Enable automatic exclusion of non-required dependencies in the Publis…

…hing Wizard #6415
enonic · Jun 22, 2023 · 034b43b · 034b43b
1 parent 6f9eb15
commit 034b43b
Show file tree

Hide file tree

Showing 15 changed files with 339 additions and 62 deletions.
diff --git a/modules/app/src/main/resources/services/config/config.js b/modules/app/src/main/resources/services/config/config.js
@@ -8,6 +8,7 @@ function handleGet() {
  const context = contextLib.get();
  const branch = context.branch;
  const allowContentUpdate = app.config['publishingWizard.allowContentUpdate'] !== 'false';
+ const excludeDependencies = app.config['publishingWizard.excludeDependencies'] === 'true' || false;
  const allowPathTransliteration = app.config['contentWizard.allowPathTransliteration'] !== 'false';
  const enableCollaboration = app.config['contentWizard.enableCollaboration'] !== 'false';
  const hideDefaultProject = app.config['settings.hideDefaultProject'] !== 'false';
@@ -17,14 +18,15 @@ function handleGet() {
  contentType: 'application/json',
  body: {
  allowContentUpdate,
+ excludeDependencies,
  allowPathTransliteration,
  adminUrl: admin.getBaseUri(),
  assetsUri: portal.assetUrl({
  path: ''
  }),
  toolUri: admin.getToolUrl(
- app.name,
- 'main'
+  app.name,
+  'main'
  ),
  appId: app.name,
  appVersion: app.version,

diff --git a/modules/lib/src/main/resources/assets/js/app/dialog/BasePublishDialog.ts b/modules/lib/src/main/resources/assets/js/app/dialog/BasePublishDialog.ts
@@ -166,6 +166,10 @@ export abstract class BasePublishDialog
  this.lockControls();
  }
 
+ setKeepDependencies(keepDependencies: boolean): void {
+ this.publishProcessor.setKeepDependencies(keepDependencies);
+ }
+
  getButtonRow(): DropdownButtonRow {
  return super.getButtonRow() as DropdownButtonRow;
  }

diff --git a/modules/lib/src/main/resources/assets/js/app/issue/IssueDialogsManager.ts b/modules/lib/src/main/resources/assets/js/app/issue/IssueDialogsManager.ts
@@ -1,14 +1,14 @@
 import {ModalDialog} from '@enonic/lib-admin-ui/ui/dialog/ModalDialog';
-import {IssueDetailsDialog} from './view/IssueDetailsDialog';
-import {IssueListDialog} from './view/IssueListDialog';
-import {Issue} from './Issue';
-import {CreateIssueDialog} from './view/CreateIssueDialog';
-import {GetIssueRequest} from './resource/GetIssueRequest';
+import {ContentPublishPromptEvent} from '../browse/ContentPublishPromptEvent';
 import {ContentSummaryAndCompareStatus} from '../content/ContentSummaryAndCompareStatus';
 import {ContentPublishDialog} from '../publish/ContentPublishDialog';
-import {ContentPublishPromptEvent} from '../browse/ContentPublishPromptEvent';
-import {IssueServerEventsHandler} from './event/IssueServerEventsHandler';
 import {RequestContentPublishDialog} from '../publish/RequestContentPublishDialog';
+import {IssueServerEventsHandler} from './event/IssueServerEventsHandler';
+import {Issue} from './Issue';
+import {GetIssueRequest} from './resource/GetIssueRequest';
+import {CreateIssueDialog} from './view/CreateIssueDialog';
+import {IssueDetailsDialog} from './view/IssueDetailsDialog';
+import {IssueListDialog} from './view/IssueListDialog';
 
 export class IssueDialogsManager {
 
@@ -56,6 +56,7 @@ export class IssueDialogsManager {
  if (this.detailsDialog.isOpen()) {
  this.detailsDialog.getEl().focus();
  }
+ this.publishDialog.setKeepDependencies(false);
  this.publishDialog.unClosed(this.publishDialogCloseHandler);
  this.detailsDialog.onClosed(this.detailsDialogCloseHandler);
  IssueServerEventsHandler.getInstance().unIssueUpdated(this.issueUpdateHandler);
@@ -142,6 +143,7 @@ export class IssueDialogsManager {
  ContentPublishPromptEvent.on(() => {
  if (this.detailsDialog.isOpen()) {
  this.detailsDialog.unClosed(this.detailsDialogCloseHandler);
+ this.publishDialog.setKeepDependencies(true);
  this.publishDialog.onCloseButtonClicked(this.publishDialogBeforeClosedHandler);
  this.publishDialog.onClosed(this.publishDialogCloseHandler);
  this.issue = this.detailsDialog.getIssue();

diff --git a/modules/lib/src/main/resources/assets/js/app/issue/view/IssueDetailsDialog.ts b/modules/lib/src/main/resources/assets/js/app/issue/view/IssueDetailsDialog.ts
@@ -165,7 +165,7 @@ export class IssueDetailsDialog
 
  this.initActions();
 
- this.publishProcessor = new PublishProcessor(this.getItemList(), this.getDependantList());
+ this.publishProcessor = new PublishProcessor(this.getItemList(), this.getDependantList(), true);
  this.publishProcessor.setIgnoreSilent(true);
 
  this.commentTextArea = new IssueCommentTextArea();
@@ -813,7 +813,7 @@ export class IssueDetailsDialog
 
  private initItemListTogglers(itemList: PublishDialogItemList): boolean {
  return itemList.getItemViews().reduce((wasAnyIncluded, itemView) => {
- const isIncluded = itemView.toggleIncludeChildren(this.areChildrenIncludedInIssue(itemView.getContentId()));
+ const isIncluded = itemView.toggleIncludeChildren(this.areChildrenIncludedInIssue(itemView.getContentId())); //
  return isIncluded || wasAnyIncluded;
  }, false);
  }

diff --git a/modules/lib/src/main/resources/assets/js/app/publish/PublishDialogItemList.ts b/modules/lib/src/main/resources/assets/js/app/publish/PublishDialogItemList.ts
@@ -91,7 +91,7 @@ export class PublishDialogItemList
  return !!this.config.allowOnlyItemRemoval || this.getItemCount() > 1;
  }
 
- public setExcludeChildrenIds(ids: ContentId[]) {
+ setExcludeChildrenIds(ids: ContentId[]) {
  this.excludeChildrenIds = ids;
 
  this.getItemViews().forEach(itemView => {
@@ -103,17 +103,21 @@ export class PublishDialogItemList
  this.debounceNotifyListChanged();
  }
 
- public getExcludeChildrenIds(): ContentId[] {
+ getExcludeChildrenIds(): ContentId[] {
  return this.excludeChildrenIds.slice();
  }
 
- public clearExcludeChildrenIds() {
+ clearExcludeChildrenIds() {
  this.excludeChildrenIds = [];
  }
 
+ getIncludeChildrenIds(): ContentId[] {
+ return this.getItemsIds().filter(id => !ArrayHelper.contains(this.excludeChildrenIds, id));
+ }
+
  removeItemsByIds(contentIds: ContentId[]) {
  contentIds.forEach((id: ContentId) => {
- const item: ContentSummaryAndCompareStatus = this.getItem(id.toString());
+  const item: ContentSummaryAndCompareStatus = this.getItem(id.toString());
 
  if (item) {
  this.removeItem(item, true);