Merge branch 'dev' into feature/sovereign-clouds

config/webpack.config.js

@@ -417,7 +417,7 @@ module.exports = function (webpackEnv) {
         maxChunks: 1
       }),
       new MonacoWebpackPlugin({
-        languages: ['json', 'javascript', 'java', 'csharp', 'html', 'powershell', 'go', 'php']
+        languages: ['json', 'javascript', 'java', 'csharp', 'html', 'powershell', 'go']
       }),
       // Generates an `index.html` file with the <script> injected.
       new HtmlWebpackPlugin(

package.json

@@ -1,6 +1,6 @@
 {
         "name": "graph-explorer-v2",
-        "version": "6.1.0",
+        "version": "6.2.0",
         "private": true,
         "dependencies": {
                 "@augloop/types-core": "file:packages/types-core-2.16.189.tgz",

src/app/services/actions/snippet-action-creator.ts

@@ -44,7 +44,7 @@ export function getSnippet(language: string): Function {
       if (language !== 'csharp') {
         snippetsUrl += `?lang=${language}`;
       }
-      const openApiSnippets: string[] = ['go', 'powershell', 'php'];
+      const openApiSnippets: string[] = ['go', 'powershell'];
       if (openApiSnippets.includes(language)) {
         snippetsUrl += '&generation=openapi';
       }

src/app/views/main-header/MainHeader.tsx

@@ -49,7 +49,6 @@ export const MainHeader: React.FunctionComponent <MainHeaderProps> = (props: Mai
     feedbackIconAdjustmentStyles, tenantIconStyles, moreInformationStyles,
     tenantLabelStyle, tenantContainerStyle } = mainHeaderStyles(currentTheme, mobileScreen);
 
-
   return (
     <Stack tokens={sectionStackTokens}>
       <Stack

src/app/views/query-response/snippets/Snippets.tsx

@@ -25,10 +25,6 @@ function GetSnippets() {
     'PowerShell': {
       sdkDownloadLink: 'https://aka.ms/pshellsdk',
       sdkDocLink: 'https://aka.ms/pshellsdkdocs'
-    },
-    'PHP': {
-      sdkDownloadLink: 'https://aka.ms/graphphpsdk',
-      sdkDocLink: 'https://aka.ms/sdk-doc'
     }
   };
 

src/app/views/query-runner/query-input/share-query/ShareQuery.tsx

@@ -21,8 +21,7 @@ export const ShareQuery = () => {
 
   const query = { ...sampleQuery };
   const sanitizedQueryUrl = sanitizeQueryUrl(query.sampleUrl);
-  query.sampleUrl = sanitizedQueryUrl;
-  const shareLink = createShareLink(query);
+  const shareLink = createShareLink(sampleQuery);
 
   const toggleShareQueryDialogState = () => {
     setShareQuaryDialogStatus(prevState => !prevState);
@@ -37,7 +36,7 @@ export const ShareQuery = () => {
     telemetry.trackEvent(eventTypes.BUTTON_CLICK_EVENT,
       {
         ComponentName: componentNames.SHARE_QUERY_COPY_BUTTON,
-        QuerySignature: `${sampleQuery.selectedVerb} ${sanitizedQueryUrl}`
+        QuerySignature: `${query.selectedVerb} ${sanitizedQueryUrl}`
       });
   }
 

src/modules/suggestions/suggestions.ts

@@ -26,7 +26,15 @@ class Suggestions implements ISuggestions {
       return localOptions;
     }
 
-    return this.fetchSuggestionsFromNetwork(url, api, version);
+    /*
+    * blocks calls to the API for path segments
+    * uses resource explorer and cache as source of truth
+    */
+    if (context === 'parameters') {
+      return this.fetchSuggestionsFromNetwork(url, api, version);
+    }
+
+    return null;
   }
 
   private async getSuggestionsFromResources(url: string, version: string,

src/telemetry/component-names.ts

@@ -74,6 +74,9 @@ export const CODE_SNIPPET_LANGUAGES = {
   },
   Powershell: {
     sdk: 'PowerShell snippet SDK link', doc: 'PowerShell snippet docs link'
+  },
+  PHP: {
+    sdk: 'PHP snippet SDK link', doc: 'PHP snippet docs link'
   }
 }
 export const GE_DOCUMENTATION_LINK = 'GE documentation link';