Chore: Update to 6.0.0

.github/workflows/linter.yml

@@ -24,7 +24,7 @@ jobs:
  - name: Set up Node
  uses: actions/setup-node@v3
  with:
- node-version: '14.x'
+ node-version: "14.x"
 
  - name: Cache npm
  uses: actions/cache@v3
@@ -52,26 +52,26 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - name: Checkout repository
- uses: actions/checkout@v3
- with:
- fetch-depth: 0
-
- - name: Set up Node
- uses: actions/setup-node@v3
- with:
- node-version: '14.x'
-
- - name: Cache node_modules
- uses: actions/cache@v3
- with:
- path: |
- node_modules
- packages/*/node_modules
- key: modules-${{ hashFiles('package-lock.json') }}
-
- - name: Lint
- run: npm run lint
+  - name: Checkout repository
+  uses: actions/checkout@v3
+  with:
+  fetch-depth: 0
+
+  - name: Set up Node
+  uses: actions/setup-node@v3
+  with:
+  node-version: "14.x"
+
+  - name: Cache node_modules
+  uses: actions/cache@v3
+  with:
+  path: |
+  node_modules
+  packages/*/node_modules
+  key: modules-${{ hashFiles('package-lock.json') }}
+
+  - name: Lint
+  run: npm run lint
 
  build:
  name: Build packages
@@ -85,7 +85,7 @@ jobs:
  - name: Set up Node
  uses: actions/setup-node@v3
  with:
- node-version: '14.x'
+ node-version: "14.x"
 
  - name: Cache node_modules
  uses: actions/cache@v3
@@ -113,7 +113,7 @@ jobs:
  - name: Set up Node
  uses: actions/setup-node@v3
  with:
- node-version: '14.x'
+ node-version: "14.x"
 
  - name: Cache node_modules
  uses: actions/cache@v3
@@ -156,11 +156,9 @@ jobs:
  - name: Run sonar cloud analysis
  uses: SonarSource/sonarcloud-github-action@master
  env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
-
-
  publish-preview-site:
  name: Static preview site creation
  needs: install
@@ -199,4 +197,4 @@ jobs:
  uses: Azure/static-web-apps-deploy@v0.0.1-preview
  with:
  azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_JOLLY_SAND_0AC78C710 }}
- action: "close"
+ action: "close"

package.json

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

src/app/utils/query-parameter-sanitization.spec.ts

@@ -291,4 +291,4 @@ describe('Sanitize Query Parameters should', () => {
  });
  });
 
-});
+});

src/app/utils/query-parameter-sanitization.ts

@@ -433,8 +433,7 @@ function sanitizeFilterQueryOptionValue(queryParameterValue: string): string {
  if (!isPropertyName(propertyName)) {
  propertyName = '<property>';
  }
- sanitizedQueryString += `${queryFunctionPrefix}(${propertyName}${
- commaIndex > 0 ? ',<value>' : ''
+ sanitizedQueryString += `${queryFunctionPrefix}(${propertyName}${commaIndex > 0 ? ',<value>' : ''
  })`;
  } else {
  sanitizedQueryString += `${queryFunctionPrefix}(<unknown>)`;
@@ -460,8 +459,7 @@ function sanitizeFilterQueryOptionValue(queryParameterValue: string): string {
  COMPARISON_OPERATORS.includes(expectedOperator) ||
  ARITHMETIC_OPERATORS.includes(expectedOperator)
  ) {
- sanitizedQueryString += `${segment} ${
- filterSegments[index + 1]
+ sanitizedQueryString += `${segment} ${filterSegments[index + 1]
  } <value>`;
  index += 2;
  continue;

src/app/views/app-sections/FeedbackButton.spec.tsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { cleanup, render } from '@testing-library/react';
+
+import { FeedbackButton } from './FeedbackButton';
+
+afterEach(cleanup);
+const renderFeedbackButton = () => {
+ return render(
+ <FeedbackButton />
+ )
+}
+
+jest.mock('react-redux', () => ({
+ useSelector: jest.fn(() => {
+ return {
+ profile: {
+ profileType: 'MSA'
+ }
+ }
+ }),
+ useDispatch: jest.fn()
+}));
+
+// eslint-disable-next-line no-console
+console.warn = jest.fn();
+
+// eslint-disable-next-line react/display-name
+jest.mock('../query-runner/request/feedback/FeedbackForm.tsx', () => () => {
+ return <div>Feedback</div>
+})
+
+describe('Tests Feedback button', () => {
+ it('Renders feedback button without crashing', () => {
+ const { getByText } = renderFeedbackButton();
+ expect(getByText(/Help Improve Graph Explorer/)).toBeDefined();
+
+ });
+})

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

@@ -0,0 +1,67 @@
+import { DirectionalHint, IconButton, IIconProps, TooltipHost } from '@fluentui/react';
+import React, { useState } from 'react';
+import { translateMessage } from '../../utils/translate-messages';
+import { useSelector } from 'react-redux';
+import FeedbackForm from '../query-runner/request/feedback/FeedbackForm';
+import { IRootState } from '../../../types/root';
+import { ACCOUNT_TYPE } from '../../services/graph-constants';
+
+export const FeedbackButton = () => {
+ const [enableSurvey, setEnableSurvey] = useState(false);
+ const { profile } = useSelector( (state: IRootState) => state );
+
+ const feedbackIcon : IIconProps = {
+ iconName : 'Feedback'
+ }
+ const feedbackTitle = translateMessage('Feedback');
+ const content = <div style={{padding:'3px'}}>{translateMessage('Feedback')}</div>
+
+ const feedbackIconStyles = {
+ root:{
+ height: '50px',
+ width: '50px'
+ }
+ }
+ const calloutProps = {
+ gapSpace: 0
+ };
+ const hostStyles = { root: {
+ display: 'inline-block'
+ }
+ };
+
+ const toggleSurvey = () => {
+ setEnableSurvey(prevState => !prevState);
+ }
+
+ const disableSurvey = () => {
+ setEnableSurvey(false);
+ }
+
+ return (
+ <div>
+ {profile?.profileType !== ACCOUNT_TYPE.AAD &&
+ <div>
+ <TooltipHost
+ content={content}
+ calloutProps={calloutProps}
+ styles={hostStyles}
+ directionalHint={DirectionalHint.leftCenter}
+ >
+ <IconButton onClick={toggleSurvey}
+ iconProps={feedbackIcon}
+ ariaDescription={feedbackTitle}
+ ariaLabel={feedbackTitle}
+ styles={feedbackIconStyles}
+ role={'button'}
+ disabled={enableSurvey}
+ />
+ </TooltipHost>
+
+ <FeedbackForm onDismissSurvey={toggleSurvey}
+ activated={enableSurvey} onDisableSurvey={disableSurvey} />
+ </div>
+ }
+ </div>
+ )
+}

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

@@ -9,7 +9,7 @@ export function headerMessaging(classes: any, query: string): React.ReactNode {
  const loginType = getLoginType();
 
  return (
- <div style={{ marginBottom: 8 }}>
+ <div style={{ marginBottom: 8, paddingLeft: 10 }}>
  {loginType === LoginType.Popup && <>
  <MessageBar messageBarType={MessageBarType.info} isMultiline={true}>
  <p>

src/app/views/authentication/profile/Profile.tsx

@@ -197,7 +197,7 @@ const Profile = (props: any) => {
  role='dialog'
  gapSpace={0}
  target={`#${buttonId}`}
- isBeakVisible={true}
+ isBeakVisible={false}
  beakWidth={10}
  onDismiss={toggleIsCalloutVisible}
  setInitialFocus

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

@@ -66,7 +66,6 @@ export const ShareQuery = () => {
  styles={shareButtonStyles}
  role={'button'}
  ariaLabel={translateMessage('Share Query')}
- title={translateMessage('Share Query')}
  />
  </TooltipHost>
  <Dialog

src/app/views/sidebar/Sidebar.styles.ts

@@ -118,8 +118,8 @@ export const sidebarStyles = (theme: ITheme) => {
  },
  sidebarButtons: {
  root:{
- height: 50,
- width: 50,
+ height: 40,
+ width: 40,
  ':hover': {
  background: `${theme.palette.neutralLight} !important`
  }

src/app/views/sidebar/resource-explorer/ResourceLink.tsx

@@ -73,7 +73,6 @@ const ResourceLink = (props: IResourceLinkProps) => {
  aria-describedby={tooltipId}
  styles={iconButtonStyles}
  menuIconProps={{ iconName: 'MoreVertical' }}
- title={translateMessage('More actions')}
  menuProps={{
  shouldFocusOnMount: true,
  alignTargetEdge: true,

src/app/views/sidebar/sample-queries/SampleQueries.tsx

@@ -151,7 +151,6 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element =
  >
  <Icon
  iconName='Lock'
- title={signInText}
  style={{
  fontSize: 15,
  height: 10,

src/messages/GE_de-DE.json

@@ -12,9 +12,9 @@
  "secure scores (beta)": "Sicherheitsbewertungen (Beta)",
  "secure score control profiles (beta)": "Profile für Steuerung der Sicherheitsbewertung (Beta)",
  "update alert": "Warnung aktualisieren",
- "To try the explorer, please ": "Um den Explorer auszuprobieren, bitte ",
- "sign in": "Beim Graph Explorer anmelden",
- " with your work or school account from Microsoft.": " mit Ihrem Geschäfts-, Schul- oder Unikonto von Microsoft.",
+ "To try the explorer, please ": "Um den Explorer auszuprobieren, gehen Sie bitte wie folgt vor ",
+ "sign in": "Anmelden",
+ " with your work or school account from Microsoft.": " mit Ihrem Arbeits- oder Schulkonto von Microsoft.",
  "Submit": "Senden",
  "Using demo tenant": "Sie verwenden derzeit ein Beispielkonto.",
  "To access your own data:": "Melden Sie sich an, um auf Ihre eigenen Daten zuzugreifen.",
@@ -301,8 +301,8 @@
  "Microsoft Graph API Reference docs": "Microsoft Graph-API-Referenzdokumenten.",
  "Fetching permissions": "Berechtigungen werden abgerufen",
  "Authentication failed": "Authentifizierung fehlgeschlagen",
- "view all permissions": "Berechtigungen auswählen",
- "Fetching code snippet": "Code-Schnipsel abrufen",
+ "view all permissions": "Zustimmung zu Berechtigungen",
+ "Fetching code snippet": "Codeausschnitt wird abgerufen",
  "Snippet not available": "Snippet nicht verfügbar",
  "Select different permissions": "Um verschiedene Microsoft Graph API-Endpunkte auszuprobieren, wählen Sie die Berechtigungen aus und klicken Sie dann auf Zustimmen.",
  "Search permissions": "Suchberechtigungen",
@@ -441,5 +441,11 @@
  "Switch to beta": "Zur Betaversion wechseln",
  "Resources": "Ressourcen",
  "More items": "Weitere Elemente",
- "Update": "Aktualisierung"
+ "Update": "Aktualisierung",
+ "Edit request header": "Anforderungsheader bearbeiten",
+ "Remove request header": "Anforderungsheader entfernen",
+ "Settings": "Einstellungen",
+ "sign in other account": "Mit einem anderen Konto anmelden",
+ "Help": "Hilfe",
+ "Documentation": "Dokumentation"
 }

src/messages/GE_es-ES.json

@@ -13,7 +13,7 @@
  "secure score control profiles (beta)": "perfiles de control de puntuación segura (beta)",
  "update alert": "actualizar alerta",
  "To try the explorer, please ": "Para probar el explorador, ",
- "sign in": "Inicie sesión en el Probador de Graph",
+ "sign in": "inicie sesión",
  " with your work or school account from Microsoft.": " con su cuenta profesional o educativa de Microsoft.",
  "Submit": "Enviar",
  "Using demo tenant": "Actualmente utiliza una cuenta de muestra.",
@@ -301,7 +301,7 @@
  "Microsoft Graph API Reference docs": "Documentos de referencia de la API de Microsoft Graph.",
  "Fetching permissions": "Obteniendo permisos",
  "Authentication failed": "Error de autenticación",
- "view all permissions": "Seleccionar permisos",
+ "view all permissions": "Consentimiento para los permisos",
  "Fetching code snippet": "Recuperando fragmento de código",
  "Snippet not available": "Fragmento de código no disponible",
  "Select different permissions": "Para probar otros puntos de conexión de la API de Microsoft Graph, elija los permisos y, luego, haga clic en Consentir.",
@@ -441,5 +441,11 @@
  "Switch to beta": "Cambiar a beta",
  "Resources": "Recursos",
  "More items": "Más elementos",
- "Update": "Actualizar"
+ "Update": "Actualizar",
+ "Edit request header": "Editar el encabezado de la solicitud",
+ "Remove request header": "Eliminar el encabezado de la solicitud",
+ "Settings": "Configuración",
+ "sign in other account": "Inicie sesión con una cuenta diferente",
+ "Help": "Ayuda",
+ "Documentation": "Documentación"
 }