From c4b73a8fd0a790fbd5844179e06550f39075d11f Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Fri, 6 May 2022 00:55:08 +0700
Subject: [PATCH] Fix UI for adding attributes (#1660)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 plugins/view-assets/lang/en.json              |   2 +-
 plugins/view-assets/lang/ru.json              |   2 +-
 .../src/components/ClassAttributeBar.svelte   |   2 +-
 .../src/components/CreateAttribute.svelte     | 107 ++++++++----------
 .../typeEditors/DateTypeEditor.svelte         |  16 +--
 5 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/plugins/view-assets/lang/en.json b/plugins/view-assets/lang/en.json
index 51006077ba..5f66ef05d5 100644
--- a/plugins/view-assets/lang/en.json
+++ b/plugins/view-assets/lang/en.json
@@ -36,6 +36,6 @@
     "Type": "Type",
     "WithTime": "WithTime",
     "CreatingAttribute": "Creating an attribute",
-    "CreatingAttributeConfirm": "Do you want to create an attribute? It will not be possible to change or delete it."
+    "CreatingAttributeConfirm": "Warning: It will not be possible for now to change or delete created attribute."
   }
 }
diff --git a/plugins/view-assets/lang/ru.json b/plugins/view-assets/lang/ru.json
index ed792a2bf0..772bc57d67 100644
--- a/plugins/view-assets/lang/ru.json
+++ b/plugins/view-assets/lang/ru.json
@@ -24,7 +24,7 @@
     "Type": "Тип",
     "WithTime": "Со временем",
     "CreatingAttribute": "Создание атрибута",
-    "CreatingAttributeConfirm": "Вы хотите создать атрибут? Изменить или удалить его будет невозможно",
+    "CreatingAttributeConfirm": "Предупреждение: Изменить или удалить аттрибут в текущей версии невозможно.",
     "MoveLeft": "Переместить влево",
     "MoveRight": "Переместить вправо",
     "MoveUp": "Переместить вверх",
diff --git a/plugins/view-resources/src/components/ClassAttributeBar.svelte b/plugins/view-resources/src/components/ClassAttributeBar.svelte
index 34ef29e48c..bf5ccd4abd 100644
--- a/plugins/view-resources/src/components/ClassAttributeBar.svelte
+++ b/plugins/view-resources/src/components/ClassAttributeBar.svelte
@@ -48,7 +48,7 @@
       icon={IconAdd}
       size="small"
       action={() => {
-        showPopup(view.component.CreateAttribute, { _class: objectClass._id }, undefined, () => {
+        showPopup(view.component.CreateAttribute, { _class: objectClass._id }, 'top', () => {
           updateKeys(ignoreKeys)
           dispatch('update')
         })
diff --git a/plugins/view-resources/src/components/CreateAttribute.svelte b/plugins/view-resources/src/components/CreateAttribute.svelte
index 198f4f9378..2ca408702d 100644
--- a/plugins/view-resources/src/components/CreateAttribute.svelte
+++ b/plugins/view-resources/src/components/CreateAttribute.svelte
@@ -14,12 +14,12 @@
 -->
 <script lang="ts">
   import core, { AnyAttribute, Class, Data, generateId, IndexKind, PropertyType, Ref, Space, Type } from '@anticrm/core'
-  import presentation, { getClient, MessageBox } from '@anticrm/presentation'
-  import { AnyComponent, EditBox, DropdownLabelsIntl, Label, Component, Button, showPopup } from '@anticrm/ui'
+  import { getEmbeddedLabel } from '@anticrm/platform'
+  import { Card, getClient } from '@anticrm/presentation'
+  import { AnyComponent, Component, DropdownLabelsIntl, EditBox, Label } from '@anticrm/ui'
   import { DropdownIntlItem } from '@anticrm/ui/src/types'
   import { createEventDispatcher } from 'svelte'
   import view from '../plugin'
-  import { getEmbeddedLabel } from '@anticrm/platform'
 
   export let _class: Ref<Class<Space>>
   let name: string
@@ -32,30 +32,19 @@
 
   async function save (): Promise<void> {
     if (type === undefined) return
-    showPopup(
-      MessageBox,
-      {
-        label: view.string.CreatingAttribute,
-        message: view.string.CreatingAttributeConfirm
-      },
-      undefined,
-      async (result) => {
-        if (result && type !== undefined) {
-          const data: Data<AnyAttribute> = {
-            attributeOf: _class,
-            name: name + generateId(),
-            label: getEmbeddedLabel(name),
-            isCustom: true,
-            type
-          }
-          if (index !== undefined) {
-            data.index = index
-          }
-          await client.createDoc(core.class.Attribute, core.space.Model, data)
-          dispatch('close')
-        }
-      }
-    )
+
+    const data: Data<AnyAttribute> = {
+      attributeOf: _class,
+      name: name + generateId(),
+      label: getEmbeddedLabel(name),
+      isCustom: true,
+      type
+    }
+    if (index !== undefined) {
+      data.index = index
+    }
+    await client.createDoc(core.class.Attribute, core.space.Model, data)
+    dispatch('close')
   }
 
   function getTypes (): DropdownIntlItem[] {
@@ -87,38 +76,42 @@
   }
 </script>
 
-<div class="antiPopup w-60 p-4 flex-col">
+<Card
+  label={view.string.CreatingAttribute}
+  okAction={save}
+  canSave={!(type === undefined || name === undefined || name.trim().length === 0)}
+  on:close={() => {
+    dispatch('close')
+  }}
+>
   <div class="mb-2"><EditBox bind:value={name} placeholder={core.string.Name} maxWidth="13rem" /></div>
-  <div class="flex-between mb-2">
-    <Label label={view.string.Type} />
-    <DropdownLabelsIntl
-      label={view.string.Type}
-      {items}
-      width="8rem"
-      bind:selected={selectedType}
-      on:selected={(e) => selectType(e.detail)}
-    />
+  <div class="flex-col mb-2">
+    <div class="flex-row-center flex-grow">
+      <Label label={view.string.Type} />
+      <div class="ml-4">
+        <DropdownLabelsIntl
+          label={view.string.Type}
+          {items}
+          width="8rem"
+          bind:selected={selectedType}
+          on:selected={(e) => selectType(e.detail)}
+        />
+      </div>
+    </div>
+    {#if is}
+      <div class="flex mt-4">
+        <Component
+          {is}
+          on:change={(e) => {
+            type = e.detail?.type
+            index = e.detail?.index
+          }}
+        />
+      </div>
+    {/if}
+    <Label label={view.string.CreatingAttributeConfirm} />
   </div>
-  {#if is}
-    <Component
-      {is}
-      on:change={(e) => {
-        type = e.detail?.type
-        index = e.detail?.index
-      }}
-    />
-  {/if}
-  <div class="mt-2">
-    <Button
-      width="100%"
-      disabled={type === undefined || name === undefined || name.trim().length === 0}
-      label={presentation.string.Create}
-      on:click={() => {
-        save()
-      }}
-    />
-  </div>
-</div>
+</Card>
 
 <style lang="scss">
 </style>
diff --git a/plugins/view-resources/src/components/typeEditors/DateTypeEditor.svelte b/plugins/view-resources/src/components/typeEditors/DateTypeEditor.svelte
index 7b8f59c936..94ca6f9624 100644
--- a/plugins/view-resources/src/components/typeEditors/DateTypeEditor.svelte
+++ b/plugins/view-resources/src/components/typeEditors/DateTypeEditor.svelte
@@ -28,12 +28,14 @@
   })
 </script>
 
-<div class="flex-between">
+<div class="flex-row-center">
   <Label label={view.string.WithTime} />
-  <BooleanEditor
-    bind:value={withTime}
-    onChange={(e) => {
-      dispatch('change', TypeDate(e))
-    }}
-  />
+  <div class="ml-2">
+    <BooleanEditor
+      bind:value={withTime}
+      onChange={(e) => {
+        dispatch('change', TypeDate(e))
+      }}
+    />
+  </div>
 </div>