Merge pull request #503 from appwrite/fix-user-labels-design-corrections

Update user labels based on design review
appwrite · Aug 21, 2023 · edabdfd · edabdfd
2 parents cf13a8c + 8cea7d9
commit edabdfd
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/src/lib/components/code.svelte b/src/lib/components/code.svelte
@@ -108,7 +108,7 @@
     :not(pre) > code[class*='language-'],
     pre[class*='language-'] {
         background: hsl(var(--p-box-background-color));
-        padding: 0;
+        padding-block-start: 4%;
         margin: 0;
     }
     .prism-token {

diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte
@@ -86,12 +86,8 @@
                 <InputTags
                     id="user-labels"
                     label="Labels"
-                    placeholder="Select or tyype user labels"
+                    placeholder="Select or type user labels"
                     bind:tags={labels} />
-                <li>
-                    <Helper type={error ? 'warning' : 'neutral'}
-                        >{error ? error : 'Only alphanumeric characters are allowed'}</Helper>
-                </li>
                 <li class="u-flex u-gap-12 u-margin-block-start-8">
                     {#each suggestedLabels as suggestedLabel}
                         <Pill
@@ -109,6 +105,10 @@
                         </Pill>
                     {/each}
                 </li>
+                <li>
+                    <Helper type={error ? 'warning' : 'neutral'}
+                        >{error ? error : 'Only alphanumeric characters are allowed'}</Helper>
+                </li>
             </ul>
         </svelte:fragment>
 

diff --git a/...tabases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte b/...tabases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
@@ -13,31 +13,38 @@
     import { collection, type Attributes } from '../../store';
     import { Container } from '$lib/layout';
     import AttributeItem from '../attributeItem.svelte';
-    import { difference, symmetricDifference } from '$lib/helpers/array';
+    import { symmetricDifference } from '$lib/helpers/array';
     import { isRelationship, isRelationshipToMany } from '../attributes/store';
+    import { deepClone } from '$lib/helpers/object';
 
     const databaseId = $page.params.database;
     const collectionId = $page.params.collection;
     const documentId = $page.params.document;
     const editing = true;
 
-    const work = writable(
-        Object.keys($doc)
-            .filter((key) => {
-                return ![
-                    '$id',
-                    '$collection',
-                    '$collectionId',
-                    '$databaseId',
-                    '$createdAt',
-                    '$updatedAt'
-                ].includes(key);
-            })
-            .reduce((obj, key) => {
-                obj[key] = $doc[key];
-                return obj;
-            }, {}) as Models.Document
-    );
+    function initWork() {
+        const prohibitedKeys = [
+            '$id',
+            '$collection',
+            '$collectionId',
+            '$databaseId',
+            '$createdAt',
+            '$updatedAt'
+        ];
+
+        const filteredKeys = Object.keys($doc).filter((key) => {
+            return !prohibitedKeys.includes(key);
+        });
+
+        const result = filteredKeys.reduce((obj, key) => {
+            obj[key] = $doc[key];
+            return obj;
+        }, {});
+
+        return writable(deepClone(result as Models.Document));
+    }
+
+    const work = initWork();
 
     async function updateData() {
         try {
@@ -77,7 +84,7 @@
         const docAttribute = $doc?.[attribute.key];
 
         if (attribute.array) {
-            return !difference(Array.from(workAttribute), Array.from(docAttribute)).length;
+            return !symmetricDifference(Array.from(workAttribute), Array.from(docAttribute)).length;
         }
 
         if (isRelationship(attribute)) {