@omnia/wcm 7.8.90-preview → 7.8.93-preview

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

@@ -1,4 +1,4 @@
-import { Page, NavigationNode, NavigationData, VariationId, VariationString, Variation, PageId } from "@omnia/wcm/models";
+import { Page, NavigationNode, NavigationData, VariationId, VariationString, Variation, PageId, PageDetailQueryResult, PageNavigationData, PageNavigationNode } from "@omnia/wcm/models";
 import { LayoutItem } from "@omnia/fx-models";
 export declare namespace Utils {
     function isSupportedByOfficeWebApp(documentUrl: string): boolean;
@@ -47,6 +47,7 @@ export declare module MultilingualUtils {
 export declare module NavigationUtils {
     function sortNodesByCreated<T extends NavigationNode<NavigationData>>(nodes: Array<T>): any;
     function sortNodesByTitle<T extends NavigationNode<NavigationData>>(nodes: Array<T>): any;
+    function findPageInNode(node: PageNavigationNode<PageNavigationData>, pageId: PageId): any;
 }
 export declare namespace VariationUtils {
     function getValueByVariationId(variationString: VariationString, id: VariationId, defaultVariation?: Variation): string;
@@ -70,6 +71,7 @@ export declare module WCMMigrationUtils {
 }
 export declare module PageUtils {
     function filterUnavailablePages(pages: Page[]): Page[];
+    function ensureVariationIdInPageDetail(pages: PageDetailQueryResult[]): PageDetailQueryResult[];
 }
 export declare module WCMGovernanceUtils {
     function getMonthName(language: string, date: Date): string;

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

@@ -4,6 +4,7 @@ export declare module ItemQueryHelper {
     const PageId = "PId";
     const ConditionExpressionFilter = "ConditionExpressionFilter";
     const VariationId = "VariationId";
+    const VariationOfPageId = "VariationOfPageId";
     function generateExcludePageId(logicalOperator: FilterLogicalOperator, pageId: PageId, filters?: Array<QueryFilter>): QueryFilter;
     function generateFalseFilter(logicalOperator: FilterLogicalOperator, filters?: Array<QueryFilter>): QueryFilter;
     function generateTrueFilter(logicalOperator: FilterLogicalOperator, filters?: Array<QueryFilter>): QueryFilter;

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

@@ -20,6 +20,7 @@ export interface PageItemNode {
     publishingAppId: string;
     displayTitle?: string;
     nodeId?: number;
+    selectedVariationId?: number;
 }
 export interface PageLinkItem extends LinkItem, PageItemNode, AnchorLinkItem {
 }

package/internal-do-not-import-from-here/fx/services/PageQueryService.d.ts

@@ -20,7 +20,5 @@ export declare class PageQueryService {
     getExportedFile: (exportingFileName: string, exportingFileToken: string) => Promise<void>;
     checkMigrationOmniaSearchStatus: (migrationId: string) => Promise<boolean>;
     private processPagesDetailData;
-    private getPageVisited;
-    private findPageInNode;
     getPendingApprovalPages: () => Promise<Array<PendingApprovalPage>>;
 }

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

@@ -39,6 +39,7 @@ declare class InternalPageRollupStoreHelper {
     private profileCardStore;
     private userIdentityStore;
     private navigationStore;
+    private pickedPageHelper;
     private resolvablePageRollupInNP;
     private pageRollupInstancesInNP;
     private pageRollupInstances;
@@ -99,11 +100,12 @@ declare class InternalPageRollupStoreHelper {
     }, settings: PageRollupBlockSettings, pageCollectionSelections: Array<PageCollectionSelection>): any[];
     private populateNavigationPathTargetingVariationIds;
     private generateVariationIdFilter;
-    buildQuery(serviceContainerContext: ServiceContainerContext, settings: PageRollupBlockSettings, instance: IBlockInstance<PageRollupBlockSettings>, uiQueryFilters: QueryFilter[]): Promise<PageQuery>;
+    buildQuery(block: BlockPageRollupInstanceExtends, uiQueryFilters: QueryFilter[]): Promise<PageQuery>;
     getPagesDetails(pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit?: number, reloadData?: boolean): Promise<PageDialogData>;
     getPagesDetailsMetric(blockInstance: BlockPageRollupInstanceExtends, settings: PageRollupBlockSettings, uiQueryFilters: QueryFilter[], orderBy?: Array<QueryOrder>, blockProperty?: ReactivePageBlockProperty<PageRollupBlockProperty>): Promise<void>;
-    generateBatchQuery(blockInstance: BlockPageRollupInstanceExtends, settings: PageRollupBlockSettings, uiQueryFilters: QueryFilter[], orderBy?: Array<QueryOrder>, blockProperty?: ReactivePageBlockProperty<PageRollupBlockProperty>): Promise<BatchQueryPages>;
+    generateBatchQuery(blockPageRollupInstance: BlockPageRollupInstanceExtends): Promise<BatchQueryPages>;
     needToGetVariationQuery(type: PageRollupEnums.QueryConfigurationType, scope: PageRollupEnums.RollupScopes): boolean;
+    mergeBlockInstance(blockInstance: BlockPageRollupInstanceExtends, settings: PageRollupBlockSettings, uiQueryFilters: QueryFilter[], orderBy?: Array<QueryOrder>, blockProperty?: ReactivePageBlockProperty<PageRollupBlockProperty>): BlockPageRollupInstanceExtends;
     private generateChannelsFilter;
     private generateChannelsFilterForChannelsScope;
     private getPropertyNameByScope;
@@ -133,7 +135,8 @@ declare class InternalPageRollupStoreHelper {
     private extractPageRollupInstancesInNP;
     private pushBatchQueryTimewatch;
     private ensureRunLatestBatchQuery;
-    executeBatchQuery(queries: BatchQueryPagesExtends[], queryWithPageTypes: Array<string>, allowCancelToken?: boolean, clientCaching?: boolean): Promise<BatchQueryPagesResult>;
+    executeBatchQuery(queries: BatchQueryPagesExtends[], blockInstances: BlockPageRollupInstanceExtends[], queryWithPageTypes: Array<string>, allowCancelToken?: boolean, clientCaching?: boolean): Promise<BatchQueryPagesResult>;
+    private ensurePickedPagesResult;
     private mapToBatchQueryPages;
     private hasPageTypeSettingInView;
     private hasTagOrTaxonomyInView;
@@ -166,7 +169,7 @@ export declare class PageRollupStoreHelper {
     getPagesDetails(pageIds: number[], selectProps: PageDialogPropertiesMapping, contentLimit?: number, reloadData?: boolean): Promise<PageDialogData>;
     getPagesDetailsMetric(blockInstance: IBlockInstance<PageRollupBlockSettings>, settings: PageRollupBlockSettings, uiQueryFilters: QueryFilter[], orderBy?: Array<QueryOrder>, blockProperty?: ReactivePageBlockProperty<PageRollupBlockProperty>): Promise<void>;
     setDestroyedPageRollups(pageRollupQueryId: string): void;
-    getBatchQueriesData(batchQueries: Array<BatchQueryPages>, queryWithPageTypes: Array<string>): Promise<BatchQueryPagesResult>;
+    getBatchQueriesData(batchQueries: Array<BatchQueryPages>, blockInstances: BlockPageRollupInstanceExtends[], queryWithPageTypes: Array<string>): Promise<BatchQueryPagesResult>;
     needToLoadPageTypeInView(settings: PageRollupBlockSettings, internalNames: Array<string>): boolean;
 }
 export declare class FilterManager {
@@ -212,8 +215,10 @@ export declare class BatchQueryRegistration {
     execute(): Promise<number>;
     getPagingData(pageNumber: number): Promise<number>;
     getNextPagingData(): Promise<number>;
+    private noNextPaging;
     private loadCurrentPageData;
     generateBatchQuery(): Promise<BatchQueryPages>;
+    getBlockPageRollupInstance(): BlockPageRollupInstanceExtends;
     get orderBy(): QueryOrder[];
     get pagingNumber(): number;
     get pagingStateKey(): string;

package/internal-do-not-import-from-here/fx/shared/PickedPageHelper.d.ts

@@ -0,0 +1,10 @@
+import { PageItemNode, PageDetailQueryResult, QueryFilter } from "../models";
+export declare class PickedPageHelper {
+    private variationStore;
+    private targetingStore;
+    buildPickedPagesQuery(queryFilter: QueryFilter, pickedPages: Array<PageItemNode>): QueryFilter;
+    ensureVariationTargetingCurrentUser(pickedPages: Array<PageItemNode>): Promise<void>;
+    ensureFallbackPickedPagesResult(pickedPages: Array<PageItemNode>, pages: Array<PageDetailQueryResult>, itemLimit?: number): PageDetailQueryResult[];
+    sortPickedPagesByDefault(pickedPages: Array<PageItemNode>, pages: Array<PageDetailQueryResult>): PageDetailQueryResult[];
+    private getPublishingAppVariation;
+}

package/internal-do-not-import-from-here/fx/shared/index.d.ts

@@ -3,3 +3,4 @@ export * from "./OmniaSearchQueryUtils";
 export * from "./PageSearchHelper";
 export * from "./OmniaSearchQueryHelper";
 export * from "./OmniaSearchCategoryQueryHelper";
+export * from "./PickedPageHelper";

package/internal-do-not-import-from-here/manifests/omnia.wcm.fx.manifest.json

@@ -1 +1 @@
-{"name":"omniaWebpackJsonp['d60fa82a-129a-41a9-93ce-d784dcb217b0']['a41d1723-10ca-4597-9c40-fd4f511ae2ae']","content":{"./node_modules/@omnia/wcm/internal/index.js":{"id":"./node_modules/@omnia/wcm/internal/index.js","buildMeta":{"exportsType":"namespace"},"expo.js":["ActiveUserDashboardQueryTypes","BreadcrumNodeTypes","NavigationTitleHelperService","OmniaPageSearch","OmniaSearchPageStore","PageDashboardDetail","PageTypesFilterValue","PagesDashboardDetailResult","PagesDashboardMetricQuery","PagesDashboardQueryTypes","PagesDetailDashboardQuery","PublishingAppsFilterValue","ReindexContentOmniaSearchStatus","SyncOmniaSearchType","UserPropertiesFilterValue","YammerIntegrationStore"]},"./node_modules/@omnia/wcm/messaging/InternalWcmTopics.js":{"id":"./node_modules/@omnia/wcm/messaging/internalwcmtopics.js","buildMeta":{"exportsType":"namespace"},"expo.js":["InternalWcmTopics"]},"./node_modules/@omnia/wcm/shared/index.js":{"id":"./node_modules/@omnia/wcm/shared/index.js","buildMeta":{"exportsType":"namespace"},"expo.js":["BatchQueryRegistration","EnsureMigrateBlockData","FilterManager","OmniaSearchCategoryQueryHelper","OmniaSearchQueryHelper","OmniaSearchQueryUtils","PageRollupConfigurationFactory","PageRollupStoreHelper","PageSearchHelper"]},"./node_modules/@omnia/wcm/index.js":{"id":"dd7f30f1-7b1b-47a5-acfb-c173d2fcb1f3","buildMeta":{"exportsType":"namespace"},"expo.js":["ActivityActionFactory","AiContentPageReportService","AppInfoStore","AutomaticPageCreationService","BASE_URL","BackgroundImageHelper","BreadcrumbStore","BreakpointStore","BuiltInActionButtonHandlers","CURRENT_DATE","CalendarConstants","CalendarService","ChannelCategoriesStore","ChannelManagementService","ChannelManagementStore","CommunityRules","CreatePageFormStore","CurrentEventStore","CurrentNavigationStore","CurrentPageStore","DisplayBreakPointFactory","DocumentService","EditingDisplayRules","EmailSettingsKey","EnterprisePropertyInternalNames","EventParticipantListElementName","EventService","GovernanceDashboard","IconRules","ItemQueryHelper","LayoutDataParentPageId","LayoutHelper","LayoutItemsTranslator","LinkPickerProviderMsg","LinkPickerProviders","LinkPickerStore","MaxIntNumber","MediaRollupService","NavigationNodeHelper","NavigationService","NavigationStore","NewsletterService","OmniaSearchPageService","OmniaWCMPageBody","OpenAIPageCreationService","OutlookEvent","PageApprovalConstants","PageBlockPropertyStore","PageFactory","PageHiddenService","PageNavigationNodeHelper","PagePermissionService","PageQueryService","PageRedirectHelper","PageRollupFilterEngineContext","PageRollupIndexedDB","PageRollupListView","PageRollupStore","PageService","PageSocialService","PageStatisticsService","PageStatisticsStore","PageVariationHelper","PageVersion","PagesStore","ParticipantService","ParticipantsFields","PublishingAppDefaultScrollElementClass","PublishingAppInfoStore","PublishingAppUniqueModelName","PublishingChannelCategoriesService","PublishingRuleService","PublishingRuleStore","QueryableProperties","ReusablePageService","SocialService","TargetingStore","ThemingRules","TimeFormat","TopicActivityService","TopicPrefixConstants","Topics","TopicsActivityStore","VariationRules","VariationService","VariationStore","VersionEnterpriseProperties","VersionPropertyBag","VisitedPageKeyPrefix","WCMPageKeyPrefix","WCMPageVersionStateException","WcmContext","WcmRouter","YammerService"]}}}
+{"name":"omniaWebpackJsonp['d60fa82a-129a-41a9-93ce-d784dcb217b0']['a41d1723-10ca-4597-9c40-fd4f511ae2ae']","content":{"./node_modules/@omnia/wcm/internal/index.js":{"id":"./node_modules/@omnia/wcm/internal/index.js","buildMeta":{"exportsType":"namespace"},"expo.js":["ActiveUserDashboardQueryTypes","BreadcrumNodeTypes","NavigationTitleHelperService","OmniaPageSearch","OmniaSearchPageStore","PageDashboardDetail","PageTypesFilterValue","PagesDashboardDetailResult","PagesDashboardMetricQuery","PagesDashboardQueryTypes","PagesDetailDashboardQuery","PublishingAppsFilterValue","ReindexContentOmniaSearchStatus","SyncOmniaSearchType","UserPropertiesFilterValue","YammerIntegrationStore"]},"./node_modules/@omnia/wcm/messaging/InternalWcmTopics.js":{"id":"./node_modules/@omnia/wcm/messaging/internalwcmtopics.js","buildMeta":{"exportsType":"namespace"},"expo.js":["InternalWcmTopics"]},"./node_modules/@omnia/wcm/shared/index.js":{"id":"./node_modules/@omnia/wcm/shared/index.js","buildMeta":{"exportsType":"namespace"},"expo.js":["BatchQueryRegistration","EnsureMigrateBlockData","FilterManager","OmniaSearchCategoryQueryHelper","OmniaSearchQueryHelper","OmniaSearchQueryUtils","PageRollupConfigurationFactory","PageRollupStoreHelper","PageSearchHelper","PickedPageHelper"]},"./node_modules/@omnia/wcm/index.js":{"id":"dd7f30f1-7b1b-47a5-acfb-c173d2fcb1f3","buildMeta":{"exportsType":"namespace"},"expo.js":["ActivityActionFactory","AiContentPageReportService","AppInfoStore","AutomaticPageCreationService","BASE_URL","BackgroundImageHelper","BreadcrumbStore","BreakpointStore","BuiltInActionButtonHandlers","CURRENT_DATE","CalendarConstants","CalendarService","ChannelCategoriesStore","ChannelManagementService","ChannelManagementStore","CommunityRules","CreatePageFormStore","CurrentEventStore","CurrentNavigationStore","CurrentPageStore","DisplayBreakPointFactory","DocumentService","EditingDisplayRules","EmailSettingsKey","EnterprisePropertyInternalNames","EventParticipantListElementName","EventService","GovernanceDashboard","IconRules","ItemQueryHelper","LayoutDataParentPageId","LayoutHelper","LayoutItemsTranslator","LinkPickerProviderMsg","LinkPickerProviders","LinkPickerStore","MaxIntNumber","MediaRollupService","NavigationNodeHelper","NavigationService","NavigationStore","NewsletterService","OmniaSearchPageService","OmniaWCMPageBody","OpenAIPageCreationService","OutlookEvent","PageApprovalConstants","PageBlockPropertyStore","PageFactory","PageHiddenService","PageNavigationNodeHelper","PagePermissionService","PageQueryService","PageRedirectHelper","PageRollupFilterEngineContext","PageRollupIndexedDB","PageRollupListView","PageRollupStore","PageService","PageSocialService","PageStatisticsService","PageStatisticsStore","PageVariationHelper","PageVersion","PagesStore","ParticipantService","ParticipantsFields","PublishingAppDefaultScrollElementClass","PublishingAppInfoStore","PublishingAppUniqueModelName","PublishingChannelCategoriesService","PublishingRuleService","PublishingRuleStore","QueryableProperties","ReusablePageService","SocialService","TargetingStore","ThemingRules","TimeFormat","TopicActivityService","TopicPrefixConstants","Topics","TopicsActivityStore","VariationRules","VariationService","VariationStore","VersionEnterpriseProperties","VersionPropertyBag","VisitedPageKeyPrefix","WCMPageKeyPrefix","WCMPageVersionStateException","WcmContext","WcmRouter","YammerService"]}}}

package/package.json

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