few fixes

Author: jnptk

backend/tests/services/keywords/test_keywords_get.py

@@ -13,7 +13,7 @@ def portal(portal_class):
 def contents(portal):
     with api.env.adopt_roles(["Manager"]):
         doc = api.content.create(portal, type="Document", id="doc1")
-        doc.Subject = ["doc"]
+        doc.subjects = ["doc"]
         api.content.transition(obj=doc, transition="publish")
         transaction.commit()
 

frontend/packages/volto-keywordmanager/locales/de/LC_MESSAGES/volto.po

@@ -24,7 +24,7 @@ msgstr ""
 #. Default: "All types"
 #: components/KeywordView
 msgid "All types"
-msgstr ""
+msgstr "Alle Inhaltstypen"
 
 #. Default: "Back"
 #: components/KeywordManager
@@ -51,7 +51,7 @@ msgstr "Löschen"
 #. Default: "Keyword"
 #: components/KeywordManager
 msgid "Keyword"
-msgstr ""
+msgstr "Stichwort"
 
 #. Default: "Keyword Manager"
 #: components/KeywordManager
@@ -61,7 +61,7 @@ msgstr ""
 #. Default: "Keywords"
 #: components/KeywordManager
 msgid "Keywords"
-msgstr ""
+msgstr "Stichworte"
 
 #. Default: "Occurrence"
 #: components/KeywordManager
@@ -81,12 +81,12 @@ msgstr ""
 #. Default: "Delete keyword(s)"
 #: components/DeleteModal
 msgid "confirm-modal-title"
-msgstr ""
+msgstr "Stichwort(e) löschen"
 
 #. Default: "Keyword field:"
 #: components/KeywordManager
 msgid "keyword-field"
-msgstr ""
+msgstr "Stichwort Feld:"
 
 #. Default: "The Keyword Manager allows you to maintain the keywords used in your website. Start by selecting the keyword field you want to manage. You can then sort, filter, rename, merge, or delete individual keywords."
 #: components/KeywordManager
@@ -114,7 +114,7 @@ msgstr "Kein Inhalt ausgewählt"
 #. Default: "No keyword selected"
 #: components/KeywordManager
 msgid "no-keyword-selected"
-msgstr ""
+msgstr "Kein Stichwort ausgewählt"
 
 #. Default: "{num} content(s) selected"
 #: components/KeywordView
@@ -124,7 +124,7 @@ msgstr "{num} Inhalt(e) ausgewählt"
 #. Default: "{num} keyword(s) selected"
 #: components/KeywordManager
 msgid "number-keywords-selected"
-msgstr ""
+msgstr "{num} Stichwort(e) ausgewählt"
 
 #. Default: "You are about to rename {num} selected keyword(s). This action cannot be undone. Either select one of the existing keywords to keep or enter a new name to replace all selected keywords."
 #: components/RenameModal
@@ -134,7 +134,7 @@ msgstr ""
 #. Default: "Rename & merge keyword(s)"
 #: components/RenameModal
 msgid "rename-modal-title"
-msgstr ""
+msgstr "Stichwort(e) umbennenen & zusammenführen"
 
 #. Default: "Search"
 #: components/KeywordView
@@ -154,4 +154,4 @@ msgstr "Titel / Pfad"
 #. Default: "Type"
 #: components/KeywordView
 msgid "type"
-msgstr ""
+msgstr "Inhaltstyp"

frontend/packages/volto-keywordmanager/src/components/KeywordView.tsx

@@ -58,7 +58,10 @@ const messages = defineMessages({
 
 const KeywordView = (props) => {
   const { location } = props;
-  const { keywordIndex, id } = useParams<{ id: string }>();
+  const { keywordIndex, id } = useParams<{
+    keywordIndex: string;
+    id: string;
+  }>();
   const intl = useIntl();
   const keywords = useSelector((state) => state.search.subrequests.keywords);
   const types = useSelector(
@@ -78,8 +81,7 @@ const KeywordView = (props) => {
     selectedKeys === 'all' ? keywords.items?.length : selectedKeys?.size;
   // Pagination
   const [currentPage, setCurrentPage] = useState<number>(0);
-  const [pageSize, setPageSize] = useState<number>(25);
-  const pageSizes = [25, 50, 100];
+  const [pageSize, setPageSize] = useState<number>(5);
   const [selectedTypes, setSelectedTypes] = useState<[]>([]);
   const [selectedStates, setSelectedStates] = useState<[]>([]);
   const [search, setSearch] = useState<string>('');
@@ -89,11 +91,11 @@ const KeywordView = (props) => {
     () => ({
       [keywordIndex]: [id],
       metadata_fields: keywordIndex,
+      b_size: pageSize,
+      b_start: currentPage * pageSize,
       ...(selectedTypes.length > 0 && { portal_type: selectedTypes }),
       ...(selectedStates.length > 0 && { review_state: selectedStates }),
       ...(search && { SearchableText: search }),
-      ...(pageSize !== 25 && { b_size: pageSize }),
-      ...(currentPage !== 0 && { b_start: currentPage }),
     }),
     [
       keywordIndex,
@@ -252,7 +254,7 @@ const KeywordView = (props) => {
                   {obj.title}
                 </UniversalLink>
                 <br />
-                <span className="sc-only">Path: </span>
+                <span hidden>Path: </span>
                 <span>{flattenToAppURL(obj['@id']) || '/'}</span>
                 <KeywordList
                   keywords={obj[keywordIndex]}
@@ -261,7 +263,7 @@ const KeywordView = (props) => {
                 />
               </>
             ),
-            type: <p>{obj.type_title}</p>,
+            type: obj.type_title,
             state: (
               <FormattedMessage
                 id={
@@ -275,39 +277,22 @@ const KeywordView = (props) => {
           onSelectionChange={setSelectedKeys}
         />
       ) : keywords?.loading ? (
-        <Spinner label={intl.formatMessage(messages.loading)} />
+        <Spinner aria-label={intl.formatMessage(messages.loading)} />
       ) : (
         <div>No results.</div>
       )}
-      {keywords?.total > Math.min(...pageSizes) && (
+      {keywords?.total > pageSize && (
         <Pagination
           current={currentPage}
           total={Math.ceil(keywords?.total / pageSize)}
           pageSize={pageSize}
-          pageSizes={pageSizes}
           onChangePage={(e, { value }) => {
             setCurrentPage(value);
-            dispatch(
-              searchContent(
-                '/',
-                {
-                  b_size: pageSize,
-                  b_start: pageSize * value,
-                  Subject: [id],
-                },
-                'keywords',
-              ),
-            );
+            dispatch(searchContent('/', options, 'keywords'));
           }}
           onChangePageSize={(e, { value }) => {
             setPageSize(value);
-            dispatch(
-              searchContent(
-                '/',
-                { b_size: value, b_start: currentPage, Subject: [id] },
-                'keywords',
-              ),
-            );
+            dispatch(searchContent('/', options, 'keywords'));
           }}
         />
       )}

frontend/packages/volto-keywordmanager/src/theme/main.css

@@ -3,12 +3,6 @@
   flex-direction: column;
   gap: 15px;
 
-  /* Screen reader only class */
-  /* mostly used to give more context to a person using a screen reader */
-  * .sc-only {
-    display: none;
-  }
-
   .title {
     padding: 20px 15px;
     border-bottom: 2px solid;
@@ -68,6 +62,7 @@
 
   .react-aria-Table.cmsui-table {
     width: 100%;
+    padding: 0;
 
     .react-aria-Column,
     .react-aria-Cell {
@@ -102,8 +97,12 @@
         .normal {
           padding-left: 10px;
 
-          &:hover button {
-            text-decoration: underline;
+          button {
+            color: #000;
+
+            &:hover {
+              text-decoration: underline;
+            }
           }
         }