Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
ashklianko committed Oct 23, 2024
1 parent b5ffe4d commit 81354f2
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 23 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ appProjectName=contentstudio
libProjectName=lib-contentstudio
restProjectName=rest
xpVersion=7.15.0-SNAPSHOT
libAdminUiVersion=5.0.0-SNAPSHOT
libAdminUiVersion=5.0.0-AI-SNAPSHOT
version=5.3.0-SNAPSHOT
1 change: 0 additions & 1 deletion modules/app/src/main/resources/assets/js/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {ElementEvent} from '@enonic/lib-admin-ui/dom/ElementEvent';
import {SettingsAppContainer} from 'lib-contentstudio/app/settings/SettingsAppContainer';
import {CONFIG} from '@enonic/lib-admin-ui/util/Config';
import {ProjectConfigContext} from 'lib-contentstudio/app/settings/data/project/ProjectConfigContext';
import * as Q from 'q';

const waitForWidgetElemAttached = (elemId: string): void => {
const body: Body = Body.get();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import {EditContentEvent} from '../../event/EditContentEvent';
import {ContentSummaryAndCompareStatus} from '../../content/ContentSummaryAndCompareStatus';
import {DefaultErrorHandler} from '@enonic/lib-admin-ui/DefaultErrorHandler';
import {showWarning} from '@enonic/lib-admin-ui/notify/MessageBus';
import {i18n} from '@enonic/lib-admin-ui/util/Messages';
import {ContentSummaryAndCompareStatus} from '../../content/ContentSummaryAndCompareStatus';
import {EditContentEvent} from '../../event/EditContentEvent';
import {ContentTreeGrid} from '../ContentTreeGrid';
import {ContentLocalizer} from './ContentLocalizer';
import {ContentTreeGridAction} from './ContentTreeGridAction';
import {ContentTreeGridItemsState} from './ContentTreeGridItemsState';
import {DefaultErrorHandler} from '@enonic/lib-admin-ui/DefaultErrorHandler';
import {ContentsLocalizer} from './ContentsLocalizer';
import {SelectableListBoxWrapper} from '@enonic/lib-admin-ui/ui/selector/list/SelectableListBoxWrapper';

export class EditContentAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ import {HtmlEditor} from '../ui/text/HtmlEditor';
import {HtmlEditorParams} from '../ui/text/HtmlEditorParams';
import {StylesRequest} from '../ui/text/styles/StylesRequest';
import {HtmlAreaResizeEvent} from './HtmlAreaResizeEvent';
import {ProjectContext} from '../../project/ProjectContext';
import {DefaultErrorHandler} from '@enonic/lib-admin-ui/DefaultErrorHandler';

export class HtmlArea
extends BaseInputTypeNotManagingAdd {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {StylesRequest} from './styles/StylesRequest';
import editor = CKEDITOR.editor;
import eventInfo = CKEDITOR.eventInfo;
import {ObjectHelper} from '@enonic/lib-admin-ui/ObjectHelper';
import {EnonicAiToggleDialogEvent} from '../../../saga/event/outgoing/EnonicAiToggleDialogEvent';

export interface HtmlEditorCursorPosition {
selectionIndexes: number[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ import {GetApplicationsRequest} from '../resource/GetApplicationsRequest';
import {GetApplicationXDataRequest} from '../resource/GetApplicationXDataRequest';
import {GetContentByIdRequest} from '../resource/GetContentByIdRequest';
import {GetContentXDataRequest} from '../resource/GetContentXDataRequest';
import {GetPageTemplateByKeyRequest} from '../resource/GetPageTemplateByKeyRequest';
import {IsRenderableRequest} from '../resource/IsRenderableRequest';
import {Router} from '../Router';
import {ProjectDeletedEvent} from '../settings/event/ProjectDeletedEvent';
Expand Down Expand Up @@ -152,12 +151,6 @@ import {WizardStepsPanel} from '@enonic/lib-admin-ui/app/wizard/WizardStepsPanel
import {ContentWizardStepsPanel} from './ContentWizardStepsPanel';
import {ContentDiffHelper} from '../util/ContentDiffHelper';
import {ContentDiff} from '../content/ContentDiff';
import {SagaInputEventsListener} from '../saga/SagaInputEventsListener';
import {AIAssistantEventsMediator} from '../saga/AIAssistantEventsMediator';
import {ValueType} from '@enonic/lib-admin-ui/data/ValueType';
import {ValueTypes} from '@enonic/lib-admin-ui/data/ValueTypes';
import {PropertyChangedEvent} from '@enonic/lib-admin-ui/PropertyChangedEvent';
import {GetLocalesRequest} from '../resource/GetLocalesRequest';

export type FormContextName = 'content' | 'xdata' | 'live';

Expand Down Expand Up @@ -475,10 +468,6 @@ export class ContentWizardPanel
saveAction.execute();
});

AIAssistantEventsMediator.get().onResultReceived((propertyTree: PropertyTree) => {
this.updateWizardStepForms(propertyTree, false);
});

this.onPageStateChanged(() => {
this.livePanel?.setSaveEnabled(!ObjectHelper.equals(PageState.getState(), this.getPersistedItem().getPage()));
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {ClassHelper} from '@enonic/lib-admin-ui/ClassHelper';
import {DefaultErrorHandler} from '@enonic/lib-admin-ui/DefaultErrorHandler';
import {BrEl} from '@enonic/lib-admin-ui/dom/BrEl';
import {Element} from '@enonic/lib-admin-ui/dom/Element';
Expand Down Expand Up @@ -35,7 +34,6 @@ import {LiveEditPageInitializationErrorEvent} from '../../../page-editor/LiveEdi
import {ShowWarningLiveEditEvent} from '../../../page-editor/ShowWarningLiveEditEvent';
import {Content, ContentBuilder} from '../../content/Content';
import {ContentId} from '../../content/ContentId';
import {ContentIds} from '../../content/ContentIds';
import {ContentSummaryAndCompareStatus} from '../../content/ContentSummaryAndCompareStatus';
import {Site} from '../../content/Site';
import {ContentDeletedEvent} from '../../event/ContentDeletedEvent';
Expand Down

0 comments on commit 81354f2

Please sign in to comment.