@huntsman-cancer-institute/cod 17.0.9 → 17.1.0

package/fesm2022/huntsman-cancer-institute-cod.mjs

@@ -823,7 +823,7 @@ class AttributeService {
         //Shouldn't be a need to change dirty or notify attributes
     }
     saveGridRowAttributeValues(idGroupAttribute, groupAttributeRowId) {
-        let rowValues = this.updatedAttributeValues.filter((av) => av.groupAttributeRowId === groupAttributeRowId);
+        let rowValues = this.updatedAttributeValues.filter((av) => av.groupAttributeRowId === groupAttributeRowId && av.idGroupAttribute === idGroupAttribute);
         for (let j = 0; j < rowValues.length; j++) {
             //set the idAttributeValueSet if necessary
             if (!rowValues[j].idAttributeValueSet) {
@@ -837,7 +837,7 @@ class AttributeService {
         //For multi values that were sliced (de-selected) we're going to find them and null out the value, instead of removing.
         //That means they actaully need to be added to the rowValues
         //Removed multi values within an existing row
-        let removedValues = this.slicedAttributeValues.filter((av) => av.groupAttributeRowId === groupAttributeRowId);
+        let removedValues = this.slicedAttributeValues.filter((av) => av.groupAttributeRowId === groupAttributeRowId && av.idGroupAttribute === idGroupAttribute);
         for (let i = 0; i < removedValues.length; i++) {
             removedValues[i].valueAttributeChoice = undefined;
             removedValues[i].valueIdDictionary = undefined;
@@ -865,8 +865,8 @@ class AttributeService {
                     avs.attributeValues.push(attributeValueGridRow.attributeValues[i]);
                 }
                 //Remove the updated and sliced values for the grid row, now (these are the old ones with the negative rowid)
-                this.slicedAttributeValues = this.slicedAttributeValues.filter((av) => av.groupAttributeRowId !== groupAttributeRowId);
-                this.updatedAttributeValues = this.updatedAttributeValues.filter((av) => av.groupAttributeRowId !== groupAttributeRowId);
+                this.slicedAttributeValues = this.slicedAttributeValues.filter((av) => (av.groupAttributeRowId !== groupAttributeRowId || av.idGroupAttribute !== idGroupAttribute));
+                this.updatedAttributeValues = this.updatedAttributeValues.filter((av) => (av.groupAttributeRowId !== groupAttributeRowId || av.idGroupAttribute !== idGroupAttribute));
                 this.attributeValueSetSubject.next(avs);
                 this.gridRowSaved.next(attributeValueGridRow);
                 this.loadingSubject.next(false);
@@ -881,20 +881,20 @@ class AttributeService {
                 //Add the grid row to the original attribute values
                 let avs = this.attributeValueSetSubject.getValue();
                 //Remove all old values for row
-                let index = avs.attributeValues.findIndex((av) => av.groupAttributeRowId === groupAttributeRowId);
+                let index = avs.attributeValues.findIndex((av) => (av.groupAttributeRowId === groupAttributeRowId && av.idGroupAttribute === idGroupAttribute));
                 while (index > 0) {
                     //Remove value
                     avs.attributeValues.splice(index, 1);
                     //Find the next one
-                    index = avs.attributeValues.findIndex((av) => av.groupAttributeRowId === groupAttributeRowId);
+                    index = avs.attributeValues.findIndex((av) => (av.groupAttributeRowId === groupAttributeRowId && av.idGroupAttribute === idGroupAttribute));
                 }
                 //Add all the current values
                 for (let i = 0; i < attributeValueGridRow.attributeValues.length; i++) {
                     avs.attributeValues.push(attributeValueGridRow.attributeValues[i]);
                 }
                 //Remove the sliced and updated values for the grid row
-                this.slicedAttributeValues = this.slicedAttributeValues.filter((av) => av.groupAttributeRowId !== groupAttributeRowId);
-                this.updatedAttributeValues = this.updatedAttributeValues.filter((av) => av.groupAttributeRowId !== groupAttributeRowId);
+                this.slicedAttributeValues = this.slicedAttributeValues.filter((av) => (av.groupAttributeRowId !== groupAttributeRowId || av.idGroupAttribute !== idGroupAttribute));
+                this.updatedAttributeValues = this.updatedAttributeValues.filter((av) => (av.groupAttributeRowId !== groupAttributeRowId || av.idGroupAttribute !== idGroupAttribute));
                 this.attributeValueSetSubject.next(avs);
                 this.gridRowSaved.next(attributeValueGridRow);
                 this.loadingSubject.next(false);
@@ -921,7 +921,8 @@ class AttributeService {
         this.http.request('delete', url, { body: avgr, params: queryParams }).subscribe(() => {
             //Remove the grid row from the original attribute values
             let avs = this.attributeValueSetSubject.getValue();
-            avs.attributeValues = avs.attributeValues.filter((av) => av.groupAttributeRowId !== groupAttributeRowId);
+            //Filter to only attributes to KEEP - (i.e. not the same grid or not the row being deleted)
+            avs.attributeValues = avs.attributeValues.filter((av) => (av.idGroupAttribute !== idGroupAttribute || av.groupAttributeRowId !== groupAttributeRowId));
             this.attributeValueSetSubject.next(avs);
             this.gridRowDeleted.next(avgr);
             this.loadingSubject.next(false);
@@ -1872,8 +1873,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImpor
             }] } });
 
 /**
- * This component is specifically designed to exist in a modal for editing.  This is different from the flex attribute
- * because components such as the grid need extra configuration for editing.
+ * This component is specifically designed to exist in a modal for editing.
+ * This is different from the flex attribute because components such as the grid need extra configuration for editing.
  */
 class AttributeEditComponent extends AttributeBase {
     //dictionaryEndpoint = this.attributeService.dictionaryEndpoint;
@@ -1911,14 +1912,19 @@ class AttributeEditComponent extends AttributeBase {
             {{attribute.displayName}}
         </div>
         <div class="d-flex col-md-6">
-          <input #inputRef
+
+          <textarea
+            #inputRef
                  type="text"
                  spellcheck="spellcheck"
                  lang="en"
                  [ngModel]="attributeValues[0].valueLongText.textData"
                  (ngModelChange)="valueTextChange($event)"
                  [disabled]="!editInline || attribute.isCalculated === 'Y'"
-          />
+            style="width: 500px; height: 125px; resize: none;"
+          >
+          </textarea>
+
         </div>
       </div>
     </ng-container>
@@ -2063,7 +2069,8 @@ class AttributeEditComponent extends AttributeBase {
           {{attribute.displayName}}
         </div>
         <div class="d-flex col-md-6">
-          <select [ngModel]="(attributeValues[0].valueAttributeChoice)?attributeValues[0].valueAttributeChoice.idAttributeChoice:undefined"
+              <select
+                [ngModel]="(attributeValues[0].valueAttributeChoice)?attributeValues[0].valueAttributeChoice.idAttributeChoice:undefined"
                   (ngModelChange)="valueChoiceChange($event)"
                   class="edit-renderer">
             <option [ngValue]="undefined"></option>
@@ -2208,7 +2215,7 @@ class AttributeEditComponent extends AttributeBase {
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImport: i0, type: AttributeEditComponent, decorators: [{
             type: Component,
-            args: [{ selector: "hci-attribute-edit", template: `
+            args: [{ selector: 'hci-attribute-edit', template: `
     <!-- String -->
     <ng-container *ngIf="attribute.codeAttributeDataType === 'S'">
         <div #attributeRef
@@ -2235,14 +2242,19 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImpor
             {{attribute.displayName}}
         </div>
         <div class="d-flex col-md-6">
-          <input #inputRef
+
+          <textarea
+            #inputRef
                  type="text"
                  spellcheck="spellcheck"
                  lang="en"
                  [ngModel]="attributeValues[0].valueLongText.textData"
                  (ngModelChange)="valueTextChange($event)"
                  [disabled]="!editInline || attribute.isCalculated === 'Y'"
-          />
+            style="width: 500px; height: 125px; resize: none;"
+          >
+          </textarea>
+
         </div>
       </div>
     </ng-container>
@@ -2387,7 +2399,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.2", ngImpor
           {{attribute.displayName}}
         </div>
         <div class="d-flex col-md-6">
-          <select [ngModel]="(attributeValues[0].valueAttributeChoice)?attributeValues[0].valueAttributeChoice.idAttributeChoice:undefined"
+              <select
+                [ngModel]="(attributeValues[0].valueAttributeChoice)?attributeValues[0].valueAttributeChoice.idAttributeChoice:undefined"
                   (ngModelChange)="valueChoiceChange($event)"
                   class="edit-renderer">
             <option [ngValue]="undefined"></option>