First draft of splitting queries

package.json

@@ -85,8 +85,8 @@
         "querystring": "0.2.0",
         "raw-loader": "1.0.0",
         "react": "16.13.0",
-        "react-dom": "16.13.0",
         "react-calendar-timeline": "0.19.0",
+        "react-dom": "16.13.0",
         "react-highcharts": "16.0.2",
         "react-scroll": "1.7.12",
         "react-truncate-markup": "3.0.1",
@@ -115,4 +115,4 @@
     "dependencies": {
         "prosjektportalen": "2.6.12"
     }
-}
+}

src/js/@Common/index.tsx

@@ -4,6 +4,7 @@ import * as config from "../config";
 import ProjectItem from "./ProjectItem";
 import IStatusMessage from "./IStatusMessage";
 import { IDataSourceSearchCustom } from "prosjektportalen/lib/WebParts/DataSource";
+ import { format } from "office-ui-fabric-react/lib/Utilities";
 
 export function getTimestamp(): string {
     return `${new Date().toLocaleDateString()} ${new Date().toLocaleTimeString()}`;
@@ -15,7 +16,7 @@ export interface IListContext<T> {
     items: T[];
 }
 
-export async function getStoredProjectsListContext(maxLimit = config.Lists_StoredProjects_ItemsMaxLimit): Promise<IListContext<ProjectItem>> {
+export async function getStoredProjectsListContext(): Promise<IListContext<ProjectItem>> {
     try {
         const list = sp.web.lists.getByTitle(config.Lists_StoredProjects_Title);
         let properties;
@@ -28,9 +29,6 @@ export async function getStoredProjectsListContext(maxLimit = config.Lists_Store
         } catch {
             throw strings.Lists_StoredProjects_DoesNotExist;
         }
-        if (items.length > maxLimit) {
-            throw String.format(strings.Lists_StoredProjects_MaxLimitError, items.length, config.Lists_StoredProjects_ItemsMaxLimit);
-        }
         items = items.filter(i => i.URL !== null && i.URL.Url !== "").map(({ ID, URL }) => new ProjectItem(ID, URL.Description, URL.Url));
         return { list, properties, items };
     } catch (err) {
@@ -39,18 +37,30 @@ export async function getStoredProjectsListContext(maxLimit = config.Lists_Store
 }
 
 /**
-* Build search settings from items in stored projects list
+* Build search queries from items in stored projects list
+* 
+* @param {ProjectItem[]} items Project items
+* @param {string} queryTemplate Query template
+* @param {number} maxQueryLength Max query length
 */
-export async function buildSearchSettingsFromStoredProjects(items: ProjectItem[], queryTemplate: string): Promise<IDataSourceSearchCustom> {
+export async function buildSearchQueriesFromProgramProjects(items: ProjectItem[], queryTemplate: string, maxQueryLength: number = 3000): Promise<IDataSourceSearchCustom[]> {
     try {
-        if (items.length === 0) {
-            return null;
-        }
-        const searchQuery = items.map(({ URL }) => `Path:"${URL}"`).join(" OR ");
-        return {
-            RowLimit: 500,
-            QueryTemplate: String.format(queryTemplate, searchQuery),
-        };
+        let index = 0
+        const queries = items.reduce((arr, item) => {
+            if (arr[index].QueryTemplate == null) {
+                arr[index].QueryTemplate = `Path:${item.URL} `
+            } else if (arr[index].QueryTemplate.length < maxQueryLength) {
+                arr[index].QueryTemplate += `OR Path:${item.URL} `
+            } else {
+                arr.push({
+                    QueryTemplate: format(`Path:${item.URL} `, queryTemplate),
+                    RowLimit: 500,
+                })
+                index++
+            }
+            return arr
+        }, [{ QueryTemplate: null, RowLimit: 500 }])
+        return queries //.map(q => ({ ...q, QueryTemplate: format(queryTemplate, q.QueryTemplate) }))
     } catch (err) {
         throw err;
     }

src/js/@WebParts/ProgramAddProject/index.tsx

@@ -42,7 +42,7 @@ export default class ProgramAddProject extends React.Component<IProgramAddProjec
 
     public async componentDidMount() {
         try {
-            const storedProjectsList = await common.getStoredProjectsListContext(config.Lists_StoredProjects_ItemsMaxLimit - 1);
+            const storedProjectsList = await common.getStoredProjectsListContext();
             this.setState({
                 storedProjectsList,
                 isLoading: false,

src/js/@WebParts/ProgramDeliveriesOverview/IProgramDeliveriesOverviewState.ts

@@ -3,5 +3,5 @@ import { IDataSourceSearchCustom } from "prosjektportalen/lib/WebParts/DataSourc
 export default interface IProgramDeliveriesOverviewState {
     isLoading: boolean;
     errorMessage?: string;
-    searchSettings?: IDataSourceSearchCustom;
+    searchSettings?: IDataSourceSearchCustom[];
 }

src/js/@WebParts/ProgramDeliveriesOverview/index.tsx

@@ -11,14 +11,13 @@ export default class ProgramDeliveriesOverView extends React.Component<IProgramD
 
   constructor(props: IProgramDeliveriesOverviewProps) {
     super(props);
-
     this.state = { isLoading: true };
   }
 
   public async componentDidMount() {
     try {
       const { items } = await common.getStoredProjectsListContext();
-      const searchSettings = await common.buildSearchSettingsFromStoredProjects(items, this.props.queryTemplate);
+      const searchSettings = await common.buildSearchQueriesFromProgramProjects(items, this.props.queryTemplate);
       this.setState({ searchSettings, isLoading: false });
     } catch (errorMessage) {
       this.setState({ errorMessage, isLoading: false });
@@ -46,7 +45,7 @@ export default class ProgramDeliveriesOverView extends React.Component<IProgramD
       <>
         <h2>Leveranseoversikt</h2>
         {(!this.state.isLoading && this.state.searchSettings) &&
-          <DeliveriesOverview queryTemplate={this.state.searchSettings.QueryTemplate} />}
+          <DeliveriesOverview queryTemplate={null} />}
       </>
     );
   }

src/js/@WebParts/ProgramExperienceLog/IProgramExperienceLogState.ts

@@ -3,5 +3,5 @@ import { IDataSourceSearchCustom } from "prosjektportalen/lib/WebParts/DataSourc
 export default interface IProgramExperienceLogState {
     isLoading: boolean;
     errorMessage?: string;
-    searchSettings?: IDataSourceSearchCustom;
+    searchSettings?: IDataSourceSearchCustom[];
 }

src/js/@WebParts/ProgramExperienceLog/index.tsx

@@ -18,7 +18,7 @@ export default class ProgramExperienceLog extends React.Component<IProgramExperi
     public async componentDidMount() {
         try {
             const { items } = await common.getStoredProjectsListContext();
-            const searchSettings = await common.buildSearchSettingsFromStoredProjects(items, this.props.queryTemplate);
+            const searchSettings = await common.buildSearchQueriesFromProgramProjects(items, this.props.queryTemplate);
             this.setState({ searchSettings, isLoading: false });
         } catch (errorMessage) {
             this.setState({ errorMessage, isLoading: false });
@@ -47,7 +47,7 @@ export default class ProgramExperienceLog extends React.Component<IProgramExperi
                 <h2>Erfaringslogg</h2>
                 {(!this.state.isLoading && this.state.searchSettings) &&
                     <ExperienceLog
-                        queryTemplate={this.state.searchSettings.QueryTemplate}
+                        queryTemplate={null} //{this.state.searchSettings.QueryTemplate}
                     />}
             </>
         );

src/js/@WebParts/ProgramPortfolio/IProgramPortfolioProps.ts

@@ -1 +1,7 @@
-export default interface IProgramPortfolioProps {}
+export default interface IProgramPortfolioProps {
+    queryTemplate?: string;
+}
+
+export const ProgramExperienceLogDefaultProps: Partial<IProgramPortfolioProps> = {
+    queryTemplate: '({0}) ContentTypeId:0x010088578E7470CC4AA68D5663464831070211* NOT GtProjectLifecycleStatusOWSCHCS="Avsluttet"'
+};

src/js/@WebParts/ProgramProjectStats/IProgramProjectStatsState.ts

@@ -5,5 +5,5 @@ export interface IProgramProjectStatsState {
     isLoading: boolean;
     errorMessage?: string;
     items?: ProjectItem[];
-    searchSettings?: IDataSourceSearchCustom;
+    searchSettings?: IDataSourceSearchCustom[];
 }

src/js/@WebParts/ProgramProjectStats/index.tsx

@@ -18,7 +18,7 @@ export default class ProgramProjectStats extends React.Component<IProgramProject
     public async componentDidMount() {
         try {
             const { items } = await common.getStoredProjectsListContext();
-            const searchSettings = await common.buildSearchSettingsFromStoredProjects(items, this.props.queryTemplate);
+            const searchSettings = await common.buildSearchQueriesFromProgramProjects(items, this.props.queryTemplate);
             this.setState({ items, searchSettings, isLoading: false });
         } catch (errorMessage) {
             this.setState({ errorMessage, isLoading: false });
@@ -50,7 +50,7 @@ export default class ProgramProjectStats extends React.Component<IProgramProject
                         viewSelectorEnabled={false}
                         renderCommandBar={false}
                         chartsConfigListName="Diagramkonfigurasjon for programmets prosjekter"
-                        queryTemplate={this.state.searchSettings.QueryTemplate}
+                        queryTemplate={this.state.searchSettings}//{this.state.searchSettings.QueryTemplate}
                     />}
             </>
         );

src/js/@WebParts/ProgramResourceAllocation/IProgramResourceAllocationState.ts

@@ -2,5 +2,5 @@ import { IDataSourceSearchCustom } from "prosjektportalen/lib/WebParts/DataSourc
 export interface IProgramResourceAllocationState {
     isLoading: boolean;
     errorMessage?: string;
-    searchSettings?: IDataSourceSearchCustom;
+    searchSettings?: IDataSourceSearchCustom[];
 }

src/js/@WebParts/ProgramResourceAllocation/index.tsx

@@ -18,7 +18,7 @@ export default class ProgramResourceAllocation extends React.Component<IProgramR
   public async componentDidMount() {
     try {
       const { items } = await common.getStoredProjectsListContext();
-      const searchSettings = await common.buildSearchSettingsFromStoredProjects(items, this.props.queryTemplate);
+      const searchSettings = await common.buildSearchQueriesFromProgramProjects(items, this.props.queryTemplate);
       this.setState({ searchSettings, isLoading: false });
     } catch (errorMessage) {
       this.setState({ errorMessage, isLoading: false });
@@ -48,7 +48,7 @@ export default class ProgramResourceAllocation extends React.Component<IProgramR
         {(!this.state.isLoading && this.state.searchSettings) &&
           <ResourceAllocation
             searchConfiguration={this.props.searchConfiguration}
-            queryTemplate={this.state.searchSettings.QueryTemplate}
+            queryTemplate= {null}//{this.state.searchSettings.QueryTemplate}
           />}
       </>
     );

src/js/@WebParts/ProgramRiskOverview/IProgramRiskOverviewState.ts

@@ -3,5 +3,5 @@ import { IDataSourceSearchCustom } from "prosjektportalen/lib/WebParts/DataSourc
 export default interface IProgramRiskOverviewState {
     isLoading: boolean;
     errorMessage?: string;
-    searchSettings?: IDataSourceSearchCustom;
+    searchSettings?: IDataSourceSearchCustom[];
 }

src/js/@WebParts/ProgramRiskOverview/index.tsx

@@ -18,7 +18,7 @@ export default class ProgramRiskOverview extends React.Component<IProgramRiskOve
   public async componentDidMount() {
     try {
       const { items } = await common.getStoredProjectsListContext();
-      const searchSettings = await common.buildSearchSettingsFromStoredProjects(items, this.props.queryTemplate);
+      const searchSettings = await common.buildSearchQueriesFromProgramProjects(items, this.props.queryTemplate);
       this.setState({ searchSettings, isLoading: false });
     } catch (errorMessage) {
       this.setState({ errorMessage, isLoading: false });
@@ -47,7 +47,7 @@ export default class ProgramRiskOverview extends React.Component<IProgramRiskOve
         <h2>Risikooversikt</h2>
         {(!this.state.isLoading && this.state.searchSettings) &&
           <RiskMatrix
-            queryTemplate={this.state.searchSettings.QueryTemplate} />}
+        queryTemplate={null} />}
       </>
     );
   }