using dropdown for new version keep files field

oarepo · Dec 11, 2024 · 5d14423 · 5d14423
1 parent 358408a
commit 5d14423
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/oarepo_requests/actions/new_version.py b/oarepo_requests/actions/new_version.py
@@ -47,7 +47,7 @@ def apply(
         if (
             "payload" in self.request
             and "keep_files" in self.request["payload"]
-            and self.request["payload"]["keep_files"] == "true"
+            and self.request["payload"]["keep_files"] == "yes"
         ):
             topic_service.import_files(identity, new_version_topic.id)
         update_topic(self.request, topic, new_version_topic._record, uow)

diff --git a/oarepo_requests/types/new_version.py b/oarepo_requests/types/new_version.py
@@ -47,10 +47,12 @@ class NewVersionRequestType(NonDuplicableOARepoRequestType):
             attribute="draft_record:links:self_html",
             data_key="draft_record:links:self_html",
         ),
-        "keep_files": ma.fields.String(validate=OneOf(["true", "false"])),
+        "keep_files": ma.fields.String(validate=OneOf(["yes", "no"])),
     }
 
-    def extra_entity_links(self, request: Request, entity: dict, entity_type: str, **kwargs) -> dict:
+    def extra_entity_links(
+        self, request: Request, entity: dict, entity_type: str, **kwargs
+    ) -> dict:
         if request.status == "accepted" and entity_type == "topic":
             return {"topic_redirect_link": entity["links"]["edit_html"]}
         else:
@@ -70,15 +72,17 @@ def available_actions(cls) -> dict[str, type[RequestAction]]:
 
     form = {
         "field": "keep_files",
-        "ui_widget": "BooleanCheckbox",
+        "ui_widget": "Dropdown",
         "props": {
             "label": _("Keep files:"),
-            "placeholder": _("Keep files in the new version?"),
+            "placeholder": _("Yes or no"),
             "description": _(
                 "If you choose yes, the current record's files will be linked to the new version of the record. Then you will be able to add/remove files in the form."
             ),
-            "falseLabel": _("No"),
-            "trueLabel": _("Yes"),
+            "options": [
+                {"id": "yes", "title_l10n": _("Yes")},
+                {"id": "no", "title_l10n": _("No")},
+            ],
         },
     }
 

diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/hooks.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/common/utils/hooks.js
@@ -250,16 +250,15 @@ export const useAction = ({
             requestActionName,
           });
         }
-        const redirectionURL = data?.data?.links?.redirect_urls?.self_html;
-        console.log(data.data);
+        const redirectionURL = data?.data?.links?.topic?.self_html;
         modalControl?.closeModal();
 
         if (redirectionURL) {
           window.location.href = redirectionURL;
         } else {
           // TODO: some requests after they complete no longer have a topic_html,
           // so redirecting to dashboard instead
-          // window.location.href = "/me/records/";
+          window.location.href = "/me/records/";
           // fetchNewRequests?.();
         }
       },

diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/index.js b/oarepo_requests/ui/theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/index.js
@@ -16,24 +16,24 @@ const recordRequestsAppDiv = document.getElementById("record-requests");
 if (recordRequestsAppDiv) {
   const record = JSON.parse(recordRequestsAppDiv.dataset.record);
 
-  const onActionError = (e, variables, requestModalFormik, modalControl) => {
+  const onActionError = ({ e, formik, modalControl }) => {
     if (e?.response?.data?.errors) {
       const errorData = e.response.data;
       const jsonErrors = JSON.stringify(errorData);
       const base64EncodedErrors = encodeUnicodeBase64(jsonErrors);
-      if (record?.links?.topic?.edit_html) {
-        requestModalFormik?.setFieldError(
+      if (record?.links?.edit_html) {
+        formik?.setFieldError(
           "api",
           i18next.t("Record has validation errors. Redirecting to form...")
         );
         setTimeout(() => {
           window.location.href =
-            record.links.topic.edit_html + `#${base64EncodedErrors}`;
+            record.links.edit_html + `#${base64EncodedErrors}`;
           modalControl?.closeModal();
         }, 2500);
       }
     } else {
-      requestModalFormik?.setFieldError(
+      formik?.setFieldError(
         "api",
         i18next.t(
           "The action could not be executed. Please try again in a moment."

diff --git a/tests/test_requests/test_new_version.py b/tests/test_requests/test_new_version.py
@@ -81,7 +81,7 @@ def test_new_version_files(
         urls["BASE_URL_REQUESTS"],
         json={
             **new_version_data_function(record1["id"]),
-            "payload": {"keep_files": "true"},
+            "payload": {"keep_files": "yes"},
         },
     )
     resp_request_create2 = creator_client.post(