@truedat/core 5.9.4 → 5.9.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "5.9.4",
+  "version": "5.9.6",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.9.4",
+    "@truedat/test": "5.9.6",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -117,5 +117,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "63e5534704106cdab8d4294b1b1f52ac7fc36e02"
+  "gitHead": "9f323fd84b59cac49e60b9cf0e441efc192465de"
 }

package/src/components/CatalogMenu.js

@@ -4,6 +4,7 @@ import React from "react";
 import { useQuery } from "@apollo/client";
 import { CATALOG_VIEW_CONFIGS_QUERY } from "@truedat/dd/api/queries";
 import { linkTo } from "@truedat/core/routes";
+import { useIntl } from "react-intl";
 import { useAuthorized } from "../hooks";
 import {
   BUCKET_VIEW_CONFIGS,
@@ -18,16 +19,10 @@ import {
 import { Loading } from "./Loading";
 import Submenu from "./Submenu";
 
-const items = [
-  { name: "structures", routes: [STRUCTURES, SYSTEMS], beforeRest: true },
-  { name: "referenceData", routes: [REFERENCE_DATASETS] },
-];
-
 const adminItems = [
   {
     name: "catalogViewConfigs",
     routes: [BUCKET_VIEW_CONFIGS],
-    beforeRest: true,
   },
   { name: "structureTypes", routes: [STRUCTURE_TYPES] },
   { name: "structureTags", routes: [STRUCTURE_TAGS] },
@@ -38,32 +33,31 @@ const structureNoteItems = [
   { name: "structures_upload_events", routes: [STRUCTURES_UPLOAD_EVENTS] },
 ];
 
-const catalogViewConfigItems = _.flow(
-  _.map(({ fieldType, fieldName }) => ({
-    name: `${fieldType}.${fieldName}`,
-    routes: [
-      linkTo.BUCKETS_VIEW({ propertyPath: `${fieldType}.${fieldName}` }),
-    ],
-    beforeRest: true,
-  })),
-  _.orderBy(["name"], ["asc"])
-);
+const catalogViewConfigItems = (formatMessage) =>
+  _.flow(
+    _.map(({ fieldType, fieldName }) => ({
+      name: formatMessage({ id: `${fieldType}.${fieldName}` }),
+      routes: [
+        linkTo.BUCKETS_VIEW({ propertyPath: `${fieldType}.${fieldName}` }),
+      ],
+    })),
+    _.orderBy(["name"], ["asc"])
+  );
 
 export const CatalogMenu = ({ catalogViewConfigs }) => {
   const adminAuthorized = useAuthorized();
   const structureNotesAuthorized = useAuthorized(
     "data_dictionary_structure_notes"
   );
+  const { formatMessage } = useIntl();
 
-  const submenuItems = _.flow(
-    _.partition({ beforeRest: true }),
-    _.flatten
-  )([
-    ...items,
-    ...catalogViewConfigItems(catalogViewConfigs),
-    ...(adminAuthorized ? adminItems : []),
+  const submenuItems = [
+    { name: "structures", routes: [STRUCTURES, SYSTEMS] },
+    ...catalogViewConfigItems(formatMessage)(catalogViewConfigs),
+    { name: "referenceData", routes: [REFERENCE_DATASETS] },
     ...(structureNotesAuthorized ? structureNoteItems : []),
-  ]);
+    ...(adminAuthorized ? adminItems : []),
+  ];
 
   const authorized = useAuthorized("data_dictionary");
   return authorized ? (
@@ -76,9 +70,12 @@ CatalogMenu.propTypes = {
 };
 
 export const CatalogMenuLoader = (props) => {
+  const adminAuthorized = useAuthorized();
   const { loading, error, data } = useQuery(CATALOG_VIEW_CONFIGS_QUERY, {
     fetchPolicy: "cache-and-network",
+    skip: !adminAuthorized,
   });
+
   if (error) return null;
   if (loading) return <Loading />;
   const configs = data?.catalogViewConfigs || [];

package/src/components/__tests__/CatalogMenu.spec.js

@@ -13,7 +13,10 @@ jest.mock("../../hooks", () => ({
 
 const commonRenderOpts = {
   messages: {
-    en: {},
+    en: {
+      "metadata.region": "metadata.region",
+      "note.layer": "note.layer",
+    },
   },
 };
 

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

@@ -45,79 +45,79 @@ exports[`<CatalogMenu /> matches the latest snapshot 1`] = `
         <a
           aria-checked="false"
           class="item"
-          href="/bucketViewConfigs"
-          name="catalogViewConfigs"
+          href="/referenceDatasets"
+          name="referenceData"
           role="option"
         >
           <span
             class="text"
           >
-            catalogViewConfigs
+            referenceData
           </span>
         </a>
         <a
           aria-checked="false"
           class="item"
-          href="/referenceDatasets"
-          name="referenceData"
+          href="/structureNotes"
+          name="pending_structure_notes"
           role="option"
         >
           <span
             class="text"
           >
-            referenceData
+            pending_structure_notes
           </span>
         </a>
         <a
           aria-checked="false"
           class="item"
-          href="/structureTypes"
-          name="structureTypes"
+          href="/bulkUpdateTemplateContentEvents"
+          name="structures_upload_events"
           role="option"
         >
           <span
             class="text"
           >
-            structureTypes
+            structures_upload_events
           </span>
         </a>
         <a
           aria-checked="false"
           class="item"
-          href="/structureTags"
-          name="structureTags"
+          href="/bucketViewConfigs"
+          name="catalogViewConfigs"
           role="option"
         >
           <span
             class="text"
           >
-            structureTags
+            catalogViewConfigs
           </span>
         </a>
         <a
           aria-checked="false"
           class="item"
-          href="/structureNotes"
-          name="pending_structure_notes"
+          href="/structureTypes"
+          name="structureTypes"
           role="option"
         >
           <span
             class="text"
           >
-            pending_structure_notes
+            structureTypes
           </span>
         </a>
         <a
           aria-checked="false"
           class="item"
-          href="/bulkUpdateTemplateContentEvents"
-          name="structures_upload_events"
+          href="/structureTags"
+          name="structureTags"
           role="option"
         >
           <span
             class="text"
           >
-            structures_upload_events
+            structureTags
           </span>
         </a>
       </div>

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

@@ -44,9 +44,6 @@ exports[`<SideMenu /> matches the latest snapshot 1`] = `
           </div>
         </div>
       </div>
-      <div
-        class="ui active loader"
-      />
       <a
         class="item bottom"
       >

package/src/messages/en.js

@@ -76,7 +76,7 @@ export default {
   "i18n.messages.locale.es": "Spanish",
   "i18n.messages.locale.en": "English",
   "i18n.messages.search.placeholder": "Search messages",
-  missingBucket: "(Missing selected bucket)",
+  missingBucket: "(Unclassified)",
   "navigation.dashboard": "Dashboard",
   "navigation.menu": "Menu",
   "search.applied_filters": "Filters:",
@@ -103,7 +103,7 @@ export default {
   "validation.header.message.error": "Could you check something!",
   "sidemenu.admin": "Administration",
   "sidemenu.catalog": "Catalog",
-  "sidemenu.catalogViewConfigs": "Bucket view config",
+  "sidemenu.catalogViewConfigs": "Catalog views",
   "sidemenu.concepts_links_management": "Links manager",
   "sidemenu.concepts_management": "Drafts",
   "sidemenu.concepts": "Glossary",

package/src/messages/es.js

@@ -78,7 +78,7 @@ export default {
   "i18n.messages.search.placeholder": "Buscar mensajes",
 
   loading: "cargando...",
-  missingBucket: "(Sin bucket seleccionado)",
+  missingBucket: "(Sin clasificar)",
   "navigation.dashboard": "Dashboard",
   "navigation.menu": "Menú",
   "search.applied_filters": "Filtros aplicados:",
@@ -107,7 +107,7 @@ export default {
   "validation.header.message.error": "Faltan campos por rellenar!",
   "sidemenu.admin": "Administración",
   "sidemenu.catalog": "Catálogo",
-  "sidemenu.catalogViewConfigs": "Config vistas bucket",
+  "sidemenu.catalogViewConfigs": "Vistas de catálogo",
   "sidemenu.concepts_links_management": "Gestión de vínculos",
   "sidemenu.concepts_management": "Borradores",
   "sidemenu.concepts": "Glosario",