Coderabbit suggestions

- Retain non-managed identities when updating applications

- Mutation to patch then update inside the promise so if the
  patch fails for a single application, it will still update
  the remaining applications.

- `toOptionLike` will allow 0 and empty string values

Signed-off-by: Scott J Dickerson <[email protected]>

Author: sjd78

client/src/app/pages/applications/application-identity-form/application-identity-form.tsx

@@ -18,7 +18,7 @@ import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 
 import { Application, Identity, IdentityKind, Ref } from "@app/api/models";
 import { DEFAULT_SELECT_MAX_HEIGHT } from "@app/Constants";
-import { toOptionLike, toRef } from "@app/utils/model-utils";
+import { toOptionLike, toRef, toRefs } from "@app/utils/model-utils";
 import {
   UpdateAllApplicationsResult,
   useBulkPatchApplicationsMutation,
@@ -131,9 +131,23 @@ export const ApplicationIdentityForm: React.FC<
       toRef(identitiesByKind.asset?.find((i) => i.id === asset)),
     ].filter(Boolean);
 
+    // Retain identities that aren't managed by the form
+    const otherIdentities = applications.reduce((acc, application) => {
+      const otherIdentities = application.direct.identities?.filter(
+        (i) => !["source", "maven", "asset"].includes(i.kind)
+      );
+      if (otherIdentities?.length) {
+        acc.set(application.id, toRefs(otherIdentities));
+      }
+      return acc;
+    }, new Map<number, Ref[]>());
+
     const patch = (application: Application) => {
       return Object.assign({}, application, {
-        identities: updatedIdentities,
+        identities: [
+          ...updatedIdentities,
+          ...(otherIdentities.get(application.id) ?? []),
+        ],
       });
     };
 

client/src/app/queries/applications.ts

@@ -130,17 +130,14 @@ const patchAndUpdateApplications = async ({
   applications: Application[];
   patch: (application: Application) => Application;
 }): Promise<UpdateAllApplicationsResult> => {
-  const patchedApplications = applications.map((application) =>
-    patch(application)
-  );
-
   // TODO: Ideally we'd have a single request to update all applications instead of one per application.
   const results = await Promise.allSettled(
-    patchedApplications.map(async (application) => {
+    applications.map(async (application) => {
       try {
-        const response = await updateApplication(application);
+        const patchedApplication = patch(application);
+        const response = await updateApplication(patchedApplication);
         return {
-          success: { application, response },
+          success: { application: patchedApplication, response },
         };
       } catch (error) {
         return {

client/src/app/utils/model-utils.tsx

@@ -200,10 +200,12 @@ export const getKindIdByRef = (
 };
 
 export const toOptionLike = <T,>(
-  value: T | undefined,
+  value: T | undefined | null,
   options: OptionWithValue<T>[]
 ) => {
-  return value ? options.find((option) => option.value === value) : undefined;
+  return value === null || value === undefined
+    ? undefined
+    : options.find((option) => option.value === value);
 };
 
 export const IssueManagerOptions: OptionWithValue<IssueManagerKind>[] = [