Merge branch 'org-individuals' of 'https://github.com/evamillan/grimoirelab-sortinghat'

Merges #526
Closes #526
Fixes #521

Author: sduenas

ui/src/components/IndividualsTable.vue

@@ -50,6 +50,7 @@
             value: 'profile__name'
           }
         ]"
+        :set-filters="setFilters"
       />
       <v-tooltip bottom transition="expand-y-transition" open-delay="200">
         <template v-slot:activator="{ on }">
@@ -293,6 +294,10 @@ export default {
     withdraw: {
       type: Function,
       required: true
+    },
+    setFilters: {
+      type: String,
+      required: false
     }
   },
   data() {

ui/src/components/OrganizationEntry.vue

@@ -8,12 +8,19 @@
   >
     <td class="font-weight-medium">{{ name }}</td>
     <td class="text-right text--secondary">
-      {{ enrollments }}
       <v-tooltip bottom transition="expand-y-transition" open-delay="200">
         <template v-slot:activator="{ on }">
-          <v-icon v-on="on" small right>
-            mdi-account-multiple
-          </v-icon>
+          <v-btn
+            depressed
+            color="transparent"
+            v-on="on"
+            @click.stop="$emit('getEnrollments')"
+          >
+            {{ enrollments }}
+            <v-icon small right>
+              mdi-account-multiple
+            </v-icon>
+          </v-btn>
         </template>
         <span>Enrollments</span>
       </v-tooltip>

ui/src/components/OrganizationsTable.vue

@@ -47,6 +47,7 @@
           @enroll="confirmEnroll"
           @edit="openModal(item)"
           @delete="confirmDelete(item.name)"
+          @getEnrollments="$emit('getEnrollments', item.name)"
         />
       </template>
       <template v-slot:expanded-item="{ item }">

ui/src/components/Search.vue

@@ -113,6 +113,10 @@ export default {
       required: false,
       default: false
     },
+    setFilters: {
+      type: String,
+      required: false
+    },
     validFilters: {
       type: Array,
       required: false,
@@ -316,6 +320,12 @@ export default {
         this.search();
       }
     }
+  },
+  watch: {
+    setFilters(value) {
+      this.inputValue = value;
+      this.search();
+    }
   }
 };
 </script>

ui/src/views/Dashboard.vue

@@ -29,6 +29,7 @@
           :enroll="enroll"
           :get-countries="getCountries"
           :lock-individual="lockIndividual"
+          :set-filters="filters"
           :unlock-individual="unlockIndividual"
           :withdraw="withdraw"
           :update-enrollment="updateEnrollment"
@@ -50,6 +51,7 @@
           :add-domain="addDomain"
           :delete-domain="deleteDomain"
           :delete-organization="deleteOrganization"
+          @getEnrollments="getEnrollments"
           @updateIndividuals="updateTable"
           @updateWorkspace="updateWorkspace"
           ref="organizations"
@@ -101,6 +103,7 @@ export default {
   },
   data() {
     return {
+      filters: null,
       highlightInTable: undefined,
       highlightInWorkspace: undefined,
       savedIndividuals: [],
@@ -260,6 +263,9 @@ export default {
     clearWorkspace() {
       this.emptyWorkspace();
       this.savedIndividuals = [];
+    },
+    getEnrollments(organization) {
+      this.filters = `enrollment:"${organization}"`;
     }
   },
   async mounted() {

ui/tests/unit/__snapshots__/storybook.spec.js.snap

@@ -6510,18 +6510,27 @@ exports[`Storyshots OrganizationEntry Default 1`] = `
               <td
                 class="text-right text--secondary"
               >
-                
-    280
-    
                 <span
                   class="v-tooltip v-tooltip--bottom"
                 >
                   <!---->
-                  <i
-                    aria-hidden="true"
-                    class="v-icon notranslate v-icon--right mdi mdi-account-multiple theme--light"
-                    style="font-size: 16px;"
-                  />
+                  <button
+                    class="v-btn v-btn--depressed theme--light v-size--default transparent"
+                    type="button"
+                  >
+                    <span
+                      class="v-btn__content"
+                    >
+                      
+          280
+          
+                      <i
+                        aria-hidden="true"
+                        class="v-icon notranslate v-icon--right mdi mdi-account-multiple theme--light"
+                        style="font-size: 16px;"
+                      />
+                    </span>
+                  </button>
                 </span>
               </td>
                
@@ -6739,13 +6748,13 @@ exports[`Storyshots OrganizationsTable Default 1`] = `
                 >
                   <label
                     class="v-label theme--light"
-                    for="input-1013"
+                    for="input-1014"
                     style="left: 0px; position: absolute;"
                   >
                     Search
                   </label>
                   <input
-                    id="input-1013"
+                    id="input-1014"
                     type="text"
                   />
                 </div>
@@ -6872,13 +6881,13 @@ exports[`Storyshots OrganizationsTable Default 1`] = `
               >
                 <label
                   class="v-label v-label--active theme--light"
-                  for="input-1024"
+                  for="input-1025"
                   style="left: 0px; position: absolute;"
                 >
                   Items per page
                 </label>
                 <input
-                  id="input-1024"
+                  id="input-1025"
                   max="0"
                   min="1"
                   type="number"
@@ -7234,13 +7243,13 @@ exports[`Storyshots Search Default 1`] = `
               >
                 <label
                   class="v-label theme--light"
-                  for="input-1101"
+                  for="input-1105"
                   style="left: 0px; position: absolute;"
                 >
                   Search
                 </label>
                 <input
-                  id="input-1101"
+                  id="input-1105"
                   type="text"
                 />
               </div>
@@ -7368,13 +7377,13 @@ exports[`Storyshots Search Filter Selector 1`] = `
               >
                 <label
                   class="v-label theme--light"
-                  for="input-1111"
+                  for="input-1115"
                   style="left: 0px; position: absolute;"
                 >
                   Search
                 </label>
                 <input
-                  id="input-1111"
+                  id="input-1115"
                   type="text"
                 />
               </div>
@@ -7472,13 +7481,13 @@ exports[`Storyshots Search Order Selector 1`] = `
               >
                 <label
                   class="v-label theme--light"
-                  for="input-1124"
+                  for="input-1128"
                   style="left: 0px; position: absolute;"
                 >
                   Search
                 </label>
                 <input
-                  id="input-1124"
+                  id="input-1128"
                   type="text"
                 />
               </div>
@@ -7550,7 +7559,7 @@ exports[`Storyshots Search Order Selector 1`] = `
             <div
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-owns="list-1129"
+              aria-owns="list-1133"
               class="v-input__slot"
               role="button"
             >
@@ -7568,7 +7577,7 @@ exports[`Storyshots Search Order Selector 1`] = `
               >
                 <label
                   class="v-label theme--light"
-                  for="input-1129"
+                  for="input-1133"
                   style="left: 0px; position: absolute;"
                 >
                   Order by
@@ -7579,7 +7588,7 @@ exports[`Storyshots Search Order Selector 1`] = `
                   <input
                     aria-readonly="false"
                     autocomplete="off"
-                    id="input-1129"
+                    id="input-1133"
                     readonly="readonly"
                     type="text"
                   />
@@ -8154,7 +8163,7 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                   />
                   <input
                     aria-checked="false"
-                    id="input-1220"
+                    id="input-1224"
                     role="checkbox"
                     type="checkbox"
                     value=""
@@ -8165,7 +8174,7 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                 </div>
                 <label
                   class="v-label theme--light"
-                  for="input-1220"
+                  for="input-1224"
                   style="left: 0px; position: relative;"
                 >
                   Select all
@@ -8251,13 +8260,13 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                   >
                     <label
                       class="v-label theme--light"
-                      for="input-1225"
+                      for="input-1229"
                       style="left: 0px; position: absolute;"
                     >
                       Search
                     </label>
                     <input
-                      id="input-1225"
+                      id="input-1229"
                       type="text"
                     />
                   </div>
@@ -8329,7 +8338,7 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                 <div
                   aria-expanded="false"
                   aria-haspopup="listbox"
-                  aria-owns="list-1233"
+                  aria-owns="list-1237"
                   class="v-input__slot"
                   role="button"
                 >
@@ -8347,7 +8356,7 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                   >
                     <label
                       class="v-label theme--light"
-                      for="input-1233"
+                      for="input-1237"
                       style="left: 0px; position: absolute;"
                     >
                       Order by
@@ -8358,7 +8367,7 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                       <input
                         aria-readonly="false"
                         autocomplete="off"
-                        id="input-1233"
+                        id="input-1237"
                         readonly="readonly"
                         type="text"
                       />
@@ -8535,13 +8544,13 @@ exports[`Storyshots WorkSpace Drag And Drop 1`] = `
                   >
                     <label
                       class="v-label v-label--active theme--light"
-                      for="input-1253"
+                      for="input-1257"
                       style="left: 0px; position: absolute;"
                     >
                       Items per page
                     </label>
                     <input
-                      id="input-1253"
+                      id="input-1257"
                       max="0"
                       min="1"
                       type="number"