@mapcomponents/ra-geospatial 1.5.5 → 1.5.7-2

package/src/contexts/lsDataProvider.js

@@ -1,5 +1,5 @@
-import fakeRestProvider from "ra-data-fakerest";
-import pullAt from "lodash/pullAt";
+import fakeRestProvider from 'ra-data-fakerest';
+import pullAt from 'lodash/pullAt';
 
 /**
  * Respond to react-admin data queries using a local database persisted in localStorage
@@ -27,116 +27,112 @@ import pullAt from "lodash/pullAt";
  *   }
  * });
  */
-export default function localStorageDataProvider (params) {
-  const {
-    defaultData = {},
-    localStorageKey = "ra-data-local-storage",
-    loggingEnabled = false,
-    localStorageUpdateDelay = 10, // milliseconds
-  } = params || {};
-  const localStorageData = localStorage.getItem(localStorageKey);
-  let data = localStorageData ? JSON.parse(localStorageData) : defaultData;
+export default function localStorageDataProvider(params) {
+	const {
+		defaultData = {},
+		localStorageKey = 'ra-data-local-storage',
+		loggingEnabled = false,
+		localStorageUpdateDelay = 10, // milliseconds
+	} = params || {};
+	const localStorageData = localStorage.getItem(localStorageKey);
+	let data = localStorageData ? JSON.parse(localStorageData) : defaultData;
 
-  // change data by executing callback, then persist in localStorage
-  const updateLocalStorage = (callback) => {
-    // modify localStorage after the next tick
-    setTimeout(() => {
-      callback();
-      localStorage.setItem(localStorageKey, JSON.stringify(data));
-      const evt = new Event("storageItemUpdated", {
-        bubbles: true,
-        cancelable: false,
-      });
-      document.dispatchEvent(evt);
-    }, localStorageUpdateDelay);
-  };
+	// change data by executing callback, then persist in localStorage
+	const updateLocalStorage = (callback) => {
+		// modify localStorage after the next tick
+		setTimeout(() => {
+			callback();
+			localStorage.setItem(localStorageKey, JSON.stringify(data));
+			const evt = new Event('storageItemUpdated', {
+				bubbles: true,
+				cancelable: false,
+			});
+			document.dispatchEvent(evt);
+		}, localStorageUpdateDelay);
+	};
 
-  let baseDataProvider = fakeRestProvider(data, loggingEnabled);
+	let baseDataProvider = fakeRestProvider(data, loggingEnabled);
 
-  window?.addEventListener("storage", (event) => {
-    if (event.key === localStorageKey) {
-      const newData = JSON.parse(event.newValue);
-      data = newData;
-      baseDataProvider = fakeRestProvider(newData, loggingEnabled);
-    }
-  });
+	window?.addEventListener('storage', (event) => {
+		if (event.key === localStorageKey) {
+			const newData = JSON.parse(event.newValue);
+			data = newData;
+			baseDataProvider = fakeRestProvider(newData, loggingEnabled);
+		}
+	});
 
-  return {
-    // read methods are just proxies to FakeRest
-    getList: (resource, params) =>
-      baseDataProvider.getList(resource, params).catch((error) => {
-        if (error.code === 1) {
-          // undefined collection error: hide the error and return an empty list instead
-          return { data: [], total: 0 };
-        } else {
-          throw error;
-        }
-      }),
-    getOne: (resource, params) => baseDataProvider.getOne(resource, params),
-    getMany: (resource, params) => baseDataProvider.getMany(resource, params),
-    getManyReference: (resource, params) =>
-      baseDataProvider.getManyReference(resource, params).catch((error) => {
-        if (error.code === 1) {
-          // undefined collection error: hide the error and return an empty list instead
-          return { data: [], total: 0 };
-        } else {
-          throw error;
-        }
-      }),
+	return {
+		// read methods are just proxies to FakeRest
+		getList: (resource, params) =>
+			baseDataProvider.getList(resource, params).catch((error) => {
+				if (error.code === 1) {
+					// undefined collection error: hide the error and return an empty list instead
+					return { data: [], total: 0 };
+				} else {
+					throw error;
+				}
+			}),
+		getOne: (resource, params) => baseDataProvider.getOne(resource, params),
+		getMany: (resource, params) => baseDataProvider.getMany(resource, params),
+		getManyReference: (resource, params) =>
+			baseDataProvider.getManyReference(resource, params).catch((error) => {
+				if (error.code === 1) {
+					// undefined collection error: hide the error and return an empty list instead
+					return { data: [], total: 0 };
+				} else {
+					throw error;
+				}
+			}),
 
-    // update methods need to persist changes in localStorage
-    update: (resource, params) => {
-      updateLocalStorage(() => {
-
-        const index = data[resource].findIndex(item => item.id === params.data.id);
-        data[resource][index] = {
-          ...params.data,
-        };
-
-      });
-      return baseDataProvider.update(resource, params);
-    },
-    updateMany: (resource, params) => {
-      updateLocalStorage(() => {
-        params.ids.forEach((id) => {
-          const index = data[resource]?.findIndex((record) => record.id === id);
-          data[resource][index] = {
-            ...data[resource][index],
-            ...params.data,
-          };
-        });
-      });
-      return baseDataProvider.updateMany(resource, params);
-    },
-    create: (resource, params) => {
-      // we need to call the fakerest provider first to get the generated id
-      return baseDataProvider.create(resource, params).then((response) => {
-        updateLocalStorage(() => {
-          if (!Object.prototype.hasOwnProperty.call(data, resource)) {
-            data[resource] = [];
-          }
-          data[resource].push(response.data);
-        });
-        return response;
-      });
-    },
-    delete: (resource, params) => {
-      updateLocalStorage(() => {
-        const index = data[resource]?.findIndex(
-          (record) => record.id === params.id
-        );
-        pullAt(data[resource], [index]);
-      });
-      return baseDataProvider.delete(resource, params);
-    },
-    deleteMany: (resource, params) => {
-      updateLocalStorage(() => {
-        const indexes = params.ids.map((id) =>
-          data[resource]?.findIndex((record) => record.id === id)
-        );
-        pullAt(data[resource], indexes);
-      });
-      return baseDataProvider.deleteMany(resource, params);
-    },
-  };
-};
+		// update methods need to persist changes in localStorage
+		update: (resource, params) => {
+			updateLocalStorage(() => {
+				const index = data[resource].findIndex((item) => item.id === params.data.id);
+				data[resource][index] = {
+					...params.data,
+				};
+			});
+			return baseDataProvider.update(resource, params);
+		},
+		updateMany: (resource, params) => {
+			updateLocalStorage(() => {
+				params.ids.forEach((id) => {
+					const index = data[resource]?.findIndex((record) => record.id === id);
+					data[resource][index] = {
+						...data[resource][index],
+						...params.data,
+					};
+				});
+			});
+			return baseDataProvider.updateMany(resource, params);
+		},
+		create: (resource, params) => {
+			// we need to call the fakerest provider first to get the generated id
+			return baseDataProvider.create(resource, params).then((response) => {
+				updateLocalStorage(() => {
+					if (!Object.prototype.hasOwnProperty.call(data, resource)) {
+						data[resource] = [];
+					}
+					data[resource].push(response.data);
+				});
+				return response;
+			});
+		},
+		delete: (resource, params) => {
+			updateLocalStorage(() => {
+				const index = data[resource]?.findIndex((record) => record.id === params.id);
+				pullAt(data[resource], [index]);
+			});
+			return baseDataProvider.delete(resource, params);
+		},
+		deleteMany: (resource, params) => {
+			updateLocalStorage(() => {
+				const indexes = params.ids.map((id) =>
+					data[resource]?.findIndex((record) => record.id === id)
+				);
+				pullAt(data[resource], indexes);
+			});
+			return baseDataProvider.deleteMany(resource, params);
+		},
+	};
+}

package/src/decorators/ReactAdminDefaultDecorator.tsx

@@ -3,8 +3,7 @@ import DataContextProvider from '../contexts/DataContext';
 import { MapComponentsProvider, MapLibreMap } from '@mapcomponents/react-maplibre';
 import { Admin, CustomRoutes, defaultLightTheme } from 'react-admin';
 import { dataProvider } from '../contexts/dataProvider';
-import { Route } from "react-router-dom";
-
+import { Route } from 'react-router-dom';
 
 export const ReactAdminDefaultDecorator = (Story: React.ComponentType, context: any) => (
 	<DataContextProvider>

package/src/layout/GisLayout.jsx

@@ -5,7 +5,7 @@ import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import { AppBar, Menu, Sidebar, useSidebarState } from 'react-admin';
 
-const Root = styled('div')(({ theme }) => ({
+const Root = styled('div')(() => ({
 	display: 'flex',
 	flexDirection: 'column',
 	zIndex: 1,
@@ -15,18 +15,18 @@ const Root = styled('div')(({ theme }) => ({
 	pointerEvents: 'none',
 }));
 
-const AppFrame = styled('div')(({ theme }) => ({
+const AppFrame = styled('div')(() => ({
 	display: 'flex',
 	flexDirection: 'column',
 }));
 
-const ContentWithSidebar = styled('main')(({ theme }) => ({
+const ContentWithSidebar = styled('main')(() => ({
 	display: 'flex',
 	flexGrow: 1,
 	marginTop: '3em',
 }));
 
-const Content = styled('div')(({ theme }) => ({
+const Content = styled('div')(() => ({
 	display: 'flex',
 	flexDirection: 'row',
 	justifyContent: 'center',
@@ -40,7 +40,7 @@ const Content = styled('div')(({ theme }) => ({
 	boxShadow: '0px 0px 8px rgba(0,0,0,0.2)',
 }));
 
-const ContentWrapper = styled(Box)(({ theme }) => ({
+const ContentWrapper = styled(Box)(() => ({
 	maxWidth: '600px',
 	width: '100%',
 	height: '100%',
@@ -62,7 +62,7 @@ const GisLayout = ({ children, title }) => {
 						sx={{
 							backgroundColor: '#f0f0f0',
 							pointerEvents: 'all',
-							overflow: 'hidden'
+							overflow: 'hidden',
 						}}
 					>
 						<Menu />
@@ -76,16 +76,10 @@ const GisLayout = ({ children, title }) => {
 							onClick={() => setContentOpen((val) => !val)}
 							sx={{ position: 'absolute', top: 0, zIndex: 100 }}
 						>
-							{contentOpen ? (
-								<KeyboardArrowDownIcon />
-							) : (
-								<KeyboardArrowUpIcon />
-							)}
+							{contentOpen ? <KeyboardArrowDownIcon /> : <KeyboardArrowUpIcon />}
 						</IconButton>
 
-						<ContentWrapper>
-							{children}
-						</ContentWrapper>
+						<ContentWrapper>{children}</ContentWrapper>
 					</Content>
 				</ContentWithSidebar>
 			</AppFrame>
@@ -93,5 +87,4 @@ const GisLayout = ({ children, title }) => {
 	);
 };
 
-
 export default GisLayout;

package/src/ra_components/raGeospatialProps.ts

@@ -1,5 +1,5 @@
 export default {
-  MapLibreMapProps: { options: { zoom: 14 , center: [7.0851268, 50.73884] as [number, number] } },
-  embeddedMap: true,
-  source: "geom",
+	MapLibreMapProps: { options: { zoom: 14, center: [7.0851268, 50.73884] as [number, number] } },
+	embeddedMap: true,
+	source: 'geom',
 };

package/src/ra_components/raGeospatialWebGisProps.ts

@@ -1,5 +1,5 @@
 export default {
-  MapLibreMapProps: { options: { zoom: 14 , center: [7.0851268, 50.73884] as [number, number] } },
-  embeddedMap: false,
-  source: "geom",
+	MapLibreMapProps: { options: { zoom: 14, center: [7.0851268, 50.73884] as [number, number] } },
+	embeddedMap: false,
+	source: 'geom',
 };

package/src/types.d.ts

@@ -1,3 +1,3 @@
 declare module '@turf/helpers';
 declare module '@turf/turf';
-declare module 'wellknown';
+declare module 'wellknown';

package/tsconfig.lib.json

@@ -25,5 +25,5 @@
 		"**/*.stories.jsx",
 		"**/*.stories.tsx"
 	],
-	"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+	"include": ["src/**/*", "../react-maplibre/src/**/*"]
 }

package/vite.config.ts

@@ -8,7 +8,7 @@ import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
 
 export default defineConfig(() => ({
 	root: __dirname,
-	cacheDir: '../../node_modules/.vite/libs/ra-geospatial',
+	cacheDir: '../../node_modules/.vite/packages/ra-geospatial',
 	plugins: [
 		react(),
 		nxViteTsPaths(),
@@ -26,7 +26,7 @@ export default defineConfig(() => ({
 	// Configuration for building your library.
 	// See: https://vitejs.dev/guide/build.html#library-mode
 	build: {
-		outDir: '../../dist/libs/ra-geospatial',
+		outDir: 'dist',
 		emptyOutDir: true,
 		reportCompressedSize: true,
 		commonjsOptions: {
@@ -39,11 +39,20 @@ export default defineConfig(() => ({
 			fileName: 'index',
 			// Change this to the formats you want to support.
 			// Don't forget to update your package.json as well.
-			formats: ['es' as const],
+			formats: ['es' as const, 'cjs' as const],
 		},
+		sourcemap: true,
 		rollupOptions: {
 			// External packages that should not be bundled into your library.
-			external: ['react', 'react-dom', 'react/jsx-runtime'],
+			external: [
+				'react',
+				'react-dom',
+				'd3',
+				'sql.js',
+				/*				...Object.keys(pkg.dependencies),
+				...Object.keys(pkg.devDependencies),*/
+			],
+			input: [path.join(__dirname, 'src/index.ts')],
 		},
 	},
 }));

package/.babelrc

@@ -1,12 +0,0 @@
-{
-	"presets": [
-		[
-			"@nx/react/babel",
-			{
-				"runtime": "automatic",
-				"useBuiltIns": "usage"
-			}
-		]
-	],
-	"plugins": []
-}

package/.storybook/main.ts

@@ -1,19 +0,0 @@
-import type { StorybookConfig } from '@storybook/react-vite';
-
-const config: StorybookConfig = {
-	stories: ['../src/**/*.@(mdx|stories.@(js|jsx|ts|tsx))'],
-	framework: {
-		name: '@storybook/react-vite',
-		options: {
-			builder: {
-				viteConfigPath: 'vite.config.ts',
-			},
-		},
-	},
-};
-
-export default config;
-
-// To customize your Vite configuration you can use the viteFinal field.
-// Check https://storybook.js.org/docs/react/builders/vite#configuration
-// and https://nx.dev/recipes/storybook/custom-builder-configs

package/.storybook/manager.js

@@ -1,6 +0,0 @@
-import { addons } from "@storybook/addons";
-import wheregroupTheme from "./wheregroupTheme";
-
-addons.setConfig({
-  theme: wheregroupTheme,
-});

package/.storybook/preview.ts

@@ -1,27 +0,0 @@
-import './style.css';
-
-export const parameters = {
-	docs: {
-		inlineStories: false,
-	},
-	actions: { argTypesRegex: '^on[A-Z].*' },
-
-};
-
-export const globalTypes = {
-	theme: {
-		name: 'Theme',
-		title: 'Theme',
-		description: 'Theme for your components',
-		defaultValue: 'light',
-		toolbar: {
-			icon: 'paintbrush',
-			dynamicTitle: true,
-			items: [
-				{ value: 'light', left: '☀️', title: 'Light mode' },
-				{ value: 'dark', left: '🌙', title: 'Dark mode' },
-			],
-		},
-	},
-};
-export const tags = ['autodocs'];

package/.storybook/style.css

@@ -1,20 +0,0 @@
-.docs-story > div:first-child{
-  z-index:0;
-}
-
-.docs-story > div > div:first-child, .innerZoomElementWrapper, .innerZoomElementWrapper > div:first-child, .innerZoomElementWrapper > div:first-child > div:first-child{
-
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-
-.docs-story > div > div:first-child{
-  height: initial;
-}
-
-.innerZoomElementWrapper > div > div > div:first-child{
-  height: 100% !important;
-}

package/.storybook/wheregroupTheme.js

@@ -1,9 +0,0 @@
-import { create } from 'storybook/theming';
-import logo from './mapcomponents_logo.png';
-
-export default create({
-	base: 'light',
-	brandTitle: 'WhereGroup GmbH',
-	brandUrl: 'https://wheregroup.com',
-	brandImage: logo,
-});

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-	"include": [],
-	"references": [
-		{
-			"path": "./tsconfig.lib.json"
-		}
-	],
-	"extends": "../../tsconfig.base.json"
-}