fix: Impossible to update layer when base query contains an operator (c…

…loses #907)
kalisio · Jul 24, 2024 · be349e1 · be349e1
1 parent 2845b40
commit be349e1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/map/api/services/catalog/catalog.hooks.js b/map/api/services/catalog/catalog.hooks.js
@@ -15,25 +15,22 @@ export default {
     get: [],
     create: [
       coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'data.type') } }),
-      coreHooks.convertObjectIDs(['baseQuery.layer']),
-      coreHooks.convertToString(['schema.content', 'filters']),
+      coreHooks.convertToString(['baseQuery', 'schema.content', 'filters']),
       setNow('createdAt', 'updatedAt'),
       // This allow to use keys for base queries like 'properties.xxx': 'yyy'
       (hook) => { _.set(hook, 'params.mongodb.checkKeys', false) }
     ],
     update: [
       coreHooks.populatePreviousObject,
       coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'params.previousItem.type') } }),
-      coreHooks.convertObjectIDs(['baseQuery.layer']),
-      coreHooks.convertToString(['schema.content', 'filters']),
+      coreHooks.convertToString(['baseQuery', 'schema.content', 'filters']),
       discard('createdAt', 'updatedAt'),
       setNow('updatedAt')
     ],
     patch: [
       coreHooks.populatePreviousObject,
       coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'params.previousItem.type') } }),
-      coreHooks.convertObjectIDs(['baseQuery.layer']),
-      coreHooks.convertToString(['schema.content', 'filters']),
+      coreHooks.convertToString(['baseQuery', 'schema.content', 'filters']),
       discard('createdAt', 'updatedAt'),
       setNow('updatedAt')
     ],
@@ -44,7 +41,8 @@ export default {
 
   after: {
     all: [
-      coreHooks.convertToJson(['schema.content', 'filters'])
+      coreHooks.convertToJson(['baseQuery', 'schema.content', 'filters']),
+      coreHooks.convertObjectIDs(['baseQuery.layer'])
     ],
     find: [
       // Merge built-in categoriessublegends with user-defined ones for global catalog only