@salesforce/webapp-template-app-react-sample-b2x-experimental 1.84.0 → 1.85.0

package/dist/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyDetailGraphQL.ts

@@ -2,10 +2,23 @@
  * GraphQL queries for Property_Listing__c detail and related Property__c data:
  * Property_Image__c, Property_Cost__c, Property_Feature__c.
  */
-import { executeGraphQL } from "./graphqlClient";
+import { gql } from "@salesforce/sdk-data";
+import type {
+	ListingByIdQuery,
+	ListingByIdQueryVariables,
+	PropertyByIdQuery,
+	PropertyByIdQueryVariables,
+	PropertyImagesQuery,
+	PropertyImagesQueryVariables,
+	PropertyCostsQuery,
+	PropertyCostsQueryVariables,
+	PropertyFeaturesQuery,
+	PropertyFeaturesQueryVariables,
+} from "@/api/graphql-operations-types.js";
+import { executeGraphQL } from "@/api/graphqlClient.js";
 
 // ---- Listing by Id ----
-const LISTING_QUERY = /* GraphQL */ `
+const LISTING_QUERY = gql`
 	query ListingById($listingId: ID!) {
 		uiapi {
 			query {
@@ -46,23 +59,11 @@ export interface ListingDetail {
 }
 
 export async function fetchListingById(listingId: string): Promise<ListingDetail | null> {
-	const res = await executeGraphQL<{
-		uiapi?: {
-			query?: {
-				Property_Listing__c?: {
-					edges?: Array<{
-						node?: {
-							Id: string;
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-							Listing_Price__c?: { value?: unknown; displayValue?: string | null } | null;
-							Listing_Status__c?: { value?: string | null; displayValue?: string | null } | null;
-							Property__c?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-					}> | null;
-				} | null;
-			} | null;
-		} | null;
-	}>(LISTING_QUERY, { listingId });
+	const variables: ListingByIdQueryVariables = { listingId };
+	const res = await executeGraphQL<ListingByIdQuery, ListingByIdQueryVariables>(
+		LISTING_QUERY,
+		variables,
+	);
 	const node = res.uiapi?.query?.Property_Listing__c?.edges?.[0]?.node;
 	if (!node) return null;
 	const prop = node.Property__c;
@@ -84,7 +85,7 @@ export async function fetchListingById(listingId: string): Promise<ListingDetail
 }
 
 // ---- Property by Id ----
-const PROPERTY_QUERY = /* GraphQL */ `
+const PROPERTY_QUERY = gql`
 	query PropertyById($propertyId: ID!) {
 		uiapi {
 			query {
@@ -100,7 +101,7 @@ const PROPERTY_QUERY = /* GraphQL */ `
 								value
 								displayValue
 							}
-							Property_Type__c {
+							Type__c {
 								value
 								displayValue
 							}
@@ -116,7 +117,7 @@ const PROPERTY_QUERY = /* GraphQL */ `
 								value
 								displayValue
 							}
-							Square_Footage__c {
+							Sq_Ft__c {
 								value
 								displayValue
 							}
@@ -145,27 +146,11 @@ export interface PropertyDetail {
 }
 
 export async function fetchPropertyById(propertyId: string): Promise<PropertyDetail | null> {
-	const res = await executeGraphQL<{
-		uiapi?: {
-			query?: {
-				Property__c?: {
-					edges?: Array<{
-						node?: {
-							Id: string;
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-							Address__c?: { value?: string | null; displayValue?: string | null } | null;
-							Property_Type__c?: { value?: string | null; displayValue?: string | null } | null;
-							Monthly_Rent__c?: { value?: unknown; displayValue?: string | null } | null;
-							Bedrooms__c?: { value?: unknown; displayValue?: string | null } | null;
-							Bathrooms__c?: { value?: unknown; displayValue?: string | null } | null;
-							Square_Footage__c?: { value?: unknown; displayValue?: string | null } | null;
-							Description__c?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-					}> | null;
-				} | null;
-			} | null;
-		} | null;
-	}>(PROPERTY_QUERY, { propertyId });
+	const variables: PropertyByIdQueryVariables = { propertyId };
+	const res = await executeGraphQL<PropertyByIdQuery, PropertyByIdQueryVariables>(
+		PROPERTY_QUERY,
+		variables,
+	);
 	const node = res.uiapi?.query?.Property__c?.edges?.[0]?.node;
 	if (!node) return null;
 	const v = (f: { value?: unknown; displayValue?: string | null } | null | undefined) =>
@@ -182,13 +167,13 @@ export async function fetchPropertyById(propertyId: string): Promise<PropertyDet
 				? String(node.Address__c.value)
 				: (node.Address__c?.displayValue ?? null),
 		propertyType:
-			node.Property_Type__c?.value != null
-				? String(node.Property_Type__c.value)
-				: (node.Property_Type__c?.displayValue ?? null),
+			node.Type__c?.value != null
+				? String(node.Type__c.value)
+				: (node.Type__c?.displayValue ?? null),
 		monthlyRent: v(node.Monthly_Rent__c),
 		bedrooms: v(node.Bedrooms__c),
 		bathrooms: v(node.Bathrooms__c),
-		squareFootage: v(node.Square_Footage__c),
+		squareFootage: v(node.Sq_Ft__c),
 		description:
 			node.Description__c?.value != null
 				? String(node.Description__c.value)
@@ -211,7 +196,7 @@ export async function fetchPropertyAddresses(
 }
 
 // ---- Property Images by Property Id ----
-const IMAGES_QUERY = /* GraphQL */ `
+const IMAGES_QUERY = gql`
 	query PropertyImages($propertyId: ID!) {
 		uiapi {
 			query {
@@ -257,24 +242,11 @@ export interface PropertyImageRecord {
 }
 
 export async function fetchImagesByPropertyId(propertyId: string): Promise<PropertyImageRecord[]> {
-	const res = await executeGraphQL<{
-		uiapi?: {
-			query?: {
-				Property_Image__c?: {
-					edges?: Array<{
-						node?: {
-							Id: string;
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-							Image_URL__c?: { value?: string | null; displayValue?: string | null } | null;
-							Image_Type__c?: { value?: string | null; displayValue?: string | null } | null;
-							Display_Order__c?: { value?: unknown; displayValue?: string | null } | null;
-							Alt_Text__c?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-					}> | null;
-				} | null;
-			} | null;
-		} | null;
-	}>(IMAGES_QUERY, { propertyId });
+	const variables: PropertyImagesQueryVariables = { propertyId };
+	const res = await executeGraphQL<PropertyImagesQuery, PropertyImagesQueryVariables>(
+		IMAGES_QUERY,
+		variables,
+	);
 	const edges = res.uiapi?.query?.Property_Image__c?.edges ?? [];
 	const list: PropertyImageRecord[] = [];
 	for (const e of edges) {
@@ -304,7 +276,7 @@ export async function fetchImagesByPropertyId(propertyId: string): Promise<Prope
 }
 
 // ---- Property Costs by Property Id ----
-const COSTS_QUERY = /* GraphQL */ `
+const COSTS_QUERY = gql`
 	query PropertyCosts($propertyId: ID!) {
 		uiapi {
 			query {
@@ -350,24 +322,11 @@ export interface PropertyCostRecord {
 }
 
 export async function fetchCostsByPropertyId(propertyId: string): Promise<PropertyCostRecord[]> {
-	const res = await executeGraphQL<{
-		uiapi?: {
-			query?: {
-				Property_Cost__c?: {
-					edges?: Array<{
-						node?: {
-							Id: string;
-							Cost_Category__c?: { value?: string | null; displayValue?: string | null } | null;
-							Cost_Amount__c?: { value?: unknown; displayValue?: string | null } | null;
-							Cost_Date__c?: { value?: string | null; displayValue?: string | null } | null;
-							Description__c?: { value?: string | null; displayValue?: string | null } | null;
-							Vendor__c?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-					}> | null;
-				} | null;
-			} | null;
-		} | null;
-	}>(COSTS_QUERY, { propertyId });
+	const variables: PropertyCostsQueryVariables = { propertyId };
+	const res = await executeGraphQL<PropertyCostsQuery, PropertyCostsQueryVariables>(
+		COSTS_QUERY,
+		variables,
+	);
 	const edges = res.uiapi?.query?.Property_Cost__c?.edges ?? [];
 	const list: PropertyCostRecord[] = [];
 	for (const e of edges) {
@@ -404,7 +363,7 @@ export async function fetchCostsByPropertyId(propertyId: string): Promise<Proper
 }
 
 // ---- Property Features by Property Id ----
-const FEATURES_QUERY = /* GraphQL */ `
+const FEATURES_QUERY = gql`
 	query PropertyFeatures($propertyId: ID!) {
 		uiapi {
 			query {
@@ -442,22 +401,11 @@ export interface PropertyFeatureRecord {
 export async function fetchFeaturesByPropertyId(
 	propertyId: string,
 ): Promise<PropertyFeatureRecord[]> {
-	const res = await executeGraphQL<{
-		uiapi?: {
-			query?: {
-				Property_Feature__c?: {
-					edges?: Array<{
-						node?: {
-							Id: string;
-							Name?: { value?: string | null; displayValue?: string | null } | null;
-							Feature_Category__c?: { value?: string | null; displayValue?: string | null } | null;
-							Description__c?: { value?: string | null; displayValue?: string | null } | null;
-						} | null;
-					}> | null;
-				} | null;
-			} | null;
-		} | null;
-	}>(FEATURES_QUERY, { propertyId });
+	const variables: PropertyFeaturesQueryVariables = { propertyId };
+	const res = await executeGraphQL<PropertyFeaturesQuery, PropertyFeaturesQueryVariables>(
+		FEATURES_QUERY,
+		variables,
+	);
 	const edges = res.uiapi?.query?.Property_Feature__c?.edges ?? [];
 	const list: PropertyFeatureRecord[] = [];
 	for (const e of edges) {

package/dist/force-app/main/default/webapplications/appreactsampleb2x/src/api/propertyListingGraphQL.ts

@@ -2,16 +2,22 @@
  * Property Listing search via Salesforce GraphQL.
  * Replaces REST keyword search with uiapi.query.Property_Listing__c.
  */
-import { executeGraphQL } from "./graphqlClient";
+import { gql } from "@salesforce/sdk-data";
+import type {
+	PropertyListingsQuery,
+	PropertyListingsQueryVariables,
+} from "@/api/graphql-operations-types.js";
+import { ResultOrder } from "@/api/graphql-operations-types.js";
+import { executeGraphQL } from "@/api/graphqlClient.js";
 import type {
 	SearchResultRecord,
 	SearchResultRecordData,
 	FieldValue,
-} from "../features/global-search/types/search/searchResults";
+} from "@/features/global-search/types/search/searchResults.js";
 
 const OBJECT_API_NAME = "Property_Listing__c";
 
-/** GraphQL node shape: fields are { value?, displayValue? }. Only fields that exist in the org's UI API schema are queried. */
+/** GraphQL node shape: fields are { value?, displayValue? }. Property__r for property name and location. */
 type PropertyListingNode = {
 	Id: string;
 	ApiName?: string | null;
@@ -19,24 +25,12 @@ type PropertyListingNode = {
 	Listing_Price__c?: { value?: number | null; displayValue?: string | null } | null;
 	Listing_Status__c?: { value?: string | null; displayValue?: string | null } | null;
 	Property__c?: { value?: string | null; displayValue?: string | null } | null;
-};
-
-interface PropertyListingGraphQLResponse {
-	uiapi?: {
-		query?: {
-			Property_Listing__c?: {
-				edges?: ({ node?: PropertyListingNode | null; cursor?: string | null } | null)[] | null;
-				pageInfo?: {
-					hasNextPage?: boolean | null;
-					hasPreviousPage?: boolean | null;
-					startCursor?: string | null;
-					endCursor?: string | null;
-				} | null;
-				totalCount?: number | null;
-			} | null;
-		} | null;
+	Property__r?: {
+		Name?: { value?: string | null; displayValue?: string | null } | null;
+		Address__c?: { value?: string | null; displayValue?: string | null } | null;
+		Bedrooms__c?: { value?: number | null; displayValue?: string | null } | null;
 	} | null;
-}
+};
 
 function nodeToFieldValue(
 	fieldObj: { value?: unknown; displayValue?: string | null } | null | undefined,
@@ -64,6 +58,31 @@ function nodeToSearchResultRecordData(node: PropertyListingNode): SearchResultRe
 			fields[key] = nodeToFieldValue(raw as { value?: unknown; displayValue?: string | null });
 		}
 	}
+	// Flatten property name and address for display (read-only fields for search results)
+	const prop = node.Property__r;
+	if (prop?.Name != null && typeof prop.Name === "object" && "value" in prop.Name) {
+		fields["Property__r.Name"] = nodeToFieldValue(
+			prop.Name as { value?: unknown; displayValue?: string | null },
+		);
+	}
+	if (
+		prop?.Address__c != null &&
+		typeof prop.Address__c === "object" &&
+		"value" in prop.Address__c
+	) {
+		fields["Property__r.Address__c"] = nodeToFieldValue(
+			prop.Address__c as { value?: unknown; displayValue?: string | null },
+		);
+	}
+	if (
+		prop?.Bedrooms__c != null &&
+		typeof prop.Bedrooms__c === "object" &&
+		"value" in prop.Bedrooms__c
+	) {
+		fields["Property__r.Bedrooms__c"] = nodeToFieldValue(
+			prop.Bedrooms__c as { value?: unknown; displayValue?: string | null },
+		);
+	}
 	return {
 		id: node.Id,
 		apiName: typeof node.ApiName === "string" ? node.ApiName : OBJECT_API_NAME,
@@ -74,14 +93,18 @@ function nodeToSearchResultRecordData(node: PropertyListingNode): SearchResultRe
 	};
 }
 
-/** Query with optional search term (Name like) and pagination. When searchTerm is empty, no where clause = show all.
- * Uses Property_Listing__c_Filter (object API name + _Filter). No orderBy to avoid org schema mismatches.
- * ApiName is a leaf (String!); only fields that exist in the org's UI API schema are selected. */
-const PROPERTY_LISTINGS_QUERY = /* GraphQL */ `
-	query PropertyListings($where: Property_Listing__c_Filter, $first: Int!, $after: String) {
+/** Query with optional search term (Name like), pagination, and orderBy.
+ * Uses Property_Listing__c_Filter. orderBy is optional; omit if org schema does not support it. */
+const PROPERTY_LISTINGS_QUERY = gql`
+	query PropertyListings(
+		$where: Property_Listing__c_Filter
+		$first: Int!
+		$after: String
+		$orderBy: Property_Listing__c_OrderBy
+	) {
 		uiapi {
 			query {
-				Property_Listing__c(where: $where, first: $first, after: $after) {
+				Property_Listing__c(where: $where, first: $first, after: $after, orderBy: $orderBy) {
 					edges {
 						node {
 							Id
@@ -102,6 +125,20 @@ const PROPERTY_LISTINGS_QUERY = /* GraphQL */ `
 								value
 								displayValue
 							}
+							Property__r {
+								Name {
+									value
+									displayValue
+								}
+								Address__c {
+									value
+									displayValue
+								}
+								Bedrooms__c {
+									value
+									displayValue
+								}
+							}
 						}
 						cursor
 					}
@@ -126,45 +163,143 @@ export interface PropertyListingGraphQLResult {
 	totalCount: number | null;
 }
 
+/** SortBy values match PropertySearchFilters SortBy (price_asc, price_desc, beds_asc, beds_desc). */
+export interface PropertyListingFilters {
+	priceMin?: number;
+	priceMax?: number;
+	bedroomsMin?: number;
+	bedroomsMax?: number;
+	sortBy?: "price_asc" | "price_desc" | "beds_asc" | "beds_desc" | null;
+}
+
+/** Where condition for Property_Listing__c_Filter (matches graphql-operations-types.ts). */
+type PropertyListingsWhereCondition = {
+	Name?: { like: string };
+	Listing_Status__c?: { like: string };
+	Listing_Price__c?: { gte?: number; lte?: number };
+	Property__r?: {
+		Name?: { like: string };
+		Address__c?: { like: string };
+		Bedrooms__c?: { gte?: number; lte?: number };
+	};
+};
+
+/** Text search: name or Property__r name/address. Returns { or: [...] } or undefined. */
+function buildTextWhere(
+	searchTerm: string,
+): NonNullable<PropertyListingsQueryVariables["where"]> | undefined {
+	const term = searchTerm.trim();
+	if (term.length === 0) return undefined;
+	const pattern = `%${term}%`;
+	return {
+		or: [
+			{ Name: { like: pattern } },
+			{ Property__r: { Name: { like: pattern } } },
+			{ Property__r: { Address__c: { like: pattern } } },
+		],
+	};
+}
+
+/** Element type allowed inside { and: [...] } (no nested and). */
+type AndElement = PropertyListingsWhereCondition | { or: PropertyListingsWhereCondition[] };
+
+/** Combines text search + price range + bedroom range (min/max) into one where (and of conditions). */
+function buildWhere(
+	searchTerm: string,
+	filters: PropertyListingFilters | undefined,
+): PropertyListingsQueryVariables["where"] {
+	const conditions: AndElement[] = [];
+	const textWhere = buildTextWhere(searchTerm);
+	if (textWhere) conditions.push(textWhere as AndElement);
+	const priceMin =
+		filters?.priceMin != null && Number.isFinite(filters.priceMin) ? filters.priceMin : undefined;
+	const priceMax =
+		filters?.priceMax != null && Number.isFinite(filters.priceMax) ? filters.priceMax : undefined;
+	if (priceMin != null || priceMax != null) {
+		conditions.push({
+			Listing_Price__c: {
+				...(priceMin != null && { gte: priceMin }),
+				...(priceMax != null && { lte: priceMax }),
+			},
+		});
+	}
+	const bedroomsMin =
+		filters?.bedroomsMin != null && Number.isFinite(filters.bedroomsMin) && filters.bedroomsMin >= 0
+			? filters.bedroomsMin
+			: undefined;
+	const bedroomsMax =
+		filters?.bedroomsMax != null && Number.isFinite(filters.bedroomsMax) && filters.bedroomsMax >= 0
+			? filters.bedroomsMax
+			: undefined;
+	if (bedroomsMin != null || bedroomsMax != null) {
+		conditions.push({
+			Property__r: {
+				Bedrooms__c: {
+					...(bedroomsMin != null && { gte: bedroomsMin }),
+					...(bedroomsMax != null && { lte: bedroomsMax }),
+				},
+			},
+		});
+	}
+	if (conditions.length === 0) return undefined;
+	if (conditions.length === 1) return conditions[0];
+	return { and: conditions };
+}
+
+/** Build orderBy for Property_Listing__c from SortBy. Returns undefined when sortBy is null or not supported. */
+function buildOrderBy(
+	sortBy: PropertyListingFilters["sortBy"],
+): PropertyListingsQueryVariables["orderBy"] {
+	if (sortBy == null) return undefined;
+	switch (sortBy) {
+		case "price_asc":
+			return { Listing_Price__c: { order: ResultOrder.Asc } };
+		case "price_desc":
+			return { Listing_Price__c: { order: ResultOrder.Desc } };
+		case "beds_asc":
+			return { Property__r: { Bedrooms__c: { order: ResultOrder.Asc } } };
+		case "beds_desc":
+			return { Property__r: { Bedrooms__c: { order: ResultOrder.Desc } } };
+		default:
+			return undefined;
+	}
+}
+
 /**
  * Fetch Property_Listing__c records via GraphQL.
- * When searchTerm is empty, returns all records (no where clause).
+ * Optional text search (name, Property__r name/address), price range (min/max), and bedroom range (min/max).
  */
 export async function queryPropertyListingsGraphQL(
 	searchTerm: string,
 	pageSize: number,
 	afterCursor: string | null,
 	_signal?: AbortSignal,
+	filters?: PropertyListingFilters,
 ): Promise<PropertyListingGraphQLResult> {
-	const where =
-		searchTerm.trim().length > 0 ? { Name: { like: `%${searchTerm.trim()}%` } } : undefined;
-
-	const variables: {
-		where?: { Name: { like: string } };
-		first: number;
-		after?: string | null;
-	} = {
+	const where = buildWhere(searchTerm, filters);
+
+	const variables: PropertyListingsQueryVariables = {
 		first: Math.min(Math.max(pageSize, 1), 200),
 	};
 	if (where) variables.where = where;
 	if (afterCursor) variables.after = afterCursor;
+	const orderBy = buildOrderBy(filters?.sortBy);
+	if (orderBy != null) variables.orderBy = orderBy;
 
-	const response = await executeGraphQL<PropertyListingGraphQLResponse>(
+	const response = await executeGraphQL<PropertyListingsQuery, PropertyListingsQueryVariables>(
 		PROPERTY_LISTINGS_QUERY,
-		variables as Record<string, unknown>,
+		variables,
 	);
 
 	const conn = response.uiapi?.query?.Property_Listing__c;
 	const edges = conn?.edges ?? [];
 	const pageInfo = conn?.pageInfo;
 
-	type EdgeItem = { node?: PropertyListingNode | null; cursor?: string | null } | null;
 	const records: SearchResultRecord[] = edges
-		.filter(
-			(e: EdgeItem): e is { node: PropertyListingNode; cursor?: string | null } => e?.node != null,
-		)
-		.map((e: { node: PropertyListingNode; cursor?: string | null }) => {
-			const data = nodeToSearchResultRecordData(e.node);
+		.filter((e) => e != null && e.node != null)
+		.map((e) => {
+			const node = e!.node!;
+			const data = nodeToSearchResultRecordData(node as PropertyListingNode);
 			return {
 				record: data,
 				highlightInfo: { fields: {}, snippet: null },
@@ -181,6 +316,39 @@ export async function queryPropertyListingsGraphQL(
 	};
 }
 
+/**
+ * Fetch the available price range (min/max) from the first page of listings for the current search.
+ * No price or bedroom filters applied. Used to render the filter bar with known bounds.
+ */
+export async function queryPropertyListingPriceRange(
+	searchTerm: string,
+): Promise<{ priceMin: number; priceMax: number } | null> {
+	const where = buildTextWhere(searchTerm);
+	const variables: PropertyListingsQueryVariables = {
+		first: 200,
+	};
+	if (where) variables.where = where;
+
+	const response = await executeGraphQL<PropertyListingsQuery, PropertyListingsQueryVariables>(
+		PROPERTY_LISTINGS_QUERY,
+		variables,
+	);
+
+	const edges = response.uiapi?.query?.Property_Listing__c?.edges ?? [];
+	const prices: number[] = [];
+	for (const edge of edges) {
+		const node = edge?.node as PropertyListingNode | null | undefined;
+		const raw = node?.Listing_Price__c?.value;
+		const num = typeof raw === "number" && Number.isFinite(raw) ? raw : null;
+		if (num != null && num >= 0) prices.push(num);
+	}
+	if (prices.length === 0) return null;
+	return {
+		priceMin: Math.min(...prices),
+		priceMax: Math.max(...prices),
+	};
+}
+
 /** Static columns for Property_Listing__c list (only fields exposed in the GraphQL query). */
 export const PROPERTY_LISTING_COLUMNS = [
 	{ fieldApiName: "Name", label: "Name", searchable: true, sortable: true },

package/dist/force-app/main/default/webapplications/appreactsampleb2x/src/api/userApi.ts

@@ -0,0 +1,43 @@
+import { gql } from "@salesforce/sdk-data";
+import type { GetUserInfoQuery } from "@/api/graphql-operations-types.js";
+import { executeGraphQL } from "@/api/graphqlClient.js";
+
+const GET_USER_INFO = gql`
+	query GetUserInfo {
+		uiapi {
+			query {
+				User(first: 1) {
+					edges {
+						node {
+							Id
+							Name {
+								value
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+`;
+
+/**
+ * Fetches the current user's id and name (for TopBar, etc.).
+ * Returns null on error or when no user is returned.
+ */
+export async function getUserInfo(): Promise<{ name: string; id: string } | null> {
+	try {
+		const data = await executeGraphQL<GetUserInfoQuery>(GET_USER_INFO);
+		const user = data?.uiapi?.query?.User?.edges?.[0]?.node;
+		if (user) {
+			return {
+				id: user.Id,
+				name: user.Name?.value ?? "User",
+			};
+		}
+		return null;
+	} catch (error) {
+		console.error("Error fetching user info:", error);
+		return null;
+	}
+}