fix: support recordId with '/' in it.

SoftwareBrothers · Apr 10, 2023 · 34f7b1c · 34f7b1c
1 parent 7fc4ca4
commit 34f7b1c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/backend/actions/search/search-action.ts b/src/backend/actions/search/search-action.ts
@@ -31,10 +31,12 @@ export const SearchAction: Action<SearchActionResponse> = {
  const { query } = request
 
  const decorated = resource.decorate()
- const titlePropertyName = request.query?.searchProperty ?? decorated.titleProperty().name()
+ const titlePropertyName = query?.searchProperty ?? decorated.searchProperty().name()
 
  const {
- sortBy = decorated.options?.sort?.sortBy || titlePropertyName,
+ sortBy = decorated.options?.sort?.sortBy
+ || query?.searchProperty
+ || decorated.titleProperty().name(),
  direction = 'asc',
  filters: customFilters = {},
  perPage = 50,

diff --git a/src/backend/decorators/resource/resource-decorator.ts b/src/backend/decorators/resource/resource-decorator.ts
@@ -267,6 +267,17 @@ class ResourceDecorator {
  return record.get(this.titleProperty().name()) as string
  }
 
+ /**
+ * Returns PropertyDecorator of a property which should be used to search.
+ * If searchProperty not set, use titleProperty as fallback
+ *
+ * @return {PropertyDecorator} PropertyDecorator of search property
+ */
+ searchProperty(): PropertyDecorator {
+ return (this.options.searchProperty && this.getPropertyByKey(this.options.searchProperty))
+ || this.titleProperty()
+ }
+
  getHref(currentAdmin?: CurrentAdmin): string | null {
  const { href } = this.options
  if (href) {

diff --git a/src/backend/decorators/resource/resource-options.interface.ts b/src/backend/decorators/resource/resource-options.interface.ts
@@ -105,6 +105,10 @@ export interface ResourceOptions {
  direction: 'asc' | 'desc';
  sortBy: string;
  };
+ /**
+ * Property which should be used to search
+ */
+ searchProperty?: string;
  /**
  * List of properties along with their options
  */

diff --git a/src/backend/utils/build-feature/build-feature.ts b/src/backend/utils/build-feature/build-feature.ts
@@ -29,7 +29,7 @@ function mergeActionHooks<T>(
  return hooks.length ? { [key]: hooks } : {}
 }
 
-const basicOptions = ['id', 'href', 'parent', 'sort', 'navigation'] as const
+const basicOptions = ['id', 'href', 'parent', 'sort', 'navigation', 'searchProperty'] as const
 const listOptions = [
  'listProperties', 'showProperties', 'editProperties', 'filterProperties',
 ] as const