From 215c7db3d760d55291b9ecaceb5b630570ddd198 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 12:08:03 +0100 Subject: [PATCH 1/9] 3.0.6 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 411019d0..9e3b1e96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.5", + "version": "3.0.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.5", + "version": "3.0.6", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 42112809..4940bc89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.5", + "version": "3.0.6", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage:": "https://utopia-os.org/", From 3128181476df1c10811dc6c3764427e924c25547 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 14:45:09 +0100 Subject: [PATCH 2/9] fix-the-permission-fix --- src/Components/Map/hooks/usePermissions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx index 2f94b7b0..d7dfcde2 100644 --- a/src/Components/Map/hooks/usePermissions.tsx +++ b/src/Components/Map/hooks/usePermissions.tsx @@ -119,7 +119,7 @@ function usePermissionsManager(initialPermissions: Permission[]): { ( !item || evaluatePermissions(p.permissions) )) || - (p.policy === "$t:public_label" && + (p.policy.name === "$t:public_label" && ( (layer?.public_edit_items || item?.layer?.public_edit_items) && (!item || evaluatePermissions(p.permissions)) From 39e9b88edc3d9bcdbb96858418437a45445656c0 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 14:45:47 +0100 Subject: [PATCH 3/9] 3.0.7 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e3b1e96..9c97d08d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.6", + "version": "3.0.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.6", + "version": "3.0.7", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 4940bc89..d30439c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.6", + "version": "3.0.7", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage:": "https://utopia-os.org/", From 31845b48413a9f733a55fdb394165a0d5465e78e Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 14:56:07 +0100 Subject: [PATCH 4/9] fix logging issue --- src/Components/Map/hooks/usePermissions.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx index d7dfcde2..d5a08960 100644 --- a/src/Components/Map/hooks/usePermissions.tsx +++ b/src/Components/Map/hooks/usePermissions.tsx @@ -78,7 +78,7 @@ function usePermissionsManager(initialPermissions: Permission[]): { console.log(layer?.name); console.log(user?.role.name); console.log(action); - console.log(permissions.filter(p => p.policy.name === user?.role.name || (p.policy.name === "$t:public_label" && !user))); + console.log(permissions.filter(p => (user && p.policy?.name === user?.role?.name) || (p.policy?.name === "$t:public_label" && !user))); @@ -115,11 +115,11 @@ function usePermissionsManager(initialPermissions: Permission[]): { p.collection === collectionName && ( - (p.policy.name === user?.role.name && + (p.policy?.name === user?.role.name && ( !item || evaluatePermissions(p.permissions) )) || - (p.policy.name === "$t:public_label" && + (p.policy?.name === "$t:public_label" && ( (layer?.public_edit_items || item?.layer?.public_edit_items) && (!item || evaluatePermissions(p.permissions)) From e2d6e515d936811a05dd439ab208ccdc0c6d477a Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 14:56:51 +0100 Subject: [PATCH 5/9] 3.0.8 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c97d08d..747c5294 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.7", + "version": "3.0.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.7", + "version": "3.0.8", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index d30439c5..0bc7270c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.7", + "version": "3.0.8", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage:": "https://utopia-os.org/", From 5339d3fa189a4c9aa0453468136697d753002c4f Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 15:05:08 +0100 Subject: [PATCH 6/9] fix logging issue --- src/Components/Map/hooks/usePermissions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx index d5a08960..92a8c8e1 100644 --- a/src/Components/Map/hooks/usePermissions.tsx +++ b/src/Components/Map/hooks/usePermissions.tsx @@ -78,7 +78,7 @@ function usePermissionsManager(initialPermissions: Permission[]): { console.log(layer?.name); console.log(user?.role.name); console.log(action); - console.log(permissions.filter(p => (user && p.policy?.name === user?.role?.name) || (p.policy?.name === "$t:public_label" && !user))); + console.log(permissions.filter(p => user ? (p.policy?.name === user?.role?.name) : (p.policy?.name === "$t:public_label" && !user))); From 046ae052f398cd62b4d9a6c85ffb6803d5a15827 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Thu, 31 Oct 2024 15:05:22 +0100 Subject: [PATCH 7/9] 3.0.9 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 747c5294..0cb9d48e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.8", + "version": "3.0.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.8", + "version": "3.0.9", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index 0bc7270c..ed00fb49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.8", + "version": "3.0.9", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage:": "https://utopia-os.org/", From 9757304a3bf20d358d990d172074d27173803889 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Fri, 1 Nov 2024 08:20:45 +0100 Subject: [PATCH 8/9] remoeved logging --- src/Components/Map/hooks/usePermissions.tsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx index 92a8c8e1..bb1a5199 100644 --- a/src/Components/Map/hooks/usePermissions.tsx +++ b/src/Components/Map/hooks/usePermissions.tsx @@ -75,15 +75,6 @@ function usePermissionsManager(initialPermissions: Permission[]): { layer?: LayerProps ) => { - console.log(layer?.name); - console.log(user?.role.name); - console.log(action); - console.log(permissions.filter(p => user ? (p.policy?.name === user?.role?.name) : (p.policy?.name === "$t:public_label" && !user))); - - - - - const evaluateCondition = (condition: any) => { if (condition.user_created?._eq === "$CURRENT_USER") { return item?.user_created?.id === user?.id; From 599ab6ebc05cbafefe1c91559b29b9d0dbb23e57 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Fri, 1 Nov 2024 08:20:55 +0100 Subject: [PATCH 9/9] 3.0.10 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0cb9d48e..a76f35eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "utopia-ui", - "version": "3.0.9", + "version": "3.0.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "utopia-ui", - "version": "3.0.9", + "version": "3.0.10", "license": "MIT", "dependencies": { "@heroicons/react": "^2.0.17", diff --git a/package.json b/package.json index ed00fb49..cbab64a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utopia-ui", - "version": "3.0.9", + "version": "3.0.10", "description": "Reuseable React Components to build mapping apps for real life communities and networks", "repository": "https://github.com/utopia-os/utopia-ui", "homepage:": "https://utopia-os.org/",