Merge pull request #21 from oarepo/miroslavsimek/fe-303-implicitne-ne…

…zobrazene-zadosti-na-schvaleni-na-dashboardu

Added all requests - needs oarepo-requests changes to work

oarepo_dashboard/i18n/semantic-ui/translations/oarepo_dashboard/messages/cs/LC_MESSAGES/translations.json

@@ -1 +1 @@
-{"By Title":"Podle názvu","Best match":"Nejlepší shoda","Newest":"Nejnovější","Oldest":"Nejstarší","Records":"Nahráno","Communities":"Komunity","Requests":"Žádosti","profile":"profil","Search in my communities...":"Hledat v mých komunitách...","Restricted":"Omezený","Filter results":"Filtrovat výsledky","Edit":"Upravit","Uploaded on {{uploadDate}}":"Nahráno dne {{uploadDate}}","No creation date found.":"Nebylo nalezeno žádné datum vytvoření","No description":"Bez popisu","No title":"Bez názvu","Create new...":"Vytvořit nový...","Search in my uploads...":"Hledat v mých záznamech...","Expires at: {{- expiringDate}}":"Vyprší v: {{- expiringDate}}","Opened {{relativeTime}} by":"Otevřeno {{relativeTime}} uživatelem","Open":"Otevřeno","Closed":"Zavřeno","New request":"Nová žádost","My":"Moje","Others":"Ostatní","Search in my requests...":"Hledat v mých žádostech...","Opened by":"Otevřeno {{relativeTime}} uživatelem","Create new draft":"Vytvořit nový koncept","Edit record":"Úprava záznamu","Delete record":"Smazání záznamu","Publish record":"Vypublikování záznamů","Opened by {{creatorName}} on {{created}}.":"Otevřeno uživatelem {{creatorName}} na {{created}}.","Recepient: {{receiver}}.":"Příjemce: {{receiver}}","User Dashboard":"Nástěnka","Create new version of record":"Vytvořit novou verzi záznamu"}
+{"By Title":"Podle názvu","Best match":"Nejlepší shoda","Newest":"Nejnovější","Oldest":"Nejstarší","Records":"Nahráno","Communities":"Komunity","Requests":"Žádosti","profile":"profil","Search in my communities...":"Hledat v mých komunitách...","Restricted":"Omezený","Filter results":"Filtrovat výsledky","Edit":"Upravit","Uploaded on {{uploadDate}}":"Nahráno dne {{uploadDate}}","No creation date found.":"Nebylo nalezeno žádné datum vytvoření","No description":"Bez popisu","No title":"Bez názvu","Create new...":"Vytvořit nový...","Search in my uploads...":"Hledat v mých záznamech...","Expires at: {{- expiringDate}}":"Vyprší v: {{- expiringDate}}","Opened {{relativeTime}} by":"Otevřeno {{relativeTime}} uživatelem","Open":"Otevřeno","Closed":"Zavřeno","New request":"Nová žádost","My":"Moje","Others":"Ostatní","Search in my requests...":"Hledat v mých žádostech...","Opened by":"Otevřeno {{relativeTime}} uživatelem","Create new draft":"Vytvořit nový koncept","Edit record":"Úprava záznamu","Delete record":"Smazání záznamu","Publish record":"Vypublikování záznamů","Opened by {{creatorName}} on {{created}}.":"Otevřeno uživatelem {{creatorName}} na {{created}}.","Recepient: {{receiver}}.":"Příjemce: {{receiver}}","User Dashboard":"Nástěnka","Create new version of record":"Vytvořit novou verzi záznamu","All requests":"Všechny"}

oarepo_dashboard/i18n/semantic-ui/translations/oarepo_dashboard/messages/en/LC_MESSAGES/translations.json

@@ -1 +1 @@
-{"User Dashboard":"Dashboard"}
+{"User Dashboard":"Dashboard","All requests":"All"}

oarepo_dashboard/i18n/translations/cs/LC_MESSAGES/messages.po

@@ -136,3 +136,9 @@ msgstr "Nástěnka"
 
 msgid "Create new version of record"
 msgstr "Vytvořit novou verzi záznamu"
+
+msgid "All requests"
+msgstr "Všechny"
+
+msgid "Assign DOI"
+msgstr ""

oarepo_dashboard/i18n/translations/en/LC_MESSAGES/messages.po

@@ -145,3 +145,9 @@ msgstr "Dashboard"
 
 msgid "Create new version of record"
 msgstr ""
+
+msgid "All requests"
+msgstr "All"
+
+msgid "Assign DOI"
+msgstr ""

oarepo_dashboard/i18n/translations/messages.pot

@@ -8,28 +8,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-09-10 10:00+0200\n"
+"POT-Creation-Date: 2024-12-11 20:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.15.0\n"
 
-#: /home/dusanst/Projects/oarepo-dashboard/oarepo_dashboard/ui/dashboard_communities/__init__.py:46
+#: /Users/m/w/cesnet/oarepo-dashboard/oarepo_dashboard/ui/dashboard_communities/__init__.py:46
 msgid "Communities"
 msgstr ""
 
-#: /home/dusanst/Projects/oarepo-dashboard/oarepo_dashboard/ui/dashboard_records/__init__.py:52
+#: /Users/m/w/cesnet/oarepo-dashboard/oarepo_dashboard/ui/dashboard_records/__init__.py:54
 msgid "Records"
 msgstr ""
 
-#: /home/dusanst/Projects/oarepo-dashboard/oarepo_dashboard/ui/dashboard_records/__init__.py:61
+#: /Users/m/w/cesnet/oarepo-dashboard/oarepo_dashboard/ui/dashboard_records/__init__.py:63
 msgid "User Dashboard"
 msgstr ""
 
-#: /home/dusanst/Projects/oarepo-dashboard/oarepo_dashboard/ui/dashboard_requests/__init__.py:50
+#: /Users/m/w/cesnet/oarepo-dashboard/oarepo_dashboard/ui/dashboard_requests/__init__.py:51
 msgid "Requests"
 msgstr ""
 
@@ -42,9 +42,6 @@ msgstr ""
 msgid "Restricted"
 msgstr ""
 
-msgid "Filter results"
-msgstr ""
-
 msgid "Create new draft"
 msgstr ""
 
@@ -63,6 +60,15 @@ msgstr ""
 msgid "Expires at: {{- expiringDate}}"
 msgstr ""
 
+msgid "Open"
+msgstr ""
+
+msgid "Closed"
+msgstr ""
+
+msgid "All requests"
+msgstr ""
+
 msgid "My"
 msgstr ""
 
@@ -83,3 +89,6 @@ msgstr ""
 
 msgid "Create new version of record"
 msgstr ""
+
+msgid "Assign DOI"
+msgstr ""

oarepo_dashboard/ui/dashboard_components/search.py

@@ -1,5 +1,5 @@
-from oarepo_ui.resources.components import UIResourceComponent
 from flask import current_app
+from oarepo_ui.resources.components import UIResourceComponent
 from oarepo_ui.utils import can_view_deposit_page
 
 
@@ -15,4 +15,4 @@ def before_ui_search(self, *, search_options, view_args, extra_context, **kwargs
 
 class DashboardRequestsSearchComponent(UIResourceComponent):
     def before_ui_search(self, *, search_options, view_args, **kwargs):
-        search_options["initial_filters"] = [["is_open", "true"], ["mine", "true"]]
+        search_options["initial_filters"] = [["is_open", "true"], ["all", "true"]]

oarepo_dashboard/ui/dashboard_requests/semantic-ui/js/dashboard_requests/search/index.js

@@ -56,6 +56,7 @@ export const FacetButtons = () => (
       <FacetsButtonGroupNameToggler
         basic
         toggledFilters={[
+          { text: i18next.t("All requests"), filterName: "all" },
           { text: i18next.t("My"), filterName: "mine" },
           { text: i18next.t("Others"), filterName: "assigned" },
         ]}
@@ -74,6 +75,7 @@ export const FacetButtons = () => (
       <FacetsButtonGroupNameToggler
         basic
         toggledFilters={[
+          { text: i18next.t("All requests"), filterName: "all" },
           { text: i18next.t("My"), filterName: "mine" },
           { text: i18next.t("Others"), filterName: "assigned" },
         ]}
@@ -90,10 +92,10 @@ const SearchAppResultViewWithSearchbarWAppName = parametrize(
 );
 
 const ActiveFiltersElementWIgnoredFilters = parametrize(ActiveFiltersElement, {
-  ignoredFilters: ["mine", "assigned", "is_closed"],
+  ignoredFilters: ["mine", "assigned", "all", "is_closed"],
 });
 const ClearFiltersButtonWIgnoredFilters = parametrize(ClearFiltersButton, {
-  ignoredFilters: ["mine", "assigned", "is_closed"],
+  ignoredFilters: ["mine", "assigned", "all", "is_closed"],
 });
 export const DashboardUploadsSearchLayout = SearchAppLayoutWithSearchbarHOC({
   placeholder: i18next.t("Search in my requests..."),

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-dashboard
-version = 1.0.16
+version = 1.0.17
 description = Support for user dashboard (records, communities, requests)
 authors = Mirek Simek <[email protected]>
 readme = README.md