@truedat/core 4.45.1 → 4.45.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.45.1",
+  "version": "4.45.6",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.45.1",
+    "@truedat/test": "4.45.6",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "c13f37ee357bf4a5e8c8c99eb6bd0c798f468c49"
+  "gitHead": "6624767ce3b6893d538087057b662d11f90eb72d"
 }

package/src/components/FiltersLoader.js

@@ -7,6 +7,7 @@ export const FiltersLoader = ({
   fetchFilters,
   clearSort,
   selectedFilter,
+  defaultFilters = {},
   filters,
 }) => {
   useEffect(() => {
@@ -16,7 +17,14 @@ export const FiltersLoader = ({
     };
   }, [clearFilters, clearSort]);
   useEffect(() => {
-    fetchFilters({ filters: _.omit([selectedFilter])(filters) });
+    const mergedFilters = _.has(selectedFilter)(defaultFilters)
+      ? {
+          ...defaultFilters,
+          ...filters,
+          ..._.pick([selectedFilter])(defaultFilters),
+        }
+      : _.omit([selectedFilter])({ ...defaultFilters, ...filters });
+    fetchFilters({ filters: mergedFilters });
   }, [fetchFilters, filters, selectedFilter]);
   return null;
 };

package/src/components/OptionModal.js

@@ -0,0 +1,42 @@
+import React from "react";
+import PropTypes from "prop-types";
+import { useIntl } from "react-intl";
+import { Menu } from "semantic-ui-react";
+import ConfirmModal from "./ConfirmModal";
+
+export const OptionModal = ({
+  contentMessage,
+  headerMessage,
+  iconName,
+  iconColor,
+  option,
+  onConfirm,
+}) => {
+  const { formatMessage } = useIntl();
+  return (
+    <ConfirmModal
+      trigger={
+        <Menu.Item
+          icon={{ name: iconName, color: iconColor }}
+          content={formatMessage({ id: option })}
+        />
+      }
+      header={formatMessage({ id: headerMessage })}
+      content={formatMessage({ id: contentMessage })}
+      onConfirm={onConfirm}
+      onOpen={(e) => e.stopPropagation()}
+      onClose={(e) => e.stopPropagation()}
+    />
+  );
+};
+
+OptionModal.propTypes = {
+  contentMessage: PropTypes.string,
+  headerMessage: PropTypes.string,
+  iconColor: PropTypes.string,
+  iconName: PropTypes.string,
+  option: PropTypes.string,
+  onConfirm: PropTypes.func,
+};
+
+export default OptionModal;

package/src/components/QualityMenu.js

@@ -3,13 +3,19 @@ import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { useAuthorized } from "../hooks";
-import { RULES, QUALITY_DASHBOARD, IMPLEMENTATIONS } from "../routes";
+import {
+  RULES,
+  QUALITY_DASHBOARD,
+  IMPLEMENTATIONS,
+  IMPLEMENTATIONS_PENDING,
+} from "../routes";
 import { getQualityDashboardConfig } from "../selectors";
 import Submenu from "./Submenu";
 
 export const ITEMS = [
   { name: "rules", routes: [RULES] },
   { name: "implementations", routes: [IMPLEMENTATIONS] },
+  { name: "implementations_management", routes: [IMPLEMENTATIONS_PENDING] },
   { name: "quality_dashboard", routes: [QUALITY_DASHBOARD] },
 ];
 

package/src/components/UserFilters.js

@@ -19,7 +19,7 @@ export const UserFilters = ({
       {userFilters.map((userFilter, i) => (
         <Label
           basic={selectedUserFilter == userFilter.name ? false : true}
-          circular={true}
+          circular
           key={`label${userFilter.id}.${i}`}
         >
           <span

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

@@ -57,6 +57,19 @@ exports[`<QualityMenu /> matches the latest snapshot 1`] = `
             Implementations
           </span>
         </a>
+        <a
+          aria-checked="true"
+          class="active item"
+          href="/pendingImplementations"
+          name="implementations_management"
+          role="option"
+        >
+          <span
+            class="text"
+          >
+            Drafts
+          </span>
+        </a>
       </div>
     </div>
   </div>

package/src/components/index.js

@@ -24,6 +24,7 @@ import IngestMenu from "./IngestMenu";
 import LineageMenu from "./LineageMenu";
 import Loading from "./Loading";
 import OptionGroup from "./OptionGroup";
+import OptionModal from "./OptionModal";
 import Pagination from "./Pagination";
 import QualityMenu from "./QualityMenu";
 import Redirector from "./Redirector";
@@ -69,6 +70,7 @@ export {
   LineageMenu,
   Loading,
   OptionGroup,
+  OptionModal,
   Pagination,
   QualityMenu,
   Redirector,

package/src/messages/en.js

@@ -8,8 +8,11 @@ export default {
   "actions.edit": "Edit",
   "actions.next": "Next",
   "actions.prev": "Previous",
+  "actions.publish": "Publish",
+  "actions.reject": "Reject",
   "actions.save": "Save",
   "actions.share": "Share",
+  "actions.submit": "Send for approval",
   "actions.update": "Update",
   "alert.createComment.failed.header": "Error creating comment",
   "alert.fetchComments.failed.header": "Error fetching comments list",
@@ -45,6 +48,7 @@ export default {
   filters: "Filters",
   "filters.class.raw.field": "Field",
   "filters.reset": "(reset all filters)",
+  "filters.status": "Status",
   loading: "loading...",
   "form.validation.required": "{prop} is required",
   "form.validation.minLength": "{prop} must have at least {value} characters",
@@ -83,6 +87,7 @@ export default {
   "sidemenu.grants": "Grants",
   "sidemenu.hide": "Collapse sidebar",
   "sidemenu.implementations": "Implementations",
+  "sidemenu.implementations_management": "Drafts",
   "sidemenu.ingests": "Data Requests",
   "sidemenu.jobs": "Jobs",
   "sidemenu.lineage_events": "My graphs",

package/src/messages/es.js

@@ -8,8 +8,11 @@ export default {
   "actions.edit": "Editar",
   "actions.next": "Siguiente",
   "actions.prev": "Anterior",
+  "actions.publish": "Publicar",
+  "actions.reject": "Rechazar",
   "actions.save": "Guardar",
   "actions.share": "Compartir",
+  "actions.submit": "Solicitar aprobación",
   "actions.update": "Actualizar",
   "alert.createComment.failed.header": "Error creando comentario",
   "alert.fetchComments.failed.header": "Error cargando la lista de comentarios",
@@ -46,6 +49,7 @@ export default {
   filters: "Filtros",
   "filters.class.raw.field": "Field",
   "filters.reset": "(sin filtros)",
+  "filters.status": "Estado",
   "form.validation.required": "{prop} es un campo requerido",
   "form.validation.minLength": "{prop} debe tener al menos {value} elementos",
   "form.validation.email.invalid": "Dirección de email inválida",
@@ -86,6 +90,7 @@ export default {
   "sidemenu.grants": "Accesos",
   "sidemenu.hide": "Ocultar",
   "sidemenu.implementations": "Implementaciones",
+  "sidemenu.implementations_management": "Borradores",
   "sidemenu.ingests": "Peticiones de datos",
   "sidemenu.jobs": "Jobs",
   "sidemenu.lineage_events": "Mis grafos",

package/src/routes.js

@@ -54,6 +54,7 @@ export const GROUPS = "/groups";
 export const GROUP_CREATE = "/groups/new";
 export const GROUP_EDIT = "/groups/:id/edit";
 export const IMPLEMENTATIONS = "/implementations";
+export const IMPLEMENTATIONS_PENDING = "/pendingImplementations";
 export const IMPLEMENTATION_CONCEPT_LINKS =
   "/implementations/:implementation_id/links/concepts";
 export const IMPLEMENTATION_CONCEPT_LINKS_NEW =
@@ -235,6 +236,7 @@ const routes = {
   GROUP_EDIT,
   IMPLEMENTATION,
   IMPLEMENTATIONS,
+  IMPLEMENTATIONS_PENDING,
   IMPLEMENTATION_CLONE,
   IMPLEMENTATION_CONCEPT_LINKS,
   IMPLEMENTATION_CONCEPT_LINKS_NEW,

package/src/selectors/__tests__/makeActiveFiltersSelector.spec.js

@@ -10,12 +10,12 @@ describe("selectors: makeActiveFiltersSelector", () => {
   });
 
   it("should return a selector that merges defaultFilters with conceptActiveFilters if defaultFilters prop exists", () => {
-    const defaultFilters = { foo: "baz" };
+    const defaultFilters = { status: ["pending"] };
     const conceptActiveFilters = { foo: "bar" };
     const state = { conceptActiveFilters };
     const props = { defaultFilters };
     expect(
       makeActiveFiltersSelector("conceptActiveFilters")(state, props)
-    ).toEqual({ foo: "bar" });
+    ).toEqual({ foo: "bar", status: ["pending"] });
   });
 });