IM-401 - move plugins out of /beta

assets/templates/add-polygons.njk

@@ -7,7 +7,7 @@
 {% block head %}
   <link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css">
   <link href="/plugin-assets/%40defra%2Finteractive-map/dist/css/index.css" rel="stylesheet" type="text/css">
-  <link href="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/datasets/dist/css/index.css" rel="stylesheet" type="text/css">
+  <link href="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/css/index.css" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block bodyStart %}
@@ -39,7 +39,7 @@
   <!-- Defra library scripts -->
   <script src="/plugin-assets/%40defra%2Finteractive-map/dist/umd/index.js"></script>
   <script src="/plugin-assets/%40defra%2Finteractive-map/providers/maplibre/dist/umd/index.js"></script>
-  <script src="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/datasets/dist/umd/index.js"></script>
+  <script src="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/umd/index.js"></script>
 
   <script>
     // GeoJSON can also be loaded from a URL; use the tiles property for vector tile sources

assets/templates/add-symbols.njk

@@ -7,7 +7,7 @@
 {% block head %}
   <link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css">
   <link href="/plugin-assets/%40defra%2Finteractive-map/dist/css/index.css" rel="stylesheet" type="text/css">
-  <link href="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/datasets/dist/css/index.css" rel="stylesheet" type="text/css">
+  <link href="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/css/index.css" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block bodyStart %}
@@ -39,7 +39,7 @@
   <!-- Defra library scripts -->
   <script src="/plugin-assets/%40defra%2Finteractive-map/dist/umd/index.js"></script>
   <script src="/plugin-assets/%40defra%2Finteractive-map/providers/maplibre/dist/umd/index.js"></script>
-  <script src="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/datasets/dist/umd/index.js"></script>
+  <script src="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/umd/index.js"></script>
 
   <script>
     const symbolGraphic = 'M3 15H1V1h2v2h2V1h2v5h2V4h2v2h2V4h2v11H6V9H3v6z'

demo/DemoMapPolygons.js

@@ -102,7 +102,7 @@ function MapInner () {
     Promise.all([
       import('../src/index.js'),
       import('../providers/maplibre/src/index.js'),
-      import('../plugins/beta/datasets/src/index.js')
+      import('../plugins/datasets/src/index.js')
     ]).then(([
       { default: InteractiveMap },
       { default: maplibreProvider },

demo/DemoMapSymbols.js

@@ -77,7 +77,7 @@ function MapInner () {
     Promise.all([
       import('../src/index.js'),
       import('../providers/maplibre/src/index.js'),
-      import('../plugins/beta/datasets/src/index.js')
+      import('../plugins/datasets/src/index.js')
     ]).then(([
       { default: InteractiveMap },
       { default: maplibreProvider },

demo/js/draw.js

@@ -8,7 +8,7 @@ import maplibreProvider from '/providers/maplibre/src/index.js'
 import openNamesProvider from '/providers/beta/open-names/src/index.js'
 // Plugins
 import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDatasetsPlugin from '/plugins/beta/datasets/src/index.js'
+import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
 import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'

demo/js/esm.js

@@ -7,7 +7,7 @@ import maplibreProvider from '/providers/maplibre/src/index.js'
 import openNamesProvider from '/providers/beta/open-names/src/index.js'
 // Plugins
 import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDatasetsPlugin from '/plugins/beta/datasets/dist/esm/index.js'
+import createDatasetsPlugin from '/plugins/datasets/dist/esm/index.js'
 import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'

demo/js/esri-datasets.js

@@ -2,7 +2,7 @@ import InteractiveMap from '../../src/index.js'
 import esriProvider from '/providers/beta/esri/src/index.js'
 // Plugins
 import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDatasetsPlugin from '/plugins/beta/datasets/src/index.js'
+import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 // Setup
 import { vtsMapStyles27700 } from './mapStyles.js'
 import { transformGeocodeRequest, transformVtsRequest3857, setupEsriConfig } from './auth.js'

demo/js/farming.js

@@ -8,7 +8,7 @@ import openNamesProvider from '/providers/beta/open-names/src/index.js'
 // Plugins
 import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
 import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDatasetsPlugin from '/plugins/beta/datasets/src/index.js'
+import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
 import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'

demo/js/gep.js

@@ -1,7 +1,7 @@
 import InteractiveMap from '../../src/index.js'
 import { vtsMapStyles27700, apgbAerialStyle } from './mapStyles.js'
 import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
-import '/plugins/beta/datasets/src/datasets.scss' // in a separate repo: import '@defra/interactive-map/plugins/datasets/css'
+import '/plugins/datasets/src/datasets.scss' // in a separate repo: import '@defra/interactive-map/plugins/datasets/css'
 // Providers
 import openLayersProvider from '/providers/beta/openlayers/src/index.js'
 import openNamesProvider from '/providers/beta/open-names/src/index.js'

demo/js/index.js

@@ -1,7 +1,7 @@
 // CSS
 // import '../../dist/css/index.css'
 // import '/plugins/beta/map-styles/dist/css/index.css'
-// import '/plugins/beta/datasets/dist/css/index.css'
+// import '/plugins/datasets/dist/css/index.css'
 // import '/plugins/beta/draw-ml/dist/css/index.css'
 // import '/plugins/beta/scale-bar/dist/css/index.css'
 // import '/plugins/search/dist/css/index.css'
@@ -18,7 +18,7 @@ import openNamesProvider from '/providers/beta/open-names/src/index.js'
 // Plugins
 import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
 import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDatasetsPlugin from '/plugins/beta/datasets/src/index.js'
+import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 // import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
 import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'

demo/js/ml-datasets.js

@@ -7,7 +7,7 @@ import maplibreProvider from '/providers/maplibre/src/index.js'
 import openNamesProvider from '/providers/beta/open-names/src/index.js'
 // Plugins
 import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDatasetsPlugin from '/plugins/beta/datasets/src/index.js'
+import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'

demo/umd.html

@@ -6,7 +6,7 @@
   <title>Interactive Map – UMD sanity check</title>
   <link rel="stylesheet" href="/assets/govuk-frontend.min.css">
   <link rel="stylesheet" href="/dist/css/index.css">
-  <link rel="stylesheet" href="/plugins/beta/datasets/dist/css/index.css">
+  <link rel="stylesheet" href="/plugins/datasets/dist/css/index.css">
   <style>
     body { padding: 20px; font-family: sans-serif; }
   </style>
@@ -24,7 +24,7 @@ <h1>UMD sanity check – datasets plugin</h1>
   <!-- MapLibre provider -->
   <script src="/providers/maplibre/dist/umd/index.js"></script>
   <!-- Datasets plugin (adapter auto-detected at runtime) -->
-  <script src="/plugins/beta/datasets/dist/umd/index.js"></script>
+  <script src="/plugins/datasets/dist/umd/index.js"></script>
 
   <script src="/umd.js"></script>
 </body>

docs/plugins/datasets.md

@@ -33,10 +33,10 @@ const interactiveMap = new InteractiveMap({
 
 ## UMD usage
 
-Copy the entire `plugins/beta/datasets/dist/umd/` directory to `/your-assets-path/plugins/beta/datasets/umd/`. The plugin uses dynamic imports, so all files in the directory must be served from the same location. Then add the script tag:
+Copy the entire `plugins/datasets/dist/umd/` directory to `/your-assets-path/plugins/datasets/umd/`. The plugin uses dynamic imports, so all files in the directory must be served from the same location. Then add the script tag:
 
 ```html
-<script defer src="/your-assets-path/plugins/beta/datasets/umd/index.js"></script>
+<script defer src="/your-assets-path/plugins/datasets/umd/index.js"></script>
 ```
 
 ```js
@@ -68,7 +68,7 @@ const interactiveMap = new defra.InteractiveMap('map', {
 > [!NOTE]
 > **GOV.UK Prototype Kit** — skip the copy step. All files are served automatically. Use this path instead:
 > ```html
-> <script defer src="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/datasets/dist/umd/index.js"></script>
+> <script defer src="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/umd/index.js"></script>
 > ```
 
 ## Options

govuk-prototype-kit.config.json

@@ -62,7 +62,7 @@
     "/dist/umd/",
     "/providers/maplibre/dist",
     "/providers/beta/open-names/dist",
-    "/plugins/beta/datasets/dist",
+    "/plugins/datasets/dist",
     "/plugins/interact/dist",
     "/plugins/beta/map-styles/dist",
     "/plugins/beta/scale-bar/dist",

jest.config.mjs

@@ -27,7 +27,7 @@ export default {
       '<rootDir>/coverage',
       '<rootDir>/demo',
       '<rootDir>/src/test-utils.js',
-      '<rootDir>/plugins/beta/datasets/',
+      '<rootDir>/plugins/datasets/',
       '<rootDir>/providers/beta/',
       '<rootDir>/plugins/beta/draw-es',
       '<rootDir>/plugins/beta/draw-ml',

package.json

@@ -45,10 +45,10 @@
       "require": "./plugins/interact/dist/umd/index.js"
     },
     "./plugins/datasets": {
-      "import": "./plugins/beta/datasets/dist/esm/index.js"
+      "import": "./plugins/datasets/dist/esm/index.js"
     },
     "./plugins/datasets/adapters/maplibre": {
-      "import": "./plugins/beta/datasets/dist/adapters/maplibre/esm/index.js"
+      "import": "./plugins/datasets/dist/adapters/maplibre/esm/index.js"
     },
     "./plugins/map-styles": {
       "import": "./plugins/beta/map-styles/dist/esm/index.js",
@@ -68,7 +68,7 @@
     "./css": "./dist/css/index.css",
     "./plugins/draw-ml/css": "./plugins/beta/draw-ml/dist/css/index.css",
     "./plugins/scale-bar/css": "./plugins/beta/scale-bar/dist/css/index.css",
-    "./plugins/datasets/css": "./plugins/beta/datasets/dist/css/index.css",
+    "./plugins/datasets/css": "./plugins/datasets/dist/css/index.css",
     "./plugins/frame/css": "./plugins/beta/frame/dist/css/index.css",
     "./plugins/map-styles/css": "./plugins/beta/map-styles/dist/css/index.css",
     "./plugins/search/css": "./plugins/search/dist/css/index.css",

plugins/beta/datasets/src/adapters/esri/esriLayerAdapter.js → plugins/datasets/src/adapters/esri/esriLayerAdapter.js

@@ -3,14 +3,14 @@
 import { LayerAdapter } from '../layerAdapter.js'
 import { datasetRegistry } from '../../registry/datasetRegistry.js'
 import { EsriDataset } from './registry/esriDataset.js'
-import { logger } from '../../../../../../src/services/logger.js'
+import { logger } from '../../../../../src/services/logger.js'
 
 export default class EsriLayerAdapter extends LayerAdapter {
   constructor (mapProvider, symbolRegistry, patternRegistry) {
     super()
     this._mapProvider = mapProvider
     this._map = mapProvider.map
     // TODO: Implement symbolRegistry and patternRegistry usage in the adapter
 
     // _vectorTileLayers is a map of datasetId to VectorTileLayer instances
     // it includes stand alone vectorTileLayers and vectorTileLayers that are part of a groupLayer
@@ -33,7 +33,7 @@
   async init () {
     const topLevelDatasets = datasetRegistry.topLevelDatasets()
     // ensure the datasets are added in order
     for await (const registryDataset of topLevelDatasets) {
       await this._addLayers(registryDataset)
     }
 
@@ -111,7 +111,7 @@
     }
 
     // If the group layer has no more sublayers, we need to also remove the group layer from the map
     if (groupLayer && groupLayer.layers.length === 0) {
       this._map.remove(groupLayer)
       delete this._groupLayers[esriGroupId]
     }
@@ -127,7 +127,7 @@
       this._applyStyleLayerVisibility(registryDataset, vectorTileLayer)
       // Don't apply the visibility change to the parent, since the parent may have other sublayers that are visible
       return
     } else if (visible) {
       // No need to apply style layer visibility for datasets that are hidden
       registryDataset.sublayers.forEach(sublayer => this._applyStyleLayerVisibility(sublayer, vectorTileLayer))
     }
@@ -189,13 +189,13 @@
       this._applyStyleLayerVisibility(registryDataset, vectorTileLayer)
       this._applyStyleLayerPaintProperties(registryDataset, vectorTileLayer)
     })
     // TODO - handle dynamic sources
   }
 
   // onMapSizeChange is not applicable to the esriLayerAdapter
   async onMapSizeChange () {}
 
   // Remaining methods are still todo
   async applyFeatureFilter (...args) {
     console.log('TODO: applyFeatureFilter', args)
   }

plugins/beta/datasets/src/adapters/esri/esriLayerAdapter.test.js → plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js

@@ -3,7 +3,7 @@ import EsriLayerAdapter from './esriLayerAdapter.js'
 import { datasetRegistry } from '../../registry/datasetRegistry.js'
 
 jest.mock('../../registry/datasetRegistry.js')
-jest.mock('../../../../../../src/services/logger.js')
+jest.mock('../../../../../src/services/logger.js')
 
 jest.mock('@arcgis/core/layers/VectorTileLayer.js', () =>
   jest.fn().mockImplementation((opts = {}) => ({

plugins/beta/datasets/src/adapters/esri/registry/esriDataset.js → plugins/datasets/src/adapters/esri/registry/esriDataset.js

@@ -1,6 +1,6 @@
 import { Dataset } from '../../../registry/dataset.js'
 import { datasetRegistry } from '../../../registry/datasetRegistry.js'
-import { getValueForStyle } from '../../../../../../../src/utils/getValueForStyle.js'
+import { getValueForStyle } from '../../../../../../src/utils/getValueForStyle.js'
 
 export class EsriDataset extends Dataset {
   applyLayerPaintProperties (layerPaintProperties) {

plugins/beta/datasets/src/adapters/maplibre/layerBuilders.js → plugins/datasets/src/adapters/maplibre/layerBuilders.js

@@ -1,5 +1,5 @@
-import { getValueForStyle } from '../../../../../../src/utils/getValueForStyle.js'
-import { getSymbolAnchor } from '../../../../../../src/utils/symbolUtils.js'
+import { getValueForStyle } from '../../../../../src/utils/getValueForStyle.js'
+import { getSymbolAnchor } from '../../../../../src/utils/symbolUtils.js'
 
 // ─── Fill layer ───────────────────────────────────────────────────────────────
 

plugins/beta/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js → plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js

@@ -1,7 +1,7 @@
 import MaplibreLayerAdapter from './maplibreLayerAdapter.js'
 import { datasetRegistry } from '../../registry/datasetRegistry.js'
-import { symbolRegistry } from '../../../../../../src/services/symbolRegistry.js'
-import { patternRegistry } from '../../../../../../src/services/patternRegistry.js'
+import { symbolRegistry } from '../../../../../src/services/symbolRegistry.js'
+import { patternRegistry } from '../../../../../src/services/patternRegistry.js'
 
 jest.mock('../../registry/datasetRegistry.js')
 

plugins/beta/datasets/src/adapters/maplibre/registry/mapLibreDataset.js → plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.js

@@ -1,7 +1,7 @@
 import { Dataset } from '../../../registry/dataset.js'
-import { hashString } from '../../../../../../../src/utils/patternUtils.js'
-import { anchorToMaplibre } from '../../../../../../../providers/maplibre/src/utils/symbolImages.js'
-import { logger } from '../../../../../../../src/services/logger.js'
+import { hashString } from '../../../../../../src/utils/patternUtils.js'
+import { anchorToMaplibre } from '../../../../../../providers/maplibre/src/utils/symbolImages.js'
+import { logger } from '../../../../../../src/services/logger.js'
 const MAX_TILE_ZOOM = 22
 
 export class MapLibreDataset extends Dataset {

plugins/beta/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js → plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js

@@ -1,10 +1,10 @@
 import { MapLibreDataset } from './mapLibreDataset.js'
 import { datasetRegistry } from '../../../registry/datasetRegistry.js'
-import { logger } from '../../../../../../../src/services/logger.js'
+import { logger } from '../../../../../../src/services/logger.js'
 // Use the mock datasetRegistry with the demo datasets attached before each test
 // so we can test Dataset methods that depend on parent/sublayer relationships and styles
 jest.mock('../../../registry/datasetRegistry.js')
-jest.mock('../../../../../../../src/services/logger.js')
+jest.mock('../../../../../../src/services/logger.js')
 
 describe('MapLibreDataset', () => {
   beforeEach(() => {

plugins/beta/datasets/src/api/getOpacity.js → plugins/datasets/src/api/getOpacity.js

@@ -1,4 +1,4 @@
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
 
 export const getOpacity = ({ pluginState: { globals } }, options = {}) => {

plugins/beta/datasets/src/api/getOpacity.test.js → plugins/datasets/src/api/getOpacity.test.js

@@ -1,12 +1,12 @@
 import { getOpacity } from './getOpacity.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 
 jest.mock('../registry/datasetRegistry.js', () => ({
   datasetRegistry: { getDataset: jest.fn() }
 }))
 
-jest.mock('../../../../../src/services/logger.js')
+jest.mock('../../../../src/services/logger.js')
 
 describe('getOpacity', () => {
   beforeEach(() => {

plugins/beta/datasets/src/api/getStyle.js → plugins/datasets/src/api/getStyle.js

@@ -1,7 +1,7 @@
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
 
 export const getStyle = ({ pluginState }, { datasetId, sublayerId } = {}) => {
   datasetId = sublayerId ? `${datasetId}-${sublayerId}` : datasetId
   const registryDataset = datasetRegistry.getDataset(datasetId)
   if (!registryDataset) {

plugins/beta/datasets/src/api/getStyle.test.js → plugins/datasets/src/api/getStyle.test.js

@@ -1,12 +1,12 @@
 import { getStyle } from './getStyle.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 
 jest.mock('../registry/datasetRegistry.js', () => ({
   datasetRegistry: { getDataset: jest.fn() }
 }))
 
-jest.mock('../../../../../src/services/logger.js')
+jest.mock('../../../../src/services/logger.js')
 
 describe('getStyle', () => {
   beforeEach(() => {

plugins/beta/datasets/src/api/setData.js → plugins/datasets/src/api/setData.js

@@ -1,8 +1,8 @@
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
 import { layerAdapter } from '../adapters/loadLayerAdapter.js'
 
 export const setData = ({ pluginState }, geojson, { datasetId }) => {
   const registryDataset = datasetRegistry.getDataset(datasetId)
   if (!registryDataset) {
     logger.warn(`setData: Dataset with id ${datasetId} not found`)

plugins/beta/datasets/src/api/setData.test.js → plugins/datasets/src/api/setData.test.js

@@ -1,6 +1,6 @@
 import { setData } from './setData.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 import { layerAdapter } from '../adapters/loadLayerAdapter.js'
 
 jest.mock('../adapters/loadLayerAdapter.js', () => ({
@@ -13,7 +13,7 @@ jest.mock('../registry/datasetRegistry.js', () => ({
   datasetRegistry: { getDataset: jest.fn() }
 }))
 
-jest.mock('../../../../../src/services/logger.js')
+jest.mock('../../../../src/services/logger.js')
 
 describe('setData', () => {
   const geojson = { type: 'FeatureCollection', features: [] }

plugins/beta/datasets/src/api/setFeatureVisibility.js → plugins/datasets/src/api/setFeatureVisibility.js

@@ -1,4 +1,4 @@
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
 
 export const setFeatureVisibility = ({ pluginState: { dispatch } }, visible, featureIds, { datasetId = null } = {}) => {

plugins/beta/datasets/src/api/setFeatureVisibility.test.js → plugins/datasets/src/api/setFeatureVisibility.test.js

@@ -1,12 +1,12 @@
 import { setFeatureVisibility } from './setFeatureVisibility.js'
 import { datasetRegistry } from '../registry/datasetRegistry.js'
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 
 jest.mock('../registry/datasetRegistry.js', () => ({
   datasetRegistry: { getDataset: jest.fn() }
 }))
 
-jest.mock('../../../../../src/services/logger.js')
+jest.mock('../../../../src/services/logger.js')
 
 describe('setFeatureVisibility', () => {
   const dispatch = jest.fn()

plugins/beta/datasets/src/api/setGlobals.js → plugins/datasets/src/api/setGlobals.js

@@ -1,4 +1,4 @@
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 export const setGlobals = ({ pluginState: { dispatch } }, values) => {
   const { opacityMode } = values
   const payload = {}

plugins/beta/datasets/src/api/setGlobals.test.js → plugins/datasets/src/api/setGlobals.test.js

@@ -1,7 +1,7 @@
 import { setGlobals } from './setGlobals.js'
-import { logger } from '../../../../../src/services/logger.js'
+import { logger } from '../../../../src/services/logger.js'
 
-jest.mock('../../../../../src/services/logger.js')
+jest.mock('../../../../src/services/logger.js')
 
 describe('setGlobals', () => {
   const dispatch = jest.fn()

plugins/beta/datasets/src/components/Key/KeyItem.jsx → plugins/datasets/src/components/Key/KeyItem.jsx

@@ -1,4 +1,4 @@
-import { getValueForStyle } from '../../../../../../src/utils/getValueForStyle.js'
+import { getValueForStyle } from '../../../../../src/utils/getValueForStyle.js'
 import { KeySvg } from './KeySvg.jsx'
 
 export const KeyItem = ({ registryDataset, symbolRegistry, patternRegistry, mapStyle }) => {

plugins/beta/datasets/src/components/Key/KeySvg.test.jsx → plugins/datasets/src/components/Key/KeySvg.test.jsx

@@ -1,8 +1,8 @@
 import { render } from '@testing-library/react'
 import { KeySvg } from './KeySvg'
 
-import { symbolRegistry } from '../../../../../../src/services/symbolRegistry.js'
-import { patternRegistry } from '../../../../../../src/services/patternRegistry.js'
+import { symbolRegistry } from '../../../../../src/services/symbolRegistry.js'
+import { patternRegistry } from '../../../../../src/services/patternRegistry.js'
 
 const getSymbolDef = jest.spyOn(symbolRegistry, 'getSymbolDef')
 

plugins/beta/datasets/src/components/Key/KeySvgLine.jsx → plugins/datasets/src/components/Key/KeySvgLine.jsx

@@ -1,5 +1,5 @@
 import { svgProps, SVG_SIZE, SVG_CENTER } from './svgProperties.js'
-import { getValueForStyle } from '../../../../../../src/utils/getValueForStyle.js'
+import { getValueForStyle } from '../../../../../src/utils/getValueForStyle.js'
 
 export const KeySvgLine = ({ mapStyle, registryDataset }) => {
   const { style } = registryDataset