@jumoo/usync-expansions 18.3.0 → 18.4.0

package/dist/components/usync-property-layout.js

@@ -24,23 +24,23 @@ let uSyncPropertyLayout = class uSyncPropertyLayout extends UmbLitElement {
     }
     render() {
         // TODO: Only show alias on label if user has access to DocumentType within settings:
-        return html `
-			<div id="headerColumn">
-				<uui-label id="label" title=${this.alias} ?required=${this.mandatory}>
-					${this.localize.string(this.label)}
-					${when(this.invalid, () => html `<div id="invalid-badge">
-								<uui-badge color="invalid" attention>!</uui-badge>
-							</div>`)}
-				</uui-label>
-				<slot name="action-menu"></slot>
-				${__classPrivateFieldGet(this, _uSyncPropertyLayout_instances, "m", _uSyncPropertyLayout_renderDescription).call(this)}
-				<slot name="description"></slot>
-			</div>
-			<div id="editorColumn">
-				<umb-form-validation-message>
-					<slot name="editor"></slot>
-				</umb-form-validation-message>
-			</div>
+        return html `
+			<div id="headerColumn">
+				<uui-label id="label" title=${this.alias} ?required=${this.mandatory}>
+					${this.localize.string(this.label)}
+					${when(this.invalid, () => html `<div id="invalid-badge">
+								<uui-badge color="invalid" attention>!</uui-badge>
+							</div>`)}
+				</uui-label>
+				<slot name="action-menu"></slot>
+				${__classPrivateFieldGet(this, _uSyncPropertyLayout_instances, "m", _uSyncPropertyLayout_renderDescription).call(this)}
+				<slot name="description"></slot>
+			</div>
+			<div id="editorColumn">
+				<umb-form-validation-message>
+					<slot name="editor"></slot>
+				</umb-form-validation-message>
+			</div>
 		`;
     }
 };
@@ -53,86 +53,86 @@ _uSyncPropertyLayout_renderDescription = function _uSyncPropertyLayout_renderDes
         label: this.label,
         description: this.description,
     };
-    return html `<umb-ufm-render
-			id="description"
-			.markdown=${this.description}
+    return html `<umb-ufm-render
+			id="description"
+			.markdown=${this.description}
 			.value=${ufmValue}></umb-ufm-render>`;
 };
 uSyncPropertyLayout.styles = [
     UmbTextStyles,
-    css `
-			:host {
-				display: grid;
-				grid-template-columns: 100px minmax(0, 1fr);
-				column-gap: var(--uui-size-layout-2);
-				padding: var(--uui-size-4) 0;
-				container-type: inline-size;
-			}
-
-			:host(:not([alignment='left'])) {
-				grid-template-columns: 300px minmax(0, 1fr);
-			}
-
-			:host > div {
-				grid-column: span 2;
-			}
-
-			:host(:not([orientation='vertical'])) > div {
-				grid-column: span 1;
-			}
-
-			#headerColumn {
-				position: relative;
-				height: min-content;
-				top: var(--umb-property-layout-header-top);
-			}
-
-			:host(:not([orientation='vertical'])) #headerColumn {
-				position: sticky;
-				top: var(--umb-property-layout-header-top, calc(var(--uui-size-space-2) * -1));
-			}
-
-			:host {
-				/* TODO: Temp solution to not get a yellow asterisk when invalid. */
-				--umb-temp-uui-color-invalid: var(--uui-color-invalid);
-			}
-
-			#label {
-				position: relative;
-				word-break: break-word;
-				/* TODO: Temp solution to not get a yellow asterisk when invalid. */
-				--uui-color-invalid: var(--uui-color-danger);
-			}
-			#invalid-badge {
-				display: inline-block;
-				position: relative;
-				width: 18px;
-				height: 1em;
-				margin-right: 6px;
-			}
-			uui-badge {
-				//height: var(--uui-color-invalid);
-				background-color: var(--umb-temp-uui-color-invalid);
-				color: var(--uui-color-invalid-contrast);
-			}
-
-			#description {
-				color: var(--uui-color-text-alt);
-			}
-
-			#editorColumn {
-				display: flex;
-				align-items: center;
-				margin-top: var(--uui-size-space-3);
-			}
-
-			:host(:not([alignment='left'])) #editorColumn {
-				justify-content: flex-end;
-			}
-
-			:host(:not([orientation='vertical'])) #editorColumn {
-				margin-top: 0;
-			}
+    css `
+			:host {
+				display: grid;
+				grid-template-columns: 100px minmax(0, 1fr);
+				column-gap: var(--uui-size-layout-2);
+				padding: var(--uui-size-4) 0;
+				container-type: inline-size;
+			}
+
+			:host(:not([alignment='left'])) {
+				grid-template-columns: 300px minmax(0, 1fr);
+			}
+
+			:host > div {
+				grid-column: span 2;
+			}
+
+			:host(:not([orientation='vertical'])) > div {
+				grid-column: span 1;
+			}
+
+			#headerColumn {
+				position: relative;
+				height: min-content;
+				top: var(--umb-property-layout-header-top);
+			}
+
+			:host(:not([orientation='vertical'])) #headerColumn {
+				position: sticky;
+				top: var(--umb-property-layout-header-top, calc(var(--uui-size-space-2) * -1));
+			}
+
+			:host {
+				/* TODO: Temp solution to not get a yellow asterisk when invalid. */
+				--umb-temp-uui-color-invalid: var(--uui-color-invalid);
+			}
+
+			#label {
+				position: relative;
+				word-break: break-word;
+				/* TODO: Temp solution to not get a yellow asterisk when invalid. */
+				--uui-color-invalid: var(--uui-color-danger);
+			}
+			#invalid-badge {
+				display: inline-block;
+				position: relative;
+				width: 18px;
+				height: 1em;
+				margin-right: 6px;
+			}
+			uui-badge {
+				//height: var(--uui-color-invalid);
+				background-color: var(--umb-temp-uui-color-invalid);
+				color: var(--uui-color-invalid-contrast);
+			}
+
+			#description {
+				color: var(--uui-color-text-alt);
+			}
+
+			#editorColumn {
+				display: flex;
+				align-items: center;
+				margin-top: var(--uui-size-space-3);
+			}
+
+			:host(:not([alignment='left'])) #editorColumn {
+				justify-content: flex-end;
+			}
+
+			:host(:not([orientation='vertical'])) #editorColumn {
+				margin-top: 0;
+			}
 		`,
 ];
 __decorate([

package/dist/items/sync-item.context.d.ts

@@ -4,7 +4,7 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 export declare class SyncItemContext extends UmbControllerBase {
     #private;
     constructor(host: UmbControllerHost);
-    getSyncItem(entityType: string, id: string): Promise<import("..").SyncEntity | undefined>;
+    getSyncItem(entityType: string, id: string): Promise<import("..").SyncEntity>;
 }
 export default SyncItemContext;
 export declare const SYNC_ITEM_CONTEXT_TOKEN: UmbContextToken<SyncItemContext, SyncItemContext>;

package/dist/items/sync-item.repository.d.ts

@@ -9,14 +9,9 @@ export declare class SyncItemRepository extends UmbControllerBase {
      * @param id they "key" for the item
      * @returns a SyncItem (which as the udi in it.)
      */
-    GetSyncItem(entityType: string, id: string): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<({
+    GetSyncItem(entityType: string, id: string): Promise<import("@umbraco-cms/backoffice/resources").UmbApiResponse<{
         data: import("..").SyncEntity;
-        error: undefined;
-    } | {
-        data: undefined;
-        error: unknown;
-    }) & {
-        request?: Request;
-        response?: Response;
+        request: Request;
+        response: Response;
     }>>;
 }

package/dist/lang/en.d.ts

@@ -1,5 +1,6 @@
 declare const _default: {
     uSyncReport: {
+        previewIncoming: string;
         noChanges: string;
         noChangesDescription: string;
         pendingChanges: string;

package/dist/lang/en.js

@@ -1,5 +1,6 @@
 export default {
     uSyncReport: {
+        previewIncoming: 'Incoming (restore point)',
         noChanges: 'No changes',
         noChangesDescription: 'It looks like the server is up to date and there are no new changes to be made.',
         pendingChanges: '%0% pending changes in %1% items.',

package/dist/licence/components/licence-notice.js

@@ -31,18 +31,18 @@ let uSyncLicenceNoticeElement = class uSyncLicenceNoticeElement extends UmbLitEl
         const messageString = `usynccomplete_licence${status}`;
         const className = status.toLowerCase();
         const icon = status === 'Invalid' ? 'icon-wrong' : 'icon-alert';
-        return html `<div class="licence-alert ${className}">
-			<uui-icon .name=${icon}></uui-icon>
-			<umb-localize key="${messageString}"></umb-localize>
+        return html `<div class="licence-alert ${className}">
+			<uui-icon .name=${icon}></uui-icon>
+			<umb-localize key="${messageString}"></umb-localize>
 		</div>`;
     }
 };
 uSyncLicenceNoticeElement.styles = [
     JumooLicenceStyles,
-    css `
-			.licence-alert {
-				display: block;
-			}
+    css `
+			.licence-alert {
+				display: block;
+			}
 		`,
 ];
 __decorate([

package/dist/licence/components/licence-status.view.js

@@ -18,26 +18,26 @@ let uSyncLicenceStatusView = class uSyncLicenceStatusView extends UmbElementMixi
             return nothing;
         const className = this.licenceStatus?.status.toLocaleLowerCase();
         const icon = this.licenceStatus?.status === 'Valid' ? 'icon-check' : 'icon-alert';
-        return html ` <div class="licence-alert ${className}">
+        return html ` <div class="licence-alert ${className}">
 			<uui-icon .name=${icon}></uui-icon> ${this.licenceStatus?.message ??
-            'licenece is valid'}
-			${when(this.licenceStatus.link, () => html `<a
-						href="${this.licenceStatus?.link ?? '#'}"
-						target="_blank"
-						rel="noopener noreferrer"
-						>${this.licenceStatus?.linkTitle}</a
-					>`)}
+            'licenece is valid'}
+			${when(this.licenceStatus.link, () => html `<a
+						href="${this.licenceStatus?.link ?? '#'}"
+						target="_blank"
+						rel="noopener noreferrer"
+						>${this.licenceStatus?.linkTitle}</a
+					>`)}
 		</div>`;
     }
 };
 uSyncLicenceStatusView.styles = [
     UmbTextStyles,
     JumooLicenceStyles,
-    css `
-			:host {
-				display: block;
-				margin-bottom: 10px;
-			}
+    css `
+			:host {
+				display: block;
+				margin-bottom: 10px;
+			}
 		`,
 ];
 __decorate([

package/dist/licence/components/styles.js

@@ -1,41 +1,41 @@
 import { css } from '@umbraco-cms/backoffice/external/lit';
-export const JumooLicenceStyles = css `
-	.licence-alert {
-		padding: 20px;
-		border-radius: var(--uui-button-border-radius, var(--uui-border-radius, 3px));
-	}
-
-	uui-icon {
-		padding-right: 10px;
-		font-size: var(--uui-type-h4-size);
-	}
-
-	.valid {
-		background-color: var(--uui-color-positive);
-		color: var(--uui-color-positive-contrast);
-	}
-
-	.invalid,
-	.expired {
-		background-color: var(--uui-color-danger);
-		color: var(--uui-color-danger-contrast);
-	}
-
-	.trial {
-		background-color: var(--uui-color-warning);
-		color: var(--uui-color-warning-contrast);
-	}
-
-	.licence-alert a {
-		color: var(--uui-color-positive-contrast) !important;
-	}
-
-	.trial a {
-		color: var(--uui-color-warning-contrast) !important;
-	}
-
-	.invalid a,
-	.expired a {
-		color: var(--uui-color-danger-contrast) !important;
-	}
+export const JumooLicenceStyles = css `
+	.licence-alert {
+		padding: 20px;
+		border-radius: var(--uui-button-border-radius, var(--uui-border-radius, 3px));
+	}
+
+	uui-icon {
+		padding-right: 10px;
+		font-size: var(--uui-type-h4-size);
+	}
+
+	.valid {
+		background-color: var(--uui-color-positive);
+		color: var(--uui-color-positive-contrast);
+	}
+
+	.invalid,
+	.expired {
+		background-color: var(--uui-color-danger);
+		color: var(--uui-color-danger-contrast);
+	}
+
+	.trial {
+		background-color: var(--uui-color-warning);
+		color: var(--uui-color-warning-contrast);
+	}
+
+	.licence-alert a {
+		color: var(--uui-color-positive-contrast) !important;
+	}
+
+	.trial a {
+		color: var(--uui-color-warning-contrast) !important;
+	}
+
+	.invalid a,
+	.expired a {
+		color: var(--uui-color-danger-contrast) !important;
+	}
 `;

package/dist/licence/lang/en.d.ts

@@ -12,6 +12,21 @@ declare const _default: {
         licenceSubscriptionInfo: string;
         licenceClearHeading: string;
         licenceClearContent: string;
+        temporaryHeadline: string;
+        temporaryDescription: string;
+        temporaryButton: string;
+        temporaryConfirmHeadline: string;
+        temporaryConfirmContent: string;
+        temporaryConfirmBuy: string;
+        temporaryConfirmLabel: string;
+        temporarySaved: string;
+        temporarySavedExpires: string;
+        temporaryUpgrade: string;
+        temporaryInConfigHeadline: string;
+        temporaryInConfig: string;
+        temporaryKey: string;
+        temporaryDomains: string;
+        temporaryFailed: string;
     };
 };
 export default _default;

package/dist/licence/lang/en.js

@@ -9,9 +9,24 @@ export default {
         licenceAutoRenews: 'This licence will auto-renew at the end of the period.',
         licenceNotAutoRenews: 'This licence does not auto-renew, You will need to renew it manually.',
         licenceStatus: 'uSync.Complete licence status',
-        licenceSubscriptionInfo: `<p>Your subscription licence can be managed via the link sent to you when you purchased licence</p>
+        licenceSubscriptionInfo: `<p>Your subscription licence can be managed via the link sent to you when you purchased licence</p>
 			<p>For security reasons we don't show you that information in the umbraco back office but you can request that we send the details again</p>`,
         licenceClearHeading: 'Clear licence details?',
         licenceClearContent: 'Do you want to remove this current licence details? Once cleared you will need to re-enter your licence details.',
+        temporaryHeadline: 'This key is for an older version',
+        temporaryDescription: 'You can get a one-off 60 day licence while you upgrade.',
+        temporaryButton: 'Get a temporary licence',
+        temporaryConfirmHeadline: 'Get a temporary licence?',
+        temporaryConfirmContent: 'This gives you a licence that lasts 60 days, so you can keep working while you upgrade your licence. Each key can only get one temporary licence.',
+        temporaryConfirmBuy: 'You will need to buy an upgraded licence before the temporary one runs out.',
+        temporaryConfirmLabel: 'Get licence',
+        temporarySaved: 'Your temporary licence has been saved.',
+        temporarySavedExpires: 'Your temporary licence has been saved. It expires on {0}.',
+        temporaryUpgrade: 'Upgrade your licence',
+        temporaryInConfigHeadline: 'Your temporary licence',
+        temporaryInConfig: 'Your licence is set in appsettings, so it can not be saved here. Replace the key and domains in the <code>uSync:Complete:Licence</code> section of your appsettings with these values, then restart the site.',
+        temporaryKey: 'Key',
+        temporaryDomains: 'Domains',
+        temporaryFailed: 'Unable to get a temporary licence',
     },
 };

package/dist/licence/licence.context.d.ts

@@ -1,7 +1,7 @@
 import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { Licence, LicenceInfo, LicenceStatusView } from '@jumoo/usync-expansions';
+import { Licence, LicenceInfo, LicenceStatusView, TemporaryLicenceResult } from '@jumoo/usync-expansions';
 import './components/licence-notice';
 export declare class uSyncLicenceContext extends UmbControllerBase {
     #private;
@@ -10,6 +10,11 @@ export declare class uSyncLicenceContext extends UmbControllerBase {
     constructor(host: UmbControllerHost);
     refresh(): Promise<void>;
     saveLicence(licence: LicenceInfo): Promise<void>;
+    /**
+     * Ask the jumoo site for a one-off 60 day licence for a key from an older version.
+     * When the key is saved we refresh, so the page shows the new expiry.
+     */
+    requestTemporaryLicence(): Promise<TemporaryLicenceResult | undefined>;
     loadLicence(): Promise<void>;
     getLicenceStatus(): Promise<void>;
 }

package/dist/licence/licence.context.js

@@ -48,6 +48,17 @@ export class uSyncLicenceContext extends UmbControllerBase {
             });
         }
     }
+    /**
+     * Ask the jumoo site for a one-off 60 day licence for a key from an older version.
+     * When the key is saved we refresh, so the page shows the new expiry.
+     */
+    async requestTemporaryLicence() {
+        const { data } = await __classPrivateFieldGet(this, _uSyncLicenceContext_repository, "f").requestTemporaryLicence();
+        if (data?.saved) {
+            await this.refresh();
+        }
+        return data;
+    }
     async loadLicence() {
         const { data } = await __classPrivateFieldGet(this, _uSyncLicenceContext_repository, "f").getLicence();
         if (data) {

package/dist/licence/licence.element.d.ts

@@ -1,16 +1,23 @@
 import { LitElement, nothing } from '@umbraco-cms/backoffice/external/lit';
-import { LicenceInfo, LicenceStatusView } from '@jumoo/usync-expansions';
+import { LicenceInfo, LicenceStatusView, TemporaryLicenceResult } from '@jumoo/usync-expansions';
 import { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
 declare const uSyncLicenceViewElement_base: import("@umbraco-cms/backoffice/extension-api").HTMLElementConstructor<import("@umbraco-cms/backoffice/element-api").UmbElement> & typeof LitElement;
 export declare class uSyncLicenceViewElement extends uSyncLicenceViewElement_base {
     #private;
     saveState?: UUIButtonState;
+    private _temporaryResult?;
+    private _requestingTemporary;
     constructor();
     connectedCallback(): void;
     licence: LicenceInfo;
     licenceStatus: LicenceStatusView | undefined;
     render(): import("lit-html").TemplateResult<1>;
     renderStatus(): import("lit-html").TemplateResult<1>;
+    renderTemporary(): typeof nothing | import("lit-html").TemplateResult<1>;
+    renderTemporarySaved(result: TemporaryLicenceResult): import("lit-html").TemplateResult<1>;
+    renderTemporaryInConfig(result: TemporaryLicenceResult): import("lit-html").TemplateResult<1>;
+    renderCopyValue(labelKey: string, value: string): import("lit-html").TemplateResult<1>;
+    renderUpgradeButton(): import("lit-html").TemplateResult<1>;
     renderDetails(): typeof nothing | import("lit-html").TemplateResult<1>;
     renderSubscription(): typeof nothing | import("lit-html").TemplateResult<1>;
     renderExpiration(): typeof nothing | import("lit-html").TemplateResult<1>;