@truedat/df 4.48.0 → 4.48.4

package/src/templates/utils/parseFieldOptions.js

@@ -1,61 +1,72 @@
 import _ from "lodash/fp";
-const stringToValueTextList = _.map((v) => ({ value: v, text: v }));
+import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
 
-const parseFieldOptions = (content, selectedDomain) => (field) => {
-  const value = _.prop(field?.name)(content);
-  if (!field?.values) return { ...field, value };
+const makeOptions = (formatMessage, label) =>
+  _.map((v) => ({
+    value: v,
+    text: formatMessage({ id: `fields.${label}.${v}`, defaultMessage: v }),
+  }));
 
-  const parseSwitch = (values) => {
-    const switchOn = _.prop("switch.on")(values);
-    const switchedValues = _.prop(`switch.values.${content[switchOn]}`)(values);
-    return stringToValueTextList(switchedValues);
-  };
-  const parseFixed = _.flow(_.get("fixed"), stringToValueTextList);
-  const parseRoleUsers = _.flow(
-    _.get("processed_users"),
-    _.cond([
-      [_.isArray, _.identity],
-      [_.stubTrue, _.constant([])],
-    ]),
-    stringToValueTextList
-  );
-  const parseRoleGroups = (values) =>
-    _.concat(
-      _.flow(
-        _.get("processed_users"),
-        _.map((name) => ({
-          value: `user:${name}`,
-          text: name,
-          icon: "user",
-        }))
-      )(values),
-      _.flow(
-        _.get("processed_groups"),
-        _.map((name) => ({
-          value: `group:${name}`,
-          text: name,
-          icon: "group",
-        }))
-      )(values)
-    );
-  const parseDomain = _.flow(
-    _.get("domain"),
-    _.propOr([], _.toString(selectedDomain?.id)),
-    stringToValueTextList
-  );
+export const parseFieldOptions =
+  (formatMessage) => (content, selectedDomain) => (field) => {
+    const value = _.prop(field?.name)(content);
+    if (!field?.values) return { ...field, value };
 
-  const parsed_values = _.flow(
-    _.get("values"),
-    _.cond([
-      [_.has("switch"), parseSwitch],
-      [_.has("fixed"), parseFixed],
-      [_.has("fixed_tuple"), _.get("fixed_tuple")],
-      [_.has("role_users"), parseRoleUsers],
-      [_.has("role_groups"), parseRoleGroups],
-      [_.has("domain"), parseDomain],
-    ])
-  )(field);
-  return { ...field, value, parsed_values };
-};
+    const translateValues = _.flow(
+      makeOptions(formatMessage, field?.label),
+      _.sortBy(accentInsensitivePathOrder("text"))
+    );
+    const parseSwitch = (values) => {
+      const switchOn = _.prop("switch.on")(values);
+      const switchedValues = _.prop(`switch.values.${content[switchOn]}`)(
+        values
+      );
+      return translateValues(switchedValues);
+    };
+    const parseFixed = _.flow(_.get("fixed"), translateValues);
+    const parseRoleUsers = _.flow(
+      _.get("processed_users"),
+      _.cond([
+        [_.isArray, _.identity],
+        [_.stubTrue, _.constant([])],
+      ]),
+      translateValues
+    );
+    const parseRoleGroups = (values) =>
+      _.concat(
+        _.flow(
+          _.get("processed_users"),
+          _.map((name) => ({
+            value: `user:${name}`,
+            text: name,
+            icon: "user",
+          }))
+        )(values),
+        _.flow(
+          _.get("processed_groups"),
+          _.map((name) => ({
+            value: `group:${name}`,
+            text: name,
+            icon: "group",
+          }))
+        )(values)
+      );
+    const parseDomain = _.flow(
+      _.get("domain"),
+      _.propOr([], _.toString(selectedDomain?.id)),
+      translateValues
+    );
 
-export { parseFieldOptions };
+    const parsedValues = _.flow(
+      _.get("values"),
+      _.cond([
+        [_.has("switch"), parseSwitch],
+        [_.has("fixed"), parseFixed],
+        [_.has("fixed_tuple"), _.get("fixed_tuple")],
+        [_.has("role_users"), parseRoleUsers],
+        [_.has("role_groups"), parseRoleGroups],
+        [_.has("domain"), parseDomain],
+      ])
+    )(field);
+    return { ...field, value, parsedValues };
+  };

package/src/templates/utils/parseGroups.js

@@ -17,27 +17,27 @@ const checkDependency = (field, content) => {
 const enrichIsSecret = (isSecret) => (field) =>
   isSecret ? { ...field, isSecret } : field;
 
-const parseGroups = (template, content, fieldsToOmit, selectedDomain) =>
-  _.flow(
-    _.getOr([], "content"),
-    _.map((group) => {
-      const fields = _.flow(
-        _.get("fields"),
-        _.filter((field) => !_.includes(fieldsToOmit)(field?.name)),
-        _.filter(
-          (field) =>
-            (!("depends" in field) ||
-              (hasDependentKeys(field) && checkDependency(field, content))) &&
-            (!(field.values && "switch" in field.values) ||
-              _.prop(_.prop("values.switch.on")(field))(content) in
-                _.prop("values.switch.values")(field))
-        ),
-        _.map(parseFieldOptions(content, selectedDomain)),
-        _.map(enrichRequired(content)),
-        _.map(enrichIsSecret(_.get("is_secret")(group)))
-      )(group);
-      return { ...group, fields };
-    }),
-    _.filter(({ fields }) => _.negate(_.isEmpty)(fields))
-  )(template);
-export { parseGroups };
+export const parseGroups =
+  (formatMessage) => (template, content, fieldsToOmit, selectedDomain) =>
+    _.flow(
+      _.getOr([], "content"),
+      _.map((group) => {
+        const fields = _.flow(
+          _.get("fields"),
+          _.reject((field) => _.includes(fieldsToOmit)(field?.name)),
+          _.filter(
+            (field) =>
+              (!("depends" in field) ||
+                (hasDependentKeys(field) && checkDependency(field, content))) &&
+              (!(field.values && "switch" in field.values) ||
+                _.prop(_.prop("values.switch.on")(field))(content) in
+                  _.prop("values.switch.values")(field))
+          ),
+          _.map(parseFieldOptions(formatMessage)(content, selectedDomain)),
+          _.map(enrichRequired(content)),
+          _.map(enrichIsSecret(_.get("is_secret")(group)))
+        )(group);
+        return { ...group, fields };
+      }),
+      _.filter(({ fields }) => _.negate(_.isEmpty)(fields))
+    )(template);