@omnia/wcm 6.10.24-preview → 6.10.25-preview

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

@@ -254,7 +254,6 @@ export declare module PageRollupLocalization {
             ExportToExcel: string;
             OpenPageInNewTab: string;
             OpenInEditor: string;
-            ExcludeVariationUrl: string;
         };
         ViewTitle: {
             List: string;

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

@@ -3,6 +3,9 @@ import { Page, PageCalendarViewMode, PageDialogPropertiesMapping, PageItemNode,
 import { PublishingChannelId } from '../channels';
 import { PageId } from '../pages';
 import { VariationId } from '../variations';
+export interface PageRollupViewSettingsRuntimeSettings {
+    navigateWithVariationTargeting: boolean;
+}
 export interface PageRollupViewSettings {
     selectProperties: Array<string>;
     showContentAsDialog: boolean;
@@ -146,7 +149,6 @@ export interface PageRollupBlockBreakPointSettings {
     currentUserSubscription?: boolean;
     openPageInNewTab?: boolean;
     openInEditor?: boolean;
-    excludeVariationUrl?: boolean;
 }
 export interface PageRollupBlockProperty {
     pickedPages?: Array<PageItemNode>;
@@ -214,7 +216,6 @@ export interface PageRollupBlockSettings {
     versionStatus: PageRollupEnums.VersionStatus;
     openPageInNewTab?: boolean;
     openInEditor?: boolean;
-    excludeVariationUrl?: boolean;
 }
 export interface PageTypeSelection extends Page {
     title: string;

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

@@ -1 +1,2 @@
+;
 export {};

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

@@ -2,5 +2,5 @@ import { VariationId, QueryFilter } from '..';
 export interface VariationQuery {
     variationId?: VariationId;
     filter: QueryFilter;
-    fallbackDefault: boolean;
+    fallbackDefault?: boolean;
 }

package/internal-do-not-import-from-here/fx/routing/WcmRouter.d.ts

@@ -8,6 +8,7 @@ export declare class WcmRouter {
     private omniaCtx;
     private wcmContext;
     private publishingAppInfoStore;
+    private userTargetingStore;
     private isVariationSwitch;
     private currentNavigatedState;
     private loadTreeForPathPromises;
@@ -18,6 +19,8 @@ export declare class WcmRouter {
     private getDefaultRoute;
     private loadTreeForPath;
     navigate<T extends NavigationNode<NavigationData>>(to: T, targetVariationId?: any): Promise<T>;
+    navigateWithVariationTargeting<T extends NavigationNode<NavigationData>>(to: T): Promise<T>;
+    private getTargetingVariation;
     onDisposing(): void;
     private executeScrollingIfNeeded;
     private executeNewNavigationState;

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

@@ -86,6 +86,7 @@ export declare class PageRollupStore extends Store {
     };
     actions: {
         navigate: import("@omnia/fx/stores").StoreAction<unknown, (node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => void, (result: void, node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => void, (failureReason: any, node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => void, (node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => Promise<void>>;
+        navigateWithVariationTargeting: import("@omnia/fx/stores").StoreAction<unknown, (node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => void, (result: PageNavigationNode<PageNavigationData>, node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => void, (failureReason: any, node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => void, (node: PageNavigationNode<PageNavigationData>, pageId: number, pageUrl: string, openInNewTab?: boolean, openInEditor?: boolean) => Promise<PageNavigationNode<PageNavigationData>>>;
         loadPageContentData: import("@omnia/fx/stores").StoreAction<unknown, (pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit: number, reloadData?: boolean) => void, (result: void, pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit: number, reloadData?: boolean) => void, (failureReason: any, pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit: number, reloadData?: boolean) => void, (pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit: number, reloadData?: boolean) => Promise<void>>;
         ensureLoadPageTypes: import("@omnia/fx/stores").StoreAction<unknown, (publishingAppIds: string[]) => void, (result: void, publishingAppIds: string[]) => void, (failureReason: any, publishingAppIds: string[]) => void, (publishingAppIds: string[]) => Promise<void>>;
         exportToExcel: import("@omnia/fx/stores").StoreAction<unknown, (query: BatchQueryPages) => void, (result: void, query: BatchQueryPages) => void, (failureReason: any, query: BatchQueryPages) => void, (query: BatchQueryPages) => Promise<void>>;

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

@@ -65,7 +65,9 @@ declare class InternalPageRollupStoreHelper {
         ids: VariationId[];
         queries: VariationQuery[];
     }>;
-    populateTargetingVariationIds(variationQueries: VariationQuery[], settings: PageRollupBlockSettings, pageCollectionSelections: Array<PageCollectionSelection>): any[];
+    populateTargetingVariationIds(variationQueriesDict: {
+        [key: number]: VariationQuery;
+    }, settings: PageRollupBlockSettings, pageCollectionSelections: Array<PageCollectionSelection>): any[];
     buildQuery(serviceContainerContext: ServiceContainerContext, settings: PageRollupBlockSettings, instance: IBlockInstance<PageRollupBlockSettings>, uiQueryFilters: QueryFilter[]): Promise<PageQuery>;
     getPagesDetails(pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit?: number, reloadData?: boolean): Promise<PageDialogData>;
     generateBatchQuery(blockInstance: BlockPageRollupInstanceExtends, settings: PageRollupBlockSettings, uiQueryFilters: QueryFilter[], orderBy?: Array<QueryOrder>, blockProperty?: ReactivePageBlockProperty<PageRollupBlockProperty>): Promise<BatchQueryPages>;

package/package.json

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