feat: change names

opengovern · Nov 13, 2024 · 42e6c47 · 42e6c47
1 parent e1852e0
commit 42e6c47
Show file tree

Hide file tree

Showing 21 changed files with 65 additions and 66 deletions.
diff --git a/services/web-ui/src/api/api.ts b/services/web-ui/src/api/api.ts
@@ -932,7 +932,7 @@ export interface GithubComKaytuIoKaytuEnginePkgComplianceApiFindingFilters {
     /** @example ["alarm"] */
     conformanceStatus?: GithubComKaytuIoKaytuEnginePkgComplianceApiConformanceStatus[]
     /** @example ["8e0f8e7a-1b1c-4e6f-b7e4-9c6af9d2b1c8"] */
-    connectionID?: string[]
+    integrationID?: string[]
     /** @example ["Azure"] */
     connector?: SourceType[]
     /** @example ["azure_cis_v140_7_5"] */
@@ -963,7 +963,7 @@ export interface GithubComKaytuIoKaytuEnginePkgComplianceApiFindingFilters {
 export interface GithubComKaytuIoKaytuEnginePkgComplianceApiFindingFiltersWithMetadata {
     benchmarkID?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
     conformanceStatus?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
-    connectionID?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
+    integrationID?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
     connector?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
     controlID?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
     resourceCollection?: GithubComKaytuIoKaytuEnginePkgComplianceApiFilterWithMetadata[]
@@ -5265,14 +5265,14 @@ export class Api<
         apiV1FindingsTopDetail: (
             field:
                 | 'resourceType'
-                | 'connectionID'
+                | 'integrationID'
                 | 'resourceID'
                 | 'service'
                 | 'controlID',
             count: number,
             query?: {
                 /** Connection IDs to filter by (inclusive) */
-                connectionId?: string[]
+                integrationID?: string[]
                 /** Connection IDs to filter by (exclusive) */
                 notConnectionId?: string[]
                 /** Connection groups to filter by  */
@@ -5380,7 +5380,7 @@ export class Api<
          */
         apiV1FindingsCountDetail: (
             benchmarkId: string,
-            field: 'resourceType' | 'connectionID' | 'resourceID' | 'service',
+            field: 'resourceType' | 'integrationID' | 'resourceID' | 'service',
             query?: {
                 /** Connection IDs to filter by */
                 connectionId?: string[]

diff --git a/services/web-ui/src/api/compliance.gen.ts b/services/web-ui/src/api/compliance.gen.ts
@@ -4365,13 +4365,13 @@ interface IuseComplianceApiV1FindingsTopDetailState {
 export const useComplianceApiV1FindingsTopDetail = (
     field:
         | 'resourceType'
-        | 'connectionID'
+        | 'integrationID'
         | 'resourceID'
         | 'service'
         | 'controlID',
     count: number,
     query?: {
-        connectionId?: string[]
+        integrationID?: string[]
 
         notConnectionId?: string[]
 
@@ -4412,14 +4412,14 @@ export const useComplianceApiV1FindingsTopDetail = (
         abortCtrl: AbortController,
         reqfield:
             | 'resourceType'
-            | 'connectionID'
+            | 'integrationID'
             | 'resourceID'
             | 'service'
             | 'controlID',
         reqcount: number,
         reqquery:
             | {
-                  connectionId?: string[]
+                  integrationID?: string[]
 
                   notConnectionId?: string[]
 
@@ -4537,14 +4537,14 @@ export const useComplianceApiV1FindingsTopDetail = (
     const sendNowWithParams = (
         reqfield:
             | 'resourceType'
-            | 'connectionID'
+            | 'integrationID'
             | 'resourceID'
             | 'service'
             | 'controlID',
         reqcount: number,
         reqquery:
             | {
-                  connectionId?: string[]
+                  integrationID?: string[]
 
                   notConnectionId?: string[]
 
@@ -4926,7 +4926,7 @@ interface IuseComplianceApiV1FindingsCountDetailState {
  */
 export const useComplianceApiV1FindingsCountDetail = (
     benchmarkId: string,
-    field: 'resourceType' | 'connectionID' | 'resourceID' | 'service',
+    field: 'resourceType' | 'integrationID' | 'resourceID' | 'service',
     query?: {
         connectionId?: string[]
 
@@ -4962,7 +4962,7 @@ export const useComplianceApiV1FindingsCountDetail = (
     const sendRequest = (
         abortCtrl: AbortController,
         reqbenchmarkId: string,
-        reqfield: 'resourceType' | 'connectionID' | 'resourceID' | 'service',
+        reqfield: 'resourceType' | 'integrationID' | 'resourceID' | 'service',
         reqquery:
             | {
                   connectionId?: string[]
@@ -5079,7 +5079,7 @@ export const useComplianceApiV1FindingsCountDetail = (
 
     const sendNowWithParams = (
         reqbenchmarkId: string,
-        reqfield: 'resourceType' | 'connectionID' | 'resourceID' | 'service',
+        reqfield: 'resourceType' | 'integrationID' | 'resourceID' | 'service',
         reqquery:
             | {
                   connectionId?: string[]

diff --git a/services/web-ui/src/components/Cards/ConnectorCard/index.tsx b/services/web-ui/src/components/Cards/ConnectorCard/index.tsx
@@ -144,7 +144,7 @@ export default function ConnectorCard({
 
     const onClick = () => {
         if (status === 'enabled' && (count || 0) > 0) {
-            navigate(`${name}`, { state: { connector,id } })
+            navigate(`${connector}`, { state: { name, id } })
             return
         }
         if (status === 'first-time') {
@@ -157,10 +157,10 @@ export default function ConnectorCard({
             tier ===
             GithubComKaytuIoKaytuEngineServicesIntegrationApiEntityTier.TierCommunity
         ) {
-            navigate(`${name}`, { state: { connector, id } })
+            navigate(`${connector}`, { state: { name, id } })
             return
         }
-        navigate(`${name}/../../request-access?connector=${title}`) // it's a hack!
+        navigate(`${connector}/../../request-access?connector=${title}`) // it's a hack!
     }
 
     return (

diff --git a/services/web-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Filter/Others/index.tsx b/services/web-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Filter/Others/index.tsx
@@ -13,7 +13,7 @@ interface IOthers {
         | GithubComKaytuIoKaytuEnginePkgComplianceApiFindingFiltersWithMetadata
         | undefined
     condition: string
-    type: 'benchmarkID' | 'connectionID' | 'controlID' | 'resourceTypeID'
+    type: 'benchmarkID' | 'integrationID' | 'controlID' | 'resourceTypeID'
     onChange: (o: string[]) => void
 }
 

diff --git a/services/web-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Filter/index.tsx b/services/web-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Filter/index.tsx
@@ -243,7 +243,7 @@ export default function Filter({ onApply, type ,id}: IFilters) {
                     defaultValue={[]}
                     data={filters}
                     condition={connectionCon}
-                    type="connectionID"
+                    type="integrationID"
                     onChange={(o) => setConnectionID(o)}
                 />
             ),
@@ -252,7 +252,7 @@ export default function Filter({ onApply, type ,id}: IFilters) {
             value: connectionID,
             defaultValue: [],
             onDelete: () => setConnectionID([]),
-            data: filters?.connectionID,
+            data: filters?.integrationID,
             types: ['findings', 'resources', 'events', 'controls', 'accounts'],
         },
         // {

diff --git a/.../Governance/Compliance/NewBenchmarkSummary/Findings/FailingCloudAccounts/Detail/index.tsx b/.../Governance/Compliance/NewBenchmarkSummary/Findings/FailingCloudAccounts/Detail/index.tsx
@@ -27,7 +27,7 @@ export default function CloudAccountDetail({
     const { response: filters, sendNow } =
         useComplianceApiV1FindingsFiltersCreate(
             {
-                connectionID: [account?.id || ''],
+                integrationID: [account?.id || ''],
             },
             {},
             false

diff --git a/...c/pages/Governance/Compliance/NewBenchmarkSummary/Findings/FailingCloudAccounts/index.tsx b/...c/pages/Governance/Compliance/NewBenchmarkSummary/Findings/FailingCloudAccounts/index.tsx
@@ -149,7 +149,7 @@ export default function FailingCloudAccounts({ query }: ICount) {
     }
 
     const { response: accounts, isLoading: accountsLoading } =
-        useComplianceApiV1FindingsTopDetail('connectionID', 10000, topQuery)
+        useComplianceApiV1FindingsTopDetail('integrationID', 10000, topQuery)
 
     return (
         <>

diff --git a/...b-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Findings/Filter/Others/index.tsx b/...b-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Findings/Filter/Others/index.tsx
@@ -15,9 +15,9 @@ interface IOthers {
         | GithubComKaytuIoKaytuEnginePkgComplianceApiFindingFiltersWithMetadata
         | undefined
     condition: string
-    type: 'benchmarkID' | 'connectionID' | 'controlID' | 'resourceTypeID'
-    onChange: (o: string[]) => void,
-    name: string,
+    type: 'benchmarkID' | 'integrationID' | 'controlID' | 'resourceTypeID'
+    onChange: (o: string[]) => void
+    name: string
 }
 
 export default function Others({

diff --git a/...ices/web-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Findings/Filter/index.tsx b/...ices/web-ui/src/pages/Governance/Compliance/NewBenchmarkSummary/Findings/Filter/index.tsx
@@ -468,7 +468,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
                     defaultValue={[]}
                     data={filters}
                     condition={connectionCon}
-                    type="connectionID"
+                    type="integrationID"
                     onChange={(o) => setConnectionID(o)}
                     name={'Integration'}
                 />
@@ -480,7 +480,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
 
             defaultValue: [],
             onDelete: () => setConnectionID([]),
-            data: filters?.connectionID,
+            data: filters?.integrationID,
             types: ['findings', 'resources', 'events', 'controls', 'accounts'],
         },
         {

diff --git a/...web-ui/src/pages/Governance/Controls/ControlSummary/Tabs/ControlFindings/Filter/index.tsx b/...web-ui/src/pages/Governance/Controls/ControlSummary/Tabs/ControlFindings/Filter/index.tsx
@@ -435,7 +435,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
 
             defaultValue: [],
             onDelete: () => setConnectionID([]),
-            data: filters?.connectionID,
+            data: filters?.integrationID,
             types: ['findings', 'resources', 'events', 'controls', 'accounts'],
         },
         // {

diff --git a/services/web-ui/src/pages/Governance/Controls/ControlSummary/Tabs/ImpactedAccounts/index.tsx b/services/web-ui/src/pages/Governance/Controls/ControlSummary/Tabs/ImpactedAccounts/index.tsx
@@ -114,7 +114,7 @@ export const topConnections = (
 export default function ImpactedAccounts({ controlId }: IImpactedAccounts) {
     const isDemo = useAtomValue(isDemoAtom)
     const { response: accounts, isLoading: accountsLoading } =
-        useComplianceApiV1FindingsTopDetail('connectionID', 10000, {
+        useComplianceApiV1FindingsTopDetail('integrationID', 10000, {
             controlId: [String(controlId)],
         })
          const [page, setPage] = useState(0)
@@ -171,8 +171,8 @@ export default function ImpactedAccounts({ controlId }: IImpactedAccounts) {
                                         {
                                             // @ts-ignore
 
-                                            item?.Connection?.metadata
-                                                ?.account_name
+                                            item?.Integration?.name
+
                                         }
                                     </>
                                 ),
@@ -188,8 +188,7 @@ export default function ImpactedAccounts({ controlId }: IImpactedAccounts) {
                                     <>
                                         {
                                             // @ts-ignore
-                                            item?.Connection?.metadata
-                                                ?.account_id
+                                            item?.Integration?.provider_id
                                         }
                                     </>
                                 ),

diff --git a/services/web-ui/src/pages/Governance/Findings/FailingCloudAccounts/Detail/index.tsx b/services/web-ui/src/pages/Governance/Findings/FailingCloudAccounts/Detail/index.tsx
@@ -27,7 +27,7 @@ export default function CloudAccountDetail({
     const { response: filters, sendNow } =
         useComplianceApiV1FindingsFiltersCreate(
             {
-                connectionID: [account?.id || ''],
+                integrationID: [account?.id || ''],
             },
             {},
             false

diff --git a/services/web-ui/src/pages/Governance/Findings/FailingCloudAccounts/index.tsx b/services/web-ui/src/pages/Governance/Findings/FailingCloudAccounts/index.tsx
@@ -165,7 +165,7 @@ export default function FailingCloudAccounts({ query }: ICount) {
     }
 
     const { response: accounts, isLoading: accountsLoading } =
-        useComplianceApiV1FindingsTopDetail('connectionID', 10000, topQuery)
+        useComplianceApiV1FindingsTopDetail('integrationID', 10000, topQuery)
     const [page, setPage] = useState(0)
 
     return (

diff --git a/services/web-ui/src/pages/Governance/Findings/Filter/Others/index.tsx b/services/web-ui/src/pages/Governance/Findings/Filter/Others/index.tsx
@@ -15,9 +15,9 @@ interface IOthers {
         | GithubComKaytuIoKaytuEnginePkgComplianceApiFindingFiltersWithMetadata
         | undefined
     condition: string
-    type: 'benchmarkID' | 'connectionID' | 'controlID' | 'resourceTypeID'
-    onChange: (o: string[]) => void,
-    name: string,
+    type: 'benchmarkID' | 'integrationID' | 'controlID' | 'resourceTypeID'
+    onChange: (o: string[]) => void
+    name: string
 }
 
 export default function Others({

diff --git a/services/web-ui/src/pages/Governance/Findings/Filter/index.tsx b/services/web-ui/src/pages/Governance/Findings/Filter/index.tsx
@@ -338,7 +338,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
     const filterOptions = [
         {
             id: 'conformance_status',
-            name: 'Conformance Status',
+            name: 'Compliance Status',
             icon: CheckCircleIcon,
             component: (
                 <ConformanceStatus
@@ -374,7 +374,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
             defaultValue: defConformanceStatus,
             onDelete: undefined,
             data: connectionGroup_data,
-            types: ['controls','resources'],
+            types: ['controls', 'resources'],
         },
         {
             id: 'job_id',
@@ -412,14 +412,14 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
             setCondition: (c: string) => undefined,
             value: [connector],
             defaultValue: [defConnector],
-            data: Types?.integration_types?.map((d)=>{
+            data: Types?.integration_types?.map((d) => {
                 return {
                     label: d.label,
-                    value: d.platform_name
+                    value: d.platform_name,
                 }
             }),
             onDelete: () => setConnector(defConnector),
-            types: [ 'controls'],
+            types: ['controls'],
         },
         // {
         //     id: 'lifecycle',
@@ -458,7 +458,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
             defaultValue: defSeverity,
             data: severity_data,
             onDelete: () => setSeverity(defSeverity),
-            types: ['findings', 'events','controls'],
+            types: ['findings', 'events', 'controls'],
         },
         // {
         //     id: 'limit_healthy',
@@ -488,7 +488,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
                     defaultValue={[]}
                     data={filters}
                     condition={connectionCon}
-                    type="connectionID"
+                    type="integrationID"
                     onChange={(o) => setConnectionID(o)}
                     name={'Integration'}
                 />
@@ -500,7 +500,7 @@ export default function Filter({ onApply, type, setDate }: IFilters) {
 
             defaultValue: [],
             onDelete: () => setConnectionID([]),
-            data: filters?.connectionID,
+            data: filters?.integrationID,
             types: ['findings', 'resources', 'events', 'controls', 'accounts'],
         },
         {