CNV-31832: add linux-bridge as filter

nmstate · Aug 11, 2023 · ad37a9c · ad37a9c
1 parent 43bb7e5
commit ad37a9c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 29 deletions.
diff --git a/src/views/states/list/StatesList.tsx b/src/views/states/list/StatesList.tsx
@@ -55,7 +55,7 @@ const StatesList: FC = () => {
     <>
       <ListPageHeader title={t(NodeNetworkStateModel.label)}></ListPageHeader>
       <ListPageBody>
-        <StatusBox loaded={statesLoaded} error={statesError} data={states}>
+        <StatusBox loaded={statesLoaded} error={statesError}>
           <div className="list-managment-group">
             <ListPageFilter
               data={data}
@@ -101,22 +101,30 @@ const StatesList: FC = () => {
             />
           </div>
 
-          <Table
-            cells={activeColumns}
-            rows={paginatedData}
-            gridBreakPoint={TableGridBreakpoint.none}
-            role="presentation"
-          >
-            <TableHeader />
-            {paginatedData.map((nns, index) => (
-              <StateRow
-                key={nns?.metadata?.name}
-                obj={nns}
-                activeColumnIDs={new Set(activeColumns.map(({ id }) => id))}
-                rowData={{ rowIndex: index, selectedFilters }}
-              />
-            ))}
-          </Table>
+          {filteredData.length > 0 ? (
+            <Table
+              cells={activeColumns}
+              rows={paginatedData}
+              gridBreakPoint={TableGridBreakpoint.none}
+              role="presentation"
+            >
+              <TableHeader />
+              {paginatedData.map((nns, index) => (
+                <StateRow
+                  key={nns?.metadata?.name}
+                  obj={nns}
+                  activeColumnIDs={new Set(activeColumns.map(({ id }) => id))}
+                  rowData={{ rowIndex: index, selectedFilters }}
+                />
+              ))}
+            </Table>
+          ) : (
+            <div className="cos-status-box">
+              <div data-test="empty-message" className="pf-u-text-align-center">
+                {t('No NodeNetworkStates found')}
+              </div>
+            </div>
+          )}
         </StatusBox>
       </ListPageBody>
       <InterfaceDrawer selectedInterface={selectedInterface} />

diff --git a/src/views/states/list/components/StatusBox.tsx b/src/views/states/list/components/StatusBox.tsx
@@ -2,7 +2,6 @@ import React, { FC, PropsWithChildren } from 'react';
 import { Trans } from 'react-i18next';
 
 import { Button, ButtonVariant } from '@patternfly/react-core';
-import { V1beta1NodeNetworkState } from '@types';
 import { useNMStateTranslation } from '@utils/hooks/useNMStateTranslation';
 
 import ListSkeleton from './ListSkeleton';
@@ -11,10 +10,9 @@ type StatusBoxProps = PropsWithChildren<{
   loaded: boolean;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   error: any;
-  data: V1beta1NodeNetworkState[];
 }>;
 
-const StatusBox: FC<StatusBoxProps> = ({ loaded, error, data, children }) => {
+const StatusBox: FC<StatusBoxProps> = ({ loaded, error, children }) => {
   const { t } = useNMStateTranslation();
 
   if (error)
@@ -37,15 +35,6 @@ const StatusBox: FC<StatusBoxProps> = ({ loaded, error, data, children }) => {
     return <ListSkeleton />;
   }
 
-  if (!data.length)
-    return (
-      <div className="cos-status-box">
-        <div data-test="empty-message" className="pf-u-text-align-center">
-          {t('No NodeNetworkStates found')}
-        </div>
-      </div>
-    );
-
   return <>{children}</>;
 };
 

diff --git a/src/views/states/list/hooks/useStateFilters.ts b/src/views/states/list/hooks/useStateFilters.ts
@@ -73,6 +73,7 @@ const useStateFilters = (): RowFilter<V1beta1NodeNetworkState>[] => {
         InterfaceType.OVS_INTERFACE,
         InterfaceType.BOND,
         InterfaceType.ETHERNET,
+        InterfaceType.LINUX_BRIDGE,
       ].map((interfaceType) => ({
         id: interfaceType,
         title: interfaceType,