Merge branch 'loading-msg' of 'https://github.com/evamillan/grimoirelab-sortinghat'

Merges #906 
Closes #866

Author: jjmerchante

releases/unreleased/add-missing-loading-and-error-indicators.yml

@@ -0,0 +1,9 @@
+---
+title: Improve loading and error indicators
+category: added
+author: Eva Millán <[email protected]>
+issue: 866
+notes: >
+  Added error and loading messages to improve the user experience
+  when the data takes time to load.
+  

ui/src/apollo/queries.js

@@ -494,4 +494,6 @@ export {
   getOrganization,
   getScheduledTasks,
   findOrganization,
+  GET_INDIVIDUAL_BYUUID,
+  GET_ORGANIZATION,
 };

ui/src/components/IndividualsTable.stories.js

@@ -590,3 +590,50 @@ export const HiddenHeader = () => ({
     isExpandable: false,
   }),
 });
+
+export const OnError = () => ({
+  components: { IndividualsTable },
+  template: IndividualsTableTemplate,
+  methods: {
+    queryIndividuals() {
+      throw new Error("Test error message");
+    },
+    deleteIndividual() {
+      return true;
+    },
+    getCountries() {
+      return true;
+    },
+    recommendMatches() {
+      return {
+        data: {
+          recommendMatches: {
+            jobId: "b65d2170-a560-4b20-954e-fc8c9f5afdd4",
+          },
+        },
+      };
+    },
+  },
+  provide: () => ({
+    getRecommendations: () => {},
+    getRecommendationsCount: () => {
+      return {
+        data: {
+          recommendedMerge: {
+            pageInfo: {
+              totalResults: 0,
+            },
+          },
+        },
+      };
+    },
+    manageRecommendation: () => {},
+  }),
+  data: () => ({
+    query: query,
+    hideHeader: false,
+    outlined: true,
+    isExpandable: false,
+  }),
+});
+

ui/src/components/IndividualsTable.vue

@@ -204,6 +204,15 @@
           </v-col>
         </div>
       </template>
+      <template v-slot:no-data>
+        <v-alert v-if="error" class="text-left" density="compact" type="error">
+          {{ error }}
+        </v-alert>
+        <p v-else-if="Object.keys(filters).length > 0">
+          No results matched your search.
+        </p>
+        <p v-else>No data available</p>
+      </template>
     </v-data-table-server>
 
     <v-dialog v-model="dialog.open" max-width="500px">
@@ -447,6 +456,7 @@ export default {
         uuid: "",
       },
       selected: [],
+      error: null,
     };
   },
   computed: {
@@ -472,24 +482,30 @@ export default {
     ) {
       if (this.disabledSearch) return;
       this.loading = true;
-      let response = await this.fetchPage(
-        page,
-        this.itemsPerPage,
-        filters,
-        orderBy
-      );
-      if (response) {
-        this.individuals = formatIndividuals(
-          response.data.individuals.entities
+      this.error = null;
+      try {
+        let response = await this.fetchPage(
+          page,
+          this.itemsPerPage,
+          filters,
+          orderBy
         );
-        this.pageCount = response.data.individuals.pageInfo.numPages;
-        this.page = response.data.individuals.pageInfo.page;
-        this.totalResults = response.data.individuals.pageInfo.totalResults;
-        this.allSelected = false;
-        this.$emit("updateIndividuals", this.individuals);
+        if (response) {
+          this.individuals = formatIndividuals(
+            response.data.individuals.entities
+          );
+          this.pageCount = response.data.individuals.pageInfo.numPages;
+          this.page = response.data.individuals.pageInfo.page;
+          this.totalResults = response.data.individuals.pageInfo.totalResults;
+          this.allSelected = false;
+          this.$emit("updateIndividuals", this.individuals);
+        }
+      } catch (error) {
+        this.error = this.$getErrorMessage(error);
+      } finally {
+        this.loading = false;
+        this.selected = [];
       }
-      this.loading = false;
-      this.selected = [];
     },
     startDrag(item, isSelected, toggleSelect, event) {
       if (!isSelected(item)) {

ui/src/components/JobsTable.stories.js

@@ -117,3 +117,27 @@ export const Empty = () => ({
     },
   }),
 });
+
+export const OnError = () => ({
+  components: { JobsTable },
+  template: JobsTableTemplate,
+  methods: {
+    getJobs() {
+      throw new Error("Test error message")
+    },
+  },
+  data: () => ({
+    query: {
+      data: {
+        jobs: {
+          entities: [],
+          pageInfo: {
+            page: 1,
+            numPages: 1,
+            totalResults: 0,
+          },
+        },
+      },
+    },
+  }),
+});

ui/src/components/JobsTable.vue

@@ -15,7 +15,9 @@
         Add
       </v-btn>
     </header>
-    <v-table v-if="jobs.length > 0">
+    <v-alert v-if="error" :text="error" density="compact" type="error" />
+    <v-progress-linear v-if="isLoading" color="primary" indeterminate />
+    <v-table v-else-if="jobs.length > 0">
       <template v-slot:default>
         <thead>
           <tr>
@@ -89,18 +91,31 @@ export default {
       pageSize: 10,
       pageCount: 1,
       openModal: false,
+      error: null,
+      isLoading: false,
     };
   },
   created() {
     this.getPaginatedJobs(1);
   },
   methods: {
     async getPaginatedJobs(page = this.page, pageSize = this.pageSize) {
-      let response = await this.getJobs(page, pageSize);
-      if (response) {
-        this.jobs = response.data.jobs.entities;
-        this.pageCount = response.data.jobs.pageInfo.numPages;
-        this.page = response.data.jobs.pageInfo.page;
+      this.isLoading = true;
+      try {
+        let response = await this.getJobs(page, pageSize);
+        if (response.data.jobs.entities) {
+          this.jobs = response.data.jobs.entities;
+          this.pageCount = response.data.jobs.pageInfo.numPages;
+          this.page = response.data.jobs.pageInfo.page;
+        } else if (response.errors) {
+          this.error = `Error fetching data: ${this.$getErrorMessage(
+            response.errors
+          )}`;
+        }
+      } catch (error) {
+        this.error = `Error fetching data: ${this.$getErrorMessage(error)}`;
+      } finally {
+        this.isLoading = false;
       }
     },
     getColor(status) {

ui/src/components/LoadingSpinner.stories.js

@@ -0,0 +1,24 @@
+import LoadingSpinner from "./LoadingSpinner.vue";
+
+export default {
+  title: "LoadingSpinner",
+  excludeStories: /.*Data$/,
+};
+
+const template = `<loading-spinner :label="label"/>`;
+
+export const Default = () => ({
+  components: { LoadingSpinner },
+  template: template,
+  data: () => ({
+    label: null,
+  }),
+});
+
+export const Label = () => ({
+  components: { LoadingSpinner },
+  template: template,
+  data: () => ({
+    label: "Loading...",
+  }),
+});

ui/src/components/LoadingSpinner.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="d-flex flex-column justify-center align-center pa-4 h-100">
+    <v-progress-circular :size="size" color="primary" indeterminate />
+    <p v-if="label" class="subtitle-1 text-medium-emphasis mt-4">{{ label }}</p>
+  </div>
+</template>
+<script>
+export default {
+  name: "LoadingSpinner",
+  props: {
+    label: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    size: {
+      type: [String, Number],
+      required: false,
+      default: 48,
+    },
+  },
+};
+</script>

ui/src/components/OrganizationsTable.stories.js

@@ -301,3 +301,41 @@ export const Groups = () => ({
     name: "Groups",
   }),
 });
+
+export const OnError = () => ({
+  components: { OrganizationsTable },
+  template: OrganizationsTableTemplate,
+  methods: {
+    getOrganizations(page, items, filters) {
+      throw new Error("Test error message");
+    },
+    enroll() {
+      return true;
+    },
+    addOrganization() {
+      return;
+    },
+    addDomain() {
+      return;
+    },
+    deleteDomain() {
+      return;
+    },
+    deleteOrganization() {
+      return;
+    },
+    addTeam() {
+      return;
+    },
+    deleteTeam() {
+      return;
+    },
+    fetchTeams() {
+      return;
+    },
+  },
+  data: () => ({
+    isGroup: false,
+    name: "Organizations",
+  }),
+});

ui/src/components/OrganizationsTable.vue

@@ -98,6 +98,15 @@
           ></v-text-field>
         </div>
       </template>
+      <template v-slot:no-data>
+        <v-alert v-if="error" class="text-left" density="compact" type="error">
+          {{ error }}
+        </v-alert>
+        <p v-else-if="Object.keys(filters).length > 0">
+          No results matched your search.
+        </p>
+        <p v-else>No data available</p>
+      </template>
     </v-data-table-server>
 
     <organization-modal
@@ -267,6 +276,7 @@ export default {
         teamName: "",
       },
       loading: false,
+      error: null,
     };
   },
   created() {
@@ -275,14 +285,20 @@ export default {
   methods: {
     async getTableItems(page = this.page, filters = this.filters) {
       this.loading = true;
-      let response = await this.fetchPage(page, this.itemsPerPage, filters);
-      if (response) {
-        this.items = response.entities;
-        this.pageCount = response.pageInfo.numPages;
-        this.page = response.pageInfo.page;
-        this.totalResults = response.pageInfo.totalResults;
+      this.error = null;
+      try {
+        let response = await this.fetchPage(page, this.itemsPerPage, filters);
+        if (response) {
+          this.items = response.entities;
+          this.pageCount = response.pageInfo.numPages;
+          this.page = response.pageInfo.page;
+          this.totalResults = response.pageInfo.totalResults;
+        }
+      } catch (error) {
+        this.error = this.$getErrorMessage(error);
+      } finally {
+        this.loading = false;
       }
-      this.loading = false;
     },
     confirmEnroll(event) {
       Object.assign(this.dialog, {