fix: hide pagination if table empty and add optional chaining operator to fix invalid imports

This commit is contained in:
Scott Wilson
2024-09-19 19:28:09 -07:00
parent bc74c44f97
commit 0a1f25a659
5 changed files with 5 additions and 5 deletions

View File

@@ -220,7 +220,7 @@ export const fnSecretsV2FromImports = async ({
const secretsFromdeeperImportGroupedByFolderId = groupBy(secretsFromDeeperImports, (i) => i.importFolderId);
const processedImports = allowedImports.map(({ importPath, importEnv, id, folderId }, i) => {
const sourceImportFolder = importedFolderGroupBySourceImport[`${importEnv.id}-${importPath}`][0];
const sourceImportFolder = importedFolderGroupBySourceImport[`${importEnv.id}-${importPath}`]?.[0];
const folderDeeperImportSecrets =
secretsFromdeeperImportGroupedByFolderId?.[sourceImportFolder?.id || ""]?.[0]?.secrets || [];
const secretsWithDuplicate = (importedSecretsGroupByFolderId?.[importedFolders?.[i]?.id as string] || [])

View File

@@ -277,7 +277,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
})}
</TBody>
</Table>
{!isLoading && data && (
{!isLoading && data && data.totalCount > 0 && (
<Pagination
count={data.totalCount}
page={page}

View File

@@ -369,7 +369,7 @@ export const IdentityTab = withProjectPermission(
})}
</TBody>
</Table>
{!isLoading && data && (
{!isLoading && data && data.totalCount > 0 && (
<Pagination
count={data.totalCount}
page={page}

View File

@@ -358,7 +358,7 @@ export const SecretMainPage = () => {
{!canReadSecret && folders?.length === 0 && <PermissionDeniedBanner />}
</div>
</div>
{!isDetailsLoading && (
{!isDetailsLoading && totalCount > 0 && (
<Pagination
startAdornment={
<SecretTableResourceCount

View File

@@ -953,7 +953,7 @@ export const SecretOverviewPage = () => {
</Tr>
</TFoot>
</Table>
{!isOverviewLoading && (
{!isOverviewLoading && totalCount > 0 && (
<Pagination
startAdornment={
<SecretTableResourceCount