typo3-typescript-sources 14.3.6 → 14.3.7

package/form/backend/form-wizard/steps/settings-step.ts

@@ -184,6 +184,11 @@ export class SettingsStep implements WizardStepInterface, WizardStepValueInterfa
 
     let templatesFormGroup: TemplateResult | typeof nothing = nothing;
     if (templates.length > 0) {
+      // Auto-select first template if none selected yet
+      if (!this.data.template) {
+        this.setValue({ template: templates[0].value });
+      }
+
       templatesFormGroup = html `
         <div class="form-group">
           <label class="form-label" for="new-form-template">${formManagerLabels.get('formManager.form_template')}</label>
@@ -226,11 +231,9 @@ export class SettingsStep implements WizardStepInterface, WizardStepValueInterfa
   }
 
   private setPrototype(currentPrototype: string ): void {
-    const currentTemplates = this.context.formManager.getTemplatesForPrototype(currentPrototype);
-
     this.setValue({
       prototype: currentPrototype,
-      template: (currentTemplates[0]?.value ?? '')
+      template: ''
     });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typo3-typescript-sources",
-  "version": "14.3.6",
+  "version": "14.3.7",
   "description": "TYPO3 Core TypeScript Sources - Extracted from TYPO3/typo3 repository",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,7 +28,7 @@
   },
   "typo3": {
     "sourceRepository": "https://github.com/TYPO3/typo3",
-    "sourceTag": "v14.3.6",
+    "sourceTag": "v14.3.7",
     "sourcePath": "Build/Sources/TypeScript"
   }
 }

package/workspaces/backend.ts

@@ -469,6 +469,7 @@ class Backend extends Workspaces {
     }
 
     const workspacesRecordTable = document.querySelector('typo3-workspaces-record-table');
+    workspacesRecordTable.additionalColumns = result.additionalColumns ?? {};
     workspacesRecordTable.results = result.data;
   }
 
@@ -517,9 +518,13 @@ class Backend extends Workspaces {
         filterFields: true
       }),
     ).then(async (response: AjaxResponse): Promise<void> => {
-      const item = (await response.resolve())[0].result.data[0];
-      const modalButtons = [];
+      const details = await response.resolve();
+      const item = details[0]?.result.data[0];
+      if (item === undefined) {
+        return;
+      }
 
+      const modalButtons = [];
       const content = document.createElement('typo3-workspaces-record-information');
       content.record = item;
 

package/workspaces/renderable/comment-view.ts

@@ -16,12 +16,13 @@ import { html, LitElement, nothing, type TemplateResult } from 'lit';
 import { repeat } from 'lit/directives/repeat.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { nl2br } from '@typo3/core/directive/nl2br';
+import labels from '~labels/workspaces.messages';
 
 type Comment = {
   user_comment: string;
   previous_stage_title: string;
   stage_title: string;
-  tstamp: number;
+  tstamp: string;
   user_username: string;
   user_avatar: string
 };
@@ -64,7 +65,8 @@ export class CommentViewElement extends LitElement {
               ${comment.previous_stage_title} ⇾ ${comment.stage_title}
             </span>
             <span class="badge badge-info">
-              ${comment.tstamp}
+              ${comment.tstamp ? labels.get('comment.tstamp.value', { tstamp: new Date(comment.tstamp) }) : nothing}
+            </span>
           </div>
         </div>
       </div>

package/workspaces/renderable/record-table.ts

@@ -24,6 +24,14 @@ import '@typo3/backend/element/icon-element';
 import '@typo3/backend/element/qrcode-modal-button';
 import 'bootstrap'; // for data-bs-toggle="dropdown"
 
+export type AdditionalColumnValue = {
+  label?: string,
+  value?: string,
+  icon?: string,
+  title?: string,
+  url?: string
+};
+
 export type RecordData = {
   table: string,
   id: string,
@@ -38,7 +46,7 @@ export type RecordData = {
   value_nextStage: number,
   value_prevStage: number,
   path_Workspace: string,
-  lastChangedFormatted: string,
+  lastChanged: string,
   lastEditorId: number,
   lastEditorName: string,
   lastEditorRealName: string,
@@ -67,7 +75,8 @@ export type RecordData = {
   integrity: {
     status: string,
     messages: string
-  }
+  },
+  additional?: Record<string, AdditionalColumnValue>
 };
 
 @customElement('typo3-workspaces-record-table')
@@ -75,6 +84,12 @@ export class RecordTableElement extends LitElement {
   @property({ type: Array })
   public results: RecordData[] = [];
 
+  /**
+   * Labels of columns added by third party extensions, indexed by column identifier.
+   */
+  @property({ type: Object })
+  public additionalColumns: Record<string, string> = {};
+
   private latestPath: string | null = null;
 
   protected override createRenderRoot(): HTMLElement | ShadowRoot {
@@ -139,6 +154,7 @@ export class RecordTableElement extends LitElement {
             <th class="col-state">${labels.get('column.wsStateAction')}</th>
             <th class="col-state">${labels.get('column.integrity')}</th>
             <th>${labels.get('column.stage')}</th>
+            ${Object.values(this.additionalColumns).map((label: string) => html`<th>${label}</th>`)}
             <th class="col-control nowrap">
               <span class="visually-hidden">${coreLabels.get('labels._CONTROL_')}</span>
             </th>
@@ -200,7 +216,7 @@ export class RecordTableElement extends LitElement {
     return html`
       ${latestPathChanged ? html`
         <tr>
-          <th colspan="8" class="col-white-space-normal">
+          <th colspan=${8 + Object.keys(this.additionalColumns).length} class="col-white-space-normal">
             <a href=${data.urlToPage}>${data.path_Workspace}</a>
           </th>
         </tr>
@@ -251,7 +267,7 @@ export class RecordTableElement extends LitElement {
           ` : html`
             <span class="text-variant">${labels.get('column.editor.unknown')}</span>
           `}
-            ${data.lastChangedFormatted}
+            ${data.lastChanged ? labels.get('column.last_change.value', { last_change: new Date(data.lastChanged) }) : nothing}
           </div>
         </td>
         <td class="col-state">
@@ -263,6 +279,7 @@ export class RecordTableElement extends LitElement {
           </span>
         ` : nothing}</td>
         <td>${data.label_Stage}</td>
+        ${Object.keys(this.additionalColumns).map((identifier: string) => this.renderAdditionalColumn(data, identifier))}
         <td class="col-control nowrap">
           <div class="btn-group">${this.renderElementActions(data)}</div>
           <div class="btn-group">${this.renderVersioningActions(data)}</div>
@@ -271,6 +288,26 @@ export class RecordTableElement extends LitElement {
     `;
   }
 
+  protected renderAdditionalColumn(data: RecordData, identifier: string): TemplateResult {
+    const column = data.additional?.[identifier];
+    if (column === undefined) {
+      return html`<td></td>`;
+    }
+
+    const content = html`
+      ${column.icon ? html`
+        <typo3-backend-icon identifier=${column.icon} size="small"></typo3-backend-icon>
+      ` : nothing}
+      ${column.value ?? ''}
+    `;
+
+    return html`
+      <td title=${ifDefined(column.title || undefined)}>
+        ${column.url ? html`<a href=${column.url}>${content}</a>` : content}
+      </td>
+    `;
+  }
+
   protected renderIndent(level: number) {
     return html`<span class="indent indent-inline-block" style="--indent-level: ${level}"></span>`;
   }

package/workspaces/workspaces.ts

@@ -11,14 +11,28 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-import type { AjaxResponse } from '@typo3/core/ajax/ajax-response';
+import { AjaxResponse } from '@typo3/core/ajax/ajax-response';
 import AjaxRequest from '@typo3/core/ajax/ajax-request';
 import { SeverityEnum } from '@typo3/backend/enum/severity';
 import { ProgressBarElement } from '@typo3/backend/element/progress-bar-element';
+import Notification from '@typo3/backend/notification';
 import { default as Modal, type ModalElement } from '@typo3/backend/modal';
 import { html } from 'lit';
 import labels from '~labels/workspaces.messages';
 
+/**
+ * Result of a single call of a dispatched call stack, carrying either
+ * `result` if the call succeeded, or `error` if it did not.
+ */
+interface RemoteCallResult {
+  method: string;
+  result?: unknown;
+  error?: {
+    message: string;
+    code: number;
+  };
+}
+
 export default class Workspaces {
   protected readonly ajaxRoute: string = 'workspace_dispatch';
   protected progressBar: ProgressBarElement | null = null;
@@ -73,18 +87,22 @@ export default class Workspaces {
     this.progressBar = document.createElement('typo3-backend-progress-bar');
     document.querySelector(progressContainer).prepend(this.progressBar);
     this.progressBar.start();
-    return (new AjaxRequest(TYPO3.settings.ajaxUrls[this.ajaxRoute])).post(
-      payload,
-      {
-        headers: {
-          'Content-Type': 'application/json; charset=utf-8'
+    const headers = {
+      'Content-Type': 'application/json; charset=utf-8'
+    };
+    return new AjaxRequest(TYPO3.settings.ajaxUrls[this.ajaxRoute])
+      .post(payload, { headers })
+      .catch(async (reason: unknown): Promise<never> => {
+        await this.notifyRequestFailure(reason);
+        // Rejection is kept up, so that callers do not continue with a payload
+        // that carries errors instead of the results they are written for.
+        throw reason;
+      })
+      .finally(() => {
+        if (this.progressBar) {
+          this.progressBar.done();
         }
-      }
-    ).finally(() => {
-      if (this.progressBar) {
-        this.progressBar.done();
-      }
-    });
+      });
   }
 
   /**
@@ -105,4 +123,39 @@ export default class Workspaces {
       method: method,
     };
   }
+
+  /**
+   * Reports a failed request to the user. The server describes failing calls in the
+   * JSON body, anything else - an unreachable server, a session timeout redirect or
+   * an error page that is no JSON at all - can only be reported in a generic way.
+   */
+  private async notifyRequestFailure(reason: unknown): Promise<void> {
+    const title = labels.get('error.dispatch.title');
+    if (!(reason instanceof AjaxResponse)) {
+      Notification.error(title, labels.get('error.dispatch.unavailable'));
+      return;
+    }
+
+    let details: unknown;
+    try {
+      details = await reason.resolve('json');
+    } catch {
+      Notification.error(title, labels.get('error.dispatch.unavailable'));
+      return;
+    }
+
+    const messages: string[] = [];
+    if (Array.isArray(details)) {
+      for (const item of details as RemoteCallResult[]) {
+        if (item?.error?.message) {
+          messages.push(item.error.message);
+        }
+      }
+    }
+    if (messages.length === 0) {
+      Notification.error(title, labels.get('error.dispatch.unknown'));
+      return;
+    }
+    messages.forEach((message: string): void => Notification.error(title, message));
+  }
 }