From 85554199c82ef0b419141e9f03be05da7156cc7b Mon Sep 17 00:00:00 2001 From: Charles Wahome Date: Tue, 14 Jul 2020 16:45:03 +0300 Subject: [PATCH 1/3] refine image response checker --- src/app/services/actions/query-action-creator-util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/actions/query-action-creator-util.ts b/src/app/services/actions/query-action-creator-util.ts index cce501f7a..5c497e040 100644 --- a/src/app/services/actions/query-action-creator-util.ts +++ b/src/app/services/actions/query-action-creator-util.ts @@ -53,7 +53,7 @@ export function isImageResponse(contentType: string) { if (!contentType) { return false; } return ( contentType === 'application/octet-stream' || - contentType.substr(0, 6) === 'image/' + contentType.includes('image/') ); } From b1dbb4c2977ff1338278bb5ee07927ee8bb19889 Mon Sep 17 00:00:00 2001 From: Charles Wahome Date: Tue, 14 Jul 2020 16:45:22 +0300 Subject: [PATCH 2/3] create default response for all images --- src/app/services/actions/query-action-creators.ts | 4 ++-- .../query-response/pivot-items/pivot-items.tsx | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/app/services/actions/query-action-creators.ts b/src/app/services/actions/query-action-creators.ts index b28d31245..bb28897d8 100644 --- a/src/app/services/actions/query-action-creators.ts +++ b/src/app/services/actions/query-action-creators.ts @@ -3,7 +3,7 @@ import { ContentType } from '../../../types/enums'; import { IHistoryItem } from '../../../types/history'; import { IQuery } from '../../../types/query-runner'; import { writeHistoryData } from '../../views/sidebar/history/history-utils'; -import { anonymousRequest, authenticatedRequest, parseResponse, queryResponse } from './query-action-creator-util'; +import { anonymousRequest, authenticatedRequest, parseResponse, queryResponse, isImageResponse } from './query-action-creator-util'; import { setQueryResponseStatus } from './query-status-action-creator'; import { addHistoryItem } from './request-history-action-creators'; @@ -83,7 +83,7 @@ async function createHistory(response: Response, respHeaders: any, query: IQuery const responseHeaders = { ...respHeaders }; const contentType = respHeaders['content-type']; - if (contentType === ContentType.Image) { + if (isImageResponse(contentType)) { result = { message: 'Run the query to view the image' }; diff --git a/src/app/views/query-response/pivot-items/pivot-items.tsx b/src/app/views/query-response/pivot-items/pivot-items.tsx index bb986fef6..03c2db5ec 100644 --- a/src/app/views/query-response/pivot-items/pivot-items.tsx +++ b/src/app/views/query-response/pivot-items/pivot-items.tsx @@ -12,6 +12,7 @@ import AdaptiveCard from '../adaptive-cards/AdaptiveCard'; import { darkThemeHostConfig, lightThemeHostConfig } from '../adaptive-cards/AdaptiveHostConfig'; import { queryResponseStyles } from '../queryResponse.styles'; import { Snippets } from '../snippets'; +import { isImageResponse } from '../../../services/actions/query-action-creator-util'; export const getPivotItems = (properties: any) => { @@ -112,14 +113,14 @@ function displayResultComponent(headers: any, body: any, verb: string) { case ContentType.XML: return ; - case ContentType.Image: - return profile image; - default: + if (isImageResponse(contentType)) { + return profile image; + } return ; } } From 92e14679bb2327a1f9ec72ca20c590f3ff5f8d83 Mon Sep 17 00:00:00 2001 From: Charles Wahome Date: Wed, 15 Jul 2020 06:36:37 +0300 Subject: [PATCH 3/3] fix linting errors --- src/app/services/actions/query-action-creators.ts | 6 +++++- src/app/views/query-response/pivot-items/pivot-items.tsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/services/actions/query-action-creators.ts b/src/app/services/actions/query-action-creators.ts index bb28897d8..dd9dffcb5 100644 --- a/src/app/services/actions/query-action-creators.ts +++ b/src/app/services/actions/query-action-creators.ts @@ -1,9 +1,13 @@ import { MessageBarType } from 'office-ui-fabric-react'; + import { ContentType } from '../../../types/enums'; import { IHistoryItem } from '../../../types/history'; import { IQuery } from '../../../types/query-runner'; import { writeHistoryData } from '../../views/sidebar/history/history-utils'; -import { anonymousRequest, authenticatedRequest, parseResponse, queryResponse, isImageResponse } from './query-action-creator-util'; +import { + anonymousRequest, authenticatedRequest, + isImageResponse, parseResponse, queryResponse +} from './query-action-creator-util'; import { setQueryResponseStatus } from './query-status-action-creator'; import { addHistoryItem } from './request-history-action-creators'; diff --git a/src/app/views/query-response/pivot-items/pivot-items.tsx b/src/app/views/query-response/pivot-items/pivot-items.tsx index 03c2db5ec..bd3dbbb9a 100644 --- a/src/app/views/query-response/pivot-items/pivot-items.tsx +++ b/src/app/views/query-response/pivot-items/pivot-items.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { ThemeContext } from '../../../../themes/theme-context'; import { ContentType, Mode } from '../../../../types/enums'; import { IQuery } from '../../../../types/query-runner'; +import { isImageResponse } from '../../../services/actions/query-action-creator-util'; import { lookupTemplate } from '../../../utils/adaptive-cards-lookup'; import { Image, Monaco } from '../../common'; import { genericCopy } from '../../common/copy'; @@ -12,7 +13,6 @@ import AdaptiveCard from '../adaptive-cards/AdaptiveCard'; import { darkThemeHostConfig, lightThemeHostConfig } from '../adaptive-cards/AdaptiveHostConfig'; import { queryResponseStyles } from '../queryResponse.styles'; import { Snippets } from '../snippets'; -import { isImageResponse } from '../../../services/actions/query-action-creator-util'; export const getPivotItems = (properties: any) => {