From 98ab96935630bf8513ae8f6d974ed94446293a0f Mon Sep 17 00:00:00 2001 From: Scott Wilson Date: Mon, 2 Jun 2025 20:24:50 -0700 Subject: [PATCH] improvements: address greppy --- .../secret-scanning-v2-router.ts | 2 +- .../github/github-secret-scanning-factory.ts | 4 +--- .../github/github-secret-scanning-schemas.ts | 3 ++- .../secret-scanning-v2-service.ts | 1 + backend/src/lib/regex/index.ts | 2 ++ .../services/app-connection/app-connection-fns.ts | 1 - .../platform/secret-scanning/github.mdx | 5 ++--- .../components/DeleteProjectTemplateModal.tsx | 2 +- .../components/EditProjectTemplate.tsx | 2 +- .../DeleteSecretRotationV2Modal.tsx | 2 +- .../DeleteSecretScanningDataSourceModal.tsx | 6 +++--- .../GitHubDataSourceConfigFields.tsx | 2 +- .../SecretScanningDataSourceConnectionField.tsx | 6 ++---- .../forms/SecretScanningDataSourceForm.tsx | 6 +++--- .../forms/schemas/github-data-source-schema.ts | 6 +++++- .../secret-syncs/DeleteSecretSyncModal.tsx | 2 +- frontend/src/helpers/appConnections.ts | 1 - .../shared/secret-scanning-data-source-base.ts | 4 ++-- .../components/MachineIdentitiesTable.tsx | 2 +- .../components/UserIdentitiesTable.tsx | 4 ++-- .../AlertingPage/components/PkiAlertsSection.tsx | 2 +- .../components/PkiCollectionSection.tsx | 2 +- .../CertAuthDetailsByIDPage.tsx | 2 +- .../components/CaSection.tsx | 4 ++-- .../components/ExternalCaSection.tsx | 4 ++-- .../components/CertificateTemplatesSection.tsx | 2 +- .../components/CertificatesSection.tsx | 2 +- .../PkiCollectionDetailsByIDPage.tsx | 2 +- .../components/PkiCollectionItemsSection.tsx | 2 +- .../DeleteProjectSection/DeleteProjectSection.tsx | 14 +++----------- .../KmipPage/components/DeleteKmipClientModal.tsx | 2 +- .../OverviewPage/components/DeleteCmekModal.tsx | 2 +- .../DeleteProjectSection/DeleteProjectSection.tsx | 14 +++----------- .../OrgGroupsSection/OrgGroupsSection.tsx | 2 +- .../components/IdentitySection/IdentitySection.tsx | 2 +- .../OrgMembersSection/OrgMembersSection.tsx | 4 ++-- .../components/OrgRoleTabSection/OrgRoleTable.tsx | 2 +- .../components/AppConnectionList.tsx | 2 +- .../components/DeleteAppConnectionModal.tsx | 2 +- .../Gateways/GatewayListPage/GatewayListPage.tsx | 2 +- .../GroupDetailsByIDPage/GroupDetailsByIDPage.tsx | 2 +- .../GroupMembersSection/GroupMembersSection.tsx | 2 +- .../IdentityDetailsByIDPage.tsx | 2 +- .../IdentityProjectsSection.tsx | 2 +- .../IdentityTokenAuthTokensTable.tsx | 2 +- .../IdentityUniversalAuthClientSecretsTable.tsx | 2 +- .../ViewIdentityAuthModal.tsx | 2 +- .../organization/RoleByIDPage/RoleByIDPage.tsx | 2 +- .../SecretScanningSettingsPage/route.tsx | 2 +- .../OrgDeleteSection/OrgDeleteSection.tsx | 2 +- .../OrgEncryptionTab/OrgEncryptionTab.tsx | 2 +- .../OrgWorkflowIntegrationTab.tsx | 2 +- .../GithubOrgSyncConfigModal.tsx | 2 +- .../OrgProvisioningTab/ScimTokenModal.tsx | 2 +- .../components/OrgSsoTab/LDAPGroupMapModal.tsx | 2 +- .../SsoPage/components/OrgSsoTab/LDAPModal.tsx | 2 +- .../SsoPage/components/OrgSsoTab/OIDCModal.tsx | 2 +- .../SsoPage/components/OrgSsoTab/SSOModal.tsx | 2 +- .../UserDetailsByIDPage/UserDetailsByIDPage.tsx | 4 ++-- .../UserProjectsSection/UserGroupsSection.tsx | 2 +- .../components/GroupsSection/GroupsSection.tsx | 2 +- .../components/IdentityTab/IdentityTab.tsx | 2 +- .../components/ProjectRoleList/ProjectRoleList.tsx | 2 +- .../IdentityDetailsByIDPage.tsx | 2 +- .../RoleDetailsBySlugPage.tsx | 2 +- .../components/ProjectRoleModifySection.utils.tsx | 9 +++++++++ .../components/IPAllowlistSection.tsx | 2 +- .../IntegrationsDetailsByIDPage.tsx | 2 +- .../CloudIntegrationSection.tsx | 2 +- .../NativeIntegrationsTab.tsx | 2 +- .../SecretRotationPage/SecretRotationPage.tsx | 2 +- .../DeleteProjectSection/DeleteProjectSection.tsx | 14 +++----------- .../EnvironmentSection/EnvironmentSection.tsx | 2 +- .../WorkflowIntegrationTab.tsx | 2 +- .../components/SecretScanningResourceRow.tsx | 2 +- .../components/SecretScanningResourceTable.tsx | 2 +- .../components/SecretScanningDataSourceRow.tsx | 2 +- .../components/SecretScanningDataSourcesTable.tsx | 2 +- .../SecretScanningUpdateFindingModal.tsx | 2 +- .../DeleteProjectSection/DeleteProjectSection.tsx | 14 +++----------- .../DeleteProjectSection/DeleteProjectSection.tsx | 14 +++----------- .../src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx | 2 +- .../components/SshCertificateTemplatesSection.tsx | 4 ++-- .../ssh/SshCasPage/components/SshCaSection.tsx | 4 ++-- .../SshHostGroupDetailsByIDPage.tsx | 2 +- .../components/SshHostGroupHostsSection.tsx | 2 +- .../DeleteAccountSection/DeleteAccountSection.tsx | 2 +- .../components/SecuritySection/MFASection.tsx | 2 +- .../components/SessionsSection/SessionsTable.tsx | 2 +- 89 files changed, 125 insertions(+), 155 deletions(-) diff --git a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts index ba77b5b7a..70cfd08dc 100644 --- a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts +++ b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts @@ -242,7 +242,7 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider) tags: [ApiDocsTags.SecretScanning], description: "Update the specified Secret Scanning Configuration.", querystring: z.object({ - projectId: z.string().trim().min(1, "Finding ID required").describe(SecretScanningConfigs.UPDATE.projectId) + projectId: z.string().trim().min(1, "Project ID required").describe(SecretScanningConfigs.UPDATE.projectId) }), body: z.object({ content: z.string().nullable().describe(SecretScanningConfigs.UPDATE.content) diff --git a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts index e40d7f622..fc104e781 100644 --- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts +++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts @@ -1,6 +1,5 @@ import { join } from "path"; import { ProbotOctokit } from "probot"; -import RE2 from "re2"; import { scanContentAndGetFindings } from "@app/ee/services/secret-scanning/secret-scanning-queue/secret-scanning-fns"; import { SecretMatch } from "@app/ee/services/secret-scanning/secret-scanning-queue/secret-scanning-queue-types"; @@ -25,12 +24,11 @@ import { import { getConfig } from "@app/lib/config/env"; import { BadRequestError } from "@app/lib/errors"; import { titleCaseToCamelCase } from "@app/lib/fn"; +import { GitHubRepositoryRegex } from "@app/lib/regex"; import { listGitHubRadarRepositories, TGitHubRadarConnection } from "@app/services/app-connection/github-radar"; import { TGitHubDataSourceWithConnection, TQueueGitHubResourceDiffScan } from "./github-secret-scanning-types"; -const GitHubRepositoryRegex = new RE2(/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/); - export const GitHubSecretScanningFactory = () => { const initialize: TSecretScanningFactoryInitialize = async ( { connection, secretScanningV2DAL }, diff --git a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts index 3cbd7f69f..e36248bfb 100644 --- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts +++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts @@ -12,11 +12,12 @@ import { GitRepositoryScanFindingDetailsSchema } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-schemas"; import { SecretScanningDataSources } from "@app/lib/api-docs"; +import { GitHubRepositoryRegex } from "@app/lib/regex"; import { AppConnection } from "@app/services/app-connection/app-connection-enums"; export const GitHubDataSourceConfigSchema = z.object({ includeRepos: z - .array(z.string().min(1).max(256)) + .array(z.string().regex(GitHubRepositoryRegex, "Invalid repository name format").min(1).max(256)) .nonempty("One or more repositories required") .max(25) .default(["*"]) diff --git a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts index 85d8c4807..05449bd0d 100644 --- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts +++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts @@ -827,6 +827,7 @@ export const secretScanningV2ServiceFactory = ({ const configPath = join(tempFolder, "infisical-scan.toml"); await writeTextToFile(configPath, content); + // just checking if config parses await scanContentAndGetFindings("", configPath); } catch (e) { throw new BadRequestError({ diff --git a/backend/src/lib/regex/index.ts b/backend/src/lib/regex/index.ts index be9430669..c472f8d5d 100644 --- a/backend/src/lib/regex/index.ts +++ b/backend/src/lib/regex/index.ts @@ -9,3 +9,5 @@ export const DistinguishedNameRegex = export const UserPrincipalNameRegex = new RE2(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9._-]+\.[a-zA-Z]{2,}$/); export const LdapUrlRegex = new RE2(/^ldaps?:\/\//); + +export const GitHubRepositoryRegex = new RE2(/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/); diff --git a/backend/src/services/app-connection/app-connection-fns.ts b/backend/src/services/app-connection/app-connection-fns.ts index fdf205afa..4597d8f45 100644 --- a/backend/src/services/app-connection/app-connection-fns.ts +++ b/backend/src/services/app-connection/app-connection-fns.ts @@ -195,7 +195,6 @@ export const validateAppConnectionCredentials = async ( export const getAppConnectionMethodName = (method: TAppConnection["method"]) => { switch (method) { case GitHubConnectionMethod.App: - return "GitHub App"; case GitHubRadarConnectionMethod.App: return "GitHub App"; case AzureKeyVaultConnectionMethod.OAuth: diff --git a/docs/documentation/platform/secret-scanning/github.mdx b/docs/documentation/platform/secret-scanning/github.mdx index 0dfa1f146..9fa766ed6 100644 --- a/docs/documentation/platform/secret-scanning/github.mdx +++ b/docs/documentation/platform/secret-scanning/github.mdx @@ -31,7 +31,7 @@ description: "Learn how to configure secret scanning for GitHub." ![Data Source Details](/images/platform/secret-scanning/github/github-data-source-step-4.png) - **Name** - the name of the data source. Must be slug-friendly. - - **Description** (optional) - a description of this rotation configuration. + - **Description** (optional) - a description of this data source. 5. Review your data source, then click **Create Data Source**. ![Data Source Review](/images/platform/secret-scanning/github/github-data-source-step-5.png) @@ -60,9 +60,8 @@ description: "Learn how to configure secret scanning for GitHub." "description": "my github data source", "connectionId": "3c90c3cc-0d44-4b50-8888-8dd25736052a", "isAutoScanEnabled": true, - "rotationInterval": 30, "config": { - "includeRepos": ["*"], + "includeRepos": ["*"] } }' ``` diff --git a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx index 09537ce57..8ccdb0191 100644 --- a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx +++ b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx @@ -41,7 +41,7 @@ export const DeleteProjectTemplateModal = ({ isOpen, onOpenChange, template }: P diff --git a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx index 9b7164f80..666edf87b 100644 --- a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx +++ b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx @@ -112,7 +112,7 @@ export const EditProjectTemplate = ({ isInfisicalTemplate, projectTemplate, onBa /> handlePopUpToggle("removeTemplate", isOpen)} onDeleteApproved={handleRemoveTemplate} diff --git a/frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx b/frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx index 16f9a67d4..20b08eb49 100644 --- a/frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx +++ b/frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx @@ -66,7 +66,7 @@ export const DeleteSecretRotationV2Modal = ({ diff --git a/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx b/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx index 08b661b02..9cf918dfb 100644 --- a/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx +++ b/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx @@ -19,7 +19,7 @@ export const DeleteSecretScanningDataSourceModal = ({ dataSource, onComplete }: Props) => { - const deleteSecretRotation = useDeleteSecretScanningDataSource(); + const deleteDataSource = useDeleteSecretScanningDataSource(); if (!dataSource) return null; @@ -29,7 +29,7 @@ export const DeleteSecretScanningDataSourceModal = ({ const dataSourceType = SECRET_SCANNING_DATA_SOURCE_MAP[type].name; try { - await deleteSecretRotation.mutateAsync({ + await deleteDataSource.mutateAsync({ dataSourceId, type, projectId @@ -54,7 +54,7 @@ export const DeleteSecretScanningDataSourceModal = ({ diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/GitHubDataSourceConfigFields.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/GitHubDataSourceConfigFields.tsx index 2ccf9f8f8..be369bd07 100644 --- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/GitHubDataSourceConfigFields.tsx +++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/GitHubDataSourceConfigFields.tsx @@ -43,7 +43,7 @@ export const GitHubDataSourceConfigFields = () => { if (!includeRepos) { setValue("config.includeRepos", ["*"]); } - }, [includeRepos]); + }, [includeRepos, setValue]); return ( <> diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx index 4484cda61..3f995e1d0 100644 --- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx +++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx @@ -36,8 +36,6 @@ export const SecretScanningDataSourceConnectionField = ({ OrgPermissionSubjects.AppConnections ); - const appName = APP_CONNECTION_MAP[app].name; - return ( <> {canCreateConnection ? ( <> - You do not have access to any {appName} Connections. Create one from the{" "} + You do not have access to any {connectionName} Connections. Create one from the{" "} App Connections {" "} page. ) : ( - `You do not have access to any ${appName} Connections. Contact an admin to create one.` + `You do not have access to any ${connectionName} Connections. Contact an admin to create one.` )}

)} diff --git a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx index 386a1780a..b1ea0b559 100644 --- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx +++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx @@ -66,13 +66,13 @@ export const SecretScanningDataSourceForm = ({ type, onComplete, onCancel, dataS projectId: currentWorkspace.id }); try { - const rotation = await mutation; + const source = await mutation; createNotification({ - text: `Successfully ${dataSource ? "updated" : "created"} ${sourceType} Data Source`, + text: `Successfully ${source ? "updated" : "created"} ${sourceType} Data Source`, type: "success" }); - onComplete(rotation); + onComplete(source); } catch (err: any) { createNotification({ title: `Failed to ${dataSource ? "update" : "create"} ${sourceType} Data Source`, diff --git a/frontend/src/components/secret-scanning/forms/schemas/github-data-source-schema.ts b/frontend/src/components/secret-scanning/forms/schemas/github-data-source-schema.ts index 03c01b054..86f22b2b4 100644 --- a/frontend/src/components/secret-scanning/forms/schemas/github-data-source-schema.ts +++ b/frontend/src/components/secret-scanning/forms/schemas/github-data-source-schema.ts @@ -8,7 +8,11 @@ export const GitHubDataSourceSchema = z .object({ type: z.literal(SecretScanningDataSource.GitHub), config: z.object({ - includeRepos: z.string().array().min(1, "One or more repositories required") + includeRepos: z + .string() + .array() + .min(1, "One or more repositories required") + .max(25, "Cannot configure more than 25 repositories") }) }) .merge(BaseSecretScanningDataSourceSchema({ isConnectionRequired: true })); diff --git a/frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx b/frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx index 71c20832b..2b3903a9b 100644 --- a/frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx +++ b/frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx @@ -52,7 +52,7 @@ export const DeleteSecretSyncModal = ({ isOpen, onOpenChange, secretSync, onComp diff --git a/frontend/src/helpers/appConnections.ts b/frontend/src/helpers/appConnections.ts index d36bb55fd..54210438a 100644 --- a/frontend/src/helpers/appConnections.ts +++ b/frontend/src/helpers/appConnections.ts @@ -80,7 +80,6 @@ export const APP_CONNECTION_MAP: Record< export const getAppConnectionMethodDetails = (method: TAppConnection["method"]) => { switch (method) { case GitHubConnectionMethod.App: - return { name: "GitHub App", icon: faGithub }; case GitHubRadarConnectionMethod.App: return { name: "GitHub App", icon: faGithub }; case AzureKeyVaultConnectionMethod.OAuth: diff --git a/frontend/src/hooks/api/secretScanningV2/types/shared/secret-scanning-data-source-base.ts b/frontend/src/hooks/api/secretScanningV2/types/shared/secret-scanning-data-source-base.ts index 82dab866a..bcba0b02a 100644 --- a/frontend/src/hooks/api/secretScanningV2/types/shared/secret-scanning-data-source-base.ts +++ b/frontend/src/hooks/api/secretScanningV2/types/shared/secret-scanning-data-source-base.ts @@ -8,11 +8,11 @@ export type TSecretScanningDataSourceBase = { createdAt: string; updatedAt: string; projectId: string; - connection: { + connection?: { app: AppConnection; id: string; name: string; - }; + } | null; isAutoScanEnabled: boolean; isDisconnected: boolean; }; diff --git a/frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx b/frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx index d3869fdfe..7d4527032 100644 --- a/frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx +++ b/frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx @@ -164,7 +164,7 @@ export const MachineIdentitiesTable = () => { { /> { /> { handlePopUpToggle("deletePkiAlert", isOpen)} diff --git a/frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx b/frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx index 5a4ae723b..81f5a8609 100644 --- a/frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx +++ b/frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx @@ -70,7 +70,7 @@ export const PkiCollectionSection = () => { handlePopUpToggle("deletePkiCollection", isOpen)} diff --git a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx index dd202f981..bd1a9318d 100644 --- a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx +++ b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx @@ -135,7 +135,7 @@ const Page = () => { { { /> { { /> { handlePopUpToggle("deleteCertificateTemplate", isOpen)} diff --git a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx index 4eb4a4fb4..44ddbc8ba 100644 --- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx +++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx @@ -89,7 +89,7 @@ export const CertificatesSection = () => { handlePopUpToggle("deleteCertificate", isOpen)} diff --git a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx index e851e33d3..b95ff4d5f 100644 --- a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx +++ b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx @@ -152,7 +152,7 @@ export const PkiCollectionPage = () => { handlePopUpToggle("deletePkiCollection", isOpen)} deleteKey="confirm" onDeleteApproved={() => diff --git a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx index 02df725d0..b6f363fbf 100644 --- a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx +++ b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx @@ -74,7 +74,7 @@ export const PkiCollectionItemsSection = ({ collectionId, type }: Props) => { /> handlePopUpToggle("deletePkiCollectionItem", isOpen)} deleteKey="confirm" onDeleteApproved={() => { diff --git a/frontend/src/pages/cert-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/pages/cert-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx index 042adff1f..5a7549b3c 100644 --- a/frontend/src/pages/cert-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx +++ b/frontend/src/pages/cert-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx @@ -79,14 +79,6 @@ export const DeleteProjectSection = () => { }; const handleLeaveWorkspaceSubmit = async () => { - console.log({ - currentWorkspace, - currentOrg, - members, - isNoAccessMember, - membership - }); - try { setIsLeaving.on(); @@ -170,7 +162,7 @@ export const DeleteProjectSection = () => { handlePopUpToggle("deleteWorkspace", isOpen)} deleteKey="confirm" @@ -180,8 +172,8 @@ export const DeleteProjectSection = () => { handlePopUpToggle("leaveWorkspace", isOpen)} deleteKey="confirm" buttonText="Leave Project" diff --git a/frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx b/frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx index d9f833543..fe9c956ab 100644 --- a/frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx +++ b/frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx @@ -44,7 +44,7 @@ export const DeleteKmipClientModal = ({ isOpen, onOpenChange, kmipClient }: Prop return ( { return ( { }; const handleLeaveWorkspaceSubmit = async () => { - console.log({ - currentWorkspace, - currentOrg, - members, - isNoAccessMember, - membership - }); - try { setIsLeaving.on(); @@ -170,7 +162,7 @@ export const DeleteProjectSection = () => { handlePopUpToggle("deleteWorkspace", isOpen)} deleteKey="confirm" @@ -180,8 +172,8 @@ export const DeleteProjectSection = () => { handlePopUpToggle("leaveWorkspace", isOpen)} deleteKey="confirm" buttonText="Leave Project" diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx index cc50e018c..fbe2d88f0 100644 --- a/frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx +++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx @@ -80,7 +80,7 @@ export const OrgGroupsSection = () => { /> handlePopUpToggle("deleteGroup", isOpen)} diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx index cf185563a..19680ef24 100644 --- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx +++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx @@ -127,7 +127,7 @@ export const IdentitySection = withPermission( handlePopUpToggle("deleteIdentity", isOpen)} diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx index be203705d..f88ef5131 100644 --- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx +++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx @@ -143,7 +143,7 @@ export const OrgMembersSection = () => { /> handlePopUpToggle("removeMember", isOpen)} @@ -156,7 +156,7 @@ export const OrgMembersSection = () => { /> handlePopUpToggle("deactivateMember", isOpen)} diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx index 508e385df..54b257a72 100644 --- a/frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx +++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx @@ -280,7 +280,7 @@ export const OrgRoleTable = () => { handlePopUpToggle("deleteRole", isOpen)} diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx index cb7fdc84f..1f11ce363 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx @@ -54,7 +54,7 @@ export const AppConnectionsSelect = ({ onSelect }: Props) => { /> {icon && ( diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx index 9ad2ce92d..e5f6b3684 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx @@ -44,7 +44,7 @@ export const DeleteAppConnectionModal = ({ isOpen, onOpenChange, appConnection } diff --git a/frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx b/frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx index 632008eeb..703dca3a7 100644 --- a/frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx +++ b/frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx @@ -229,7 +229,7 @@ export const GatewayListPage = withPermission( )} handlePopUpToggle("deleteGateway", isOpen)} diff --git a/frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx b/frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx index b6d7dc03b..8cdaaf927 100644 --- a/frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx +++ b/frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx @@ -157,7 +157,7 @@ const Page = () => { /> handlePopUpToggle("deleteGroup", isOpen)} diff --git a/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx b/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx index 90ed8da2a..2b022020d 100644 --- a/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx +++ b/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx @@ -94,7 +94,7 @@ export const GroupMembersSection = ({ groupId, groupSlug }: Props) => { handlePopUpToggle("removeMemberFromGroup", isOpen)} diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx index 5bc74e0be..d4de5f1c4 100644 --- a/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx +++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx @@ -101,7 +101,7 @@ const Page = () => { /> handlePopUpToggle("deleteIdentity", isOpen)} diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx index b0c13009d..0ea97c4d3 100644 --- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx +++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx @@ -66,7 +66,7 @@ export const IdentityProjectsSection = ({ identityId }: Props) => { { handlePopUpToggle("revokeToken", isOpen)} diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx index 929f6e4d8..d63549855 100644 --- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx +++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx @@ -175,7 +175,7 @@ export const IdentityUniversalAuthClientSecretsTable = ({ clientSecrets, identit handlePopUpToggle("revokeAuthMethod", isOpen)} deleteKey="confirm" buttonText="Remove" diff --git a/frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx b/frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx index 7acc468f8..7b68b7fdd 100644 --- a/frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx +++ b/frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx @@ -155,7 +155,7 @@ export const Page = () => { handlePopUpToggle("deleteOrgRole", isOpen)} deleteKey="confirm" onDeleteApproved={() => onDeleteOrgRoleSubmit()} diff --git a/frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx b/frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx index 79fcac05e..0a9fc4254 100644 --- a/frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx +++ b/frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx @@ -16,7 +16,7 @@ export const Route = createFileRoute( }, { label: "Secret Scanning", - link: linkOptions({ to: "/organization/secret-scanning/settings" }) + link: linkOptions({ to: "/organization/secret-scanning/overview" }) }, { label: "Settings" diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx index bb2e9ea4d..2050d53b7 100644 --- a/frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx +++ b/frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx @@ -59,7 +59,7 @@ export const OrgDeleteSection = () => { handlePopUpToggle("deleteOrg", isOpen)} deleteKey="confirm" diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx index 8f1bd8e79..628df8de8 100644 --- a/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx +++ b/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx @@ -136,7 +136,7 @@ export const OrgEncryptionTab = withPermission( /> handlePopUpToggle("removeExternalKms", isOpen)} diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx index 374c679a1..b1faab25a 100644 --- a/frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx +++ b/frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx @@ -305,7 +305,7 @@ export const OrgWorkflowIntegrationTab = withPermission( /> handlePopUpToggle("removeIntegration", isOpen)} deleteKey="confirm" onDeleteApproved={handleRemoveIntegration} diff --git a/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx b/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx index 1aa050441..0710afa8a 100644 --- a/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx +++ b/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx @@ -162,7 +162,7 @@ export const GithubOrgSyncConfigModal = ({ handlePopUpToggle("deleteGithubOrgSyncConfig", isOpen)} deleteKey="confirm" onDeleteApproved={onDelete} diff --git a/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx b/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx index cc44204c9..5247f575c 100644 --- a/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx +++ b/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx @@ -301,7 +301,7 @@ export const ScimTokenModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Pr handlePopUpToggle("scimToken", isOpen)} deleteKey="confirm" onDeleteApproved={() => { diff --git a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx index 8e6877cad..aee845187 100644 --- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx +++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx @@ -249,7 +249,7 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: handlePopUpToggle("deleteLdapGroupMap", isOpen)} diff --git a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx index da75a769b..aef925733 100644 --- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx +++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx @@ -361,7 +361,7 @@ export const LDAPModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele setIsDeletePopupOpen.toggle()} deleteKey="confirm" onDeleteApproved={handleLdapSoftDelete} diff --git a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx index 241348b0d..52df20285 100644 --- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx +++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx @@ -478,7 +478,7 @@ export const OIDCModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele setIsDeletePopupOpen.toggle()} deleteKey="confirm" onDeleteApproved={handleOidcSoftDelete} diff --git a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx index a7dff9d02..df5fca59f 100644 --- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx +++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx @@ -371,7 +371,7 @@ export const SSOModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDelet setIsDeletePopupOpen.toggle()} deleteKey="confirm" onDeleteApproved={handleSamlSoftDelete} diff --git a/frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx b/frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx index 0daf7872b..0b48c5c9f 100644 --- a/frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx +++ b/frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx @@ -259,7 +259,7 @@ const Page = withPermission( )} handlePopUpToggle("removeMember", isOpen)} @@ -272,7 +272,7 @@ const Page = withPermission( /> handlePopUpToggle("deactivateMember", isOpen)} diff --git a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx index 7fc600b2a..969d3c516 100644 --- a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx +++ b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx @@ -53,7 +53,7 @@ export const UserGroupsSection = ({ orgMembership }: Props) => { handlePopUpToggle("removeUserFromGroup", isOpen)} deleteKey="confirm" onDeleteApproved={() => { diff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx index 8c5d18b75..e5b46ca3b 100644 --- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx +++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx @@ -87,7 +87,7 @@ export const GroupsSection = () => { handlePopUpToggle("deleteGroup", isOpen)} diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx index d20beb738..e0fe844ee 100644 --- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx +++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx @@ -432,7 +432,7 @@ export const IdentityTab = withProjectPermission( handlePopUpToggle("deleteIdentity", isOpen)} diff --git a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx index 9f04ff722..28bb56dbb 100644 --- a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx +++ b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx @@ -195,7 +195,7 @@ export const ProjectRoleList = () => { { /> handlePopUpToggle("deleteIdentity", isOpen)} deleteKey="remove" onDeleteApproved={() => onRemoveIdentitySubmit()} diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx index 3f5de1ca7..9a1336cb0 100644 --- a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx +++ b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx @@ -170,7 +170,7 @@ const Page = () => { handlePopUpToggle("deleteRole", isOpen)} deleteKey="confirm" onDeleteApproved={() => onDeleteRoleSubmit()} diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx index 1aafe65ea..6cef42f12 100644 --- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx +++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx @@ -775,6 +775,7 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => { formVal[subject]![0][ProjectPermissionSecretSyncActions.ImportSecrets] = true; if (canRemoveSecrets) formVal[subject]![0][ProjectPermissionSecretSyncActions.RemoveSecrets] = true; + return; } if (subject === ProjectPermissionSub.SecretScanningDataSources) { @@ -809,6 +810,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => { formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.ReadResources] = true; if (canTriggerScans) formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.TriggerScans] = true; + + return; } if (subject === ProjectPermissionSub.SecretScanningFindings) { @@ -821,6 +824,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => { if (canRead) formVal[subject]![0][ProjectPermissionSecretScanningFindingActions.Read] = true; if (canUpdate) formVal[subject]![0][ProjectPermissionSecretScanningFindingActions.Update] = true; + + return; } if (subject === ProjectPermissionSub.SecretScanningConfigs) { @@ -833,6 +838,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => { if (canRead) formVal[subject]![0][ProjectPermissionSecretScanningConfigActions.Read] = true; if (canUpdate) formVal[subject]![0][ProjectPermissionSecretScanningConfigActions.Update] = true; + + return; } if (subject === ProjectPermissionSub.SshHosts) { @@ -857,6 +864,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => { conditions: conditions ? convertCaslConditionToFormOperator(conditions) : [], inverted }); + + return; } if (subject === ProjectPermissionSub.PkiSubscribers) { diff --git a/frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx b/frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx index 9fba3f3fe..63b410ee2 100644 --- a/frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx +++ b/frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx @@ -91,7 +91,7 @@ export const IPAllowlistSection = () => { /> handlePopUpToggle("deleteTrustedIp", isOpen)} diff --git a/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx b/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx index 6f13e5bd7..c1ba83ae6 100644 --- a/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx +++ b/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx @@ -166,7 +166,7 @@ export const IntegrationDetailsByIDPage = () => { handlePopUpToggle("deleteConfirmation", isOpen)} diff --git a/frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx b/frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx index 417c3e1f3..935ad1a8c 100644 --- a/frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx +++ b/frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx @@ -237,7 +237,7 @@ export const CloudIntegrationSection = ({ )} { )} { /> handlePopUpToggle("deleteRotation", isOpen)} deleteKey="delete" diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx index ffb9e93fc..94a22fed2 100644 --- a/frontend/src/pages/secret-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx +++ b/frontend/src/pages/secret-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx @@ -79,14 +79,6 @@ export const DeleteProjectSection = () => { }; const handleLeaveWorkspaceSubmit = async () => { - console.log({ - currentWorkspace, - currentOrg, - members, - isNoAccessMember, - membership - }); - try { setIsLeaving.on(); @@ -176,7 +168,7 @@ export const DeleteProjectSection = () => { handlePopUpToggle("deleteWorkspace", isOpen)} deleteKey="confirm" @@ -186,8 +178,8 @@ export const DeleteProjectSection = () => { handlePopUpToggle("leaveWorkspace", isOpen)} deleteKey="confirm" buttonText="Leave Project" diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx index e90f89ffd..323fe2640 100644 --- a/frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx +++ b/frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx @@ -114,7 +114,7 @@ export const EnvironmentSection = () => { /> handlePopUpToggle("deleteEnv", isOpen)} diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx index c3e2a20f1..5b5f92bbb 100644 --- a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx +++ b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx @@ -142,7 +142,7 @@ export const WorkflowIntegrationTab = () => { /> handlePopUpToggle("removeIntegration", isOpen)} deleteKey="confirm" onDeleteApproved={async () => { diff --git a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx index 3109d00bc..0cce3f006 100644 --- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx +++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx @@ -238,7 +238,7 @@ export const SecretScanningResourceRow = ({ resource, dataSource }: Props) => { content={`Manually trigger a scan for this ${resourceDetails.singularNoun}.`} >
- Trigger Scan + Trigger Scan { {canReadResources && isResourcesPending && ( - + )} {filteredResources.slice(offset, perPage * page).map((resource) => (
- Trigger Scan + Trigger Scan { return ( SECRET_SCANNING_DATA_SOURCE_MAP[type].name.toLowerCase().includes(searchValue) || name.toLowerCase().includes(searchValue) || - connection.name.toLowerCase().includes(searchValue) + (connection && connection.name.toLowerCase().includes(searchValue)) ); }) .sort((a, b) => { diff --git a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/components/SecretScanningUpdateFindingModal.tsx b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/components/SecretScanningUpdateFindingModal.tsx index b6438d50b..3651ae3c2 100644 --- a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/components/SecretScanningUpdateFindingModal.tsx +++ b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/components/SecretScanningUpdateFindingModal.tsx @@ -27,7 +27,7 @@ type Props = { }; const FormSchema = z.object({ - remarks: z.string().optional(), + remarks: z.string().max(256, "Cannot exceed 256 characters").optional(), status: z.nativeEnum(SecretScanningFindingStatus) }); diff --git a/frontend/src/pages/secret-scanning/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/pages/secret-scanning/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx index bca70b5f2..59d6ccb95 100644 --- a/frontend/src/pages/secret-scanning/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx +++ b/frontend/src/pages/secret-scanning/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx @@ -79,14 +79,6 @@ export const DeleteProjectSection = () => { }; const handleLeaveWorkspaceSubmit = async () => { - console.log({ - currentWorkspace, - currentOrg, - members, - isNoAccessMember, - membership - }); - try { setIsLeaving.on(); @@ -170,7 +162,7 @@ export const DeleteProjectSection = () => { handlePopUpToggle("deleteWorkspace", isOpen)} deleteKey="confirm" @@ -180,8 +172,8 @@ export const DeleteProjectSection = () => { handlePopUpToggle("leaveWorkspace", isOpen)} deleteKey="confirm" buttonText="Leave Project" diff --git a/frontend/src/pages/ssh/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/pages/ssh/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx index 042adff1f..5a7549b3c 100644 --- a/frontend/src/pages/ssh/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx +++ b/frontend/src/pages/ssh/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx @@ -79,14 +79,6 @@ export const DeleteProjectSection = () => { }; const handleLeaveWorkspaceSubmit = async () => { - console.log({ - currentWorkspace, - currentOrg, - members, - isNoAccessMember, - membership - }); - try { setIsLeaving.on(); @@ -170,7 +162,7 @@ export const DeleteProjectSection = () => { handlePopUpToggle("deleteWorkspace", isOpen)} deleteKey="confirm" @@ -180,8 +172,8 @@ export const DeleteProjectSection = () => { handlePopUpToggle("leaveWorkspace", isOpen)} deleteKey="confirm" buttonText="Leave Project" diff --git a/frontend/src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx b/frontend/src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx index 3d6e8e00a..51ef7d1e7 100644 --- a/frontend/src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx +++ b/frontend/src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx @@ -119,7 +119,7 @@ const Page = () => { handlePopUpToggle("deleteSshCa", isOpen)} deleteKey="confirm" onDeleteApproved={() => diff --git a/frontend/src/pages/ssh/SshCaByIDPage/components/SshCertificateTemplatesSection.tsx b/frontend/src/pages/ssh/SshCaByIDPage/components/SshCertificateTemplatesSection.tsx index f3fa88c93..f40c53114 100644 --- a/frontend/src/pages/ssh/SshCaByIDPage/components/SshCertificateTemplatesSection.tsx +++ b/frontend/src/pages/ssh/SshCaByIDPage/components/SshCertificateTemplatesSection.tsx @@ -114,7 +114,7 @@ export const SshCertificateTemplatesSection = ({ caId }: Props) => { /> handlePopUpToggle("deleteSshCertificateTemplate", isOpen)} @@ -127,7 +127,7 @@ export const SshCertificateTemplatesSection = ({ caId }: Props) => { /> { handlePopUpToggle("deleteSshCa", isOpen)} deleteKey="confirm" onDeleteApproved={() => @@ -94,7 +94,7 @@ export const SshCaSection = () => { /> { handlePopUpToggle("deleteSshHostGroup", isOpen)} diff --git a/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/components/SshHostGroupHostsSection.tsx b/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/components/SshHostGroupHostsSection.tsx index 88a7eebae..83b43b274 100644 --- a/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/components/SshHostGroupHostsSection.tsx +++ b/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/components/SshHostGroupHostsSection.tsx @@ -88,7 +88,7 @@ export const SshHostGroupHostsSection = ({ sshHostGroupId }: Props) => { { handlePopUpToggle("deleteAccount", isOpen)} deleteKey="confirm" diff --git a/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx b/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx index 7f8988fa5..25275edc2 100644 --- a/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx +++ b/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx @@ -221,7 +221,7 @@ export const MFASection = () => { /> handlePopUpToggle("deleteTotpConfig", isOpen)} deleteKey="confirm" diff --git a/frontend/src/pages/user/PersonalSettingsPage/components/SessionsSection/SessionsTable.tsx b/frontend/src/pages/user/PersonalSettingsPage/components/SessionsSection/SessionsTable.tsx index 8d10be318..027f2ed46 100644 --- a/frontend/src/pages/user/PersonalSettingsPage/components/SessionsSection/SessionsTable.tsx +++ b/frontend/src/pages/user/PersonalSettingsPage/components/SessionsSection/SessionsTable.tsx @@ -61,7 +61,7 @@ export const SessionsTable = () => { <> handlePopUpToggle("deleteSession", isOpen)} deleteKey="confirm" onDeleteApproved={() =>