Release: October 2020

.gitignore

@@ -23,3 +23,4 @@ yarn-error.log*
 
 .idea
 .vscode
+.vs

.vscode/settings.json

@@ -7,5 +7,15 @@
  "**/node_modules": true,
  "**/.github": true,
  },
- "files.trimTrailingWhitespace": true
-}
+ "files.trimTrailingWhitespace": true,
+ "editor.codeActionsOnSave": {
+ "source.fixAll.tslint": true
+ },
+ "editor.formatOnSave": true,
+ "editor.formatOnPaste": true,
+ "typescript.updateImportsOnFileMove.enabled": "always",
+ "eslint.validate": [
+ "typescript",
+ "typescriptreact"
+ ],
+}

azure-pipelines.yml

@@ -94,7 +94,7 @@ jobs:
  npm run build
  env:
  REACT_APP_CLIENT_ID: $(REACT_APP_STAGING_CLIENT_ID)
- REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_INSTRUMENTATION_KEY)
+ REACT_APP_INSTRUMENTATION_KEY: $(REACT_APP_STAGING_INSTRUMENTATION_KEY)
  displayName: 'Build static assets for staging'
 
  - task: PowerShell@2

package.json

@@ -1,17 +1,17 @@
 {
  "name": "graph-explorer-v2",
- "version": "4.1.9",
+ "version": "4.1.10",
  "private": true,
  "dependencies": {
  "@babel/core": "7.2.2",
  "@microsoft/applicationinsights-react-js": "2.3.1",
  "@microsoft/applicationinsights-web": "2.3.1",
- "@microsoft/microsoft-graph-client": "2.0.0",
+ "@microsoft/microsoft-graph-client": "2.1.0",
  "@svgr/webpack": "4.1.0",
  "@uifabric/react-cards": "0.109.101",
  "@uifabric/styling": "7.13.1",
  "adaptivecards": "1.2.3",
- "adaptivecards-templating": "0.1.0-alpha.1",
+ "adaptivecards-templating": "1.4.0",
  "babel-core": "7.0.0-bridge.0",
  "babel-eslint": "9.0.0",
  "babel-jest": "23.6.0",

src/app/services/actions/adaptive-cards-action-creator.ts

@@ -3,9 +3,9 @@ import { IAction } from '../../../types/action';
 import { IQuery } from '../../../types/query-runner';
 import { lookupTemplate } from '../../utils/adaptive-cards-lookup';
 import {
- FETCH_ADAPTIVE_CARD_ERROR ,
+ FETCH_ADAPTIVE_CARD_ERROR,
  FETCH_ADAPTIVE_CARD_PENDING,
- FETCH_ADAPTIVE_CARD_SUCCESS
+ FETCH_ADAPTIVE_CARD_SUCCESS,
 } from '../redux-constants';
 
 export function getAdaptiveCardSuccess(result: string = ''): IAction {
@@ -18,20 +18,22 @@ export function getAdaptiveCardSuccess(result: string = ''): IAction {
 export function getAdaptiveCardError(error: string): IAction {
  return {
  type: FETCH_ADAPTIVE_CARD_ERROR,
- response: error
+ response: error,
  };
 }
 
 export function getAdaptiveCardPending(): IAction {
  return {
  type: FETCH_ADAPTIVE_CARD_PENDING,
- response: ''
+ response: '',
  };
 }
 
-export function getAdaptiveCard(payload: string, sampleQuery: IQuery): Function {
+export function getAdaptiveCard(
+ payload: string,
+ sampleQuery: IQuery
+): Function {
  return async (dispatch: Function) => {
-
  if (!payload) {
  // no payload so return empty result
  return dispatch(getAdaptiveCardSuccess());
@@ -51,20 +53,24 @@ export function getAdaptiveCard(payload: string, sampleQuery: IQuery): Function
  dispatch(getAdaptiveCardPending());
 
  return fetch(`https://templates.adaptivecards.io/graph.microsoft.com/${templateFileName}`)
- .then(resp => resp.json())
+ .then((resp) => resp.json())
  .then((fetchResult) => {
  if (fetchResult.error) {
- throw (fetchResult.error);
+ throw fetchResult.error;
  }
  // create a card from the template
  const template = new AdaptiveCardsTemplateAPI.Template(fetchResult);
- const context = new AdaptiveCardsTemplateAPI.EvaluationContext();
- context.$root = payload;
+ const context: AdaptiveCardsTemplateAPI.IEvaluationContext = {
+ $root: payload,
+ };
+ AdaptiveCardsTemplateAPI.GlobalSettings.getUndefinedFieldValueSubstitutionString = (
+ path: string
+ ) => ' ';
  const card = template.expand(context);
  // give back the result of the card
  return dispatch(getAdaptiveCardSuccess(card));
  })
- .catch(error => {
+ .catch((error) => {
  // something wrong happened
  return dispatch(getAdaptiveCardError(error));
  });

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

@@ -100,11 +100,6 @@ const makeRequest = (httpVerb: string, scopes: string[]): Function => {
 
  if (query.sampleHeaders && query.sampleHeaders.length > 0) {
  query.sampleHeaders.forEach(header => {
-
- // We are relying on the graph client to set the content type header.
- if (header.name.toLowerCase() === 'content-type') {
- return;
- }
  sampleHeaders[header.name] = header.value;
  });
  }

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

@@ -96,6 +96,7 @@ async function createHistory(response: Response, respHeaders: any, query: IQuery
 
 
  const historyItem: IHistoryItem = {
+ index: -1,
  url: query.sampleUrl,
  method: query.selectedVerb,
  headers: query.sampleHeaders,

src/app/views/query-response/QueryResponse.tsx

@@ -12,7 +12,7 @@ import { Mode } from '../../../types/enums';
 import { IQueryResponseProps, IQueryResponseState } from '../../../types/query-response';
 import { copy } from '../common/copy';
 import { createShareLink } from '../common/share';
-import { getPivotItems } from './pivot-items/pivot-items';
+import { getPivotItems, onPivotItemClick } from './pivot-items/pivot-items';
 import './query-response.scss';
 
 class QueryResponse extends Component<IQueryResponseProps, IQueryResponseState> {
@@ -122,6 +122,7 @@ class QueryResponse extends Component<IQueryResponseProps, IQueryResponseState>
  </>}
  <Pivot className='pivot-response'
  styles={{ root: { display: 'flex', flexWrap: 'wrap' } }}
+ onLinkClick={(pivotItem) => onPivotItemClick(pivotItem)}
  >
  {pivotItems}
  </Pivot>