🐛 Remove kind=asset from the Credentials pages

sjd78 · sjd78 · commit 08ae53655656 · 2025-09-12T15:22:27.000-04:00
Part 2 of 2: https://issues.redhat.com/browse/MTA-6122 Part 2 of 2: konveyor#2599 Follows: konveyor#2610 Signed-off-by: Scott J Dickerson <sdickers@redhat.com>
diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
@@ -218,7 +218,6 @@ export const IdentityKinds = [
   "proxy",
   "basic-auth",
   "bearer",
-  "asset",
 ] as const;
 
 export type IdentityKind = (typeof IdentityKinds)[number];
diff --git a/client/src/app/pages/identities/components/DefaultLabel.tsx b/client/src/app/pages/identities/components/DefaultLabel.tsx
@@ -4,6 +4,7 @@ import { Icon, Tooltip } from "@patternfly/react-core";
 import StarIcon from "@patternfly/react-icons/dist/esm/icons/star-icon";
 
 import { Identity } from "@app/api/models";
+
 import { KIND_VALUES } from "../utils";
 
 export interface DefaultLabelProps {
diff --git a/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx b/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx
@@ -1,15 +1,15 @@
 import React from "react";
+import "@testing-library/jest-dom";
+import { server } from "@mocks/server";
+import { rest } from "msw";
+
 import {
+  fireEvent,
   render,
-  waitFor,
   screen,
-  fireEvent,
+  waitFor,
 } from "@app/test-config/test-utils";
 
-import "@testing-library/jest-dom";
-import { server } from "@mocks/server";
-import { rest } from "msw";
-
 import { IdentityForm } from "..";
 
 describe("Component: identity-form", () => {
diff --git a/client/src/app/pages/identities/components/identity-form/identity-form.tsx b/client/src/app/pages/identities/components/identity-form/identity-form.tsx
@@ -1,37 +1,37 @@
 import React from "react";
+import { yupResolver } from "@hookform/resolvers/yup";
+import { AxiosError } from "axios";
+import { FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as yup from "yup";
-import { AxiosError } from "axios";
 import {
   ActionGroup,
   Button,
   ButtonVariant,
   Form,
 } from "@patternfly/react-core";
-import { FormProvider, useForm } from "react-hook-form";
-import { yupResolver } from "@hookform/resolvers/yup";
 
-import { OptionWithValue, SimpleSelect } from "@app/components/SimpleSelect";
 import { Identity, IdentityKind, IdentityKinds, New } from "@app/api/models";
-import { duplicateNameCheck, getAxiosErrorMessage } from "@app/utils/utils";
-import { toOptionLike } from "@app/utils/model-utils";
-import {
-  useCreateIdentityMutation,
-  useFetchIdentities,
-  useUpdateIdentityMutation,
-} from "@app/queries/identities";
 import {
   HookFormPFGroupController,
   HookFormPFTextInput,
 } from "@app/components/HookFormPFFields";
 import { NotificationsContext } from "@app/components/NotificationsContext";
+import { OptionWithValue, SimpleSelect } from "@app/components/SimpleSelect";
+import {
+  useCreateIdentityMutation,
+  useFetchIdentities,
+  useUpdateIdentityMutation,
+} from "@app/queries/identities";
+import { toOptionLike } from "@app/utils/model-utils";
+import { duplicateNameCheck, getAxiosErrorMessage } from "@app/utils/utils";
 
 import { KIND_OPTIONS } from "../../utils";
-import { KindSourceForm } from "./kind-source-form";
-import { KindAssetForm } from "./kind-asset-form";
+
+import { KindBearerTokenForm } from "./kind-bearer-token-form";
 import { KindMavenSettingsFileForm } from "./kind-maven-settings-file-form";
 import { KindSimpleUsernamePasswordForm } from "./kind-simple-username-password-form";
-import { KindBearerTokenForm } from "./kind-bearer-token-form";
+import { KindSourceForm } from "./kind-source-form";
 
 import "./identity-form.css";
 
@@ -70,7 +70,7 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
   const getUserCredentialsInitialValue = (
     identity?: Identity
   ): UserCredentials | undefined => {
-    if ("source" === identity?.kind || "asset" === identity?.kind) {
+    if ("source" === identity?.kind) {
       if (identity?.user && identity?.password) {
         return "userpass";
       } else {
@@ -159,20 +159,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
       });
     }
 
-    if (kind === "asset" && formValues.userCredentials === "source") {
-      Object.assign(payload, {
-        key: formValues.key,
-        password: formValues.password.trim(),
-      });
-    }
-
-    if (kind === "asset" && formValues.userCredentials === "userpass") {
-      Object.assign(payload, {
-        user: formValues.user.trim(),
-        password: formValues.password.trim(),
-      });
-    }
-
     if (kind === "basic-auth") {
       Object.assign(payload, {
         user: formValues.user.trim(),
@@ -237,7 +223,7 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
       default: yup.bool().defined(),
 
       userCredentials: yup.mixed<UserCredentials>().when("kind", {
-        is: (kind: IdentityKind) => kind === "source" || kind === "asset",
+        is: (kind: IdentityKind) => kind === "source",
         then: (schema) => schema.required().oneOf(["userpass", "source"]),
       }),
 
@@ -259,16 +245,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
         .string()
         .defined()
         .trim()
-        .when(["kind", "userCredentials"], {
-          is: (kind: IdentityKind, userCredentials: UserCredentials) =>
-            (kind === "source" || kind === "asset") &&
-            userCredentials === "userpass",
-          then: (schema) =>
-            schema
-              .required(t("validation.required"))
-              .min(3, t("validation.minLength", { length: 3 }))
-              .max(120, t("validation.maxLength", { length: 120 })),
-        })
         .when("kind", {
           is: (kind: IdentityKind) => kind === "proxy",
           then: (schema) =>
@@ -285,6 +261,15 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
               .min(3, t("validation.minLength", { length: 3 }))
               .max(120, t("validation.maxLength", { length: 120 }))
               .email("Username must be a valid email"),
+        })
+        .when(["kind", "userCredentials"], {
+          is: (kind: IdentityKind, userCredentials: UserCredentials) =>
+            kind === "source" && userCredentials === "userpass",
+          then: (schema) =>
+            schema
+              .required(t("validation.required"))
+              .min(3, t("validation.minLength", { length: 3 }))
+              .max(120, t("validation.maxLength", { length: 120 })),
         }),
       password: yup
         .string()
@@ -308,8 +293,7 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
         })
         .when(["kind", "userCredentials"], {
           is: (kind: IdentityKind, userCredentials: UserCredentials) =>
-            (kind === "source" || kind === "asset") &&
-            userCredentials === "userpass",
+            kind === "source" && userCredentials === "userpass",
           then: (schema) =>
             schema
               .required(t("validation.required"))
@@ -322,8 +306,7 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
         .defined()
         .when(["kind", "userCredentials"], {
           is: (kind: IdentityKind, userCredentials: UserCredentials) =>
-            (kind === "source" || kind === "asset") &&
-            userCredentials === "source",
+            kind === "source" && userCredentials === "source",
           // If we want to verify key contents before saving, add the yup test in the then function
           then: (schema) => schema.required(t("validation.required")),
         })
@@ -417,8 +400,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
           />
         )}
 
-        {values?.kind === "asset" && <KindAssetForm identity={identity} />}
-
         {values?.kind === "maven" && (
           <KindMavenSettingsFileForm
             identity={identity}
diff --git a/client/src/app/pages/identities/components/identity-form/kind-asset-form.tsx b/client/src/app/pages/identities/components/identity-form/kind-asset-form.tsx
diff --git a/client/src/app/pages/identities/components/identity-form/kind-bearer-token-form.tsx b/client/src/app/pages/identities/components/identity-form/kind-bearer-token-form.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
 import { useFormContext } from "react-hook-form";
 
 import { Identity } from "@app/api/models";
-import KeyDisplayToggle from "@app/components/KeyDisplayToggle";
 import { HookFormPFTextInput } from "@app/components/HookFormPFFields";
+import KeyDisplayToggle from "@app/components/KeyDisplayToggle";
 
 export const KindBearerTokenForm: React.FC<{ identity?: Identity }> = ({
   identity,
diff --git a/client/src/app/pages/identities/components/identity-form/kind-maven-settings-file-form.tsx b/client/src/app/pages/identities/components/identity-form/kind-maven-settings-file-form.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
+import { useFormContext } from "react-hook-form";
 import { Trans, useTranslation } from "react-i18next";
 import { Alert, FileUpload, Switch } from "@patternfly/react-core";
-import { useFormContext } from "react-hook-form";
 
 import { Identity, IdentityKind } from "@app/api/models";
 import { HookFormPFGroupController } from "@app/components/HookFormPFFields";
diff --git a/client/src/app/pages/identities/components/identity-form/kind-simple-username-password-form.tsx b/client/src/app/pages/identities/components/identity-form/kind-simple-username-password-form.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
 import { useFormContext } from "react-hook-form";
 
 import { Identity } from "@app/api/models";
-import KeyDisplayToggle from "@app/components/KeyDisplayToggle";
 import { HookFormPFTextInput } from "@app/components/HookFormPFFields";
+import KeyDisplayToggle from "@app/components/KeyDisplayToggle";
 
 export const KindSimpleUsernamePasswordForm: React.FC<{
   identity?: Identity;
diff --git a/client/src/app/pages/identities/components/identity-form/kind-source-form.tsx b/client/src/app/pages/identities/components/identity-form/kind-source-form.tsx
@@ -1,16 +1,17 @@
 import React, { useState } from "react";
+import { useFormContext, useWatch } from "react-hook-form";
 import { Trans, useTranslation } from "react-i18next";
 import { Alert, FileUpload, Switch } from "@patternfly/react-core";
-import { useFormContext, useWatch } from "react-hook-form";
 
-import { OptionWithValue, SimpleSelect } from "@app/components/SimpleSelect";
 import { Identity, IdentityKind } from "@app/api/models";
-import { toOptionLike } from "@app/utils/model-utils";
-import KeyDisplayToggle from "@app/components/KeyDisplayToggle";
 import {
   HookFormPFGroupController,
   HookFormPFTextInput,
 } from "@app/components/HookFormPFFields";
+import KeyDisplayToggle from "@app/components/KeyDisplayToggle";
+import { OptionWithValue, SimpleSelect } from "@app/components/SimpleSelect";
+import { toOptionLike } from "@app/utils/model-utils";
+
 import { UserCredentials } from "./identity-form";
 import { KindSimpleUsernamePasswordForm } from "./kind-simple-username-password-form";
 
diff --git a/client/src/app/pages/identities/identities.tsx b/client/src/app/pages/identities/identities.tsx
diff --git a/client/src/app/pages/identities/utils.ts b/client/src/app/pages/identities/utils.ts
