Merge pull request #116 from oarepo/stojanovic/fe-113-i18next-plugin-…

…eslint

Stojanovic/fe 113 i18next plugin eslint

oarepo_ui/resources/resource.py

@@ -114,7 +114,7 @@ def empty_record(self, resource_requestctx, **kwargs):
         empty_data = dump_empty(self.api_config.schema)
         files_field = getattr(self.api_config.record_cls, "files", None)
         if files_field and isinstance(files_field, FilesField):
-            empty_data["files"] = {"enabled": False}
+            empty_data["files"] = {"enabled": True}
         empty_data = deepmerge.always_merger.merge(
             empty_data, copy.deepcopy(self.config.empty_record)
         )

oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/api/client.js

@@ -144,8 +144,8 @@ export class OARepoDepositApiClient extends DepositApiClient {
    */
   readDraft = async (draftLinks) => {
     return this._createResponse(() => {
-      const response = this.axiosWithConfig.get(relativeUrl(draftLinks.self))
-      return this.recordSerializer.deserialize(response)
+      const response = this.axiosWithConfig.get(relativeUrl(draftLinks.self));
+      return this.recordSerializer.deserialize(response);
     });
   };
 
@@ -176,3 +176,68 @@ export class OARepoDepositApiClient extends DepositApiClient {
     );
   };
 }
+
+export class DepositFileApiClient {
+  constructor(additionalApiConfig) {
+    if (this.constructor === DepositFileApiClient) {
+      throw new Error("Abstract");
+    }
+    const additionalHeaders = _get(additionalApiConfig, "headers", {});
+    this.apiHeaders = Object.assign({}, BASE_HEADERS, additionalHeaders);
+
+    const apiConfig = {
+      withCredentials: true,
+      xsrfCookieName: "csrftoken",
+      xsrfHeaderName: "X-CSRFToken",
+      headers: this.apiHeaders.json,
+    };
+    this.axiosWithConfig = axios.create(apiConfig);
+  }
+
+  isCancelled(error) {
+    return axios.isCancel(error);
+  }
+
+  initializeFileUpload(initializeUploadUrl, filename) {
+    throw new Error("Not implemented.");
+  }
+
+  uploadFile(uploadUrl, file, onUploadProgress, cancel) {
+    throw new Error("Not implemented.");
+  }
+
+  finalizeFileUpload(finalizeUploadUrl) {
+    throw new Error("Not implemented.");
+  }
+
+  deleteFile(fileLinks) {
+    throw new Error("Not implemented.");
+  }
+}
+
+/**
+ * Default File API Client for deposits.
+ */
+export class OARepoDepositFileApiClient extends DepositFileApiClient {
+  _createResponse = async (axiosRequest) => {
+    let response;
+    try {
+      response = await axiosRequest();
+      const data = response.data || {};
+      return data;
+    } catch (error) {
+      return Promise.reject(error);
+    }
+  };
+
+  readDraftFiles = async (draft) => {
+    return this._createResponse(() => {
+      const response = this.axiosWithConfig.get(relativeUrl(draft.links.files));
+      return response;
+    });
+  };
+
+  deleteFile = (fileLinks) => {
+    return this.axiosWithConfig.delete(fileLinks.self);
+  };
+}

oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/forms/components/EDTFDatePickerField/EDTFDatePickerField.jsx

@@ -219,7 +219,7 @@ export const EDTFSingleDatePicker = ({
   icon,
   helpText,
   required,
-  placeholderText,
+  placeholder,
   calendarControlButtonClassName,
   calendarControlIconName,
   clearIconClassName,
@@ -249,6 +249,7 @@ export const EDTFSingleDatePicker = ({
           fieldPath={fieldPath}
           required={required}
           autoComplete="off"
+          placeholder={placeholder}
           label={<FieldLabel htmlFor={fieldPath} icon={icon} label={label} />}
           icon={
             field?.value ? (
@@ -281,7 +282,6 @@ export const EDTFSingleDatePicker = ({
                 {...props}
               />
             )}
-            placeholderText={placeholderText}
             {...datePickerProps}
           />
         )}
@@ -310,7 +310,7 @@ EDTFSingleDatePicker.propTypes = {
   helpText: PropTypes.string,
   datePickerProps: PropTypes.object,
   required: PropTypes.bool,
-  placeholderText: PropTypes.string,
+  placeholder: PropTypes.string,
   calendarControlButtonClassName: PropTypes.string,
   calendarControlIconName: PropTypes.string,
   clearIconClassName: PropTypes.string,
@@ -320,7 +320,7 @@ EDTFSingleDatePicker.defaultProps = {
   icon: "calendar",
   helpText: i18next.t("Format: YYYY-MM-DD, YYYYY-MM or YYYY."),
   required: false,
-  placeholderText: i18next.t(
+  placeholder: i18next.t(
     "Write a date or click on the calendar icon to select it"
   ),
   calendarControlButtonClassName: "calendar-control-button",

oarepo_ui/theme/assets/semantic-ui/js/oarepo_ui/forms/components/MultilingualTextInput/MultilingualTextInput.jsx

@@ -27,6 +27,7 @@ export const MultilingualTextInput = ({
   addButtonLabel,
   lngFieldWidth,
   showEmptyValue,
+  prefillLanguageWithDefaultLocale,
   ...uiProps
 }) => {
   const { defaultLocale } = useDefaultLocale();
@@ -43,7 +44,11 @@ export const MultilingualTextInput = ({
   return (
     <ArrayField
       addButtonLabel={addButtonLabel}
-      defaultNewValue={getNewValue(defaultNewValue, usedLanguages)}
+      defaultNewValue={
+        prefillLanguageWithDefaultLocale
+          ? getNewValue(defaultNewValue, usedLanguages)
+          : defaultNewValue
+      }
       fieldPath={fieldPath}
       label={
         <FieldLabel htmlFor={fieldPath} icon={labelIcon ?? ""} label={label} />
@@ -106,6 +111,7 @@ MultilingualTextInput.propTypes = {
   rich: PropTypes.bool,
   defaultNewValue: PropTypes.object,
   showEmptyValue: PropTypes.bool,
+  prefillLanguageWithDefaultLocale: PropTypes.bool,
 };
 
 MultilingualTextInput.defaultProps = {
@@ -117,4 +123,5 @@ MultilingualTextInput.defaultProps = {
   label: undefined,
   addButtonLabel: i18next.t("Add another language"),
   showEmptyValue: false,
+  prefillLanguageWithDefaultLocale: false,
 };