Merge branch 'dev' into dependabot-upgrades

microsoftgraph · May 3, 2024 · 5b7e475 · 5b7e475
2 parents 9c89f18 + 38c3849
commit 5b7e475
Show file tree

Hide file tree

Showing 7 changed files with 130 additions and 81 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/services/actions/query-action-creator-util.ts b/src/app/services/actions/query-action-creator-util.ts
@@ -221,6 +221,14 @@ export async function generateResponseDownloadUrl(
   }
 }
 
+async function tryParseJson(textValue: string) {
+  try {
+    return JSON.parse(textValue);
+  } catch (error) {
+    return textValue;
+  }
+}
+
 export function parseResponse(
   response: any,
   respHeaders: any = {}
@@ -233,9 +241,10 @@ export function parseResponse(
     const contentType = getContentType(response.headers);
     switch (contentType) {
       case ContentType.Json:
-        return response.json();
+        return response.text().then(tryParseJson);
       case ContentType.XML:
       case ContentType.HTML:
+      case ContentType.TextCsv:
       case ContentType.TextPlain:
         return response.text();
 

diff --git a/src/app/services/actions/query-action-creators.ts b/src/app/services/actions/query-action-creators.ts
@@ -145,8 +145,8 @@ export function runQuery(query: IQuery) {
     };
 
     if (error instanceof ClientError) {
-      status.status = 0;
-      status.statusText = `${error.name}: ${error.message}`;
+      status.status = error.message;
+      status.statusText = error.name;
     }
 
     if (queryResultsInCorsError(query.sampleUrl)) {

diff --git a/src/app/services/context/validation-context/ValidationProvider.tsx b/src/app/services/context/validation-context/ValidationProvider.tsx
@@ -34,6 +34,9 @@ export const ValidationProvider = ({ children }: ValidationProviderProps) => {
   }, [resources])
 
   useEffect(() => {
+    if (!queryVersion || !query || Object.keys(resources.data).length === 0) {
+      return;
+    }
     if (version !== queryVersion && GRAPH_API_VERSIONS.includes(queryVersion)
       && resources.data[queryVersion].children!.length > 0) {
       setVersionedResources(resources.data[queryVersion].children!);

diff --git a/src/app/views/query-response/response/Response.tsx b/src/app/views/query-response/response/Response.tsx
@@ -1,28 +1,29 @@
 
-import { useDispatch } from 'react-redux';
 
-import { AppDispatch, useAppSelector } from '../../../../store';
+import { useAppSelector } from '../../../../store';
 import { getContentType } from '../../../services/actions/query-action-creator-util';
-import { convertVhToPx, getResponseEditorHeight,
-  getResponseHeight } from '../../common/dimensions/dimensions-adjustment';
+import {
+  convertVhToPx, getResponseEditorHeight,
+  getResponseHeight
+} from '../../common/dimensions/dimensions-adjustment';
 import ResponseDisplay from './ResponseDisplay';
 import { ResponseMessages } from './ResponseMessages';
 
 const Response = () => {
-  const { dimensions: { response }, graphResponse, responseAreaExpanded, sampleQuery, authToken, graphExplorerMode } =
+  const { dimensions: { response }, graphResponse, responseAreaExpanded} =
     useAppSelector((state) => state);
   const { body, headers } = graphResponse;
-  const dispatch: AppDispatch = useDispatch();
 
   const defaultHeight = convertVhToPx(getResponseHeight(response.height, responseAreaExpanded), 220);
   const monacoHeight = getResponseEditorHeight(150);
 
   const contentDownloadUrl = body?.contentDownloadUrl;
   const throwsCorsError = body?.throwsCorsError;
   const contentType = getContentType(headers);
+
   return (
     <div style={{ display: 'block' }}>
-      {ResponseMessages(graphResponse, sampleQuery, authToken, graphExplorerMode, dispatch)}
+      <ResponseMessages />
       {!contentDownloadUrl && !throwsCorsError && headers &&
         <ResponseDisplay
           contentType={contentType}