diff --git a/src/lib/helpers/arrayComparison.ts b/src/lib/helpers/arrayComparison.ts new file mode 100644 index 000000000..1f17d9b22 --- /dev/null +++ b/src/lib/helpers/arrayComparison.ts @@ -0,0 +1,10 @@ +export function intersection(arr1: any[], arr2: any[]) { + const set = new Set(arr2); + const intersection = new Set(arr1.filter((elem) => set.has(elem))); + return Array.from(intersection); +} +export function difference(arr1: any[], arr2: any[]) { + const set = new Set(arr2); + const intersection = new Set(arr1.filter((elem) => !set.has(elem))); + return Array.from(intersection); +} diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte index 6dfa8e3bd..2911112aa 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte @@ -8,6 +8,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import Document from './_document.svelte'; import Delete from './_delete.svelte'; + import { difference } from '$lib/helpers/arrayComparison'; let showDelete = false; let read = $doc?.$read; @@ -39,15 +40,9 @@ } $: if (read || write) { - if (read) { - if (JSON.stringify(read) !== JSON.stringify($doc.$read)) { - arePermsDisabled = false; - } else arePermsDisabled = true; - } else if (write) { - if (JSON.stringify(write) !== JSON.stringify($doc.$write)) { - arePermsDisabled = false; - } else arePermsDisabled = true; - } + if (difference(read, $doc.$read).length || difference(write, $doc.$write).length) { + arePermsDisabled = false; + } else arePermsDisabled = true; } diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte index 4560fb248..6ae378d85 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte @@ -9,6 +9,7 @@ import Delete from './_delete.svelte'; import { onMount } from 'svelte'; import { page } from '$app/stores'; + import { difference } from '$lib/helpers/arrayComparison'; let showDelete = false; let showError: false | 'name' | 'size' = false, @@ -34,12 +35,11 @@ $: if (collectionPermissions || collectionRead || collectionWrite) { if (collectionPermissions !== $collection.permission) { arePermsDisabled = false; - } else if (collectionRead) { - if (JSON.stringify(collectionRead) !== JSON.stringify($collection.$read)) { - arePermsDisabled = false; - } else arePermsDisabled = true; - } else if (collectionWrite) { - if (JSON.stringify(collectionWrite) !== JSON.stringify($collection.$write)) { + } else if (collectionRead || collectionWrite) { + if ( + difference(collectionRead, $collection.$read).length || + difference(collectionWrite, $collection.$write).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; }