multilingual-localvocab

oarepo · Oct 26, 2023 · 4ec0f4c · 4ec0f4c
1 parent bcae568
commit 4ec0f4c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/...ssets/semantic-ui/js/oarepo_ui/forms/components/I18nRichInputField/I18nRichInputField.jsx b/...ssets/semantic-ui/js/oarepo_ui/forms/components/I18nRichInputField/I18nRichInputField.jsx
@@ -12,8 +12,8 @@ export const I18nRichInputField = ({
   labelIcon,
   placeholder,
   editorConfig,
-  lngFieldWidth,
   usedLanguages,
+  lngFieldWidth,
   ...uiProps
 }) => {
   return (
@@ -62,7 +62,7 @@ I18nRichInputField.propTypes = {
   disabled: PropTypes.bool,
   optimized: PropTypes.bool,
   editorConfig: PropTypes.object,
-  languageOptions: PropTypes.array,
+  usedLanguages: PropTypes.array,
   lngFieldWidth: PropTypes.number,
 };
 

diff --git a/...ssets/semantic-ui/js/oarepo_ui/forms/components/I18nTextInputField/I18nTextInputField.jsx b/...ssets/semantic-ui/js/oarepo_ui/forms/components/I18nTextInputField/I18nTextInputField.jsx
@@ -55,7 +55,7 @@ I18nTextInputField.propTypes = {
   helpText: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   disabled: PropTypes.bool,
   optimized: PropTypes.bool,
-  languageOptions: PropTypes.array,
+  usedLanguages: PropTypes.array,
   lngFieldWidth: PropTypes.number,
 };
 

diff --git a/...ets/semantic-ui/js/oarepo_ui/forms/components/LanguageSelectField/LanguageSelectField.jsx b/...ets/semantic-ui/js/oarepo_ui/forms/components/LanguageSelectField/LanguageSelectField.jsx
@@ -28,11 +28,11 @@ export const LanguageSelectField = ({
       multiple={multiple}
       label={<FieldLabel htmlFor={fieldPath} icon={labelIcon} label={label} />}
       optionsListName="languages"
-      usedOptions={usedLanguages}
+      usedLanguages={usedLanguages}
       onChange={({ e, data, formikProps }) => {
         formikProps.form.setFieldValue(fieldPath, data.value);
       }}
-      value={getIn(values, fieldPath, multiple ? [] : '')}
+      value={getIn(values, fieldPath, multiple ? [] : "")}
       {...uiProps}
     />
   );
@@ -46,7 +46,7 @@ LanguageSelectField.propTypes = {
   multiple: PropTypes.bool,
   clearable: PropTypes.bool,
   placeholder: PropTypes.string,
-  options: PropTypes.array,
+  usedLanguages: PropTypes.array,
 };
 
 LanguageSelectField.defaultProps = {

diff --git a/...semantic-ui/js/oarepo_ui/forms/components/MultilingualTextInput/MultilingualTextInput.jsx b/...semantic-ui/js/oarepo_ui/forms/components/MultilingualTextInput/MultilingualTextInput.jsx
@@ -24,6 +24,7 @@ export const MultilingualTextInput = ({
   helpText,
   addButtonLabel,
   lngFieldWidth,
+  sameLanguagesAllowed,
   ...uiProps
 }) => {
   const { options: languages } = useVocabularyOptions("languages");
@@ -45,7 +46,6 @@ export const MultilingualTextInput = ({
           languages.all,
           array
         );
-
         return (
           <ArrayFieldItem
             indexPath={indexPath}
@@ -55,13 +55,16 @@ export const MultilingualTextInput = ({
             <Form.Field width={16}>
               {rich ? (
                 <I18nRichInputField
+                  key={availableLanguages.length}
                   fieldPath={fieldPathPrefix}
                   label={textFieldLabel}
                   labelIcon={textFieldIcon}
                   editorConfig={editorConfig}
                   optimized
                   required={required}
-                  usedLanguages={array.map((v) => v.lang)}
+                  usedLanguages={
+                    sameLanguagesAllowed ? languages.all : availableLanguages
+                  }
                   lngFieldWidth={lngFieldWidth}
                   {...uiProps}
                 />
@@ -72,7 +75,9 @@ export const MultilingualTextInput = ({
                   label={textFieldLabel}
                   labelIcon={textFieldIcon}
                   required={required}
-                  usedLanguages={array.map((v) => v.lang)}
+                  usedLanguages={
+                    sameLanguagesAllowed ? languages.all : availableLanguages
+                  }
                   lngFieldWidth={lngFieldWidth}
                   {...uiProps}
                 />
@@ -97,6 +102,7 @@ MultilingualTextInput.propTypes = {
   helpText: PropTypes.string,
   addButtonLabel: PropTypes.string,
   lngFieldWidth: PropTypes.number,
+  sameLanguagesAllowed: PropTypes.bool,
 };
 
 MultilingualTextInput.defaultProps = {
@@ -107,4 +113,5 @@ MultilingualTextInput.defaultProps = {
   rich: false,
   label: undefined,
   addButtonLabel: i18next.t("Add another language"),
+  sameLanguagesAllowed: false,
 };