@beinformed/ui 1.20.4 → 1.20.7

package/src/models/attributes/AttributeContent.js

@@ -62,50 +62,52 @@ class AttributeContent {
    */
   get elements(): ContentAll {
     if (this._content?.elements) {
-      return this._content.elements?.map((element) => {
-        if (element.propertyElement) {
-          const { label, layouthint, properties } = element.propertyElement;
-
-          return {
-            propertyElement: {
-              label,
-              layouthint: new LayoutHintCollection(layouthint),
-              properties,
-            },
-          };
-        }
-
-        if (element.textFragmentElement) {
-          const { label, layouthint, textfragments } =
-            element.textFragmentElement;
-          return {
-            textFragmentElement: {
-              label,
-              layouthint: new LayoutHintCollection(layouthint),
-              textfragments: textfragments.map((textfragment) => ({
-                ...textfragment,
-                text: retrieveText(textfragment.text),
-              })),
-            },
-          };
-        }
-
-        if (element.contentElement) {
-          const { label, layouthint, sections } = element.contentElement;
-          return {
-            contentElement: {
-              label,
-              layouthint: new LayoutHintCollection(layouthint),
-              sections: sections.map(
-                (section) => new SectionModel(section, null)
-              ),
-            },
-          };
-        }
-
-        // $FlowIssue
-        return element;
-      });
+      return this._content.elements
+        .filter((element) => element !== null)
+        .map((element) => {
+          if (element.propertyElement) {
+            const { label, layouthint, properties } = element.propertyElement;
+
+            return {
+              propertyElement: {
+                label,
+                layouthint: new LayoutHintCollection(layouthint),
+                properties,
+              },
+            };
+          }
+
+          if (element.textFragmentElement) {
+            const { label, layouthint, textfragments } =
+              element.textFragmentElement;
+            return {
+              textFragmentElement: {
+                label,
+                layouthint: new LayoutHintCollection(layouthint),
+                textfragments: textfragments.map((textfragment) => ({
+                  ...textfragment,
+                  text: retrieveText(textfragment.text),
+                })),
+              },
+            };
+          }
+
+          if (element.contentElement) {
+            const { label, layouthint, sections } = element.contentElement;
+            return {
+              contentElement: {
+                label,
+                layouthint: new LayoutHintCollection(layouthint),
+                sections: sections.map(
+                  (section) => new SectionModel(section, null)
+                ),
+              },
+            };
+          }
+
+          // $FlowIssue
+          return element;
+        });
     }
 
     return [];

package/src/models/form/FormModel.js

@@ -1,7 +1,6 @@
 // @flow
 import flattenDeep from "lodash/flattenDeep";
 import deepmerge from "deepmerge";
-import { get } from "lodash";
 
 import { has } from "../../utils/helpers/objects";
 
@@ -156,11 +155,11 @@ class FormModel extends ResourceModel {
   ): string | null {
     // cancel button labels are defined on the form
     if (buttonType === "cancel") {
-      return get(this.buttonLabels, "cancel", null);
+      return this.buttonLabels?.cancel ?? null;
     }
 
     // all other form related button labels are defined on the object
-    return get(this.currentFormObject?.buttonLabels, buttonType, null);
+    return this.currentFormObject?.buttonLabels?.[buttonType] ?? null;
   }
 
   /**

package/src/modularui/ModularUIRequest.js

@@ -445,6 +445,11 @@ class ModularUIRequest {
   /**
    */
   isHiddenList(name: string, href: string): Promise<string> {
+    const HIDE_WHEN_EMPTY_IGNORE_TASKS = getSetting(
+      "HIDE_WHEN_EMPTY_IGNORE_TASKS",
+      false
+    );
+
     return universalFetch({
       ...this.options,
       url: `${BASE}${href}`,
@@ -454,7 +459,10 @@ class ModularUIRequest {
           const [key] = Object.keys(response);
           const { _embedded, actions } = response[key];
 
-          const isHidden = _embedded == null && actions == null;
+          const noListItems = _embedded == null;
+          const noActions = actions == null || HIDE_WHEN_EMPTY_IGNORE_TASKS;
+
+          const isHidden = noListItems && noActions;
           if (isHidden) {
             return name;
           }

package/src/redux/index.js

@@ -21,4 +21,7 @@ export * from "./connectors/index";
 // REDUCERS
 export * from "./reducers/index";
 
+// SELECTORS
+export * from "./selectors/index";
+
 export type * from "./types";

package/src/redux/selectors/index.js

@@ -0,0 +1,2 @@
+// @flow
+export * from "./i18n";