BI-1933 - merging into release/1.0

src/components/admin/AdminProgramsTable.vue

@@ -311,9 +311,8 @@ export default class AdminProgramsTable extends Vue {
   }
 
   mounted() {
-    this.updatePagination();
-    this.getPrograms();
     this.getSpecies();
+    this.paginationChanged();
   }
 
   setSort(field: string, order: string) {
@@ -333,7 +332,7 @@ export default class AdminProgramsTable extends Vue {
 
   @Watch('paginationController', { deep: true})
   paginationChanged() {
-    let currentCall = this.paginationController.currentCall
+    let currentCall = this.paginationController.currentCall;
     let paginationQuery = this.paginationController.getPaginationSelections();
     if(currentCall && currentCall!.page == paginationQuery.page && currentCall!.pageSize == paginationQuery.pageSize && currentCall!.showAll == paginationQuery.showAll) {
       return;
@@ -348,6 +347,7 @@ export default class AdminProgramsTable extends Vue {
   }
 
   getPrograms() {
+    this.programsLoading = true;
     ProgramService.getAll(this.paginationController.currentCall, this.programSort).then(([programs, metadata]) => {
 
       // Check that our most recent query is this one

src/components/admin/AdminUsersTable.vue

@@ -296,8 +296,7 @@ export default class AdminUsersTable extends Vue {
 
   mounted() {
     this.getRoles();
-    this.updatePagination();
-    this.getUsers();
+    this.paginationChanged();
   }
 
     setSort(field: string, order: string) {
@@ -344,6 +343,7 @@ export default class AdminUsersTable extends Vue {
   }
 
   getUsers() {
+    this.usersLoading = true;
     UserService.getAll(this.paginationController.currentCall, this.systemUserSort).then(([users, metadata]) => {
       if (this.paginationController.matchesCurrentRequest(metadata.pagination)){
         this.users = users;

src/components/experiments/ExperimentsObservationsTable.vue

@@ -154,6 +154,7 @@ export default class ExperimentsObservationsTable extends Vue {
     ));
 
     this.paginationController.pageSize = 20;
+    this.paginationChanged();
   }
 
   @Watch('paginationController', { deep: true})
@@ -174,6 +175,7 @@ export default class ExperimentsObservationsTable extends Vue {
 
   @Watch('filters', {deep: true})
   async getExperiments() {
+    this.experimentsLoading = true;
     try {
       const {call, callId} = this.experimentCallStack.makeCall(this.filters);
 

src/components/germplasm/GermplasmListsTable.vue

@@ -162,7 +162,7 @@ export default class GermplasmListsTable extends Vue {
         this.germplasmListSort,
         this.paginationController
     ));
-    this.getGermplasmLists();
+    this.paginationChanged();
   }
 
   @Watch('paginationController', { deep: true})
@@ -183,6 +183,7 @@ export default class GermplasmListsTable extends Vue {
 
   @Watch('filters', {deep: true})
   async getGermplasmLists() {
+    this.germplasmListsLoading = true;
     try {
       const {call, callId} = this.germplasmListCallStack.makeCall(this.filters);
       const response = await call;

src/components/germplasm/GermplasmTable.vue

@@ -156,7 +156,7 @@ export default class GermplasmTable extends Vue {
         this.paginationController
     ));
 
-    this.getGermplasm();
+    this.paginationChanged();
   }
 
   @Watch('paginationController', { deep: true})
@@ -177,6 +177,7 @@ export default class GermplasmTable extends Vue {
 
   @Watch('filters', {deep: true})
   async getGermplasm() {
+    this.germplasmLoading = true;
     try {
       // Only process the most recent call
       const {call, callId} = this.germplasmCallStack.makeCall(this.filters);

src/components/ontology/OntologyTable.vue

@@ -337,6 +337,7 @@ export default class OntologyTable extends Vue {
   ontologySort!: OntologySort;
 
   mounted() {
+    this.paginationController.pageSize = 200;
     this.getSubscribedOntology();
     this.getObservationLevels();
     this.getAttributesEntitiesDescriptions();
@@ -347,7 +348,7 @@ export default class OntologyTable extends Vue {
         this.paginationController
     ));
     this.registerSidePanelEventHandlers();
-    this.getTraits();
+    this.paginationChanged();
   }
 
   @Watch('paginationController', { deep: true})

src/components/program/ProgramLocationsTable.vue

@@ -193,8 +193,7 @@ export default class ProgramLocationsTable extends Vue {
   }
 
   mounted() {
-    this.updatePagination();
-    this.getLocations();
+    this.paginationChanged();
   }
 
   setSort(field: string, order: string) {
@@ -222,6 +221,7 @@ export default class ProgramLocationsTable extends Vue {
   }
 
   getLocations() {
+    this.locationsLoading = true;
     ProgramLocationService.getAll(this.activeProgram!.id!, this.paginationController.currentCall, this.locationSort).then(([programLocations, metadata]) => {
       if (this.paginationController.matchesCurrentRequest(metadata.pagination)){
         this.locations = programLocations;

src/components/program/ProgramUsersTable.vue

@@ -251,10 +251,9 @@ export default class ProgramUsersTable extends Vue {
   }
 
   mounted() {
-    this.updatePagination();
     this.getRoles();
-    this.getUsers();
     this.getSystemUsers();
+    this.paginationChanged();
   }
 
   setSort(field: string, order: string) {
@@ -286,6 +285,7 @@ export default class ProgramUsersTable extends Vue {
   }
 
   getUsers() {
+    this.usersLoading = true;
     ProgramUserService.getAll(this.activeProgram!.id!, this.paginationController.currentCall, this.programUserSort).then(([programUsers, metadata]) => {
       if (this.paginationController.matchesCurrentRequest(metadata.pagination)){
         this.users = programUsers;

src/components/tables/expandableTable/ExpandableTable.vue

@@ -74,7 +74,7 @@
         </a>
       </b-table-column>
 
-      <template v-slot:empty v-if="this.loading !== true">
+      <template v-slot:empty v-if="!loading">
         <slot name="emptyMessage" />
       </template>
 

src/components/trait/TraitsImportTable.vue

@@ -249,8 +249,7 @@ export default class TraitsImportTable extends Vue {
   private fullNameSortLabel: string = OntologySortField.FullName;
 
   mounted() {
-    this.updatePagination();
-    this.getTraitUpload();
+    this.paginationChanged();
   }
 
   @Watch('paginationController', { deep: true})