@omnia/wcm 6.10.7-preview → 6.10.15-preview

package/internal-do-not-import-from-here/core/loc/PageRollupLocalization.d.ts

@@ -71,8 +71,10 @@ export declare module PageRollupLocalization {
             Rating: string;
             Feedback: string;
             LastCommentedAt: string;
+            LastActivity: string;
             NoLimit: string;
             ExcludeCurrentPage: string;
+            ExcludeVariations: string;
             Status: {
                 Title: string;
                 AnyStatus: string;

package/internal-do-not-import-from-here/fx/helpers/LayoutHelper.d.ts

@@ -2,5 +2,5 @@ import { LayoutItem } from '@omnia/fx-models';
 export declare module LayoutHelper {
     function registerBlockChangesAffectPagesChecker(elem: string, checker: (oldVal: any, newVal: any) => boolean): void;
     function checkBlockChangesAffectPages(layoutItem: LayoutItem, getLatestPublishedBlockData: (key: string) => any, getComingPublishedBlockData: (key: string) => any): boolean;
-    function convertToPlainText(html: any): string;
+    function convertToPlainText(html: string): string;
 }

package/internal-do-not-import-from-here/fx/models/Constants.d.ts

@@ -5,7 +5,8 @@ export declare const PageRollupConstants: {
     readonly likeInternalName: string;
     readonly commentInternalName: string;
     readonly ratingInternalName: string;
-    readonly lastCommentedAtInternalName: string;
+    readonly lastActivityInternalName: string;
+    readonly lastCommentedInternalName: string;
     readonly feedbackInternalName: string;
     readonly titleInternalName: string;
     readonly currentPageCollectionId: string;

package/internal-do-not-import-from-here/fx/models/Constants.js

@@ -15,9 +15,12 @@ export var PageRollupConstants = {
     get ratingInternalName() {
         return "b9580693-6e0e-4e3a-848a-30515b334451";
     },
-    get lastCommentedAtInternalName() {
+    get lastActivityInternalName() {
         return "579affaa-4050-49aa-9058-99974726880f";
     },
+    get lastCommentedInternalName() {
+        return "69ec8bf6-c32f-443a-9d98-0647308fb070";
+    },
     get feedbackInternalName() {
         return "8630ed9f-6069-4e17-925d-f92928c2a9ec";
     },

package/internal-do-not-import-from-here/fx/models/components/PageRollupBlock.d.ts

@@ -154,6 +154,7 @@ export interface PageRollupBlockProperty {
 export interface PageRollupBlockSettings {
     scope: PageRollupEnums.RollupScopes;
     excludeCurrentPage: boolean;
+    excludeVariations: boolean;
     resources: Array<{
         id: string;
         typeId?: GuidValue;

package/internal-do-not-import-from-here/fx/models/layout/MergedPageVersionLayout.d.ts

@@ -3,5 +3,6 @@ import { Layout } from '@omnia/fx-models';
 export interface MergedPageVersionLayout {
     target: VersionedPageData<PageData>;
     source: VersionedPageData<PageData>;
+    externalSourceLayout: Layout;
     mergedLayout: Layout;
 }

package/internal-do-not-import-from-here/fx/models/pagequery/PageRollupQuery.d.ts

@@ -25,6 +25,7 @@ export interface BatchQueryPages extends PageQuery {
     queryId: string;
     internalNames?: Array<string>;
     trimDuplicates?: boolean;
+    excludeVariations?: boolean;
     priority?: number;
     contentLimit?: number;
     contentProp?: string;

package/internal-do-not-import-from-here/fx/models/pages/VariationPage.d.ts

@@ -3,4 +3,7 @@ export interface VariationPage extends Page {
     variationId: number;
     variationOfPageId: number;
     variationSegment: string;
+    variationPages: {
+        [variationId: number]: VariationPage;
+    };
 }

package/internal-do-not-import-from-here/fx/stores/CurrentPageStore.d.ts

@@ -1,5 +1,6 @@
 import { Store } from '@omnia/fx/stores';
 import { Page, VersionReference, PageId, VersionId, IPageVersion } from '../models';
+import { Layout } from '@omnia/fx-models';
 export interface ICurrentPageState {
     /**
      * Reference to the current page
@@ -21,6 +22,7 @@ export interface ICurrentPageState {
     * if the current version does not have a parentLayoutPageId this version data will be null
     * */
     readonly parentLayout?: IPageVersion;
+    readonly externalParentLayout?: Layout;
 }
 export declare class CurrentPageStore extends Store {
     private pageService;

package/internal-do-not-import-from-here/fx/stores/PageRollupStoreHelper.d.ts

@@ -91,9 +91,10 @@ declare class InternalPageRollupStoreHelper {
     private ensureRunLatestBatchQuery;
     private executeBatchQuery;
     private mapToBatchQueryPages;
+    private hasPageTypeInSettings;
     private ensureLoadPageTypesOfInstance;
     private ensureLoadPageTypes;
-    private ensureLanuageSettings;
+    private ensureLanguageSettings;
 }
 export declare class PageRollupStoreHelper {
     private internal;
@@ -111,7 +112,6 @@ export declare class PageRollupStoreHelper {
         ids: VariationId[];
         queries: VariationQuery[];
     }>;
-    populateTargetingVariationIds(variationQueries: VariationQuery[], settings: PageRollupBlockSettings, pageCollectionSelections: Array<PageCollectionSelection>): any[];
     getPagesDetails(pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit?: number, reloadData?: boolean): Promise<PageDialogData>;
 }
 export declare class FilterManager {

package/internal-do-not-import-from-here/fx/stores/PagesStore.d.ts

@@ -1,5 +1,5 @@
 import { Store } from '@omnia/fx/stores';
-import { NavigationNode, WCMPageTypes, Page, VersionedPageData, PageData, VersionReference, PageId, NavigationPosition, PageNavigationNode, PageNavigationData, NavigationData, VariationPage, Variation, PageCollectionSelection, CheckedOutVersionPageData, ArchivePageResult, PageWithNavigationCreationRequest, ReadNews } from '../models';
+import { NavigationNode, WCMPageTypes, Page, VersionedPageData, PageData, VersionReference, PageId, NavigationPosition, PageNavigationNode, PageNavigationData, MergedPageVersionLayout, NavigationData, VariationPage, Variation, PageCollectionSelection, CheckedOutVersionPageData, ArchivePageResult, PageWithNavigationCreationRequest, ReadNews } from '../models';
 import { GuidValue, Guid, IMessageBusSubscriptionHandler, IOmniaContext } from '@omnia/fx-models';
 export declare class PagesStore extends Store {
     private pageService;
@@ -45,7 +45,7 @@ export declare class PagesStore extends Store {
          * */
         ensurePages: import("@omnia/fx/stores").StoreAction<unknown, (pageIds: PageId[], useCachedData?: boolean) => void, (result: void, pageIds: PageId[], useCachedData?: boolean) => void, (failureReason: any, pageIds: PageId[], useCachedData?: boolean) => void, (pageIds: Array<PageId>, useCachedData?: boolean) => Promise<void>>;
         ensurePagesByType: import("@omnia/fx/stores").StoreAction<unknown, (typesToGet?: number, isTenantPageTypeIncluded?: boolean) => void, (result: void, typesToGet?: number, isTenantPageTypeIncluded?: boolean) => void, (failureReason: any, typesToGet?: number, isTenantPageTypeIncluded?: boolean) => void, (typesToGet?: number, isTenantPageTypeIncluded?: boolean) => Promise<void>>;
-        ensureVersionData: import("@omnia/fx/stores").StoreAction<unknown, (versionRefs: VersionReference[], force?: boolean) => void, (result: void, versionRefs: VersionReference[], force?: boolean) => void, (failureReason: any, versionRefs: VersionReference[], force?: boolean) => void, (versionRefs: Array<VersionReference>, force?: boolean) => Promise<void>>;
+        ensureVersionData: import("@omnia/fx/stores").StoreAction<unknown, (versionRefs: VersionReference[], force?: boolean) => void, (result: MergedPageVersionLayout[], versionRefs: VersionReference[], force?: boolean) => void, (failureReason: any, versionRefs: VersionReference[], force?: boolean) => void, (versionRefs: Array<VersionReference>, force?: boolean) => Promise<MergedPageVersionLayout[]>>;
         createPage: import("@omnia/fx/stores").StoreAction<unknown, (creationRequest: PageWithNavigationCreationRequest, targetPublishingAppId?: GuidValue, targetVariationId?: string) => void, (result: PageNavigationNode<PageNavigationData>, creationRequest: PageWithNavigationCreationRequest, targetPublishingAppId?: GuidValue, targetVariationId?: string) => void, (failureReason: any, creationRequest: PageWithNavigationCreationRequest, targetPublishingAppId?: GuidValue, targetVariationId?: string) => void, <T extends PageData>(creationRequest: PageWithNavigationCreationRequest, targetPublishingAppId?: GuidValue, targetVariationId?: string) => Promise<PageNavigationNode<PageNavigationData>>>;
         movePage: import("@omnia/fx/stores").StoreAction<unknown, (navigationNode: NavigationNode<NavigationData>, newPosition: NavigationPosition) => void, (result: void, navigationNode: NavigationNode<NavigationData>, newPosition: NavigationPosition) => void, (failureReason: any, navigationNode: NavigationNode<NavigationData>, newPosition: NavigationPosition) => void, (navigationNode: NavigationNode<NavigationData>, newPosition: NavigationPosition) => Promise<void>>;
         /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/wcm",
   "license": "MIT",
-  "version": "6.10.7-preview",
+  "version": "6.10.15-preview",
   "description": "Omnia Web Content Management.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"