awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 07:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/secret-import/secret-import-fns.ts
+1 -1
View File
@@ -220,7 +220,7 @@ export const fnSecretsV2FromImports = async ({
const secretsFromdeeperImportGroupedByFolderId = groupBy(secretsFromDeeperImports, (i) => i.importFolderId); const secretsFromdeeperImportGroupedByFolderId = groupBy(secretsFromDeeperImports, (i) => i.importFolderId);
const processedImports = allowedImports.map(({ importPath, importEnv, id, folderId }, i) => { 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 = const folderDeeperImportSecrets =
secretsFromdeeperImportGroupedByFolderId?.[sourceImportFolder?.id || ""]?.[0]?.secrets || []; secretsFromdeeperImportGroupedByFolderId?.[sourceImportFolder?.id || ""]?.[0]?.secrets || [];
const secretsWithDuplicate = (importedSecretsGroupByFolderId?.[importedFolders?.[i]?.id as string] || []) const secretsWithDuplicate = (importedSecretsGroupByFolderId?.[importedFolders?.[i]?.id as string] || [])
frontend/src/views/Org/MembersPage/components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
+1 -1
View File
@@ -277,7 +277,7 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
})} })}
</TBody> </TBody>
</Table> </Table>
{!isLoading && data && ( {!isLoading && data && data.totalCount > 0 && (
<Pagination <Pagination
count={data.totalCount} count={data.totalCount}
page={page} page={page}
frontend/src/views/Project/MembersPage/components/IdentityTab/IdentityTab.tsx
+1 -1
View File
@@ -369,7 +369,7 @@ export const IdentityTab = withProjectPermission(
})} })}
</TBody> </TBody>
</Table> </Table>
{!isLoading && data && ( {!isLoading && data && data.totalCount > 0 && (
<Pagination <Pagination
count={data.totalCount} count={data.totalCount}
page={page} page={page}
frontend/src/views/SecretMainPage/SecretMainPage.tsx
+1 -1
View File
@@ -358,7 +358,7 @@ export const SecretMainPage = () => {
{!canReadSecret && folders?.length === 0 && <PermissionDeniedBanner />} {!canReadSecret && folders?.length === 0 && <PermissionDeniedBanner />}
</div> </div>
</div> </div>
{!isDetailsLoading && ( {!isDetailsLoading && totalCount > 0 && (
<Pagination <Pagination
startAdornment={ startAdornment={
<SecretTableResourceCount <SecretTableResourceCount
frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
+1 -1
View File
@@ -953,7 +953,7 @@ export const SecretOverviewPage = () => {
</Tr> </Tr>
</TFoot> </TFoot>
</Table> </Table>
{!isOverviewLoading && ( {!isOverviewLoading && totalCount > 0 && (
<Pagination <Pagination
startAdornment={ startAdornment={
<SecretTableResourceCount <SecretTableResourceCount