Skip to content

Commit a0bf885

Browse files
dhernandez-quoinjtoliver-quoin
authored andcommitted
Merged in r2-3134-non-harcoded-modules-translated (pull request #7092)
R2-3134 - Non-hardcoded modules do not appear as translated in the forms list Approved-by: Joshua Toliver
2 parents a4c6821 + e69f45a commit a0bf885

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

app/javascript/components/pages/admin/form-builder/forms.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const settingsForm = ({ formMode, onManageTranslation, onEnglishTextChang
9090
name: MODULES_FIELD,
9191
type: SELECT_FIELD,
9292
option_strings_source: "Module",
93-
multipleLimitOne: true,
93+
multi_select: true,
9494
required: true,
9595
clearDependentValues: [RECORD_TYPE_FIELD, [FORM_GROUP_FIELD, []]],
9696
clearDependentReason: [SELECT_CHANGE_REASON.clear],

app/javascript/components/pages/admin/forms-list/components/table-row/component.jsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,28 @@
33
import PropTypes from "prop-types";
44
import { Link } from "react-router-dom";
55
import { Draggable } from "react-beautiful-dnd";
6-
import findKey from "lodash/findKey";
76
import { cx } from "@emotion/css";
87

98
import { useI18n } from "../../../../../i18n";
10-
import { MODULES, RECORD_PATH } from "../../../../../../config";
9+
import { RECORD_PATH } from "../../../../../../config";
1110
import css from "../../styles.css";
1211
import DragIndicator from "../drag-indicator";
1312
import LockedIcon from "../../../../../locked-icon";
13+
import { useMemoizedSelector } from "../../../../../../libs";
14+
import { selectModules } from "../../../../../application";
1415

1516
function Component({ name, modules, parentForm, uniqueID, id, index, editable, isDragDisabled = false }) {
17+
const primeroModules = useMemoizedSelector(state => selectModules(state));
1618
const i18n = useI18n();
1719

1820
const nameStyles = cx({
1921
[css.formName]: true,
2022
[css.protected]: !editable
2123
});
2224

23-
const formSectionModules = modules.map(module => findKey(MODULES, value => module === value))?.join(", ");
25+
const formSectionModules = modules
26+
.map(module => primeroModules.find(primeroModule => primeroModule.unique_id === module)?.name)
27+
?.join(", ");
2428

2529
const renderIcon = !editable ? <LockedIcon /> : null;
2630

0 commit comments

Comments
 (0)