Skip to content

Commit a3f9fdb

Browse files
committed
renaming cls_key to class_name,
and rename spec to tree_obj
1 parent 29f771b commit a3f9fdb

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

lib/AppContext.js

+13-15
Original file line numberDiff line numberDiff line change
@@ -432,42 +432,41 @@ export default class AppContext {
432432
makeDataHarmonizersFromSchemaTree(schema, template_name) {
433433
let data_harmonizers = {};
434434
const template = this.appConfig.template_path.split('/')[1];
435+
console.log("SCHEMA TREE", this.schema_tree)
435436
Object.entries(this.schema_tree)
436-
.filter(([cls_key]) => cls_key !== 'Container')
437+
// Container class is only used in input and output file coordination.
438+
.filter(([class_name]) => class_name !== 'Container')
437439
// FOR NOW: 1-many involves getting all children of selected template too.
438-
//.filter(([cls_key]) => cls_key === template)
440+
//.filter(([class_name]) => class_name === template)
439441

440442
.forEach((obj, index) => {
441443
if (obj.length > 0) {
442-
const [cls_key, spec] = obj;
444+
const [class_name, tree_obj] = obj;
443445

444446
// if it shares a key with another class which is its parent, this DH must be a child
445-
const is_child = spec.shared_keys.some(
447+
const is_child = tree_obj.shared_keys.some(
446448
(shared_key_spec) => shared_key_spec.relation === 'parent'
447449
);
448450

449-
// Doesn't rebuild if tab id already exists.
451+
// Doesn't build if tab id already exists.
450452
const dhId = `data-harmonizer-grid-${index}`;
451453
if (!document.getElementById(dhId)) {
452454
const dhSubroot = createDataHarmonizerContainer(dhId, index === 0);
453455

454-
const dhTab = createDataHarmonizerTab(dhId, spec.name, index === 0);
456+
const dhTab = createDataHarmonizerTab(dhId, class_name, index === 0);
455457
dhTab.addEventListener('click', () => {
456458
$(document).trigger('dhTabChange', {
457-
specName: spec.name,
459+
specName: class_name,
458460
});
459461
});
460462

461463
// Each selected DataHarmonizer is rendered here.
462-
// Different classes have different slots allocated to them.
463-
// field_filters narrows to those slots.
464464
// NOTE: this may be running twice?.
465465
// in 1-M, different DataHarmonizers have fewer rows to start with
466466
// and visible if a child. Override the default HoT settings.
467-
data_harmonizers[spec.name] = new DataHarmonizer(dhSubroot, this, {
467+
data_harmonizers[class_name] = new DataHarmonizer(dhSubroot, this, {
468468
loadingScreenRoot: document.body,
469-
class_assignment: cls_key,
470-
field_filters: findSlotNamesForClass(schema, cls_key),
469+
class_assignment: class_name,
471470
hot_override_settings: {
472471
minRows: is_child ? 0 : 100,
473472
minSpareRows: is_child ? 0 : 100,
@@ -478,13 +477,12 @@ export default class AppContext {
478477
},
479478
});
480479

481-
// Adds .field_filters[field list], .useTemplate(template_name);
482-
data_harmonizers[spec.name].useSchema(schema, template_name);
480+
data_harmonizers[class_name].useSchema(schema, template_name);
483481

484482
// Initialization of each child table is to hide all rows until
485483
// parent primary key record is selected as a foreign key index.
486484
if (is_child) {
487-
data_harmonizers[spec.name].filterAll();
485+
data_harmonizers[class_name].filterAll();
488486
}
489487
}
490488
}

0 commit comments

Comments
 (0)