Merge branch 'remove-manifest' into dh2-i18n-rc1

Author: ddooley

lib/AppContext.js

@@ -266,8 +266,8 @@ export default class AppContext {
   }
 
   async initializeTemplate(template_path, options = {}) {
-    const [template_name] = template_path.split('/');
-    this.template = await Template.create(template_name, options);
+    const [schema_folder] = template_path.split('/');
+    this.template = await Template.create(schema_folder, options);
     return this;
   }
 

lib/Toolbar.js

@@ -19,7 +19,7 @@ import { MULTIVALUED_DELIMITER, titleOverText } from '../lib/utils/fields';
 import { takeKeys, invert } from '../lib/utils/objects';
 import {
   findBestLocaleMatch,
-  templatePathForSchemaURI,
+//  templatePathForSchemaURI,
   rangeToContainerClass,
   LocaleNotSupportedError,
 } from '../lib/utils/templates';
@@ -225,10 +225,13 @@ class Toolbar {
     // provided attempt to use that one. If not the first item in the menu
     // will be used.
     this.updateTemplateOptions();
+
     if (options.templatePath) {
-      const [folder, template] = options.templatePath.split('/');
-      if (folder in this.menu && template in this.menu[folder]) {
-        this.$selectTemplate.val(options.templatePath);
+      const [schema_folder, template_name] = options.templatePath.split('/');
+      for (const [schema_name, schema_obj] of Object.entries(this.menu)) {
+        if ('folder' in schema_obj && schema_obj['folder'] == schema_folder && template_name in schema_obj['templates']) {
+          this.$selectTemplate.val(options.templatePath);
+        }
       }
     }
     this.loadSelectedTemplate();
@@ -309,14 +312,12 @@ class Toolbar {
 
   updateTemplateOptions() {
     this.$selectTemplate.empty();
-    //const view_drafts = $('#view-template-drafts').is(':checked');
-    for (const [folder, templates] of Object.entries(this.menu)) {
-      for (const [name, template] of Object.entries(templates)) {
-        let path = folder + '/' + name;
-        if (template.display) {
-//          if (view_drafts || template.status == 'published') {
+    for (const [schema_name, schema_obj] of Object.entries(this.menu)) {
+      const templates = schema_obj['templates'];
+      for (const [template_name, template_obj] of Object.entries(templates)) {
+        let path = schema_obj.folder + '/' + template_name;
+        if (template_obj.display) {
           this.$selectTemplate.append(new Option(path, path));
-//          }
         }
       }
     }
@@ -363,6 +364,7 @@ class Toolbar {
   }
 
   async openFile() {
+
     const file = $('#open-file-input')[0].files[0];
     const ext = file.name.split('.').pop();
     const acceptedExts = ['xlsx', 'xls', 'tsv', 'csv', 'json'];
@@ -378,7 +380,7 @@ class Toolbar {
         // its Container class contains template spec itself.  
         // It may have several dhs, one for each Container class mentioned.
         const contentBuffer = await readFileAsync(file);
-
+        //alert("opening " + file.name)
         let jsonData;
         try {
           jsonData = JSON.parse(contentBuffer.text);
@@ -465,7 +467,6 @@ class Toolbar {
     const baseName = $('#base-name-save-as-input').val();
     const ext = $('#file-ext-save-as-select').val();
     const lang = $('#select-translation-localization').val();
-
     const MultiEntityJSON = Object.values(this.context.dhs).reduce(
       (acc, dh) => {
         return Object.assign(acc, { [dh.class_assignment]: dh.toJSON() });
@@ -480,8 +481,10 @@ class Toolbar {
       schema_container.attributes
     ).reduce((acc, [cls_key, { name, range }]) => {
       // TODO: check if container attributes always have ranges?
-      if (typeof range !== 'undefined') {
+      if (typeof range !== 'undefined' && range == this.context.current_data_harmonizer_name) {
+        //Or test range against this.context.appConfig.template_path.split('/')[1]
         const processedClass = {
+
           [name]: MultiEntityJSON[range]
             .map((obj) => nullValuesToString(obj))
             .map((entry) => {
@@ -1066,10 +1069,12 @@ class Toolbar {
     $('#section-menu').localize();
   }
 
+  // NOT USED UNLESS LOADING FILE?
   async _defaultGetSchema(schemaName) {
     return this.menu[schemaName].schema;
   }
 
+  // NOT USED UNLESS LOADING FILE?
   async _defaultGetExportFormats(schemaName) {
     return this.menu[schemaName].exportFormats;
   }