Fixed forms

dashboard/src/main/home/onboarding/state/index.ts

@@ -101,7 +101,7 @@ const decompressState = (prev_state: any) => {
     skip: state.skip_registry_connection,
     provider: state.registry_connection_provider,
     credentials: {
-      id: state?.registry_connection_data?.id,
+      id: state?.registry_connection_credential_id,
     },
     settings: {
       registry_connection_id: state?.registry_connection_id,

dashboard/src/main/home/onboarding/steps/ConnectRegistry/forms/_AWSRegistryForm.tsx

@@ -70,7 +70,9 @@ export const CredentialsForm: React.FC<{
         }
 
         let lastUsed = integrations.find((i) => {
-          i.id === snap.StateHandler?.connected_registry?.credentials?.id;
+          return (
+            i.id === snap.StateHandler?.connected_registry?.credentials?.id
+          );
         });
 
         if (!lastUsed) {

dashboard/src/main/home/onboarding/steps/ConnectRegistry/forms/_GCPRegistryForm.tsx

@@ -36,7 +36,7 @@ export const CredentialsForm: React.FC<{
 
   useEffect(() => {
     api
-      .getAWSIntegration("<token>", {}, { project_id: project.id })
+      .getGCPIntegration("<token>", {}, { project_id: project.id })
       .then((res) => {
         let integrations = res.data;
         if (!Array.isArray(integrations) || !integrations.length) {
@@ -45,7 +45,9 @@ export const CredentialsForm: React.FC<{
         }
 
         let lastUsed = integrations.find((i) => {
-          i.id === snap.StateHandler?.connected_registry?.credentials?.id;
+          return (
+            i.id === snap.StateHandler?.connected_registry?.credentials?.id
+          );
         });
 
         if (!lastUsed) {
@@ -163,8 +165,12 @@ export const CredentialsForm: React.FC<{
       <div>
         Last connected account:
         <div>
-          <b>ARN: </b>
-          {lastConnectedAccount?.aws_arn}
+          <b>Project id: </b>
+          {lastConnectedAccount?.gcp_project_id}
+        </div>
+        <div>
+          <b>Service account email: </b>
+          {lastConnectedAccount?.gcp_sa_email}
         </div>
         <div>
           <b>Connected on:</b> {readableDate(lastConnectedAccount?.created_at)}

dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_AWSProvisionerForm.tsx

@@ -86,7 +86,9 @@ export const CredentialsForm: React.FC<{
         integrations.sort((a, b) => b.id - a.id);
 
         let lastUsed = integrations.find((i) => {
-          i.id === snap.StateHandler?.provision_resources?.credentials?.id;
+          return (
+            i.id === snap.StateHandler?.provision_resources?.credentials?.id
+          );
         });
 
         if (!lastUsed) {

dashboard/src/main/home/onboarding/steps/ProvisionResources/forms/_GCPProvisionerForm.tsx

@@ -91,7 +91,9 @@ export const CredentialsForm: React.FC<{
         integrations.sort((a, b) => b.id - a.id);
 
         let lastUsed = integrations.find((i) => {
-          i.id === snap.StateHandler?.provision_resources?.credentials?.id;
+          return (
+            i.id === snap.StateHandler?.provision_resources?.credentials?.id
+          );
         });
 
         if (!lastUsed) {
@@ -209,8 +211,12 @@ export const CredentialsForm: React.FC<{
       <div>
         Last connected account:
         <div>
-          <b>ARN: </b>
-          {lastConnectedAccount?.aws_arn}
+          <b>Project id: </b>
+          {lastConnectedAccount?.gcp_project_id}
+        </div>
+        <div>
+          <b>Service account email: </b>
+          {lastConnectedAccount?.gcp_sa_email}
         </div>
         <div>
           <b>Connected on:</b> {readableDate(lastConnectedAccount?.created_at)}