Merge branch 'dev' into fix/update-doc-links

Author: ElinorW

.vscode/settings.json

@@ -23,6 +23,7 @@
     "package.json": "package-lock.json, .npmrc"
   },
   "cSpell.words": [
-    "fluentui"
+    "fluentui",
+    "noreferrer"
   ],
 }

azure-pipelines.yml

@@ -109,50 +109,6 @@ extends:
             npm run build
           displayName: "Run build"
       - job: Two
-        displayName: "Run playwright tests"
-        condition: eq(variables['isDev'], 'true')
-        steps:
-        - task: NodeTool@0
-          inputs:
-            versionSpec: "18.16.x"
-          displayName: "Install npm"
-        - script: |
-            npm install
-          displayName: "npm install"
-        - script: |
-            npm install -D @playwright/test
-            npx playwright install-deps
-          displayName: "Install playwright dependancies"
-        - script: |
-            npx playwright install
-          displayName: "Install playwright"
-        - script: |
-            npm run test-playwright-accessibility
-          displayName: "Run accessibility tests"
-        - script: |
-            set CI=true
-            npm run test-playwright
-          env:
-            REACT_APP_CLIENT_ID: $(REACT_APP_PLAYWRIGHT_TEST_CLIENT_ID)
-            REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_STAGING_INSTRUMENTATION_KEY)
-            REACT_APP_CONNECTION_STRING: $(REACT_APP_STAGING_CONNECTION_STRING)
-            REACT_APP_FEEDBACK_CAMPAIGN_ID: $(REACT_APP_STAGING_FEEDBACK_CAMPAIGN_ID)
-            REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID: $(REACT_APP_NPS_FEEDBACK_CAMPAIGN_ID)
-            REACT_APP_NOMINATION_PERIOD: $(REACT_APP_NOMINATION_PERIOD)
-            REACT_APP_COOLDOWN_PERIOD: $(REACT_APP_COOLDOWN_PERIOD)
-            REACT_APP_USAGE_TIME: $(REACT_APP_USAGE_TIME)
-            PLAYWRIGHT_TESTS_BASE_URL: $(PLAYWRIGHT_TESTS_BASE_URL)
-            PLAYWRIGHT_TESTS_USERNAME: $(PLAYWRIGHT_TESTS_USERNAME)
-            PLAYWRIGHT_TESTS_PASSWORD: $(PLAYWRIGHT_TESTS_PASSWORD)
-          displayName: "Run playwright tests"
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            displayName: 'Publish test results'
-            condition: always()
-            targetPath: $(System.DefaultWorkingDirectory)/playwright-report
-            artifactName: playwright-report
-      - job: Three
         displayName: "Publish artifacts"
         dependsOn: One
         steps:
@@ -252,7 +208,7 @@ extends:
         parameters:
           directory: 'microsoft-graph-explorer-v4'
           repoName: ReleasePipelines
-          dependsOn: ['Three']
+          dependsOn: ['Two']
 
     - stage: DeployProduction
       condition: and(contains(variables['build.sourceBranch'], 'refs/heads/master'), succeeded())
@@ -275,7 +231,7 @@ extends:
                 displayName: 'Deploy to portal - staging'
                 inputs:
                   SourcePath: '$(Build.ArtifactStagingDirectory)/drop/*'
-                  azureSubscription: 'Federated GE-Portals Managed Identity Connection'
+                  azureSubscription: 'Federated Portals Managed Identity Connection'
                   Destination: AzureBlob
                   storage: graphstagingblobstorage
                   ContainerName: staging
@@ -285,7 +241,7 @@ extends:
                 displayName: 'Deploy to portal - production'
                 inputs:
                   SourcePath: '$(Build.ArtifactStagingDirectory)/drop/*'
-                  azureSubscription: 'Federated GE-Portals Managed Identity Connection'
+                  azureSubscription: 'Federated Portals Managed Identity Connection'
                   Destination: AzureBlob
                   storage: graphprodblobstorage
                   ContainerName: prod

package-lock.json

@@ -8,13 +8,13 @@
                 "@azure/msal-browser": "4.5.1",
                 "@babel/core": "7.26.10",
                 "@babel/runtime": "7.26.10",
-                "@fluentui/react": "8.122.9",
+                "@fluentui-contrib/react-resize-handle": "0.6.1",
                 "@fluentui/react-components": "9.60.0",
                 "@fluentui/react-icons": "2.0.274",
-                "@fluentui/react-icons-mdl2": "1.3.83",
                 "@microsoft/applicationinsights-react-js": "17.3.4",
                 "@microsoft/applicationinsights-web": "3.3.6",
                 "@microsoft/microsoft-graph-client": "3.0.7",
+                "@microsoft/microsoft-graph-types": "2.40.0",
                 "@monaco-editor/react": "4.7.0",
                 "@ms-ofb/officebrowserfeedbacknpm": "file:packages/officebrowserfeedbacknpm-1.6.6.tgz",
                 "@reduxjs/toolkit": "2.6.0",
@@ -48,7 +48,6 @@
                 "postcss-flexbugs-fixes": "5.0.2",
                 "postcss-loader": "8.1.1",
                 "postcss-preset-env": "10.1.1",
-                "re-resizable": "6.11.2",
                 "react": "18.3.0",
                 "react-app-polyfill": "3.0.0",
                 "react-dom": "18.3.0",
@@ -69,7 +68,8 @@
                 "start": "node scripts/start.js",
                 "build": "node scripts/build.js && node versioned-build.js",
                 "test": "node scripts/test.js --no-watch --testPathIgnorePatterns=src/tests/ui src/tests/accessibility /scripts/ --max-old-space-size=8192",
-                "lint": "eslint . \"**/*.{js,ts,tsx}\"",
+                "lint": "eslint . \"**/*.{js,ts,tsx}\" --quiet",
+                "lint-fix": "eslint . \"**/*.{js,ts,tsx}\" --quiet --fix",
                 "prebuild:prod": "standard-version",
                 "build:prod": "npm run build",
                 "bump": "standard-version --skip.tag --skip.changelog",

package.json

@@ -6,6 +6,7 @@ import { ApplicationState, store } from '../../../../src/store/index';
 import { fetchAutoCompleteOptions } from '../../../app/services/slices/autocomplete.slice';
 import { suggestions } from '../../../modules/suggestions/suggestions';
 import { Mode } from '../../../types/enums';
+import { SnippetError } from '../../../types/snippets';
 import { AUTOCOMPLETE_FETCH_ERROR, AUTOCOMPLETE_FETCH_PENDING, AUTOCOMPLETE_FETCH_SUCCESS } from '../redux-constants';
 import { mockThunkMiddleware } from './mockThunkMiddleware';
 
@@ -61,13 +62,13 @@ const mockState: ApplicationState = {
     isLoadingData: false,
     response: {
       body: undefined,
-      headers: undefined
+      headers: {}
     }
   },
   snippets: {
     pending: false,
-    data: [],
-    error: null
+    data: {},
+    error: {} as SnippetError
   },
   responseAreaExpanded: false,
   dimensions: {

src/app/services/actions/autocomplete-action-creators.spec.ts

@@ -11,6 +11,7 @@ import {
 import { authenticationWrapper } from '../../../modules/authentication';
 import { ApplicationState, store } from '../../../store/index';
 import { Mode } from '../../../types/enums';
+import { SnippetError } from '../../../types/snippets';
 import { getPermissionsScopeType } from '../../utils/getPermissionsScopeType';
 import { translateMessage } from '../../utils/translate-messages';
 import { ACCOUNT_TYPE } from '../graph-constants';
@@ -82,13 +83,13 @@ const mockState: ApplicationState = {
     isLoadingData: false,
     response: {
       body: undefined,
-      headers: undefined
+      headers: {}
     }
   },
   snippets: {
     pending: false,
-    data: [],
-    error: null
+    data: {},
+    error: {} as SnippetError
   },
   responseAreaExpanded: false,
   dimensions: {
@@ -301,7 +302,7 @@ describe('Permissions action creators', () => {
             statusText: translateMessage('Revoking'),
             status: translateMessage('Please wait while we revoke this permission'),
             ok: false,
-            messageType: 0
+            messageBarType: 'info'
           }
         }
       ]
@@ -357,7 +358,7 @@ describe('Permissions action creators', () => {
             statusText: translateMessage('Revoking '),
             status: translateMessage('Please wait while we revoke this permission'),
             ok: false,
-            messageType: 0
+            messageBarType: 'info'
           }
         }
       ]
@@ -416,7 +417,7 @@ describe('Permissions action creators', () => {
             statusText: translateMessage('Revoking'),
             status: translateMessage('Please wait while we revoke this permission'),
             ok: false,
-            messageType: 0
+            messageBarType: 'info'
           }
         }
       ]

src/app/services/actions/permissions-action-creator.spec.ts

@@ -1,11 +1,13 @@
+import { User } from '@microsoft/microsoft-graph-types';
 import { componentNames, eventTypes, telemetry } from '../../../telemetry';
 import { IOAuthGrantPayload, IPermissionGrant } from '../../../types/permissions';
 import { IUser } from '../../../types/profile';
+import { CustomBody, ResponseValue } from '../../../types/query-response';
 import { IQuery } from '../../../types/query-runner';
 import { RevokeScopesError } from '../../utils/error-utils/RevokeScopesError';
 import { exponentialFetchRetry } from '../../utils/fetch-retry-handler';
 import { GRAPH_URL } from '../graph-constants';
-import { makeGraphRequest, parseResponse } from './query-action-creator-util';
+import { parseResponse, makeGraphRequest as queryMakeGraphRequest } from './query-action-creator-util';
 
 interface IPreliminaryChecksObject {
   defaultUserScopes: string[];
@@ -107,7 +109,9 @@ export class RevokePermissionsUtil {
     const tenantAdminQuery = { ...genericQuery };
     tenantAdminQuery.sampleUrl = `${GRAPH_URL}/v1.0/me/memberOf`;
     const response = await RevokePermissionsUtil.makeExponentialFetch([], tenantAdminQuery);
-    return response ? response.value.some((value: any) => value.displayName === 'Global Administrator') : false
+    const value = (response as CustomBody).value
+    const isAdmin = value ? value.some((v: Partial<User>)=>v?.displayName === 'Global Administrator') : false
+    return isAdmin
   }
 
   public async getUserPermissionChecks(preliminaryObject: PartialCheckObject): Promise<{
@@ -191,7 +195,7 @@ export class RevokePermissionsUtil {
     genericQuery.sampleUrl = `${GRAPH_URL}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${servicePrincipalAppId}'`;
     genericQuery.sampleHeaders = [{ name: 'ConsistencyLevel', value: 'eventual' }];
     const oAuthGrant = await RevokePermissionsUtil.makeExponentialFetch(scopes, genericQuery);
-    return oAuthGrant;
+    return oAuthGrant as IOAuthGrantPayload;
   }
 
   public permissionToRevokeInGrant(permissionsGrant: IPermissionGrant, allPrincipalGrant: IPermissionGrant,
@@ -207,7 +211,8 @@ export class RevokePermissionsUtil {
     const currentAppId = process.env.REACT_APP_CLIENT_ID;
     genericQuery.sampleUrl = `${GRAPH_URL}/v1.0/servicePrincipals?$filter=appId eq '${currentAppId}'`;
     const response = await this.makeGraphRequest(scopes, genericQuery);
-    return response ? response.value[0].id : '';
+    const value = (response as CustomBody)?.value
+    return value ? value[0]?.id ?? '' : ''
   }
 
   private async revokePermission(permissionGrantId: string, newScopes: string): Promise<boolean> {
@@ -219,32 +224,24 @@ export class RevokePermissionsUtil {
     patchQuery.sampleUrl = `${GRAPH_URL}/v1.0/oauth2PermissionGrants/${permissionGrantId}`;
     genericQuery.sampleHeaders = [{ name: 'ConsistencyLevel', value: 'eventual' }];
     patchQuery.selectedVerb = 'PATCH';
-    // eslint-disable-next-line no-useless-catch
-    try {
-      const response = await RevokePermissionsUtil.makeGraphRequest([], patchQuery);
-      const { error } = response;
-      if (error) {
-        return false;
-      }
-      return true;
-    }
-    catch (error: any) {
-      throw error;
+
+    const response = await RevokePermissionsUtil.makeGraphRequest([], patchQuery);
+    const error  = (response as CustomBody).error;
+    if (error) {
+      return false;
     }
+    return true;
   }
 
-  private static async makeExponentialFetch(scopes: string[], query: IQuery, condition?:
-  (args?: any) => Promise<boolean>) {
-    const respHeaders: any = {};
-    const response = await exponentialFetchRetry(() => makeGraphRequest(scopes)(query),
-      8, 100, condition);
-    return parseResponse(response, respHeaders);
+  private static async makeExponentialFetch(
+    scopes: string[], query: IQuery, condition?: (args?: unknown) => Promise<boolean>) {
+    const response = await exponentialFetchRetry(() => queryMakeGraphRequest(scopes)(query), 8, 100, condition);
+    return parseResponse(response as Response);
   }
 
   private static async makeGraphRequest(scopes: string[], query: IQuery) {
-    const respHeaders: any = {};
-    const response = await makeGraphRequest(scopes)(query);
-    return parseResponse(response, respHeaders);
+    const response = await queryMakeGraphRequest(scopes)(query);
+    return parseResponse(response as Response);
   }
 
   private trackRevokeConsentEvent = (status: string, permissionObject: any) => {

src/app/services/actions/permissions-action-creator.util.ts

@@ -103,10 +103,9 @@ export async function getProfileImage(): Promise<string> {
 
 export async function getProfileResponse(): Promise<IProfileResponse> {
   const scopes = DEFAULT_USER_SCOPES.split(' ');
-  const respHeaders: Record<string, string> = {};
 
   const response = await makeGraphRequest(scopes)(query);
-  const userInfo = await parseResponse(response, respHeaders);
+  const userInfo = await parseResponse(response as Response);
   return {
     userInfo,
     response