@truedat/dd 4.48.9 → 4.48.12

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.48.10] 2022-07-19
+
+### Changed
+
+- [TD-4975] StructuresView can be used as embedded without header
+
 ## [4.48.8] 2022-07-18
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.48.9",
+  "version": "4.48.12",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.4",
-    "@truedat/auth": "4.48.9",
-    "@truedat/core": "4.48.9",
-    "@truedat/df": "4.48.9",
+    "@truedat/auth": "4.48.12",
+    "@truedat/core": "4.48.12",
+    "@truedat/df": "4.48.12",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.8.1",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "82d6ab8fb0b3000bf4b8975670d3e5cf15b14487"
+  "gitHead": "4a36e50c99882caf8be2d2d59e13e4fde1759302"
 }

package/src/components/StructuresSearchResults.js

@@ -14,34 +14,39 @@ export const StructuresSearchResults = ({
   onSelect,
   selectedStructure,
   structures,
-  loading
-}) =>
-  !_.isEmpty(structures) || !_.isEmpty(selectedStructure) ? (
-    <Dimmer.Dimmable dimmed={loading}>
-      <StructuresLabelResults />
-      <StructuresTable
-        columns={columns}
-        size={size}
-        selectedStructure={selectedStructure}
-        structures={structures}
-        onStructureSelected={onSelect}
-      />
-      <StructuresPagination size={size} />
-      <Dimmer inverted active={loading}>
-        <Loader size="large" />
-      </Dimmer>
-    </Dimmer.Dimmable>
-  ) : loading ? null : (
-    <Message icon info>
-      <Icon name="search" />
-      <Message.Content>
-        <Message.Header>
-          <FormattedMessage id="structures.not_found.header" />
-        </Message.Header>
-        <FormattedMessage id="structures.not_found.body" />
-      </Message.Content>
-    </Message>
-  );
+  loading,
+}) => (
+  <Dimmer.Dimmable dimmed={loading}>
+    <Dimmer active={loading} inverted>
+      <Loader size="large" />
+    </Dimmer>
+    {!_.isEmpty(structures) || !_.isEmpty(selectedStructure) ? (
+      <>
+        <StructuresLabelResults />
+        <StructuresTable
+          columns={columns}
+          size={size}
+          selectedStructure={selectedStructure}
+          structures={structures}
+          onStructureSelected={onSelect}
+        />
+        <StructuresPagination size={size} />
+      </>
+    ) : (
+      <Message icon info>
+        <Icon name="search" />
+        <Message.Content>
+          <Message.Header>
+            <FormattedMessage
+              id={`structures.${loading ? "loading" : "not_found"}.header`}
+            />
+          </Message.Header>
+          {loading ? null : <FormattedMessage id="structures.not_found.body" />}
+        </Message.Content>
+      </Message>
+    )}
+  </Dimmer.Dimmable>
+);
 
 StructuresSearchResults.propTypes = {
   columns: PropTypes.array,
@@ -49,7 +54,7 @@ StructuresSearchResults.propTypes = {
   onSelect: PropTypes.func,
   structures: PropTypes.array,
   selectedStructure: PropTypes.object,
-  loading: PropTypes.bool
+  loading: PropTypes.bool,
 };
 
 export default StructuresSearchResults;

package/src/components/StructuresView.js

@@ -26,23 +26,21 @@ export const StructuresHeader = () => (
   </Header>
 );
 
-export const StructuresView = ({
+const StructuresViewContent = ({
   actions = {},
   loading,
   structures,
   hasFilterApplied,
-  systemsLoading,
+  embedded,
 }) => {
   const history = useHistory();
   return (
-    <Segment loading={systemsLoading}>
-      <StructuresHeader />
-      <Divider hidden />
+    <>
       <StructuresOptions hasFilterApplied={hasFilterApplied} {...actions} />
       <StructuresSearch />
       <StructureSelectedFilters />
       <StructureDateFilter />
-      {hasFilterApplied ? (
+      {hasFilterApplied || embedded ? (
         <StructuresSearchResults
           structures={structures}
           loading={loading}
@@ -51,6 +49,27 @@ export const StructuresView = ({
       ) : (
         <SystemCards />
       )}
+    </>
+  );
+};
+
+StructuresViewContent.propTypes = {
+  actions: PropTypes.object,
+  structures: PropTypes.array,
+  loading: PropTypes.bool,
+  hasFilterApplied: PropTypes.bool,
+  embedded: PropTypes.bool,
+};
+
+export const StructuresView = (props) => {
+  const { systemsLoading, embedded } = props;
+  return embedded ? (
+    <StructuresViewContent {...props} />
+  ) : (
+    <Segment loading={systemsLoading}>
+      <StructuresHeader />
+      <Divider hidden />
+      <StructuresViewContent {...props} />
     </Segment>
   );
 };
@@ -61,6 +80,7 @@ StructuresView.propTypes = {
   loading: PropTypes.bool,
   systemsLoading: PropTypes.bool,
   hasFilterApplied: PropTypes.bool,
+  embedded: PropTypes.bool,
 };
 
 const selectedFilters = ({ structureActiveFilters, structureDateFilter }) =>
@@ -71,13 +91,15 @@ const selectedFilters = ({ structureActiveFilters, structureDateFilter }) =>
 
 const isEmptyPath = (state, path) => _.flow(_.path(path), _.isEmpty)(state);
 
-const mapStateToProps = (state) => ({
-  structures: structureRowsSelector(state),
-  actions: state.structuresActions,
-  loading: state.structuresLoading,
-  systemsLoading: state.systemsLoading,
-  hasFilterApplied:
-    !isEmptyPath(state, "structureQuery.query") || selectedFilters(state),
-});
+const mapStateToProps = (state) => {
+  return {
+    structures: structureRowsSelector(state),
+    actions: state.structuresActions,
+    loading: state.structuresLoading,
+    systemsLoading: state.systemsLoading,
+    hasFilterApplied:
+      !isEmptyPath(state, "structureQuery.query") || selectedFilters(state),
+  };
+};
 
 export default connect(mapStateToProps)(StructuresView);

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

@@ -2,6 +2,13 @@
 
 exports[`<StructuresSearchResults /> matches the latest snapshot 1`] = `
 <DimmerDimmable>
+  <Dimmer
+    inverted={true}
+  >
+    <Loader
+      size="large"
+    />
+  </Dimmer>
   <Connect(StructuresLabelResults) />
   <Connect(StructuresTable)
     structures={
@@ -19,12 +26,5 @@ exports[`<StructuresSearchResults /> matches the latest snapshot 1`] = `
     }
   />
   <Connect(Pagination) />
-  <Dimmer
-    inverted={true}
-  >
-    <Loader
-      size="large"
-    />
-  </Dimmer>
 </DimmerDimmable>
 `;

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

@@ -6,13 +6,44 @@ exports[`<StructuresView /> matches the latest snapshot 1`] = `
   <Divider
     hidden={true}
   />
-  <StructuresOptions
-    bulkUpdate={Object {}}
+  <StructuresViewContent
+    actions={
+      Object {
+        "bulkUpdate": Object {},
+      }
+    }
+    columns={
+      Array [
+        Object {
+          "name": "name",
+        },
+        Object {
+          "fieldSelector": [Function],
+          "name": "domain",
+        },
+        Object {
+          "name": "system",
+        },
+        Object {
+          "name": "group",
+        },
+      ]
+    }
+    structures={
+      Array [
+        Object {
+          "description": "dd",
+          "domain": Object {
+            "name": "org",
+          },
+          "group": "gp",
+          "id": 1,
+          "name": "s1",
+          "system": "sys",
+        },
+      ]
+    }
   />
-  <Connect(StructuresSearch) />
-  <injectIntl(Connect(SelectedFilters)) />
-  <Connect(StructureDateFilter) />
-  <Connect(SystemCards) />
 </Segment>
 `;
 

package/src/messages/en.js

@@ -492,6 +492,7 @@ export default {
     "Only modify fields to be updated",
   "structures.header.edit.bulk.structures_count":
     'Selected structures: "{structures_count}"',
+  "structures.loading.header": "Loading structures...",
   "structures.not_found.body":
     "No structures have been found matching these filters.",
   "structures.not_found.header": "Nothing found...",

package/src/messages/es.js

@@ -506,6 +506,7 @@ export default {
     "Rellenar únicamente los campos que se quieran actualizar",
   "structures.header.edit.bulk.structures_count":
     'Estructuras seleccionadas: "{structures_count}"',
+  "structures.loading.header": "Cargando estructuras...",
   "structures.not_found.body":
     "No existe ningún elemento para la búsqueda aplicada",
   "structures.not_found.header": "Ningún resultado encontrado",

package/src/reducers/structuresLoading.js

@@ -1,4 +1,4 @@
-import { fetchStructures, toggleStructureFilterValue } from "../routines";
+import { fetchStructures, fetchStructureFilters } from "../routines";
 
 const structuresLoading = (state = false, { type }) => {
   switch (type) {
@@ -6,8 +6,6 @@ const structuresLoading = (state = false, { type }) => {
       return true;
     case fetchStructures.FULFILL:
       return false;
-    case toggleStructureFilterValue.TRIGGER:
-      return true;
     default:
       return state;
   }