chore: merge conflict resolution

Author: Usmanfee

src/assets/locales/de/main.json

@@ -2456,7 +2456,9 @@
     },
     "table": {
       "search": "Enter email to search",
-      "searchName": "Enter name to search"
+      "searchName": "Enter name to search",
+      "emptyDataMsg": "Keine Einträge vorhanden.\nEinträge werden hier angezeigt, sobald sie hinzugefügt werden.",
+      "noSearchResults": "Keine Ergebnisse gefunden.\nBitte versuchen Sie es mit anderen Suchbegriffen."
     },
     "noData": {
       "heading": "No data available",

src/assets/locales/en/main.json

@@ -2456,7 +2456,9 @@
     },
     "table": {
       "search": "Enter email to search",
-      "searchName": "Enter name to search"
+      "searchName": "Enter name to search",
+      "emptyDataMsg": "No items to display.\nItems will appear here once they are added.",
+      "noSearchResults": "No results found.\nPlease try again with different keywords."
     },
     "noData": {
       "heading": "No data available",

src/components/overlays/AddAppUserRoles/UserListContent.tsx

@@ -66,7 +66,6 @@ export default function UserListContent() {
       onSelection={(id: GridRowId[]) => {
         dispatch(setSelectedUserToAdd(id))
       }}
-      noRowsMsg={t('content.usermanagement.table.noRowsMsg')}
       title={t('content.usermanagement.table.title')}
       loadLabel={t('global.actions.loadmore')}
       fetchHook={useFetchAppUsersSearchQuery}

src/components/pages/AppOverview/AddRoles.tsx

@@ -61,6 +61,7 @@ export default function AddRoles() {
   const navigate = useNavigate()
   const appId = useParams().appId
   const [isLoading, setIsLoading] = useState(false)
+  const [noRowsMsg, setNoRowsMsg] = useState<string>('')
   const { state } = useLocation()
   const items = state
   const app = items?.filter((item: ItemType) => item.id === appId)
@@ -74,6 +75,14 @@ export default function AddRoles() {
     [`${(<Checkbox disabled={true} />)}`],
   ])
 
+  const appRolesData =
+    data && data.length > 0
+      ? appRoles.map((item, i) => ({
+          establishedRoles: item[0],
+          id: i,
+        }))
+      : []
+
   useEffect(() => {
     refetch()
   }, [state])
@@ -91,13 +100,11 @@ export default function AddRoles() {
     )
   }, [data])
 
-  const appRolesData =
-    data && data.length > 0
-      ? appRoles.map((item, i) => ({
-          establishedRoles: item[0],
-          id: i,
-        }))
-      : []
+  useEffect(() => {
+    if (appRolesData && appRolesData.length === 0) {
+      setNoRowsMsg(t('global.table.emptyDataMsg'))
+    }
+  }, [appRolesData])
 
   const columns = [
     {
@@ -194,6 +201,7 @@ export default function AddRoles() {
               rows={appRolesData}
               getRowId={(row) => uniqueId(row.urn)}
               hasBorder={false}
+              noRowsMsg={noRowsMsg}
             />
           </Box>
         </div>

src/components/pages/CompanyData/CompanyAddressList.tsx

@@ -18,7 +18,7 @@
  ********************************************************************************/
 
 import { Chip, IconButton, Table } from '@catena-x/portal-shared-components'
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { Box } from '@mui/material'
 import { useTranslation } from 'react-i18next'
@@ -60,6 +60,7 @@ export const CompanyAddressList = ({
   handleConfirm: () => void
 }) => {
   const { t } = useTranslation()
+  const [noRowsMsg, setNoRowsMsg] = useState<string>('')
   const [page, setPage] = useState<number>(0)
   const {
     data,
@@ -80,6 +81,8 @@ export const CompanyAddressList = ({
   const dispatch = useDispatch()
   const refetch = useSelector(companyRefetch)
 
+  const rows = useMemo(() => inputs.concat(outputs), [inputs, outputs])
+
   const getInputItems = async () => {
     const params = sharingStates
       ?.filter(
@@ -139,6 +142,12 @@ export const CompanyAddressList = ({
     }
   }, [data])
 
+  useEffect(() => {
+    if (rows && rows.length === 0) {
+      setNoRowsMsg(t('global.table.emptyDataMsg'))
+    }
+  }, [rows])
+
   const getStatus = (id: string) =>
     sharingStates?.filter((state) => id === state.externalId)[0]
       ?.sharingStateType
@@ -212,9 +221,7 @@ export const CompanyAddressList = ({
         columnHeadersBackgroundColor={'#FFFFFF'}
         searchDebounce={1000}
         noRowsMsg={
-          !isFetching && !isOutputLoading && !isInputLoading
-            ? t('content.companyData.table.noRowsMsg')
-            : ''
+          !isFetching && !isOutputLoading && !isInputLoading ? noRowsMsg : ''
         }
         title={t('content.companyData.table.title')}
         getRowId={(row: { [key: string]: string }) => row.createdAt}

src/components/pages/EdcConnector/index.tsx

@@ -517,7 +517,6 @@ const EdcConnector = () => {
               fetchHookRefresh={refresh}
               getRowId={(row: { [key: string]: string }) => row.id}
               columns={managedConnectorCols}
-              noRowsMsg={t('content.edcconnector.noConnectorsMessage')}
               onCellClick={(params: GridCellParams) => {
                 onTableCellClick(params)
               }}

src/components/pages/IDPManagement/IDPList.tsx

@@ -88,6 +88,7 @@ export const IDPList = ({ isManagementOSP }: { isManagementOSP?: boolean }) => {
 
   const [disableLoading, setDisableLoading] = useState(false)
   const [deleteLoading, setDeleteLoading] = useState(false)
+  const [noRowsMsg, setNoRowsMsg] = useState<string>('')
 
   const { data, isFetching } = useFetchIDPListQuery()
   const idpsData = data
@@ -107,6 +108,13 @@ export const IDPList = ({ isManagementOSP }: { isManagementOSP?: boolean }) => {
     setIdpsManagedData(managedIdpsData)
   }, [data])
 
+  useEffect(() => {
+    const dataRows = isManagementOSP ? idpsManagedData : idpsData
+    if (dataRows && dataRows.length === 0) {
+      setNoRowsMsg(t('global.table.emptyDataMsg'))
+    }
+  }, [isManagementOSP, idpsData, idpsManagedData])
+
   const doDelete = async (
     e: React.MouseEvent<HTMLElement, MouseEvent>,
     idp: IdentityProvider
@@ -474,6 +482,7 @@ export const IDPList = ({ isManagementOSP }: { isManagementOSP?: boolean }) => {
       rows={(isManagementOSP ? idpsManagedData : idpsData) ?? []}
       getRowId={(row: { [key: string]: string }) => row.identityProviderId}
       hasBorder={false}
+      noRowsMsg={noRowsMsg}
       searchPlaceholder={
         isManagementOSP
           ? t('content.onboardingServiceProvider.search')

src/components/pages/PartnerNetwork/index.tsx

@@ -47,6 +47,7 @@ const PartnerNetwork = () => {
   const { t } = useTranslation()
   const [expr, setExpr] = useState<string>('')
   const [bpn, setBpn] = useState<string>('')
+  const [noRowsMsg, setNoRowsMsg] = useState<string>('')
   const searchInputData = useSelector(updatePartnerSelector)
   const columns = PartnerNetworksTableColumns(t)
   const [mutationRequest] = useFetchBusinessPartnerAddressMutation()
@@ -89,6 +90,16 @@ const PartnerNetwork = () => {
     if (data && data.length > 0) fetchAllMembers()
   }, [data, fetchArgs])
 
+  useEffect(() => {
+    if (allItems) {
+      if (!(expr || bpn) && allItems.length === 0) {
+        setNoRowsMsg(t('global.table.emptyDataMsg'))
+      } else if ((expr || bpn) && allItems.length === 0) {
+        setNoRowsMsg(t('global.table.noSearchResults'))
+      }
+    }
+  }, [allItems, expr, bpn])
+
   const setCountryAttributes = (payload: PaginResult<BusinessPartner>) => {
     let finalObj = JSON.parse(JSON.stringify(payload?.content))
     finalObj = addCountryAttribute(
@@ -171,7 +182,7 @@ const PartnerNetwork = () => {
           loading={loading}
           rows={allItems}
           rowsCount={allItems?.length}
-          noRowsMsg={t('content.companyData.table.noRowsMsg')}
+          noRowsMsg={noRowsMsg}
           nextPage={() => {
             setPage(page + 1)
           }}

src/components/pages/SemanticHub/ModelTable.tsx

@@ -51,6 +51,7 @@ const ModelTable = ({ onModelSelect }: ModelTableProps) => {
   const [selectedFilter, setSelectedFilter] = useState<SelectedFilter>({
     status: [DefaultStatus],
   })
+  const [noRowsMsg, setNoRowsMsg] = useState<string>('')
   const rowCount = 10
   const filter = [
     {
@@ -94,6 +95,16 @@ const ModelTable = ({ onModelSelect }: ModelTableProps) => {
 
   const { uploadedModel } = useSelector(semanticModelsSelector)
 
+  useEffect(() => {
+    if (models) {
+      if (!searchValue && models.length === 0) {
+        setNoRowsMsg(t('global.table.emptyDataMsg'))
+      } else if (searchValue && models.length === 0) {
+        setNoRowsMsg(t('global.table.noSearchResults'))
+      }
+    }
+  }, [models, searchValue])
+
   useEffect(() => {
     if (modelList) {
       if (pageNumber === 0) {
@@ -156,6 +167,7 @@ const ModelTable = ({ onModelSelect }: ModelTableProps) => {
     <section>
       <Table
         autoFocus={false}
+        searchExpr={searchValue}
         rowsCount={modelList?.totalItems}
         hideFooter
         loading={loadingModelList}
@@ -184,7 +196,7 @@ const ModelTable = ({ onModelSelect }: ModelTableProps) => {
         reload={() => {
           setPageNumber(0)
         }}
-        noRowsMsg={t('global.noData.heading')}
+        noRowsMsg={noRowsMsg}
       />
       <div className="load-more-button-container">
         {modelList?.totalPages !== pageNumber && (

src/components/shared/frame/UserList/index.tsx

@@ -120,7 +120,6 @@ export const UserList = ({
           onSearch(expr)
         }}
         searchDebounce={1000}
-        noRowsMsg={t('content.usermanagement.appUserDetails.table.noRowsMsg')}
         title={t(tableLabel)}
         loadLabel={t('global.actions.more')}
         fetchHook={fetchHook}