Fix error on explorer not loading

scholarsportal · Jul 18, 2024 · c02876f · c02876f
1 parent 4ea7894
commit c02876f
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 17 deletions.
diff --git a/configure-manifest.json b/configure-manifest.json
@@ -4,7 +4,7 @@
   "scope": "file",
   "type": "configure",
   "contentType": "text/tab-separated-values",
-  "toolUrl": "http://localhost:4200",
+  "toolUrl": "http://localhost:4200/",
   "toolParameters": {
     "queryParameters": [
       {

diff --git a/src/app/components/header/header.component.ts b/src/app/components/header/header.component.ts
@@ -143,21 +143,20 @@ export class HeaderComponent implements OnInit {
     const fileID = datasetInfo()?.info?.fileID;
     const apiKey = datasetInfo()?.info?.apiKey;
     const secureUploadURL = datasetInfo()?.info?.secureUploadUrl || '';
-    if (siteURL && fileID && apiKey && ddiData) {
+    if (ddiData && !!secureUploadURL) {
       this.store.dispatch(
-        DataverseFetchActions.startDatasetUpload({
+        DataverseFetchActions.startSecureDatasetUpload({
           ddiData,
-          siteURL,
-          fileID,
-          apiKey,
+          secureUploadURL,
         }),
       );
-    }
-    if (ddiData && !!secureUploadURL) {
+    } else if (siteURL && fileID && apiKey && ddiData) {
       this.store.dispatch(
-        DataverseFetchActions.startSecureDatasetUpload({
+        DataverseFetchActions.startDatasetUpload({
           ddiData,
-          secureUploadURL,
+          siteURL,
+          fileID,
+          apiKey,
         }),
       );
     }

diff --git a/src/app/new.state/xml/xml.interface.ts b/src/app/new.state/xml/xml.interface.ts
@@ -183,9 +183,9 @@ export interface XmlState {
   info: {
     siteURL?: string;
     fileID?: number;
-    apiKey?: string | undefined;
+    apiKey: string | null;
     importedSuccess?: boolean;
-    secureUploadUrl?: string;
+    secureUploadUrl: string | null;
   } | null;
 }
 

diff --git a/src/app/new.state/xml/xml.reducer.ts b/src/app/new.state/xml/xml.reducer.ts
@@ -9,6 +9,7 @@ import {
   changeSingleVariable,
   createNewVariables,
   deleteVariableGroup,
+  extractUrlAndToken,
   matchVariableIDs,
   removeVariablesFromGroups,
   renameVariableGroup,
@@ -26,9 +27,27 @@ export const xmlReducer = createReducer(
   on(
     DataverseFetchActions.decodeAndFetchDDISuccess,
     (state, { data, apiResponse }) => {
-      let info = {
-        secureUploadUrl: apiResponse.data.signedUrls[1].signedUrl,
+      let info: {
+        siteURL?: string;
+        apiKey: string | null;
+        fileID: number;
+        secureUploadUrl: string | null;
+      } = {
+        apiKey: null,
+        fileID: apiResponse.data.queryParameters.fileId,
+        secureUploadUrl: null,
       };
+      const extractedData = extractUrlAndToken(
+        apiResponse.data.signedUrls[0].signedUrl,
+      );
+      if (extractedData) {
+        info = {
+          ...info,
+          siteURL: extractedData.siteURL,
+          apiKey: extractedData.apiKey ? extractedData.apiKey : null,
+          secureUploadUrl: apiResponse.data.signedUrls[1]?.signedUrl || null,
+        };
+      }
       return {
         ...state,
         dataset: data,
@@ -48,8 +67,9 @@ export const xmlReducer = createReducer(
         dataset: data,
         info: {
           siteURL,
-          apiKey,
+          apiKey: apiKey ? apiKey : null,
           fileID,
+          secureUploadUrl: null,
         },
         header: {
           citation: data.codeBook.stdyDscr?.citation.biblCit,

diff --git a/src/app/new.state/xml/xml.selectors.ts b/src/app/new.state/xml/xml.selectors.ts
@@ -10,7 +10,7 @@ export const selectDatasetState = createSelector(
 
 export const selectDatasetHasApiKey = createSelector(
   selectXmlFeature,
-  (state) => !!state.info?.apiKey || !!state.info?.secureUploadUrl,
+  (state) => !!state.info?.apiKey,
 );
 
 export const selectDatasetInfo = createSelector(

diff --git a/src/app/new.state/xml/xml.util.ts b/src/app/new.state/xml/xml.util.ts
@@ -442,3 +442,17 @@ function editSingleVariable(
   console.log(currentVariableCloned);
   return currentVariableCloned;
 }
+
+export function extractUrlAndToken(url: string) {
+  try {
+    const parsedUrl = new URL(url);
+    const siteURL = `${parsedUrl.protocol}//${parsedUrl.host}`;
+    const apiKey = parsedUrl.searchParams.get('token');
+    return {
+      siteURL: siteURL,
+      apiKey: apiKey,
+    };
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/src/app/services/ddi.service.ts b/src/app/services/ddi.service.ts
@@ -107,7 +107,7 @@ export class DdiService {
       }),
     };
     const xml = this.JSONtoXML(jsonData);
-    return this.http.put(secureUploadURL, xml, httpOptions);
+    return this.http.post(secureUploadURL, xml, httpOptions);
   }
 
   fetchCrossTabulationFromVariables(variable: string) {