From 9fd24cdcfd2db2b6e27a1e834a6c36b5e0c5425b Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 30 May 2023 15:04:10 +0500
Subject: [PATCH 1/3] UBER-278: add Yes-No to popup, refactor

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 .../components/DeleteConfirmationPopup.svelte | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte b/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
index c2fecefc38..659b3c13ce 100644
--- a/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
+++ b/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
@@ -13,40 +13,41 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Card, createQuery } from '@hcengineering/presentation'
-  import { AccountRole, Doc, getCurrentAccount, Ref, SortingOrder } from '@hcengineering/core'
+  import { Card } from '@hcengineering/presentation'
+  import { AccountRole, Doc, getCurrentAccount, Ref } from '@hcengineering/core'
   import view from '@hcengineering/view-resources/src/plugin'
   import { createEventDispatcher } from 'svelte'
-  import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
-  import EmployeePresenter from './EmployeePresenter.svelte'
+  import { EmployeeAccount } from '@hcengineering/contact'
   import { employeeAccountByIdStore } from '../utils'
-  import ui, { Label } from '@hcengineering/ui'
+  import ui, { Button, Label } from '@hcengineering/ui'
+  import EmployeeAccountRefPresenter from './EmployeeAccountRefPresenter.svelte'
 
   export let object: Doc | Doc[]
   export let deleteAction: () => void
   const objectArray = Array.isArray(object) ? object : [object]
-  let owners: Ref<Employee>[] = []
-  const query = createQuery()
-  query.query(
-    contact.class.EmployeeAccount,
-    { role: AccountRole.Owner },
-    (res) => {
-      owners = res.map((account) => account.employee)
-    },
-    {
-      sort: { name: SortingOrder.Descending }
-    }
+  const owners: EmployeeAccount[] = Array.from($employeeAccountByIdStore.values()).filter(
+    (acc) => acc.role === AccountRole.Owner
   )
   const dispatch = createEventDispatcher()
-  const creators = [
-    ...new Set(objectArray.map((obj) => $employeeAccountByIdStore.get(obj.createdBy as Ref<EmployeeAccount>)?.employee))
-  ]
-  const me = $employeeAccountByIdStore.get(getCurrentAccount()._id as Ref<EmployeeAccount>)?.employee
-  const canDelete = (creators.length === 1 && creators.includes(me)) || (me && owners.includes(me))
-  const label = canDelete ? view.string.DeleteObject : view.string.DeletePopupNoPermissionTitle
+  $: creators = [...new Set(objectArray.map((obj) => obj.createdBy as Ref<EmployeeAccount>))]
+  $: canDelete =
+    (creators.length === 1 && creators.includes(getCurrentAccount()._id as Ref<EmployeeAccount>)) ||
+    getCurrentAccount().role === AccountRole.Owner
+  $: label = canDelete ? view.string.DeleteObject : view.string.DeletePopupNoPermissionTitle
 </script>
 
-<Card {label} okAction={deleteAction} canSave={canDelete} okLabel={ui.string.Ok} on:close={() => dispatch('close')}>
+<Card
+  {label}
+  okAction={deleteAction}
+  canSave={canDelete}
+  okLabel={canDelete ? view.string.LabelYes : ui.string.Ok}
+  on:close={() => dispatch('close')}
+>
+  <svelte:fragment slot="buttons">
+    {#if canDelete}
+      <Button label={view.string.LabelNo} on:click={() => dispatch('close')} />
+    {/if}
+  </svelte:fragment>
   <div class="flex-grow flex-col">
     {#if canDelete}
       <div class="mb-2">
@@ -58,17 +59,17 @@
       </div>
       <div class="mb-2">
         <Label label={view.string.DeletePopupCreatorLabel} />
-        {#each creators as employee}
+        {#each creators as account}
           <div class="my-2">
-            <EmployeePresenter value={employee} />
+            <EmployeeAccountRefPresenter value={account} />
           </div>
         {/each}
       </div>
       <div class="mb-2">
         <Label label={view.string.DeletePopupOwnerLabel} />
-        {#each owners as employee}
+        {#each owners as owner}
           <div class="my-2">
-            <EmployeePresenter value={employee} />
+            <EmployeeAccountRefPresenter value={owner._id} />
           </div>
         {/each}
       </div>

From 18ed237ee37892703d43fc1ca57257c11fb5923e Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 30 May 2023 15:10:33 +0500
Subject: [PATCH 2/3] UBER-278: change presenter

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 .../src/components/DeleteConfirmationPopup.svelte              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte b/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
index 659b3c13ce..23add26eca 100644
--- a/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
+++ b/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
@@ -21,6 +21,7 @@
   import { employeeAccountByIdStore } from '../utils'
   import ui, { Button, Label } from '@hcengineering/ui'
   import EmployeeAccountRefPresenter from './EmployeeAccountRefPresenter.svelte'
+  import EmployeeAccountPresenter from './EmployeeAccountPresenter.svelte'
 
   export let object: Doc | Doc[]
   export let deleteAction: () => void
@@ -69,7 +70,7 @@
         <Label label={view.string.DeletePopupOwnerLabel} />
         {#each owners as owner}
           <div class="my-2">
-            <EmployeeAccountRefPresenter value={owner._id} />
+            <EmployeeAccountPresenter value={owner} />
           </div>
         {/each}
       </div>

From 567d38c9ac94df8182fe81ab83294a035523f874 Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Tue, 30 May 2023 16:24:46 +0500
Subject: [PATCH 3/3] UBER-278: fix uitest

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 tests/sanity/tests/contacts.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/sanity/tests/contacts.spec.ts b/tests/sanity/tests/contacts.spec.ts
index 5e22580128..74966c63a7 100644
--- a/tests/sanity/tests/contacts.spec.ts
+++ b/tests/sanity/tests/contacts.spec.ts
@@ -96,7 +96,7 @@ test.describe('contact tests', () => {
     })
     await page.click('text="Delete"')
     // Click text=Ok
-    await page.click('text=Ok')
+    await page.click('text=Yes')
 
     await expect(page.locator(`td:has-text("${first} ${last}")`)).toHaveCount(0)
   })