Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions models/process/src/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@ export function defineMethods (builder: Builder): void {
process.method.RunSubProcess
)

builder.createDoc(
process.class.Method,
core.space.Model,
{
label: process.string.RequestApproval,
objectClass: process.class.ApproveRequest,
editor: process.component.ApproveRequestEditor,
presenter: process.component.ApproveRequestPresenter,
createdContext: {
_class: process.class.ApproveRequest,
nameField: 'title'
},
requiredParams: ['user']
},
process.method.RequestApproval
)

builder.createDoc(
process.class.Method,
core.space.Model,
Expand Down Expand Up @@ -103,4 +120,30 @@ export function defineMethods (builder: Builder): void {
},
process.method.AddTag
)

builder.createDoc(
process.class.Method,
core.space.Model,
{
label: process.string.LockCard,
objectClass: card.class.Card,
requiredParams: [],
createdContext: null
},
process.method.LockCard
)

builder.createDoc(
process.class.Method,
core.space.Model,
{
label: process.string.LockSection,
objectClass: card.class.Card,
editor: process.component.LockSectionEditor,
presenter: process.component.LockSectionPresenter,
requiredParams: ['_id'],
createdContext: null
},
process.method.LockSection
)
}
92 changes: 92 additions & 0 deletions models/process/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import workbench from '@hcengineering/model-workbench'
import notification from '@hcengineering/notification'
import { type Asset, type IntlString, type Resource } from '@hcengineering/platform'
import {
type ApproveRequest,
type CheckFunc,
type ContextId,
type CreatedContext,
Expand Down Expand Up @@ -204,6 +205,19 @@ export class TProcessToDo extends TToDo implements ProcessToDo {
withRollback!: boolean
}

@Model(process.class.ApproveRequest, process.class.ProcessToDo)
export class TApproveRequest extends TProcessToDo implements ApproveRequest {
@Prop(TypeBoolean(), process.string.IsApproved)
approved?: boolean

@Prop(TypeString(), process.string.RejectionReason)
reason?: string

group!: string

card!: Ref<Card>
}

@Model(process.class.Method, core.class.Doc, DOMAIN_MODEL)
export class TMethod extends TDoc implements Method<Doc> {
label!: IntlString
Expand Down Expand Up @@ -290,6 +304,7 @@ export function createModel (builder: Builder): void {
TProcess,
TExecution,
TProcessToDo,
TApproveRequest,
TMethod,
TState,
TProcessFunction,
Expand Down Expand Up @@ -323,6 +338,28 @@ export function createModel (builder: Builder): void {
process.ids.ProcessToDoCreated
)

builder.createDoc(
notification.class.NotificationType,
core.space.Model,
{
hidden: false,
generated: false,
allowedForAuthor: true,
label: process.string.ApproveRequest,
group: time.ids.TimeNotificationGroup,
txClasses: [core.class.TxCreateDoc],
objectClass: process.class.ApproveRequest,
onlyOwn: true,
defaultEnabled: true,
templates: {
textTemplate: '{body}',
htmlTemplate: '<p>{body}</p>',
subjectTemplate: '{title}'
}
},
process.ids.ApproveRequestCreated
)

createAction(builder, {
action: view.actionImpl.Delete,
label: view.string.Delete,
Expand Down Expand Up @@ -413,6 +450,42 @@ export function createModel (builder: Builder): void {
presenter: process.component.StatePresenter
})

builder.createDoc(
view.class.Viewlet,
core.space.Model,
{
variant: 'cardRequests',
attachTo: process.class.ApproveRequest,
descriptor: view.viewlet.List,
props: {
baseMenuClass: process.class.ApproveRequest
},
viewOptions: {
groupBy: ['user', 'approved'],
orderBy: [
['approved', SortingOrder.Descending],
['modifiedOn', SortingOrder.Descending],
['createdOn', SortingOrder.Descending]
],
other: []
},
configOptions: {
strict: true
},
config: [
{
key: '',
label: process.string.ApproveRequest,
presenter: process.component.ApproveRequestPresenter
},
'user',
'approved',
'reason'
]
},
process.viewlet.CardRequests
)

builder.createDoc(
view.class.Viewlet,
core.space.Model,
Expand Down Expand Up @@ -600,6 +673,12 @@ export function createModel (builder: Builder): void {
props: {}
})

builder.createDoc(presentation.class.ComponentPointExtension, core.space.Model, {
extension: card.extensions.EditCardExtension,
component: process.component.RequestsExtension,
props: {}
})

builder.createDoc(presentation.class.ComponentPointExtension, core.space.Model, {
extension: card.extensions.EditCardHeaderExtension,
component: process.component.ProcessesHeaderExtension,
Expand All @@ -623,6 +702,19 @@ export function createModel (builder: Builder): void {
process.section.CardProcesses
)

builder.createDoc(
card.class.CardSection,
core.space.Model,
{
label: process.string.ApproveRequest,
component: process.component.RequestsCardSection,
checkVisibility: process.function.CheckRequestsSectionVisibility,
order: 360,
navigation: []
},
process.section.CardApproveRequest
)

builder.createDoc(card.class.MasterTagEditorSection, core.space.Model, {
id: 'processes',
label: process.string.Processes,
Expand Down
6 changes: 4 additions & 2 deletions models/process/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ export default mergeIds(processId, process, {
Process: '' as Ref<Doc>
},
section: {
CardProcesses: '' as Ref<CardSection>
CardProcesses: '' as Ref<CardSection>,
CardApproveRequest: '' as Ref<CardSection>
},
pipeline: {
ProcessMiddleware: '' as Ref<PresentationMiddlewareFactory>
},
ids: {
ProcessSettings: '' as Ref<Doc>,
ProcessToDoCreated: '' as Ref<Doc>
ProcessToDoCreated: '' as Ref<Doc>,
ApproveRequestCreated: '' as Ref<Doc>
},
actionImpl: {
ContinueExecution: '' as ViewAction
Expand Down
32 changes: 32 additions & 0 deletions models/process/src/triggers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,38 @@ import { type Builder } from '@hcengineering/model'
import process from './plugin'

export function defineTriggers (builder: Builder): void {
builder.createDoc(
process.class.Trigger,
core.space.Model,
{
label: process.string.OnApproveRequestApproved,
icon: process.icon.ToDo,
editor: process.component.ApproveRequestTriggerEditor,
presenter: process.component.ApproveRequestTriggerPresenter,
requiredParams: ['_id'],
checkFunction: process.triggerCheck.ApproveRequestApproved,
init: false,
auto: true
},
process.trigger.OnApproveRequestApproved
)

builder.createDoc(
process.class.Trigger,
core.space.Model,
{
label: process.string.OnApproveRequestRejected,
icon: process.icon.ToDoRemove,
editor: process.component.ApproveRequestTriggerEditor,
presenter: process.component.ApproveRequestTriggerPresenter,
requiredParams: ['_id'],
checkFunction: process.triggerCheck.ApproveRequestRejected,
init: false,
auto: true
},
process.trigger.OnApproveRequestRejected
)

builder.createDoc(
process.class.Trigger,
core.space.Model,
Expand Down
22 changes: 22 additions & 0 deletions models/server-process/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ export function createModel (builder: Builder): void {
serverCheckFunc: serverProcess.func.FieldChangedCheck
})

builder.mixin(process.trigger.OnApproveRequestApproved, process.class.Trigger, serverProcess.mixin.TriggerImpl, {
preventRollback: true,
serverCheckFunc: serverProcess.func.ApproveRequestApproved
})

builder.mixin(process.trigger.OnApproveRequestRejected, process.class.Trigger, serverProcess.mixin.TriggerImpl, {
preventRollback: true,
serverCheckFunc: serverProcess.func.ApproveRequestRejected
})

builder.mixin(process.trigger.OnExecutionStart, process.class.Trigger, serverProcess.mixin.TriggerImpl, {
preventRollback: true
})
Expand Down Expand Up @@ -117,6 +127,18 @@ export function createModel (builder: Builder): void {
func: serverProcess.func.AddTag
})

builder.mixin(process.method.RequestApproval, process.class.Method, serverProcess.mixin.MethodImpl, {
func: serverProcess.func.RequestApproval
})

builder.mixin(process.method.LockCard, process.class.Method, serverProcess.mixin.MethodImpl, {
func: serverProcess.func.LockCard
})

builder.mixin(process.method.LockSection, process.class.Method, serverProcess.mixin.MethodImpl, {
func: serverProcess.func.LockSection
})

builder.mixin(process.function.FirstValue, process.class.ProcessFunction, serverProcess.mixin.FuncImpl, {
func: serverProcess.transform.FirstValue
})
Expand Down
16 changes: 14 additions & 2 deletions plugins/card-resources/src/components/CardAttributeEditor.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,26 @@
<div class="divider" />
{/if}
<div class="masterTag">
<MasterTagAttributes bind:this={masterTagAttributes} {readonly} {value} {ignoreKeys} fourRows={columns === 2} />
<MasterTagAttributes
bind:this={masterTagAttributes}
readonly={readonly || value.readonlySections?.includes(value._class)}
{value}
{ignoreKeys}
fourRows={columns === 2}
/>
</div>
{#if mixins.length > 0}
<div class="divider" />
<Grid column={columns} columnGap={0} rowGap={0} alignItems={'start'}>
{#each mixins as tag, i (tag._id)}
<div class="tag" class:withoutBorder={Math.ceil((i + 1) / columns) === Math.ceil(mixins.length / columns)}>
<TagAttributes bind:this={tagAttributes[i]} {readonly} {tag} {value} {ignoreKeys} />
<TagAttributes
bind:this={tagAttributes[i]}
readonly={readonly || value.readonlySections?.includes(tag._id)}
{tag}
{value}
{ignoreKeys}
/>
</div>
{/each}
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div class="content" class:hidden>
<Content
{doc}
readonly={readonly || updatePermissionForbidden}
readonly={readonly || updatePermissionForbidden || doc.readonlySections?.includes(doc._class)}
content={contentDiv}
showToc={false}
on:loaded
Expand Down
3 changes: 2 additions & 1 deletion plugins/card/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ export interface Card extends Doc, IconProps, VersionableDoc {
parentInfo: ParentInfo[]
parent?: Ref<Card> | null
rank: Rank
readonly?: boolean

peerId?: string

readonlySections?: Ref<MasterTag>[]
}

export interface CardSpace extends TypedSpace {
Expand Down
3 changes: 0 additions & 3 deletions plugins/login-resources/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ export default mergeIds(loginId, login, {
HaveAccount: '' as IntlString,
LoadingAccount: '' as IntlString,
Join: '' as IntlString,
Email: '' as IntlString,
Password: '' as IntlString,
PasswordRepeat: '' as IntlString,
Workspace: '' as IntlString,
SignUp: '' as IntlString,
DoNotHaveAnAccount: '' as IntlString,
Expand Down
5 changes: 4 additions & 1 deletion plugins/login/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ export default plugin(loginId, {
WorkspaceArchived: '' as IntlString,
WorkspaceArchivedDesc: '' as IntlString,
RestoreArchivedWorkspace: '' as IntlString,
PasswordExpiredDesc: '' as IntlString
PasswordExpiredDesc: '' as IntlString,
Email: '' as IntlString,
Password: '' as IntlString,
PasswordRepeat: '' as IntlString
},
function: {
SendInvite: '' as Resource<(email: string, role: AccountRole) => Promise<void>>,
Expand Down
Loading
Loading