Merge branch 'dev' into dependabot-upgrades

.vscode/settings.json

@@ -9,7 +9,7 @@
   },
   "files.trimTrailingWhitespace": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "eslint.format.enable": true,
   "editor.formatOnSave": false,

package.json

@@ -51,7 +51,6 @@
                 "react": "18.2.0",
                 "react-app-polyfill": "3.0.0",
                 "react-dom": "18.2.0",
-                "react-intl": "6.5.2",
                 "react-redux": "8.1.3",
                 "redux": "4.2.1",
                 "redux-thunk": "2.4.2",
@@ -99,7 +98,6 @@
                 "@types/lodash.debounce": "4.0.9",
                 "@types/react": "18.2.47",
                 "@types/react-dom": "18.2.15",
-                "@types/react-intl": "3.0.0",
                 "@types/react-redux": "7.1.30",
                 "@types/redux-logger": "3.0.11",
                 "@types/redux-mock-store": "1.0.3",

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

@@ -1,6 +1,5 @@
 import { MessageBarType } from '@fluentui/react';
 
-import { geLocale } from '../../../appLocale';
 import { authenticationWrapper } from '../../../modules/authentication';
 import { AppAction } from '../../../types/action';
 import { IUser } from '../../../types/profile';
@@ -136,8 +135,7 @@ export function fetchScopes(scopesFetchType: ScopesFetchType = 'full') {
       }
 
       const headers = {
-        'Content-Type': 'application/json',
-        'Accept-Language': geLocale
+        'Content-Type': 'application/json'
       };
 
       const options: IRequestOptions = { headers };

src/app/services/actions/samples-action-creators.ts

@@ -1,4 +1,3 @@
-import { geLocale } from '../../../appLocale';
 import { samplesCache } from '../../../modules/cache/samples.cache';
 import { AppDispatch } from '../../../store';
 import { AppAction } from '../../../types/action';
@@ -41,8 +40,7 @@ export function fetchSamples() {
       : `${samplesUrl}`;
 
     const headers = {
-      'Content-Type': 'application/json',
-      'Accept-Language': geLocale
+      'Content-Type': 'application/json'
     };
 
     const options: IRequestOptions = { headers };

src/app/utils/translate-messages.ts

@@ -1,11 +1,6 @@
-import { geLocale } from '../../appLocale';
 import messages from '../../messages';
 
 export function translateMessage(messageId: string): string {
-  const translatedMessage = getTranslation(messageId, geLocale);
-  if (translatedMessage) {
-    return translatedMessage;
-  }
   return getTranslation(messageId, 'en-US') || messageId;
 }
 

src/app/views/App.tsx

@@ -1,7 +1,6 @@
 import { Announced, getTheme, ITheme, styled } from '@fluentui/react';
 import { Resizable } from 're-resizable';
 import { Component } from 'react';
-import { injectIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
 
@@ -43,7 +42,6 @@ import { ValidationProvider } from '../services/context/validation-context/Valid
 export interface IAppProps {
   theme?: ITheme;
   styles?: object;
-  intl: any;
   profile: object;
   graphExplorerMode: Mode;
   sidebarProperties: ISidebarProps;
@@ -476,7 +474,7 @@ class App extends Component<IAppProps, IAppState> {
                       <div style={mobileScreen ? this.statusAreaMobileStyle : this.statusAreaFullScreenStyle}>
                         <StatusMessages />
                       </div>
-                      <QueryResponse verb={this.state.selectedVerb} />
+                      <QueryResponse />
                     </div>
                   </ValidationProvider>
                 </Resizable>
@@ -529,7 +527,6 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
 };
 
 const StyledApp = styled(App, appStyles as any);
-const IntlApp = injectIntl(StyledApp);
 
 //@ts-ignore
-export default connect(mapStateToProps, mapDispatchToProps)(IntlApp);
+export default connect(mapStateToProps, mapDispatchToProps)(StyledApp);

src/app/views/app-sections/HeaderMessaging.tsx

@@ -1,8 +1,8 @@
 import { Link, MessageBar, MessageBarType } from '@fluentui/react';
-import { FormattedMessage } from 'react-intl';
 
 import { getLoginType } from '../../../modules/authentication/authUtils';
 import { LoginType } from '../../../types/enums';
+import { translateMessage } from '../../utils/translate-messages';
 
 export function headerMessaging(query: string): React.ReactNode {
   const loginType = getLoginType();
@@ -12,23 +12,23 @@ export function headerMessaging(query: string): React.ReactNode {
       {loginType === LoginType.Popup && <>
         <MessageBar messageBarType={MessageBarType.info} isMultiline={true}>
           <p>
-            <FormattedMessage id='To try the full features' />,
+            {translateMessage('To try the full features')},
             <Link tabIndex={0} href={query} target='_blank' rel='noopener noreferrer' underline>
-              <FormattedMessage id='full Graph Explorer' />.
+              {translateMessage('full Graph Explorer')}.
             </Link>
           </p>
           <p>
-            <FormattedMessage id='running the query' />.
+            {translateMessage('running the query')}.
           </p>
         </MessageBar>
 
       </>}
       {loginType === LoginType.Redirect && <MessageBar messageBarType={MessageBarType.warning} isMultiline={true}>
         <p>
-          <FormattedMessage id='To try operations other than GET' />,
+          {translateMessage('To try operations other than GET')},
 
           <Link tabIndex={0} href={query} target='_blank' rel='noopener noreferrer' underline>
-            <FormattedMessage id='sign in' />.
+            {translateMessage('sign in')}.
           </Link>
         </p>
       </MessageBar>}

src/app/views/app-sections/StatusMessages.tsx

@@ -1,17 +1,17 @@
 import { Link, MessageBar } from '@fluentui/react';
 import { Fragment } from 'react';
-import { FormattedMessage } from 'react-intl';
 import { useDispatch } from 'react-redux';
 
-import { IQuery } from '../../../types/query-runner';
 import { AppDispatch, useAppSelector } from '../../../store';
+import { IQuery } from '../../../types/query-runner';
 import { setSampleQuery } from '../../services/actions/query-input-action-creators';
 import { clearQueryStatus } from '../../services/actions/query-status-action-creator';
 import { GRAPH_URL } from '../../services/graph-constants';
 import {
   convertArrayToObject, extractUrl, getMatchesAndParts,
   matchIncludesLink, replaceLinks
 } from '../../utils/status-message';
+import { translateMessage } from '../../utils/translate-messages';
 
 const StatusMessages = () => {
   const dispatch: AppDispatch = useDispatch();
@@ -70,15 +70,15 @@ const StatusMessages = () => {
       {`${statusText} - `}{displayStatusMessage(message, urls)}
 
       {duration && <>
-        {` - ${duration}`}<FormattedMessage id='milliseconds' />
+        {` - ${duration} ${translateMessage('milliseconds')}`}
       </>}
 
       {status === 403 && <>.
-        <FormattedMessage id='consent to scopes' />
+        {translateMessage('consent to scopes')}
         <span style={{ fontWeight: 600 }}>
-          <FormattedMessage id='modify permissions' />
+          {translateMessage('modify permissions')}
         </span>
-        <FormattedMessage id='tab' />
+        {translateMessage('tab')}
       </>}
 
       {hint && <div>{hint}</div>}