@truedat/bg 8.13.4 → 8.13.6

package/src/concepts/components/__tests__/ConceptForm.spec.js

@@ -1,7 +1,7 @@
 import { waitFor } from "@testing-library/react";
 import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock, multipleTemplatesMock } from "@truedat/test/mocks";
-import ConceptForm from "../ConceptForm";
+import ConceptForm, { conceptHasDateRestrictionErrors } from "../ConceptForm";
 
 jest.mock("@truedat/ai/hooks/useSuggestions", () => {
   const originalModule = jest.requireActual("@truedat/ai/hooks/useSuggestions");
@@ -76,7 +76,103 @@ const props = {
 const templateVariables = { scope: "bg", domainIds: [1] };
 const domainVariables = { action: "createBusinessConcept" };
 
+const dateTemplate = {
+  content: [
+    {
+      name: "dates",
+      fields: [
+        {
+          name: "fecha",
+          type: "date",
+          restrictions: { resolved: { min: null, max: "2026-10-15" } },
+        },
+      ],
+    },
+  ],
+};
+
+const savedConcept = {
+  en: { content: { fecha: { value: "2026-10-16", origin: "user" } } },
+};
+
 describe("<ConceptForm />", () => {
+  it("allows an unchanged existing date outside the latest restriction", () => {
+    expect(
+      conceptHasDateRestrictionErrors(
+        dateTemplate,
+        {
+          en: {
+            name: "Updated name",
+            content: { fecha: { value: "2026-10-16", origin: "user" } },
+          },
+        },
+        savedConcept,
+      ),
+    ).toBe(false);
+  });
+
+  it("rejects a modified date outside the latest restriction", () => {
+    expect(
+      conceptHasDateRestrictionErrors(
+        dateTemplate,
+        { en: { content: { fecha: { value: "2026-10-17", origin: "user" } } } },
+        savedConcept,
+      ),
+    ).toBe(true);
+  });
+
+  it("does not exempt a new language using another language's saved date", () => {
+    expect(
+      conceptHasDateRestrictionErrors(
+        dateTemplate,
+        {
+          ...savedConcept,
+          es: { content: { fecha: { value: "2026-10-16", origin: "user" } } },
+        },
+        savedConcept,
+      ),
+    ).toBe(true);
+  });
+
+  it("detects an invalid date so Save can be disabled", () => {
+    const template = {
+      content: [
+        {
+          name: "dates",
+          fields: [
+            {
+              name: "fecha",
+              type: "date",
+              restrictions: {
+                resolved: { min: null, max: "2026-10-15" },
+              },
+            },
+          ],
+        },
+      ],
+    };
+
+    expect(
+      conceptHasDateRestrictionErrors(template, {
+        en: {
+          content: {
+            fecha: { value: "2026-10-16", origin: "user" },
+          },
+        },
+      }),
+    ).toBe(true);
+
+    expect(
+      conceptHasDateRestrictionErrors(template, {
+        en: {
+          content: {
+            fecha: { value: "2026-10-15", origin: "user" },
+          },
+        },
+      }),
+    ).toBe(false);
+  });
+
   describe("with multiple templates", () => {
     const renderOpts = {
       mocks: [

package/src/concepts/components/__tests__/ConceptRoutes.spec.js

@@ -7,7 +7,7 @@ import {
   CONCEPTS_DEPRECATED,
   CONCEPTS_NEW,
   CONCEPTS_BULK_UPDATE,
-  CONCEPTS_BULK_UPLOAD_EVENTS,
+  CONCEPTS_UPLOAD_JOBS,
   CONCEPT_LINKS_MANAGEMENT,
   CONCEPT_VERSION,
   CONCEPT_EDIT,
@@ -35,8 +35,11 @@ jest.mock("../ConceptsBulkUpdate", () => () => <div>ConceptsBulkUpdate</div>);
 jest.mock("../ConceptSubscriptionLoader", () => () => (
   <div>ConceptSubscriptionLoader</div>
 ));
-jest.mock("../ConceptsUploadEvents", () => () => (
-  <div>ConceptsUploadEvents</div>
+jest.mock("@truedat/core/components/UploadJobs", () => () => (
+  <div>UploadJobs</div>
+));
+jest.mock("@truedat/core/components/UploadJob", () => () => (
+  <div>UploadJob</div>
 ));
 jest.mock("../../relations/components/ConceptLinksApprovals", () => () => (
   <div>ConceptLinksApprovals</div>
@@ -106,9 +109,9 @@ describe("<ConceptRoutes />", () => {
     expect(rendered.container).toMatchSnapshot();
   });
 
-  it("renders correctly with bulk upload events route", async () => {
+  it("renders correctly with upload jobs route", async () => {
     const rendered = render(<ConceptRoutes />, {
-      routes: [CONCEPTS_BULK_UPLOAD_EVENTS],
+      routes: [CONCEPTS_UPLOAD_JOBS],
     });
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
@@ -149,10 +152,12 @@ describe("<ConceptRoutes />", () => {
       state: {
         concept: { business_concept_id: "123" },
         templatesLoading: false,
-        templates: { some: "template" },
+        templates: [],
       },
     });
     await waitForLoad(rendered);
+    expect(rendered.getByText("ConceptEdit")).toBeInTheDocument();
+    expect(rendered.queryByText("TemplatesLoader")).not.toBeInTheDocument();
     expect(rendered.container).toMatchSnapshot();
   });
 

package/src/concepts/components/__tests__/__snapshots__/ConceptRoutes.spec.js.snap

@@ -14,22 +14,11 @@ exports[`<ConceptRoutes /> renders correctly with bulk update route 1`] = `
 </div>
 `;
 
-exports[`<ConceptRoutes /> renders correctly with bulk upload events route 1`] = `
-<div>
-  <div>
-    ConceptsUploadEvents
-  </div>
-</div>
-`;
-
 exports[`<ConceptRoutes /> renders correctly with concept edit route 1`] = `
 <div>
   <div>
     ConceptCrumbs
   </div>
-  <div>
-    TemplatesLoader
-  </div>
   <div>
     ConceptLoader
   </div>
@@ -139,6 +128,14 @@ exports[`<ConceptRoutes /> renders correctly with subscope route 1`] = `
 </div>
 `;
 
+exports[`<ConceptRoutes /> renders correctly with upload jobs route 1`] = `
+<div>
+  <div>
+    UploadJobs
+  </div>
+</div>
+`;
+
 exports[`<ConceptRoutes /> renders unauthorized component when not authorized 1`] = `
 <div>
   <div

package/src/concepts/hooks/useConcepts.js

@@ -1,7 +1,12 @@
 import useSWR from "swr";
 import useSWRMutations from "swr/mutation";
 import FileSaver from "file-saver";
-import { apiJson, apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  apiJson,
+  apiJsonPost,
+  JSON_OPTS,
+  UPLOAD_JSON_OPTS,
+} from "@truedat/core/services/api";
 
 import {
   API_CONCEPT_SUGGESTIONS,
@@ -9,7 +14,7 @@ import {
   API_CONCEPT_LINKS_DOWNLOAD,
   API_BUSINESS_CONCEPT_VERSIONS_SEARCH,
   API_BUSINESS_CONCEPT_VERSIONS_ACTIONS,
-  API_BUSINESS_CONCEPT_VERSIONS_UPLOAD,
+  API_BUSINESS_CONCEPTS_XLSX_UPLOAD,
   API_CONCEPT_LINKS_UPLOAD,
 } from "../api";
 
@@ -58,8 +63,8 @@ export const useConceptLinksDownload = () => {
 };
 
 export const useConceptsUpload = () => {
-  return useSWRMutations(API_BUSINESS_CONCEPT_VERSIONS_UPLOAD, (url, { arg }) =>
-    apiJsonPost(url, arg),
+  return useSWRMutations(API_BUSINESS_CONCEPTS_XLSX_UPLOAD, (url, { arg }) =>
+    apiJsonPost(url, arg, UPLOAD_JSON_OPTS),
   );
 };
 

package/src/concepts/sagas/__tests__/downloadConcepts.spec.js

@@ -6,7 +6,7 @@ import {
   saveFile,
 } from "../downloadConcepts";
 import { downloadConcepts } from "../../routines";
-import { API_BUSINESS_CONCEPT_VERSIONS_XLSX } from "../../api";
+import { API_BUSINESS_CONCEPTS_XLSX_DOWNLOAD } from "../../api";
 
 describe("sagas: downloadConceptsRequestSaga", () => {
   it("should invoke downloadConceptsSaga on downloadConcepts.TRIGGER", () => {
@@ -52,7 +52,7 @@ describe("sagas: downloadConceptsSaga", () => {
         .next()
         .put(downloadConcepts.request(body))
         .next()
-        .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_XLSX, body, {
+        .call(apiJsonPost, API_BUSINESS_CONCEPTS_XLSX_DOWNLOAD, body, {
           ...JSON_OPTS,
           responseType: "blob",
         })
@@ -76,7 +76,7 @@ describe("sagas: downloadConceptsSaga", () => {
         .next()
         .put(downloadConcepts.request(body))
         .next()
-        .call(apiJsonPost, API_BUSINESS_CONCEPT_VERSIONS_XLSX, body, {
+        .call(apiJsonPost, API_BUSINESS_CONCEPTS_XLSX_DOWNLOAD, body, {
           ...JSON_OPTS,
           responseType: "blob",
         })

package/src/concepts/sagas/downloadConcepts.js

@@ -4,7 +4,7 @@ import { call, put, takeLatest } from "redux-saga/effects";
 import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
 import { CONCEPT_VERSION } from "@truedat/core/routes";
 import { downloadConcepts } from "../routines";
-import { API_BUSINESS_CONCEPT_VERSIONS_XLSX } from "../api";
+import { API_BUSINESS_CONCEPTS_XLSX_DOWNLOAD } from "../api";
 
 export function saveFile({ data, headers }) {
   const contentDisposition = headers["content-disposition"];
@@ -25,7 +25,7 @@ export function* downloadConceptsSaga({ payload }) {
       lang,
       ...searchParams,
     };
-    const url = API_BUSINESS_CONCEPT_VERSIONS_XLSX;
+    const url = API_BUSINESS_CONCEPTS_XLSX_DOWNLOAD;
     yield put(downloadConcepts.request(body));
     const { data, headers } = yield call(apiJsonPost, url, body, {
       ...JSON_OPTS,

package/src/concepts/selectors/__tests__/messages.spec.js

@@ -0,0 +1,63 @@
+import {
+  getConceptsUploadAlertMessage,
+  getUploadAlertMessage,
+} from "../messages";
+
+describe("getUploadAlertMessage", () => {
+  it("returns a success alert for status 200", () => {
+    expect(getUploadAlertMessage({ status: 200, data: {} })).toMatchObject({
+      error: false,
+      header: "concepts.upload.success.accepted.header",
+    });
+  });
+
+  it("returns a success alert for status 202", () => {
+    expect(getUploadAlertMessage({ status: 202, data: {} })).toMatchObject({
+      error: false,
+      header: "concepts.upload.success.accepted.header",
+    });
+  });
+
+  it("returns a failure alert for other statuses", () => {
+    expect(getUploadAlertMessage({ status: 422, data: {} })).toMatchObject({
+      error: true,
+    });
+  });
+});
+
+describe("getConceptsUploadAlertMessage", () => {
+  it("links to the created job detail on success with job_id", () => {
+    expect(
+      getConceptsUploadAlertMessage({
+        status: 200,
+        data: { job_id: 123 },
+      }),
+    ).toMatchObject({
+      error: false,
+      anchor: {
+        reference: "/concepts/uploadJobs/123",
+        label: "uploadJob.concepts.header",
+      },
+    });
+  });
+
+  it("keeps the upload jobs list anchor when there is no job_id", () => {
+    expect(
+      getConceptsUploadAlertMessage({ status: 202, data: {} }),
+    ).toMatchObject({
+      error: false,
+      anchor: {
+        reference: "/concepts/uploadJobs",
+        label: "sidemenu.concepts_upload_events",
+      },
+    });
+  });
+
+  it("returns a failure alert untouched when the upload fails", () => {
+    expect(
+      getConceptsUploadAlertMessage({ status: 422, data: {} }),
+    ).toMatchObject({
+      error: true,
+    });
+  });
+});

package/src/concepts/selectors/index.js

@@ -1,9 +1,5 @@
 export { defaultConceptColumns, getConceptColumns } from "./getConceptColumns";
 export { getConceptDomainPath } from "./getConceptDomainPath";
-export {
-  getConceptUploadEventColumns,
-  defaultConceptsUploadEventColumns,
-} from "./getConceptUploadEventColumns";
 export { getParsedEvents } from "./getParsedEvents";
 export { getTemplateFields } from "./getTemplateFields";
 export { getTemplateGroups } from "./getTemplateGroups";

package/src/concepts/selectors/messages.js

@@ -1,8 +1,8 @@
 import _ from "lodash/fp";
-import { CONCEPTS_BULK_UPLOAD_EVENTS } from "@truedat/core/routes";
+import { CONCEPTS_UPLOAD_JOBS, linkTo } from "@truedat/core/routes";
 
 export const getUploadAlertMessage = ({ status, data }) => {
-  if (status === 202) {
+  if (status === 200 || status === 202) {
     return {
       error: false,
       header: "concepts.upload.success.accepted.header",
@@ -10,7 +10,7 @@ export const getUploadAlertMessage = ({ status, data }) => {
       color: "blue",
       text: "",
       anchor: {
-        reference: CONCEPTS_BULK_UPLOAD_EVENTS,
+        reference: CONCEPTS_UPLOAD_JOBS,
         label: "sidemenu.concepts_upload_events",
       },
     };
@@ -44,3 +44,20 @@ export const getUploadAlertMessage = ({ status, data }) => {
     return null;
   }
 };
+
+export const getConceptsUploadAlertMessage = ({ status, data }) => {
+  const alertMessage = getUploadAlertMessage({ status, data });
+  const jobId = _.prop("job_id")(data);
+
+  if (alertMessage && !alertMessage.error && jobId != null) {
+    return {
+      ...alertMessage,
+      anchor: {
+        reference: linkTo.CONCEPTS_UPLOAD_JOB({ id: jobId }),
+        label: "uploadJob.concepts.header",
+      },
+    };
+  }
+
+  return alertMessage;
+};

package/src/concepts/components/ConceptsUploadEvents.js

@@ -1,31 +0,0 @@
-import { Header, Icon, Segment } from "semantic-ui-react";
-import { FormattedMessage, useIntl } from "react-intl";
-import ConceptsUploadEventsTable from "./ConceptsUploadEventsTable";
-
-export const ConceptsUploadEvents = () => {
-  const { formatMessage } = useIntl();
-  return (
-    <Segment>
-      <Header as="h2">
-        <Icon
-          circular
-          name={formatMessage({
-            id: "conceptsUpload.header.icon",
-            defaultMessage: "cogs",
-          })}
-        />
-        <Header.Content>
-          <FormattedMessage id="concepts.upload.header" />
-          <Header.Subheader>
-            <FormattedMessage id="concepts.upload.subheader" />
-          </Header.Subheader>
-        </Header.Content>
-      </Header>
-      <Segment attached="bottom">
-        <ConceptsUploadEventsTable />
-      </Segment>
-    </Segment>
-  );
-};
-
-export default ConceptsUploadEvents;

package/src/concepts/components/ConceptsUploadEventsTable.js

@@ -1,183 +0,0 @@
-import { useState } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import _ from "lodash/fp";
-import { FormattedMessage } from "react-intl";
-import { Table } from "semantic-ui-react";
-import { useIntl } from "react-intl";
-import { columnDecorator } from "@truedat/core/services";
-import { useUploadEvents } from "../hooks/useUploadEvents";
-import { getConceptUploadEventColumns } from "../selectors/getConceptUploadEventColumns";
-import "../styles/ConceptsUploadEventColumns.less";
-
-const getColumnsWithData = (conceptsResults, columns) =>
-  _.filter((column) =>
-    _.any(_.flow(columnDecorator(column), _.negate(_.isEmpty)))(
-      conceptsResults,
-    ),
-  )(columns);
-
-const messagesImp = (data) => {
-  const errors = data?.errors ?? [];
-  return _.map((error) => {
-    if (!error || !error.body)
-      return {
-        id: "unknown_error",
-        context: {},
-        defaultMessage: "concepts.upload.failed.success.errors",
-      };
-
-    return {
-      id: error.body.message ?? "unknown_error",
-      context: { ...error.body.context } ?? {},
-      defaultMessage: "concepts.upload.failed.success.errors",
-    };
-  }, errors);
-};
-
-const ConceptsUploadEventsTable = ({ getColumns }) => {
-  const { formatMessage } = useIntl();
-  const [eventExpandedIndex, setEventExpandedIndex] = useState(null);
-  const { data, loading } = useUploadEvents();
-
-  const events =
-    data && !loading
-      ? _.reduce(
-          (acc, event) => {
-            const eventKey = `${event.task_reference}_${event.status}`;
-
-            const node = event.node ?? "";
-            const hasErrors =
-              event.response?.errors && !_.isEmpty(event.response.errors);
-
-            const messageId = _.startsWith("lm@", node)
-              ? hasErrors
-                ? "concepts.upload.success.header_with_errors_without_update"
-                : "concepts.upload.success.header"
-              : hasErrors
-                ? "concepts.upload.success.header_with_errors"
-                : "concepts.upload.success.header";
-
-            const translatedHeader = event.response
-              ? formatMessage(
-                  { id: messageId },
-                  {
-                    count_created: event.response.created?.length ?? 0,
-                    count_updated: event.response.updated?.length ?? 0,
-                    count_errors: event.response.errors?.length ?? 0,
-                  },
-                )
-              : "";
-
-            const translatedErrors = _.map((error) =>
-              formatMessage(
-                { id: error.id ?? "unknown_error" },
-                error.context ?? {},
-              ),
-            )(messagesImp(event.response));
-
-            // eslint-disable-next-line fp/no-mutation
-            acc[eventKey] = {
-              ...event,
-              response: {
-                ...event.response,
-                translatedHeader,
-                translatedErrors,
-              },
-              expanded: false,
-            };
-
-            return acc;
-          },
-          {},
-          data.data,
-        )
-      : [];
-
-  const columns = getColumnsWithData(events, getColumns());
-
-  const toggleExpanded = (eventKey) =>
-    eventExpandedIndex === eventKey
-      ? setEventExpandedIndex(null)
-      : setEventExpandedIndex(eventKey);
-
-  return (
-    <>
-      {!_.isEmpty(events) && (
-        <Table sortable selectable>
-          <Table.Header>
-            <Table.Row>
-              {columns.map((column, i) => (
-                <Table.HeaderCell
-                  key={i}
-                  width={column.width}
-                  content={formatMessage({
-                    id: `concepts.upload.props.${column.name}`,
-                    defaultMessage: column.name,
-                  })}
-                />
-              ))}
-            </Table.Row>
-          </Table.Header>
-          <Table.Body>
-            {_.map(
-              (eventKey) => (
-                <Table.Row
-                  className={
-                    eventKey === eventExpandedIndex ? "expanded" : "contracted"
-                  }
-                  key={eventKey}
-                  onClick={() => toggleExpanded(eventKey)}
-                >
-                  {eventKey !== eventExpandedIndex ? (
-                    columns &&
-                    columns.map((column, key) => (
-                      <Table.Cell
-                        key={key}
-                        textAlign={column.textAlign}
-                        content={columnDecorator(column)({
-                          ...events[eventKey],
-                          formatMessage,
-                        })}
-                      />
-                    ))
-                  ) : (
-                    <Table.Cell colSpan={columns.length}>
-                      {events[eventKey].file_hash ? (
-                        <>
-                          <FormattedMessage
-                            id={`concepts.upload.props.file_hash`}
-                          />
-                          : {events[eventKey].file_hash}
-                        </>
-                      ) : null}
-                      {columns.map((column, key) => (
-                        <div key={key}>
-                          {columnDecorator(column)({
-                            ...events[eventKey],
-                            formatMessage,
-                          })}
-                        </div>
-                      ))}
-                    </Table.Cell>
-                  )}
-                </Table.Row>
-              ),
-              Object.keys(events),
-            )}
-          </Table.Body>
-        </Table>
-      )}
-    </>
-  );
-};
-
-ConceptsUploadEventsTable.propTypes = {
-  getColumns: PropTypes.func,
-};
-
-const mapStateToProps = (state) => ({
-  getColumns: () => getConceptUploadEventColumns(state),
-});
-
-export default connect(mapStateToProps)(ConceptsUploadEventsTable);