UBER-678 Move delete actions to bottom (#3559)

Signed-off-by: Alexander Onnikov <alexander.onnikov@xored.com>
hcengineering · Aug 24, 2023 · 416a5f0 · 416a5f0
1 parent 48a30d1
commit 416a5f0
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/models/calendar/src/index.ts b/models/calendar/src/index.ts
@@ -260,7 +260,7 @@ export function createModel (builder: Builder): void {
       category: view.category.General,
       input: 'any',
       target: calendar.class.ReccuringInstance,
-      context: { mode: ['context', 'browser'], group: 'tools' }
+      context: { mode: ['context', 'browser'], group: 'remove' }
     },
     calendar.action.DeleteRecEvent
   )

diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts
@@ -741,7 +741,7 @@ export function createModel (builder: Builder): void {
       input: 'focus',
       context: {
         mode: ['context'],
-        group: 'other'
+        group: 'remove'
       },
       secured: true
     },
@@ -761,7 +761,7 @@ export function createModel (builder: Builder): void {
       input: 'focus',
       context: {
         mode: ['context'],
-        group: 'other'
+        group: 'remove'
       },
       secured: true
     },
@@ -788,7 +788,7 @@ export function createModel (builder: Builder): void {
       input: 'focus',
       context: {
         mode: ['context'],
-        group: 'other'
+        group: 'remove'
       },
       secured: true
     },

diff --git a/models/setting/src/index.ts b/models/setting/src/index.ts
@@ -394,7 +394,7 @@ export function createModel (builder: Builder): void {
       category: view.category.General,
       input: 'any',
       target: setting.mixin.UserMixin,
-      context: { mode: ['context', 'browser'], group: 'tools' }
+      context: { mode: ['context', 'browser'], group: 'remove' }
     },
     setting.action.DeleteMixin
   )

diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
@@ -1260,7 +1260,7 @@ export function createModel (builder: Builder): void {
       target: tracker.class.Issue,
       context: {
         mode: ['context', 'browser'],
-        group: 'edit'
+        group: 'remove'
       },
       override: [view.action.Delete]
     },
@@ -1874,7 +1874,7 @@ export function createModel (builder: Builder): void {
       category: tracker.category.Tracker,
       input: 'any',
       target: tracker.class.Milestone,
-      context: { mode: ['context', 'browser'], group: 'tools' }
+      context: { mode: ['context', 'browser'], group: 'remove' }
     },
     tracker.action.DeleteMilestone
   )

diff --git a/models/view/src/index.ts b/models/view/src/index.ts
@@ -565,7 +565,7 @@ export function createModel (builder: Builder): void {
       category: view.category.General,
       input: 'any',
       target: core.class.Doc,
-      context: { mode: ['context', 'browser'], group: 'tools' }
+      context: { mode: ['context', 'browser'], group: 'remove' }
     },
     view.action.Delete
   )

diff --git a/plugins/view-resources/src/actions.ts b/plugins/view-resources/src/actions.ts
@@ -25,7 +25,7 @@ import core, {
   Ref
 } from '@hcengineering/core'
 import { getResource } from '@hcengineering/platform'
-import { Action, ViewAction, ViewActionInput, ViewContextType } from '@hcengineering/view'
+import { Action, ActionGroup, ViewAction, ViewActionInput, ViewContextType } from '@hcengineering/view'
 import view from './plugin'
 import { FocusSelection } from './selection'
 
@@ -60,7 +60,7 @@ export async function getActions (
     'context.mode': mode
   })
 
-  const categories: Record<string, number> = { top: 1, filter: 50, tools: 100 }
+  const categories: Partial<Record<ActionGroup | 'top', number>> = { top: 1, tools: 50, other: 100, remove: 200 }
 
   let filteredActions: Action[] = []
 

diff --git a/plugins/view-resources/src/components/Menu.svelte b/plugins/view-resources/src/components/Menu.svelte
@@ -37,7 +37,8 @@
     copy: 3,
     associate: 4,
     tools: 5,
-    other: 6
+    other: 6,
+    remove: 7
   }
 
   getActions(client, object, baseMenuClass, mode).then((result) => {

diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts
@@ -433,7 +433,7 @@ export interface ActionCategory extends Doc, UXObject {
 /**
  * @public
  */
-export type ActionGroup = 'create' | 'edit' | 'associate' | 'copy' | 'tools' | 'other'
+export type ActionGroup = 'create' | 'edit' | 'associate' | 'copy' | 'tools' | 'other' | 'remove'
 
 /**
  * @public