wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-13 03:40:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ezqms-1185: fix delete document availability (#6485)

Browse Source 
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev 2024-09-05 14:32:46 +04:00 committed by GitHub
parent 286b7e29f9
commit 3eb7d6e965
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/controlled-documents/src/index.ts
View File

@ -684,7 +684,7 @@ export function createModel (builder: Builder): void {
input: 'any',
category: view.category.General,
target: documents.class.Document,
visibilityTester: documents.function.IsLatestDraftDoc,
visibilityTester: documents.function.CanDeleteDocument,
query: {
state: DocumentState.Draft
},

22
plugins/controlled-documents-resources/src/index.ts
View File

@ -20,7 +20,8 @@ import {
type RelatedDocument,
SortingOrder,
type WithLookup,
type Doc
type Doc,
getCurrentAccount
} from '@hcengineering/core'
import {
type Document,
@ -31,6 +32,7 @@ import {
import { type Resources } from '@hcengineering/platform'
import { type ObjectSearchResult, getClient, MessageBox } from '@hcengineering/presentation'
import { showPopup } from '@hcengineering/ui'
import { type PersonAccount } from '@hcengineering/contact'
import CreateDocument from './components/CreateDocument.svelte'
import QmsDocumentWizard from './components/create-doc/QmsDocumentWizard.svelte'
@ -148,6 +150,22 @@ async function deleteDocuments (obj: Document | Document[]): Promise<void> {
})
}
async function canDeleteDocument (obj?: Doc | Doc[]): Promise<boolean> {
if (obj == null) {
return false
}
const objs = (Array.isArray(obj) ? obj : [obj]) as Document[]
const currentUser = getCurrentAccount() as PersonAccount
const isOwner = objs.every((doc) => doc.owner === currentUser.person)
if (!isOwner) {
return false
}
return await isLatestDraftDoc(obj)
}
async function isLatestDraftDoc (obj?: Doc | Doc[]): Promise<boolean> {
if (obj == null) {
return false
@ -261,7 +279,7 @@ export default async (): Promise<Resources> => ({
DocumentStateSort: sortDocumentStates,
GetAllDocumentStates: getAllDocumentStates,
GetDocumentMetaLinkFragment: getDocumentMetaLinkFragment,
IsLatestDraftDoc: isLatestDraftDoc,
CanDeleteDocument: canDeleteDocument,
DocumentIdentifierProvider: documentIdentifierProvider,
ControlledDocumentTitleProvider: getControlledDocumentTitle,
Comment: comment,

2
plugins/controlled-documents-resources/src/plugin.ts
View File

@ -231,7 +231,7 @@ export default mergeIds(documentsId, documents, {
GetAllDocumentStates: '' as Resource<() => Promise<DocumentState[]>>,
GetVisibleFilters: '' as Resource<(filters: KeyFilter[], space?: Ref<Space>) => Promise<KeyFilter[]>>,
GetDocumentMetaLinkFragment: '' as Resource<(doc: Doc, props: Record<string, any>) => Promise<Location>>,
IsLatestDraftDoc: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
CanDeleteDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
ControlledDocumentTitleProvider: '' as Resource<(client: Client, ref: Ref<Doc>, doc?: Doc) => Promise<string>>
}
})