From dd29f971d7151ac0fa5dbd675a0e81b72e66ba57 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 11 Jul 2024 13:59:11 +0200 Subject: [PATCH] utopia ui alpha 187 --- package-lock.json | 35 ++++++++++++++++++----------------- package.json | 2 +- src/App.tsx | 2 +- src/pages/MapContainer.tsx | 4 +++- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 203e7d25..d43cc631 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "react-dom": "^18.2.0", "react-rnd": "^10.4.1", "react-router-dom": "^6.23.0", - "utopia-ui": "^3.0.0-alpha.178" + "utopia-ui": "^3.0.0-alpha.187" }, "devDependencies": { "@types/react": "^18.2.79", @@ -1969,20 +1969,20 @@ } }, "node_modules/@tanstack/query-core": { - "version": "5.45.0", - "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.45.0.tgz", - "integrity": "sha512-RVfIZQmFUTdjhSAAblvueimfngYyfN6HlwaJUPK71PKd7yi43Vs1S/rdimmZedPWX/WGppcq/U1HOj7O7FwYxw==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.51.1.tgz", + "integrity": "sha512-fJBMQMpo8/KSsWW5ratJR5+IFr7YNJ3K2kfP9l5XObYHsgfVy1w3FJUWU4FT2fj7+JMaEg33zOcNDBo0LMwHnw==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" } }, "node_modules/@tanstack/react-query": { - "version": "5.45.1", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.45.1.tgz", - "integrity": "sha512-mYYfJujKg2kxmkRRjA6nn4YKG3ITsKuH22f1kteJ5IuVQqgKUgbaSQfYwVP0gBS05mhwxO03HVpD0t7BMN7WOA==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.51.1.tgz", + "integrity": "sha512-s47HKFnQ4HOJAHoIiXcpna/roMMPZJPy6fJ6p4ZNVn8+/onlLBEDd1+xc8OnDuwgvecqkZD7Z2mnSRbcWefrKw==", "dependencies": { - "@tanstack/query-core": "5.45.0" + "@tanstack/query-core": "5.51.1" }, "funding": { "type": "github", @@ -2646,7 +2646,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001540", + "version": "1.0.30001640", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz", + "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==", "dev": true, "funding": [ { @@ -2661,8 +2663,7 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ], - "license": "CC-BY-4.0" + ] }, "node_modules/ccount": { "version": "2.0.1", @@ -7086,9 +7087,9 @@ } }, "node_modules/unified": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz", - "integrity": "sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==", + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz", + "integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==", "dependencies": { "@types/unist": "^3.0.0", "bail": "^2.0.0", @@ -7249,9 +7250,9 @@ "license": "MIT" }, "node_modules/utopia-ui": { - "version": "3.0.0-alpha.178", - "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.0-alpha.178.tgz", - "integrity": "sha512-Xn4ESlLiarr9vEUVdgY+G6DyaeKYbcygDo6bicYQBg59qhRVJrU1GQnsUOogNgKZAVTzAtuWULL+rtUnBlzwkQ==", + "version": "3.0.0-alpha.187", + "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.0-alpha.187.tgz", + "integrity": "sha512-LTVapROcVO/RaHnPMzPYWdW/xo4qEfikeBAGBv6/HLH30Oh/C4GnBdAn/raXA8hOzWyhSEzA+gfp+QjdjpY6lA==", "dependencies": { "@heroicons/react": "^2.0.17", "@tanstack/react-query": "^5.17.8", diff --git a/package.json b/package.json index bec4791c..c1cea1d2 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "react-dom": "^18.2.0", "react-rnd": "^10.4.1", "react-router-dom": "^6.23.0", - "utopia-ui": "^3.0.0-alpha.178" + "utopia-ui": "^3.0.0-alpha.187" }, "devDependencies": { "@types/react": "^18.2.79", diff --git a/src/App.tsx b/src/App.tsx index c2f6c2e6..907707f8 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -53,7 +53,7 @@ function App() { const getLayers = async () => { const layers = await layersApiInstance?.getItems(); layers && setLayers(layers); - setLayerPageRoutes(layers?.map((l: any) => ({ + setLayerPageRoutes(layers?.filter((l: any) => l.listed).map((l: any) => ({ path: '/' + l.name, // url icon: , name: l.name, // name that appear in Sidebar diff --git a/src/pages/MapContainer.tsx b/src/pages/MapContainer.tsx index c2c86394..77c8334e 100644 --- a/src/pages/MapContainer.tsx +++ b/src/pages/MapContainer.tsx @@ -37,7 +37,7 @@ function MapContainer({ layers, map }: { layers: Array, map: any }) return ( - + {layers && apis && layers.map(layer => , map: any }) markerShape={layer.markerShape} onlyOnePerOwner={layer.onlyOnePerOwner} markerDefaultColor={layer.menuColor} + markerDefaultColor2={layer.markerDefaultColor2} itemType={layer.itemType} itemNameField='name' itemTextField='text' @@ -62,6 +63,7 @@ function MapContainer({ layers, map }: { layers: Array, map: any }) customEditLink='/edit-item' customEditParameter='id' public_edit_items={layer.public_edit_items} + listed={layer.listed} api={apis?.find(api => api.id === layer.id)?.api}> {layer.itemType.show_start_end &&