yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
JesmoDev
2024-04-09 14:27:49 +02:00
parent b6c7890011
commit 8cb105b00c
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/repository/rollback.repository.ts
View File

@@ -13,23 +13,19 @@ export class UmbRollbackRepository extends UmbControllerBase implements UmbApi {
}
async requestVersionsByDocumentId(id: string, culture?: string) {
const { data, error } = await this.#dataSource.getVersionsByDocumentId(id, culture);
return { data, error };
return await this.#dataSource.getVersionsByDocumentId(id, culture);
}
async requestVersionById(id: string) {
const { data, error } = await this.#dataSource.getVersionById(id);
return { data, error };
return await this.#dataSource.getVersionById(id);
}
async setPreventCleanup(versionId: string, preventCleanup: boolean) {
const { error } = await this.#dataSource.setPreventCleanup(versionId, preventCleanup);
return { error };
return await this.#dataSource.setPreventCleanup(versionId, preventCleanup);
}
async rollback(versionId: string, culture?: string) {
const { error } = await this.#dataSource.rollback(versionId, culture);
return { error };
return await this.#dataSource.rollback(versionId, culture);
}
}

14
src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
View File

@@ -1,3 +1,4 @@
import { UMB_ROLLBACK_MODAL } from '../../../modals/rollback/index.js';
import { HistoryTagStyleAndText, TimeOptions } from './utils.js';
import { UmbAuditLogRepository } from '@umbraco-cms/backoffice/audit-log';
import {
@@ -15,15 +16,12 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api';
import { UMB_MODAL_MANAGER_CONTEXT, type UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
import { UMB_ROLLBACK_MODAL_ALIAS } from '../../../modals/manifests.js';
import { UMB_ROLLBACK_MODAL } from '../../../modals/rollback/index.js';
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
@customElement('umb-document-workspace-view-info-history')
export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
#logRepository: UmbAuditLogRepository;
#itemsPerPage = 10;
#modalContext?: UmbModalManagerContext;
@property()
documentUnique = '';
@@ -40,9 +38,6 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
constructor() {
super();
this.#logRepository = new UmbAuditLogRepository(this);
this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
this.#modalContext = instance;
});
}
protected firstUpdated(): void {
@@ -95,8 +90,9 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
this.#getLogs();
}
#onRollbackModalOpen = () => {
const modalContext = this.#modalContext?.open(this, UMB_ROLLBACK_MODAL, {});
#onRollbackModalOpen = async () => {
const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
if (!modalContext) return;