DOMUS
${this.text('tagline')}
${view?.session ? this.text(view.session.context.channel === 'stable' ? 'stable' : 'edge') : 'Domus'}
- ${this.text(closed ? 'closed' : loading ? 'loading' : `state_${state}`)}
-${this.text(closed ? 'closedBody' : loading ? 'loadingBody' : `body_${state}`)}
- ${view?.session ? html`${this.text('verified')}${this.text(view.session.access === 'read_only' ? 'readOnly' : 'full')}` : nothing} +${taskWorkspace && !closed && !loading && view?.household ? view.household.name : this.text(closed ? 'closed' : loading ? 'loading' : `state_${state}`)}
+ ${!taskWorkspace || closed || loading ? html`${this.text(closed ? 'closedBody' : loading ? 'loadingBody' : `body_${state}`)}
` : nothing} + ${view?.session && !taskWorkspace ? html`${this.text('verified')}${this.text(view.session.access === 'read_only' ? 'readOnly' : 'full')}` : nothing} ${decision?.readOnly ? html`${this.text('readOnly')}
${this.text('grace')}
${this.text('deadline')}: ${instant(view!.session!.expiresAt, this.language)}
${this.text(`notice_${view.notice}`)}
` : nothing} ${view?.cleanup === 'unconfirmed' ? html`${this.text('cleanup')}
` : nothing} - ${this.outcome()} + ${taskWorkspace && view?.outcome?.kind === 'receipt' && view.outcome.stage === 'committed' + ? html`${this.text('outcome_committed')}
${this.outcome()}${this.text('state_active')}
-
+ ${!loading && !closed && !taskWorkspace && view?.household ? html`
- ${this.text('householdName')}
- ${view.household.name}
- ${this.text('householdZone')}
- ${view.household.timeZone}
- ${this.text('revision')}
- ${view.household.revision}
${this.text('state_active')}
${closed ? this.button(this.deployment === 'native' ? 'reopen' : 'signIn', this.deployment === 'native' ? 'reopen' : 'sign_in', true)
: !loading && decision?.action === 'sign_in' ? this.button('signIn', 'sign_in', true)
: !loading && decision?.action === 'reopen_home_assistant' ? this.button('reopen', 'reopen', true)
: !loading ? html`${decision?.action === 'request_membership' ? this.button('join', 'request_membership', true) : nothing}
- ${this.button('refresh', 'refresh', decision?.action === 'refresh')}` : nothing}
+ ${!taskWorkspace ? this.button('refresh', 'refresh', decision?.action === 'refresh') : nothing}` : nothing}
${!loading && decision?.action === 'contact_administrator' ? html`${this.text('contact')}
` : nothing} ${!closed && view?.busy ? html`${this.text('busy')}
` : nothing}${this.text('journalTitle')}
-${this.text('journalBody')}
- ${view.journal.records.map(record => this.request(record))}
${this.text('journalTitle')}
${this.text('journalBody')}
- ${view.journal.records.map(record => this.request(record))}
${this.text('journalTitle')}
+${this.text('journalBody')}
- ${view.journal.records.map(record => this.request(record))}
${this.text('details')}
- ${this.text('status')}
- ${this.text(`state_${state}`)}
- ${this.text('access')}
- ${this.text(view.session.access === 'read_only' ? 'readOnly' : 'full')}
${this.text('permissions')}
${view.authorization?.permissions.length ? html`- ${view.authorization.permissions.map(permission => html`
${permission}`)}
{const target = event.target as HTMLDetailsElement; if (target.isConnected) this.createOpen = target.open;}}>
+
`;
+ }
+ private complete(): void {
+ const work = this.view!.detail!; let materialUsages: readonly TaskMaterialUsage[] | null = null;
+ if (work.materialRecording === 'review_on_completion' && work.materials.length > 0) {
+ const usages: TaskMaterialUsage[] = [];
+ for (const material of work.materials) {
+ const quantity = quantityInput(this.quantities[material.lineId] ?? '', material.precision);
+ if (quantity === null) {this.quantityError = material.lineId; return;}
+ usages.push(Object.freeze({line_id: material.lineId, quantity}));
+ }
+ materialUsages = Object.freeze(usages);
+ }
+ this.quantityError = null; this.intent({type: 'complete', materialUsages});
+ }
+ private workDetail() {
+ const work = this.view!.detail!;
+ return html`${this.text('newTask')}
+ ${work.title}
+${this.text(`state_${work.state}`)}${this.text(`priority_${work.priority}`)}
+ ${work.description ? html`${work.description}
` : nothing} +${this.text('due')}: ${taskInstant(work.dueAt, this.language)}
+ ${work.cycle ? html`${this.text(`verification_${work.cycle.verification}`)}
+ ${this.text('performed')}: ${taskInstant(work.cycle.performedAt, this.language)}
${this.text('dependencyReview')}
` : nothing} + ${work.pendingMaterials ? html`${this.text('pendingMaterials')}
` : nothing} + ${work.allowedActions.includes('claim') ? html`` : nothing} + ${work.allowedActions.includes('complete') ? html`` : nothing} + ${work.allowedActions.some(action => ['approve', 'reject', 'reopen'].includes(action)) ? html`${this.text('review')}
+
+ ${this.text('reasonHelp')}
+ ${(['approve', 'reject', 'reopen'] as const).filter(action => work.allowedActions.includes(action)).map(action => html``)}
+
${this.text('technical')}
- ${this.text('taskId')}
${work.occurrenceId}
+ - ${this.text('revision')}
- ${work.revision}
${this.text(`action_${record.command.action.slice(5)}` as TaskMessageKey)}
+
`;
+ }
+ private outcome() {
+ const result = this.view!.outcome; if (result === null) return nothing;
+ const kind = result.kind === 'receipt' ? result.stage === 'committed' ? 'saved' : 'historical' : result.kind;
+ return html`${record.stage !== 'rejected' ? html`` : nothing}
+ ${record.stage !== 'prepared' && record.stage !== 'uncertain' ? html`` : nothing}
${this.text(kind)}
${this.text(`${kind}Body`)}
+ ${result.kind === 'rejected' ? html`${this.text(`notice_${result.reason}`)}
` : nothing} + ${result.kind === 'receipt' ? html`${this.text('technical')}
${this.text('operation')}: ${result.operationId}
${this.text('title')}
+${this.text('intro')}
+ ${view === null || view.phase === 'idle' || view.phase === 'loading' ? html`${this.text('loading')}
` : view.phase === 'closed' ? html`${this.text('closed')}
` : nothing} + ${view?.notice ? html`${this.text(`notice_${view.notice}`)}
` : nothing} + ${ready ? html`${view.readOnly ? html`${this.text('readOnly')}
` : nothing}${this.outcome()} + ${unresolved.length ? html`${this.text('uncertainBody')}
${unresolved.map(record => this.request(record))}
+
+ ${resolved.length ? html`${view.access!.canCreate ? this.createForm() : nothing}
+
+ ${this.text('list')}
+ ${view.page?.items.length ? html`- ${view.page.items.map(item => html`
- + `)}
${this.text('empty')}
` : nothing} + ${view.page?.nextCursor ? html`` : nothing}${view.detail ? this.workDetail() : nothing}
+ ${this.text('requests')}
${resolved.map(record => this.request(record))}Fictional interface state. No server is connected; actions emit intents only.
+ {const target = event.target as HTMLDetailsElement; if (target.isConnected) this.createOpen = target.open;}}>
`;
}
private complete(): void {
@@ -141,10 +147,10 @@ export class DomusTasks extends LitElement {
: html`${this.text('newTask')}
${this.text('separateMaterials')}
` : nothing} ` : nothing} ${work.allowedActions.some(action => ['approve', 'reject', 'reopen'].includes(action)) ? html`${this.text('review')}
-
- ${this.text('reasonHelp')}
- ${(['approve', 'reject', 'reopen'] as const).filter(action => work.allowedActions.includes(action)).map(action => html`
+ ${(['approve', 'reject', 'reopen'] as const).filter(action => work.allowedActions.includes(action)).map(action => html``)}
${Array.from(this.reasonDraft).length > TASK_TEXT_LIMITS.reason ? this.text('textTooLong') + ': ' + TASK_TEXT_LIMITS.reason : this.text('reasonHelp')}
- ${(['approve', 'reject', 'reopen'] as const).filter(action => work.allowedActions.includes(action)).map(action => html`
` : nothing}
diff --git a/frontend/tests/e2e/tasks.spec.ts b/frontend/tests/e2e/tasks.spec.ts
index 5466c8d..889bb34 100644
--- a/frontend/tests/e2e/tasks.spec.ts
+++ b/frontend/tests/e2e/tasks.spec.ts
@@ -106,13 +106,21 @@ for (const mode of ['native', 'standalone'] as const) test.describe('tasks ' + m
await expect(memberTasks.getByText('Pending approval', {exact: true})).toBeVisible();
await expect(memberTasks.getByRole('button', {name: 'Approve', exact: true})).toHaveCount(0);
await page.getByRole('link', {name: 'Tasks', exact: true}).click(); await tasks.getByRole('button', {name: 'Refresh tasks', exact: true}).click();
- await tasks.getByRole('button', {name: title, exact: true}).click(); await tasks.getByRole('button', {name: 'Approve', exact: true}).click();
+ await tasks.getByRole('button', {name: title, exact: true}).click();
+ await expect(tasks.getByRole('button', {name: 'Approve', exact: true})).toBeEnabled();
+ await expect(tasks.getByRole('button', {name: 'Reject', exact: true})).toBeDisabled();
+ await expect(tasks.getByRole('button', {name: 'Reopen task', exact: true})).toBeDisabled();
+ await tasks.getByLabel('Reason', {exact: true}).fill(' \t\n ');
+ await expect(tasks.getByRole('button', {name: 'Reject', exact: true})).toBeDisabled();
+ await tasks.getByRole('button', {name: 'Approve', exact: true}).click();
await expect(tasks.getByText('Approved', {exact: true})).toBeVisible();
await memberTasks.getByRole('button', {name: 'Refresh tasks', exact: true}).click(); await expect(memberTasks.getByText('Approved', {exact: true})).toBeVisible();
const items = await (await page.request.get(base(mode) + '/api/v1/tasks/occurrences')).json(), id = items.items[0].occurrence_id;
const approved = await (await page.request.get(base(mode) + '/api/v1/tasks/occurrences/' + id)).json();
expect(approved.cycle.performers[0].role).toBe('restricted'); expect(approved.cycle.verified_by.role).toBe('administrator');
+ await expect(tasks.getByRole('button', {name: 'Reopen task', exact: true})).toBeDisabled();
await tasks.getByLabel('Reason', {exact: true}).fill('Repeat after review');
+ await expect(tasks.getByRole('button', {name: 'Reopen task', exact: true})).toBeEnabled();
const reopening = page.waitForResponse(response => response.url() === base(mode) + '/api/v1/tasks/occurrences/' + id + '/reopen' && response.request().method() === 'POST');
await tasks.getByRole('button', {name: 'Reopen task', exact: true}).click(); const original = await (await reopening).json();
expect(original.result.cycle.closed_at).not.toBeNull(); expect(original.result.cycle.performers).toEqual(approved.cycle.performers);
diff --git a/frontend/tests/task-component.test.ts b/frontend/tests/task-component.test.ts
index dd7e55d..f6af2f3 100644
--- a/frontend/tests/task-component.test.ts
+++ b/frontend/tests/task-component.test.ts
@@ -199,3 +199,21 @@ test.each(['a', '🧹'])('review enforces the same 1,000-code-point reason bound
expect(f.button('Reject').disabled).toBe(false); f.button('Reject').click();
expect(f.intents).toEqual([{type: 'verify', decision: 'rejected', reason: character.repeat(1000)}]);
});
+
+
+test.each(['en', 'es'] as const)('required review reasons prevent impossible actions in %s', async locale => {
+ const labels = locale === 'es' ? ['Aprobar', 'Rechazar', 'Reabrir tarea'] : ['Approve', 'Reject', 'Reopen task'];
+ const f = await mount(view({detail: {...work, state: 'completed', allowedActions: ['approve', 'reject', 'reopen']}}), locale);
+ for (const reason of ['', ' \t\n ']) {
+ await f.input('task-reason', reason);
+ expect(f.button(labels[0]).disabled).toBe(false);
+ for (const label of labels.slice(1)) {expect(f.button(label).disabled).toBe(true); f.button(label).click();}
+ expect(f.intents).toEqual([]);
+ }
+ f.button(labels[0]).click();
+ expect(f.intents).toEqual([{type: 'verify', decision: 'approved', reason: ' \t\n '}]);
+ await f.input('task-reason', ' Correct the completion ');
+ for (const label of labels.slice(1)) {expect(f.button(label).disabled).toBe(false); f.button(label).click();}
+ expect(f.intents.slice(1)).toEqual([{type: 'verify', decision: 'rejected', reason: ' Correct the completion '},
+ {type: 'reopen', reason: ' Correct the completion '}]);
+});
From b2729f3ca159027a2fc1ccc37ce0f49b7b940264 Mon Sep 17 00:00:00 2001
From: Efra Espada