feat(edge/stacks): sync EE codechanges [EE-498] (#8580)

app/react/portainer/account/git-credentials/git-credentials.service.ts

@@ -13,7 +13,11 @@ export async function createGitCredential(
   gitCredential: CreateGitCredentialPayload
 ) {
   try {
-    await axios.post(buildGitUrl(gitCredential.userId), gitCredential);
+    const { data } = await axios.post<{ gitCredential: GitCredential }>(
+      buildGitUrl(gitCredential.userId),
+      gitCredential
+    );
+    return data.gitCredential;
   } catch (e) {
     throw parseAxiosError(e as Error, 'Unable to create git credential');
   }

app/react/portainer/environments/environment.service/registries.ts

@@ -1,6 +1,7 @@
 import axios, { parseAxiosError } from '@/portainer/services/axios';
 import { TeamId } from '@/react/portainer/users/teams/types';
 import { UserId } from '@/portainer/users/types';
+import { RegistryId, Registry } from '@/react/portainer/registries/types';
 
 import { EnvironmentId } from '../types';
 
@@ -14,12 +15,6 @@ interface AccessPolicy {
 type UserAccessPolicies = Record<UserId, AccessPolicy>; // map[UserID]AccessPolicy
 type TeamAccessPolicies = Record<TeamId, AccessPolicy>;
 
-export type RegistryId = number;
-export interface Registry {
-  Id: RegistryId;
-  Name: string;
-}
-
 interface RegistryAccess {
   UserAccessPolicies: UserAccessPolicies;
   TeamAccessPolicies: TeamAccessPolicies;

app/react/portainer/gitops/AuthFieldset/utils.ts

@@ -22,3 +22,27 @@ export function parseAuthResponse(
     RepositoryUsername: auth.Username,
   };
 }
+
+export function transformGitAuthenticationViewModel(
+  auth?: GitAuthModel
+): GitAuthenticationResponse | null {
+  if (
+    !auth ||
+    !auth.RepositoryAuthentication ||
+    typeof auth.RepositoryGitCredentialID === 'undefined' ||
+    (auth.RepositoryGitCredentialID === 0 && auth.RepositoryPassword === '')
+  ) {
+    return null;
+  }
+
+  if (auth.RepositoryGitCredentialID !== 0) {
+    return {
+      GitCredentialID: auth.RepositoryGitCredentialID,
+    };
+  }
+
+  return {
+    Username: auth.RepositoryUsername,
+    Password: auth.RepositoryPassword,
+  };
+}

app/react/portainer/gitops/types.ts

@@ -15,9 +15,9 @@ export interface AutoUpdateResponse {
 }
 
 export interface GitAuthenticationResponse {
-  Username: string;
-  Password: string;
-  GitCredentialID: number;
+  Username?: string;
+  Password?: string;
+  GitCredentialID?: number;
 }
 
 export interface RepoConfigResponse {

app/react/portainer/registries/queries/queryKeys.ts

@@ -0,0 +1,3 @@
+export const queryKeys = {
+  registries: () => ['registries'] as const,
+};

app/react/portainer/registries/queries/useRegistries.ts

@@ -0,0 +1,20 @@
+import { useQuery } from 'react-query';
+
+import axios, { parseAxiosError } from '@/portainer/services/axios';
+
+import { Registry } from '../types';
+
+import { queryKeys } from './queryKeys';
+
+export function useRegistries() {
+  return useQuery(queryKeys.registries(), getRegistries);
+}
+
+async function getRegistries() {
+  try {
+    const response = await axios.get<Array<Registry>>('/registries');
+    return response.data;
+  } catch (err) {
+    throw parseAxiosError(err as Error, 'Unable to retrieve registries');
+  }
+}

app/react/portainer/registries/types.ts

@@ -0,0 +1,5 @@
+export type RegistryId = number;
+export interface Registry {
+  Id: RegistryId;
+  Name: string;
+}