Disable default columns in sort modal

kyma-project · Oct 17, 2024 · cb7ff87 · cb7ff87
1 parent 72524f0
commit cb7ff87
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/public/extensions/extensions.yaml b/public/extensions/extensions.yaml
@@ -1,9 +1,11 @@
 
 list: 
-  - name: Name
-    source: name
-  - name: Namespace
-    source: namespace
+  - name: Display Name
+    source: metadata.displayName
+    sort:
+      default: true  
+  - name: Description
+    source: description
 details: []
 form: []
 general:

diff --git a/src/shared/components/GenericList/GenericList.js b/src/shared/components/GenericList/GenericList.js
@@ -57,6 +57,7 @@ export const GenericList = ({
   serverDataLoading,
   pagination,
   sortBy,
+  disableDefaultColumns = false,
   notFoundMessage,
   searchSettings,
   disableMargin,
@@ -80,7 +81,9 @@ export const GenericList = ({
   searchSettings = { ...defaultSearch, ...searchSettings };
   const [entrySelected, setEntrySelected] = useState('');
   const [entrySelectedNamespace, setEntrySelectedNamespace] = useState('');
-  if (typeof sortBy === 'function') sortBy = sortBy(defaultSort);
+
+  if (typeof sortBy === 'function')
+    sortBy = sortBy(disableDefaultColumns ? {} : defaultSort);
 
   const [sort, setSort] = useState({
     name: sortBy && Object.keys(sortBy)[0],

diff --git a/src/shared/components/ResourcesList/ResourcesList.js b/src/shared/components/ResourcesList/ResourcesList.js
@@ -69,6 +69,7 @@ ResourcesList.propTypes = {
   disableEdit: PropTypes.bool,
   disableDelete: PropTypes.bool,
   disableMargin: PropTypes.bool,
+  disableDefaultColumns: PropTypes.bool,
   enableColumnLayout: PropTypes.bool,
   layoutNumber: PropTypes.string,
   handleRedirect: PropTypes.func,
@@ -85,6 +86,7 @@ ResourcesList.defaultProps = {
   disableEdit: false,
   disableDelete: false,
   disableMargin: false,
+  disableDefaultColumns: false,
   enableColumnLayout: false,
   layoutNumber: 'StartColumn',
   filterFn: () => true,
@@ -199,6 +201,7 @@ export function ResourceListRenderer({
   disableCreate,
   disableDelete,
   disableMargin,
+  disableDefaultColumns,
   enableColumnLayout,
   columnLayout,
   customColumnLayout,
@@ -517,6 +520,7 @@ export function ResourceListRenderer({
             columnLayout={columnLayout}
             enableColumnLayout={enableColumnLayout}
             disableMargin={disableMargin}
+            disableDefaultColumns={disableDefaultColumns}
             title={showTitle ? title || prettifiedResourceName : null}
             actions={actions}
             entries={resources || []}