Fixes #32748 - add pf4 table template

theforeman · Sep 19, 2023 · 93ac77a · 93ac77a
1 parent 6a29200
commit 93ac77a
Show file tree

Hide file tree

Showing 36 changed files with 628 additions and 1,207 deletions.
diff --git a/webpack/assets/javascripts/react_app/components/ModelsTable/ModelsTable.js b/webpack/assets/javascripts/react_app/components/ModelsTable/ModelsTable.js
diff --git a/webpack/assets/javascripts/react_app/components/ModelsTable/ModelsTable.test.js b/webpack/assets/javascripts/react_app/components/ModelsTable/ModelsTable.test.js
diff --git a/webpack/assets/javascripts/react_app/components/ModelsTable/ModelsTableSchema.js b/webpack/assets/javascripts/react_app/components/ModelsTable/ModelsTableSchema.js
diff --git a/...ssets/javascripts/react_app/components/ModelsTable/__snapshots__/ModelsTable.test.js.snap b/...ssets/javascripts/react_app/components/ModelsTable/__snapshots__/ModelsTable.test.js.snap
diff --git a/webpack/assets/javascripts/react_app/components/ModelsTable/index.js b/webpack/assets/javascripts/react_app/components/ModelsTable/index.js
diff --git a/webpack/assets/javascripts/react_app/components/PF4/Bookmarks/Bookmarks.js b/webpack/assets/javascripts/react_app/components/PF4/Bookmarks/Bookmarks.js
@@ -72,6 +72,7 @@ const Bookmarks = ({
         searchQuery={searchQuery}
       />
       <Dropdown
+        position="right"
         ouiaId="bookmarks-dropdown"
         isOpen={isDropdownOpen}
         onSelect={() => setIsDropdownOpen(false)}

diff --git a/webpack/assets/javascripts/react_app/components/PF4/Helpers/useTableSort.js b/webpack/assets/javascripts/react_app/components/PF4/Helpers/useTableSort.js
@@ -9,19 +9,23 @@ export const useTableSort = ({
 }) => {
   const translatedInitialSortColumnName = initialSortColumnName
     ? __(initialSortColumnName)
-    : allColumns[0];
+    : Object.keys(columnsToSortParams)[0];
+
+  const [activeSortColumn, setActiveSortColumn] = useState(
+    translatedInitialSortColumnName
+  );
+  const [activeSortDirection, setActiveSortDirection] = useState('asc');
+
+  if (Object.keys(columnsToSortParams).length === 0) {
+    return {};
+  }
   if (
     !Object.keys(columnsToSortParams).includes(translatedInitialSortColumnName)
   ) {
     throw new Error(
       `translatedInitialSortColumnName '${translatedInitialSortColumnName}' must also be defined in columnsToSortParams`
     );
   }
-  const [activeSortColumn, setActiveSortColumn] = useState(
-    translatedInitialSortColumnName
-  );
-  const [activeSortDirection, setActiveSortDirection] = useState('asc');
-
   if (!allColumns.includes(activeSortColumn)) {
     setActiveSortColumn(translatedInitialSortColumnName);
   }
@@ -30,7 +34,7 @@ export const useTableSort = ({
   const onSort = (_event, index, direction) => {
     setActiveSortColumn(allColumns?.[index]);
     setActiveSortDirection(direction);
-    _onSort(_event, index, direction);
+    _onSort && _onSort(_event, index, direction);
   };
 
   // Patternfly sort params to pass to the <Th> component.