From cb17eaaaff02cd2ea301a94b315e4991c588cc78 Mon Sep 17 00:00:00 2001
From: Markus Waelchli <mkw@nexplore.ch>
Date: Mon, 8 Apr 2024 13:22:15 +0200
Subject: [PATCH 1/3] Change to MS Search Data Source to support query template

---
 .../dataSources/MicrosoftSearchDataSource.ts   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/search-parts/src/dataSources/MicrosoftSearchDataSource.ts b/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
index 782a134a..56bc8d58 100644
--- a/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
+++ b/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
@@ -2,7 +2,7 @@ import { BaseDataSource, FilterSortType, FilterSortDirection, ITemplateSlot, Bui
 import { IPropertyPaneGroup, PropertyPaneLabel, IPropertyPaneField, PropertyPaneToggle, PropertyPaneHorizontalRule } from "@microsoft/sp-property-pane";
 import { cloneDeep, isEmpty, find } from '@microsoft/sp-lodash-subset';
 import { MSGraphClientFactory } from "@microsoft/sp-http";
-import { TokenService } from "../services/tokenService/TokenService";
+import { BuiltinTokenNames, TokenService } from "../services/tokenService/TokenService";
 import { ServiceScope } from '@microsoft/sp-core-library';
 import { Dropdown, IComboBoxOption, IDropdownProps, ITextFieldProps, TextField } from '@fluentui/react';
 import { PropertyPaneAsyncCombo } from "../controls/PropertyPaneAsyncCombo/PropertyPaneAsyncCombo";
@@ -378,7 +378,7 @@ export class MicrosoftSearchDataSource extends BaseDataSource<IMicrosoftSearchDa
         if (this.properties.entityTypes.indexOf(EntityType.DriveItem) !== -1 ||
             this.properties.entityTypes.indexOf(EntityType.ListItem) !== -1 ||
             this.properties.entityTypes.indexOf(EntityType.Site) !== -1 ||
-            this.properties.entityTypes.indexOf(EntityType.List) !== -1 || 
+            this.properties.entityTypes.indexOf(EntityType.List) !== -1 ||
             this.properties.entityTypes.indexOf(EntityType.ExternalItem) !== -1) {
 
             sortPropertiesFields.push(
@@ -687,13 +687,11 @@ export class MicrosoftSearchDataSource extends BaseDataSource<IMicrosoftSearchDa
         }
 
         // Query modification
+        // As of 04/08/2024 query template is supported in v1.0 version. 
+        // The {searchTerms} token may not be replaced in query template, otherwise wrong results may be returned.
+        // see (https://learn.microsoft.com/en-us/graph/api/search-query?view=graph-rest-1.0&tabs=http, Example 2)
+        this._tokenService.setTokenValue(BuiltinTokenNames.searchTerms, undefined);
         let queryTemplate = await this._tokenService.resolveTokens(this.properties.queryTemplate);
-        if (!isEmpty(queryTemplate.trim()) && !this.properties.useBetaEndpoint) {
-
-            // Use {searchTerms} or {inputQueryText} to use orginal value
-            // As of 06/06/2022 the query template is still in beta so we use the query text instead
-            queryText = queryTemplate.trim();
-        }
 
         // Paging
         if (dataContext.pageNumber > 1) {
@@ -778,8 +776,8 @@ export class MicrosoftSearchDataSource extends BaseDataSource<IMicrosoftSearchDa
         }
 
         // Sort is only available for 'ListItem' and ExternalItem
-        if (this.properties.entityTypes.indexOf(EntityType.ListItem) !== -1 ||  
-        this.properties.entityTypes.indexOf(EntityType.ExternalItem) !== -1) {
+        if (this.properties.entityTypes.indexOf(EntityType.ListItem) !== -1 ||
+            this.properties.entityTypes.indexOf(EntityType.ExternalItem) !== -1) {
 
             if (dataContext.sorting?.selectedSortFieldName
                 && dataContext.sorting?.selectedSortDirection) {

From eb7988c46100e42dca26f172531ffd3596b63ba9 Mon Sep 17 00:00:00 2001
From: Markus Waelchli <mkw@nexplore.ch>
Date: Thu, 11 Apr 2024 11:25:36 +0200
Subject: [PATCH 2/3] make change generic

---
 search-parts/src/dataSources/MicrosoftSearchDataSource.ts  | 7 +------
 .../src/webparts/searchResults/SearchResultsWebPart.ts     | 5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/search-parts/src/dataSources/MicrosoftSearchDataSource.ts b/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
index 56bc8d58..b46b755d 100644
--- a/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
+++ b/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
@@ -2,7 +2,7 @@ import { BaseDataSource, FilterSortType, FilterSortDirection, ITemplateSlot, Bui
 import { IPropertyPaneGroup, PropertyPaneLabel, IPropertyPaneField, PropertyPaneToggle, PropertyPaneHorizontalRule } from "@microsoft/sp-property-pane";
 import { cloneDeep, isEmpty, find } from '@microsoft/sp-lodash-subset';
 import { MSGraphClientFactory } from "@microsoft/sp-http";
-import { BuiltinTokenNames, TokenService } from "../services/tokenService/TokenService";
+import { TokenService } from "../services/tokenService/TokenService";
 import { ServiceScope } from '@microsoft/sp-core-library';
 import { Dropdown, IComboBoxOption, IDropdownProps, ITextFieldProps, TextField } from '@fluentui/react';
 import { PropertyPaneAsyncCombo } from "../controls/PropertyPaneAsyncCombo/PropertyPaneAsyncCombo";
@@ -686,11 +686,6 @@ export class MicrosoftSearchDataSource extends BaseDataSource<IMicrosoftSearchDa
             queryText = await this._tokenService.resolveTokens(dataContext.inputQueryText);
         }
 
-        // Query modification
-        // As of 04/08/2024 query template is supported in v1.0 version. 
-        // The {searchTerms} token may not be replaced in query template, otherwise wrong results may be returned.
-        // see (https://learn.microsoft.com/en-us/graph/api/search-query?view=graph-rest-1.0&tabs=http, Example 2)
-        this._tokenService.setTokenValue(BuiltinTokenNames.searchTerms, undefined);
         let queryTemplate = await this._tokenService.resolveTokens(this.properties.queryTemplate);
 
         // Paging
diff --git a/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts b/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
index 6806f87b..00a3bdca 100644
--- a/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
+++ b/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
@@ -2208,11 +2208,6 @@ export default class SearchResultsWebPart extends BaseWebPart<ISearchResultsWebP
             this.tokenService.setTokenValue(BuiltinTokenNames.inputQueryText, inputQueryText);
             this.tokenService.setTokenValue(BuiltinTokenNames.originalInputQueryText, inputQueryText);   
 
-            //Set searchTerms value from inputQueryText, but set initial token value, undefined, if empty
-            const searchTerms = inputQueryText ?? undefined;
-            // Legacy token for SharePoint and Microsoft Search data sources
-            this.tokenService.setTokenValue(BuiltinTokenNames.searchTerms, searchTerms);    
-
             // Selected filters
             if (this._filtersConnectionSourceData) {
 

From 0c670ea0ad61c888cc72ceb6550a44efad4f37dd Mon Sep 17 00:00:00 2001
From: Markus Waelchli <mkw@nexplore.ch>
Date: Thu, 11 Apr 2024 11:26:51 +0200
Subject: [PATCH 3/3] comment readded

---
 search-parts/src/dataSources/MicrosoftSearchDataSource.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/search-parts/src/dataSources/MicrosoftSearchDataSource.ts b/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
index b46b755d..148f8db4 100644
--- a/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
+++ b/search-parts/src/dataSources/MicrosoftSearchDataSource.ts
@@ -686,6 +686,7 @@ export class MicrosoftSearchDataSource extends BaseDataSource<IMicrosoftSearchDa
             queryText = await this._tokenService.resolveTokens(dataContext.inputQueryText);
         }
 
+        // Query modification
         let queryTemplate = await this._tokenService.resolveTokens(this.properties.queryTemplate);
 
         // Paging