@salesforce/templates 66.3.2 → 66.4.0

package/README.md

@@ -10,6 +10,16 @@ This repository provides:
 
 - [@salesforce/templates](https://www.npmjs.com/package/@salesforce/templates) to support the library and [Salesforce VS Code extensions](https://github.com/forcedotcom/salesforcedx-vscode/).
 
+### Consumer build requirements (e.g. salesforcedx-vscode)
+
+Repos that **bundle** `@salesforce/templates` (e.g. with esbuild) and use a templates manifest must:
+
+1. **Copy built-in templates into the bundle output** before the bundle step that runs `generateTemplatesManifest`. The published package includes templates at `lib/templates`. You can copy from that path, or use the exported path:
+   - `getBuiltinTemplatesPath` (returns the resolved path to `lib/templates` when not on the web platform; `undefined` on web).
+2. **Wireit / task order**: Ensure the script that populates `dist/templates` (or your equivalent) runs **before** the `vscode:bundle` (or similar) task. Otherwise the bundle step will fail with `ENOENT: no such file or directory, scandir '.../dist/templates'`.
+
+Template paths inside the package are kept short (via placeholders in `lib/templates`) so they stay within Windows path limits used by `pack:verify`.
+
 ## Getting Started
 
 If you're interested in contributing, take a look at the [CONTRIBUTING](CONTRIBUTING.md) guide.

package/lib/templates/project/reactb2e/AGENT.md

@@ -26,6 +26,8 @@ Used for SFDX metadata (LWC, Aura, etc.). Scripts here are for the base SFDX tem
 | `npm run prettier` | Format supported metadata files |
 | `npm run prettier:verify` | Check Prettier |
 
+**One-command setup:** From project root run `node scripts/setup-cli.mjs --target-org <alias>` to run login (if needed), deploy, optional permset/data import, GraphQL schema/codegen, web app build, and optionally the dev server. Use `node scripts/setup-cli.mjs --help` for options (e.g. `--skip-login`, `--skip-data`, `--webapp-name`).
+
 Root **does not** run the React app. The root `npm run build` is a no-op for the base SFDX project.
 
 ### 2. React web app (where you do most work)

package/lib/templates/project/reactb2e/CHANGELOG.md

@@ -3,6 +3,175 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.84.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.83.0...v1.84.0) (2026-03-09)
+
+
+### Features
+
+* **template:** add setup-cli and prepare-import-unique-fields scripts ([#240](https://github.com/salesforce-experience-platform-emu/webapps/issues/240)) ([5cad14c](https://github.com/salesforce-experience-platform-emu/webapps/commit/5cad14c9be8176b2faf2429fe8e8a56383aac1ae))
+
+
+
+
+
+# [1.83.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.82.0...v1.83.0) (2026-03-09)
+
+
+### Features
+
+* dedupe with feature skills, rename to webapp-react-* where relevant @W-21338965@ ([#233](https://github.com/salesforce-experience-platform-emu/webapps/issues/233)) ([9e4e4d8](https://github.com/salesforce-experience-platform-emu/webapps/commit/9e4e4d80f4a33575412e1940a8cbfaae6c035a12))
+
+
+
+
+
+# [1.82.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.81.0...v1.82.0) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.81.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.80.1...v1.81.0) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.80.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.80.0...v1.80.1) (2026-03-09)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.80.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.79.2...v1.80.0) (2026-03-07)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.79.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.79.1...v1.79.2) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.79.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.79.0...v1.79.1) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.79.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.78.0...v1.79.0) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.78.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.77.0...v1.78.0) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.77.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.76.1...v1.77.0) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.76.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.76.0...v1.76.1) (2026-03-06)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.76.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.75.1...v1.76.0) (2026-03-06)
+
+
+### Features
+
+* (template) add skills for base-app ([#208](https://github.com/salesforce-experience-platform-emu/webapps/issues/208)) ([dd5f7c5](https://github.com/salesforce-experience-platform-emu/webapps/commit/dd5f7c59b0d711cade589620c434836f016c5417))
+
+
+
+
+
+## [1.75.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.75.0...v1.75.1) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.75.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.74.0...v1.75.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.74.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.73.1...v1.74.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.73.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.73.0...v1.73.1) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.73.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.72.0...v1.73.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+# [1.72.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.71.3...v1.72.0) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
+## [1.71.3](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.71.2...v1.71.3) (2026-03-05)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 ## [1.71.2](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.71.1...v1.71.2) (2026-03-05)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e → _p_/_m_/_w_/_a_}/package.json

@@ -15,9 +15,9 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/agentforce-conversation-client": "^1.71.2",
-    "@salesforce/sdk-data": "^1.71.2",
-    "@salesforce/webapp-experimental": "^1.71.2",
+    "@salesforce/agentforce-conversation-client": "^1.84.0",
+    "@salesforce/sdk-data": "^1.84.0",
+    "@salesforce/webapp-experimental": "^1.84.0",
     "@tailwindcss/vite": "^4.1.17",
     "@tanstack/react-form": "^1.28.4",
     "class-variance-authority": "^0.7.1",
@@ -28,7 +28,7 @@
     "react-dom": "^19.2.0",
     "react-router": "^7.10.1",
     "shadcn": "^3.8.5",
-    "tailwind-merge": "^3.4.0",
+    "tailwind-merge": "^3.5.0",
     "tailwindcss": "^4.1.17",
     "tw-animate-css": "^1.4.0",
     "zod": "^4.3.6"
@@ -41,7 +41,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.71.2",
+    "@salesforce/vite-plugin-webapp-experimental": "^1.84.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/lib/templates/project/{reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search/components/detail → reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_/_c_/_det_}/DetailForm.tsx

@@ -13,7 +13,7 @@ import {
 	type PicklistOption,
 	type TransformedLayoutItem,
 } from "../../utils/layoutTransformUtils";
-import { FieldValueDisplay } from "./formatted";
+import { FieldValueDisplay } from "./formatted/FieldValueDisplay";
 import { Section } from "./Section";
 import { SectionRow } from "./SectionRow";
 

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search/components/detail → _p_/_m_/_w_/_a_/src/_f_/_gs_/_c_/_det_}/UiApiDetailForm.tsx

@@ -75,7 +75,7 @@ export function UiApiDetailForm({
 
 	const objectInfo: ObjectInfo | null = useMemo(() => {
 		if (!metadata?.fields) return null;
-		const apiName = typeof metadata.apiName === "string" ? metadata.apiName : undefined;
+		const apiName = metadata.ApiName;
 		return {
 			apiName,
 			fields: Object.fromEntries(
@@ -83,7 +83,7 @@ export function UiApiDetailForm({
 					name,
 					{
 						compoundFieldName: f.compoundFieldName ?? undefined,
-						dataType: f.dataType,
+						dataType: f.dataType ?? "",
 					},
 				]),
 			),

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search/components → _p_/_m_/_w_/_a_/src/_f_/_gs_/_c_}/search/GlobalSearchInput.tsx

@@ -11,7 +11,7 @@ import { Card, CardContent } from "../../../../components/ui/card";
 import { Input } from "../../../../components/ui/input";
 import { Button } from "../../../../components/ui/button";
 import { Search } from "lucide-react";
-import { OBJECT_API_NAMES } from "../../../../constants";
+import { OBJECT_API_NAMES } from "../../constants";
 import { useObjectInfoBatch } from "../../hooks/useObjectInfoBatch";
 
 const BROWSE_SEGMENT = "browse__all";

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search/components → _p_/_m_/_w_/_a_/src/_f_/_gs_/_c_}/search/SearchResultCard.tsx

@@ -34,7 +34,7 @@ import {
 import type { Column, SearchResultRecordData } from "../../types/search/searchResults";
 import { getNestedFieldValue } from "../../utils/fieldUtils";
 import ResultCardFields from "./ResultCardFields";
-import { OBJECT_API_NAMES } from "../../../../constants";
+import { OBJECT_API_NAMES } from "../../constants";
 
 interface SearchResultCardProps {
 	record: SearchResultRecordData;

package/lib/templates/project/reactb2e/{force-app/main/default/webapplications/appreacttemplateb2e/src/features/global-search → _p_/_m_/_w_/_a_/src/_f_/_gs_}/api/objectDetailService.ts

@@ -36,17 +36,9 @@ export function extractFieldsFromLayout(
 	return optionalFields;
 }
 
-/**
- * Fetches the Full/View layout for an object (REST). Used by detail view to render sections/rows/items.
- *
- * @param objectApiName - Object API name.
- * @param recordTypeId - Record type Id (default master).
- * @param signal - Optional abort signal.
- */
 export async function getLayout(
 	objectApiName: string,
 	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
-	signal?: AbortSignal,
 ): Promise<LayoutResponse> {
 	const params = new URLSearchParams({
 		layoutType: "Full",
@@ -54,14 +46,10 @@ export async function getLayout(
 		recordTypeId,
 	});
 	return fetchAndValidate(
-		(abortSignal) =>
-			uiApiClient.get(`/layout/${safeEncodePath(objectApiName)}?${params.toString()}`, {
-				signal: abortSignal,
-			}),
+		() => uiApiClient.get(`/layout/${safeEncodePath(objectApiName)}?${params.toString()}`),
 		{
 			schema: LayoutResponseSchema,
 			errorContext: `layout for ${objectApiName}`,
-			signal,
 		},
 	);
 }
@@ -86,24 +74,13 @@ function optionalFieldsToColumns(optionalFields: string[]): Column[] {
 	}));
 }
 
-/**
- * Fetches everything needed for the detail page: layout (REST), object metadata (GraphQL), single record (GraphQL).
- * Layout drives which fields are requested; getRecordByIdGraphQL fetches that field set by Id.
- *
- * @param objectApiName - Object API name.
- * @param recordId - Record Id.
- * @param recordTypeId - Record type (default master).
- * @param signal - Optional abort signal.
- * @returns { layout, record, objectMetadata } for DetailForm / UiApiDetailForm.
- */
 export async function getRecordDetail(
 	objectApiName: string,
 	recordId: string,
 	recordTypeId: string = DEFAULT_RECORD_TYPE_ID,
-	signal?: AbortSignal,
 ): Promise<RecordDetailResult> {
-	const layout = await getLayout(objectApiName, recordTypeId, signal);
-	const objectMetadata = await objectInfoService.getObjectInfoBatch(objectApiName, signal);
+	const layout = await getLayout(objectApiName, recordTypeId);
+	const objectMetadata = await objectInfoService.getObjectInfoBatch(objectApiName);
 	const firstResult = objectMetadata?.results?.[0]?.result;
 	if (!firstResult) {
 		throw new Error(`Object metadata not found for ${objectApiName}`);

package/lib/templates/project/reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_/api/objectInfoGraphQLService.ts

@@ -0,0 +1,137 @@
+/**
+ * Object metadata GraphQL service (uiapi.objectInfos).
+ *
+ * Single endpoint for object describe and picklist values. Used by objectInfoService
+ * to implement getObjectInfoBatch and getPicklistValues. Not used directly by UI.
+ *
+ * @module api/objectInfoGraphQLService
+ */
+
+import { getDataSDK, gql } from "@salesforce/sdk-data";
+import type {
+	GetObjectInfosQuery,
+	GetObjectInfosQueryVariables,
+	GetPicklistValuesQuery,
+	GetPicklistValuesQueryVariables,
+	ObjectInfoInput,
+} from "../types/schema";
+
+/**
+ * Builds objectInfos query (metadata only). Uses apiNames only — do not pass objectInfoInputs.
+ */
+const OBJECT_INFOS_QUERY = gql`
+	query GetObjectInfos($apiNames: [String!]!) {
+		uiapi {
+			objectInfos(apiNames: $apiNames) {
+				ApiName
+				label
+				labelPlural
+				nameFields
+				defaultRecordTypeId
+				keyPrefix
+				layoutable
+				queryable
+				searchable
+				updateable
+				deletable
+				createable
+				custom
+				mruEnabled
+				feedEnabled
+				fields {
+					ApiName
+					label
+					dataType
+					relationshipName
+					reference
+					compound
+					compoundFieldName
+					compoundComponentName
+					controllingFields
+					controllerName
+					referenceToInfos {
+						ApiName
+						nameFields
+					}
+				}
+				recordTypeInfos {
+					recordTypeId
+					name
+					master
+					available
+					defaultRecordTypeMapping
+				}
+				themeInfo {
+					color
+					iconUrl
+				}
+				childRelationships {
+					relationshipName
+					fieldName
+					childObjectApiName
+				}
+				dependentFields {
+					controllingField
+				}
+			}
+		}
+	}
+`;
+
+/**
+ * Builds objectInfos query with picklist values (API v65.0+).
+ * Schema requires objectInfos to be called with either apiNames or objectInfoInputs, not both.
+ * This query uses objectInfoInputs only.
+ * Optimized to only fetch fields used by extractPicklistValuesFromGraphQLObjectInfo.
+ */
+const PICKLIST_VALUES_QUERY = gql`
+	query GetPicklistValues($objectInfoInputs: [ObjectInfoInput!]!) {
+		uiapi {
+			objectInfos(objectInfoInputs: $objectInfoInputs) {
+				ApiName
+				fields {
+					ApiName
+					... on PicklistField {
+						picklistValuesByRecordTypeIDs {
+							recordTypeID
+							defaultValue {
+								value
+							}
+							picklistValues {
+								label
+								value
+								validFor
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+`;
+
+export async function queryForObjectInfos(apiNames: string[]): Promise<GetObjectInfosQuery> {
+	return runQuery<GetObjectInfosQuery, GetObjectInfosQueryVariables>(OBJECT_INFOS_QUERY, {
+		apiNames,
+	});
+}
+
+export async function queryForPicklistValues(
+	objectInfoInputs: ObjectInfoInput[],
+): Promise<GetPicklistValuesQuery> {
+	return runQuery<GetPicklistValuesQuery, GetPicklistValuesQueryVariables>(PICKLIST_VALUES_QUERY, {
+		objectInfoInputs,
+	});
+}
+
+async function runQuery<Q, V>(query: string, variables: V): Promise<Q> {
+	const data = await getDataSDK();
+	const response = await data.graphql?.<Q, V>(query, variables);
+
+	if (response?.errors?.length) {
+		const errorMessages = response.errors.map((e) => e.message).join("; ");
+		throw new Error(`GraphQL Error: ${errorMessages}`);
+	}
+
+	return response?.data ?? ({} as Q);
+}

package/lib/templates/project/reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_/api/objectInfoService.ts

@@ -0,0 +1,95 @@
+import { uiApiClient } from "@salesforce/webapp-experimental/api";
+import type { Filter } from "../types/filters/filters";
+import { FilterArraySchema } from "../types/filters/filters";
+import type { PicklistValue } from "../types/filters/picklist";
+import type { ObjectInfoBatchResponse } from "../types/objectInfo/objectInfo";
+import { fetchAndValidate, safeEncodePath } from "../utils/apiUtils";
+import { queryForObjectInfos, queryForPicklistValues } from "./objectInfoGraphQLService";
+import {
+	graphQLObjectInfosToBatchResponse,
+	extractPicklistValuesFromGraphQLObjectInfo,
+} from "../utils/graphQLObjectInfoAdapter";
+
+/**
+ * Object info and search service.
+ *
+ * - getObjectInfoBatch / getPicklistValues: GraphQL (objectInfoGraphQLService).
+ * - getObjectListFilters: REST (search-info).
+ * Hooks use this service; components do not call it directly.
+ *
+ * @module api/objectInfoService
+ */
+
+/** Cache key: sorted, comma-joined object API names. */
+function getObjectInfoBatchCacheKey(objectApiNames: string): string {
+	const names = objectApiNames
+		.split(",")
+		.map((s) => s.trim())
+		.filter(Boolean);
+	return [...names].sort().join(",");
+}
+
+const objectInfoBatchCache = new Map<string, ObjectInfoBatchResponse>();
+const objectInfoBatchInFlight = new Map<string, Promise<ObjectInfoBatchResponse>>();
+
+export async function getObjectInfoBatch(objectApiNames: string): Promise<ObjectInfoBatchResponse> {
+	const names = objectApiNames
+		.split(",")
+		.map((s) => s.trim())
+		.filter(Boolean);
+	if (names.length === 0) {
+		return { results: [] };
+	}
+	const key = getObjectInfoBatchCacheKey(objectApiNames);
+	const cached = objectInfoBatchCache.get(key);
+	if (cached) return Promise.resolve(cached);
+	const inFlight = objectInfoBatchInFlight.get(key);
+	if (inFlight) return inFlight;
+	const promise = (async () => {
+		try {
+			const response = await queryForObjectInfos(names);
+			const nodes = response?.uiapi?.objectInfos ?? [];
+			const result = graphQLObjectInfosToBatchResponse(nodes, names);
+			objectInfoBatchCache.set(key, result);
+			return result;
+		} finally {
+			objectInfoBatchInFlight.delete(key);
+		}
+	})();
+	objectInfoBatchInFlight.set(key, promise);
+	return promise;
+}
+
+export async function getObjectListFilters(objectApiName: string): Promise<Filter[]> {
+	return fetchAndValidate(
+		() => uiApiClient.get(`/search-info/${safeEncodePath(objectApiName)}/filters`),
+		{
+			schema: FilterArraySchema,
+			errorContext: `filters for ${objectApiName}`,
+			extractData: (data: unknown) => {
+				if (!data) return [];
+				return Array.isArray(data) ? data : (data as { filters?: unknown }).filters || [];
+			},
+		},
+	);
+}
+
+export async function getPicklistValues(
+	objectApiName: string,
+	fieldName: string,
+	recordTypeId: string = "012000000000000AAA",
+): Promise<PicklistValue[]> {
+	const response = await queryForPicklistValues([
+		{ apiName: objectApiName, fieldNames: [fieldName] },
+	]);
+	const nodes = response?.uiapi?.objectInfos ?? [];
+	const node = nodes[0];
+	if (!node) return [];
+	return extractPicklistValuesFromGraphQLObjectInfo(node, fieldName, recordTypeId);
+}
+
+export const objectInfoService = {
+	getObjectInfoBatch,
+	getObjectListFilters,
+	getPicklistValues,
+};

package/lib/templates/project/{reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search → reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_}/api/recordListGraphQLService.ts

@@ -149,10 +149,9 @@ export function buildWhereFromCriteria(
 
 	for (const c of criteria) {
 		if (!c.fieldPath || !c.operator || !c.values?.length) continue;
-		const value = c.values[0];
 		const op = c.operator;
 		const parts = c.fieldPath.split(".");
-		const fieldClause = { [op]: value };
+		const fieldClause = op === "in" ? { in: c.values } : { [op]: c.values[0] };
 		if (parts.length === 1) {
 			conditions.push({ [parts[0]]: fieldClause });
 		} else {

package/lib/templates/project/{reactb2x/force-app/main/default/webapplications/appreacttemplateb2x/src/features/global-search → reactb2e/_p_/_m_/_w_/_a_/src/_f_/_gs_}/hooks/useObjectInfoBatch.ts

@@ -44,7 +44,7 @@ export function useObjectInfoBatch(objectApiNames: string[]): UseObjectInfoBatch
 			.then((res) => {
 				if (isCancelled.current) return;
 				const objectInfos = names
-					.map((apiName) => res.results?.find((r) => r.result?.apiName === apiName)?.result)
+					.map((apiName) => res.results?.find((r) => r.result?.ApiName === apiName)?.result)
 					.filter((r) => r != null) as ObjectInfoResult[];
 				setState({ objectInfos, loading: false, error: null });
 			})