Revert "feat: Bump Axios to 0.28.0 (#988)"

package.json

@@ -47,7 +47,7 @@
         "@types/react-transition-group": "^4.4.2",
         "@web3-storage/parse-link-header": "^3.1.0",
         "ajv": "^8.10.0",
-        "axios": "^0.28.0",
+        "axios": "^0.21.1",
         "axios-retry": "^3.1.9",
         "azure-iot-dtdl-parser": "^0.0.1-beta.0",
         "constantinople": "^4.0.1",
@@ -176,8 +176,7 @@
     "overrides": {
         "[email protected]": "1.2.6",
         "follow-redirects": "1.15.6",
-        "es5-ext": "0.10.63",
-        "axios": "^0.28.0"
+        "es5-ext": "0.10.63"
     },
     "author": "",
     "license": "ISC"

src/Adapters/ADTAdapter.ts

@@ -583,9 +583,7 @@ export default class ADTAdapter implements IADTAdapter {
                     return null;
                 }
             });
-            return new ADTModelsData(
-                (axiosResult?.data as unknown) as IADTModel[]
-            );
+            return new ADTModelsData(axiosResult?.data);
         });
     }
 
@@ -817,7 +815,7 @@ export default class ADTAdapter implements IADTAdapter {
             const recursivelyAddToExpandedModels = async (modelId: string) => {
                 try {
                     // Add root model
-                    const rootModel = (await fetchFullModel(modelId)).data.data
+                    const rootModel = (await fetchFullModel(modelId)).data
                         .model;
                     expandedModels.push(rootModel);
 
@@ -869,8 +867,7 @@ export default class ADTAdapter implements IADTAdapter {
 
             const parallelFetchModel = async (modelId: string) => {
                 try {
-                    const model = (await fetchFullModel(modelId)).data.data
-                        .model;
+                    const model = (await fetchFullModel(modelId)).data.model;
                     expandedModels.push(model);
                 } catch (err) {
                     adapterMethodSandbox.pushError({
@@ -951,7 +948,7 @@ export default class ADTAdapter implements IADTAdapter {
                 }
             });
 
-            return new ADTRelationshipData(axiosResponse.data.data);
+            return new ADTRelationshipData(axiosResponse.data);
         });
     }
 

src/Adapters/ADXAdapter.ts

@@ -84,11 +84,8 @@ export default class ADXAdapter implements IADXAdapter {
                 const adxDataHistoryResults = await getDataHistoryFromADX();
                 const resultTimeSeriesData: Array<ADXTimeSeries> = []; // considering there is going to be multiple series to fetch data for
 
-                if (
-                    adxDataHistoryResults.data &&
-                    adxDataHistoryResults.data.data
-                ) {
-                    const primaryResultTables: Array<ADXTable> = adxDataHistoryResults.data.data.filter(
+                if (adxDataHistoryResults.data) {
+                    const primaryResultTables: Array<ADXTable> = adxDataHistoryResults.data.filter(
                         (frame) => frame.TableKind === 'PrimaryResult'
                     );
                     logDebugConsole(

src/Adapters/BlobAdapter.ts

@@ -174,10 +174,8 @@ export default class BlobAdapter implements IBlobAdapter {
                         ),
                         headers: this.generateBlobHeaders(headers)
                     });
-                    if (scenesBlob.data && scenesBlob.data.data) {
-                        config = validate3DConfigWithSchema(
-                            scenesBlob.data.data
-                        );
+                    if (scenesBlob.data) {
+                        config = validate3DConfigWithSchema(scenesBlob.data);
                     } else {
                         throw new Error('Data not found');
                     }
@@ -278,7 +276,7 @@ export default class BlobAdapter implements IBlobAdapter {
                 });
                 const filesXML = filesData.data;
                 const parser = new XMLParser();
-                let files: Array<IStorageBlob> = parser.parse(filesXML.data)
+                let files: Array<IStorageBlob> = parser.parse(filesXML)
                     ?.EnumerationResults?.Blobs?.Blob;
                 if (fileTypes) {
                     files = files.filter((f) =>