From f8c494548e36aa926a51c308858b8725f9128fbe Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Fri, 8 Nov 2024 22:08:27 +0100 Subject: [PATCH] updated to utopia-ui@3.0.19 --- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- src/App.tsx | 9 ++++----- src/api/layersApi.ts | 2 +- src/pages/MapContainer.tsx | 20 ++++++++++++++------ 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5bb61b54..14fd8aae 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.10" + "utopia-ui": "^3.0.19" }, "devDependencies": { "@types/react": "^18.2.79", @@ -1969,20 +1969,20 @@ } }, "node_modules/@tanstack/query-core": { - "version": "5.59.16", - "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.16.tgz", - "integrity": "sha512-crHn+G3ltqb5JG0oUv6q+PMz1m1YkjpASrXTU+sYWW9pLk0t2GybUHNRqYPZWhxgjPaVGC4yp92gSFEJgYEsPw==", + "version": "5.59.20", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.20.tgz", + "integrity": "sha512-e8vw0lf7KwfGe1if4uPFhvZRWULqHjFcz3K8AebtieXvnMOz5FSzlZe3mTLlPuUBcydCnBRqYs2YJ5ys68wwLg==", "funding": { "type": "github", "url": "https://github.com/sponsors/tannerlinsley" } }, "node_modules/@tanstack/react-query": { - "version": "5.59.16", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.16.tgz", - "integrity": "sha512-MuyWheG47h6ERd4PKQ6V8gDyBu3ThNG22e1fRVwvq6ap3EqsFhyuxCAwhNP/03m/mLg+DAb0upgbPaX6VB+CkQ==", + "version": "5.59.20", + "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.20.tgz", + "integrity": "sha512-Zly0egsK0tFdfSbh5/mapSa+Zfc3Et0Zkar7Wo5sQkFzWyB3p3uZWOHR2wrlAEEV2L953eLuDBtbgFvMYiLvUw==", "dependencies": { - "@tanstack/query-core": "5.59.16" + "@tanstack/query-core": "5.59.20" }, "funding": { "type": "github", @@ -4835,9 +4835,9 @@ } }, "node_modules/mdast-util-to-markdown": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.1.tgz", - "integrity": "sha512-OrkcCoqAkEg9b1ykXBrA0ehRc8H4fGU/03cACmW2xXzau1+dIdS+qJugh1Cqex3hMumSBgSE/5pc7uqP12nLAw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz", + "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==", "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", @@ -7203,9 +7203,9 @@ "license": "MIT" }, "node_modules/utopia-ui": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.10.tgz", - "integrity": "sha512-xrutPzz/xVSmUoGOtOJ9vLQ+UoCXdrVloVI6v+qZNU2gBfJvAOouUWi6qY3J/yXU2b6cEFVLNJLEE2L3LAg0Sg==", + "version": "3.0.19", + "resolved": "https://registry.npmjs.org/utopia-ui/-/utopia-ui-3.0.19.tgz", + "integrity": "sha512-3MKWg36129nuL7rxCUSofx1p4KKQZjbOT6EbdVcy/VlAE9N6Sdc7xpvBathhI4PHiusiV3Xpm64zgBZwAQczoA==", "dependencies": { "@heroicons/react": "^2.0.17", "@tanstack/react-query": "^5.17.8", diff --git a/package.json b/package.json index 852aeafd..55976e4c 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.10" + "utopia-ui": "^3.0.19" }, "devDependencies": { "@types/react": "^18.2.79", diff --git a/src/App.tsx b/src/App.tsx index 536a2db0..b3acbac8 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -29,7 +29,6 @@ function App() { const [layerPageRoutes, setLayerPageRoutes] = useState(); const [loading, setLoading] = useState(true); - useEffect(() => { setPermissionsApiInstance(new permissionsApi()); setMapApiInstance(new mapApi(window.location.origin)); @@ -103,15 +102,15 @@ function App() { }> } /> } /> - } /> + } /> } /> - } /> - } /> + } /> + } /> } /> } /> } /> } /> - } /> + } /> } /> { layers.map((l: any) => diff --git a/src/api/layersApi.ts b/src/api/layersApi.ts index 70f9c980..60315f39 100644 --- a/src/api/layersApi.ts +++ b/src/api/layersApi.ts @@ -12,7 +12,7 @@ export class layersApi { async getItems() { try { - const layers = await directusClient.request(readItems("layers" as any, { fields: ['*', {itemType : ['*']}], filter: { "maps": { "maps_id": { "id": { "_eq": this.mapId } } } }, limit: 500 })); + const layers = await directusClient.request(readItems("layers" as any, { fields: ['*', {itemType : ['*.*', {profileTemplate: ['*', 'item.*.*.*'] }]} as any], filter: { "maps": { "maps_id": { "id": { "_eq": this.mapId } } } }, limit: 500 })); return layers; } catch (error: any) { console.log(error); diff --git a/src/pages/MapContainer.tsx b/src/pages/MapContainer.tsx index 79b3ebaa..f21e3022 100644 --- a/src/pages/MapContainer.tsx +++ b/src/pages/MapContainer.tsx @@ -21,12 +21,20 @@ function MapContainer({ layers, map }: { layers: Array, map: any }) layers.map((layer: LayerProps) => { apis && setApis(current => [...current, { id: layer.id!, api: new itemsApi('items', layer.id, undefined, { - ...(layer.itemType.name == "event" && { - "end": { - "_gt": etartOfDayISO + "_or": [ + { + "end": { + "_gt": etartOfDayISO + } + }, + { + "end": { + "_null": true + } } - }) - }) + ] + } + ) }]) }) }, [layers]) @@ -89,7 +97,7 @@ function MapContainer({ layers, map }: { layers: Array, map: any }) {layer.itemType.show_name_input && } {layer.itemType.show_start_end_input && } - {layer.itemType.show_text_input && } + {layer.itemType.show_text_input &&
} {//layer.public_edit_items && } {layer.itemType.custom_text &&