@q2devel/q2-core 1.0.44 → 1.0.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,8 +3,9 @@ import { Term } from '../types/Term';
3
3
  type GetTermsInput = {
4
4
  categoryId?: string[];
5
5
  include?: string[];
6
+ sortField?: string;
6
7
  mapFn?: (base: Term, raw: any) => Term | Promise<Term>;
7
8
  };
8
- export declare const getTerms: (ctx: CoreContext, { categoryId, include, mapFn }: GetTermsInput) => Promise<Term[]>;
9
+ export declare const getTerms: (ctx: CoreContext, { categoryId, include, sortField, mapFn, }: GetTermsInput) => Promise<Term[]>;
9
10
  export {};
10
11
  //# sourceMappingURL=getTerms.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAIrC,KAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,KAAK,WAAW,EAChB,gCAA0I,aAAa,KACtJ,OAAO,CAAC,IAAI,EAAE,CAuEhB,CAAC"}
1
+ {"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAIpC,KAAK,aAAa,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACzD,CAAA;AAED,eAAO,MAAM,QAAQ,GACjB,KAAK,WAAW,EAChB,4CAWG,aAAa,KACjB,OAAO,CAAC,IAAI,EAAE,CA8EhB,CAAA"}
@@ -1,7 +1,14 @@
1
1
  // api/getTerms.ts
2
2
  import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
3
3
  import mapIncludedResources from '../utils/mapIncludedResources';
4
- export const getTerms = async (ctx, { categoryId, include = ['parent', 'field_icon', 'field_icon.field_media_image', 'field_image', 'field_image.field_media_image'], mapFn }) => {
4
+ export const getTerms = async (ctx, { categoryId, include = [
5
+ 'parent',
6
+ 'field_icon',
7
+ 'field_icon.field_media_image',
8
+ 'field_image',
9
+ 'field_image.field_media_image',
10
+ ], sortField = 'name', // default fallback
11
+ mapFn, }) => {
5
12
  const cacheKey = ['terms', ctx.locale, ...(categoryId ?? []), ...(include ?? [])].join(':');
6
13
  const cached = await ctx.getCache?.(cacheKey);
7
14
  if (cached)
@@ -13,7 +20,9 @@ export const getTerms = async (ctx, { categoryId, include = ['parent', 'field_ic
13
20
  .addInclude(include)
14
21
  .addFilter('langcode', ctx.locale)
15
22
  .addPageLimit(50);
16
- //.addSort("weight")
23
+ if (sortField) {
24
+ params.addSort(sortField);
25
+ }
17
26
  if (categoryId) {
18
27
  params.addFilter('drupal_internal__tid', categoryId, 'IN');
19
28
  }
@@ -50,8 +59,12 @@ export const getTerms = async (ctx, { categoryId, include = ['parent', 'field_ic
50
59
  name: item.name,
51
60
  description: item.description?.processed ?? '',
52
61
  parent: item.parent?.[0],
53
- icon: item?.field_icon?.field_media_image.uri?.url ? ctx.makeAbsoluteUrl(item.field_icon.field_media_image.uri.url) : undefined,
54
- image: item?.field_image?.field_media_image.uri?.url ? ctx.makeAbsoluteUrl(item.field_image.field_media_image.uri.url) : undefined,
62
+ icon: item?.field_icon?.field_media_image.uri?.url
63
+ ? ctx.makeAbsoluteUrl(item.field_icon.field_media_image.uri.url)
64
+ : undefined,
65
+ image: item?.field_image?.field_media_image.uri?.url
66
+ ? ctx.makeAbsoluteUrl(item.field_image.field_media_image.uri.url)
67
+ : undefined,
55
68
  };
56
69
  return mapFn ? await mapFn(base, item) : base;
57
70
  }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@q2devel/q2-core",
3
- "version": "1.0.44",
3
+ "version": "1.0.45",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "exports": {