@truedat/dd 6.10.1 → 6.10.2

package/src/components/__tests__/__snapshots__/GrantRequestBulkApprovalForm.spec.js.snap

@@ -30,6 +30,7 @@ exports[`<GrantRequestBulkApprovalForm /> matches the latest snapshot 1`] = `
       >
         <button
           class="ui primary button"
+          data-testid="approve-button-id"
           type="submit"
         >
           reject

package/src/components/__tests__/__snapshots__/GrantRequestBulkRoleSelector.spec.js.snap

@@ -3,7 +3,6 @@
 exports[`<GrantRequestBulkRoleSelector /> matches the latest snapshot 1`] = `
 <div>
   <div
-    aria-disabled="false"
     aria-expanded="false"
     class="ui selection dropdown grant-requests-bulk-role-selector"
     role="listbox"

package/src/components/__tests__/__snapshots__/GrantRequestRow.spec.js.snap

@@ -7,6 +7,26 @@ exports[`<GrantRequestRow /> disable checkbox when can not Approve 1`] = `
       <tr
         class="active warning"
       >
+        <td
+          class="collapsing center aligned one wide"
+        >
+          <div
+            class="ui checked fitted checkbox"
+          >
+            <input
+              checked=""
+              class="hidden"
+              id="1"
+              readonly=""
+              tabindex="0"
+              type="checkbox"
+              value=""
+            />
+            <label
+              for="1"
+            />
+          </div>
+        </td>
         <td
           class=""
         >

package/src/components/__tests__/__snapshots__/GrantRequestsLabelResults.spec.js.snap

@@ -3,24 +3,28 @@
 exports[`<GrantRequestsLabelResults /> When is loading 1`] = `
 <div>
   <div
-    class="ui label grant-requests-bulk-label-results"
+    class="grant-requests-bulk-label-results"
   >
-    results
+    <div
+      class="ui label"
+    >
+      searching
+    </div>
   </div>
+  ,
 </div>
 `;
 
-exports[`<GrantRequestsLabelResults /> When role is not selected 1`] = `
+exports[`<GrantRequestsLabelResults /> When not in approve view 1`] = `
 <div>
   <div
-    class="ui label grant-requests-bulk-label-results"
+    class="grant-requests-bulk-label-results"
   >
-    results
-  </div>
-  <div
-    class="ui label grant-requests-bulk-label-results"
-  >
-    selected
+    <div
+      class="ui label"
+    >
+      results
+    </div>
   </div>
 </div>
 `;
@@ -28,9 +32,18 @@ exports[`<GrantRequestsLabelResults /> When role is not selected 1`] = `
 exports[`<GrantRequestsLabelResults /> matches the latest snapshot 1`] = `
 <div>
   <div
-    class="ui label grant-requests-bulk-label-results"
+    class="grant-requests-bulk-label-results"
   >
-    results
+    <div
+      class="ui label"
+    >
+      results
+    </div>
+    <div
+      class="ui label"
+    >
+      selected
+    </div>
   </div>
 </div>
 `;

package/src/components/__tests__/__snapshots__/GrantRequestsSearchResults.spec.js.snap

@@ -29,151 +29,146 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
       <div
         class="grant-requests-bulk-actions"
       >
-        <div
-          class="right aligned four wide column"
-        >
+        <div>
           <div
-            aria-disabled="false"
-            aria-expanded="false"
-            class="ui selection dropdown grant-requests-bulk-role-selector"
-            role="listbox"
-            tabindex="0"
+            class="ui action left icon input"
           >
-            <div
-              aria-atomic="true"
-              aria-live="polite"
-              class="divider default text"
-              role="alert"
-            >
-              select
-            </div>
             <i
               aria-hidden="true"
-              class="dropdown icon"
+              class="search link icon"
+            />
+            <input
+              placeholder="placeholder"
+              type="text"
+              value=""
             />
             <div
-              class="menu transition"
+              aria-expanded="false"
+              class="ui button floating labeled scrolling dropdown icon"
+              role="listbox"
+              tabindex="0"
             >
               <div
-                aria-checked="false"
-                aria-selected="true"
-                class="selected item"
-                role="option"
-                style="pointer-events: all;"
+                aria-atomic="true"
+                aria-live="polite"
+                class="divider text"
+                role="alert"
               >
-                <span
-                  class="text"
-                >
-                  bar
-                </span>
+                Filters
               </div>
+              <i
+                aria-hidden="true"
+                class="filter icon"
+              />
               <div
-                aria-checked="false"
-                aria-selected="false"
-                class="item"
-                role="option"
-                style="pointer-events: all;"
+                class="menu transition"
               >
-                <span
-                  class="text"
+                <div
+                  class="item"
+                  role="option"
                 >
-                  foo
-                </span>
+                  <em>
+                    (reset filters)
+                  </em>
+                </div>
               </div>
             </div>
           </div>
-          <button
-            class="ui primary disabled button button icon group-actions"
-            disabled=""
-            tabindex="-1"
-          >
-            approve
-          </button>
-          <button
-            class="ui secondary disabled button button icon group-actions"
-            disabled=""
-            tabindex="-1"
-          >
-            reject
-          </button>
-        </div>
-      </div>
-      <div
-        class="ui action left icon input"
-      >
-        <input
-          placeholder="placeholder"
-          type="text"
-          value=""
-        />
-        <i
-          aria-hidden="true"
-          class="search link icon"
-        />
-        <div
-          aria-expanded="false"
-          class="ui button floating labeled scrolling dropdown icon"
-          role="listbox"
-          tabindex="0"
-        >
           <div
-            aria-atomic="true"
-            aria-live="polite"
-            class="divider text"
-            role="alert"
-          >
-            Filters
-          </div>
-          <i
-            aria-hidden="true"
-            class="filter icon"
+            class="selectedFilters"
           />
+        </div>
+        <div>
           <div
-            class="menu transition"
+            class="row grant-requests-approve-actions"
           >
             <div
-              class="item"
-              role="option"
+              class="five wide column"
             >
-              <em>
-                (reset filters)
-              </em>
+              <div
+                class="ui buttons"
+              >
+                <button
+                  class="ui active icon button"
+                >
+                  Approve view
+                </button>
+                <button
+                  class="ui icon button"
+                >
+                  Search view
+                </button>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
-      <div
-        class="selectedFilters"
-      >
-        <div
-          class="appliedFilters"
-        >
-          Filters:
-        </div>
-        <div
-          aria-expanded="false"
-          class="ui floating item scrolling dropdown"
-          role="listbox"
-          tabindex="0"
-        >
           <div
-            class="ui label"
+            class="row"
           >
-            current_status
-            <i
-              aria-hidden="true"
-              class="delete icon"
-            />
+            <div
+              class="right aligned five wide column"
+            >
+              <div
+                aria-expanded="false"
+                class="ui selection dropdown grant-requests-bulk-role-selector"
+                role="listbox"
+                tabindex="0"
+              >
+                <div
+                  aria-atomic="true"
+                  aria-live="polite"
+                  class="divider text"
+                  role="alert"
+                >
+                  foo
+                </div>
+                <i
+                  aria-hidden="true"
+                  class="dropdown icon"
+                />
+                <div
+                  class="menu transition"
+                >
+                  <div
+                    aria-checked="false"
+                    aria-selected="false"
+                    class="item"
+                    role="option"
+                    style="pointer-events: all;"
+                  >
+                    <span
+                      class="text"
+                    >
+                      bar
+                    </span>
+                  </div>
+                  <div
+                    aria-checked="true"
+                    aria-selected="true"
+                    class="active selected item"
+                    role="option"
+                    style="pointer-events: all;"
+                  >
+                    <span
+                      class="text"
+                    >
+                      foo
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <button
+                class="ui primary button button icon group-actions"
+              >
+                approve
+              </button>
+              <button
+                class="ui secondary button button icon group-actions"
+              >
+                reject
+              </button>
+            </div>
           </div>
-          <div
-            class="menu transition dimmable"
-          />
         </div>
-        <a
-          class="resetFilters"
-        >
-          Clear filters
-        </a>
       </div>
       <div
         class="dimmable"
@@ -190,9 +185,18 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
           </div>
         </div>
         <div
-          class="ui label grant-requests-bulk-label-results"
+          class="grant-requests-bulk-label-results"
         >
-          results
+          <div
+            class="ui label"
+          >
+            results
+          </div>
+          <div
+            class="ui label"
+          >
+            selected
+          </div>
         </div>
         <table
           class="ui selectable sortable table"
@@ -203,6 +207,25 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
             <tr
               class=""
             >
+              <th
+                class="center aligned"
+              >
+                <div
+                  class="ui fitted checkbox"
+                >
+                  <input
+                    class="hidden"
+                    id="selectGrantRequest"
+                    readonly=""
+                    tabindex="0"
+                    type="checkbox"
+                    value=""
+                  />
+                  <label
+                    for="selectGrantRequest"
+                  />
+                </div>
+              </th>
               <th
                 class=""
               >
@@ -214,7 +237,7 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
                 data_structure
               </th>
               <th
-                class="ascending sorted disabled"
+                class="disabled"
               >
                 path
               </th>
@@ -236,6 +259,25 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
             <tr
               class=""
             >
+              <td
+                class="collapsing center aligned one wide"
+              >
+                <div
+                  class="ui fitted checkbox"
+                >
+                  <input
+                    class="hidden"
+                    id="1"
+                    readonly=""
+                    tabindex="0"
+                    type="checkbox"
+                    value=""
+                  />
+                  <label
+                    for="1"
+                  />
+                </div>
+              </td>
               <td
                 class=""
               >
@@ -259,6 +301,25 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
             <tr
               class=""
             >
+              <td
+                class="collapsing center aligned one wide"
+              >
+                <div
+                  class="ui fitted checkbox"
+                >
+                  <input
+                    class="hidden"
+                    id="2"
+                    readonly=""
+                    tabindex="0"
+                    type="checkbox"
+                    value=""
+                  />
+                  <label
+                    for="2"
+                  />
+                </div>
+              </td>
               <td
                 class=""
               >
@@ -284,5 +345,6 @@ exports[`<GrantRequestsSearchResults /> matches the latest snapshot 1`] = `
       </div>
     </div>
   </div>
+  ,
 </div>
 `;

package/src/components/__tests__/__snapshots__/GrantRequestsTable.spec.js.snap

@@ -2,18 +2,116 @@
 
 exports[`<GrantRequestsTable /> matches the latest snapshot 1`] = `
 <div>
-  <h4
-    class="ui header"
+  <table
+    class="ui selectable sortable table"
   >
-    <i
-      aria-hidden="true"
-      class="search icon"
-    />
-    <div
-      class="content"
+    <thead
+      class=""
     >
-      No grant requests found
-    </div>
-  </h4>
+      <tr
+        class=""
+      >
+        <th
+          class="center aligned"
+        >
+          <div
+            class="ui checked fitted checkbox"
+          >
+            <input
+              checked=""
+              class="hidden"
+              id="selectGrantRequest"
+              readonly=""
+              tabindex="0"
+              type="checkbox"
+              value=""
+            />
+            <label
+              for="selectGrantRequest"
+            />
+          </div>
+        </th>
+        <th
+          class=""
+        >
+          user
+        </th>
+        <th
+          class=""
+        >
+          data_structure
+        </th>
+        <th
+          class="disabled"
+        >
+          path
+        </th>
+        <th
+          class="two wide"
+        >
+          current_status
+        </th>
+        <th
+          class="two wide ascending sorted"
+        >
+          inserted_at
+        </th>
+      </tr>
+    </thead>
+    <tbody
+      class=""
+    >
+      <tr
+        class=""
+      >
+        <td
+          class="collapsing center aligned one wide"
+        >
+          <div
+            class="ui fitted checkbox"
+          >
+            <input
+              class="hidden"
+              id="55"
+              readonly=""
+              tabindex="0"
+              type="checkbox"
+              value=""
+            />
+            <label
+              for="55"
+            />
+          </div>
+        </td>
+        <td
+          class=""
+        >
+          null
+        </td>
+        <td
+          class=""
+        />
+        <td
+          class=""
+        >
+          
+        </td>
+        <td
+          class=""
+        >
+          pending
+        </td>
+        <td
+          class="center aligned"
+        >
+          <time
+            datetime="1642157752059"
+          >
+            2022-01-14 10:55
+          </time>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 `;

package/src/components/index.js

@@ -5,9 +5,7 @@ import GrantRoutes from "./GrantRoutes";
 import GrantRequestBulkActions from "./GrantRequestBulkActions";
 import GrantRequestsTable from "./GrantRequestsTable";
 import GrantRequestRow from "./GrantRequestRow";
-import GrantRequestPagination from "./GrantRequestPagination";
 import GrantSelectedFilters from "./GrantSelectedFilters";
-import GrantRequestsSelectedFilters from "./GrantRequestsSelectedFilters";
 import GrantsTable from "./GrantsTable";
 import LineageDefs from "./LineageDefs";
 import LineageDownloadButton from "./LineageDownloadButton";
@@ -60,8 +58,6 @@ export {
   GrantRequestBulkActions,
   GrantRequestsTable,
   GrantRequestRow,
-  GrantRequestsSelectedFilters,
-  GrantRequestPagination,
   GrantRoutes,
   GrantSelectedFilters,
   GrantsTable,

package/src/hooks/useGrantRequest.js

@@ -3,6 +3,8 @@ import { apiJsonPost } from "@truedat/core/services/api";
 import {
   API_GRANT_REQUEST_BULK_APPROVAL,
   API_GRANT_REQUEST_GROUP,
+  API_GRANT_REQUESTS_SEARCH,
+  API_GRANT_REQUESTS_FILTERS_SEARCH,
 } from "../api";
 
 export const useGrantRequestBulkApproval = () => {
@@ -16,3 +18,14 @@ export const useGrantRequestGroup = () => {
     apiJsonPost(url, arg)
   );
 };
+export const useGrantRequestsSearch = () => {
+  return useSWRMutations(API_GRANT_REQUESTS_SEARCH, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+};
+
+export const useGrantRequestsFilters = () => {
+  return useSWRMutations(API_GRANT_REQUESTS_FILTERS_SEARCH, (url, { arg }) =>
+    apiJsonPost(url, arg)
+  );
+};