Merge pull request #3677 from Infisical/secret-scanning-v2-pt-1

feature(secret-scanning-v2): secret scanning architecture and github data source

frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx

@@ -164,7 +164,7 @@ export const MachineIdentitiesTable = () => {
       <IdentityPanelTable handlePopUpOpen={handlePopUpOpen} />
       <DeleteActionModal
         isOpen={popUp.removeServerAdmin.isOpen}
-        title={`Are you sure want to remove Server Admin permissions from ${
+        title={`Are you sure you want to remove Server Admin permissions from ${
           (popUp?.removeServerAdmin?.data as { name: string })?.name || ""
         }?`}
         subTitle=""

frontend/src/pages/admin/UserIdentitiesResourcesPage/components/UserIdentitiesTable.tsx

@@ -309,7 +309,7 @@ export const UserIdentitiesTable = () => {
       />
       <DeleteActionModal
         isOpen={popUp.upgradeToServerAdmin.isOpen}
-        title={`Are you sure want to grant Server Admin permissions to ${
+        title={`Are you sure you want to grant Server Admin permissions to ${
           (popUp?.upgradeToServerAdmin?.data as { id: string; username: string })?.username || ""
         }?`}
         subTitle=""
@@ -320,7 +320,7 @@ export const UserIdentitiesTable = () => {
       />
       <DeleteActionModal
         isOpen={popUp.removeServerAdmin.isOpen}
-        title={`Are you sure want to remove Server Admin permissions from ${
+        title={`Are you sure you want to remove Server Admin permissions from ${
           (popUp?.removeServerAdmin?.data as { id: string; username: string })?.username || ""
         }?`}
         subTitle=""

frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsSection.tsx

@@ -70,7 +70,7 @@ export const PkiAlertsSection = () => {
       <PkiAlertModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deletePkiAlert.isOpen}
-        title={`Are you sure want to remove the alert ${
+        title={`Are you sure you want to remove the alert ${
           (popUp?.deletePkiAlert?.data as { name: string })?.name || ""
         } from the project?`}
         onChange={(isOpen) => handlePopUpToggle("deletePkiAlert", isOpen)}

frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx

@@ -70,7 +70,7 @@ export const PkiCollectionSection = () => {
       <PkiCollectionModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deletePkiCollection.isOpen}
-        title={`Are you sure want to remove the alert ${
+        title={`Are you sure you want to remove the alert ${
           (popUp?.deletePkiCollection?.data as { name: string })?.name || ""
         } from the project?`}
         onChange={(isOpen) => handlePopUpToggle("deletePkiCollection", isOpen)}

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx

@@ -135,7 +135,7 @@ const Page = () => {
       <CaInstallCertModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteCa.isOpen}
-        title={`Are you sure want to remove the CA ${
+        title={`Are you sure you want to remove the CA ${
           (popUp?.deleteCa?.data as { dn: string })?.dn || ""
         } from the project?`}
         subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaSection.tsx

@@ -96,7 +96,7 @@ export const CaSection = () => {
       <CaTable handlePopUpOpen={handlePopUpOpen} />
       <DeleteActionModal
         isOpen={popUp.deleteCa.isOpen}
-        title={`Are you sure want to remove the CA ${
+        title={`Are you sure you want to remove the CA ${
           (popUp?.deleteCa?.data as { dn: string })?.dn || ""
         } from the project?`}
         subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."
@@ -108,7 +108,7 @@ export const CaSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.caStatus.isOpen}
-        title={`Are you sure want to ${
+        title={`Are you sure you want to ${
           (popUp?.caStatus?.data as { status: string })?.status === CaStatus.ACTIVE
             ? "enable"
             : "disable"

frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaSection.tsx

@@ -97,7 +97,7 @@ export const ExternalCaSection = () => {
       <ExternalCaTable handlePopUpOpen={handlePopUpOpen} />
       <DeleteActionModal
         isOpen={popUp.deleteCa.isOpen}
-        title={`Are you sure want to remove the CA ${
+        title={`Are you sure you want to remove the CA ${
           (popUp?.deleteCa?.data as { dn: string })?.dn || ""
         } from the project?`}
         subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."
@@ -112,7 +112,7 @@ export const ExternalCaSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.caStatus.isOpen}
-        title={`Are you sure want to ${
+        title={`Are you sure you want to ${
           (popUp?.caStatus?.data as { status: string })?.status === CaStatus.ACTIVE
             ? "enable"
             : "disable"

frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplatesSection.tsx

@@ -90,7 +90,7 @@ export const CertificateTemplatesSection = ({ caId }: Props) => {
       <CertificateTemplateEnrollmentModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteCertificateTemplate.isOpen}
-        title={`Are you sure want to delete the certificate template ${
+        title={`Are you sure you want to delete the certificate template ${
           (popUp?.deleteCertificateTemplate?.data as { name: string })?.name || ""
         } from the project?`}
         onChange={(isOpen) => handlePopUpToggle("deleteCertificateTemplate", isOpen)}

frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx

@@ -89,7 +89,7 @@ export const CertificatesSection = () => {
       <CertificateRevocationModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteCertificate.isOpen}
-        title={`Are you sure want to remove the certificate ${
+        title={`Are you sure you want to remove the certificate ${
           (popUp?.deleteCertificate?.data as { commonName: string })?.commonName || ""
         } from the project?`}
         onChange={(isOpen) => handlePopUpToggle("deleteCertificate", isOpen)}

frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx

@@ -152,7 +152,7 @@ export const PkiCollectionPage = () => {
       <PkiCollectionModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deletePkiCollection.isOpen}
-        title={`Are you sure want to delete the PKI collection ${data?.name ?? ""}?`}
+        title={`Are you sure you want to delete the PKI collection ${data?.name ?? ""}?`}
         onChange={(isOpen) => handlePopUpToggle("deletePkiCollection", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={() =>

frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx

@@ -74,7 +74,7 @@ export const PkiCollectionItemsSection = ({ collectionId, type }: Props) => {
       />
       <DeleteActionModal
         isOpen={popUp.deletePkiCollectionItem.isOpen}
-        title={`Are you sure want to remove the item from the collection ${pkiCollection.name}?`}
+        title={`Are you sure you want to remove the item from the collection ${pkiCollection.name}?`}
         onChange={(isOpen) => handlePopUpToggle("deletePkiCollectionItem", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={() => {

frontend/src/pages/cert-manager/PkiTemplateListPage/components/PkiTemplateForm.tsx

@@ -1,5 +1,4 @@
 import { Controller, useForm } from "react-hook-form";
-
 import { faQuestionCircle } from "@fortawesome/free-regular-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";

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 = () => {
 
       <DeleteActionModal
         isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
         subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
         onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
         deleteKey="confirm"
@@ -180,8 +172,8 @@ export const DeleteProjectSection = () => {
 
       <LeaveProjectModal
         isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
         onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
         deleteKey="confirm"
         buttonText="Leave Project"

frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx

@@ -44,7 +44,7 @@ export const DeleteKmipClientModal = ({ isOpen, onOpenChange, kmipClient }: Prop
   return (
     <DeleteActionModal
       isOpen={isOpen}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
       onChange={onOpenChange}
       deleteKey="confirm"
       onDeleteApproved={handleDeleteKmipClient}

frontend/src/pages/kms/OverviewPage/components/DeleteCmekModal.tsx

@@ -43,7 +43,7 @@ export const DeleteCmekModal = ({ isOpen, onOpenChange, cmek }: Props) => {
   return (
     <DeleteActionModal
       isOpen={isOpen}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
       onChange={onOpenChange}
       deleteKey="confirm"
       onDeleteApproved={handleDeleteCmek}

frontend/src/pages/kms/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 = () => {
 
       <DeleteActionModal
         isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
         subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
         onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
         deleteKey="confirm"
@@ -180,8 +172,8 @@ export const DeleteProjectSection = () => {
 
       <LeaveProjectModal
         isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
         onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
         deleteKey="confirm"
         buttonText="Leave Project"

frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx

@@ -80,7 +80,7 @@ export const OrgGroupsSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deleteGroup.isOpen}
-        title={`Are you sure want to delete the group named ${
+        title={`Are you sure you want to delete the group named ${
           (popUp?.deleteGroup?.data as { name: string })?.name || ""
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deleteGroup", isOpen)}

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx

@@ -127,7 +127,7 @@ export const IdentitySection = withPermission(
         <IdentityTokenAuthTokenModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
         <DeleteActionModal
           isOpen={popUp.deleteIdentity.isOpen}
-          title={`Are you sure want to delete ${
+          title={`Are you sure you want to delete ${
             (popUp?.deleteIdentity?.data as { name: string })?.name || ""
           }?`}
           onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx

@@ -143,7 +143,7 @@ export const OrgMembersSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.removeMember.isOpen}
-        title={`Are you sure want to remove member with username ${
+        title={`Are you sure you want to remove member with username ${
           (popUp?.removeMember?.data as { username: string })?.username || ""
         }?`}
         onChange={(isOpen) => handlePopUpToggle("removeMember", isOpen)}
@@ -156,7 +156,7 @@ export const OrgMembersSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deactivateMember.isOpen}
-        title={`Are you sure want to deactivate member with username ${
+        title={`Are you sure you want to deactivate member with username ${
           (popUp?.deactivateMember?.data as { username: string })?.username || ""
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deactivateMember", isOpen)}

frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx

@@ -280,7 +280,7 @@ export const OrgRoleTable = () => {
       <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteRole.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
           (popUp?.deleteRole?.data as TOrgRole)?.name || " "
         } role?`}
         onChange={(isOpen) => handlePopUpToggle("deleteRole", isOpen)}

frontend/src/pages/organization/AdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx

@@ -67,6 +67,15 @@ export const OrgAdminProjects = withPermission(
           });
           return;
         }
+        if (type === ProjectType.SecretScanning) {
+          await navigate({
+            to: "/secret-scanning/$projectId/data-sources" as const,
+            params: {
+              projectId
+            }
+          });
+          return;
+        }
         await navigate({
           to: `/${type}/$projectId/overview` as const,
           params: {

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AppConnectionForm.tsx

@@ -19,6 +19,7 @@ import { CamundaConnectionForm } from "./CamundaConnectionForm";
 import { DatabricksConnectionForm } from "./DatabricksConnectionForm";
 import { GcpConnectionForm } from "./GcpConnectionForm";
 import { GitHubConnectionForm } from "./GitHubConnectionForm";
+import { GitHubRadarConnectionForm } from "./GitHubRadarConnectionForm";
 import { HCVaultConnectionForm } from "./HCVaultConnectionForm";
 import { HumanitecConnectionForm } from "./HumanitecConnectionForm";
 import { LdapConnectionForm } from "./LdapConnectionForm";
@@ -72,6 +73,8 @@ const CreateForm = ({ app, onComplete }: CreateFormProps) => {
       return <AwsConnectionForm onSubmit={onSubmit} />;
     case AppConnection.GitHub:
       return <GitHubConnectionForm />;
+    case AppConnection.GitHubRadar:
+      return <GitHubRadarConnectionForm />;
     case AppConnection.GCP:
       return <GcpConnectionForm onSubmit={onSubmit} />;
     case AppConnection.AzureKeyVault:
@@ -150,6 +153,8 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
       return <AwsConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
     case AppConnection.GitHub:
       return <GitHubConnectionForm appConnection={appConnection} />;
+    case AppConnection.GitHubRadar:
+      return <GitHubRadarConnectionForm appConnection={appConnection} />;
     case AppConnection.GCP:
       return <GcpConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
     case AppConnection.AzureKeyVault:
@@ -188,7 +193,6 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
       return <OCIConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
     case AppConnection.OnePass:
       return <OnePassConnectionForm onSubmit={onSubmit} appConnection={appConnection} />;
-
     default:
       throw new Error(`Unhandled App ${(appConnection as TAppConnection).app}`);
   }

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubRadarConnectionForm.tsx

@@ -0,0 +1,157 @@
+import crypto from "crypto";
+
+import { useState } from "react";
+import { Controller, FormProvider, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+
+import { Button, FormControl, ModalClose, Select, SelectItem } from "@app/components/v2";
+import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
+import { isInfisicalCloud } from "@app/helpers/platform";
+import {
+  GitHubRadarConnectionMethod,
+  TGitHubRadarConnection,
+  useGetAppConnectionOption
+} from "@app/hooks/api/appConnections";
+import { AppConnection } from "@app/hooks/api/appConnections/enums";
+
+import {
+  genericAppConnectionFieldsSchema,
+  GenericAppConnectionsFields
+} from "./GenericAppConnectionFields";
+
+type Props = {
+  appConnection?: TGitHubRadarConnection;
+};
+
+const formSchema = genericAppConnectionFieldsSchema.extend({
+  app: z.literal(AppConnection.GitHubRadar),
+  method: z.nativeEnum(GitHubRadarConnectionMethod)
+});
+
+type FormData = z.infer<typeof formSchema>;
+
+export const GitHubRadarConnectionForm = ({ appConnection }: Props) => {
+  const isUpdate = Boolean(appConnection);
+  const [isRedirecting, setIsRedirecting] = useState(false);
+
+  const {
+    option: { appClientSlug },
+    isLoading
+  } = useGetAppConnectionOption(AppConnection.GitHubRadar);
+
+  const form = useForm<FormData>({
+    resolver: zodResolver(formSchema),
+    defaultValues: appConnection ?? {
+      app: AppConnection.GitHubRadar,
+      method: GitHubRadarConnectionMethod.App
+    }
+  });
+
+  const {
+    handleSubmit,
+    control,
+    watch,
+    formState: { isSubmitting, isDirty }
+  } = form;
+
+  const selectedMethod = watch("method");
+
+  const onSubmit = (formData: FormData) => {
+    setIsRedirecting(true);
+    const state = crypto.randomBytes(16).toString("hex");
+    localStorage.setItem("latestCSRFToken", state);
+    localStorage.setItem(
+      "githubRadarConnectionFormData",
+      JSON.stringify({ ...formData, connectionId: appConnection?.id })
+    );
+
+    switch (formData.method) {
+      case GitHubRadarConnectionMethod.App:
+        window.location.assign(
+          `https://github.com/apps/${appClientSlug}/installations/new?state=${state}`
+        );
+        break;
+      default:
+        throw new Error(
+          `Unhandled GitHub Radar Connection method: ${(formData as FormData).method}`
+        );
+    }
+  };
+
+  let isMissingConfig: boolean;
+
+  switch (selectedMethod) {
+    case GitHubRadarConnectionMethod.App:
+      isMissingConfig = !appClientSlug;
+      break;
+    default:
+      throw new Error(`Unhandled GitHub Radar Connection method: ${selectedMethod}`);
+  }
+
+  const methodDetails = getAppConnectionMethodDetails(selectedMethod);
+
+  return (
+    <FormProvider {...form}>
+      <form onSubmit={handleSubmit(onSubmit)}>
+        {!isUpdate && <GenericAppConnectionsFields />}
+        <Controller
+          name="method"
+          control={control}
+          render={({ field: { value, onChange }, fieldState: { error } }) => (
+            <FormControl
+              tooltipText={`The method you would like to use to connect with ${
+                APP_CONNECTION_MAP[AppConnection.GitHubRadar].name
+              }. This field cannot be changed after creation.`}
+              errorText={
+                !isLoading && isMissingConfig
+                  ? `Environment variables have not been configured. ${
+                      isInfisicalCloud()
+                        ? "Please contact Infisical."
+                        : `See Docs to configure GitHub Radar ${methodDetails.name} Connections.`
+                    }`
+                  : error?.message
+              }
+              isError={Boolean(error?.message) || isMissingConfig}
+              label="Method"
+            >
+              <Select
+                isDisabled={isUpdate}
+                value={value}
+                onValueChange={(val) => onChange(val)}
+                className="w-full border border-mineshaft-500"
+                position="popper"
+                dropdownContainerClassName="max-w-none"
+              >
+                {Object.values(GitHubRadarConnectionMethod).map((method) => {
+                  return (
+                    <SelectItem value={method} key={method}>
+                      {getAppConnectionMethodDetails(method).name}
+                    </SelectItem>
+                  );
+                })}
+              </Select>
+            </FormControl>
+          )}
+        />
+        <div className="mt-8 flex items-center">
+          <Button
+            className="mr-4"
+            size="sm"
+            type="submit"
+            colorSchema="secondary"
+            isLoading={isSubmitting || isRedirecting}
+            isDisabled={isSubmitting || (!isUpdate && !isDirty) || isMissingConfig || isRedirecting}
+          >
+            {isUpdate ? "Reconnect to GitHub" : "Connect to GitHub"}
+          </Button>
+          <ModalClose asChild>
+            <Button colorSchema="secondary" variant="plain">
+              Cancel
+            </Button>
+          </ModalClose>
+        </div>
+      </form>
+    </FormProvider>
+  );
+};

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionHeader.tsx

@@ -15,11 +15,19 @@ export const AppConnectionHeader = ({ app, isConnected, onBack }: Props) => {
 
   return (
     <div className="mb-4 flex w-full items-start gap-2 border-b border-mineshaft-500 pb-4">
-      <img
-        alt={`${appDetails.name} logo`}
-        src={`/images/integrations/${appDetails.image}`}
-        className="h-12 w-12 rounded-md bg-bunker-500 p-2"
-      />
+      <div className="relative">
+        <img
+          alt={`${appDetails.name} logo`}
+          src={`/images/integrations/${appDetails.image}`}
+          className="h-12 w-12 rounded-md bg-bunker-500 p-2"
+        />
+        {appDetails.icon && (
+          <FontAwesomeIcon
+            icon={appDetails.icon}
+            className="absolute bottom-1 right-1 text-primary-700"
+          />
+        )}
+      </div>
       <div>
         <div className="flex items-center text-mineshaft-300">
           {appDetails.name}

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx

@@ -31,7 +31,7 @@ export const AppConnectionsSelect = ({ onSelect }: Props) => {
   return (
     <div className="grid grid-cols-4 gap-2">
       {appConnectionOptions?.map((option) => {
-        const { image, name, size = 50, enterprise = false } = APP_CONNECTION_MAP[option.app];
+        const { image, name, size = 50, enterprise = false, icon } = APP_CONNECTION_MAP[option.app];
 
         return (
           <button
@@ -43,14 +43,23 @@ export const AppConnectionsSelect = ({ onSelect }: Props) => {
             }
             className="group relative flex h-28 cursor-pointer flex-col items-center justify-center rounded-md border border-mineshaft-600 bg-mineshaft-700 p-4 duration-200 hover:bg-mineshaft-600"
           >
-            <img
-              src={`/images/integrations/${image}`}
-              style={{
-                width: `${size}px`
-              }}
-              className="mt-auto"
-              alt={`${name} logo`}
-            />
+            <div className="relative">
+              <img
+                src={`/images/integrations/${image}`}
+                style={{
+                  width: `${size}px`
+                }}
+                className="mt-auto"
+                alt={`${name} logo`}
+              />
+              {icon && (
+                <FontAwesomeIcon
+                  className="absolute -bottom-1.5 -right-1.5 text-primary-700"
+                  size="xl"
+                  icon={icon}
+                />
+              )}
+            </div>
             <div className="mt-auto max-w-xs text-center text-xs font-medium text-gray-300 duration-200 group-hover:text-gray-200">
               {name}
             </div>

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionRow.tsx

@@ -65,6 +65,8 @@ export const AppConnectionRow = ({
 
   const methodDetails = getAppConnectionMethodDetails(method);
 
+  const connectionDetails = APP_CONNECTION_MAP[app];
+
   return (
     <Tr
       className={twMerge("group h-12 transition-colors duration-100 hover:bg-mineshaft-700")}
@@ -72,12 +74,21 @@ export const AppConnectionRow = ({
     >
       <Td>
         <div className="flex items-center gap-2">
-          <img
-            alt={`${APP_CONNECTION_MAP[app].name} integration`}
-            src={`/images/integrations/${APP_CONNECTION_MAP[app].image}`}
-            className="mr-0.5 w-5"
-          />
-          <span className="hidden lg:inline">{APP_CONNECTION_MAP[app].name}</span>
+          <div className="relative">
+            <img
+              alt={`${connectionDetails.name} integration`}
+              src={`/images/integrations/${connectionDetails.image}`}
+              className="mr-0.5 w-5"
+            />
+            {connectionDetails.icon && (
+              <FontAwesomeIcon
+                icon={connectionDetails.icon}
+                size="xs"
+                className="absolute -bottom-0.5 -right-0.5 text-primary-700"
+              />
+            )}
+          </div>
+          <span className="hidden lg:inline">{connectionDetails.name}</span>
         </div>
       </Td>
       <Td className="!min-w-[8rem] max-w-0">

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx

@@ -44,7 +44,7 @@ export const DeleteAppConnectionModal = ({ isOpen, onOpenChange, appConnection }
     <DeleteActionModal
       isOpen={isOpen}
       onChange={onOpenChange}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
       deleteKey={name}
       onDeleteApproved={handleDeleteAppConnection}
     >

frontend/src/pages/organization/AppConnections/OauthCallbackPage/OauthCallbackPage.tsx

@@ -14,6 +14,7 @@ import {
   TAzureClientSecretsConnection,
   TAzureKeyVaultConnection,
   TGitHubConnection,
+  TGitHubRadarConnection,
   useCreateAppConnection,
   useUpdateAppConnection
 } from "@app/hooks/api/appConnections";
@@ -26,6 +27,9 @@ type BaseFormData = {
 
 type GithubFormData = BaseFormData & Pick<TGitHubConnection, "name" | "method" | "description">;
 
+type GithubRadarFormData = BaseFormData &
+  Pick<TGitHubRadarConnection, "name" | "method" | "description">;
+
 type AzureKeyVaultFormData = BaseFormData &
   Pick<TAzureKeyVaultConnection, "name" | "method" | "description"> &
   Pick<TAzureKeyVaultConnection["credentials"], "tenantId">;
@@ -40,6 +44,7 @@ type AzureClientSecretsFormData = BaseFormData &
 
 type FormDataMap = {
   [AppConnection.GitHub]: GithubFormData & { app: AppConnection.GitHub };
+  [AppConnection.GitHubRadar]: GithubRadarFormData & { app: AppConnection.GitHubRadar };
   [AppConnection.AzureKeyVault]: AzureKeyVaultFormData & { app: AppConnection.AzureKeyVault };
   [AppConnection.AzureAppConfiguration]: AzureAppConfigurationFormData & {
     app: AppConnection.AzureAppConfiguration;
@@ -51,6 +56,7 @@ type FormDataMap = {
 
 const formDataStorageFieldMap: Partial<Record<AppConnection, string>> = {
   [AppConnection.GitHub]: "githubConnectionFormData",
+  [AppConnection.GitHubRadar]: "githubRadarConnectionFormData",
   [AppConnection.AzureKeyVault]: "azureKeyVaultConnectionFormData",
   [AppConnection.AzureAppConfiguration]: "azureAppConfigurationConnectionFormData",
   [AppConnection.AzureClientSecrets]: "azureClientSecretsConnectionFormData"
@@ -318,6 +324,54 @@ export const OAuthCallbackPage = () => {
     };
   }, []);
 
+  const handleGithubRadar = useCallback(async () => {
+    const formData = getFormData(AppConnection.GitHubRadar);
+    if (formData === null) return null;
+
+    clearState(AppConnection.GitHubRadar);
+
+    const { connectionId, name, description, returnUrl } = formData;
+
+    try {
+      if (connectionId) {
+        await updateAppConnection.mutateAsync({
+          app: AppConnection.GitHubRadar,
+          connectionId,
+          credentials: {
+            code: code as string,
+            installationId: installationId as string
+          }
+        });
+      } else {
+        await createAppConnection.mutateAsync({
+          app: AppConnection.GitHubRadar,
+          name,
+          description,
+          method: GitHubConnectionMethod.App,
+          credentials: {
+            code: code as string,
+            installationId: installationId as string
+          }
+        });
+      }
+    } catch (e: any) {
+      createNotification({
+        title: `Failed to ${connectionId ? "update" : "add"} GitHub Radar Connection`,
+        text: e.message,
+        type: "error"
+      });
+      navigate({
+        to: returnUrl ?? "/organization/app-connections"
+      });
+    }
+
+    return {
+      connectionId,
+      returnUrl,
+      appConnectionName: formData.app
+    };
+  }, []);
+
   // Ensure that the localstorage is ready for use, to avoid the form data being malformed
   useEffect(() => {
     if (!isReady) {
@@ -334,6 +388,8 @@ export const OAuthCallbackPage = () => {
 
       if (appConnection === AppConnection.GitHub) {
         data = await handleGithub();
+      } else if (appConnection === AppConnection.GitHubRadar) {
+        data = await handleGithubRadar();
       } else if (appConnection === AppConnection.AzureKeyVault) {
         data = await handleAzureKeyVault();
       } else if (appConnection === AppConnection.AzureAppConfiguration) {

frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx

@@ -229,7 +229,7 @@ export const GatewayListPage = withPermission(
                   )}
                   <DeleteActionModal
                     isOpen={popUp.deleteGateway.isOpen}
-                    title={`Are you sure want to delete gateway ${
+                    title={`Are you sure you want to delete gateway ${
                       (popUp?.deleteGateway?.data as { name: string })?.name || ""
                     }?`}
                     onChange={(isOpen) => handlePopUpToggle("deleteGateway", isOpen)}

frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx

@@ -157,7 +157,7 @@ const Page = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deleteGroup.isOpen}
-        title={`Are you sure want to delete the group named ${
+        title={`Are you sure you want to delete the group named ${
           (popUp?.deleteGroup?.data as { name: string })?.name || ""
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deleteGroup", isOpen)}

frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx

@@ -94,7 +94,7 @@ export const GroupMembersSection = ({ groupId, groupSlug }: Props) => {
       <AddGroupMembersModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.removeMemberFromGroup.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
           (popUp?.removeMemberFromGroup?.data as { username: string })?.username || ""
         } from the group?`}
         onChange={(isOpen) => handlePopUpToggle("removeMemberFromGroup", isOpen)}

frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx

@@ -101,7 +101,7 @@ const Page = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deleteIdentity.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
           (popUp?.deleteIdentity?.data as { name: string })?.name || ""
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}

frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx

@@ -66,7 +66,7 @@ export const IdentityProjectsSection = ({ identityId }: Props) => {
       </div>
       <DeleteActionModal
         isOpen={popUp.removeIdentityFromProject.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
           (popUp?.removeIdentityFromProject?.data as { identityName: string })?.identityName || ""
         } from ${
           (popUp?.removeIdentityFromProject?.data as { projectName: string })?.projectName || ""

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityTokenAuthTokensTable.tsx

@@ -218,7 +218,7 @@ export const IdentityTokenAuthTokensTable = ({ tokens, identityId }: Props) => {
       </TableContainer>
       <DeleteActionModal
         isOpen={popUp.revokeToken.isOpen}
-        title={`Are you sure want to revoke ${
+        title={`Are you sure you want to revoke ${
           (popUp?.revokeToken?.data as { name: string })?.name || ""
         }?`}
         onChange={(isOpen) => handlePopUpToggle("revokeToken", isOpen)}

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx

@@ -175,7 +175,7 @@ export const IdentityUniversalAuthClientSecretsTable = ({ clientSecrets, identit
       </TableContainer>
       <DeleteActionModal
         isOpen={popUp.revokeClientSecret.isOpen}
-        title={`Are you sure want to delete the client secret ${
+        title={`Are you sure you want to delete the client secret ${
           (popUp?.revokeClientSecret?.data as { clientSecretPrefix: string })?.clientSecretPrefix ||
           ""
         }************?`}

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityAuthModal.tsx

@@ -151,7 +151,7 @@ export const Content = ({
       />
       <DeleteActionModal
         isOpen={popUp?.revokeAuthMethod?.isOpen}
-        title={`Are you sure want to remove ${identityAuthToNameMap[authMethod]} on this identity?`}
+        title={`Are you sure you want to remove ${identityAuthToNameMap[authMethod]} on this identity?`}
         onChange={(isOpen) => handlePopUpToggle("revokeAuthMethod", isOpen)}
         deleteKey="confirm"
         buttonText="Remove"

frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx

@@ -155,7 +155,7 @@ export const Page = () => {
       <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteOrgRole.isOpen}
-        title={`Are you sure want to delete the organization role ${data?.name ?? ""}?`}
+        title={`Are you sure you want to delete the organization role ${data?.name ?? ""}?`}
         onChange={(isOpen) => handlePopUpToggle("deleteOrgRole", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={() => onDeleteOrgRoleSubmit()}

frontend/src/pages/organization/SecretManagerOverviewPage/SecretManagerOverviewPage.tsx

@@ -24,6 +24,8 @@ const formatDescription = (type: ProjectType) => {
     return "Manage your PKI infrastructure and issue digital certificates for services, applications, and devices.";
   if (type === ProjectType.KMS)
     return "Centralize the management of keys for cryptographic operations, such as encryption and decryption.";
+  if (type === ProjectType.SecretScanning)
+    return "Connect and monitor data sources to prevent secret leaks.";
   return "Infisical SSH lets you issue SSH credentials to users for short-lived, secure SSH access to infrastructure.";
 };
 

frontend/src/pages/organization/SecretScanningOverviewPage/SecretScanningOverviewPage.tsx

@@ -0,0 +1,7 @@
+import { ProjectType } from "@app/hooks/api/workspace/types";
+
+import { ProductOverviewPage } from "../SecretManagerOverviewPage/SecretManagerOverviewPage";
+
+export const SecretScanningOverviewPage = () => (
+  <ProductOverviewPage type={ProjectType.SecretScanning} />
+);

frontend/src/pages/organization/SecretScanningOverviewPage/route.tsx

@@ -0,0 +1,23 @@
+import { faHome } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { SecretScanningOverviewPage } from "./SecretScanningOverviewPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/overview"
+)({
+  component: SecretScanningOverviewPage,
+  context: () => ({
+    breadcrumbs: [
+      {
+        label: "Products",
+        icon: () => <FontAwesomeIcon icon={faHome} />
+      },
+      {
+        label: "Secret Scanning",
+        link: linkOptions({ to: "/organization/secret-scanning/overview" })
+      }
+    ]
+  })
+});

frontend/src/pages/organization/SecretScanningPage/SecretScanningPage.tsx

@@ -1,227 +0,0 @@
-import { useEffect } from "react";
-import { Helmet } from "react-helmet";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useNavigate, useSearch } from "@tanstack/react-router";
-
-import { OrgPermissionCan } from "@app/components/permissions";
-import { Button, NoticeBanner, PageHeader, Pagination } from "@app/components/v2";
-import { ROUTE_PATHS } from "@app/const/routes";
-import {
-  OrgPermissionActions,
-  OrgPermissionSubjects,
-  useOrganization,
-  useServerConfig
-} from "@app/context";
-import {
-  getUserTablePreference,
-  PreferenceKey,
-  setUserTablePreference
-} from "@app/helpers/userTablePreferences";
-import { withPermission } from "@app/hoc";
-import { usePagination, usePopUp } from "@app/hooks";
-import {
-  useCreateNewInstallationSession,
-  useGetSecretScanningInstallationStatus,
-  useGetSecretScanningRisks,
-  useLinkGitAppInstallationWithOrg
-} from "@app/hooks/api/secretScanning";
-import { SecretScanningOrderBy } from "@app/hooks/api/secretScanning/types";
-
-import { ExportSecretScansModal } from "./components/ExportSecretScansModal";
-import { SecretScanningFilter } from "./components/SecretScanningFilters";
-import { SecretScanningFilterFormData, secretScanningFilterFormSchema } from "./components/types";
-import { SecretScanningLogsTable } from "./components";
-
-export const SecretScanningPage = withPermission(
-  () => {
-    const queryParams = useSearch({
-      from: ROUTE_PATHS.Organization.SecretScanning.id
-    });
-
-    const navigate = useNavigate();
-
-    const { control, watch } = useForm<SecretScanningFilterFormData>({
-      resolver: zodResolver(secretScanningFilterFormSchema),
-      defaultValues: {}
-    });
-
-    const { config } = useServerConfig();
-    const { currentOrg } = useOrganization();
-    const organizationId = currentOrg.id;
-
-    const { offset, limit, orderBy, setPage, perPage, page, setPerPage } = usePagination(
-      SecretScanningOrderBy.CreatedAt,
-      { initPerPage: getUserTablePreference("secretScanningTable", PreferenceKey.PerPage, 20) }
-    );
-
-    const handlePerPageChange = (newPerPage: number) => {
-      setPerPage(newPerPage);
-      setUserTablePreference("secretScanningTable", PreferenceKey.PerPage, newPerPage);
-    };
-
-    const repositoryNames = watch("repositoryNames");
-    const resolvedStatus = watch("resolved");
-
-    const { isPending, data: risksData } = useGetSecretScanningRisks(
-      organizationId,
-      {
-        offset,
-        limit,
-        orderBy
-      },
-      {
-        repositoryNames:
-          repositoryNames?.length > 0 ? repositoryNames.map((repo) => repo.name) : undefined,
-        resolvedStatus
-      }
-    );
-
-    const { mutateAsync: linkGitAppInstallationWithOrganization } =
-      useLinkGitAppInstallationWithOrg();
-    const { mutateAsync: createNewIntegrationSession } = useCreateNewInstallationSession();
-    const {
-      data: installationStatus,
-      isPending: isSecretScanningInstatllationStatusLoading,
-      refetch: refetchSecretScanningInstallationStatus
-    } = useGetSecretScanningInstallationStatus(organizationId);
-    const integrationEnabled =
-      !isSecretScanningInstatllationStatusLoading && installationStatus?.appInstallationCompleted;
-
-    const { handlePopUpToggle, popUp } = usePopUp(["exportSecretScans"]);
-
-    useEffect(() => {
-      const linkInstallation = async () => {
-        if (queryParams.state && queryParams.installation_id) {
-          try {
-            const isLinked = await linkGitAppInstallationWithOrganization({
-              installationId: String(queryParams.installation_id),
-              sessionId: String(queryParams.state)
-            });
-            if (isLinked) {
-              await navigate({
-                to: "/organization/secret-scanning"
-              });
-              refetchSecretScanningInstallationStatus();
-            }
-
-            console.log("installation verification complete");
-          } catch (e) {
-            console.log("app installation is stale, start new session", e);
-          }
-        }
-      };
-      linkInstallation();
-    }, [queryParams.state, queryParams.installation_id]);
-
-    const generateNewIntegrationSession = async () => {
-      const session = await createNewIntegrationSession({ organizationId });
-      window.location.href = `https://github.com/apps/${session.gitAppSlug}/installations/new?state=${session.sessionId}`;
-    };
-
-    return (
-      <div className="py-2">
-        <Helmet>
-          <title>Secret scanning</title>
-          <link rel="icon" href="/infisical.ico" />
-          <meta property="og:image" content="/images/message.png" />
-        </Helmet>
-        <div className="flex h-full w-full justify-center bg-bunker-800 text-white">
-          <div className="w-full max-w-7xl">
-            <PageHeader
-              title="Secret Scanning"
-              description="Automatically monitor your GitHub activity and prevent secret leaks"
-            />
-            {config.isSecretScanningDisabled && (
-              <NoticeBanner title="Secret scanning is in maintenance" className="mb-4">
-                We are working on improving the performance of secret scanning due to increased
-                usage.
-              </NoticeBanner>
-            )}
-            <div className="relative mb-6 flex justify-between rounded-md border border-mineshaft-600 bg-mineshaft-800 p-6">
-              <div className="flex flex-col items-start">
-                <div className="mb-1 flex flex-row">
-                  Secret Scanning Status:{" "}
-                  {integrationEnabled ? (
-                    <p className="ml-1.5 font-semibold text-green">Enabled</p>
-                  ) : (
-                    <p className="ml-1.5 font-semibold text-red">Not enabled</p>
-                  )}
-                </div>
-                <div>
-                  {integrationEnabled ? (
-                    <p className="text-mineshaft-300">
-                      Your GitHub organization is connected to Infisical, and is being continuously
-                      monitored for secret leaks.
-                    </p>
-                  ) : (
-                    <p className="text-mineshaft-300">
-                      Connect your GitHub organization to Infisical.
-                    </p>
-                  )}
-                </div>
-              </div>
-              {integrationEnabled ? (
-                <div>
-                  <div className="absolute right-[2.5rem] top-[2.5rem] flex h-6 w-6 animate-ping items-center justify-center rounded-full bg-green" />
-                  <div className="absolute right-[2.63rem] top-[2.63rem] flex h-5 w-5 animate-ping items-center justify-center rounded-full bg-green" />
-                  <div className="absolute right-[2.82rem] top-[2.82rem] flex h-3.5 w-3.5 animate-ping items-center justify-center rounded-full bg-green" />
-                </div>
-              ) : (
-                <div className="flex h-[3.25rem] items-center">
-                  <OrgPermissionCan
-                    I={OrgPermissionActions.Create}
-                    a={OrgPermissionSubjects.SecretScanning}
-                  >
-                    {(isAllowed) => (
-                      <Button
-                        variant="solid"
-                        colorSchema="primary"
-                        onClick={generateNewIntegrationSession}
-                        className="h-min py-2"
-                        isDisabled={!isAllowed}
-                      >
-                        Integrate with GitHub
-                      </Button>
-                    )}
-                  </OrgPermissionCan>
-                </div>
-              )}
-            </div>
-            <div className="mt-8 space-y-2">
-              {integrationEnabled && (
-                <div className="flex w-full items-center justify-end">
-                  <SecretScanningFilter
-                    repositories={risksData?.repos || []}
-                    handlePopUpToggle={handlePopUpToggle}
-                    control={control}
-                  />
-                </div>
-              )}
-              <SecretScanningLogsTable gitRisks={risksData?.risks} isPending={isPending} />
-              {!isPending && risksData?.totalCount !== undefined && risksData.totalCount >= 10 && (
-                <Pagination
-                  className="rounded-md"
-                  count={risksData.totalCount}
-                  page={page}
-                  perPage={perPage}
-                  onChangePage={(newPage) => setPage(newPage)}
-                  onChangePerPage={handlePerPageChange}
-                />
-              )}
-            </div>
-          </div>
-        </div>
-        <ExportSecretScansModal
-          repositories={risksData?.repos || []}
-          handlePopUpToggle={handlePopUpToggle}
-          popUp={popUp}
-        />
-      </div>
-    );
-  },
-  {
-    action: OrgPermissionActions.Read,
-    subject: OrgPermissionSubjects.SecretScanning
-  }
-);

frontend/src/pages/organization/SecretScanningPage/components/ExportSecretScansModal.tsx

@@ -1,200 +0,0 @@
-import { Controller, useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import FileSaver from "file-saver";
-import { z } from "zod";
-
-import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
-import { useOrganization } from "@app/context";
-import { useExportSecretScanningRisks } from "@app/hooks/api/secretScanning";
-import { SecretScanningResolvedStatus } from "@app/hooks/api/secretScanning/types";
-import { UsePopUpState } from "@app/hooks/usePopUp";
-import { convertJsonToCsv } from "@app/lib/fn/csv";
-
-type Props = {
-  popUp: UsePopUpState<["exportSecretScans"]>;
-  handlePopUpToggle: (
-    popUpName: keyof UsePopUpState<["exportSecretScans"]>,
-    state?: boolean
-  ) => void;
-  repositories: string[];
-};
-
-enum ExportFormat {
-  Json = "json",
-  Csv = "csv"
-}
-
-const formSchema = z.object({
-  githubRepository: z.string().trim(),
-  status: z.nativeEnum(SecretScanningResolvedStatus),
-  exportFormat: z.nativeEnum(ExportFormat)
-});
-
-type TFormSchema = z.infer<typeof formSchema>;
-
-export const ExportSecretScansModal = ({ popUp, handlePopUpToggle, repositories }: Props) => {
-  const { currentOrg } = useOrganization();
-  const { mutateAsync } = useExportSecretScanningRisks();
-
-  const {
-    control,
-    handleSubmit,
-    formState: { isSubmitting }
-  } = useForm<TFormSchema>({
-    resolver: zodResolver(formSchema),
-    defaultValues: {
-      exportFormat: ExportFormat.Json,
-      status: SecretScanningResolvedStatus.All,
-      githubRepository: "all"
-    }
-  });
-
-  const onFormSubmit = async (data: TFormSchema) => {
-    const gitRisks = await mutateAsync({
-      orgId: currentOrg.id,
-      filter: {
-        repositoryNames: data.githubRepository !== "all" ? [data.githubRepository] : undefined,
-        resolvedStatus: data.status
-      }
-    });
-
-    const filteredRisks = gitRisks
-      .filter((risk) =>
-        // eslint-disable-next-line no-nested-ternary
-        data.status === SecretScanningResolvedStatus.All
-          ? true
-          : data.status === SecretScanningResolvedStatus.Resolved
-            ? risk.isResolved
-            : !risk.isResolved
-      )
-      .filter((risk) => {
-        if (data.githubRepository === "all") return true;
-        return risk.repositoryFullName === data.githubRepository;
-      });
-
-    const formattedRisks = filteredRisks.map((risk) => {
-      return {
-        repository: risk.repositoryFullName,
-        fileName: risk.file,
-        isResolved: risk.isResolved ? "Resolved" : "Needs Attention",
-        status: risk.status || "UNRESOLVED",
-        entropy: risk.entropy,
-        secretType: risk.ruleID,
-        exposedSecretLink: `https://github.com/${risk.repositoryFullName}/blob/${risk.commit}/${risk.file}#L${risk.startLine}-L${risk.endLine}`,
-        commitAuthor: risk.author,
-        commitAuthorEmail: risk.email,
-        commitDate: risk.createdAt,
-        commitMessage: risk.message,
-        commitFingerprint: risk.fingerprint
-      };
-    });
-
-    const fileName = `infisical-secret-scans-${new Date().toISOString()}`;
-    if (data.exportFormat === ExportFormat.Csv) {
-      const csvBlob = convertJsonToCsv(formattedRisks);
-      FileSaver.saveAs(csvBlob, `${fileName}.csv`);
-    } else if (data.exportFormat === ExportFormat.Json) {
-      const json = JSON.stringify(formattedRisks, null, 2);
-      const blob = new Blob([json], { type: "application/json" });
-      FileSaver.saveAs(blob, `${fileName}.json`);
-    }
-  };
-
-  return (
-    <form onSubmit={handleSubmit(onFormSubmit)}>
-      <Modal
-        isOpen={popUp?.exportSecretScans?.isOpen}
-        onOpenChange={(isOpen) => {
-          handlePopUpToggle("exportSecretScans", isOpen);
-        }}
-      >
-        <ModalContent
-          title="Export Secret Scans"
-          footerContent={[
-            <Button
-              onClick={() => handleSubmit(onFormSubmit)()}
-              isLoading={isSubmitting}
-              type="submit"
-              colorSchema="primary"
-            >
-              Export secret scans
-            </Button>,
-            <Button
-              key="keep-old-btn"
-              className="ml-4"
-              onClick={() => handlePopUpToggle("exportSecretScans", false)}
-              variant="outline_bg"
-              isDisabled={isSubmitting}
-            >
-              Cancel
-            </Button>
-          ]}
-        >
-          <Controller
-            control={control}
-            name="exportFormat"
-            render={({ field: { value, onChange } }) => (
-              <FormControl label="Export Format">
-                <Select
-                  defaultValue={ExportFormat.Json}
-                  value={value}
-                  onValueChange={onChange}
-                  className="w-full"
-                >
-                  {Object.values(ExportFormat).map((format) => (
-                    <SelectItem key={format} value={format}>
-                      {format.toUpperCase()}
-                    </SelectItem>
-                  ))}
-                </Select>
-              </FormControl>
-            )}
-          />
-
-          <Controller
-            control={control}
-            name="status"
-            render={({ field: { value, onChange } }) => (
-              <FormControl label="Risk Status">
-                <Select
-                  defaultValue="all"
-                  value={value}
-                  onValueChange={onChange}
-                  className="w-full"
-                >
-                  {Object.values(SecretScanningResolvedStatus).map((status) => (
-                    <SelectItem key={status} value={status}>
-                      {status.charAt(0).toUpperCase() + status.slice(1)}
-                    </SelectItem>
-                  ))}
-                </Select>
-              </FormControl>
-            )}
-          />
-
-          <Controller
-            control={control}
-            name="githubRepository"
-            render={({ field: { value, onChange } }) => (
-              <FormControl label="GitHub Repository">
-                <Select
-                  defaultValue="all"
-                  value={value}
-                  onValueChange={onChange}
-                  className="w-full"
-                >
-                  <SelectItem value="all">All Repositories</SelectItem>
-                  {repositories.map((repoName) => (
-                    <SelectItem key={repoName} value={repoName}>
-                      {repoName}
-                    </SelectItem>
-                  ))}
-                </Select>
-              </FormControl>
-            )}
-          />
-        </ModalContent>
-      </Modal>
-    </form>
-  );
-};

frontend/src/pages/organization/SecretScanningPage/components/RiskStatusSelection.tsx

@@ -1,46 +0,0 @@
-import { useState } from "react";
-
-import { OrgPermissionCan } from "@app/components/permissions";
-import { OrgPermissionActions, OrgPermissionSubjects, useOrganization } from "@app/context";
-import { useUpdateRiskStatus } from "@app/hooks/api/secretScanning";
-import { RiskStatus } from "@app/hooks/api/secretScanning/types";
-
-export const RiskStatusSelection = ({
-  riskId,
-  currentSelection
-}: {
-  riskId: any;
-  currentSelection: any;
-}) => {
-  const [selectedRiskStatus, setSelectedRiskStatus] = useState(currentSelection);
-  const { mutate: updateRiskStatus } = useUpdateRiskStatus();
-  const { currentOrg } = useOrganization();
-  const organizationId = currentOrg.id;
-
-  return (
-    <OrgPermissionCan I={OrgPermissionActions.Edit} a={OrgPermissionSubjects.SecretScanning}>
-      {(isAllowed) => (
-        <select
-          disabled={!isAllowed}
-          value={selectedRiskStatus}
-          onChange={(e) => {
-            setSelectedRiskStatus(e.target.value);
-            updateRiskStatus({
-              organizationId,
-              status: e.target.value as RiskStatus,
-              riskId
-            });
-          }}
-          className="block w-full rounded-md px-3 py-2 shadow-sm focus:border-blue-500 focus:outline-none focus:ring-blue-500"
-        >
-          <option>Unresolved</option>
-          <option value={RiskStatus.RESOLVED_FALSE_POSITIVE}>
-            This is a false positive, resolved
-          </option>
-          <option value={RiskStatus.RESOLVED_REVOKED}>I have rotated the secret, resolved</option>
-          <option value={RiskStatus.RESOLVED_NOT_REVOKED}>No rotate needed, resolved</option>
-        </select>
-      )}
-    </OrgPermissionCan>
-  );
-};

frontend/src/pages/organization/SecretScanningPage/components/SecretScanningFilters.tsx

@@ -1,89 +0,0 @@
-import { Control, Controller } from "react-hook-form";
-import { twMerge } from "tailwind-merge";
-
-import { Button, FilterableSelect, FormControl, Select, SelectItem } from "@app/components/v2";
-import { SecretScanningResolvedStatus } from "@app/hooks/api/secretScanning/types";
-import { UsePopUpState } from "@app/hooks/usePopUp";
-
-import { SecretScanningFilterFormData } from "./types";
-
-type Props = {
-  control: Control<SecretScanningFilterFormData>;
-  repositories: string[];
-  handlePopUpToggle: (
-    popUpName: keyof UsePopUpState<["exportSecretScans"]>,
-    state?: boolean
-  ) => void;
-};
-
-export const SecretScanningFilter = ({ repositories, control, handlePopUpToggle }: Props) => {
-  return (
-    <div className={twMerge("flex w-full flex-wrap items-center justify-between bg-bunker-800")}>
-      <div className="flex items-center -space-x-8">
-        <Controller
-          control={control}
-          name="repositoryNames"
-          render={({ field: { onChange, value }, fieldState: { error } }) => (
-            <FormControl
-              label="Repository"
-              errorText={error?.message}
-              isError={Boolean(error)}
-              className="mr-12 w-96"
-            >
-              <FilterableSelect
-                value={value}
-                isClearable
-                isMulti
-                onChange={onChange}
-                placeholder="Select a repository..."
-                options={repositories.map((repository) => ({
-                  name: repository
-                }))}
-                getOptionValue={(option) => option.name}
-                getOptionLabel={(option) => option.name}
-              />
-            </FormControl>
-          )}
-        />
-
-        <Controller
-          control={control}
-          name="resolved"
-          render={({ field: { onChange, value }, fieldState: { error } }) => (
-            <FormControl
-              label="Status"
-              errorText={error?.message}
-              isError={Boolean(error)}
-              className="mr-12 w-44"
-            >
-              <Select
-                defaultValue={SecretScanningResolvedStatus.All}
-                placeholder={SecretScanningResolvedStatus.All}
-                value={value}
-                onValueChange={onChange}
-                className="w-full"
-              >
-                {Object.values(SecretScanningResolvedStatus).map((status) => (
-                  <SelectItem key={status} value={status}>
-                    {status.charAt(0).toUpperCase() + status.slice(1)} risks
-                  </SelectItem>
-                ))}
-              </Select>
-            </FormControl>
-          )}
-        />
-      </div>
-
-      <div>
-        <Button
-          className="mt-[0.45rem]"
-          onClick={() => handlePopUpToggle("exportSecretScans", true)}
-          variant="solid"
-          colorSchema="secondary"
-        >
-          Export
-        </Button>
-      </div>
-    </div>
-  );
-};

frontend/src/pages/organization/SecretScanningPage/components/SecretScanningLogsTable.tsx

@@ -1,91 +0,0 @@
-import { faCheck } from "@fortawesome/free-solid-svg-icons";
-import { formatDistance } from "date-fns";
-
-import {
-  EmptyState,
-  Table,
-  TableContainer,
-  TableSkeleton,
-  TBody,
-  Td,
-  Th,
-  THead,
-  Tr
-} from "@app/components/v2";
-import { TSecretScanningGitRisks } from "@app/hooks/api/secretScanning/types";
-
-import { RiskStatusSelection } from "./RiskStatusSelection";
-
-type Props = {
-  gitRisks?: TSecretScanningGitRisks[];
-  isPending: boolean;
-};
-
-export const SecretScanningLogsTable = ({ gitRisks, isPending }: Props) => {
-  return (
-    <TableContainer>
-      <Table>
-        <THead>
-          <Tr>
-            <Th className="flex-1">Date</Th>
-            <Th className="flex-1">Secret Type</Th>
-            <Th className="flex-1">View Risk</Th>
-            <Th className="flex-1">Info</Th>
-            <Th className="flex-1">Status</Th>
-            <Th className="flex-1">Action</Th>
-            <Th className="w-5" />
-          </Tr>
-        </THead>
-        <TBody>
-          {!isPending &&
-            gitRisks &&
-            gitRisks?.map((risk) => {
-              return (
-                <Tr key={risk.ruleID} className="h-10">
-                  <Td>{formatDistance(new Date(risk.createdAt), new Date())}</Td>
-                  <Td>{risk.ruleID}</Td>
-                  <Td>
-                    <a
-                      href={`https://github.com/${risk.repositoryFullName}/blob/${risk.commit}/${risk.file}#L${risk.startLine}-L${risk.endLine}`}
-                      target="_blank"
-                      className="text-red-500"
-                      rel="noreferrer"
-                    >
-                      View Exposed Secret
-                    </a>
-                  </Td>
-                  <Td>
-                    <div className="font-bold">
-                      <a href={`https://github.com/${risk.repositoryFullName}`}>
-                        {risk.repositoryFullName}
-                      </a>
-                    </div>
-                    <div className="text-xs">
-                      <span>{risk.file}</span>
-                      <br />
-                      <br />
-                      <span className="font-bold">{risk.author}</span>
-                      <br />
-                      <span>{risk.email}</span>
-                    </div>
-                  </Td>
-                  <Td>{risk.isResolved ? "Resolved" : "Needs Attention"}</Td>
-                  <Td>
-                    <RiskStatusSelection riskId={risk.id} currentSelection={risk.status} />
-                  </Td>
-                </Tr>
-              );
-            })}
-          {isPending && <TableSkeleton columns={7} innerKey="gitRisks" />}
-          {!isPending && gitRisks && gitRisks?.length === 0 && (
-            <Tr>
-              <Td colSpan={7}>
-                <EmptyState title="No risks detected." icon={faCheck} />
-              </Td>
-            </Tr>
-          )}
-        </TBody>
-      </Table>
-    </TableContainer>
-  );
-};

frontend/src/pages/organization/SecretScanningPage/components/index.tsx

@@ -1 +0,0 @@
-export { SecretScanningLogsTable } from "./SecretScanningLogsTable";

frontend/src/pages/organization/SecretScanningPage/components/types.ts

@@ -1,22 +0,0 @@
-import { z } from "zod";
-
-import { SecretScanningResolvedStatus } from "@app/hooks/api/secretScanning/types";
-
-export const secretScanningFilterFormSchema = z.object({
-  repositoryNames: z.array(z.object({ name: z.string() })),
-  resolved: z
-    .nativeEnum(SecretScanningResolvedStatus)
-    .default(SecretScanningResolvedStatus.All)
-    .optional()
-});
-
-export type SecretScanningFilterFormData = z.infer<typeof secretScanningFilterFormSchema>;
-
-export type SetValueType = (
-  name: keyof SecretScanningFilterFormData,
-  value: any,
-  options?: {
-    shouldValidate?: boolean;
-    shouldDirty?: boolean;
-  }
-) => void;

frontend/src/pages/organization/SecretScanningPage/route.tsx

@@ -1,39 +0,0 @@
-import { faHome } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router";
-import { zodValidator } from "@tanstack/zod-adapter";
-import { z } from "zod";
-
-import { SecretScanningPage } from "./SecretScanningPage";
-
-const SecretScanningQueryParams = z.object({
-  state: z.string().catch(""),
-  installation_id: z.coerce.string().optional()
-});
-
-export const Route = createFileRoute(
-  "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning"
-)({
-  validateSearch: zodValidator(SecretScanningQueryParams),
-  component: SecretScanningPage,
-  search: {
-    middlewares: [
-      stripSearchParams({
-        installation_id: "",
-        state: ""
-      })
-    ]
-  },
-  context: () => ({
-    breadcrumbs: [
-      {
-        label: "Home",
-        icon: () => <FontAwesomeIcon icon={faHome} />,
-        link: linkOptions({ to: "/" })
-      },
-      {
-        label: "Secret Scanning"
-      }
-    ]
-  })
-});

frontend/src/pages/organization/SecretScanningSettingsPage/SecretScanningSettingsPage.tsx

@@ -0,0 +1,20 @@
+import { Helmet } from "react-helmet";
+
+import { ProjectSettings } from "@app/components/projects/ProjectSettings";
+import { PageHeader } from "@app/components/v2";
+
+export const SecretScanningSettingsPage = () => {
+  return (
+    <>
+      <Helmet>
+        <title>Secret Scanning Settings</title>
+      </Helmet>
+      <div className="flex w-full justify-center bg-bunker-800 text-white">
+        <div className="w-full max-w-7xl">
+          <PageHeader title="Secret Scanning Settings" />
+          <ProjectSettings />
+        </div>
+      </div>
+    </>
+  );
+};

frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx

@@ -0,0 +1,26 @@
+import { faHome } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { SecretScanningSettingsPage } from "./SecretScanningSettingsPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning/settings"
+)({
+  component: SecretScanningSettingsPage,
+  context: () => ({
+    breadcrumbs: [
+      {
+        label: "Products",
+        icon: () => <FontAwesomeIcon icon={faHome} />
+      },
+      {
+        label: "Secret Scanning",
+        link: linkOptions({ to: "/organization/secret-scanning/overview" })
+      },
+      {
+        label: "Settings"
+      }
+    ]
+  })
+});

frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx

@@ -59,7 +59,7 @@ export const OrgDeleteSection = () => {
       </div>
       <DeleteActionModal
         isOpen={popUp.deleteOrg.isOpen}
-        title="Are you sure want to delete this organization?"
+        title="Are you sure you want to delete this organization?"
         subTitle={`Permanently remove ${currentOrg?.name} and all of its data. This action is not reversible, so please be careful.`}
         onChange={(isOpen) => handlePopUpToggle("deleteOrg", isOpen)}
         deleteKey="confirm"

frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx

@@ -136,7 +136,7 @@ export const OrgEncryptionTab = withPermission(
         />
         <DeleteActionModal
           isOpen={popUp.removeExternalKms.isOpen}
-          title={`Are you sure want to remove ${
+          title={`Are you sure you want to remove ${
             (popUp?.removeExternalKms?.data as { slug: string })?.slug || ""
           } from ${(popUp?.removeExternalKms?.data as { provider: string })?.provider || ""}?`}
           onChange={(isOpen) => handlePopUpToggle("removeExternalKms", isOpen)}

frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx

@@ -305,7 +305,7 @@ export const OrgWorkflowIntegrationTab = withPermission(
         />
         <DeleteActionModal
           isOpen={popUp.removeIntegration.isOpen}
-          title={`Are you sure want to remove ${popUp?.removeIntegration?.data?.slug}?`}
+          title={`Are you sure you want to remove ${popUp?.removeIntegration?.data?.slug}?`}
           onChange={(isOpen) => handlePopUpToggle("removeIntegration", isOpen)}
           deleteKey="confirm"
           onDeleteApproved={handleRemoveIntegration}

frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx

@@ -162,7 +162,7 @@ export const GithubOrgSyncConfigModal = ({
       </form>
       <DeleteActionModal
         isOpen={popUp.deleteGithubOrgSyncConfig.isOpen}
-        title="Are you sure want to remove GitHub organization sync?"
+        title="Are you sure you want to remove GitHub organization sync?"
         onChange={(isOpen) => handlePopUpToggle("deleteGithubOrgSyncConfig", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={onDelete}

frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx

@@ -301,7 +301,7 @@ export const ScimTokenModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Pr
         </TableContainer>
         <DeleteActionModal
           isOpen={popUp.deleteScimToken.isOpen}
-          title="Are you sure want to delete the SCIM token?"
+          title="Are you sure you want to delete the SCIM token?"
           onChange={(isOpen) => handlePopUpToggle("scimToken", isOpen)}
           deleteKey="confirm"
           onDeleteApproved={() => {

frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx

@@ -249,7 +249,7 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
             </TableContainer>
             <DeleteActionModal
               isOpen={popUp.deleteLdapGroupMap.isOpen}
-              title={`Are you sure want to delete the group mapping for ${
+              title={`Are you sure you want to delete the group mapping for ${
                 (popUp?.deleteLdapGroupMap?.data as { ldapGroupCN: string })?.ldapGroupCN || ""
               }?`}
               onChange={(isOpen) => handlePopUpToggle("deleteLdapGroupMap", isOpen)}

frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx

@@ -361,7 +361,7 @@ export const LDAPModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
       </Modal>
       <DeleteActionModal
         isOpen={isDeletePopupOpen}
-        title="Are you sure want to delete LDAP?"
+        title="Are you sure you want to delete LDAP?"
         onChange={() => setIsDeletePopupOpen.toggle()}
         deleteKey="confirm"
         onDeleteApproved={handleLdapSoftDelete}

frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx

@@ -478,7 +478,7 @@ export const OIDCModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
       </Modal>
       <DeleteActionModal
         isOpen={isDeletePopupOpen}
-        title="Are you sure want to delete OIDC?"
+        title="Are you sure you want to delete OIDC?"
         onChange={() => setIsDeletePopupOpen.toggle()}
         deleteKey="confirm"
         onDeleteApproved={handleOidcSoftDelete}

frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx

@@ -371,7 +371,7 @@ export const SSOModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDelet
       </Modal>
       <DeleteActionModal
         isOpen={isDeletePopupOpen}
-        title="Are you sure want to delete SAML SSO?"
+        title="Are you sure you want to delete SAML SSO?"
         onChange={() => setIsDeletePopupOpen.toggle()}
         deleteKey="confirm"
         onDeleteApproved={handleSamlSoftDelete}

frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx

@@ -259,7 +259,7 @@ const Page = withPermission(
         )}
         <DeleteActionModal
           isOpen={popUp.removeMember.isOpen}
-          title={`Are you sure want to remove member with username ${
+          title={`Are you sure you want to remove member with username ${
             (popUp?.removeMember?.data as { username: string })?.username || ""
           }?`}
           onChange={(isOpen) => handlePopUpToggle("removeMember", isOpen)}
@@ -272,7 +272,7 @@ const Page = withPermission(
         />
         <DeleteActionModal
           isOpen={popUp.deactivateMember.isOpen}
-          title={`Are you sure want to deactivate member with username ${
+          title={`Are you sure you want to deactivate member with username ${
             (popUp?.deactivateMember?.data as { username: string })?.username || ""
           }?`}
           onChange={(isOpen) => handlePopUpToggle("deactivateMember", isOpen)}

frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx

@@ -53,7 +53,7 @@ export const UserGroupsSection = ({ orgMembership }: Props) => {
 
       <DeleteActionModal
         isOpen={popUp.removeUserFromGroup.isOpen}
-        title="Are you sure want to unassign user from group?"
+        title="Are you sure you want to unassign user from group?"
         onChange={(isOpen) => handlePopUpToggle("removeUserFromGroup", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={() => {

frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx

@@ -87,7 +87,7 @@ export const GroupsSection = () => {
       <GroupTable handlePopUpOpen={handlePopUpOpen} />
       <DeleteActionModal
         isOpen={popUp.deleteGroup.isOpen}
-        title={`Are you sure want to remove the group ${
+        title={`Are you sure you want to remove the group ${
           (popUp?.deleteGroup?.data as { name: string })?.name || ""
         } from the project?`}
         onChange={(isOpen) => handlePopUpToggle("deleteGroup", isOpen)}

frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx

@@ -432,7 +432,7 @@ export const IdentityTab = withProjectPermission(
           <IdentityModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
           <DeleteActionModal
             isOpen={popUp.deleteIdentity.isOpen}
-            title={`Are you sure want to remove ${
+            title={`Are you sure you want to remove ${
               (popUp?.deleteIdentity?.data as { name: string })?.name || ""
             } from the project?`}
             onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}

frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx

@@ -195,7 +195,7 @@ export const ProjectRoleList = () => {
       <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteRole.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
           (popUp?.deleteRole?.data as TProjectRole)?.name || " "
         } role?`}
         deleteKey={(popUp?.deleteRole?.data as TProjectRole)?.slug || ""}

frontend/src/pages/project/AccessControlPage/route-secret-scanning.tsx

@@ -0,0 +1,38 @@
+import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router";
+import { zodValidator } from "@tanstack/zod-adapter";
+import { z } from "zod";
+
+import { ProjectAccessControlTabs } from "@app/types/project";
+
+import { AccessControlPage } from "./AccessControlPage";
+
+const AccessControlPageQuerySchema = z.object({
+  selectedTab: z.nativeEnum(ProjectAccessControlTabs).catch(ProjectAccessControlTabs.Member),
+  requesterEmail: z.string().catch("")
+});
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-scanning/$projectId/_secret-scanning-layout/access-management"
+)({
+  component: AccessControlPage,
+  validateSearch: zodValidator(AccessControlPageQuerySchema),
+  search: {
+    middlewares: [stripSearchParams({ requesterEmail: "" })]
+  },
+  beforeLoad: ({ context, params }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Access Control",
+          link: linkOptions({
+            to: "/secret-scanning/$projectId/access-management",
+            params: {
+              projectId: params.projectId
+            }
+          })
+        }
+      ]
+    };
+  }
+});

frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx

@@ -184,7 +184,7 @@ const Page = () => {
           />
           <DeleteActionModal
             isOpen={popUp.deleteIdentity.isOpen}
-            title={`Are you sure want to remove ${identityMembershipDetails?.identity?.name} from the project?`}
+            title={`Are you sure you want to remove ${identityMembershipDetails?.identity?.name} from the project?`}
             onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}
             deleteKey="remove"
             onDeleteApproved={() => onRemoveIdentitySubmit()}

frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-scanning.tsx

@@ -0,0 +1,28 @@
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { IdentityDetailsByIDPage } from "./IdentityDetailsByIDPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-scanning/$projectId/_secret-scanning-layout/identities/$identityId"
+)({
+  component: IdentityDetailsByIDPage,
+  beforeLoad: ({ context, params }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Access Control",
+          link: linkOptions({
+            to: "/secret-scanning/$projectId/access-management",
+            params: {
+              projectId: params.projectId
+            }
+          })
+        },
+        {
+          label: "Identities"
+        }
+      ]
+    };
+  }
+});

frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx

@@ -28,6 +28,7 @@ import {
   useGetWorkspaceUserDetails
 } from "@app/hooks/api";
 import { ActorType } from "@app/hooks/api/auditLogs/enums";
+import { ProjectType } from "@app/hooks/api/workspace/types";
 
 import { MemberProjectAdditionalPrivilegeSection } from "./components/MemberProjectAdditionalPrivilegeSection";
 import { MemberRoleDetailsSection } from "./components/MemberRoleDetailsSection";
@@ -70,7 +71,21 @@ export const Page = () => {
             type: "success",
             text: "User privilege assumption has started"
           });
-          window.location.href = `/${currentWorkspace.type}/${currentWorkspace.id}/overview`;
+
+          let page: string;
+
+          switch (currentWorkspace.type) {
+            case ProjectType.SecretScanning:
+              page = "data-sources";
+              break;
+            case ProjectType.CertificateManager:
+              page = "subscribers";
+              break;
+            default:
+              page = "overview";
+          }
+
+          window.location.href = `/${currentWorkspace.type}/${currentWorkspace.id}/${page}`;
         }
       }
     );

frontend/src/pages/project/MemberDetailsByIDPage/route-secret-scanning.tsx

@@ -0,0 +1,28 @@
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { MemberDetailsByIDPage } from "./MemberDetailsByIDPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-scanning/$projectId/_secret-scanning-layout/members/$membershipId"
+)({
+  component: MemberDetailsByIDPage,
+  beforeLoad: ({ context, params }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Access Control",
+          link: linkOptions({
+            to: "/secret-scanning/$projectId/access-management",
+            params: {
+              projectId: params.projectId
+            }
+          })
+        },
+        {
+          label: "Users"
+        }
+      ]
+    };
+  }
+});

frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx

@@ -170,7 +170,7 @@ const Page = () => {
       <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
       <DeleteActionModal
         isOpen={popUp.deleteRole.isOpen}
-        title={`Are you sure want to delete the project role ${data?.name ?? ""}?`}
+        title={`Are you sure you want to delete the project role ${data?.name ?? ""}?`}
         onChange={(isOpen) => handlePopUpToggle("deleteRole", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={() => onDeleteRoleSubmit()}

frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx

@@ -21,6 +21,9 @@ import {
   ProjectPermissionPkiTemplateActions,
   ProjectPermissionSecretActions,
   ProjectPermissionSecretRotationActions,
+  ProjectPermissionSecretScanningConfigActions,
+  ProjectPermissionSecretScanningDataSourceActions,
+  ProjectPermissionSecretScanningFindingActions,
   ProjectPermissionSecretSyncActions,
   ProjectPermissionSshHostActions,
   TPermissionCondition,
@@ -98,6 +101,26 @@ const SecretRotationPolicyActionSchema = z.object({
   [ProjectPermissionSecretRotationActions.RotateSecrets]: z.boolean().optional()
 });
 
+const SecretScanningDataSourcePolicyActionSchema = z.object({
+  [ProjectPermissionSecretScanningDataSourceActions.Read]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningDataSourceActions.Create]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningDataSourceActions.Edit]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningDataSourceActions.Delete]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningDataSourceActions.ReadScans]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningDataSourceActions.ReadResources]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningDataSourceActions.TriggerScans]: z.boolean().optional()
+});
+
+const SecretScanningFindingPolicyActionSchema = z.object({
+  [ProjectPermissionSecretScanningFindingActions.Read]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningFindingActions.Update]: z.boolean().optional()
+});
+
+const SecretScanningConfigPolicyActionSchema = z.object({
+  [ProjectPermissionSecretScanningConfigActions.Read]: z.boolean().optional(),
+  [ProjectPermissionSecretScanningConfigActions.Update]: z.boolean().optional()
+});
+
 const KmipPolicyActionSchema = z.object({
   [ProjectPermissionKmipActions.ReadClients]: z.boolean().optional(),
   [ProjectPermissionKmipActions.CreateClients]: z.boolean().optional(),
@@ -296,7 +319,13 @@ export const projectRoleFormSchema = z.object({
       [ProjectPermissionSub.Kms]: GeneralPolicyActionSchema.array().default([]),
       [ProjectPermissionSub.Cmek]: CmekPolicyActionSchema.array().default([]),
       [ProjectPermissionSub.SecretSyncs]: SecretSyncPolicyActionSchema.array().default([]),
-      [ProjectPermissionSub.Kmip]: KmipPolicyActionSchema.array().default([])
+      [ProjectPermissionSub.Kmip]: KmipPolicyActionSchema.array().default([]),
+      [ProjectPermissionSub.SecretScanningDataSources]:
+        SecretScanningDataSourcePolicyActionSchema.array().default([]),
+      [ProjectPermissionSub.SecretScanningFindings]:
+        SecretScanningFindingPolicyActionSchema.array().default([]),
+      [ProjectPermissionSub.SecretScanningConfigs]:
+        SecretScanningConfigPolicyActionSchema.array().default([])
     })
     .partial()
     .optional()
@@ -746,6 +775,71 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
         formVal[subject]![0][ProjectPermissionSecretSyncActions.ImportSecrets] = true;
       if (canRemoveSecrets)
         formVal[subject]![0][ProjectPermissionSecretSyncActions.RemoveSecrets] = true;
+      return;
+    }
+
+    if (subject === ProjectPermissionSub.SecretScanningDataSources) {
+      const canRead = action.includes(ProjectPermissionSecretScanningDataSourceActions.Read);
+      const canEdit = action.includes(ProjectPermissionSecretScanningDataSourceActions.Edit);
+      const canDelete = action.includes(ProjectPermissionSecretScanningDataSourceActions.Delete);
+      const canCreate = action.includes(ProjectPermissionSecretScanningDataSourceActions.Create);
+      const canReadScans = action.includes(
+        ProjectPermissionSecretScanningDataSourceActions.ReadScans
+      );
+      const canReadResources = action.includes(
+        ProjectPermissionSecretScanningDataSourceActions.ReadResources
+      );
+      const canTriggerScans = action.includes(
+        ProjectPermissionSecretScanningDataSourceActions.TriggerScans
+      );
+
+      if (!formVal[subject]) formVal[subject] = [{}];
+
+      // from above statement we are sure it won't be undefined
+      if (canRead)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.Read] = true;
+      if (canEdit)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.Edit] = true;
+      if (canCreate)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.Create] = true;
+      if (canDelete)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.Delete] = true;
+      if (canReadScans)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.ReadScans] = true;
+      if (canReadResources)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.ReadResources] = true;
+      if (canTriggerScans)
+        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.TriggerScans] = true;
+
+      return;
+    }
+
+    if (subject === ProjectPermissionSub.SecretScanningFindings) {
+      const canRead = action.includes(ProjectPermissionSecretScanningFindingActions.Read);
+      const canUpdate = action.includes(ProjectPermissionSecretScanningFindingActions.Update);
+
+      if (!formVal[subject]) formVal[subject] = [{}];
+
+      // from above statement we are sure it won't be undefined
+      if (canRead) formVal[subject]![0][ProjectPermissionSecretScanningFindingActions.Read] = true;
+      if (canUpdate)
+        formVal[subject]![0][ProjectPermissionSecretScanningFindingActions.Update] = true;
+
+      return;
+    }
+
+    if (subject === ProjectPermissionSub.SecretScanningConfigs) {
+      const canRead = action.includes(ProjectPermissionSecretScanningConfigActions.Read);
+      const canUpdate = action.includes(ProjectPermissionSecretScanningConfigActions.Update);
+
+      if (!formVal[subject]) formVal[subject] = [{}];
+
+      // from above statement we are sure it won't be undefined
+      if (canRead) formVal[subject]![0][ProjectPermissionSecretScanningConfigActions.Read] = true;
+      if (canUpdate)
+        formVal[subject]![0][ProjectPermissionSecretScanningConfigActions.Update] = true;
+
+      return;
     }
 
     if (subject === ProjectPermissionSub.SshHosts) {
@@ -770,6 +864,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
         conditions: conditions ? convertCaslConditionToFormOperator(conditions) : [],
         inverted
       });
+
+      return;
     }
 
     if (subject === ProjectPermissionSub.PkiSubscribers) {
@@ -1318,6 +1414,65 @@ export const PROJECT_PERMISSION_OBJECT: TProjectPermissionObject = {
         value: ProjectPermissionKmipActions.GenerateClientCertificates
       }
     ]
+  },
+  [ProjectPermissionSub.SecretScanningDataSources]: {
+    title: "Secret Scanning Data Sources",
+    actions: [
+      {
+        label: "Read Data Sources",
+        value: ProjectPermissionSecretScanningDataSourceActions.Read
+      },
+      {
+        label: "Create Data Sources",
+        value: ProjectPermissionSecretScanningDataSourceActions.Create
+      },
+      {
+        label: "Modify Data Sources",
+        value: ProjectPermissionSecretScanningDataSourceActions.Edit
+      },
+      {
+        label: "Delete Data Sources",
+        value: ProjectPermissionSecretScanningDataSourceActions.Delete
+      },
+      {
+        label: "Read Resources",
+        value: ProjectPermissionSecretScanningDataSourceActions.ReadResources
+      },
+      {
+        label: "Read Scans",
+        value: ProjectPermissionSecretScanningDataSourceActions.ReadScans
+      },
+      {
+        label: "Trigger Scans",
+        value: ProjectPermissionSecretScanningDataSourceActions.TriggerScans
+      }
+    ]
+  },
+  [ProjectPermissionSub.SecretScanningFindings]: {
+    title: "Secret Scanning Findings",
+    actions: [
+      {
+        label: "Read Findings",
+        value: ProjectPermissionSecretScanningFindingActions.Read
+      },
+      {
+        label: "Update Findings",
+        value: ProjectPermissionSecretScanningFindingActions.Update
+      }
+    ]
+  },
+  [ProjectPermissionSub.SecretScanningConfigs]: {
+    title: "Secret Scanning Config",
+    actions: [
+      {
+        label: "Read Config",
+        value: ProjectPermissionSecretScanningConfigActions.Read
+      },
+      {
+        label: "Update Config",
+        value: ProjectPermissionSecretScanningConfigActions.Update
+      }
+    ]
   }
 };
 
@@ -1371,6 +1526,12 @@ const SshPermissionSubjects = (enabled = false) => ({
   [ProjectPermissionSub.SshHostGroups]: enabled
 });
 
+const SecretScanningSubject = (enabled = false) => ({
+  [ProjectPermissionSub.SecretScanningDataSources]: enabled,
+  [ProjectPermissionSub.SecretScanningFindings]: enabled,
+  [ProjectPermissionSub.SecretScanningConfigs]: enabled
+});
+
 // scott: this structure ensures we don't forget to add project permissions to their relevant project type
 export const ProjectTypePermissionSubjects: Record<
   ProjectType,
@@ -1381,27 +1542,39 @@ export const ProjectTypePermissionSubjects: Record<
     ...SecretsManagerPermissionSubjects(true),
     ...KmsPermissionSubjects(),
     ...CertificateManagerPermissionSubjects(),
-    ...SshPermissionSubjects()
+    ...SshPermissionSubjects(),
+    ...SecretScanningSubject()
   },
   [ProjectType.KMS]: {
     ...SharedPermissionSubjects,
     ...KmsPermissionSubjects(true),
     ...SecretsManagerPermissionSubjects(),
     ...CertificateManagerPermissionSubjects(),
-    ...SshPermissionSubjects()
+    ...SshPermissionSubjects(),
+    ...SecretScanningSubject()
   },
   [ProjectType.CertificateManager]: {
     ...SharedPermissionSubjects,
     ...CertificateManagerPermissionSubjects(true),
     ...KmsPermissionSubjects(),
     ...SecretsManagerPermissionSubjects(),
-    ...SshPermissionSubjects()
+    ...SshPermissionSubjects(),
+    ...SecretScanningSubject()
   },
   [ProjectType.SSH]: {
     ...SharedPermissionSubjects,
     ...SshPermissionSubjects(true),
     ...CertificateManagerPermissionSubjects(),
     ...KmsPermissionSubjects(),
+    ...SecretsManagerPermissionSubjects(),
+    ...SecretScanningSubject()
+  },
+  [ProjectType.SecretScanning]: {
+    ...SharedPermissionSubjects,
+    ...SecretScanningSubject(true),
+    ...SshPermissionSubjects(),
+    ...CertificateManagerPermissionSubjects(),
+    ...KmsPermissionSubjects(),
     ...SecretsManagerPermissionSubjects()
   }
 };
@@ -1614,6 +1787,56 @@ export const RoleTemplates: Record<ProjectType, RoleTemplate[]> = {
     },
     projectManagerTemplate()
   ],
+  [ProjectType.SecretScanning]: [
+    {
+      id: "scanning-viewer",
+      name: "Secret Scanning Viewing Policies",
+      description: "Grants read access to data sources and findings",
+      permissions: [
+        {
+          subject: ProjectPermissionSub.SecretScanningDataSources,
+          actions: [
+            ProjectPermissionSecretScanningDataSourceActions.Read,
+            ProjectPermissionSecretScanningDataSourceActions.ReadResources,
+            ProjectPermissionSecretScanningDataSourceActions.ReadScans
+          ]
+        },
+        {
+          subject: ProjectPermissionSub.SecretScanningFindings,
+          actions: [ProjectPermissionSecretScanningFindingActions.Read]
+        },
+        {
+          subject: ProjectPermissionSub.SecretScanningConfigs,
+          actions: [ProjectPermissionSecretScanningConfigActions.Read]
+        }
+      ]
+    },
+    {
+      id: "scanning-editor",
+      name: "Secret Scanning Editing Policies",
+      description: "Grants read and edit access to data sources and findings",
+      permissions: [
+        {
+          subject: ProjectPermissionSub.SecretScanningDataSources,
+          actions: Object.values(ProjectPermissionSecretScanningDataSourceActions)
+        },
+        {
+          subject: ProjectPermissionSub.SecretScanningFindings,
+          actions: Object.values(ProjectPermissionSecretScanningFindingActions)
+        },
+        {
+          subject: ProjectPermissionSub.SecretScanningConfigs,
+          actions: [ProjectPermissionSecretScanningConfigActions.Read]
+        }
+      ]
+    },
+    projectManagerTemplate([
+      {
+        subject: ProjectPermissionSub.SecretScanningConfigs,
+        actions: Object.values(ProjectPermissionSecretScanningConfigActions)
+      }
+    ])
+  ],
   [ProjectType.SecretManager]: [
     {
       id: "secret-viewer",

frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-scanning.tsx

@@ -0,0 +1,28 @@
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { RoleDetailsBySlugPage } from "./RoleDetailsBySlugPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-scanning/$projectId/_secret-scanning-layout/roles/$roleSlug"
+)({
+  component: RoleDetailsBySlugPage,
+  beforeLoad: ({ context, params }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Access Control",
+          link: linkOptions({
+            to: "/secret-scanning/$projectId/access-management",
+            params: {
+              projectId: params.projectId
+            }
+          })
+        },
+        {
+          label: "Roles"
+        }
+      ]
+    };
+  }
+});

frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx

@@ -91,7 +91,7 @@ export const IPAllowlistSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deleteTrustedIp.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
           (popUp?.deleteTrustedIp?.data as { name: string })?.name || " "
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deleteTrustedIp", isOpen)}

frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx

@@ -166,7 +166,7 @@ export const IntegrationDetailsByIDPage = () => {
 
       <DeleteActionModal
         isOpen={popUp.deleteConfirmation.isOpen}
-        title={`Are you sure want to remove ${integration?.integration || " "} integration for ${
+        title={`Are you sure you want to remove ${integration?.integration || " "} integration for ${
           integration?.app || "this project"
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deleteConfirmation", isOpen)}

frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx

@@ -237,7 +237,7 @@ export const CloudIntegrationSection = ({
       )}
       <DeleteActionModal
         isOpen={popUp.deleteConfirmation.isOpen}
-        title={`Are you sure want to revoke access ${
+        title={`Are you sure you want to revoke access ${
           (popUp?.deleteConfirmation.data as TRevokeIntegrationPopUp)?.provider || " "
         }?`}
         subTitle="This will remove all the secret integration of this provider!!!"

frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/NativeIntegrationsTab.tsx

@@ -202,7 +202,7 @@ export const NativeIntegrationsTab = () => {
       )}
       <DeleteActionModal
         isOpen={popUp.deleteConfirmation.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
           (popUp?.deleteConfirmation.data as TIntegration)?.integration || " "
         } integration for ${
           (popUp?.deleteConfirmation.data as TIntegration)?.app || "this project"

frontend/src/pages/secret-manager/IntegrationsListPage/components/SecretSyncsTab/SecretSyncTable/SecretSyncRow.tsx

@@ -252,7 +252,7 @@ export const SecretSyncRow = ({
                 <FontAwesomeIcon icon={faEllipsisV} />
               </IconButton>
             </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
+            <DropdownMenuContent sideOffset={2} align="end">
               <DropdownMenuItem
                 icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
                 onClick={(e) => {

frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx

@@ -387,7 +387,7 @@ const Page = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deleteRotation.isOpen}
-        title="Are you sure want to delete this rotation?"
+        title="Are you sure you want to delete this rotation?"
         subTitle="This will stop the rotation from dynamically changing. Secret won't be deleted"
         onChange={(isOpen) => handlePopUpToggle("deleteRotation", isOpen)}
         deleteKey="delete"

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 = () => {
 
       <DeleteActionModal
         isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
         subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
         onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
         deleteKey="confirm"
@@ -186,8 +178,8 @@ export const DeleteProjectSection = () => {
 
       <LeaveProjectModal
         isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
         onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
         deleteKey="confirm"
         buttonText="Leave Project"

frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx

@@ -114,7 +114,7 @@ export const EnvironmentSection = () => {
       />
       <DeleteActionModal
         isOpen={popUp.deleteEnv.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
           (popUp?.deleteEnv?.data as { name: string })?.name || " "
         }?`}
         onChange={(isOpen) => handlePopUpToggle("deleteEnv", isOpen)}

frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx

@@ -142,7 +142,7 @@ export const WorkflowIntegrationTab = () => {
       />
       <DeleteActionModal
         isOpen={popUp.removeIntegration.isOpen}
-        title="Are you sure want to remove this integration?"
+        title="Are you sure you want to remove this integration?"
         onChange={(isOpen) => handlePopUpToggle("removeIntegration", isOpen)}
         deleteKey="confirm"
         onDeleteApproved={async () => {

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/SecretScanningDataSourceByIdPage.tsx

@@ -0,0 +1,117 @@
+import { Helmet } from "react-helmet";
+import { faBan, faChevronLeft } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate, useParams } from "@tanstack/react-router";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { Button, ContentLoader, EmptyState } from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import { SECRET_SCANNING_DATA_SOURCE_MAP } from "@app/helpers/secretScanningV2";
+import {
+  SecretScanningDataSource,
+  useGetSecretScanningDataSource
+} from "@app/hooks/api/secretScanningV2";
+
+import {
+  SecretScanningDataSourceSection,
+  SecretScanningResourceSection,
+  SecretScanningScanSection
+} from "./components";
+
+const PageContent = () => {
+  const navigate = useNavigate();
+  const { type, dataSourceId, projectId } = useParams({
+    from: ROUTE_PATHS.SecretScanning.DataSourceByIdPage.id,
+    select: (params) => ({
+      ...params,
+      type: params.type as SecretScanningDataSource
+    })
+  });
+
+  const { data: dataSource, isPending } = useGetSecretScanningDataSource({ type, dataSourceId });
+
+  if (isPending) {
+    return (
+      <div className="flex h-full w-full items-center justify-center">
+        <ContentLoader />
+      </div>
+    );
+  }
+
+  const details = SECRET_SCANNING_DATA_SOURCE_MAP[type];
+
+  if (!dataSource) {
+    return (
+      <div className="flex h-full w-full items-center justify-center px-20">
+        <EmptyState
+          className="max-w-2xl rounded-md text-center"
+          icon={faBan}
+          title={`Could not find ${details.name ?? "Secret Scanning"} Data Source with ID ${dataSourceId}`}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className="container mx-auto flex flex-col justify-between bg-bunker-800 font-inter text-white">
+      <div className="mx-auto mb-6 w-full max-w-7xl">
+        <Button
+          variant="link"
+          type="submit"
+          leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
+          onClick={() => {
+            navigate({
+              to: "/secret-scanning/$projectId/data-sources",
+              params: {
+                projectId
+              }
+            });
+          }}
+        >
+          Data Sources
+        </Button>
+        <div className="mb-6 flex w-full items-center gap-3">
+          <img
+            alt={`${details.name} data source`}
+            src={`/images/integrations/${details.image}`}
+            className="ml-1 mt-3 w-14"
+          />
+          <div>
+            <p className="text-3xl font-semibold text-white">{dataSource.name}</p>
+            <p className="leading-3 text-bunker-300">{details.name} Data Source</p>
+          </div>
+        </div>
+        <div className="flex justify-center">
+          <div className="mr-4 flex w-72 flex-col gap-4">
+            <SecretScanningDataSourceSection dataSource={dataSource} />
+          </div>
+          <div className="flex flex-1 flex-col gap-4">
+            <SecretScanningResourceSection dataSource={dataSource} />
+            <SecretScanningScanSection dataSource={dataSource} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export const SecretScanningDataSourceByIdPage = () => {
+  return (
+    <>
+      <Helmet>
+        <title>Secret Scanning Data Source | Infisical</title>
+        <link rel="icon" href="/infisical.ico" />
+      </Helmet>
+      <ProjectPermissionCan
+        renderGuardBanner
+        passThrough={false}
+        I={ProjectPermissionSecretScanningDataSourceActions.Read}
+        a={ProjectPermissionSub.SecretScanningDataSources}
+      >
+        <PageContent />
+      </ProjectPermissionCan>
+    </>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/DataSourceConfigDisplay/DataSourceConfigDisplay.tsx

@@ -0,0 +1,21 @@
+import {
+  SecretScanningDataSource,
+  TSecretScanningDataSource
+} from "@app/hooks/api/secretScanningV2";
+
+import { GitHubDataSourceConfigDisplay } from "./GitHubDataSourceConfigDisplay";
+
+type Props = {
+  dataSource: TSecretScanningDataSource;
+};
+
+export const DataSourceConfigDisplay = ({ dataSource }: Props) => {
+  switch (dataSource.type) {
+    case SecretScanningDataSource.GitHub:
+      return <GitHubDataSourceConfigDisplay dataSource={dataSource} />;
+    default:
+      throw new Error(
+        `Unhandled dataSource type ${(dataSource as TSecretScanningDataSource).type}`
+      );
+  }
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/DataSourceConfigDisplay/GitHubDataSourceConfigDisplay.tsx

@@ -0,0 +1,18 @@
+import { GenericFieldLabel } from "@app/components/v2";
+import { TGitHubDataSource } from "@app/hooks/api/secretScanningV2/types/github-data-source";
+
+type Props = {
+  dataSource: TGitHubDataSource;
+};
+
+export const GitHubDataSourceConfigDisplay = ({ dataSource }: Props) => {
+  const {
+    config: { includeRepos }
+  } = dataSource;
+
+  return (
+    <GenericFieldLabel label="Scan Repositories">
+      {includeRepos.includes("*") ? "All" : includeRepos.join(", ")}
+    </GenericFieldLabel>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/DataSourceConfigDisplay/index.ts

@@ -0,0 +1 @@
+export * from "./DataSourceConfigDisplay";

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningDataSourceSection.tsx

@@ -0,0 +1,98 @@
+import { faBan, faCheck, faEdit, faPlugCircleXmark } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { EditSecretScanningDataSourceModal } from "@app/components/secret-scanning";
+import { GenericFieldLabel } from "@app/components/secret-syncs";
+import { Badge, IconButton, Tooltip } from "@app/components/v2";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import { usePopUp } from "@app/hooks";
+import { TSecretScanningDataSource } from "@app/hooks/api/secretScanningV2";
+
+import { DataSourceConfigDisplay } from "./DataSourceConfigDisplay";
+
+type Props = {
+  dataSource: TSecretScanningDataSource;
+};
+
+export const SecretScanningDataSourceSection = ({ dataSource }: Props) => {
+  const { handlePopUpToggle, popUp, handlePopUpOpen } = usePopUp(["editDataSource"] as const);
+
+  const { name, description, connection, isAutoScanEnabled, isDisconnected } = dataSource;
+
+  return (
+    <>
+      <div className="flex w-full flex-col gap-3 rounded-lg border border-mineshaft-600 bg-mineshaft-900 px-4 py-3">
+        <div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
+          <div className="mr-2 flex flex-1 items-center justify-between">
+            <h3 className="font-semibold text-mineshaft-100">Details</h3>
+            {isDisconnected && (
+              <Tooltip
+                className="text-xs"
+                content="The external data source has been removed and can no longer be scanned. Delete this data source and re-initialize the connection."
+              >
+                <div className="ml-auto">
+                  <Badge
+                    variant="danger"
+                    className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+                  >
+                    <FontAwesomeIcon icon={faPlugCircleXmark} />
+                    <span>Disconnected</span>
+                  </Badge>
+                </div>
+              </Tooltip>
+            )}
+          </div>
+          <ProjectPermissionCan
+            I={ProjectPermissionSecretScanningDataSourceActions.Edit}
+            a={ProjectPermissionSub.SecretScanningDataSources}
+          >
+            {(isAllowed) => (
+              <IconButton
+                variant="plain"
+                colorSchema="secondary"
+                isDisabled={!isAllowed}
+                ariaLabel="Edit data source"
+                onClick={() => handlePopUpOpen("editDataSource")}
+              >
+                <FontAwesomeIcon icon={faEdit} />
+              </IconButton>
+            )}
+          </ProjectPermissionCan>
+        </div>
+        <div>
+          <div className="space-y-3">
+            <GenericFieldLabel label="Name">{name}</GenericFieldLabel>
+            <GenericFieldLabel label="Description">{description}</GenericFieldLabel>
+            {connection && (
+              <GenericFieldLabel label="Connection">{connection.name}</GenericFieldLabel>
+            )}
+            <DataSourceConfigDisplay dataSource={dataSource} />
+            <GenericFieldLabel label="Auto-Scan">
+              {isAutoScanEnabled ? (
+                <Badge
+                  variant="success"
+                  className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+                >
+                  <FontAwesomeIcon icon={faCheck} />
+                  <span>Enabled</span>
+                </Badge>
+              ) : (
+                <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300">
+                  <FontAwesomeIcon icon={faBan} />
+                  <span>Disabled</span>
+                </Badge>
+              )}
+            </GenericFieldLabel>
+          </div>
+        </div>
+      </div>
+      <EditSecretScanningDataSourceModal
+        dataSource={dataSource}
+        onOpenChange={(isOpen) => handlePopUpToggle("editDataSource", isOpen)}
+        isOpen={popUp.editDataSource.isOpen}
+      />
+    </>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx

@@ -0,0 +1,259 @@
+import { useCallback } from "react";
+import {
+  faBan,
+  faCheck,
+  faCopy,
+  faEllipsisV,
+  faExpand,
+  faInfoCircle,
+  faSearch,
+  faWarning
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate } from "@tanstack/react-router";
+import { formatDistance } from "date-fns";
+import { twMerge } from "tailwind-merge";
+
+import { createNotification } from "@app/components/notifications";
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { SecretScanningScanStatusBadge } from "@app/components/secret-scanning";
+import {
+  Badge,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  IconButton,
+  Td,
+  Tooltip,
+  Tr
+} from "@app/components/v2";
+import {
+  ProjectPermissionSecretScanningDataSourceActions,
+  ProjectPermissionSub
+} from "@app/context/ProjectPermissionContext/types";
+import { RESOURCE_DESCRIPTION_HELPER } from "@app/helpers/secretScanningV2";
+import { useToggle } from "@app/hooks";
+import {
+  SecretScanningFindingStatus,
+  SecretScanningScanStatus,
+  TSecretScanningDataSource,
+  TSecretScanningResourceWithDetails,
+  useTriggerSecretScanningDataSource
+} from "@app/hooks/api/secretScanningV2";
+
+type Props = {
+  resource: TSecretScanningResourceWithDetails;
+  dataSource: TSecretScanningDataSource;
+};
+
+export const SecretScanningResourceRow = ({ resource, dataSource }: Props) => {
+  const { id, name, lastScannedAt, lastScanStatus, unresolvedFindings, lastScanStatusMessage } =
+    resource;
+
+  const {
+    config: { includeRepos }
+  } = dataSource;
+
+  // scott: will need to be differentiated by type once other data sources are available
+  const isActive = includeRepos.includes("*") || includeRepos.includes(name);
+
+  const triggerDataSourceScan = useTriggerSecretScanningDataSource();
+
+  const navigate = useNavigate();
+
+  const handleTriggerScan = async () => {
+    try {
+      await triggerDataSourceScan.mutateAsync({
+        dataSourceId: dataSource.id,
+        type: dataSource.type,
+        projectId: dataSource.projectId,
+        resourceId: id
+      });
+
+      createNotification({
+        text: `Successfully triggered scan for ${name}`,
+        type: "success"
+      });
+    } catch {
+      createNotification({
+        text: `Failed to trigger scan for ${name}`,
+        type: "error"
+      });
+    }
+  };
+
+  const [isIdCopied, setIsIdCopied] = useToggle(false);
+
+  const handleCopyId = useCallback(
+    (idToCopy: string) => {
+      setIsIdCopied.on();
+      navigator.clipboard.writeText(idToCopy);
+
+      createNotification({
+        text: "Resource ID copied to clipboard",
+        type: "info"
+      });
+
+      const timer = setTimeout(() => setIsIdCopied.off(), 2000);
+
+      // eslint-disable-next-line consistent-return
+      return () => clearTimeout(timer);
+    },
+    [isIdCopied]
+  );
+
+  const resourceDetails = RESOURCE_DESCRIPTION_HELPER[dataSource.type];
+
+  return (
+    <Tr
+      className={twMerge(
+        "group h-10 transition-colors duration-100 hover:bg-mineshaft-700",
+        lastScanStatus === SecretScanningScanStatus.Failed && "bg-red/5 hover:bg-red/10"
+      )}
+      key={`resource-${id}`}
+    >
+      <Td className="!min-w-[8rem] max-w-0">
+        <div className="flex w-full items-center">
+          <p className="truncate">{name}</p>
+        </div>
+      </Td>
+      <Td>
+        {/* eslint-disable-next-line no-nested-ternary */}
+        {lastScanStatus?.match(/queued|scanning/) ? (
+          <Badge
+            variant="primary"
+            className="flex h-5 w-min animate-pulse items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300"
+          >
+            <FontAwesomeIcon icon={faSearch} />
+            <span>Scanning For Leaks</span>
+          </Badge>
+        ) : // eslint-disable-next-line no-nested-ternary
+        lastScannedAt ? (
+          // eslint-disable-next-line no-nested-ternary
+          unresolvedFindings ? (
+            <Badge
+              onClick={() =>
+                navigate({
+                  to: "/secret-scanning/$projectId/findings",
+                  params: {
+                    projectId: dataSource.projectId
+                  },
+                  search: {
+                    search: name,
+                    status: SecretScanningFindingStatus.Unresolved
+                  }
+                })
+              }
+              variant="primary"
+              className="flex h-5 w-min cursor-pointer items-center gap-1.5 whitespace-nowrap"
+            >
+              <FontAwesomeIcon icon={faWarning} />
+              <span>
+                {unresolvedFindings} Secret{unresolvedFindings > 1 ? "s" : ""} Detected
+              </span>
+            </Badge>
+          ) : lastScanStatus === SecretScanningScanStatus.Failed ? (
+            <span className="text-mineshaft-400">No findings</span>
+          ) : (
+            <Badge
+              variant="success"
+              className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+            >
+              <FontAwesomeIcon icon={faCheck} />
+              No Secrets Detected
+            </Badge>
+          )
+        ) : (
+          <span className="text-mineshaft-400">No findings</span>
+        )}
+      </Td>
+      <Td className="whitespace-nowrap">
+        {/* eslint-disable-next-line no-nested-ternary */}
+        {lastScanStatus?.match(/queued|scanning|failed/) ? (
+          <SecretScanningScanStatusBadge
+            status={lastScanStatus}
+            statusMessage={lastScanStatusMessage}
+            scannedAt={lastScannedAt}
+          />
+        ) : lastScannedAt ? (
+          formatDistance(new Date(lastScannedAt), new Date(), { addSuffix: true })
+        ) : (
+          <span className="text-mineshaft-400">No scans</span>
+        )}
+      </Td>
+      <Td>
+        <div className="flex items-center justify-end gap-2">
+          {!isActive && (
+            <Tooltip
+              className="text-xs"
+              content={`This ${resourceDetails.singularNoun} will not be scanned due to exclusion in Data Source configuration.`}
+            >
+              <div className="ml-auto">
+                <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300">
+                  <FontAwesomeIcon icon={faBan} />
+                  <span>Inactive</span>
+                </Badge>
+              </div>
+            </Tooltip>
+          )}
+          <Tooltip className="max-w-sm text-center" content="Options">
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <IconButton
+                  ariaLabel="Options"
+                  colorSchema="secondary"
+                  className="w-6"
+                  variant="plain"
+                >
+                  <FontAwesomeIcon icon={faEllipsisV} />
+                </IconButton>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent sideOffset={2} align="end">
+                <DropdownMenuItem
+                  icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    handleCopyId(id);
+                  }}
+                >
+                  Copy Resource ID
+                </DropdownMenuItem>
+                <ProjectPermissionCan
+                  I={ProjectPermissionSecretScanningDataSourceActions.TriggerScans}
+                  a={ProjectPermissionSub.SecretScanningDataSources}
+                >
+                  {(isAllowed) => (
+                    <DropdownMenuItem
+                      isDisabled={!isAllowed || !isActive}
+                      icon={<FontAwesomeIcon icon={faExpand} />}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        handleTriggerScan();
+                      }}
+                    >
+                      <Tooltip
+                        position="left"
+                        sideOffset={42}
+                        content={`Manually trigger a scan for this ${resourceDetails.singularNoun}.`}
+                      >
+                        <div className="flex h-full w-full items-center justify-between gap-1">
+                          <span>Trigger Scan</span>
+                          <FontAwesomeIcon
+                            className="text-bunker-300"
+                            size="sm"
+                            icon={faInfoCircle}
+                          />
+                        </div>
+                      </Tooltip>
+                    </DropdownMenuItem>
+                  )}
+                </ProjectPermissionCan>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </Tooltip>
+        </div>
+      </Td>
+    </Tr>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceSection.tsx

@@ -0,0 +1,75 @@
+import { createNotification } from "@app/components/notifications";
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { Button } from "@app/components/v2";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import {
+  RESOURCE_DESCRIPTION_HELPER,
+  SECRET_SCANNING_DATA_SOURCE_MAP
+} from "@app/helpers/secretScanningV2";
+import {
+  TSecretScanningDataSource,
+  useTriggerSecretScanningDataSource
+} from "@app/hooks/api/secretScanningV2";
+
+import { SecretScanningResourcesTable } from "./SecretScanningResourceTable";
+
+type Props = {
+  dataSource: TSecretScanningDataSource;
+};
+
+export const SecretScanningResourceSection = ({ dataSource }: Props) => {
+  const triggerDataSourceScan = useTriggerSecretScanningDataSource();
+
+  const handleTriggerScan = async () => {
+    try {
+      await triggerDataSourceScan.mutateAsync({
+        dataSourceId: dataSource.id,
+        type: dataSource.type,
+        projectId: dataSource.projectId
+      });
+
+      createNotification({
+        text: `Successfully triggered scan for ${dataSource.name}`,
+        type: "success"
+      });
+    } catch {
+      createNotification({
+        text: `Failed to trigger scan for ${dataSource.name}`,
+        type: "error"
+      });
+    }
+  };
+
+  const resourceDetails = RESOURCE_DESCRIPTION_HELPER[dataSource.type];
+
+  return (
+    <div className="w-full rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+      <div className="mb-4 flex items-center justify-between">
+        <div>
+          <p className="text-xl font-semibold text-mineshaft-100">{resourceDetails.pluralTitle}</p>
+          <p className="text-sm text-bunker-300">
+            {resourceDetails.pluralTitle} associated with this{" "}
+            {SECRET_SCANNING_DATA_SOURCE_MAP[dataSource.type].name} Data Source
+          </p>
+        </div>
+        <ProjectPermissionCan
+          I={ProjectPermissionSecretScanningDataSourceActions.TriggerScans}
+          a={ProjectPermissionSub.SecretScanningDataSources}
+        >
+          {(isAllowed) => (
+            <Button
+              colorSchema="secondary"
+              onClick={handleTriggerScan}
+              isDisabled={!isAllowed || triggerDataSourceScan.isPending}
+              isLoading={triggerDataSourceScan.isPending}
+            >
+              Scan {resourceDetails.pluralTitle}
+            </Button>
+          )}
+        </ProjectPermissionCan>
+      </div>
+      <SecretScanningResourcesTable dataSource={dataSource} />
+    </div>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceTable.tsx

@@ -0,0 +1,335 @@
+import { useMemo, useState } from "react";
+import {
+  faArrowDown,
+  faArrowUp,
+  faBan,
+  faBullseye,
+  faCheckCircle,
+  faFilter,
+  faInfoCircle,
+  faMagnifyingGlass,
+  faSearch
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+  EmptyState,
+  IconButton,
+  Input,
+  Pagination,
+  Table,
+  TableContainer,
+  TableSkeleton,
+  TBody,
+  Th,
+  THead,
+  Tooltip,
+  Tr
+} from "@app/components/v2";
+import { ProjectPermissionSub, useProjectPermission } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import { RESOURCE_DESCRIPTION_HELPER } from "@app/helpers/secretScanningV2";
+import { usePagination, useResetPageHelper } from "@app/hooks";
+import { OrderByDirection } from "@app/hooks/api/generic/types";
+import {
+  SecretScanningScanStatus,
+  TSecretScanningDataSource,
+  useListSecretScanningResources
+} from "@app/hooks/api/secretScanningV2";
+
+import { SecretScanningResourceRow } from "./SecretScanningResourceRow";
+
+enum ResourcesOrderBy {
+  Name = "name",
+  Findings = "findings",
+  LastScanned = "last-scanned"
+}
+
+type Props = {
+  dataSource: TSecretScanningDataSource;
+};
+
+enum ResourceStatus {
+  Active = "active",
+  Inactive = "inactive"
+}
+
+type ResourceFilters = {
+  status: ResourceStatus[];
+};
+
+export const SecretScanningResourcesTable = ({ dataSource }: Props) => {
+  const { permission } = useProjectPermission();
+
+  const canReadResources = permission.can(
+    ProjectPermissionSecretScanningDataSourceActions.ReadResources,
+    ProjectPermissionSub.SecretScanningDataSources
+  );
+
+  const [filters, setFilters] = useState<ResourceFilters>({
+    status: [ResourceStatus.Active]
+  });
+
+  const { data: resources = [], isPending: isResourcesPending } = useListSecretScanningResources(
+    { dataSourceId: dataSource.id, type: dataSource.type },
+    {
+      refetchInterval: 30000,
+      enabled: canReadResources
+    }
+  );
+
+  const {
+    search,
+    setSearch,
+    setPage,
+    page,
+    perPage,
+    setPerPage,
+    offset,
+    orderDirection,
+    toggleOrderDirection,
+    orderBy,
+    setOrderDirection,
+    setOrderBy
+  } = usePagination<ResourcesOrderBy>(ResourcesOrderBy.Name, { initPerPage: 10 });
+
+  const filteredResources = useMemo(
+    () =>
+      resources
+        .filter((resource) => {
+          const { name } = resource;
+          const {
+            config: { includeRepos }
+          } = dataSource;
+
+          // scott: will need to be differentiated by type once other data sources are available
+          const isActive = includeRepos.includes("*") || includeRepos.includes(name);
+
+          if (filters.status.length === 1) {
+            if (filters.status.includes(ResourceStatus.Active)) {
+              return isActive;
+            }
+            return !isActive;
+          }
+
+          const searchValue = search.trim().toLowerCase();
+
+          return name.toLowerCase().includes(searchValue);
+        })
+        .sort((a, b) => {
+          const [resourceOne, resourceTwo] =
+            orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
+
+          switch (orderBy) {
+            case ResourcesOrderBy.Findings:
+              if (
+                resourceOne.unresolvedFindings === 0 &&
+                resourceOne.lastScanStatus === SecretScanningScanStatus.Failed
+              )
+                return 1;
+              if (
+                resourceTwo.unresolvedFindings === 0 &&
+                resourceTwo.lastScanStatus === SecretScanningScanStatus.Failed
+              )
+                return -1;
+
+              return resourceTwo.unresolvedFindings - resourceOne.unresolvedFindings;
+            case ResourcesOrderBy.LastScanned:
+              return (
+                new Date(resourceTwo.lastScannedAt).getTime() -
+                new Date(resourceOne.lastScannedAt).getTime()
+              );
+            case ResourcesOrderBy.Name:
+            default:
+              return resourceOne.name.toLowerCase().localeCompare(resourceTwo.name.toLowerCase());
+          }
+        }),
+    [resources, orderDirection, search, orderBy, filters, dataSource]
+  );
+
+  useResetPageHelper({
+    totalCount: filteredResources.length,
+    offset,
+    setPage
+  });
+
+  const handleSort = (column: ResourcesOrderBy) => {
+    if (column === orderBy) {
+      toggleOrderDirection();
+      return;
+    }
+
+    setOrderBy(column);
+    setOrderDirection(OrderByDirection.ASC);
+  };
+
+  const getClassName = (col: ResourcesOrderBy) =>
+    twMerge("ml-2", orderBy === col ? "" : "opacity-30");
+
+  const getColSortIcon = (col: ResourcesOrderBy) =>
+    orderDirection === OrderByDirection.DESC && orderBy === col ? faArrowUp : faArrowDown;
+
+  const resourceDetails = RESOURCE_DESCRIPTION_HELPER[dataSource.type];
+
+  const isTableFiltered = Boolean(filters.status.length);
+
+  return (
+    <div>
+      <div className="flex gap-2">
+        <Input
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+          placeholder={`Search ${resourceDetails.pluralNoun}...`}
+          className="flex-1"
+        />
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <IconButton
+              ariaLabel="Filter data sources"
+              variant="plain"
+              size="sm"
+              className={twMerge(
+                "flex h-10 w-11 items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
+                isTableFiltered && "border-primary/50 text-primary"
+              )}
+            >
+              <FontAwesomeIcon icon={faFilter} />
+            </IconButton>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent className="thin-scrollbar max-h-[70vh] overflow-y-auto" align="end">
+            <DropdownMenuLabel className="flex w-full items-center justify-between">
+              Status
+              <Tooltip
+                content={`Inactive ${resourceDetails.pluralNoun} will not be scanned due to exclusion in Data Source configuration.`}
+              >
+                <FontAwesomeIcon icon={faInfoCircle} className="text-mineshaft-400" />
+              </Tooltip>
+            </DropdownMenuLabel>
+            {Object.values(ResourceStatus).map((status) => (
+              <DropdownMenuItem
+                onClick={(e) => {
+                  e.preventDefault();
+                  setFilters((prev) => ({
+                    ...prev,
+                    status: prev.status.includes(status)
+                      ? prev.status.filter((s) => s !== status)
+                      : [...prev.status, status]
+                  }));
+                }}
+                key={status}
+                icon={
+                  filters.status.includes(status) && (
+                    <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
+                  )
+                }
+                iconPos="right"
+              >
+                <div className="flex items-center gap-2">
+                  <FontAwesomeIcon
+                    icon={status === ResourceStatus.Active ? faBullseye : faBan}
+                    className={
+                      status === ResourceStatus.Active ? "text-primary" : "text-mineshaft-400"
+                    }
+                  />
+                  <span className="capitalize">{status.replace("-", " ")}</span>
+                </div>
+              </DropdownMenuItem>
+            ))}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Tr>
+              <Th className="w-1/2">
+                <div className="flex items-center">
+                  Name
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(ResourcesOrderBy.Name)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(ResourcesOrderBy.Name)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(ResourcesOrderBy.Name)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/4">
+                <div className="flex items-center">
+                  Findings
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(ResourcesOrderBy.Findings)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(ResourcesOrderBy.Findings)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(ResourcesOrderBy.Findings)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/4 whitespace-nowrap">
+                <div className="flex items-center">
+                  Last Scan
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(ResourcesOrderBy.LastScanned)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(ResourcesOrderBy.LastScanned)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(ResourcesOrderBy.LastScanned)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-5" />
+            </Tr>
+          </THead>
+          <TBody>
+            {canReadResources && isResourcesPending && (
+              <TableSkeleton columns={4} innerKey="resource" />
+            )}
+            {filteredResources.slice(offset, perPage * page).map((resource) => (
+              <SecretScanningResourceRow
+                key={resource.id}
+                resource={resource}
+                dataSource={dataSource}
+              />
+            ))}
+          </TBody>
+        </Table>
+        {!canReadResources && (
+          <EmptyState
+            icon={faBan}
+            title={`You do not have permission to view data source ${resourceDetails.pluralNoun}`}
+          />
+        )}
+        {Boolean(filteredResources.length) && (
+          <Pagination
+            count={filteredResources.length}
+            page={page}
+            perPage={perPage}
+            onChangePage={setPage}
+            onChangePerPage={setPerPage}
+          />
+        )}
+        {!isResourcesPending && !filteredResources?.length && (
+          <EmptyState
+            title={
+              resources.length
+                ? "No resources match search..."
+                : `This data source has no ${resourceDetails.pluralNoun} associated with it.`
+            }
+            icon={resources.length ? faSearch : undefined}
+          />
+        )}
+      </TableContainer>
+    </div>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanRow.tsx

@@ -0,0 +1,164 @@
+import { useCallback } from "react";
+import { faCheck, faCopy, faEllipsisV, faWarning } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate } from "@tanstack/react-router";
+import { format } from "date-fns";
+import { twMerge } from "tailwind-merge";
+
+import { createNotification } from "@app/components/notifications";
+import { SecretScanningScanStatusBadge } from "@app/components/secret-scanning";
+import {
+  Badge,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  IconButton,
+  Td,
+  Tooltip,
+  Tr
+} from "@app/components/v2";
+import { useWorkspace } from "@app/context";
+import { useToggle } from "@app/hooks";
+import {
+  SecretScanningScanStatus,
+  SecretScanningScanType,
+  TSecretScanningScanWithDetails
+} from "@app/hooks/api/secretScanningV2";
+
+type Props = {
+  scan: TSecretScanningScanWithDetails;
+};
+
+export const SecretScanningScanRow = ({ scan }: Props) => {
+  const {
+    id,
+    resourceName,
+    createdAt,
+    status,
+    statusMessage,
+    unresolvedFindings,
+    resolvedFindings,
+    type
+  } = scan;
+  const { currentWorkspace } = useWorkspace();
+  const totalFindings = resolvedFindings + unresolvedFindings;
+  const navigate = useNavigate();
+
+  const [isIdCopied, setIsIdCopied] = useToggle(false);
+
+  const handleCopyId = useCallback(() => {
+    setIsIdCopied.on();
+    navigator.clipboard.writeText(id);
+
+    createNotification({
+      text: "Scan ID copied to clipboard",
+      type: "info"
+    });
+
+    const timer = setTimeout(() => setIsIdCopied.off(), 2000);
+
+    // eslint-disable-next-line consistent-return
+    return () => clearTimeout(timer);
+  }, [isIdCopied]);
+
+  return (
+    <Tr
+      className={twMerge(
+        "group h-10 transition-colors duration-100 hover:bg-mineshaft-700",
+        status === SecretScanningScanStatus.Failed && "bg-red/5 hover:bg-red/10"
+      )}
+      key={`scan-${id}`}
+    >
+      <Td>
+        <p>
+          {format(createdAt, "MMM dd yyyy")}{" "}
+          <span className="text-mineshaft-300">{format(createdAt, "h:mm aa")}</span>
+        </p>
+      </Td>
+      <Td className="!min-w-[8rem] max-w-0">
+        <div className="flex flex-col">
+          <p className="truncate">{resourceName}</p>
+        </div>
+      </Td>
+      <Td className="whitespace-nowrap">
+        {type === SecretScanningScanType.FullScan ? "Full Scan" : "Diff Scan"}
+      </Td>
+      <Td>
+        {
+          // eslint-disable-next-line no-nested-ternary
+          status?.match(/queued|scanning|failed/) ? (
+            <SecretScanningScanStatusBadge status={status} statusMessage={statusMessage} />
+          ) : // eslint-disable-next-line no-nested-ternary
+          totalFindings ? (
+            <div className="flex flex-col">
+              <Badge
+                onClick={() =>
+                  navigate({
+                    to: "/secret-scanning/$projectId/findings",
+                    params: {
+                      projectId: currentWorkspace.id
+                    },
+                    search: {
+                      search: `scanId:${id}`
+                    }
+                  })
+                }
+                variant={unresolvedFindings ? "primary" : undefined}
+                className={twMerge(
+                  "flex h-5 w-min cursor-pointer items-center gap-1.5 whitespace-nowrap",
+                  !unresolvedFindings && "bg-mineshaft-400/50 text-bunker-300"
+                )}
+              >
+                <FontAwesomeIcon icon={unresolvedFindings ? faWarning : faCheck} />
+                <span className="text-xs">
+                  {totalFindings}{" "}
+                  {unresolvedFindings
+                    ? `Secret${totalFindings > 1 ? "s" : ""} Detected`
+                    : "Leak Resolved"}
+                </span>
+              </Badge>
+            </div>
+          ) : status === SecretScanningScanStatus.Failed ? (
+            <span className="text-mineshaft-400">No findings</span>
+          ) : (
+            <Badge
+              variant="success"
+              className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+            >
+              <FontAwesomeIcon icon={faCheck} />
+              No Secrets Detected
+            </Badge>
+          )
+        }
+      </Td>
+      <Td>
+        <Tooltip className="max-w-sm text-center" content="Options">
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <IconButton
+                ariaLabel="Options"
+                colorSchema="secondary"
+                className="w-6"
+                variant="plain"
+              >
+                <FontAwesomeIcon icon={faEllipsisV} />
+              </IconButton>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent sideOffset={2} align="end">
+              <DropdownMenuItem
+                icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleCopyId();
+                }}
+              >
+                Copy Scan ID
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </Tooltip>
+      </Td>
+    </Tr>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanSection.tsx

@@ -0,0 +1,27 @@
+import { RESOURCE_DESCRIPTION_HELPER } from "@app/helpers/secretScanningV2";
+import { TSecretScanningDataSource } from "@app/hooks/api/secretScanningV2";
+
+import { SecretScanningScanTable } from "./SecretScanningScanTable";
+
+type Props = {
+  dataSource: TSecretScanningDataSource;
+};
+
+export const SecretScanningScanSection = ({ dataSource }: Props) => {
+  const resourceDetails = RESOURCE_DESCRIPTION_HELPER[dataSource.type];
+
+  return (
+    <div className="w-full rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+      <div className="mb-4 flex items-center justify-between">
+        <div>
+          <p className="text-xl font-semibold text-mineshaft-100">Scan History</p>
+          <p className="text-sm text-bunker-300">
+            Detailed history of when {resourceDetails.singularNoun} scans occurred and their
+            findings
+          </p>
+        </div>
+      </div>
+      <SecretScanningScanTable dataSource={dataSource} />
+    </div>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningScanTable.tsx

@@ -0,0 +1,299 @@
+import { useMemo, useState } from "react";
+import {
+  faArrowDown,
+  faArrowUp,
+  faBan,
+  faCheckCircle,
+  faExpand,
+  faFilter,
+  faMagnifyingGlass,
+  faSearch
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+  EmptyState,
+  IconButton,
+  Input,
+  Pagination,
+  Table,
+  TableContainer,
+  TableSkeleton,
+  TBody,
+  Th,
+  THead,
+  Tr
+} from "@app/components/v2";
+import { ProjectPermissionSub, useProjectPermission } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import { RESOURCE_DESCRIPTION_HELPER } from "@app/helpers/secretScanningV2";
+import { usePagination, useResetPageHelper } from "@app/hooks";
+import { OrderByDirection } from "@app/hooks/api/generic/types";
+import {
+  SecretScanningScanStatus,
+  TSecretScanningDataSource,
+  useListSecretScanningScans
+} from "@app/hooks/api/secretScanningV2";
+
+import { SecretScanningScanRow } from "./SecretScanningScanRow";
+
+enum ScansOrderBy {
+  ResourceName = "resource-name",
+  Findings = "findings",
+  Timestamp = "timestamp",
+  Status = "status"
+}
+
+type Props = {
+  dataSource: TSecretScanningDataSource;
+};
+
+type ScanFilters = {
+  resourceNames: string[];
+};
+
+export const SecretScanningScanTable = ({ dataSource }: Props) => {
+  const { permission } = useProjectPermission();
+
+  const canReadScans = permission.can(
+    ProjectPermissionSecretScanningDataSourceActions.ReadScans,
+    ProjectPermissionSub.SecretScanningDataSources
+  );
+
+  const { data: scans = [], isPending: isScansPending } = useListSecretScanningScans(
+    { dataSourceId: dataSource.id, type: dataSource.type },
+    {
+      refetchInterval: 30000,
+      enabled: canReadScans
+    }
+  );
+
+  const [filters, setFilters] = useState<ScanFilters>({
+    resourceNames: []
+  });
+
+  const {
+    search,
+    setSearch,
+    setPage,
+    page,
+    perPage,
+    setPerPage,
+    offset,
+    orderDirection,
+    toggleOrderDirection,
+    orderBy,
+    setOrderDirection,
+    setOrderBy
+  } = usePagination<ScansOrderBy>(ScansOrderBy.Timestamp, { initPerPage: 10 });
+
+  const filteredResources = useMemo(
+    () =>
+      scans
+        .filter((scan) => {
+          const { resourceName } = scan;
+
+          if (filters.resourceNames.length && !filters.resourceNames.includes(resourceName))
+            return false;
+
+          const searchValue = search.trim().toLowerCase();
+
+          return resourceName.toLowerCase().includes(searchValue);
+        })
+        .sort((a, b) => {
+          const [scanOne, scanTwo] = orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
+
+          switch (orderBy) {
+            case ScansOrderBy.Findings:
+              if (
+                scanOne.unresolvedFindings === 0 &&
+                scanOne.status === SecretScanningScanStatus.Failed
+              )
+                return 1;
+              if (
+                scanTwo.unresolvedFindings === 0 &&
+                scanTwo.status === SecretScanningScanStatus.Failed
+              )
+                return -1;
+
+              return scanTwo.unresolvedFindings - scanOne.unresolvedFindings;
+            case ScansOrderBy.Timestamp:
+              return new Date(scanTwo.createdAt).getTime() - new Date(scanOne.createdAt).getTime();
+            case ScansOrderBy.ResourceName:
+            default:
+              return scanOne.resourceName
+                .toLowerCase()
+                .localeCompare(scanTwo.resourceName.toLowerCase());
+          }
+        }),
+    [scans, orderDirection, search, orderBy, filters]
+  );
+
+  useResetPageHelper({
+    totalCount: filteredResources.length,
+    offset,
+    setPage
+  });
+
+  const handleSort = (column: ScansOrderBy) => {
+    if (column === orderBy) {
+      toggleOrderDirection();
+      return;
+    }
+
+    setOrderBy(column);
+    setOrderDirection(OrderByDirection.ASC);
+  };
+
+  const getClassName = (col: ScansOrderBy) => twMerge("ml-2", orderBy === col ? "" : "opacity-30");
+
+  const getColSortIcon = (col: ScansOrderBy) =>
+    orderDirection === OrderByDirection.DESC && orderBy === col ? faArrowUp : faArrowDown;
+
+  const isTableFiltered = Boolean(filters.resourceNames.length);
+
+  const resourceDetails = RESOURCE_DESCRIPTION_HELPER[dataSource.type];
+
+  return (
+    <div>
+      <div className="flex gap-2">
+        <Input
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+          placeholder="Search scans..."
+          className="flex-1"
+        />
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <IconButton
+              ariaLabel="Filter data sources"
+              variant="plain"
+              size="sm"
+              className={twMerge(
+                "flex h-10 w-11 items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
+                isTableFiltered && "border-primary/50 text-primary"
+              )}
+            >
+              <FontAwesomeIcon icon={faFilter} />
+            </IconButton>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent className="thin-scrollbar max-h-[70vh] overflow-y-auto" align="end">
+            <DropdownMenuLabel>{resourceDetails.pluralTitle}</DropdownMenuLabel>
+            {scans.length ? (
+              [...new Set(scans.map(({ resourceName }) => resourceName))].map((resourceName) => {
+                return (
+                  <DropdownMenuItem
+                    onClick={(e) => {
+                      e.preventDefault();
+                      setFilters((prev) => ({
+                        ...prev,
+                        resourceNames: prev.resourceNames.includes(resourceName)
+                          ? prev.resourceNames.filter((a) => a !== resourceName)
+                          : [...prev.resourceNames, resourceName]
+                      }));
+                    }}
+                    key={resourceName}
+                    icon={
+                      filters.resourceNames.includes(resourceName) && (
+                        <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
+                      )
+                    }
+                    iconPos="right"
+                  >
+                    {resourceName}
+                  </DropdownMenuItem>
+                );
+              })
+            ) : (
+              <DropdownMenuItem isDisabled>No Data Sources Configured</DropdownMenuItem>
+            )}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Tr>
+              <Th className="w-1/4 whitespace-nowrap">
+                <div className="flex items-center">
+                  Timestamp
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(ScansOrderBy.Timestamp)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(ScansOrderBy.Timestamp)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(ScansOrderBy.Timestamp)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/2">
+                <div className="flex items-center">
+                  Name
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(ScansOrderBy.ResourceName)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(ScansOrderBy.ResourceName)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(ScansOrderBy.ResourceName)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-20">Type</Th>
+              <Th className="w-1/5 whitespace-nowrap">
+                <div className="flex items-center">
+                  Findings
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(ScansOrderBy.Findings)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(ScansOrderBy.Findings)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(ScansOrderBy.Findings)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-5" />
+            </Tr>
+          </THead>
+          <TBody>
+            {canReadScans && isScansPending && <TableSkeleton columns={5} innerKey="resource" />}
+            {filteredResources.slice(offset, perPage * page).map((scan) => (
+              <SecretScanningScanRow key={scan.id} scan={scan} />
+            ))}
+          </TBody>
+        </Table>
+        {!canReadScans && (
+          <EmptyState icon={faBan} title="You do not have permission to view data source scans" />
+        )}
+        {Boolean(filteredResources.length) && (
+          <Pagination
+            count={filteredResources.length}
+            page={page}
+            perPage={perPage}
+            onChangePage={setPage}
+            onChangePerPage={setPerPage}
+          />
+        )}
+        {!isScansPending && !filteredResources?.length && (
+          <EmptyState
+            title={
+              scans.length
+                ? "No scans match search..."
+                : "This data source has no scans associated with it."
+            }
+            icon={scans.length ? faSearch : faExpand}
+          />
+        )}
+      </TableContainer>
+    </div>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/index.ts

@@ -0,0 +1,3 @@
+export * from "./SecretScanningDataSourceSection";
+export * from "./SecretScanningResourceSection";
+export * from "./SecretScanningScanSection";

frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/route.tsx

@@ -0,0 +1,26 @@
+import { createFileRoute, linkOptions } from "@tanstack/react-router";
+
+import { SecretScanningDataSourceByIdPage } from "./SecretScanningDataSourceByIdPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-scanning/$projectId/_secret-scanning-layout/data-sources/$type/$dataSourceId"
+)({
+  component: SecretScanningDataSourceByIdPage,
+  beforeLoad: ({ context, params }) => {
+    return {
+      breadcrumbs: [
+        ...context.breadcrumbs,
+        {
+          label: "Data Sources",
+          link: linkOptions({
+            to: "/secret-scanning/$projectId/data-sources",
+            params
+          })
+        },
+        {
+          label: "Data Source"
+        }
+      ]
+    };
+  }
+});

frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/SecretScanningDataSourcesPage.tsx

@@ -0,0 +1,39 @@
+import { Helmet } from "react-helmet";
+import { useTranslation } from "react-i18next";
+
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { PageHeader } from "@app/components/v2";
+import {
+  ProjectPermissionSecretScanningDataSourceActions,
+  ProjectPermissionSub
+} from "@app/context/ProjectPermissionContext/types";
+
+import { SecretScanningDataSourcesSection } from "./components";
+
+export const SecretScanningDataSourcesPage = () => {
+  const { t } = useTranslation();
+  return (
+    <>
+      <Helmet>
+        <title>{t("common.head-title", { title: "Secret Scanning" })}</title>
+      </Helmet>
+      <ProjectPermissionCan
+        renderGuardBanner
+        I={ProjectPermissionSecretScanningDataSourceActions.Read}
+        a={ProjectPermissionSub.SecretScanningDataSources}
+      >
+        <div className="h-full bg-bunker-800">
+          <div className="container mx-auto flex flex-col justify-between bg-bunker-800 text-white">
+            <div className="mx-auto mb-6 w-full max-w-7xl">
+              <PageHeader
+                title="Data Sources"
+                description="Manage your Secret Scanning data sources."
+              />
+              <SecretScanningDataSourcesSection />
+            </div>
+          </div>
+        </div>
+      </ProjectPermissionCan>
+    </>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx

@@ -0,0 +1,345 @@
+import { useCallback } from "react";
+import {
+  faBan,
+  faCheck,
+  faCopy,
+  faEdit,
+  faEllipsisV,
+  faExpand,
+  faInfoCircle,
+  faPlugCircleXmark,
+  faSearch,
+  faToggleOff,
+  faToggleOn,
+  faTrash,
+  faWarning
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useNavigate } from "@tanstack/react-router";
+import { formatDistance } from "date-fns";
+import { twMerge } from "tailwind-merge";
+
+import { createNotification } from "@app/components/notifications";
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { SecretScanningScanStatusBadge } from "@app/components/secret-scanning";
+import {
+  Badge,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  IconButton,
+  Td,
+  Tooltip,
+  Tr
+} from "@app/components/v2";
+import { ROUTE_PATHS } from "@app/const/routes";
+import { ProjectPermissionSub } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import {
+  RESOURCE_DESCRIPTION_HELPER,
+  SECRET_SCANNING_DATA_SOURCE_MAP
+} from "@app/helpers/secretScanningV2";
+import { useToggle } from "@app/hooks";
+import {
+  SecretScanningFindingStatus,
+  SecretScanningScanStatus,
+  TSecretScanningDataSourceWithDetails
+} from "@app/hooks/api/secretScanningV2";
+
+type Props = {
+  dataSource: TSecretScanningDataSourceWithDetails;
+  onDelete: (dataSource: TSecretScanningDataSourceWithDetails) => void;
+  onTriggerScan: (dataSource: TSecretScanningDataSourceWithDetails) => void;
+  onToggleEnableAutoScan: (dataSource: TSecretScanningDataSourceWithDetails) => void;
+  onEdit: (dataSource: TSecretScanningDataSourceWithDetails) => void;
+};
+
+export const SecretScanningDataSourceRow = ({
+  dataSource,
+  onDelete,
+  onEdit,
+  onTriggerScan,
+  onToggleEnableAutoScan
+}: Props) => {
+  const navigate = useNavigate();
+  const {
+    id,
+    name,
+    description,
+    isAutoScanEnabled,
+    projectId,
+    type,
+    unresolvedFindings,
+    lastScannedAt,
+    lastScanStatus,
+    lastScanStatusMessage,
+    isDisconnected
+  } = dataSource;
+
+  const sourceDetails = SECRET_SCANNING_DATA_SOURCE_MAP[type];
+
+  const [isIdCopied, setIsIdCopied] = useToggle(false);
+
+  const handleCopyId = useCallback(() => {
+    setIsIdCopied.on();
+    navigator.clipboard.writeText(id);
+
+    createNotification({
+      text: "Data Source ID copied to clipboard",
+      type: "info"
+    });
+
+    const timer = setTimeout(() => setIsIdCopied.off(), 2000);
+
+    // eslint-disable-next-line consistent-return
+    return () => clearTimeout(timer);
+  }, [isIdCopied]);
+
+  const autoScanDescription = RESOURCE_DESCRIPTION_HELPER[type];
+
+  return (
+    <Tr
+      onClick={() =>
+        navigate({
+          to: ROUTE_PATHS.SecretScanning.DataSourceByIdPage.path,
+          params: {
+            dataSourceId: id,
+            type,
+            projectId
+          }
+        })
+      }
+      className={twMerge(
+        "group h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700",
+        lastScanStatus === SecretScanningScanStatus.Failed && "bg-red/5 hover:bg-red/10"
+      )}
+      key={`data-source-${id}`}
+    >
+      <Td className="!min-w-[8rem] max-w-0">
+        <div className="flex w-full items-center">
+          <img
+            alt={`${sourceDetails.name} Data Source`}
+            src={`/images/integrations/${sourceDetails.image}`}
+            className="w-5"
+          />
+          <p className="ml-2 truncate">{sourceDetails.name}</p>
+        </div>
+      </Td>
+      <Td className="!min-w-[8rem] max-w-0">
+        <div className="flex w-full items-center">
+          <p className="truncate">{name}</p>
+          {description && (
+            <Tooltip content={description}>
+              <FontAwesomeIcon icon={faInfoCircle} size="xs" className="ml-1 text-mineshaft-400" />
+            </Tooltip>
+          )}
+        </div>
+      </Td>
+      <Td>
+        {/* eslint-disable-next-line no-nested-ternary */}
+        {lastScanStatus?.match(/queued|scanning/) ? (
+          <Badge
+            variant="primary"
+            className="flex h-5 w-min animate-pulse items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300"
+          >
+            <FontAwesomeIcon icon={faSearch} />
+            <span>Scanning For Leaks</span>
+          </Badge>
+        ) : // eslint-disable-next-line no-nested-ternary
+        lastScannedAt ? (
+          // eslint-disable-next-line no-nested-ternary
+          unresolvedFindings ? (
+            <Badge
+              variant="primary"
+              className="flex h-5 w-min cursor-pointer items-center gap-1.5 whitespace-nowrap"
+              onClick={(e) => {
+                e.stopPropagation();
+                navigate({
+                  to: "/secret-scanning/$projectId/findings",
+                  params: {
+                    projectId
+                  },
+                  search: {
+                    search: name,
+                    status: SecretScanningFindingStatus.Unresolved
+                  }
+                });
+              }}
+            >
+              <FontAwesomeIcon icon={faWarning} />
+              <span>
+                {unresolvedFindings} Secret{unresolvedFindings > 1 ? "s" : ""} Detected
+              </span>
+            </Badge>
+          ) : lastScanStatus === SecretScanningScanStatus.Failed ? (
+            <span className="text-mineshaft-400">No findings</span>
+          ) : (
+            <Badge
+              variant="success"
+              className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+            >
+              <FontAwesomeIcon icon={faCheck} />
+              No Secrets Detected
+            </Badge>
+          )
+        ) : (
+          <span className="text-mineshaft-400">No findings</span>
+        )}
+      </Td>
+      <Td>
+        <div className="flex w-full items-center gap-1">
+          {/* eslint-disable-next-line no-nested-ternary */}
+          {lastScanStatus?.match(/queued|scanning|failed/) ? (
+            <SecretScanningScanStatusBadge
+              status={lastScanStatus}
+              statusMessage={lastScanStatusMessage}
+              scannedAt={lastScannedAt}
+            />
+          ) : lastScannedAt ? (
+            <span>{formatDistance(new Date(lastScannedAt), new Date(), { addSuffix: true })}</span>
+          ) : (
+            <span className="text-mineshaft-400">No scans</span>
+          )}
+          {!isAutoScanEnabled && !isDisconnected && (
+            <Tooltip
+              className="text-xs"
+              content={`Auto-Scan is disabled. Scans will not be automatically triggered when a ${autoScanDescription.verb} occurs to ${autoScanDescription.pluralNoun} associated with this data source`}
+            >
+              <div className="ml-auto">
+                <Badge className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap bg-mineshaft-400/50 text-bunker-300">
+                  <FontAwesomeIcon icon={faBan} />
+                  <span>Auto-Scan Disabled</span>
+                </Badge>
+              </div>
+            </Tooltip>
+          )}
+          {isDisconnected && (
+            <Tooltip
+              className="text-xs"
+              content="The external data source has been removed and can no longer be scanned. Delete this data source and re-initialize the connection."
+            >
+              <div className="ml-auto">
+                <Badge
+                  variant="danger"
+                  className="flex h-5 w-min items-center gap-1.5 whitespace-nowrap"
+                >
+                  <FontAwesomeIcon icon={faPlugCircleXmark} />
+                  <span>Disconnected</span>
+                </Badge>
+              </div>
+            </Tooltip>
+          )}
+        </div>
+      </Td>
+      <Td>
+        <Tooltip className="max-w-sm text-center" content="Options">
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <IconButton
+                ariaLabel="Options"
+                colorSchema="secondary"
+                className="w-6"
+                variant="plain"
+              >
+                <FontAwesomeIcon icon={faEllipsisV} />
+              </IconButton>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent sideOffset={2} align="end">
+              <DropdownMenuItem
+                icon={<FontAwesomeIcon icon={isIdCopied ? faCheck : faCopy} />}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleCopyId();
+                }}
+              >
+                Copy Data Source ID
+              </DropdownMenuItem>
+              <ProjectPermissionCan
+                I={ProjectPermissionSecretScanningDataSourceActions.TriggerScans}
+                a={ProjectPermissionSub.SecretScanningDataSources}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    icon={<FontAwesomeIcon icon={faExpand} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onTriggerScan(dataSource);
+                    }}
+                    isDisabled={!isAllowed}
+                  >
+                    <Tooltip
+                      position="left"
+                      sideOffset={42}
+                      content={`Manually trigger a scan for this ${sourceDetails.name} data source.`}
+                    >
+                      <div className="flex h-full w-full items-center justify-between gap-1">
+                        <span>Trigger Scan</span>
+                        <FontAwesomeIcon
+                          className="text-bunker-300"
+                          size="sm"
+                          icon={faInfoCircle}
+                        />
+                      </div>
+                    </Tooltip>
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+              <ProjectPermissionCan
+                I={ProjectPermissionSecretScanningDataSourceActions.Edit}
+                a={ProjectPermissionSub.SecretScanningDataSources}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed}
+                    icon={<FontAwesomeIcon icon={isAutoScanEnabled ? faToggleOff : faToggleOn} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onToggleEnableAutoScan(dataSource);
+                    }}
+                  >
+                    {isAutoScanEnabled ? "Disable" : "Enable"} Auto-Scan
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+              <ProjectPermissionCan
+                I={ProjectPermissionSecretScanningDataSourceActions.Edit}
+                a={ProjectPermissionSub.SecretScanningDataSources}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed}
+                    icon={<FontAwesomeIcon icon={faEdit} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onEdit(dataSource);
+                    }}
+                  >
+                    Edit Data Source
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+              <ProjectPermissionCan
+                I={ProjectPermissionSecretScanningDataSourceActions.Delete}
+                a={ProjectPermissionSub.SecretScanningDataSources}
+              >
+                {(isAllowed: boolean) => (
+                  <DropdownMenuItem
+                    isDisabled={!isAllowed}
+                    icon={<FontAwesomeIcon icon={faTrash} />}
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      onDelete(dataSource);
+                    }}
+                  >
+                    Delete Data Source
+                  </DropdownMenuItem>
+                )}
+              </ProjectPermissionCan>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </Tooltip>
+      </Td>
+    </Tr>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesSection.tsx

@@ -0,0 +1,101 @@
+import { faArrowUpRightFromSquare, faBookOpen, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
+import { ProjectPermissionCan } from "@app/components/permissions";
+import { CreateSecretScanningDataSourceModal } from "@app/components/secret-scanning";
+import { Button, Spinner } from "@app/components/v2";
+import { ProjectPermissionSub, useSubscription, useWorkspace } from "@app/context";
+import { ProjectPermissionSecretScanningDataSourceActions } from "@app/context/ProjectPermissionContext/types";
+import { usePopUp } from "@app/hooks";
+import { useListSecretScanningDataSources } from "@app/hooks/api/secretScanningV2";
+
+import { SecretScanningDataSourcesTable } from "./SecretScanningDataSourcesTable";
+
+export const SecretScanningDataSourcesSection = () => {
+  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
+    "addDataSource",
+    "upgradePlan"
+  ] as const);
+
+  const { subscription } = useSubscription();
+
+  const { currentWorkspace } = useWorkspace();
+
+  const { data: dataSources = [], isPending: isDataSourcesPending } =
+    useListSecretScanningDataSources(currentWorkspace.id, {
+      refetchInterval: 30000,
+      enabled: subscription.secretScanning
+    });
+
+  if (subscription.secretScanning && isDataSourcesPending)
+    return (
+      <div className="flex h-[60vh] flex-col items-center justify-center gap-2">
+        <Spinner />
+      </div>
+    );
+
+  return (
+    <>
+      <div className="w-full rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+        <div className="mb-4 flex items-center justify-between">
+          <div>
+            <div className="flex items-center gap-1">
+              <p className="text-xl font-semibold text-mineshaft-100">Data Sources</p>
+              <a
+                href="https://infisical.com/docs/documentation/platform/secret-scanning/overview"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <div className="ml-1 mt-[0.32rem] inline-block rounded-md bg-yellow/20 px-1.5 text-sm text-yellow opacity-80 hover:opacity-100">
+                  <FontAwesomeIcon icon={faBookOpen} className="mr-1.5" />
+                  <span>Docs</span>
+                  <FontAwesomeIcon
+                    icon={faArrowUpRightFromSquare}
+                    className="mb-[0.07rem] ml-1.5 text-[10px]"
+                  />
+                </div>
+              </a>
+            </div>
+            <p className="text-sm text-bunker-300">
+              Configure Data Sources to scan for secret leaks from third-party services.
+            </p>
+          </div>
+          <ProjectPermissionCan
+            I={ProjectPermissionSecretScanningDataSourceActions.Create}
+            a={ProjectPermissionSub.SecretScanningDataSources}
+          >
+            {(isAllowed) => (
+              <Button
+                colorSchema="secondary"
+                type="submit"
+                leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                onClick={() => {
+                  if (!subscription.secretScanning) {
+                    handlePopUpOpen("upgradePlan");
+                    return;
+                  }
+
+                  handlePopUpOpen("addDataSource");
+                }}
+                isDisabled={!isAllowed}
+              >
+                Add Data Source
+              </Button>
+            )}
+          </ProjectPermissionCan>
+        </div>
+        <SecretScanningDataSourcesTable dataSources={dataSources} />
+      </div>
+      <CreateSecretScanningDataSourceModal
+        isOpen={popUp.addDataSource.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("addDataSource", isOpen)}
+      />
+      <UpgradePlanModal
+        isOpen={popUp.upgradePlan.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
+        text="You can create Data Sources by upgrading to Infisical's Enterprise plan."
+      />
+    </>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesTable.tsx

@@ -0,0 +1,385 @@
+import { useMemo, useState } from "react";
+import {
+  faArrowDown,
+  faArrowUp,
+  faCheckCircle,
+  faCubesStacked,
+  faFilter,
+  faMagnifyingGlass,
+  faSearch
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import { createNotification } from "@app/components/notifications";
+import { EditSecretScanningDataSourceModal } from "@app/components/secret-scanning";
+import { DeleteSecretScanningDataSourceModal } from "@app/components/secret-scanning/DeleteSecretScanningDataSourceModal";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+  EmptyState,
+  IconButton,
+  Input,
+  Pagination,
+  Table,
+  TableContainer,
+  TBody,
+  Th,
+  THead,
+  Tr
+} from "@app/components/v2";
+import { SECRET_SCANNING_DATA_SOURCE_MAP } from "@app/helpers/secretScanningV2";
+import { usePagination, usePopUp, useResetPageHelper } from "@app/hooks";
+import { OrderByDirection } from "@app/hooks/api/generic/types";
+import {
+  SecretScanningDataSource,
+  SecretScanningScanStatus,
+  TSecretScanningDataSource,
+  TSecretScanningDataSourceWithDetails,
+  useTriggerSecretScanningDataSource,
+  useUpdateSecretScanningDataSource
+} from "@app/hooks/api/secretScanningV2";
+
+import { SecretScanningDataSourceRow } from "./SecretScanningDataSourceRow";
+
+enum DataSourcesOrderBy {
+  Findings = "findings",
+  Name = "name",
+  LastScan = "last-scan"
+}
+
+type DataSourceFilters = {
+  types: SecretScanningDataSource[];
+};
+
+type Props = {
+  dataSources: TSecretScanningDataSourceWithDetails[];
+};
+
+export const SecretScanningDataSourcesTable = ({ dataSources }: Props) => {
+  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
+    "deleteDataSource",
+    "editDataSource",
+    "triggerDataSourceScan"
+  ] as const);
+  const triggerDataSourceScan = useTriggerSecretScanningDataSource();
+  const updateDataSource = useUpdateSecretScanningDataSource();
+
+  const [filters, setFilters] = useState<DataSourceFilters>({
+    types: []
+  });
+
+  const {
+    search,
+    setSearch,
+    setPage,
+    page,
+    perPage,
+    setPerPage,
+    offset,
+    orderDirection,
+    toggleOrderDirection,
+    orderBy,
+    setOrderDirection,
+    setOrderBy
+  } = usePagination<DataSourcesOrderBy>(DataSourcesOrderBy.Name, { initPerPage: 20 });
+
+  const filteredDataSources = useMemo(
+    () =>
+      dataSources
+        .filter((dataSource) => {
+          const { type, name, connection } = dataSource;
+
+          if (filters.types.length && !filters.types.includes(type)) return false;
+
+          const searchValue = search.trim().toLowerCase();
+
+          return (
+            SECRET_SCANNING_DATA_SOURCE_MAP[type].name.toLowerCase().includes(searchValue) ||
+            name.toLowerCase().includes(searchValue) ||
+            (connection && connection.name.toLowerCase().includes(searchValue))
+          );
+        })
+        .sort((a, b) => {
+          const [dataSourceOne, dataSourceTwo] =
+            orderDirection === OrderByDirection.ASC ? [a, b] : [b, a];
+
+          switch (orderBy) {
+            case DataSourcesOrderBy.LastScan:
+              if (dataSourceOne.lastScannedAt === null && dataSourceTwo.lastScannedAt === null)
+                return 0;
+              if (dataSourceOne.lastScannedAt === null) return 1;
+              if (dataSourceTwo.lastScannedAt === null) return -1;
+
+              return (
+                new Date(dataSourceTwo.lastScannedAt).getTime() -
+                new Date(dataSourceOne.lastScannedAt).getTime()
+              );
+            case DataSourcesOrderBy.Findings:
+              if (
+                dataSourceOne.unresolvedFindings === null &&
+                dataSourceTwo.unresolvedFindings === null
+              )
+                return 0;
+              if (dataSourceOne.unresolvedFindings === null) return 1;
+              if (dataSourceTwo.unresolvedFindings === null) return -1;
+
+              if (
+                dataSourceOne.unresolvedFindings === 0 &&
+                dataSourceOne.lastScanStatus === SecretScanningScanStatus.Failed
+              )
+                return 1;
+              if (
+                dataSourceTwo.unresolvedFindings === 0 &&
+                dataSourceTwo.lastScanStatus === SecretScanningScanStatus.Failed
+              )
+                return -1;
+
+              return dataSourceTwo.unresolvedFindings - dataSourceOne.unresolvedFindings;
+            case DataSourcesOrderBy.Name:
+            default:
+              return dataSourceOne.name
+                .toLowerCase()
+                .localeCompare(dataSourceTwo.name.toLowerCase());
+          }
+        }),
+    [dataSources, orderDirection, search, orderBy, filters]
+  );
+
+  useResetPageHelper({
+    totalCount: filteredDataSources.length,
+    offset,
+    setPage
+  });
+
+  const handleSort = (column: DataSourcesOrderBy) => {
+    if (column === orderBy) {
+      toggleOrderDirection();
+      return;
+    }
+
+    setOrderBy(column);
+    setOrderDirection(OrderByDirection.ASC);
+  };
+
+  const getClassName = (col: DataSourcesOrderBy) =>
+    twMerge("ml-2", orderBy === col ? "" : "opacity-30");
+
+  const getColSortIcon = (col: DataSourcesOrderBy) =>
+    orderDirection === OrderByDirection.DESC && orderBy === col ? faArrowUp : faArrowDown;
+
+  const isTableFiltered = Boolean(filters.types.length);
+
+  const handleDelete = (dataSource: TSecretScanningDataSource) =>
+    handlePopUpOpen("deleteDataSource", dataSource);
+
+  const handleEdit = (dataSource: TSecretScanningDataSource) =>
+    handlePopUpOpen("editDataSource", dataSource);
+
+  const handleToggleEnableAutoScan = async (dataSource: TSecretScanningDataSource) => {
+    const destinationName = SECRET_SCANNING_DATA_SOURCE_MAP[dataSource.type].name;
+
+    const isAutoScanEnabled = !dataSource.isAutoScanEnabled;
+
+    try {
+      await updateDataSource.mutateAsync({
+        dataSourceId: dataSource.id,
+        type: dataSource.type,
+        isAutoScanEnabled,
+        projectId: dataSource.projectId
+      });
+
+      createNotification({
+        text: `Successfully ${isAutoScanEnabled ? "enabled" : "disabled"} auto-scan for ${destinationName} Data Source`,
+        type: "success"
+      });
+    } catch {
+      createNotification({
+        text: `Failed to ${isAutoScanEnabled ? "enable" : "disable"} auto-scan for ${destinationName} Data Source`,
+        type: "error"
+      });
+    }
+  };
+
+  const handleTriggerScan = async (dataSource: TSecretScanningDataSource) => {
+    try {
+      await triggerDataSourceScan.mutateAsync({
+        dataSourceId: dataSource.id,
+        type: dataSource.type,
+        projectId: dataSource.projectId
+      });
+
+      createNotification({
+        text: "Successfully triggered scan",
+        type: "success"
+      });
+    } catch {
+      createNotification({
+        text: "Failed to trigger scan",
+        type: "error"
+      });
+    }
+  };
+
+  return (
+    <div>
+      <div className="flex gap-2">
+        <Input
+          value={search}
+          onChange={(e) => setSearch(e.target.value)}
+          leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+          placeholder="Search data sources..."
+          className="flex-1"
+        />
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <IconButton
+              ariaLabel="Filter data sources"
+              variant="plain"
+              size="sm"
+              className={twMerge(
+                "flex h-10 w-11 items-center justify-center overflow-hidden border border-mineshaft-600 bg-mineshaft-800 p-0 transition-all hover:border-primary/60 hover:bg-primary/10",
+                isTableFiltered && "border-primary/50 text-primary"
+              )}
+            >
+              <FontAwesomeIcon icon={faFilter} />
+            </IconButton>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent className="thin-scrollbar max-h-[70vh] overflow-y-auto" align="end">
+            <DropdownMenuLabel>Platform</DropdownMenuLabel>
+            {dataSources.length ? (
+              [...new Set(dataSources.map(({ type }) => type))].map((type) => {
+                const { name, image } = SECRET_SCANNING_DATA_SOURCE_MAP[type];
+
+                return (
+                  <DropdownMenuItem
+                    onClick={(e) => {
+                      e.preventDefault();
+                      setFilters((prev) => ({
+                        ...prev,
+                        types: prev.types.includes(type)
+                          ? prev.types.filter((a) => a !== type)
+                          : [...prev.types, type]
+                      }));
+                    }}
+                    key={type}
+                    icon={
+                      filters.types.includes(type) && (
+                        <FontAwesomeIcon className="text-primary" icon={faCheckCircle} />
+                      )
+                    }
+                    iconPos="right"
+                  >
+                    <div className="flex items-center gap-2">
+                      <img
+                        alt={`${name} integration`}
+                        src={`/images/integrations/${image}`}
+                        className="h-4 w-4"
+                      />
+                      <span>{name}</span>
+                    </div>
+                  </DropdownMenuItem>
+                );
+              })
+            ) : (
+              <DropdownMenuItem isDisabled>No Data Sources Configured</DropdownMenuItem>
+            )}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Tr>
+              <Th className="w-60">Platform</Th>
+              <Th className="w-1/3">
+                <div className="flex items-center">
+                  Name
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(DataSourcesOrderBy.Name)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(DataSourcesOrderBy.Name)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(DataSourcesOrderBy.Name)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/3">
+                <div className="flex items-center">
+                  Findings
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(DataSourcesOrderBy.Findings)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(DataSourcesOrderBy.Findings)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(DataSourcesOrderBy.Findings)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-1/3">
+                <div className="flex items-center">
+                  Last Scan
+                  <IconButton
+                    variant="plain"
+                    className={getClassName(DataSourcesOrderBy.LastScan)}
+                    ariaLabel="sort"
+                    onClick={() => handleSort(DataSourcesOrderBy.LastScan)}
+                  >
+                    <FontAwesomeIcon icon={getColSortIcon(DataSourcesOrderBy.LastScan)} />
+                  </IconButton>
+                </div>
+              </Th>
+              <Th className="w-5" />
+            </Tr>
+          </THead>
+          <TBody>
+            {filteredDataSources.slice(offset, perPage * page).map((dataSource) => (
+              <SecretScanningDataSourceRow
+                key={dataSource.id}
+                dataSource={dataSource}
+                onDelete={handleDelete}
+                onEdit={handleEdit}
+                onTriggerScan={handleTriggerScan}
+                onToggleEnableAutoScan={handleToggleEnableAutoScan}
+              />
+            ))}
+          </TBody>
+        </Table>
+        {Boolean(filteredDataSources.length) && (
+          <Pagination
+            count={filteredDataSources.length}
+            page={page}
+            perPage={perPage}
+            onChangePage={setPage}
+            onChangePerPage={setPerPage}
+          />
+        )}
+        {!filteredDataSources?.length && (
+          <EmptyState
+            title={
+              dataSources.length
+                ? "No data sources match search..."
+                : "This project has no data sources configured"
+            }
+            icon={dataSources.length ? faSearch : faCubesStacked}
+          />
+        )}
+      </TableContainer>
+      <DeleteSecretScanningDataSourceModal
+        onOpenChange={(isOpen) => handlePopUpToggle("deleteDataSource", isOpen)}
+        isOpen={popUp.deleteDataSource.isOpen}
+        dataSource={popUp.deleteDataSource.data}
+      />
+      <EditSecretScanningDataSourceModal
+        onOpenChange={(isOpen) => handlePopUpToggle("editDataSource", isOpen)}
+        isOpen={popUp.editDataSource.isOpen}
+        dataSource={popUp.editDataSource.data}
+      />
+    </div>
+  );
+};

frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/index.tsx

@@ -0,0 +1 @@
+export { SecretScanningDataSourcesSection } from "./SecretScanningDataSourcesSection";

frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/route.tsx

@@ -0,0 +1,19 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { SecretScanningDataSourcesPage } from "./SecretScanningDataSourcesPage";
+
+export const Route = createFileRoute(
+  "/_authenticate/_inject-org-details/_org-layout/secret-scanning/$projectId/_secret-scanning-layout/data-sources/"
+)({
+  component: SecretScanningDataSourcesPage
+  // beforeLoad: ({ context }) => {
+  //   return {
+  //     breadcrumbs: [
+  //       ...context.breadcrumbs,
+  //       {
+  //         label: "Data Sources"
+  //       }
+  //     ]
+  //   };
+  // }
+});