Skip to content

Fix/new category crash 10772 #10794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Learnobug wants to merge 1 commit into
base: develop
Choose a base branch
from
+15 −6
Open

Fix/new category crash 10772 #10794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/controlled-documents-resources/src/components/Categories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
const _class: Ref<Class<DocumentCategory>> = document.class.DocumentCategory

function showCreateDialog (): void {
showPopup(CreateDocumentCategory, {}, 'top')
showPopup(CreateDocumentCategory, { space }, 'top')
}
</script>

Expand Down Expand Up @@ -79,7 +79,7 @@

{#if loading}
<Loading />
{:else if viewlet && viewOptions}

Check warning on line 82 in plugins/controlled-documents-resources/src/components/Categories.svelte

View workflow job for this annotation

GitHub Actions / formatting 

Unexpected nullable object value in conditional. An explicit null check is required
<TableBrowser
{_class}
config={preference?.config ?? viewlet.config}
Expand Down
19 changes: 14 additions & 5 deletions plugins/controlled-documents-resources/src/components/CreateDocumentCategory.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
//
-->
<script lang="ts">
import { createEventDispatcher } from 'svelte'
import { createEventDispatcher, onMount } from 'svelte'
import { Attachment } from '@hcengineering/attachment'
import { AttachmentPresenter, AttachmentStyledBox } from '@hcengineering/attachment-resources'
import { generateId, Ref, Space } from '@hcengineering/core'
import { Card, getClient } from '@hcengineering/presentation'
import { Button, EditBox, IconAttachment, tooltip } from '@hcengineering/ui'
import { DocumentCategory } from '@hcengineering/controlled-documents'
import { DocumentCategory, DocumentSpace } from '@hcengineering/controlled-documents'

import IconWarning from './icons/IconWarning.svelte'
import documents from '../plugin'
Expand All @@ -37,9 +37,18 @@
const dispatch = createEventDispatcher()
const client = getClient()
let descriptionBox: AttachmentStyledBox
let spaceExists = true

onMount(async () => {
const spaceDoc = await client.findOne(documents.class.DocumentSpace, { _id: space as Ref<DocumentSpace> })
spaceExists = spaceDoc !== undefined
if (!spaceExists) {
console.error(`Document space ${space} not found. Category cannot be created.`)
}
})

async function handleOkAction (): Promise<void> {
if (isCodeWrong || isTitleWrong) {
if (isCodeWrong || isTitleWrong || !spaceExists) {
return
}
const op = client.apply()
Expand All @@ -61,7 +70,7 @@

let existingCategories: string[] = []
let existingCodes: string[] = []
$: void client.findAll(documents.class.DocumentCategory, {}).then((cats) => {
$: void client.findAll(documents.class.DocumentCategory, { space }).then((cats) => {
existingCategories = cats.map((cat) => cat.title)
existingCodes = cats.map((cat) => cat.code)
})
Expand All @@ -82,7 +91,7 @@
<Card
label={documents.string.CreateDocumentCategory}
okAction={handleOkAction}
canSave={!isCodeWrong && !isTitleWrong}
canSave={!isCodeWrong && !isTitleWrong && spaceExists}
hideAttachments={attachments.size === 0}
on:close={() => {
dispatch('close')
Expand Down
Loading