@truedat/core 7.5.7 → 7.5.10

package/src/reducers/index.js

@@ -4,6 +4,8 @@ import { commentsResource } from "./commentsResource";
 import { coreMessage } from "./coreMessage";
 import { dashboardDomains } from "./dashboardDomains";
 import { sidebarVisible } from "./sidebarVisible";
+import { systems } from "./systems";
+import { systemsLoading } from "./systemsLoading";
 
 export {
   commentsLoading,
@@ -11,5 +13,7 @@ export {
   commentsResource,
   coreMessage,
   dashboardDomains,
-  sidebarVisible
+  sidebarVisible,
+  systems,
+  systemsLoading,
 };

package/src/reducers/systems.js

@@ -0,0 +1,19 @@
+import _ from "lodash/fp";
+import { fetchSystems, clearSystems } from "../routines";
+
+const initialState = [];
+
+const systems = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case fetchSystems.TRIGGER:
+      return initialState;
+    case clearSystems.TRIGGER:
+      return initialState;
+    case fetchSystems.SUCCESS:
+      return _.propOr([], "data")(payload);
+    default:
+      return state;
+  }
+};
+
+export { systems };

package/src/reducers/systemsLoading.js

@@ -0,0 +1,14 @@
+import { fetchSystems } from "../routines";
+
+const systemsLoading = (state = false, { type }) => {
+  switch (type) {
+    case fetchSystems.TRIGGER:
+      return true;
+    case fetchSystems.FULFILL:
+      return false;
+    default:
+      return state;
+  }
+};
+
+export { systemsLoading };

package/src/router/Loader.js

@@ -0,0 +1,10 @@
+import { Outlet } from "react-router";
+
+export default function Loader({ loaders, children }) {
+  return (
+    <>
+      {loaders}
+      {children ? children : <Outlet />}
+    </>
+  );
+}

package/src/router/ProtectedRoute.js

@@ -0,0 +1,11 @@
+import { Outlet } from "react-router";
+import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
+import Unauthorized from "@truedat/core/router/Unauthorized";
+
+export default function ProtectedRoute({ authorization, children }) {
+  const isAllowed = useAuthorized(authorization);
+  if (!isAllowed) {
+    return <Unauthorized />;
+  }
+  return children ? children : <Outlet />;
+}

package/src/router/Unauthorized.js

@@ -0,0 +1,16 @@
+import { useIntl } from "react-intl";
+import { Message } from "semantic-ui-react";
+
+export default function Unauthorized() {
+  const { formatMessage } = useIntl();
+  return (
+    <Message
+      icon="warning sign"
+      className="center"
+      header={formatMessage({ id: "view.unauthorized.head" })}
+      content={formatMessage({ id: "view.unauthorized.content" })}
+      attached="bottom"
+      visible
+    />
+  );
+}

package/src/router/__tests__/ProtectedRoute.spec.js

@@ -0,0 +1,49 @@
+import { render, waitForLoad } from "@truedat/test/render";
+import ProtectedRoute from "../ProtectedRoute";
+import { useAuthorized } from "@truedat/core/hooks/useAuthorized";
+
+// Mock the hooks module
+jest.mock("@truedat/core/hooks/useAuthorized", () => ({
+  useAuthorized: jest.fn(() => true),
+}));
+
+// Mock the Outlet component
+jest.mock("react-router", () => ({
+  ...jest.requireActual("react-router"),
+  Outlet: () => <div data-testid="outlet">Outlet Content</div>,
+}));
+
+describe("ProtectedRoute", () => {
+  it("renders unauthorized message when not authorized", async () => {
+    useAuthorized.mockReturnValueOnce(false);
+
+    const rendered = render(<ProtectedRoute authorization="some_permission" />);
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/view.unauthorized.head/i)).toBeInTheDocument();
+    expect(
+      rendered.getByText(/view.unauthorized.content/i),
+    ).toBeInTheDocument();
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders children when authorized and children are provided", async () => {
+    const rendered = render(
+      <ProtectedRoute authorization="some_permission">
+        <div>Protected Content</div>
+      </ProtectedRoute>,
+    );
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/protected content/i)).toBeInTheDocument();
+    expect(rendered.container).toMatchSnapshot();
+  });
+
+  it("renders outlet when authorized and no children are provided", async () => {
+    const rendered = render(<ProtectedRoute authorization="some_permission" />);
+    await waitForLoad(rendered);
+
+    expect(rendered.getByTestId("outlet")).toBeInTheDocument();
+    expect(rendered.container).toMatchSnapshot();
+  });
+});

package/src/router/__tests__/Unauthorized.spec.js

@@ -0,0 +1,15 @@
+import { render, waitForLoad } from "@truedat/test/render";
+import Unauthorized from "../Unauthorized";
+
+describe("Unauthorized", () => {
+  it("renders unauthorized message", async () => {
+    const rendered = render(<Unauthorized />);
+    await waitForLoad(rendered);
+
+    expect(rendered.getByText(/view.unauthorized.head/i)).toBeInTheDocument();
+    expect(
+      rendered.getByText(/view.unauthorized.content/i),
+    ).toBeInTheDocument();
+    expect(rendered.container).toMatchSnapshot();
+  });
+});

package/src/router/__tests__/__snapshots__/ProtectedRoute.spec.js.snap

@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ProtectedRoute renders children when authorized and children are provided 1`] = `
+<div>
+  <div>
+    Protected Content
+  </div>
+</div>
+`;
+
+exports[`ProtectedRoute renders outlet when authorized and no children are provided 1`] = `
+<div>
+  <div
+    data-testid="outlet"
+  >
+    Outlet Content
+  </div>
+</div>
+`;
+
+exports[`ProtectedRoute renders unauthorized message when not authorized 1`] = `
+<div>
+  <div
+    class="ui icon visible bottom attached message center"
+  >
+    <i
+      aria-hidden="true"
+      class="warning sign icon"
+    />
+    <div
+      class="content"
+    >
+      <div
+        class="header"
+      >
+        view.unauthorized.head
+      </div>
+      <p>
+        view.unauthorized.content
+      </p>
+    </div>
+  </div>
+</div>
+`;

package/src/router/__tests__/__snapshots__/Unauthorized.spec.js.snap

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Unauthorized renders unauthorized message 1`] = `
+<div>
+  <div
+    class="ui icon visible bottom attached message center"
+  >
+    <i
+      aria-hidden="true"
+      class="warning sign icon"
+    />
+    <div
+      class="content"
+    >
+      <div
+        class="header"
+      >
+        view.unauthorized.head
+      </div>
+      <p>
+        view.unauthorized.content
+      </p>
+    </div>
+  </div>
+</div>
+`;

package/src/router/index.js

@@ -0,0 +1,5 @@
+import ProtectedRoute from "./ProtectedRoute";
+import Loader from "./Loader";
+import Unauthorized from "./Unauthorized";
+
+export { ProtectedRoute, Unauthorized, Loader };

package/src/routes.js

@@ -97,10 +97,10 @@ export const HIERARCHY_CREATE = "/hierarchies/new";
 export const I18N = "/i18n";
 export const I18N_MESSAGES = "/i18n/messages";
 export const I18N_MESSAGES_NEW = "/i18n/messages/new";
-export const IMPLEMENTATION = "/implementations/:implementation_id(\\d+)";
+export const IMPLEMENTATION = "/implementations/:implementation_id";
 export const IMPLEMENTATIONS = "/implementations";
-export const IMPLEMENTATIONS_DEPRECATED = "/deprecatedImplementations";
-export const IMPLEMENTATIONS_PENDING = "/pendingImplementations";
+export const IMPLEMENTATIONS_DEPRECATED = "/implementations/deprecated";
+export const IMPLEMENTATIONS_PENDING = "/implementations/pending";
 export const IMPLEMENTATION_CLONE = "/implementations/:implementation_id/clone";
 export const IMPLEMENTATION_CONCEPT_LINKS =
   "/implementations/:implementation_id/links/concepts";
@@ -196,7 +196,7 @@ export const RESOURCE_MAPPINGS = "/resource_mappings";
 export const ROLE = "/roles/:id";
 export const ROLES = "/roles";
 export const ROLES_NEW = "/roles/new";
-export const RULE = "/rules/:id(\\d+)";
+export const RULE = "/rules/:id";
 export const RULES = "/rules";
 export const RULE_EDIT = "/rules/:id/edit";
 export const RULE_EVENTS = "/rules/:id/events";
@@ -271,7 +271,6 @@ export const TASK = "/reindex/:id";
 export const TEMPLATE = "/templates/:templateId";
 export const TEMPLATES = "/templates";
 export const TEMPLATES_NEW = "/templates/new";
-export const TEMPLATE_EDIT = "/templates/:id/edit";
 export const UNAUTHORIZED = "/unauthorized";
 export const USER = "/users/:id";
 export const USERS = "/users";
@@ -500,7 +499,6 @@ const routes = {
   TEMPLATE,
   TEMPLATES,
   TEMPLATES_NEW,
-  TEMPLATE_EDIT,
   UNAUTHORIZED,
   USER,
   USERS,
@@ -509,5 +507,7 @@ const routes = {
   USER_EDIT_PASSWORD,
 };
 
-export const linkTo = _.mapValues(compile)(routes);
+export const linkTo = _.mapValues(
+  (route) => (params) => compile(route)(_.mapValues((x) => `${x}`)(params))
+)(routes);
 export default routes;

package/src/routesTree.js

@@ -0,0 +1,93 @@
+import _ from "lodash/fp";
+
+const routes = [
+  "/",
+  {
+    i18n: [
+      "i18n",
+      {
+        messages: ["messages", { new: ["new"] }],
+      },
+    ],
+    roles: [
+      "roles",
+      {
+        new: ["new"],
+        ":id": [":id"],
+      },
+    ],
+  },
+];
+/**
+ * Returns the path for a given location based on the routes structure
+ * @param {string} location - A slash separated string representing the location (e.g. "i18n/messages")
+ * @returns {string} The path for the specified location
+ */
+export function path(location) {
+  if (!location) return "/";
+
+  const segments = _.flow(_.split("/"), _.filter(Boolean))(location);
+
+  if (_.isEmpty(segments)) return "/";
+
+  return _.flow(
+    () => routes[1],
+    (routeObj) =>
+      _.reduce((acc, segment) => {
+        if (acc === null || !acc[segment]) return null;
+
+        return acc[segment][1];
+      }, routeObj)(segments.slice(0, -1)),
+    (finalRouteObj) => {
+      if (finalRouteObj === null) return undefined;
+      const lastSegment = _.last(segments);
+      return finalRouteObj[lastSegment]
+        ? finalRouteObj[lastSegment][0]
+        : undefined;
+    }
+  )();
+}
+/**
+ * Returns the absolute path for a given location based on the routes structure
+ * @param {string} location - A slash separated string representing the location (e.g. "i18n/messages")
+ * @returns {string} The absolute path for the specified location, including all parent segments
+ */
+export function absolutePath(location) {
+  if (!location) return "/";
+
+  const segments = _.flow(_.split("/"), _.filter(Boolean))(location);
+
+  if (_.isEmpty(segments)) return "/";
+
+  let currentPath = "";
+  let currentRouteObj = routes[1];
+
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+
+    if (!currentRouteObj[segment]) return undefined;
+
+    currentPath += `/${currentRouteObj[segment][0]}`;
+
+    if (i < segments.length - 1) {
+      currentRouteObj = currentRouteObj[segment][1];
+      if (!currentRouteObj) return undefined;
+    }
+  }
+
+  return currentPath;
+}
+
+/**
+ * Returns the relative path for a given location based on the routes structure
+ * @param {string} location - A slash separated string representing the location (e.g. "i18n/messages")
+ * @returns {string} The relative path for the specified location, without the leading slash
+ */
+export function relativePath(location) {
+  const absolute = absolutePath(location);
+
+  if (!absolute) return undefined;
+  if (absolute === "/") return "";
+
+  return absolute.substring(1); // Remove the leading slash
+}

package/src/routines.js

@@ -31,3 +31,11 @@ export const logError = createRoutine("LOG_ERROR");
 
 export const reindexAllGrants = createRoutine("REINDEX_ALL_GRANTS");
 export const reindexAllStructures = createRoutine("REINDEX_ALL_STRUCTURES");
+
+export const clearNavFilter = createRoutine("CLEAR_BUCKET_FILTER");
+
+export const clearTemplates = createRoutine("CLEAR_TEMPLATES");
+export const fetchTemplates = createRoutine("FETCH_TEMPLATES");
+
+export const fetchSystems = createRoutine("FETCH_SYSTEMS");
+export const clearSystems = createRoutine("CLEAR_SYSTEMS");

package/src/sagas/__tests__/addComment.spec.js

@@ -17,9 +17,7 @@ describe("sagas: addCommentRequestSaga", () => {
 
   it("should throw exception if an unhandled action is received", () => {
     expect(() => {
-      testSaga(addCommentRequestSaga)
-        .next()
-        .takeLatest("FOO", addCommentSaga);
+      testSaga(addCommentRequestSaga).next().takeLatest("FOO", addCommentSaga);
     }).toThrow();
   });
 });
@@ -31,7 +29,7 @@ describe("sagas: addCommentSaga", () => {
   const data = {
     resource_id: id,
     resource_type: "business_concept",
-    content: comment
+    content: comment,
   };
   const payload = { comment: data };
 
@@ -59,7 +57,7 @@ describe("sagas: addCommentSaga", () => {
     const data = {
       resource_id: id,
       resource_type: "business_concept",
-      content: comment
+      content: comment,
     };
     const payload = { comment: data };
 

package/src/sagas/__tests__/fetchComments.spec.js

@@ -31,7 +31,7 @@ describe("sagas: fetchCommentsSaga", () => {
   const json_opts = { ...JSON_OPTS, params: payload };
   const data = [
     { content: "My first comment", resource_id: id },
-    { content: "My second comment", resource_id: id }
+    { content: "My second comment", resource_id: id },
   ];
 
   it("should put a success action when a response is returned", () => {

package/src/sagas/__tests__/fetchSystems.spec.js

@@ -0,0 +1,69 @@
+import { testSaga } from "redux-saga-test-plan";
+import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
+import { fetchSystemsRequestSaga, fetchSystemsSaga } from "../fetchSystems";
+import { fetchSystems } from "../../routines";
+import { API_SYSTEMS } from "../../api";
+
+describe("sagas: fetchSystemsRequestSaga", () => {
+  it("should invoke fetchSystemsSaga on trigger", () => {
+    expect(() => {
+      testSaga(fetchSystemsRequestSaga)
+        .next()
+        .takeLatest(fetchSystems.TRIGGER, fetchSystemsSaga)
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(fetchSystemsRequestSaga)
+        .next()
+        .takeLatest("FOO", fetchSystemsSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: fetchSystemsSaga", () => {
+  const data = {
+    collection: [
+      { id: 1, name: "Structure 1" },
+      { id: 2, name: "Structure 2" },
+    ],
+  };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(fetchSystemsSaga)
+        .next()
+        .put(fetchSystems.request())
+        .next()
+        .call(apiJson, API_SYSTEMS, JSON_OPTS)
+        .next({ data })
+        .put(fetchSystems.success(data))
+        .next()
+        .put(fetchSystems.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(fetchSystemsSaga)
+        .next()
+        .put(fetchSystems.request())
+        .next()
+        .call(apiJson, API_SYSTEMS, JSON_OPTS)
+        .throw(error)
+        .put(fetchSystems.failure(message))
+        .next()
+        .put(fetchSystems.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/fetchSystems.js

@@ -0,0 +1,25 @@
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
+import { fetchSystems } from "../routines";
+import { API_SYSTEMS } from "../api";
+
+export function* fetchSystemsSaga() {
+  try {
+    yield put(fetchSystems.request());
+    const { data } = yield call(apiJson, API_SYSTEMS, JSON_OPTS);
+    yield put(fetchSystems.success(data));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(fetchSystems.failure({ status, data }));
+    } else {
+      yield put(fetchSystems.failure(error.message));
+    }
+  } finally {
+    yield put(fetchSystems.fulfill());
+  }
+}
+
+export function* fetchSystemsRequestSaga() {
+  yield takeLatest(fetchSystems.TRIGGER, fetchSystemsSaga);
+}

package/src/sagas/index.js

@@ -1,15 +1,18 @@
 import { fetchCommentsRequestSaga } from "./fetchComments";
 import { addCommentRequestSaga } from "./addComment";
 import { reindexAllRequestSaga } from "./reindexAll";
+import { fetchSystemsRequestSaga } from "./fetchSystems";
 
 export {
   fetchCommentsRequestSaga,
   addCommentRequestSaga,
   reindexAllRequestSaga,
+  fetchSystemsRequestSaga,
 };
 
 export default [
   fetchCommentsRequestSaga(),
   addCommentRequestSaga(),
   reindexAllRequestSaga(),
+  fetchSystemsRequestSaga(),
 ];

package/src/search/FilterDropdown.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { FormattedMessage } from "react-intl";
 import { Label, Icon, Dropdown, Dimmer, Loader } from "semantic-ui-react";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";

package/src/search/FilterItem.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { Icon, Dropdown } from "semantic-ui-react";

package/src/search/FilterMultilevelDropdown.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { FormattedMessage } from "react-intl";
 import {
   Label,

package/src/search/FilterQueryDropdown.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { FormattedMessage } from "react-intl";
 import {
   Label,
@@ -88,52 +88,48 @@ export default function FilterQueryDropdown() {
       open={!_.isEmpty(options)}
     >
       <Dimmer.Dimmable as={Dropdown.Menu} dimmed={loading}>
-        <>
-          <>
-            <Input
-              icon="search"
-              iconPosition="left"
-              className="search"
-              onKeyDown={(e) => {
-                if (e.key === " ") {
-                  e.stopPropagation();
-                }
-              }}
-              onChange={handleSearch}
-              value={localQuery}
-              onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-              }}
-            />
-            {selected.map((option, i) => (
-              <FilterItem
-                key={i}
-                filter={filter}
-                toggleFilterValue={toggleFilterValue}
-                option={option}
-                active={true}
-              />
-            ))}
-            <Dropdown.Divider />
-            {filteredOptions.map((option, i) => (
-              <FilterItem
-                key={i}
-                filter={filter}
-                toggleFilterValue={toggleFilterValue}
-                option={option}
-                active={_.includes(_.prop("value")(option))(
-                  activeFilterSelectedValues
-                )}
-              />
-            ))}
-          </>
-        </>
         {loading && (
           <Dimmer active inverted>
             <Loader size="tiny" />
           </Dimmer>
         )}
+        <Input
+          icon="search"
+          iconPosition="left"
+          className="search"
+          onKeyDown={(e) => {
+            if (e.key === " ") {
+              e.stopPropagation();
+            }
+          }}
+          onChange={handleSearch}
+          value={localQuery}
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+          }}
+        />
+        {selected.map((option, i) => (
+          <FilterItem
+            key={i}
+            filter={filter}
+            toggleFilterValue={toggleFilterValue}
+            option={option}
+            active={true}
+          />
+        ))}
+        <Dropdown.Divider />
+        {filteredOptions.map((option, i) => (
+          <FilterItem
+            key={i}
+            filter={filter}
+            toggleFilterValue={toggleFilterValue}
+            option={option}
+            active={_.includes(_.prop("value")(option))(
+              activeFilterSelectedValues
+            )}
+          />
+        ))}
       </Dimmer.Dimmable>
     </Dropdown>
   );