@kalisio/kdk 2.6.4 → 2.7.0

package/map/client/utils/utils.time-series.js

@@ -1,10 +1,68 @@
 import _ from 'lodash'
 import moment from 'moment'
+import { unref } from 'vue'
+import sift from 'sift'
+import chroma from 'chroma-js'
 import centroid from '@turf/centroid'
-import { Time, Units, i18n } from '../../../core/client/index.js'
-import { isMeasureLayer } from './utils.layers.js'
+import { Time, Store, Units, i18n } from '../../../core/client/index.js'
+import { getFeatureId, getFeatureLabel } from './utils.js'
 import { getMeasureForFeature } from './utils.features.js'
+import { formatUserCoordinates } from './utils.location.js'
+import { isMeasureLayer } from './utils.layers.js'
 import { getForecastForLocation, getForecastProbe, getForecastForFeature } from './utils.weacast.js'
+import { useCurrentActivity } from '../composables/activity.js'
+
+// When organizing time series by feature the dataset color is the variable color as given in the layer
+// eg 'temperature' data in red and 'humidity' data in blue
+// When organizing time series by variable the dataset color should be different for each feature
+// eg 'Toulouse' data in red, 'Paris' data in blue, etc.
+// We pregenerate a fixed set of colors for this to ensure they are always assigned in the same order
+const nbColors = 10
+const Colors = chroma.scale('Set1').colors(nbColors)
+
+// Add a small delta (minutes) to data time range so that some ticks are always visible
+// and points on on the left/right side are not cut
+const TimeRangeDelta = 2
+
+// ID of weather forecast probe timeseries
+export const ForecastProbeId = 'forecast-probe'
+
+export function getChartOptions (title) {
+  return {
+    title: {
+      display: true,
+      text: title,
+      align: 'start'
+    },
+    scales: {
+      x: {
+        min: (startTime, endTime) => startTime.clone().subtract(TimeRangeDelta, 'minutes').valueOf(),
+        max: (startTime, endTime) => endTime.clone().add(TimeRangeDelta, 'minutes').valueOf()
+      }
+    },
+    plugins: {
+      legend: {
+        labels: {
+          usePointStyle: true,
+          generateLabels: (chart) => {
+            return chart.data.datasets.map((dataset, index) => {
+              // If we have a single value but like to draw a line it does not make sense so that we "force" point display
+              const hasSingleValue = (dataset.data.length === 1)
+              return {
+                text: dataset.label,
+                datasetIndex: index,
+                fillStyle: dataset.backgroundColor,
+                strokeStyle: dataset.borderColor,
+                pointStyle: (hasSingleValue ? 'rectRot' : 'line'),
+                hidden: !chart.isDatasetVisible(index)
+              }
+            })
+          }
+        }
+      }
+    }
+  }
+}
 
 // Extract target variable data for timeseries from timeseries request result
 async function getDataForVariable(data, variable, forecastLevel, runTime) {
@@ -81,7 +139,7 @@ async function fetchDataForMeasureSeries({
 // Build timeseries to be used in charts for target feature and associated layer definition or probe location
 export function getForecastTimeSeries({
   feature, location, layer, startTime, endTime, runTime,
-  forecastLayers, forecastModel, forecastLevel, weacastApi, fetchDelay
+  forecastLayers, forecastModel, forecastLevel, forecastLevelUnit, weacastApi, fetchDelay
 }) {
   let forecastVariables = []
   if (forecastLayers && forecastLayers.length > 0) forecastLayers.forEach(layer => { forecastVariables = forecastVariables.concat(_.get(layer, 'variables', [])) })
@@ -106,12 +164,16 @@ export function getForecastTimeSeries({
     // Known by the unit system ?
     const unit = Units.getUnit(baseUnit)
     const targetUnit = Units.getTargetUnit(baseUnit)
+    // We allow variable name to be customized based on level information
+    const label = _.template(i18n.tie(variable.label))({
+      level: forecastLevel, levelUnit: forecastLevelUnit
+    })
     const serie = {
       probedLocationData: forecastData,
       data: getDataForVariable(forecastData, variable, forecastLevel, runTime),
       variable: {
         name: variable.name,
-        label: `${i18n.tie(variable.label)} (${Units.getTargetUnitSymbol(baseUnit)})`,
+        label: `${label} (${Units.getTargetUnitSymbol(baseUnit)})`,
         unit,
         targetUnit,
         chartjs: Object.assign({
@@ -138,7 +200,7 @@ export function getForecastTimeSeries({
 // Build timeseries to be used in charts for target feature and associated layer definition or probe location
 export function getMeasureTimeSeries({
   feature, location, layer, layers, startTime, endTime, runTime,
-  level, probeFunction, fetchDelay
+  level, levelUnit, probeFunction, fetchDelay
 }) {
   // A feature comes from a single layer so target variables from it by default
   let variables = _.get(layer, 'variables', [])
@@ -165,12 +227,16 @@ export function getMeasureTimeSeries({
     // Known by the unit system ?
     const unit = Units.getUnit(baseUnit)
     const targetUnit = Units.getTargetUnit(baseUnit)
+    // We allow variable name to be customized based on level information
+    const label = _.template(i18n.tie(variable.label))({
+      level, levelUnit
+    })
     const serie = {
       probedLocationData: data,
       data: getDataForVariable(data, variable),
       variable: {
         name: variable.name,
-        label: `${i18n.tie(variable.label)} (${Units.getTargetUnitSymbol(baseUnit)})`,
+        label: `${label} (${Units.getTargetUnitSymbol(baseUnit)})`,
         unit,
         targetUnit,
         chartjs: Object.assign({
@@ -193,3 +259,146 @@ export function getMeasureTimeSeries({
 
   return series
 }
+
+// Helper function to update time series whenever something related changes, eg time span
+export async function updateTimeSeries (previousTimeSeries) {
+  const { CurrentActivity, hasSelectedItems, getSelectedItems, hasProbedLocation, getProbedLocation } = useCurrentActivity()
+  const activity = unref(CurrentActivity)
+  if (!activity) return
+  // Initialize the time range
+  const span = Store.get('timeseries.span')
+  const start = moment(Time.getCurrentTime()).subtract(span, 'm')
+  const end = moment(Time.getCurrentTime()).add(span, 'm')
+  Time.patchRange({ start, end })
+  // Weather probe targets variables coming from multiple layers
+  const forecastLayers = _.values(activity.layers).filter(sift({ tags: ['weather', 'forecast'] }))
+  const featureLevel = activity.selectableLevelsLayer ? ` - ${activity.selectedLevel} ${activity.selectableLevels.unit}` : ''
+  const forecastLevel = activity.forecastLevel ? ` - ${activity.forecastLevel} ${activity.selectableLevels.unit}` : ''
+
+  let timeSeries = []
+  if (hasProbedLocation()) {
+    const coordinates = formatUserCoordinates(getProbedLocation().lat, getProbedLocation().lng, Store.get('locationFormat', 'FFf'))
+    // When custom probe function we provide visible layers as input
+    if (activity.probeLocation) {
+      let variableLayers = _.difference(_.values(activity.layers).filter(sift({ variables: { $exists: true }, isVisible: true })), forecastLayers)
+      variableLayers = variableLayers.filter(layer => activity.canProbeLocation({ location: getProbedLocation(), layer, level: activity.selectedLevel }))
+      variableLayers.forEach(layer => {
+        const series = getMeasureTimeSeries({
+          location: getProbedLocation(),
+          layer,
+          level: activity.selectedLevel,
+          levelUnit: (activity.selectableLevels ? activity.selectableLevels.unit : ''),
+          probeFunction: activity.probeLocation
+        })
+        if (!_.isEmpty(series)) {
+          timeSeries.push({
+            id: `${layer.name}-measure-probe`,
+            label: `${layer.label} (${coordinates})` + featureLevel,
+            series
+          })
+        }
+      })
+    }
+    // Or weather forecast probe
+    if (_.isEmpty(timeSeries) && activity.forecastModel) {
+      const series = getForecastTimeSeries({
+        location: getProbedLocation(),
+        forecastLayers,
+        forecastModel: activity.forecastModel,
+        forecastLevel: activity.forecastLevel,
+        forecastLevelUnit: (activity.selectableLevels ? activity.selectableLevels.unit : ''),
+        weacastApi: activity.getWeacastApi()
+      })
+      if (!_.isEmpty(series)) {
+        timeSeries.push({
+          id: ForecastProbeId,
+          label: `${activity.forecastModel.label} (${coordinates})` + forecastLevel,
+          series
+        })
+      }
+    }
+  }
+  if (hasSelectedItems()) {
+    getSelectedItems().forEach(item => {
+      const featureId = getFeatureId(item.feature, item.layer)
+      const featureLabel = getFeatureLabel(item.feature, item.layer)
+      // Measure
+      if (isMeasureLayer(item.layer)) {
+        const series = getMeasureTimeSeries({
+          feature: item.feature,
+          layer: item.layer,
+          level: activity.selectedLevel
+        })
+        if (!_.isEmpty(series)) {
+          timeSeries.push({
+            id: `${item.layer.name}-${featureId}-measure`,
+            label: `${item.layer.label} - ${featureLabel || featureId}` + featureLevel,
+            series
+          })
+        }
+      }
+      // Or weather forecast probe
+      if (_.isEmpty(timeSeries) && activity.forecastModel) {
+        const series = getForecastTimeSeries({
+          feature: item.feature,
+          layer: item.layer,
+          forecastLayers,
+          forecastModel: activity.forecastModel,
+          forecastLevel: activity.forecastLevel,
+          weacastApi: activity.getWeacastApi()
+        })
+        if (!_.isEmpty(series)) {
+          timeSeries.push({
+            id: `${item.layer.name}-${featureId}-probe`,
+            label: `${activity.forecastModel.label} (${item.layer.label} - ${featureLabel || featureId})` + forecastLevel,
+            series
+          })
+        }
+      }
+    })
+  }
+
+  const groupBy = Store.get('timeseries.groupBy')
+  // Default is to group by feature
+  if (groupBy === 'variable') {
+    const timeSeriesByVariable = {}
+    timeSeries.forEach((timeSerie, index) => {
+      timeSerie.series.forEach(serie => {
+        // We do not mix variables with different units
+        const variable = `${_.get(serie, 'variable.name')}-${_.get(serie, 'variable.unit.name')}`
+        const variableLabel = _.get(serie, 'variable.label')
+        // When organizing time series by feature chart name is the feature name while the dataset label is the variable name,
+        // eg a 'Toulouse' station collecting 'temperature' and 'humidity' data
+        // When organizing time series by variable the chart name is the variable name while the dataset label is the feature name
+        // eg the 'temperature' data for different stations 'Toulouse', 'Paris', etc.
+        _.set(serie, 'variable.label', timeSerie.label)
+        _.set(serie, 'variable.chartjs.backgroundColor', Colors[index % nbColors])
+        _.set(serie, 'variable.chartjs.borderColor', Colors[index % nbColors])
+        if (timeSeriesByVariable[variable]) {
+          timeSeriesByVariable[variable].series.push(serie)
+        } else {
+          timeSeriesByVariable[variable] = {
+            id: variable,
+            label: variableLabel,
+            series: [serie]
+          }
+        }
+      })
+    })
+    timeSeries = _.values(timeSeriesByVariable)
+  }
+  // Restore previous state if any
+  if (previousTimeSeries) {
+    timeSeries.forEach(timeSerie => {
+      const previousTimeSerie = _.find(previousTimeSeries, { id: timeSerie.id })
+      // Keep track of some states only
+      if (previousTimeSerie) Object.assign(timeSerie, _.pick(previousTimeSerie, ['visible', 'pinned', 'logarithmic']))
+    })
+  }
+  // Make first serie visible if required, always measure first if any
+  if (!_.isEmpty(timeSeries) && !_.find(timeSeries, { visible: true })) {
+    const timeSerie = _.find(timeSeries, timeSerie => timeSerie.label.includes('measure')) || timeSeries[0]
+    timeSerie.visible = true
+  }
+  return timeSeries
+}

package/map/common/schemas/catalog.update.json

@@ -16,7 +16,7 @@
     },
     "description": {
       "type": ["string", "null"],
-      "maxLength": 256,
+      "maxLength": 4096,
       "field": {
         "component": "form/KTextField",
         "label": "schemas.CATALOG_DESCRIPTION_FIELD_LABEL"

package/map/common/weacast-grid-source.js

@@ -58,7 +58,7 @@ export class WeacastGridSource extends GridSource {
   constructor (options) {
     super(options)
 
-    this.api = options.weacastApi
+    this.api = options.planetApi
     this.usable = false
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kalisio/kdk",
   "description": "Kalisio Development Kit",
-  "version": "2.6.4",
+  "version": "2.7.0",
   "homepage": "https://github.com/kalisio/kdk",
   "type": "module",
   "keywords": [
@@ -94,8 +94,8 @@
     "@feathersjs/feathers": "^5.0.8",
     "@feathersjs/schema": "^5.0.8",
     "@feathersjs/socketio": "^5.0.8",
-    "@kalisio/feathers-import-export": "^1.4.0",
-    "@kalisio/feathers-s3": "^1.5.0",
+    "@kalisio/feathers-import-export": "^1.4.1",
+    "@kalisio/feathers-s3": "^1.6.0",
     "@kalisio/feathers-webpush": "^1.0.2",
     "@turf/bbox": "^6.0.1",
     "@weacast/core": "^2.2.1",

package/scripts/kash/CHANGELOG.md

@@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-  - added `get_toml_value` to extract values from TOML fields
   - support for mongo 8 (`install_mongo8`)
   - added `get_flavor_from_git_ref` `get_version_from_git_ref` `get_custom_from_git_ref` helpers to parse git ref names (tag or branch names).
   - added `install_sona_scanner_cli` to install SonarQube scanner cli tool
@@ -19,7 +18,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - support for mongo 4,5,6
   - helper to install k9s
   - support for node 16,18
-  - support for Code Climate
   
 ### Changed
 
@@ -34,8 +32,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - node22 bumped to `22.16`
   - mongodb7 bumped to `7.0.21`
   - mongodb8 bumped to `8.0.10`
-  - allow `_` character in custom fields (see `get_custom_from_git_ref`)
-  - run_app_tests now run lint on whole project repo (using `yarn lint`)
 
 ### Fixed
 

package/scripts/kash/README.md

@@ -2,12 +2,3 @@
 Kalisio's bash snippets repository
 
 ## HOWTO use
-
-
-## License
-
-Licensed under the [MIT license](LICENSE).
-
-Copyright (c) 2017-present [Kalisio](https://kalisio.com)
-
-[![Kalisio](https://kalisio.github.io/kalisioscope/kalisio/kalisio-logo-black-256x84.png)](https://kalisio.com)

package/scripts/kash/kash.sh

@@ -129,11 +129,11 @@ AGE_VERSION=1.1.1
 SOPS_VERSION=3.8.1
 
 # https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
-KUBECTL_VERSION=1.31.11
+KUBECTL_VERSION=1.28.13
 # https://github.com/helm/helm/releases
-HELM_VERSION=3.18.4
+HELM_VERSION=3.14.4
 # https://github.com/helmfile/helmfile/releases
-HELMFILE_VERSION=1.1.3
+HELMFILE_VERSION=0.167.1
 
 # https://github.com/nvm-sh/nvm/releases
 NVM_VERSION=0.40.3
@@ -246,6 +246,34 @@ ensure_sops() {
     fi
 }
 
+# Install code climate test reporter in ~/.local/bin
+# Arg1: a writable folder where to write downloaded files
+install_cc_test_reporter() {
+    local DL_ROOT=$1
+    local DL_PATH="$DL_ROOT/cc"
+    if [ ! -d "$DL_PATH" ]; then
+        mkdir -p "$DL_PATH" && cd "$DL_PATH"
+        curl -OLsS https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+        curl -OLsS https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64.sha256
+        sha256sum --ignore-missing --quiet -c test-reporter-latest-linux-amd64.sha256
+        cd ~-
+    fi
+    cd "$DL_PATH"
+    cp test-reporter-latest-linux-amd64 ~/.local/bin/cc-test-reporter
+    chmod +x ~/.local/bin/cc-test-reporter
+    cd ~-
+}
+
+# Sends test coverage to code climate
+# Arg1: code climate identifier for authentication
+# Arg2: prefix to use when using format-coverage (can be empty)
+send_coverage_to_cc() {
+    local CC_TEST_REPORTER_ID=$1
+    local CC_PREFIX=${2:-}
+    ~/.local/bin/cc-test-reporter format-coverage -t lcov --add-prefix "$CC_PREFIX" coverage/lcov.info
+    ~/.local/bin/cc-test-reporter upload-coverage -r "$CC_TEST_REPORTER_ID"
+}
+
 # Make sure nvm is installed
 # Arg1: a writable folder where to write downloaded files
 # NOTE: also define 'yarn' as a default package, ie. it'll be automatically
@@ -458,28 +486,12 @@ use_mongo() {
 ### Utils
 ###
 
-# Extract a value from a TOML file
-# Expected args:
-# 1. the toml file
-# 2. the field to extract
-get_toml_value() {
-    local TOML_SRC="$1"
-    local TOML_FIELD="$2"
-
-    ensure_yq
-    yq --input-format=toml --output-format=yaml ".$TOML_FIELD" "$TOML_SRC"
-}
-
-# Extract a value from a JSON file
-# Expected args:
-# 1. the toml file
-# 2. the field to extract
 get_json_value() {
     local JSON_SRC="$1"
     local JSON_FIELD="$2"
 
     ensure_yq
-    yq --input-format=yaml --output-format=yaml ".$JSON_FIELD" "$JSON_SRC"
+    yq --output-format=yaml ".$JSON_FIELD" "$JSON_SRC"
 }
 
 # Extract version major from a version string.
@@ -991,7 +1003,7 @@ get_version_from_git_ref() {
 get_custom_from_git_ref() {
     local GIT_REF=$1
 
-    local CUSTOM_REGEX="(^|-)([a-zA-Z0-9_]+)$"
+    local CUSTOM_REGEX="(^|-)([a-zA-Z0-9]+)$"
     if [[ "$GIT_REF" =~ $CUSTOM_REGEX ]]; then
         if [[ "${BASH_REMATCH[1]}" == "" ]]; then
             # If first capture group is empty => that's probably a 'dev' flavor.
@@ -1272,13 +1284,13 @@ get_app_kli_file() {
 # Expected arguments:
 # 1. the app repository directory
 # 2. the directory in which we'll find kli files relative to the 'development' repository root directory
-# 3. whether to run SonarQube analysis and publish code quality & coverage results (boolean)
+# 3. wether to publish code coverage results (boolean)
 # 4. the node version to use (16, 18, ...)
 # 5. the mongo version to use (5, 6, ...). Mongo will not be started if not provided
 run_app_tests() {
     local REPO_DIR="$1"
     local KLI_BASE="$2"
-    local RUN_SONAR="$3"
+    local CODE_COVERAGE="$3"
     local NODE_VER="$4"
     local MONGO_VER="$5"
     local WORKSPACE_DIR
@@ -1295,13 +1307,6 @@ run_app_tests() {
 
     echo "About to run tests for $APP v$VERSION-$FLAVOR ..."
 
-    ## Lint whole project
-    ##
-
-    cd "$REPO_DIR"
-    yarn lint
-    cd ~-
-
     ## Start mongo
     ##
 
@@ -1317,19 +1322,19 @@ run_app_tests() {
     ## Run tests
     ##
 
-    cd "$REPO_DIR/api"
+    pushd "$REPO_DIR/api"
 
     use_node "$NODE_VER"
     yarn test
 
-    ## Run SonarQube analysis and publish code quality & coverage reports
+    ## Publish code coverage
     ##
 
-    if [ "$RUN_SONAR" = true ]; then
-        cd "$ROOT_DIR" && sonar-scanner
+    if [ "$CODE_COVERAGE" = true ]; then
+        send_coverage_to_cc "$CC_TEST_REPORTER_ID" "api"
     fi
 
-    cd ~-
+    popd
 }
 
 # Setup the workspace for a lib project.
@@ -1392,12 +1397,12 @@ get_lib_branch() {
 # Run tests for a library module
 # Expected arguments
 # 1. Root directory
-# 2. whether to run SonarQube analysis and publish code quality & coverage results (boolean)
+# 2. true to publish code coverage to code climate (CC_TEST_REPORTER_ID env var should be defined in this case)
 # 3. node version to be used
 # 4. mongo version to be used if required by tests
 run_lib_tests () {
     local ROOT_DIR="$1"
-    local RUN_SONAR="$2"
+    local CODE_COVERAGE="$2"
     local NODE_VER="$3"
     local MONGO_VER="$4"
     local WORKSPACE_DIR
@@ -1432,11 +1437,11 @@ run_lib_tests () {
     use_node "$NODE_VER"
     yarn && yarn test
 
-    ## Run SonarQube analysis and publish code quality & coverage reports
+    ## Publish code coverage
     ##
 
-    if [ "$RUN_SONAR" = true ]; then
-        cd "$ROOT_DIR" && sonar-scanner
+    if [ "$CODE_COVERAGE" = true ]; then
+        send_coverage_to_cc "$CC_TEST_REPORTER_ID"
     fi
 }
 

package/scripts/kash/scripts/run_tests.sh

@@ -11,7 +11,7 @@ ROOT_DIR=$(dirname "$THIS_DIR")
 ### Github Actions
 
 init_github() {
-    install_reqs yq age sops nvm node20 node22 sonar_scanner_cli
+    install_reqs yq age sops nvm node20 node22 cc_test_reporter sonar_scanner_cli
 
     # mongo is not available for alpine hosts
     if [ "$OS_ID" != "alpine" ]; then
@@ -49,8 +49,6 @@ mkdir -p "$TMP_DIR/utils"
 cd "$TMP_DIR/utils"
 curl -OLsS "https://raw.githubusercontent.com/kalisio/krawler/master/package.json"
 [ "$(get_json_value "$TMP_DIR/utils/package.json" 'name')" != "@kalisio/krawler" ] && exit 1
-curl -OLsS "https://raw.githubusercontent.com/kalisio/kazarr/refs/heads/master/pyproject.toml"
-[ "$(get_toml_value "$TMP_DIR/utils/pyproject.toml" 'project.name')" != "kazarr" ] && exit 1
 cd ~-
 
 [ "$(get_semver_major "1" )" != "1" ] && exit 1
@@ -131,7 +129,6 @@ git_shallow_clone https://github.com/kalisio/kApp.git "$TMP_DIR/kApp.v1.3.0" pro
 [[ "$(get_custom_from_git_ref "test-v4.3-blabla")" != "blabla" ]] && exit 1
 [[ "$(get_custom_from_git_ref "prod-v4.5.3")" != "" ]] && exit 1
 [[ "$(get_custom_from_git_ref "prod-v4.5.3-custom")" != "custom" ]] && exit 1
-[[ "$(get_custom_from_git_ref "prod-v4.5.3-custom_foo")" != "custom_foo" ]] && exit 1
 
 # Setup a fake workspace with additional dependencies
 mkdir -p "$TMP_DIR/fake"

package/test/api/core/authentication.test.js

@@ -42,11 +42,9 @@ describe('core:authentication', () => {
     try {
       await request.get(`${baseUrl}/users`)
     } catch (error) {
-      /* FIXME: Not sure why but in this case the raised error is in text format
-        expect(error).toExist()
-        expect(error.name).to.equal('NotAuthenticated')
-        */
+      // Not sure why but in this case the raised error is in text/html format
       expect(error.status).to.equal(500)
+      expect(error.response.text.includes('NotAuthenticated')).beTrue()
     }
   })
 
@@ -154,6 +152,7 @@ describe('core:authentication', () => {
     expect(accessToken).not.to.equal(statelessAccessToken)
     expect(user).beUndefined()
     const payload = await authenticationService.verifyAccessToken(accessToken, app.get('authentication').jwtOptions)
+    expect(payload.sub).to.equal('mycustomapp')
     expect(payload.property).to.equal('mycustomproperty')
   })
 
@@ -175,6 +174,12 @@ describe('core:authentication', () => {
     expect(users[0]._id).to.equal(userObject._id.toString())
   })
 
+  it('removes user', async () => {
+    await userService.remove(userObject._id)
+  })
+  // Let enough time to process
+    .timeout(5000)
+
   // Cleanup
   after(async () => {
     if (server) await server.close()

package/test/api/core/config/default.cjs

@@ -20,6 +20,7 @@ module.exports = {
     service: API_PREFIX + '/users',
     entity: 'user',
     identityFields: ['email', 'profile.phone'],
+    disallowRegistration: true,
     authStrategies: [
       'jwt',
       'local'

package/test/api/core/hooks.test.js

@@ -272,6 +272,12 @@ describe('core:hooks', () => {
     fuzzySearch({ fields: ['name'] })(hook)
     hooks.diacriticSearch()(hook)
     expect(hook.params.query.name.$regex.source).to.equal('árë')
+    // Ensure it works on complex queries
+    hook.params.query = { $or: [{ name: { $search: 'are' } }, { name: { $search: 'árë' } }] }
+    fuzzySearch({ fields: ['name'] })(hook)
+    hooks.diacriticSearch()(hook)
+    expect(hook.params.query.$or[0].name.$regex.source).to.equal('[a,á,à,ä,â,ã]r[e,é,ë,è,ê]')
+    expect(hook.params.query.$or[1].name.$regex.source).to.equal('árë')
   })
 
   it('rate limiting', (done) => {