@truedat/dq 8.1.1 → 8.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "8.1.1",
+  "version": "8.1.4",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -53,7 +53,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.1.1",
+    "@truedat/test": "8.1.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -86,5 +86,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "26ff4767ae2a60605d4958208ca73d91cfe7f81a"
+  "gitHead": "49d0d43e081d0f631f221d8f5992e390098b3630"
 }

package/src/components/Implementations.js

@@ -1,7 +1,14 @@
-import { lazy } from "react";
+import { useActiveRoute } from "@truedat/core/hooks";
+import { useParams } from "react-router";
+import { useSelector } from "react-redux";
 import PropTypes from "prop-types";
 import { Segment } from "semantic-ui-react";
 import { SearchContextProvider } from "@truedat/core/search/SearchContext";
+import { getRiSubscopes } from "@truedat/core/selectors";
+import {
+  IMPLEMENTATIONS,
+  IMPLEMENTATIONS_BY_SUBSCOPE
+} from "@truedat/core/routes";
 import {
   useRuleImplementationFilters,
   useRuleImplementationSearch,
@@ -12,6 +19,27 @@ import ImplementationFiltersLoader from "./ImplementationFiltersLoader";
 import ImplementationSearchResults from "./ImplementationSearchResults";
 
 export const Implementations = ({ defaultFilters }) => {
+  const { subscope } = useParams();
+  const isImplementations=useActiveRoute(IMPLEMENTATIONS)
+  const isImplementationsBySubscope=useActiveRoute(IMPLEMENTATIONS_BY_SUBSCOPE)
+  const riSubscopes = useSelector(getRiSubscopes);
+
+  let filtersWithSubscope = { ...defaultFilters };
+  
+  if (isImplementations && riSubscopes && riSubscopes.length > 0){
+    const mustNotFilters = {};
+    mustNotFilters[`mustnot.template.subscope`] = riSubscopes;
+
+    filtersWithSubscope = {
+      ...defaultFilters,
+      ...mustNotFilters
+    };
+  }
+  else if (isImplementationsBySubscope){
+    filtersWithSubscope = { ...defaultFilters, "template.subscope": [subscope] };
+  }
+ 
+
   const searchProps = {
     initialSortColumn: "implementation_key.raw",
     initialSortDirection: "ascending",
@@ -20,17 +48,17 @@ export const Implementations = ({ defaultFilters }) => {
     pageSize: 20,
     userFiltersType: "user_search_filters",
     userFilterScope: "rule_implementation",
-    defaultFilters,
+    defaultFilters: filtersWithSubscope,
   };
 
   return (
     <>
       <SearchContextProvider {...searchProps}>
-        <ImplementationFiltersLoader defaultFilters={defaultFilters} />
+        <ImplementationFiltersLoader defaultFilters={filtersWithSubscope} />
         <Segment>
           <ImplementationsHeader />
           <Segment attached="bottom">
-            <ImplementationSearchResults defaultFilters={defaultFilters} />
+            <ImplementationSearchResults defaultFilters={filtersWithSubscope} />
           </Segment>
         </Segment>
       </SearchContextProvider>
@@ -42,4 +70,4 @@ Implementations.propTypes = {
   defaultFilters: PropTypes.object,
 };
 
-export default Implementations;
+export default Implementations;

package/src/components/ImplementationsHeader.js

@@ -1,25 +1,62 @@
 import { Header, Icon } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useActiveRoute } from "@truedat/core/hooks";
+import { useLocation } from "react-router";
 import {
   IMPLEMENTATIONS_PENDING,
   IMPLEMENTATIONS_DEPRECATED,
+  IMPLEMENTATIONS_BY_SUBSCOPE,
 } from "@truedat/core/routes";
+import { useMemo } from "react";
 
 export const ImplementationSearchResultsHeader = () => {
   const { formatMessage } = useIntl();
+  const location = useLocation();
   const pending = useActiveRoute(IMPLEMENTATIONS_PENDING);
   const deprecated = useActiveRoute(IMPLEMENTATIONS_DEPRECATED);
-  const header = pending
-    ? "implementations.header.manage"
-    : deprecated
-      ? "implementations.header.deprecated"
-      : "implementations.header";
-  const subheader = pending
-    ? "implementations.subheader.manage"
-    : deprecated
-      ? "implementations.subheader.deprecated"
-      : "implementations.subheader";
+
+  const { header, subheader } = useMemo(() => {
+    // Check if current URL is a subscope URL
+    const pathParts = location.pathname.split('/');
+    const isSubscopeUrl = pathParts.includes('subscope') && pathParts.length > 2;
+    
+    if (isSubscopeUrl) {
+      const subscopeIndex = pathParts.indexOf('subscope');
+      const subscopeName = pathParts[subscopeIndex + 1];
+      
+      if (subscopeName) {
+        const decodedName = decodeURIComponent(subscopeName);
+        const normalizedSubscopeName = decodedName
+          .replace(/\s+/g, '_')
+          .replace(/[^\w_]/g, '');
+        
+        return {
+          header: `implementations.${normalizedSubscopeName}.main.header`,
+          subheader: `implementations.${normalizedSubscopeName}.main.subheader`
+        };
+      }
+    }
+
+    if (pending) {
+      return {
+        header: "implementations.header.manage",
+        subheader: "implementations.subheader.manage"
+      };
+    }
+
+    if (deprecated) {
+      return {
+        header: "implementations.header.deprecated",
+        subheader: "implementations.subheader.deprecated"
+      };
+    }
+
+    return {
+      header: "implementations.header",
+      subheader: "implementations.subheader"
+    };
+  }, [location.pathname, pending, deprecated]);
+
   return (
     <Header as="h2">
       <Icon
@@ -30,13 +67,19 @@ export const ImplementationSearchResultsHeader = () => {
         })}
       />
       <Header.Content>
-        <FormattedMessage id={header} />
+        <FormattedMessage 
+          id={header} 
+          defaultMessage={header} 
+        />
         <Header.Subheader>
-          <FormattedMessage id={subheader} />
+          <FormattedMessage 
+            id={subheader} 
+            defaultMessage={subheader}
+          />
         </Header.Subheader>
       </Header.Content>
     </Header>
   );
 };
 
-export default ImplementationSearchResultsHeader;
+export default ImplementationSearchResultsHeader;

package/src/components/ImplementationsRoutes.js

@@ -26,6 +26,7 @@ import {
   IMPLEMENTATION_STRUCTURES,
   IMPLEMENTATION,
   IMPLEMENTATIONS,
+  IMPLEMENTATIONS_BY_SUBSCOPE,
   IMPLEMENTATIONS_DEPRECATED,
   IMPLEMENTATIONS_PENDING,
 } from "@truedat/core/routes";
@@ -51,8 +52,8 @@ import RuleResultDetails from "./RuleResultDetails";
 import RuleResultRemediationLoader from "./RuleResultRemediationLoader";
 import RuleResultsRoutes from "./RuleResultsRoutes";
 import RuleSubscriptionLoader from "./RuleSubscriptionLoader";
-import ImplementationsUploadJobs from "./ImplementationsUploadJobs";
-import ImplementationsUploadJob from "./ImplementationsUploadJob";
+import UploadJobs from "@truedat/core/components/UploadJobs";
+import UploadJob from "@truedat/core/components/UploadJob";
 
 const TemplatesLoader = React.lazy(
   () => import("@truedat/core/components/TemplatesLoader")
@@ -110,8 +111,8 @@ export const ImplementationsRoutes = ({
         // IMPLEMENTATIONS_UPLOAD_JOBS = "/implementations/uploadJobs";
         path="/uploadJobs"
       >
-        <Route index element={<ImplementationsUploadJobs />} />
-        <Route path=":id" element={<ImplementationsUploadJob />} />
+        <Route index element={<UploadJobs scope="implementations" />} />
+        <Route path=":id" element={<UploadJob scope="implementations" />} />
       </Route>
 
       <Route
@@ -125,6 +126,13 @@ export const ImplementationsRoutes = ({
           />
         }
       />
+      <Route
+        // IMPLEMENTATIONS_BY_SUBSCOPE = "/implementations/subscope/:subscope";
+        path="/subscope/:subscope"
+        element={
+          <Implementations defaultFilters={{ status: ["published"] }} />
+        }
+      />
       <Route
         // IMPLEMENTATIONS_DEPRECATED = "/implementations/deprecated";
         path="deprecated"
@@ -281,8 +289,8 @@ export const ImplementationsRoutes = ({
                 />
               ) : null}
               {!structuresAliasesLoading &&
-              ruleImplementationLoaded &&
-              implementationStructuresLoaded ? (
+                ruleImplementationLoaded &&
+                implementationStructuresLoaded ? (
                 isRuleImplemenationBasic ? (
                   <NewBasicRuleImplementation edition clone />
                 ) : (
@@ -308,8 +316,8 @@ export const ImplementationsRoutes = ({
                 />
               ) : null}
               {!structuresAliasesLoading &&
-              ruleImplementationLoaded &&
-              implementationStructuresLoaded ? (
+                ruleImplementationLoaded &&
+                implementationStructuresLoaded ? (
                 isRuleImplemenationBasic ? (
                   <NewBasicRuleImplementation edition />
                 ) : (
@@ -335,8 +343,8 @@ export const ImplementationsRoutes = ({
                 />
               ) : null}
               {!structuresAliasesLoading &&
-              ruleImplementationLoaded &&
-              implementationStructuresLoaded ? (
+                ruleImplementationLoaded &&
+                implementationStructuresLoaded ? (
                 <NewRuleImplementation edition implementationType="default" />
               ) : null}
             </>
@@ -358,8 +366,8 @@ export const ImplementationsRoutes = ({
                 />
               ) : null}
               {!structuresAliasesLoading &&
-              ruleImplementationLoaded &&
-              implementationStructuresLoaded ? (
+                ruleImplementationLoaded &&
+                implementationStructuresLoaded ? (
                 <NewRuleImplementation edition implementationType="raw" />
               ) : null}
             </>

package/src/components/RuleImplementationsDownloadXlsx.js

@@ -25,14 +25,12 @@ export const RuleImplementationsDownloadXlsx = () => {
     <Dropdown.Item
       icon="download"
       content={
-        <>
-          <span>
+           <span>
             {formatMessage({
               id: "implementations.actions.downloadXlsx.tooltip",
             })}
           </span>
-        </>
-      }
+       }
       onClick={() =>
         triggerDownload({
           ...searchParams,

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

@@ -54,7 +54,9 @@ exports[`<ImplementationSearchResults /> matches the latest snapshot 1`] = `
               aria-hidden="true"
               class="download icon"
             />
-            <span>
+            <span
+              class="text"
+            >
               implementations.actions.downloadXlsx.tooltip
             </span>
           </div>
@@ -205,7 +207,9 @@ exports[`<ImplementationSearchResults /> renders executions on when executionEna
               aria-hidden="true"
               class="download icon"
             />
-            <span>
+            <span
+              class="text"
+            >
               implementations.actions.downloadXlsx.tooltip
             </span>
           </div>

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

@@ -56,7 +56,9 @@ exports[`<Implementations /> matches the latest snapshot 1`] = `
                   aria-hidden="true"
                   class="download icon"
                 />
-                <span>
+                <span
+                  class="text"
+                >
                   implementations.actions.downloadXlsx.tooltip
                 </span>
               </div>

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

@@ -66,7 +66,9 @@ exports[`<RuleImplementationsActions /> matches the latest snapshot 1`] = `
             aria-hidden="true"
             class="download icon"
           />
-          <span>
+          <span
+            class="text"
+          >
             implementations.actions.downloadXlsx.tooltip
           </span>
         </div>

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

@@ -25,7 +25,9 @@ exports[`<RuleImplementationsOptions /> matches the latest snapshot 1`] = `
           aria-hidden="true"
           class="download icon"
         />
-        <span>
+        <span
+          class="text"
+        >
           implementations.actions.downloadXlsx.tooltip
         </span>
       </div>

package/src/components/ImplementationUploadJobBreadcrumbs.js

@@ -1,25 +0,0 @@
-import PropTypes from "prop-types";
-import { Breadcrumb } from "semantic-ui-react";
-import { Link } from "react-router";
-import { FormattedMessage } from "react-intl";
-import { IMPLEMENTATIONS_UPLOAD_JOBS } from "@truedat/core/routes";
-
-export const ImplementationUploadJobBreadcrumbs = ({ filename }) => (
-  <Breadcrumb>
-    <Breadcrumb.Section as={Link} to={IMPLEMENTATIONS_UPLOAD_JOBS}>
-      <FormattedMessage id="sidemenu.implementations_upload_jobs" />
-    </Breadcrumb.Section>
-    {filename ? (
-      <>
-        <Breadcrumb.Divider icon="right angle" />
-        <Breadcrumb.Section active>{filename}</Breadcrumb.Section>
-      </>
-    ) : null}
-  </Breadcrumb>
-);
-
-ImplementationUploadJobBreadcrumbs.propTypes = {
-  filename: PropTypes.string,
-};
-
-export default ImplementationUploadJobBreadcrumbs;

package/src/components/ImplementationsUploadJob.js

@@ -1,217 +0,0 @@
-import _ from "lodash/fp";
-import { useState } from "react";
-import {
-  Header,
-  Icon,
-  Segment,
-  Dimmer,
-  Loader,
-  Table,
-  Label,
-  Button,
-} from "semantic-ui-react";
-import { FormattedMessage, useIntl } from "react-intl";
-import { useParams } from "react-router";
-import { DateTime } from "@truedat/core/components";
-import { useImplementationsUploadJob } from "../hooks/useImplementations";
-import { StatusPill, ResponseCell } from "./implementationsUploadJobParser";
-import ImplementationUploadJobBreadcrumbs from "./ImplementationUploadJobBreadcrumbs";
-
-export default function ImplementationsUploadJob() {
-  const { id } = useParams();
-  const { data, loading } = useImplementationsUploadJob(id);
-  const job = data?.data;
-
-  const { formatMessage } = useIntl();
-  const [expandedGroups, setExpandedGroups] = useState({});
-
-  // Group events by status
-  const groupedEvents = job?.events ? _.groupBy("status", job.events) : {};
-
-  const toggleGroup = (status) => {
-    setExpandedGroups((prev) => ({
-      ...prev,
-      [status]: !prev[status],
-    }));
-  };
-
-  const renderEventGroup = (status, events) => {
-    const isExpanded = expandedGroups[status];
-    const shouldCollapse = status === "INFO" || status === "ERROR";
-
-    if (!shouldCollapse) {
-      // Render non-collapsible events normally
-      return events.map((event, idx) => (
-        <Table.Row key={`${status}-${idx}`}>
-          <Table.Cell>
-            <StatusPill status={event.status} />
-          </Table.Cell>
-          <Table.Cell>
-            <DateTime value={event.inserted_at} />
-          </Table.Cell>
-          <Table.Cell>
-            <ResponseCell {...event} />
-          </Table.Cell>
-        </Table.Row>
-      ));
-    }
-
-    // Render collapsible groups for INFO and ERROR
-    const groupRows = [];
-
-    // Add group header row
-    groupRows.push(
-      <Table.Row
-        key={`${status}-header`}
-        style={{ backgroundColor: "#f8f9fa" }}
-      >
-        <Table.Cell>
-          <Button
-            basic
-            size="mini"
-            icon={isExpanded ? "chevron down" : "chevron right"}
-            content={` ${formatMessage({ id: `implementations.bulkUpload.event.status.${status}` })} (${events.length})`}
-            onClick={() => toggleGroup(status)}
-            style={{ padding: "0.5em" }}
-          />
-        </Table.Cell>
-        <Table.Cell>
-          <DateTime value={events[0]?.inserted_at} />
-        </Table.Cell>
-        <Table.Cell></Table.Cell>
-      </Table.Row>
-    );
-
-    // Add expanded events if group is expanded
-    if (isExpanded) {
-      events.forEach((event, idx) => {
-        groupRows.push(
-          <Table.Row key={`${status}-${idx}`} style={{ paddingLeft: "2em" }}>
-            <Table.Cell style={{ paddingLeft: "2em" }}>
-              <StatusPill status={event.status} />
-            </Table.Cell>
-            <Table.Cell>
-              <DateTime value={event.inserted_at} />
-            </Table.Cell>
-            <Table.Cell>
-              <ResponseCell {...event} />
-            </Table.Cell>
-          </Table.Row>
-        );
-      });
-    }
-
-    return groupRows;
-  };
-
-  return (
-    <>
-      <ImplementationUploadJobBreadcrumbs filename={job?.filename} />
-      <Segment>
-        <Header as="h2">
-          <Icon
-            circular
-            name={formatMessage({
-              id: "implementations.bulkUpload.job.header.icon",
-              defaultMessage: "cogs",
-            })}
-          />
-          <Header.Content>
-            <FormattedMessage id="implementations.bulkUpload.job.header" />
-          </Header.Content>
-        </Header>
-        <Dimmer.Dimmable dimmed={loading}>
-          <Segment attached="bottom">
-            {job ? (
-              <>
-                <div
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    gap: "1.5em",
-                    marginBottom: "1.5em",
-                    flexWrap: "wrap",
-                  }}
-                >
-                  <div style={{ display: "flex", flexDirection: "column" }}>
-                    <span style={{ fontWeight: 600, fontSize: "1.3em" }}>
-                      {job.filename}
-                    </span>
-                    <span style={{ color: "gray", fontSize: "0.7em" }}>
-                      {job.hash}
-                    </span>
-                  </div>
-                  <span>
-                    <Label basic size="small" style={{ marginRight: 4 }}>
-                      <FormattedMessage
-                        id="implementations.bulkUpload.job.table.status"
-                        defaultMessage="Status"
-                      />
-                    </Label>
-                    <StatusPill status={job.latest_status} />
-                  </span>
-                  <span>
-                    <Label basic size="small" style={{ marginRight: 4 }}>
-                      <FormattedMessage
-                        id="implementations.bulkUpload.job.table.inserted_at"
-                        defaultMessage="Inserted At"
-                      />
-                    </Label>
-                    <DateTime value={job.latest_event_at} />
-                  </span>
-                </div>
-                <Table>
-                  <Table.Header>
-                    <Table.Row>
-                      <Table.HeaderCell>
-                        <FormattedMessage
-                          id="implementations.bulkUpload.job.table.status"
-                          defaultMessage="Status"
-                        />
-                      </Table.HeaderCell>
-                      <Table.HeaderCell>
-                        <FormattedMessage
-                          id="implementations.bulkUpload.job.table.inserted_at"
-                          defaultMessage="Inserted At"
-                        />
-                      </Table.HeaderCell>
-                      <Table.HeaderCell>
-                        <FormattedMessage
-                          id="implementations.bulkUpload.job.table.detail"
-                          defaultMessage="Detail"
-                        />
-                      </Table.HeaderCell>
-                    </Table.Row>
-                  </Table.Header>
-                  <Table.Body>
-                    {_.isArray(job.events) && !_.isEmpty(job.events) ? (
-                      Object.entries(groupedEvents)
-                        .map(([status, events]) =>
-                          renderEventGroup(status, events)
-                        )
-                        .flat()
-                    ) : (
-                      <Table.Row>
-                        <Table.Cell colSpan={3}>
-                          <FormattedMessage
-                            id="implementations.bulkUpload.job.table.no_events"
-                            defaultMessage="No events found."
-                          />
-                        </Table.Cell>
-                      </Table.Row>
-                    )}
-                  </Table.Body>
-                </Table>
-              </>
-            ) : null}
-            {loading ? (
-              <Dimmer active inverted>
-                <Loader />
-              </Dimmer>
-            ) : null}
-          </Segment>
-        </Dimmer.Dimmable>
-      </Segment>
-    </>
-  );
-}