Merge pull request #538 from ncats/fixesHF2

fix to polymer / mixture acces defaulting wrong
ncats · Aug 19, 2024 · 29ec708 · 29ec708
2 parents a462fec + 326d1fa
commit 29ec708
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app/core/substance-form/substance-form-definition/substance-form-definition.component.ts b/src/app/core/substance-form/substance-form-definition/substance-form-definition.component.ts
@@ -83,10 +83,6 @@ export class SubstanceFormDefinitionComponent extends SubstanceFormBase implemen
   const subscription =  this.substanceFormService.definition.subscribe(definition => {
     this.defAccess = this.substanceFormService.getDefinitionForDefRef();
       this.definition = definition || {};
-      if (definition && definition.substanceClass && (definition.substanceClass === 'polymer' || definition.substanceClass === 'mixture') && !definition.uuid) {
-        this.definition.definitionLevel = 'REPRESENTATIVE';
-        this.updateDefinition();
-      }
       this.crossCheckTags();
       if (this.definition.substanceClass === 'structure') {
         this.substanceClass = 'chemical';

diff --git a/src/app/core/substance-form/substance-form.service.ts b/src/app/core/substance-form/substance-form.service.ts
@@ -145,6 +145,8 @@ export class SubstanceFormService implements OnDestroy {
             codes: [],
             relationships: [],
             properties: [],
+            definitionLevel: 'REPRESENTATIVE',
+            access: ['protected']
           };
         } else if (substanceClass === 'structurallyDiverse') {
           this.privateSubstance = {
@@ -230,6 +232,8 @@ export class SubstanceFormService implements OnDestroy {
             moieties: [],
             relationships: [],
             properties: [],
+            definitionLevel: 'REPRESENTATIVE',
+            access: ['protected']
           };
         } else {
           this.privateSubstance = {
@@ -537,7 +541,7 @@ export class SubstanceFormService implements OnDestroy {
   updateDefinition(definition: SubstanceFormDefinition): void {
     this.privateSubstance.definitionLevel = definition.definitionLevel;
     this.privateSubstance.deprecated = definition.deprecated;
-    this.privateSubstance.access = definition.access;
+    this.privateSubstance.access = definition.access
     this.privateSubstance.created = definition.created;
     this.privateSubstance.createdBy = definition.createdBy;
     this.privateSubstance.lastEdited = definition.lastEdited;