Merge pull request #3203 from microsoft-search/develop

v4.9.3
microsoft-search · Aug 23, 2023 · 156cc90 · 156cc90
2 parents 284e2bd + 736e6bc
commit 156cc90
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 300 deletions.
diff --git a/search-parts/config/package-solution.json b/search-parts/config/package-solution.json
@@ -3,7 +3,7 @@
     "solution": {
         "name": "PnP Modern Search - Search Web Parts - v4",
         "id": "59903278-dd5d-4e9e-bef6-562aae716b8b",
-        "version": "4.9.2.0",
+        "version": "4.9.3.0",
         "includeClientSideAssets": true,
         "skipFeatureDeployment": true,
         "isDomainIsolated": false,

diff --git a/search-parts/package-lock.json b/search-parts/package-lock.json
diff --git a/search-parts/package.json b/search-parts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pnp/modern-search-web-parts",
-    "version": "4.9.2",
+    "version": "4.9.3",
     "private": true,
     "main": "lib/index.js",
     "engines": {
@@ -16,7 +16,6 @@
         "@fluentui/react": "^8.109.7",
         "@fluentui/react-file-type-icons": "8.8.18",
         "@fluentui/react-theme-provider": "0.19.16",
-        "@microsoft/applicationinsights-web": "^2.8.9",
         "@microsoft/mgt-react": "^2.10.1",
         "@microsoft/mgt-sharepoint-provider": "^2.10.1",
         "@microsoft/sp-component-base": "1.15.2",

diff --git a/search-parts/src/common/Constants.ts b/search-parts/src/common/Constants.ts
@@ -14,12 +14,6 @@ export class Constants {
      * The client tag to append to all REST calls to SharePoint
      */
     public static readonly X_CLIENTSERVICE_CLIENTTAG = 'NonISV|PnP|ModernSearch';
-
-    /**
-     * The PnP Application Insights instrumentation key and events for stats tracking
-     */
-    public static readonly PNP_APP_INSIGHTS_INSTRUMENTATION_KEY = '0f0b9db6-680c-480c-804d-f75830e2c383';
-    public static readonly PNP_MODERN_SEARCH_EVENT_NAME = 'pnpModernSearchV4';
 }
 
 export enum AutoCalculatedDataSourceFields {

diff --git a/search-parts/src/helpers/LocalizationHelper.ts b/search-parts/src/helpers/LocalizationHelper.ts
@@ -77,8 +77,8 @@ class LocalizationHelper {
     }
 
     private static isInt(value: any): boolean {
-        const x = parseFloat(value);
-        return !isNaN(value) && (x | 0) === x;
+        const x = Number(value);
+        return Number.isInteger(x);
     }
 
     /**
@@ -92,4 +92,4 @@ class LocalizationHelper {
     }
 }
 
-export default LocalizationHelper;
+export default LocalizationHelper;
diff --git a/search-parts/src/webparts/searchResults/ISearchResultsWebPartProps.ts b/search-parts/src/webparts/searchResults/ISearchResultsWebPartProps.ts
@@ -173,11 +173,6 @@ export default interface ISearchResultsWebPartProps extends IBaseWebPartProps {
      */
     selectedItemFieldValue: DynamicProperty<string>;
 
-    /**
-     * Flag indicating if telemetry are enabled
-     */
-    enableTelemetry: boolean;
-
     /**
      * The queryModifier properties
      */

diff --git a/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts b/search-parts/src/webparts/searchResults/SearchResultsWebPart.ts
@@ -58,7 +58,6 @@ import { BuiltinFilterTemplates } from '../../layouts/AvailableTemplates';
 import { IExtensibilityConfiguration } from '../../models/common/IExtensibilityConfiguration';
 import { IDataVerticalSourceData } from '../../models/dynamicData/IDataVerticalSourceData';
 import { BaseWebPart } from '../../common/BaseWebPart';
-import { ApplicationInsights } from '@microsoft/applicationinsights-web';
 import commonStyles from '../../styles/Common.module.scss';
 import { UrlHelper } from '../../helpers/UrlHelper';
 import { ObjectHelper } from '../../helpers/ObjectHelper';
@@ -526,34 +525,6 @@ export default class SearchResultsWebPart extends BaseWebPart<ISearchResultsWebP
         // Web components are only defined once.
         await this.templateService.registerWebComponents(this.availableWebComponentDefinitions, this.instanceId);
 
-        if (this.properties.dataSourceKey && this.properties.selectedLayoutKey && this.properties.enableTelemetry) {
-
-            const usageEvent = {
-                name: Constants.PNP_MODERN_SEARCH_EVENT_NAME,
-                properties: {
-                    selectedDataSource: this.properties.dataSourceKey,
-                    selectedLayout: this.properties.selectedLayoutKey,
-                    useFilters: this.properties.useFilters,
-                    useVerticals: this.properties.useVerticals
-                }
-            };
-
-            // Track event with application insights (PnP)
-            const appInsights = new ApplicationInsights({
-                config: {
-                    maxBatchInterval: 0,
-                    instrumentationKey: Constants.PNP_APP_INSIGHTS_INSTRUMENTATION_KEY,
-                    namePrefix: LogSource,
-                    disableFetchTracking: true,
-                    disableAjaxTracking: true
-                }
-            });
-
-            appInsights.loadAppInsights();
-            appInsights.context.application.ver = this.manifest.version;
-            appInsights.trackEvent(usageEvent);
-        }
-
         // Initializes MS Graph Toolkit
         if (this.properties.useMicrosoftGraphToolkit) {
             await loadMsGraphToolkit(this.context);
@@ -694,11 +665,6 @@ export default class SearchResultsWebPart extends BaseWebPart<ISearchResultsWebP
                             this._propertyPanePropertyEditor({
                                 webpart: this,
                                 key: 'propertyEditor'
-                            }),
-                            PropertyPaneToggle('enableTelemetry', {
-                                label: webPartStrings.PropertyPane.InformationPage.EnableTelemetryLabel,
-                                offText: webPartStrings.PropertyPane.InformationPage.EnableTelemetryOn,
-                                onText: webPartStrings.PropertyPane.InformationPage.EnableTelemetryOff,
                             })
                         ]
                     }
@@ -1169,7 +1135,6 @@ export default class SearchResultsWebPart extends BaseWebPart<ISearchResultsWebP
         this.properties.showResultsCount = this.properties.showResultsCount !== undefined ? this.properties.showResultsCount : true;
         this.properties.showBlankIfNoResult = this.properties.showBlankIfNoResult !== undefined ? this.properties.showBlankIfNoResult : false;
         this.properties.useMicrosoftGraphToolkit = this.properties.useMicrosoftGraphToolkit !== undefined ? this.properties.useMicrosoftGraphToolkit : false;
-        this.properties.enableTelemetry = this.properties.enableTelemetry !== undefined ? this.properties.enableTelemetry : true;
 
         // Item selection properties
         if (!this.properties.selectedItemFieldValue) {

diff --git a/search-parts/src/webparts/searchResults/loc/da-dk.js b/search-parts/src/webparts/searchResults/loc/da-dk.js
@@ -118,10 +118,7 @@ define([], function() {
         Extensibility: {
           PanelHeader: "Konfigurér extensibility-biblioteker så de indlæser ved opstart.",
           PanelDescription: "Tilføj/Fjern ID på dit extensibility-bibliotek her. Du kan specificere et visningsnavn og beslutte, om biblioteket skal indlæses eller ej ved opstart. Kun brugerdefinerede datakilder, layouts, web-komponenter og Handlebars-hjælpere vil blive loadet her.",
-        },
-        EnableTelemetryLabel: "PnP telemetri",
-        EnableTelemetryOn: "Slå telemetri til",
-        EnableTelemetryOff: "Slå telemetri fra"
+        }
       },
       CustomQueryModifier: {          
           EditQueryModifiersLabel: "Konfigurere tilgængelige brugerdefinerede forespørgselsmodifikatorer",