Merge pull request #18 from oarepo/corovcam/fe-128-after-a-new-reques…

…t-is-created-the-list-of-requests-is-not [FE-128] oarepo-requests UI updates
oarepo · Apr 8, 2024 · 175bfc9 · 175bfc9
2 parents 126786a + 19fbd5a
commit 175bfc9
Show file tree

Hide file tree

Showing 20 changed files with 346 additions and 201 deletions.
diff --git a/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo b/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo
diff --git a/oarepo_requests/translations/cs/LC_MESSAGES/messages.po b/oarepo_requests/translations/cs/LC_MESSAGES/messages.po
@@ -186,3 +186,21 @@ msgstr "Stav"
 #: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:104
 msgid "Type"
 msgstr "Typ"
+
+msgid "Loading request types"
+msgstr "Načítám typy žádostí"
+
+msgid "Error loading request types"
+msgstr "Chyba při načítání typů žádostí"
+
+msgid "No new requests to create"
+msgstr "Nejsou dostupné žádné žádosti"
+
+msgid "Requests"
+msgstr "Žádosti"
+
+msgid "Error loading requests"
+msgstr "Chyba při načítání žádostí"
+
+msgid "Loading requests"
+msgstr "Načítám žádosti"
diff --git a/oarepo_requests/translations/en/LC_MESSAGES/messages.po b/oarepo_requests/translations/en/LC_MESSAGES/messages.po
@@ -184,5 +184,23 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+msgid "Loading request types"
+msgstr ""
+
+msgid "Error loading request types"
+msgstr ""
+
+msgid "No new requests to create"
+msgstr ""
+
+msgid "Requests"
+msgstr ""
+
+msgid "Error loading requests"
+msgstr ""
+
+msgid "Loading requests"
+msgstr ""
+
 #~ msgid "No status"
 #~ msgstr ""
diff --git a/oarepo_requests/translations/messages.mo b/oarepo_requests/translations/messages.mo
diff --git a/oarepo_requests/translations/messages.pot b/oarepo_requests/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-04-08 12:47+0200\n"
+"POT-Creation-Date: 2024-04-08 13:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,173 +17,191 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:92
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:92
 msgid "Submitted"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:93
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:93
 msgid "Expired"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:94
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:94
 msgid "Accepted"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:95
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:95
 msgid "Declined"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:96
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:96
 msgid "Cancelled"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:98
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:98
 msgid "Status"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/invenio_patches.py:104
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/invenio_patches.py:104
 msgid "Type"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/services/ui_schema.py:76
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/services/ui_schema.py:76
 msgid "status"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:3
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:3
 msgid "Create Request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:4
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:4
 msgid "Open dialog for request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:5
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:5
 msgid "My Requests"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:6
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:6
 msgid "Requests to Approve"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:7
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:7
 msgid "Are you sure?"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:8
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:8
 msgid "Cancel"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:9
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:9
 msgid "OK"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:10
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:10
 msgid "Create request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:11
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:11
 msgid "Submit request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:12
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:12
 msgid "Delete request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:13
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:13
 msgid "Delete"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:14
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:14
 msgid "Accept request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:15
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:15
 msgid "Accept"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:16
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:16
 msgid "Decline request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:17
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:17
 msgid "Decline"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:18
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:18
 msgid "Create and submit request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:19
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:19
 msgid "Create and submit"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:20
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:20
 msgid "Error sending request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:21
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:21
 msgid "Submit"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:22
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:22
 msgid "Save drafted request"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:23
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:23
 msgid "Save"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:24
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:24
 msgid "Create"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:25
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:25
 msgid "Creator"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:26
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:26
 msgid "Receiver"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:27
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:27
 msgid "Request type"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:28
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:28
 msgid "Created"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:29
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:29
 msgid "Timeline"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:30
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:30
 msgid "Submit event"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:31
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:31
 msgid "No requests to show"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:32
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:32
 msgid "api.requests"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/delete_record.py:14
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/types/delete_record.py:14
 msgid "Request deletion of published record"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/edit_record.py:16
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/types/edit_record.py:16
 msgid "Request re-opening of published record"
 msgstr ""
 
-#: /Users/m/w/cesnet/oarepo-requests/oarepo_requests/types/publish_draft.py:14
+#: /Users/miroslavbauer/Code/github.com/oarepo/oarepo-requests/oarepo_requests/types/publish_draft.py:14
 msgid "Request publishing of a draft"
 msgstr ""
 
+msgid "Loading request types"
+msgstr ""
+
+msgid "Error loading request types"
+msgstr ""
+
+msgid "No new requests to create"
+msgstr ""
+
 msgid "No status"
 msgstr ""
 
+msgid "Requests"
+msgstr ""
+
+msgid "Error loading requests"
+msgstr ""
+
+msgid "Loading requests"
+msgstr ""
+
 msgid "Cannot send request. Please try again later."
 msgstr ""
 

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
@@ -2,7 +2,8 @@ import React from "react";
 
 import { i18next } from "@translations/oarepo_requests_ui/i18next";
 
-import { Segment, Header, Button } from "semantic-ui-react";
+import { Segment, Header, Button, Dimmer, Loader, Placeholder, Message } from "semantic-ui-react";
+import _isEmpty from "lodash/isEmpty";
 
 import { RequestModal } from "./RequestModal";
 
@@ -12,24 +13,47 @@ import { RequestModal } from "./RequestModal";
  */
 
 /**
- * @param {{ requestTypes: RequestType[] }} props
+ * @param {{ requestTypes: RequestType[], isLoading: boolean, loadingError: Error, fetchNewRequests: () => void }} props
  */
-export const CreateRequestButtonGroup = ({ requestTypes }) => {
+export const CreateRequestButtonGroup = ({ requestTypes, isLoading, loadingError, fetchNewRequests }) => {
   const createRequests = requestTypes.filter(requestType => requestType.links.actions?.create);
 
   return (
     <Segment>
       <Header size="small" className="detail-sidebar-header">{i18next.t("Create Request")}</Header>
-      <Button.Group vertical compact fluid>
-        {createRequests.map((requestType) => (
-          <RequestModal 
-            key={requestType.type_id} 
-            request={requestType} 
-            requestModalType="create" 
-            triggerButton={<Button icon="plus" title={i18next.t(requestType.name)} basic compact content={requestType.name} />} 
-          />
-        ))}
-      </Button.Group>
+      <Dimmer.Dimmable dimmed={isLoading}>
+        <Dimmer active={isLoading} inverted>
+          <Loader indeterminate>{i18next.t("Loading request types")}...</Loader>
+        </Dimmer>
+        {isLoading ? <Placeholder fluid>
+          {Array.from({ length: 3 }).map((_, index) => (
+            <Placeholder.Paragraph key={index}>
+              <Placeholder.Line length="full" />
+              <Placeholder.Line length="medium" />
+              <Placeholder.Line length="short" />
+            </Placeholder.Paragraph>
+          ))}
+        </Placeholder> :
+          loadingError ?
+            <Message negative>
+              <Message.Header>{i18next.t("Error loading request types")}</Message.Header>
+              <p>{loadingError?.message}</p>
+            </Message> :
+            !_isEmpty(createRequests) ?
+              <Button.Group vertical compact fluid>
+                {createRequests.map((requestType) => (
+                  <RequestModal
+                    key={requestType.type_id}
+                    request={requestType}
+                    requestModalType="create"
+                    triggerButton={<Button icon="plus" title={i18next.t(requestType.name)} basic compact content={requestType.name} />}
+                    fetchNewRequests={fetchNewRequests}
+                  />
+                ))}
+              </Button.Group> :
+              <p>{i18next.t("No new requests to create")}.</p>
+        }
+      </Dimmer.Dimmable>
     </Segment>
   );
 }