@jumoo/processing 17.4.2 → 17.4.3-prerelease.10

package/dist/pipeline/pipeline.source.d.ts

@@ -3,6 +3,10 @@ import { PipelineStatus } from '../api';
 export declare class PipelineSource {
     private readonly host;
     constructor(host: UmbControllerHost);
+    /**
+     * @description a 409 (another pipeline holds this one's concurrency key, so it can't resume)
+     * is returned as the error without a notification - see getPipelineConflict.
+     */
     process(id: string, clientId: string | null): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
         data: import("..").Pipeline;
         request: Request;
@@ -19,6 +23,10 @@ export declare class PipelineSource {
         request: Request;
         response: Response;
     }>>;
+    /**
+     * @description a 409 (the new options' concurrency key is held) is returned as the error
+     * without a notification - see getPipelineConflict.
+     */
     update(id: string, body: any): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
         data: import("..").ProcessingOptionsResults;
         request: Request;
@@ -42,7 +50,8 @@ export declare class PipelineSource {
     /**
      *
      * @param strategy alias of the strategy to use for the pipeline
-     * @returns
+     * @returns the new pipeline's id. A 409 (another pipeline holds its concurrency key) is
+     * returned as the error without a notification - see getPipelineConflict.
      */
     create(processor: string, strategy: string, options: any): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
         data: string;
@@ -68,6 +77,15 @@ export declare class PipelineSource {
         request: Request;
         response: Response;
     }>>;
+    /**
+     * @param id guid id of the pipeline
+     * @returns its run status, or an error (without a notification) if the user can't see it.
+     */
+    getRunStatus(id: string): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
+        data: import("..").PipelineRunStatus;
+        request: Request;
+        response: Response;
+    }>>;
     listPiplelines(status: PipelineStatus): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
         data: import("..").Pipeline[];
         request: Request;

package/dist/pipeline/pipeline.source.js

@@ -1,11 +1,16 @@
 import { tryExecute } from '@umbraco-cms/backoffice/resources';
 import { PipelinesService } from '../api';
+import { tryExecuteAllowingConflict } from './pipeline-conflict.js';
 export class PipelineSource {
     constructor(host) {
         this.host = host;
     }
+    /**
+     * @description a 409 (another pipeline holds this one's concurrency key, so it can't resume)
+     * is returned as the error without a notification - see getPipelineConflict.
+     */
     async process(id, clientId) {
-        const result = await tryExecute(this.host, PipelinesService.processPipeline({
+        const result = await tryExecuteAllowingConflict(this.host, PipelinesService.processPipeline({
             path: { id: id },
             query: { clientId: clientId ?? undefined },
         }));
@@ -24,8 +29,12 @@ export class PipelineSource {
         }));
         return result;
     }
+    /**
+     * @description a 409 (the new options' concurrency key is held) is returned as the error
+     * without a notification - see getPipelineConflict.
+     */
     async update(id, body) {
-        return await tryExecute(this.host, PipelinesService.updatePipeline({
+        return await tryExecuteAllowingConflict(this.host, PipelinesService.updatePipeline({
             path: { id: id },
             body: body,
         }));
@@ -44,10 +53,11 @@ export class PipelineSource {
     /**
      *
      * @param strategy alias of the strategy to use for the pipeline
-     * @returns
+     * @returns the new pipeline's id. A 409 (another pipeline holds its concurrency key) is
+     * returned as the error without a notification - see getPipelineConflict.
      */
     async create(processor, strategy, options) {
-        return await tryExecute(this.host, PipelinesService.createPipeline({
+        return await tryExecuteAllowingConflict(this.host, PipelinesService.createPipeline({
             body: {
                 alias: processor,
                 strategy: strategy,
@@ -73,6 +83,15 @@ export class PipelineSource {
             path: { id: id },
         }));
     }
+    /**
+     * @param id guid id of the pipeline
+     * @returns its run status, or an error (without a notification) if the user can't see it.
+     */
+    async getRunStatus(id) {
+        return await tryExecute(this.host, PipelinesService.pipelineStatus({ path: { id: id } }), {
+            disableNotifications: true,
+        });
+    }
     async listPiplelines(status) {
         return await tryExecute(this.host, PipelinesService.listPipelines({ path: { status: status } }));
     }

package/dist/pipeline/workspace/views/default-pipeline-view.js

@@ -50,30 +50,30 @@ let JumooProcessingPipelineWorkspaceDefaultViewElement = class JumooProcessingPi
         this.progressLabel = this.localize.term('jumooProc_process');
     }
     render() {
-        return html `<umb-body-layout .headline=${this.headline}>
-			<jumoo-pipeline
-				.pipelineId=${this.pipeline?.id}
-				.setup=${this.pipeline?.options}
-				.debug=${false}
-				@pipeline-status=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onStatusChange)}
-				@pipeline-valid=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onSetValid)}
-				@pipeline-complete=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onComplete)}
-				@pipeline-modal-update=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onUpdateModal)}></jumoo-pipeline>
-			<div slot="actions">${this.renderActions()}</div>
+        return html `<umb-body-layout .headline=${this.headline}>
+			<jumoo-pipeline
+				.pipelineId=${this.pipeline?.id}
+				.setup=${this.pipeline?.options}
+				.debug=${false}
+				@pipeline-status=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onStatusChange)}
+				@pipeline-valid=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onSetValid)}
+				@pipeline-complete=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onComplete)}
+				@pipeline-modal-update=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onUpdateModal)}></jumoo-pipeline>
+			<div slot="actions">${this.renderActions()}</div>
 		</umb-body-layout>`;
     }
     renderActions() {
         const actionButton = this._status === PipelineStatus.WAITING && this._isValid && !this._isLastAction
-            ? html `<uui-button
-						@click=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onProcess)}
-						color="positive"
-						look="primary"
+            ? html `<uui-button
+						@click=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onProcess)}
+						color="positive"
+						look="primary"
 						.label=${this.progressLabel}></uui-button>`
             : nothing;
-        const closeButton = html `<uui-button
-			@click=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onClose)}
-			color="default"
-			look="default"
+        const closeButton = html `<uui-button
+			@click=${__classPrivateFieldGet(this, _JumooProcessingPipelineWorkspaceDefaultViewElement_instances, "m", _JumooProcessingPipelineWorkspaceDefaultViewElement_onClose)}
+			color="default"
+			look="default"
 			label=${this.closeLabel}></uui-button>`;
         return html `${closeButton} ${actionButton}`;
     }

package/dist/queue/components/queue-list.element.js

@@ -27,34 +27,34 @@ let JumooQueueListElement = class JumooQueueListElement extends UmbLitElement {
         this.loading = false;
     }
     render() {
-        return html `<uui-box style="--uui-box-default-padding: 0;" .headline=${this.headline}>
-			<div slot="header-actions">
-				<uui-button label="refresh" @click=${this.onRefresh} compact
-					><uui-icon name="icon-refresh"></uui-icon
-				></uui-button>
-			</div>
-			${when(this.loading, () => html `<uui-loader-bar
-						animationDuration="1.5"
-						style="color: black"></uui-loader-bar>`, () => this.renderTable())}
+        return html `<uui-box style="--uui-box-default-padding: 0;" .headline=${this.headline}>
+			<div slot="header-actions">
+				<uui-button label="refresh" @click=${this.onRefresh} compact
+					><uui-icon name="icon-refresh"></uui-icon
+				></uui-button>
+			</div>
+			${when(this.loading, () => html `<uui-loader-bar
+						animationDuration="1.5"
+						style="color: black"></uui-loader-bar>`, () => this.renderTable())}
 		</uui-box>`;
     }
     renderTable() {
         return !this.queue || !this.queue.items.length
             ? html `<div class="emtpy">Nothing in the queue</div>`
-            : html `<jumoo-queue-table
-					.items=${this.queue.items}
+            : html `<jumoo-queue-table
+					.items=${this.queue.items}
 					@process-queue-item=${this._onProcessQueueItem}></jumoo-queue-table>`;
     }
     async _onProcessQueueItem(e) {
         await this._queueContext.process(e.detail.key);
     }
 };
-JumooQueueListElement.styles = css `
-		.emtpy {
-			display: flex;
-			justify-content: center;
-			padding: var(--uui-size-space-5);
-		}
+JumooQueueListElement.styles = css `
+		.emtpy {
+			display: flex;
+			justify-content: center;
+			padding: var(--uui-size-space-5);
+		}
 	`;
 __decorate([
     property({ type: String })

package/dist/queue/components/queue-table.element.js

@@ -93,24 +93,24 @@ let JumooQueueTableElement = class JumooQueueTableElement extends UmbLitElement
             };
         })
             .filter((item) => item !== undefined);
-        return html ` <umb-table
-			.items=${items}
-			.config=${this.tableConfig}
-			.columns=${this.tableColumns}
+        return html ` <umb-table
+			.items=${items}
+			.config=${this.tableConfig}
+			.columns=${this.tableColumns}
 			.filter=${this.filter}></umb-table>`;
     }
     renderActions(item) {
-        return html ` <uui-button-group>
-			${when(this.showViewDetails, () => html ` <uui-button
-						label="Details"
-						color="default"
-						look="primary"
-						@click=${() => __classPrivateFieldGet(this, _JumooQueueTableElement_instances, "m", _JumooQueueTableElement_onViewDetails).call(this, item)}></uui-button>`)}
-			${when(!this.hideProcess, () => html ` <uui-button
-						label="Process"
-						color="positive"
-						look="outline"
-						@click=${() => __classPrivateFieldGet(this, _JumooQueueTableElement_instances, "m", _JumooQueueTableElement_onProcess).call(this, item)}></uui-button>`)}
+        return html ` <uui-button-group>
+			${when(this.showViewDetails, () => html ` <uui-button
+						label="Details"
+						color="default"
+						look="primary"
+						@click=${() => __classPrivateFieldGet(this, _JumooQueueTableElement_instances, "m", _JumooQueueTableElement_onViewDetails).call(this, item)}></uui-button>`)}
+			${when(!this.hideProcess, () => html ` <uui-button
+						label="Process"
+						color="positive"
+						look="outline"
+						@click=${() => __classPrivateFieldGet(this, _JumooQueueTableElement_instances, "m", _JumooQueueTableElement_onProcess).call(this, item)}></uui-button>`)}
 		</uui-button-group>`;
     }
 };

package/package.json

@@ -1,51 +1,58 @@
-{
-	"name": "@jumoo/processing",
-	"licence": "custom",
-	"version": "17.4.2",
-	"type": "module",
-	"description": "Jumoo processing library",
-	"exports": {
-		".": "./dist/index.js",
-		"./pipeline": "./dist/pipeline/index.js",
-		"./signalr": "./dist/signalr/index.js",
-		"./api": "./dist/api/index.js"
-	},
-	"files": [
-		"./dist/**/*"
-	],
-	"author": {
-		"name": "Jumoo",
-		"email": "info@jumoo.co.uk",
-		"url": "https://jumoo.co.uk"
-	},
-	"publishConfig": {},
-	"scripts": {
-		"client:build": "tsc --project ./tsconfig.dist.json",
-		"client:pack": "npm pack --pack-destination ./pack",
-		"client:publish": "npm publish -tag next",
-		"client:make": "npm run client:build && npm run client:pack && npm run client:publish",
-		"client:link": "npm link",
-		"generate": "openapi-ts",
-		"lint": "eslint .",
-		"lint:fix": "eslint . --fix",
-		"format:fix": "npm run format -- --write",
-		"format": "prettier \"src/**/*.ts\" --check",
-		"build": "tsc && vite build",
-		"watch": "vite build --watch",
-		"make": "npm run build && npm run client:make"
-	},
-	"devDependencies": {
-		"@eslint/js": "^10.0.1",
-		"@hey-api/openapi-ts": "^0.95.0",
-		"@microsoft/signalr": "^10.0.0",
-		"@umbraco-cms/backoffice": "^17.3.0",
-		"eslint": "^10.2.0",
-		"globals": "^17.8.0",
-		"lit": "^3.3.2",
-		"prettier": "^3.8.2",
-		"typescript": "^6.0.2",
-		"typescript-eslint": "^8.65.0",
-		"vite": "^8.0.8",
-		"vite-plugin-dts": "^4.5.4"
-	}
-}
+{
+	"name": "@jumoo/processing",
+	"licence": "custom",
+	"version": "17.4.3-prerelease.10",
+	"type": "module",
+	"description": "Jumoo processing library",
+	"exports": {
+		".": "./dist/index.js",
+		"./pipeline": "./dist/pipeline/index.js",
+		"./signalr": "./dist/signalr/index.js",
+		"./api": "./dist/api/index.js"
+	},
+	"files": [
+		"./dist/**/*"
+	],
+	"author": {
+		"name": "Jumoo",
+		"email": "info@jumoo.co.uk",
+		"url": "https://jumoo.co.uk"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"scripts": {
+		"client:build": "tsc --project ./tsconfig.dist.json",
+		"client:pack": "npm pack --pack-destination ./pack",
+		"client:publish": "npm publish -tag next",
+		"client:make": "npm run client:build && npm run client:pack && npm run client:publish",
+		"client:link": "npm link",
+		"generate": "openapi-ts",
+		"lint": "eslint .",
+		"lint:fix": "eslint . --fix",
+		"format:fix": "npm run format -- --write",
+		"format": "prettier \"src/**/*.ts\" --check",
+		"build": "tsc && vite build",
+		"watch": "vite build --watch",
+		"make": "npm run build && npm run client:make"
+	},
+	"devDependencies": {
+		"@eslint/js": "^10.0.1",
+		"@hey-api/openapi-ts": "^0.95.0",
+		"@microsoft/signalr": "^10.0.0",
+		"@umbraco-cms/backoffice": "^17.3.0",
+		"eslint": "^10.2.0",
+		"globals": "^17.8.0",
+		"lit": "^3.3.2",
+		"prettier": "^3.8.2",
+		"typescript": "^6.0.2",
+		"typescript-eslint": "^8.65.0",
+		"vite": "^8.0.8",
+		"vite-plugin-dts": "^4.5.4"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/Jumoo/Jumoo.Processing.git",
+		"directory": "Jumoo.Processing.Client/jumoo-processing-assets"
+	}
+}