Fix archived and viewlet bugs (#7927)

Signed-off-by: Denis Bykhov <[email protected]>

Author: BykhovDenis

Diff for: packages/core/src/storage.ts

@@ -275,3 +275,19 @@ export interface Storage {
 export interface FulltextStorage {
   searchFulltext: (query: SearchQuery, options: SearchOptions) => Promise<SearchResult>
 }
+
+export function shouldShowArchived<T extends Doc> (
+  query: DocumentQuery<T>,
+  options: FindOptions<T> | undefined
+): boolean {
+  if (options?.showArchived !== undefined) {
+    return options.showArchived
+  }
+  if (query._id !== undefined && typeof query._id === 'string') {
+    return true
+  }
+  if (query.space !== undefined && typeof query.space === 'string') {
+    return true
+  }
+  return false
+}

Diff for: packages/query/src/index.ts

@@ -54,6 +54,7 @@ import core, {
   getObjectValue,
   matchQuery,
   reduceCalls,
+  shouldShowArchived,
   toFindResult
 } from '@hcengineering/core'
 import { PlatformError } from '@hcengineering/platform'
@@ -519,8 +520,7 @@ export class LiveQuery implements WithTx, Client {
     if (q.options?.lookup !== undefined) {
       options.lookup = q.options?.lookup
     }
-    const showArchived: boolean =
-      options?.showArchived ?? (q.query._id !== undefined && typeof q.query._id === 'string')
+    const showArchived = shouldShowArchived(q.query, q.options)
 
     options.showArchived = showArchived
     const docIdKey = _id + JSON.stringify(options ?? {}) + q._class

Diff for: plugins/contact-resources/src/components/Contacts.svelte

@@ -86,6 +86,7 @@
         bind:viewlet
         bind:preference
         bind:loading
+        ignoreFragment
         viewletQuery={{
           attachTo: contact.class.Contact,
           descriptor: view.viewlet.Table

Diff for: plugins/recruit-resources/src/components/Applications.svelte

@@ -58,6 +58,7 @@
         <Table
           _class={recruit.class.Applicant}
           config={preference?.config ?? viewlet.config}
+          options={{ showArchived: true }}
           query={{ attachedTo: objectId, ...(viewlet?.baseQuery ?? {}) }}
           loadingProps={{ length: applications }}
           {readonly}

Diff for: plugins/recruit-resources/src/components/ApplicationsPopup.svelte

@@ -35,6 +35,7 @@
     _class={recruit.class.Applicant}
     config={['', '$lookup.space.name', '$lookup.space.company', 'status']}
     query={{ attachedTo: value._id }}
+    options={{ showArchived: true }}
     loadingProps={{ length: value.applications ?? 0 }}
   />
 </div>

Diff for: plugins/recruit-resources/src/components/Organizations.svelte

@@ -198,6 +198,7 @@
       bind:loading
       bind:viewlet
       bind:preference
+      ignoreFragment
       viewletQuery={{
         attachTo: recruit.mixin.VacancyList,
         descriptor: { $in: [view.viewlet.Table, view.viewlet.List] }

Diff for: plugins/recruit-resources/src/components/Vacancies.svelte

@@ -146,6 +146,7 @@
       bind:loading
       bind:viewlet
       bind:preference
+      ignoreFragment
       viewletQuery={{
         attachTo: recruit.class.Vacancy,
         descriptor: { $in: [view.viewlet.Table, view.viewlet.List] }

Diff for: plugins/recruit-resources/src/components/VacancyList.svelte

@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Doc, Ref } from '@hcengineering/core'
   import presentation from '@hcengineering/presentation'
-  import { Button, Icon, IconAdd, Label, showPopup, Scroller } from '@hcengineering/ui'
+  import { Button, Icon, IconAdd, Label, Scroller, showPopup } from '@hcengineering/ui'
   import view, { BuildModelKey } from '@hcengineering/view'
   import { Table } from '@hcengineering/view-resources'
   import recruit from '../plugin'
@@ -66,6 +66,7 @@
         _class={recruit.class.Vacancy}
         {config}
         query={{ company: objectId }}
+        options={{ showArchived: true }}
         {readonly}
         loadingProps={{ length: vacancies ?? 0 }}
       />

Diff for: plugins/setting-resources/src/components/RelationSetting.svelte

@@ -1,12 +1,22 @@
 <script lang="ts">
   import core, { Association, Class, Data, Doc, Ref } from '@hcengineering/core'
-  import { createQuery } from '@hcengineering/presentation'
-  import { Button, Header, Breadcrumb, Separator, defineSeparators, twoPanelsSeparators } from '@hcengineering/ui'
+  import { createQuery, getClient, MessageBox } from '@hcengineering/presentation'
+  import {
+    Button,
+    Header,
+    Breadcrumb,
+    Separator,
+    defineSeparators,
+    twoPanelsSeparators,
+    IconDelete,
+    showPopup
+  } from '@hcengineering/ui'
   import settings from '../plugin'
-  import view from '@hcengineering/view'
+  import view from '@hcengineering/view-resources/src/plugin'
   import AssociationEditor from './AssociationEditor.svelte'
 
   const query = createQuery()
+  const client = getClient()
 
   let selected: Association | Data<Association> | undefined
 
@@ -26,12 +36,37 @@
     }
   }
 
+  function isAssociation (data: Data<Association> | Association | undefined): data is Association {
+    return (data as Association)?._id !== undefined
+  }
+
   defineSeparators('workspaceSettings', twoPanelsSeparators)
+
+  async function remove (val: Association | Data<Association> | undefined): Promise<void> {
+    if (isAssociation(val)) {
+      showPopup(MessageBox, {
+        label: view.string.DeleteObject,
+        message: view.string.DeleteObjectConfirm,
+        params: { count: 1 },
+        dangerous: true,
+        action: async () => {
+          selected = undefined
+          await client.remove(val)
+        }
+      })
+    }
+  }
 </script>
 
 <div class="hulyComponent">
   <Header adaptive={'disabled'}>
     <Breadcrumb icon={settings.icon.Relations} label={core.string.Relations} size={'large'} isCurrent />
+
+    <svelte:fragment slot="actions">
+      {#if isAssociation(selected)}
+        <Button icon={IconDelete} label={view.string.Delete} kind={'dangerous'} on:click={() => remove(selected)} />
+      {/if}
+    </svelte:fragment>
   </Header>
 
   <div class="hulyComponent-content__container columns">

Diff for: plugins/task-resources/src/components/TypesView.svelte

@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, DocumentQuery, FindOptions, mergeQueries, Ref, Space, WithLookup } from '@hcengineering/core'
+  import { Class, Doc, DocumentQuery, mergeQueries, Ref, Space, WithLookup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
   import { Project, ProjectType, ProjectTypeDescriptor } from '@hcengineering/task'
@@ -97,6 +97,7 @@
       bind:viewlet
       bind:preference
       bind:viewlets
+      ignoreFragment
       viewletQuery={{
         attachTo: _class,
         variant: { $exists: false },

Diff for: plugins/view-resources/src/components/ViewletSelector.svelte

@@ -12,6 +12,7 @@
   export let preference: ViewletPreference | undefined = undefined
   export let loading = true
   export let hidden = false
+  export let ignoreFragment = false
 
   const query = createQuery()
 
@@ -29,11 +30,11 @@
     }
   )
 
-  let key = makeViewletKey()
+  let key = makeViewletKey(undefined, ignoreFragment)
 
   onDestroy(
     resolvedLocationStore.subscribe((loc) => {
-      key = makeViewletKey(loc)
+      key = makeViewletKey(loc, ignoreFragment)
     })
   )
 

Diff for: plugins/view-resources/src/utils.ts

@@ -750,11 +750,11 @@ export function categorizeFields (
   return result
 }
 
-export function makeViewletKey (loc?: Location): string {
+export function makeViewletKey (loc?: Location, ignoreFragment = false): string {
   loc = loc != null ? { path: loc.path, fragment: loc.fragment } : getCurrentResolvedLocation()
   loc.query = undefined
 
-  if (loc.fragment != null && loc.fragment !== '') {
+  if (!ignoreFragment && loc.fragment != null && loc.fragment !== '') {
     const props = decodeURIComponent(loc.fragment).split('|')
     if (props.length >= 3) {
       const [panel, , _class] = props

Diff for: plugins/workbench-resources/src/components/SpaceHeader.svelte

@@ -95,7 +95,7 @@
 {#if space}
   <Header hideActions={createItemDialog === undefined}>
     <svelte:fragment slot="beforeTitle">
-      <ViewletSelector {viewletQuery} bind:viewlet bind:viewlets />
+      <ViewletSelector {viewletQuery} ignoreFragment bind:viewlet bind:viewlets />
       <ViewletSettingButton bind:viewOptions bind:viewlet />
     </svelte:fragment>
 

Diff for: plugins/workbench-resources/src/components/SpecialView.svelte

@@ -114,6 +114,7 @@
       bind:viewlet
       bind:preference
       bind:viewlets
+      ignoreFragment
       viewletQuery={{
         attachTo: _class,
         variant: { $exists: false },

Diff for: server/middleware/src/spaceSecurity.ts

@@ -42,6 +42,7 @@ import core, {
   WorkspaceEvent,
   clone,
   generateId,
+  shouldShowArchived,
   systemAccountEmail,
   toFindResult,
   type SessionData
@@ -538,7 +539,7 @@ export class SpaceSecurityMiddleware extends BaseMiddleware implements Middlewar
     const account = ctx.contextData.account
     const isSpace = this.context.hierarchy.isDerived(_class, core.class.Space)
     const field = this.getKey(domain)
-    const showArchived: boolean = options?.showArchived ?? (query._id !== undefined && typeof query._id === 'string')
+    const showArchived: boolean = shouldShowArchived(query, options)
 
     let clientFilterSpaces: Set<Ref<Space>> | undefined
 

Diff for: server/postgres/src/storage.ts

@@ -43,6 +43,7 @@ import core, {
   type Ref,
   type ReverseLookups,
   type SessionData,
+  shouldShowArchived,
   type SortingQuery,
   type StorageIterator,
   toFindResult,
@@ -665,7 +666,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
 
           const select = `SELECT ${this.getProjection(vars, domain, options?.projection, joins, options?.associations)} FROM ${domain}`
 
-          const showArchived = options?.showArchived ?? (query._id !== undefined && typeof query._id === 'string')
+          const showArchived = shouldShowArchived(query, options)
           const secJoin = this.addSecurity(vars, query, showArchived, domain, ctx.contextData)
           if (secJoin !== undefined) {
             sqlChunks.push(secJoin)
@@ -686,7 +687,7 @@ abstract class PostgresAdapterBase implements DbAdapter {
             let total = options?.total === true ? 0 : -1
             if (options?.total === true) {
               const pvars = new ValuesVariables()
-              const showArchived = options?.showArchived ?? (query._id !== undefined && typeof query._id === 'string')
+              const showArchived = shouldShowArchived(query, options)
               const secJoin = this.addSecurity(pvars, query, showArchived, domain, ctx.contextData)
               const totalChunks: string[] = []
               if (secJoin !== undefined) {