feat(model): virtual properties to check app status

Author: Hans Kristian Flaatten

apps/app/controller.js

@@ -100,7 +100,7 @@ route.post('/new', (req, res, next) => {
     };
 
     // Warn about pending app approval.
-    if (!app.approved) {
+    if (app.isPending) {
       req.session.message = {
         class: 'info',
         title: 'Venter på godkjenning',

apps/app/model.js

@@ -33,6 +33,18 @@ const appSchema = new Schema({
   },
 });
 
+appSchema.virtual('isActive').get(function appSchemaIsActive() {
+  return !!this.active && !!this.approved;
+});
+
+appSchema.virtual('isPending').get(function appSchemaIsPending() {
+  return !this.approved && !this.rejection;
+});
+
+appSchema.virtual('isRejected').get(function appSchemaIsRejected() {
+  return !this.approved && !!this.rejection;
+});
+
 appSchema.virtual('slugg').get(function appSchemaVirtualSlugg() {
   return this.name.toLowerCase().replace(/[^a-zaæå0-9]/g, '-');
 });

test/models/appSchema.js

@@ -13,6 +13,45 @@ beforeEach(done => {
 });
 
 describe('appSchema', () => {
+  describe('isActive()', () => {
+    [true, false].forEach(active => {
+      [true, false].forEach(approved => {
+        const ret = active && approved;
+
+        it(`returns ${ret} when active=${active} and approved=${approved}`, () => {
+          const app = api.apps.create({ active, approved });
+          assert.equal(app.isActive, ret);
+        });
+      });
+    });
+  });
+
+  describe('isPending()', () => {
+    [true, false].forEach(approved => {
+      [undefined, 'Rejected'].forEach(rejection => {
+        const ret = !approved && !rejection;
+
+        it(`returns ${ret} when approved=${approved} and rejection=${rejection}`, () => {
+          const app = api.apps.create({ approved, rejection });
+          assert.equal(app.isPending, ret);
+        });
+      });
+    });
+  });
+
+  describe('isRejected()', () => {
+    [true, false].forEach(approved => {
+      [undefined, 'Rejected'].forEach(rejection => {
+        const ret = !approved && !!rejection;
+
+        it(`returns ${ret} when approved=${approved} and rejection=${rejection}`, () => {
+          const app = api.apps.create({ approved, rejection });
+          assert.equal(app.isRejected, ret);
+        });
+      });
+    });
+  });
+
   describe('slugg', () => {
     it('returns URL safe slug for simple name', () => {
       const app = api.apps.create({ name: 'My App' });

views/app/index.html

@@ -34,7 +34,7 @@ <h4 class="ui header">
           <div class="ui attached message">
             <div class="header">{{ app.name }}</div>
           </div>
-          {% if app.active or (not app.approved and not app.rejection) %}
+          {% if app.isActive or app.isPending %}
           <form class="ui form attached fluid segment" method="post" action="/app/{{ app._id }}">
             <div class="two fields">
               <div class="field">
@@ -54,68 +54,82 @@ <h4 class="ui header">
               <div class="twelve wide field">
                 <label>Prod Nøkkel</label>
                 <div class="ui action input">
-                  <input type="text" name="key_prod" value="{{ app.key.prod }}"
+                  <input
+                    type="text"
+                    name="key_prod"
+                    value="{{ app.key.prod }}"
                     readonly="">
-                  <button class="ui teal right labeled icon button copy"
+                  <button
+                    class="ui teal right labeled icon button copy"
                     data-clipboard-text="{{ app.key.prod }}">
-                      <i class="copy icon"></i> Kopier
+                    <i class="copy icon"></i> Kopier
                   </button>
                 </div>
               </div>
               <div class="four wide field">
                 <label>Rate Limit</label>
-                <input type="text" name="limit_prod"
+                <input
+                  type="text"
+                  name="limit_prod"
+                  placeholder="{{ app.limit.prod }}"
                   value="{{ app.limit.prodRequest | d(app.limit.prod) }}">
               </div>
             </div>
             <div class="fields">
               <div class="twelve wide field">
                 <label>Dev Nøkkel</label>
                 <div class="ui action input">
-                  <input type="text" name="key_dev" value="{{ app.key.dev }}"
+                  <input
+                    type="text"
+                    name="key_dev"
+                    value="{{ app.key.dev }}"
                     readonly="">
-                  <button class="ui teal right labeled icon button copy"
+                  <button
+                    class="ui teal right labeled icon button copy"
                     data-clipboard-text="{{ app.key.dev }}">
-                      <i class="copy icon"></i> Kopier
+                    <i class="copy icon"></i> Kopier
                   </button>
                 </div>
               </div>
               <div class="four wide field">
                 <label>Rate Limit</label>
-                <input type="text" name="limit_dev"
+                <input
+                  type="text"
+                  name="limit_dev"
+                  placeholder="{{ app.limit.dev }}"
                   value="{{ app.limit.devRequest | d(app.limit.dev) }}">
               </div>
             </div>
-            <button class="ui blue submit button" name="save" value="true">
+            <button class="ui blue submit button" type="submit">
               Lagre
             </button>
-            {% if app.active %}
-              <button class="ui red submit button" name="deactivate" value="true">
+            {% if app.isActive %}
+              <button class="ui red submit button" type="submit">
                 Deaktiver
               </button>
             {% endif %}
           </form>
           {% endif %}
-          {% if app.rejection %}
+          {% if app.isRejected %}
             <div class="ui bottom attached error message">
               <i class="icon warning"></i>
               Denne applikasjonen ble avvist. {{ app.rejection }}
             </div>
-          {% elif not app.approved %}
+          {% elif app.isPending %}
             <div class="ui bottom attached info message">
               <i class="icon wait"></i>
               Denne applikasjonen venter på godkjenning.
             </div>
-          {% elif not app.active %}
-            <div class="ui bottom attached warning message">
-              <i class="icon warning"></i>
-              Denne applikasjonen er deaktivert.
-            </div>
           {% elif app.limit.devRequest or app.limit.prodRequest %}
             <div class="ui bottom attached info message">
               <i class="icon wait"></i>
               Endring av API rate-limit venter på godkjenning.
             </div>
+          {% elif not app.isActive %}
+            <div class="ui bottom attached warning message">
+              <i class="icon warning"></i>
+              Denne applikasjonen er deaktivert.
+            </div>
           {% endif %}
         </div>
       {% endfor %}