@truedat/core 7.10.4 → 7.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "7.10.4",
+  "version": "7.11.1",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.10.4",
+    "@truedat/test": "7.11.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -85,5 +85,5 @@
     "slate-react": "^0.22.10",
     "swr": "^2.3.3"
   },
-  "gitHead": "0dcedbfaed3964ee02a3d2c175e0f96e2fbc9316"
+  "gitHead": "efc0969708811b5e4fc2ea39e628a1b2691e4042"
 }

package/src/components/GlossaryMenu.js

@@ -15,9 +15,8 @@ import {
   CONCEPTS_PENDING,
   CONCEPTS_DEPRECATED,
   CONCEPT_LINKS_MANAGEMENT,
+  CONCEPT_LINKS_APPROVALS,
   CONCEPTS_BULK_UPLOAD_EVENTS,
-  CONCEPTS_SIDEMENU_MANAGEMENT_LINKS,
-  CONCEPTS_SIDEMENU_MANAGEMENT_UPLOADS,
   CONCEPTS_SUBSCOPE,
   CONCEPTS_SIDEMENU_SUBSCOPE,
   CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED,
@@ -95,6 +94,12 @@ function buildMainConceptsSubmenuItems(
     groups: ["business_glossary_management"],
     isActive: () => pathname === CONCEPT_LINKS_MANAGEMENT,
   };
+  const manageApprovals = {
+    name: "concepts_links_approvals",
+    routes: [CONCEPT_LINKS_APPROVALS],
+    groups: ["business_glossary_management"],
+    isActive: () => pathname === CONCEPT_LINKS_APPROVALS,
+  };
   const manageUploads = {
     name: "concepts_upload_events",
     routes: [CONCEPTS_BULK_UPLOAD_EVENTS],
@@ -107,7 +112,9 @@ function buildMainConceptsSubmenuItems(
     ...leftoverSubscopeItems,
     mainPending,
     mainDeprecated,
-    ...(rootSubscopes.length > 0 ? [] : [manageLinks, manageUploads]),
+    ...(rootSubscopes.length > 0
+      ? []
+      : [manageLinks, manageApprovals, manageUploads]),
   ];
 }
 
@@ -155,12 +162,17 @@ function buildManagementSubmenuItems() {
   return [
     {
       name: "concepts_links_management",
-      routes: [CONCEPTS_SIDEMENU_MANAGEMENT_LINKS],
+      routes: [CONCEPT_LINKS_MANAGEMENT],
+      groups: ["business_glossary_management"],
+    },
+    {
+      name: "concepts_links_approvals",
+      routes: [CONCEPT_LINKS_APPROVALS],
       groups: ["business_glossary_management"],
     },
     {
       name: "concepts_upload_events",
-      routes: [CONCEPTS_SIDEMENU_MANAGEMENT_UPLOADS],
+      routes: [CONCEPTS_BULK_UPLOAD_EVENTS],
       groups: ["business_glossary_management"],
     },
   ];

package/src/components/QualityMenu.js

@@ -8,6 +8,7 @@ import {
   IMPLEMENTATIONS,
   IMPLEMENTATIONS_DEPRECATED,
   IMPLEMENTATIONS_PENDING,
+  IMPLEMENTATIONS_UPLOAD_JOBS,
   QUALITY_DASHBOARD,
   RULES,
 } from "../routes";
@@ -27,6 +28,11 @@ export const ITEMS = [
     routes: [IMPLEMENTATIONS_DEPRECATED],
     groups: ["quality_implementation_workflow_management"],
   },
+  {
+    name: "implementations_upload_jobs",
+    routes: [IMPLEMENTATIONS_UPLOAD_JOBS],
+    groups: ["quality"],
+  },
   {
     name: "executions",
     routes: [EXECUTION_GROUPS],

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

@@ -114,6 +114,20 @@ exports[`<GlossaryMenu /> matches the latest snapshot, finds fixed and subscopes
             concepts_links_management
           </span>
         </a>
+        <a
+          aria-checked="false"
+          class="item"
+          data-discover="true"
+          href="/concepts/management/approvals"
+          name="concepts_links_approvals"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            concepts_links_approvals
+          </span>
+        </a>
         <a
           aria-checked="false"
           class="item"

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

@@ -88,6 +88,20 @@ exports[`<QualityMenu /> matches the latest snapshot 1`] = `
             implementations_deprecated
           </span>
         </a>
+        <a
+          aria-checked="false"
+          class="item"
+          data-discover="true"
+          href="/implementations/uploadJobs"
+          name="implementations_upload_jobs"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            implementations_upload_jobs
+          </span>
+        </a>
         <a
           aria-checked="false"
           class="item"

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

@@ -107,6 +107,20 @@ exports[`<SideMenu /> matches the latest snapshot 1`] = `
                 concepts_links_management
               </span>
             </a>
+            <a
+              aria-checked="false"
+              class="item"
+              data-discover="true"
+              href="/concepts/management/approvals"
+              name="concepts_links_approvals"
+              role="option"
+            >
+              <span
+                class="text"
+              >
+                concepts_links_approvals
+              </span>
+            </a>
             <a
               aria-checked="false"
               class="item"
@@ -309,6 +323,13 @@ exports[`<SideMenu /> matches the latest snapshot 1`] = `
           >
             implementations_deprecated
           </a>
+          <a
+            class="link item"
+            data-discover="true"
+            href="/implementations/uploadJobs"
+          >
+            implementations_upload_jobs
+          </a>
           <a
             class="link item"
             data-discover="true"

package/src/routes.js

@@ -26,14 +26,14 @@ export const CONCEPTS_SIDEMENU_SUBSCOPE_DEPRECATED =
   "/glossarySubscope/:subscope/deprecated";
 export const CONCEPTS_SIDEMENU_SUBSCOPE_PENDING =
   "/glossarySubscope/:subscope/pending";
-export const CONCEPTS_SIDEMENU_MANAGEMENT_LINKS = "/glossaryManagement/links";
-export const CONCEPTS_SIDEMENU_MANAGEMENT_UPLOADS =
-  "/glossaryManagement/uploads";
 export const CONCEPT_ARCHIVE =
   "/concepts/:business_concept_id/versions/:id/archive";
 export const CONCEPT_EDIT = "/concepts/:business_concept_id/versions/:id/edit";
 export const CONCEPT_EVENTS =
   "/concepts/:business_concept_id/versions/:id/events";
+export const CONCEPT_LINKS_APPROVALS = "/concepts/management/approvals";
+export const CONCEPT_LINKS_APPROVALS_RESULTS =
+  "/concepts/management/approvals/results";
 export const CONCEPT_LINKS_CONCEPTS =
   "/concepts/:business_concept_id/versions/:id/links/concepts";
 export const CONCEPT_LINKS_CONCEPTS_NEW =
@@ -103,6 +103,8 @@ export const IMPLEMENTATION = "/implementations/:implementation_id";
 export const IMPLEMENTATIONS = "/implementations";
 export const IMPLEMENTATIONS_DEPRECATED = "/implementations/deprecated";
 export const IMPLEMENTATIONS_PENDING = "/implementations/pending";
+export const IMPLEMENTATIONS_UPLOAD_JOBS = "/implementations/uploadJobs";
+export const IMPLEMENTATIONS_UPLOAD_JOB = "/implementations/uploadJobs/:id";
 export const IMPLEMENTATION_CLONE = "/implementations/:implementation_id/clone";
 export const IMPLEMENTATION_CONCEPT_LINKS =
   "/implementations/:implementation_id/links/concepts";
@@ -295,6 +297,8 @@ const routes = {
   BUCKET_VIEW_CONFIGS,
   CONCEPTS,
   CONCEPTS_BULK_UPDATE,
+  CONCEPT_LINKS_APPROVALS,
+  CONCEPT_LINKS_APPROVALS_RESULTS,
   CONCEPTS_NEW,
   CONCEPTS_PENDING,
   CONCEPTS_SUBSCOPE,
@@ -362,6 +366,8 @@ const routes = {
   IMPLEMENTATIONS,
   IMPLEMENTATIONS_DEPRECATED,
   IMPLEMENTATIONS_PENDING,
+  IMPLEMENTATIONS_UPLOAD_JOBS,
+  IMPLEMENTATIONS_UPLOAD_JOB,
   IMPLEMENTATION_CLONE,
   IMPLEMENTATION_CONCEPT_LINKS,
   IMPLEMENTATION_CONCEPT_LINKS_NEW,

package/src/search/SearchContext.js

@@ -72,7 +72,7 @@ export const SearchContextProvider = (props) => {
 
   const debouncedTriggerSearchFilters = useCallback(
     _.debounce(debounceQueryTime)((filterParam) => {
-      triggerFilters(filterParam).then(({ data }) => {
+      triggerFilters?.(filterParam).then(({ data }) => {
         setFiltersPayload(data);
         setLoadingFilters(false);
       });
@@ -176,14 +176,23 @@ export const SearchContextProvider = (props) => {
     toFilterValues
   )(allActiveFilters);
 
+  const [customSearchMust, setCustomSearchMust] = useState({});
+
   const searchMust = useMemo(
     () => ({
       ...defaultFilters,
       ...dateFilters,
       ...hiddenFilters,
       ..._.pickBy(_.negate(_.isEmpty))(allActiveFilters),
+      ...customSearchMust,
     }),
-    [allActiveFilters, defaultFilters, dateFilters, hiddenFilters]
+    [
+      allActiveFilters,
+      defaultFilters,
+      dateFilters,
+      hiddenFilters,
+      customSearchMust,
+    ]
   );
 
   const filterMust = useMemo(
@@ -207,7 +216,7 @@ export const SearchContextProvider = (props) => {
     [sortColumn, sortDirection]
   );
 
-  const { trigger: triggerFilters } = useFilters();
+  const triggerFilters = useFilters?.()?.trigger;
 
   useEffect(() => {
     setLoadingFilters(true);
@@ -337,6 +346,7 @@ export const SearchContextProvider = (props) => {
     toggleHiddenFilterValue,
     setHiddenFilters,
     searchMust,
+    setSearchMust: setCustomSearchMust,
     setQuery: setQueryAndScoreSort,
     cleanQuery,
     setAllActiveFilters,