UI/mfa small bugs (#15522)

* remove pagintion and fix on methods list view * fix enforcements
hashicorp · May 19, 2022 · 75630ef · 75630ef
1 parent da24f4b
commit 75630ef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 54 deletions.
diff --git a/ui/app/routes/vault/cluster/access/mfa/enforcements/index.js b/ui/app/routes/vault/cluster/access/mfa/enforcements/index.js
@@ -1,25 +1,14 @@
 import Route from '@ember/routing/route';
 
 export default class MfaEnforcementsRoute extends Route {
-  queryParams = {
-    page: {
-      refreshModel: true,
-    },
-  };
-
-  model(params) {
-    return this.store
-      .lazyPaginatedQuery('mfa-login-enforcement', {
-        responsePath: 'data.keys',
-        page: params.page || 1,
-      })
-      .catch((err) => {
-        if (err.httpStatus === 404) {
-          return [];
-        } else {
-          throw err;
-        }
-      });
+  model() {
+    return this.store.query('mfa-login-enforcement', {}).catch((err) => {
+      if (err.httpStatus === 404) {
+        return [];
+      } else {
+        throw err;
+      }
+    });
   }
   setupController(controller, model) {
     controller.set('model', model);

diff --git a/ui/app/routes/vault/cluster/access/mfa/methods/index.js b/ui/app/routes/vault/cluster/access/mfa/methods/index.js
@@ -4,26 +4,16 @@ import { inject as service } from '@ember/service';
 export default class MfaMethodsRoute extends Route {
   @service router;
 
-  queryParams = {
-    page: {
-      refreshModel: true,
-    },
-  };
-
-  model(params) {
-    return this.store
-      .lazyPaginatedQuery('mfa-method', {
-        responsePath: 'data.keys',
-        page: params.page || 1,
-      })
-      .catch((err) => {
-        if (err.httpStatus === 404) {
-          return [];
-        } else {
-          throw err;
-        }
-      });
+  model() {
+    return this.store.query('mfa-method', {}).catch((err) => {
+      if (err.httpStatus === 404) {
+        return [];
+      } else {
+        throw err;
+      }
+    });
   }
+
   afterModel(model) {
     if (model.length === 0) {
       this.router.transitionTo('vault.cluster.access.mfa');

diff --git a/ui/app/templates/vault/cluster/access/mfa/enforcements/index.hbs b/ui/app/templates/vault/cluster/access/mfa/enforcements/index.hbs
@@ -16,17 +16,10 @@
   </ToolbarActions>
 </Toolbar>
 
-{{#if this.model.meta.total}}
+{{#if (gt this.model.length 0)}}
   {{#each this.model as |item|}}
     <Mfa::LoginEnforcementListItem @model={{item}} />
   {{/each}}
 {{else}}
   <EmptyState @title="No enforcements found." @message="Add a new one to get started." />
-{{/if}}
-{{#if (gt this.model.meta.lastPage 1)}}
-  <ListPagination
-    @page={{this.model.meta.currentPage}}
-    @lastPage={{this.model.meta.lastPage}}
-    @link="vault.cluster.access.mfa.enforcements"
-  />
 {{/if}}
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/index.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/index.hbs
@@ -16,15 +16,10 @@
   </ToolbarActions>
 </Toolbar>
 
-{{#if this.model.meta.total}}
+{{#if (gt this.model.length 0)}}
   {{#each this.model as |item|}}
     <Mfa::MethodListItem @model={{item}} />
   {{/each}}
-{{/if}}
-{{#if (gt this.model.meta.lastPage 1)}}
-  <ListPagination
-    @page={{this.model.meta.currentPage}}
-    @lastPage={{this.model.meta.lastPage}}
-    @link={{concat "vault.cluster.access.mfa.methods"}}
-  />
+{{else}}
+  <EmptyState @title="No methods found." @message="Add a new one to get started." />
 {{/if}}