Merge pull request #113 from oarepo/fixing-button-display

fixed button issue
oarepo · Feb 18, 2025 · ab5ddcc · ab5ddcc
2 parents ec3252a + 6c6ef9f
commit ab5ddcc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/oarepo_requests/services/ui_schema.py b/oarepo_requests/services/ui_schema.py
@@ -35,6 +35,7 @@
     RequestTypeSchema,
     get_links_schema,
 )
+from sqlalchemy.orm.exc import NoResultFound
 
 if TYPE_CHECKING:
     from invenio_requests.customizations.request_types import RequestType
@@ -172,7 +173,7 @@ def _get_stateful_labels(
                         # not very nice, but we need to pass the request object to the stateful_description function
                         request=SimpleNamespace(**data),
                     )
-        except PersistentIdentifierError:
+        except (PersistentIdentifierError, NoResultFound):
             pass
 
         return stateful_name, stateful_description

diff --git a/...i/theme/assets/semantic-ui/js/oarepo_requests_ui/common/actions/DirectCreateAndSubmit.jsx b/...i/theme/assets/semantic-ui/js/oarepo_requests_ui/common/actions/DirectCreateAndSubmit.jsx
@@ -30,7 +30,9 @@ const DirectCreateAndSubmit = ({
     requestOrRequestType: requestType,
   });
   const { requestButtonsIconsConfig } = useRequestContext();
-  const buttonIconProps = requestButtonsIconsConfig[requestType.type_id];
+  const buttonIconProps =
+    requestButtonsIconsConfig[requestType.type_id] ||
+    requestButtonsIconsConfig?.default;
   const buttonContent =
     requestType?.stateful_name || requestType?.name || requestType?.type_id;
 

diff --git a/...semantic-ui/js/oarepo_requests_ui/record-requests/components/CreateRequestButtonGroup.jsx b/...semantic-ui/js/oarepo_requests_ui/record-requests/components/CreateRequestButtonGroup.jsx
@@ -47,7 +47,9 @@ export const CreateRequestButtonGroup = ({
     content = createRequests.map((requestType) => {
       const header =
         requestType.stateful_name || requestType.name || requestType.type_id;
-      const buttonIconProps = requestButtonsIconsConfig[requestType.type_id];
+      const buttonIconProps =
+        requestButtonsIconsConfig[requestType.type_id] ||
+        requestButtonsIconsConfig?.default;
 
       return (
         <CreateRequestButton

diff --git a/...me/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx b/...me/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RecordRequests.jsx
@@ -18,6 +18,7 @@ const overriddenComponents = overrideStore.getAll();
 export const requestButtonsDefaultIconConfig = {
   delete_published_record: { icon: "trash" },
   publish_draft: { icon: "upload" },
+  publish_new_version: { icon: "upload" },
   new_version: { icon: "tag" },
   edit_published_record: { icon: "pencil" },
   assign_doi: { icon: "address card" },
@@ -27,6 +28,7 @@ export const requestButtonsDefaultIconConfig = {
   secondary_community_submission: { icon: "users" },
   remove_secondary_community: { icon: "remove" },
   submitted: { icon: "clock" },
+  default: { icon: "plus" },
 };
 
 const queryClient = new QueryClient();

diff --git a/...theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RequestList.jsx b/...theme/assets/semantic-ui/js/oarepo_requests_ui/record-requests/components/RequestList.jsx
@@ -16,7 +16,9 @@ export const RequestList = ({ requests }) => {
   const { requestButtonsIconsConfig } = useRequestContext();
   const isMutating = useIsMutating();
   return requests.map((request) => {
-    const buttonIconProps = requestButtonsIconsConfig[request.status_code];
+    const buttonIconProps =
+      requestButtonsIconsConfig[request.status_code] ||
+      requestButtonsIconsConfig?.default;
     const header = request?.stateful_name || request?.name;
     return (
       <RequestModal

diff --git a/...theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/elements/button.overrides b/...theme/assets/semantic-ui/less/oarepo_requests_ui/themes/default/elements/button.overrides
@@ -8,7 +8,11 @@
       color: @white;
     }
     &.publish_draft {
-      color: white;
+      color: @white;
+      background-color: @green;
+    }
+    &.publish_new_version {
+      color: @white;
       background-color: @green;
     }
   }
@@ -19,6 +23,10 @@
       color: white;
       background-color: @green;
     }
+    &.publish_new_version {
+      color: white;
+      background-color: @green;
+    }
     &.delete_published_record {
       background-color: @red;
       color: @white;

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-requests
-version = 2.3.18
+version = 2.3.19
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md