diff --git a/frontend/src/hooks/api/integrations/types.ts b/frontend/src/hooks/api/integrations/types.ts index f63257f84..db205a3ec 100644 --- a/frontend/src/hooks/api/integrations/types.ts +++ b/frontend/src/hooks/api/integrations/types.ts @@ -11,31 +11,23 @@ export type TCloudIntegration = { export type TIntegration = { id: string; - projectId: string; - envId: string; - environment: { slug: string; name: string; id: string }; isActive: boolean; - url: any; - app: string; - appId: string; - targetEnvironment: string; - targetEnvironmentId: string; - targetService: string; - targetServiceId: string; - owner: string; - path: string; - region: string; + url?: string; + app?: string; + appId?: string; + targetEnvironment?: string; + targetEnvironmentId?: string; + targetService?: string; + targetServiceId?: string; + owner?: string; + path?: string; + region?: string; + scope?: string; integration: string; - integrationAuth: string; + metadata?: Record; + integrationAuthId: string; + envId: string; secretPath: string; createdAt: string; updatedAt: string; - __v: number; - metadata?: { - secretSuffix?: string; - scope: string; - org: string; - project: string; - environment: string; - }; -}; +}; \ No newline at end of file diff --git a/frontend/src/pages/integrations/github/create.tsx b/frontend/src/pages/integrations/github/create.tsx index ff29583c2..398245748 100644 --- a/frontend/src/pages/integrations/github/create.tsx +++ b/frontend/src/pages/integrations/github/create.tsx @@ -63,7 +63,7 @@ const schema = yup.object({ repoIds: yup.mixed().when("scope", { is: "github-repo", - then: yup.array(yup.string().required()).min(1, "Select atleast one repositories") + then: yup.array(yup.string().required()).min(1, "Select at least one repositories") }), repoName: yup.mixed().when("scope", { @@ -177,6 +177,7 @@ export default function GitHubCreateIntegrationPage() { secretPath: data.secretPath, sourceEnvironment: data.selectedSourceEnvironment, scope: data.scope, + owner: integrationAuthOrgs?.find(e=>e.orgId === data.orgId)?.name, // repo owner targetServiceId: data.orgId, // github org id metadata: { secretSuffix: data.secretSuffix @@ -588,7 +589,7 @@ export default function GitHubCreateIntegrationPage() { /> ) : (
- +

Something went wrong. Please contact{" "} ; + environments: Array<{ name: string; slug: string; id: string }>; integrations?: TIntegration[]; isLoading?: boolean; onIntegrationDelete: (integration: TIntegration, cb: () => void) => void; @@ -84,25 +81,11 @@ export const IntegrationsSection = ({ key={`integration-${integration?.id.toString()}`} >

-
- - - +
+ +
+ {environments.find((e) => e.id === integration.envId)?.name || "-"} +
@@ -142,11 +125,21 @@ export const IntegrationsSection = ({
)}
- -
- {integration.integration === "hashicorp-vault" - ? `${integration.app} - path: ${integration.path}` - : integration.app} + +
+ { + (integration.integration === "hashicorp-vault" && `${integration.app} - path: ${integration.path}`) || + (integration.scope === "github-org" && `${integration.owner}` ) || + (integration.scope?.startsWith("github-") && `${integration.owner}/${integration.app}` ) || + integration.app + }
{(integration.integration === "vercel" || @@ -154,11 +147,12 @@ export const IntegrationsSection = ({ integration.integration === "railway" || integration.integration === "gitlab" || integration.integration === "teamcity" || - integration.integration === "bitbucket") && ( + integration.integration === "bitbucket" || + (integration.integration === "github" && integration.scope === "github-env")) && (
-
- {integration.targetEnvironment} +
+ {integration.targetEnvironment || integration.targetEnvironmentId}
)}