Merge pull request #75 from usnistgov/fix/ODD770-filepath-771-missing…

…-item Addresses ODD-770 (show file path for failing files in data cart), and ODD-711 (add all folders to the data cart).
usnistgov · May 20, 2019 · 542c802 · 542c802
2 parents 22713e8 + 9bb8584
commit 542c802
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/angular/src/app/datacart/datacart.component.html b/angular/src/app/datacart/datacart.component.html
@@ -88,7 +88,7 @@
     </tr>
     <tbody *ngIf="showUnhandledFiles">
       <tr *ngFor="let file of bundlePlanUnhandledFiles">
-        <td width="30%" style="padding-left:.5em;border-bottom:1pt solid black;">{{file.resFilePath}}</td>
+        <td width="30%" style="padding-left:.5em;border-bottom:1pt solid black;">{{file.filePath}}</td>
         <td width="30%" style="padding-left:.5em;border-bottom:1pt solid black;">{{file.downloadUrl}}
         </td>
         <td width="40%" style="padding-left:.5em;border-bottom:1pt solid black;">{{file.message}}</td>

diff --git a/angular/src/app/landing/description/description.component.ts b/angular/src/app/landing/description/description.component.ts
@@ -160,7 +160,7 @@ export class DescriptionComponent {
         downloadUrl: null,
         description: null,
         filetype: null,
-        resId: "files",
+        resId: "/",
         filePath: "/",
         downloadProgress: 0,
         downloadInstance: null,

diff --git a/angular/src/app/landing/landing.component.ts b/angular/src/app/landing/landing.component.ts
@@ -466,7 +466,7 @@ export class LandingComponent implements OnInit {
                 downloadUrl: path.downloadURL,
                 description: path.description,
                 filetype: path['@type'][0],
-                resId: path["filepath"].replace(/^.*[\\\/]/, ''),
+                resId: tempId,
                 filePath: path.filepath,
                 downloadProgress: 0,
                 downloadInstance: null,