|
500 | 500 | .slice(0, -1) |
501 | 501 | .join('.'); |
502 | 502 | } |
503 | | - if (file.metadata.orgs === undefined) { |
| 503 | + if (file.metadata.folders === undefined) { |
504 | 504 | this.createNode( |
505 | 505 | FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id, |
506 | 506 | { title, ...file.metadata } |
|
513 | 513 | contentnode: newNodeId, |
514 | 514 | }); |
515 | 515 | }); |
516 | | - } else if (file.metadata.orgs) { |
| 516 | + } else if (file.metadata.folders) { |
517 | 517 | this.createNode('topic', file.metadata).then(newNodeId => { |
518 | | - Object.values(file.metadata.orgs).forEach(org => { |
| 518 | + file.metadata.folders.forEach(org => { |
519 | 519 | this.createNode('topic', org, newNodeId).then(topicNodeId => { |
520 | | - Object.values(org).forEach(orgFile => { |
521 | | - if (typeof orgFile === 'object') { |
522 | | - const extra_fields = {}; |
523 | | - extra_fields['options'] = { entry: orgFile.resourceHref }; |
524 | | - extra_fields['title'] = orgFile.title; |
525 | | - let file_kind = null; |
526 | | - FormatPresetsList.forEach(p => { |
527 | | - if (p.id === file.metadata.preset) { |
528 | | - file_kind = p.kind_id; |
529 | | - } |
530 | | - }); |
| 520 | + org.files.forEach(orgFile => { |
| 521 | + const extra_fields = {}; |
| 522 | + extra_fields['options'] = { entry: orgFile.resourceHref }; |
| 523 | + extra_fields['title'] = orgFile.title; |
| 524 | + let file_kind = null; |
| 525 | + FormatPresetsList.forEach(p => { |
| 526 | + if (p.id === file.metadata.preset) { |
| 527 | + file_kind = p.kind_id; |
| 528 | + } |
| 529 | + }); |
531 | 530 |
|
532 | | - this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => { |
533 | | - return File.uploadUrl({ |
534 | | - checksum: file.checksum, |
535 | | - size: file.file_size, |
536 | | - type: 'application/zip', |
537 | | - name: file.original_filename, |
538 | | - file_format: file.file_format, |
539 | | - preset: file.metadata.preset, |
540 | | - }).then(data => { |
541 | | - const fileObject = { |
542 | | - ...data.file, |
543 | | - loaded: 0, |
544 | | - total: file.size, |
545 | | - }; |
546 | | - if (index === 0) { |
547 | | - this.selected = [resourceNodeId]; |
| 531 | + this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => { |
| 532 | + return File.uploadUrl({ |
| 533 | + checksum: file.checksum, |
| 534 | + size: file.file_size, |
| 535 | + type: 'application/zip', |
| 536 | + name: file.original_filename, |
| 537 | + file_format: file.file_format, |
| 538 | + preset: file.metadata.preset, |
| 539 | + }).then(data => { |
| 540 | + const fileObject = { |
| 541 | + ...data.file, |
| 542 | + loaded: 0, |
| 543 | + total: file.size, |
| 544 | + }; |
| 545 | + if (index === 0) { |
| 546 | + this.selected = [resourceNodeId]; |
| 547 | + } |
| 548 | + this.updateFile({ |
| 549 | + ...fileObject, |
| 550 | + contentnode: resourceNodeId, |
| 551 | + }).catch(error => { |
| 552 | + let errorType = fileErrors.UPLOAD_FAILED; |
| 553 | + if (error.response && error.response.status === 412) { |
| 554 | + errorType = fileErrors.NO_STORAGE; |
548 | 555 | } |
549 | | - this.updateFile({ |
550 | | - ...fileObject, |
551 | | - contentnode: resourceNodeId, |
552 | | - }).catch(error => { |
553 | | - let errorType = fileErrors.UPLOAD_FAILED; |
554 | | - if (error.response && error.response.status === 412) { |
555 | | - errorType = fileErrors.NO_STORAGE; |
556 | | - } |
557 | | - return Promise.reject(errorType); |
558 | | - }); |
| 556 | + return Promise.reject(errorType); |
559 | 557 | }); |
560 | 558 | }); |
561 | | - } |
| 559 | + }); |
562 | 560 | }); |
563 | 561 | }); |
564 | 562 | }); |
|
0 commit comments