minor pre release fixes

usnistgov · Sep 16, 2020 · d4fbf42 · d4fbf42
1 parent ee15c81
commit d4fbf42
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ domain/.settings
 *.project*
 *.classpath*
 *.metadata
-*public*
+public/*
 bootstrap/hl7-igamt.log.*
 hl7-auth.log
 hl7-igamt.log

diff --git a/bootstrap/src/main/java/gov/nist/hit/hl7/igamt/bootstrap/app/BootstrapApplication.java b/bootstrap/src/main/java/gov/nist/hit/hl7/igamt/bootstrap/app/BootstrapApplication.java
@@ -986,8 +986,8 @@ private void fixIGs() throws CoConstraintGroupNotFoundException{
 
  //@PostConstruct
   void fixConformanceStatements() throws IGUpdateException, CoConstraintGroupNotFoundException {
+   // this.conformanceStatementFixer.fixConformanceStatmentsId();
     this.igFixer.deriveChildren();
-    this.conformanceStatementFixer.fixConformanceStatmentsId();
     this.conformanceStatementFixer.lockCfsForDerived();
     this.igFixer.fixIgComponents();
 

diff --git a/export/document-export/src/main/resources/templates/profile/resource/publicationDate.xsl b/export/document-export/src/main/resources/templates/profile/resource/publicationDate.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:template name="PublicationDate">
+		<xsl:if test="normalize-space(@publicationDate)!=''">
+ 			<b>Publication Date : </b> <xsl:value-of disable-output-escaping="yes" select="@publicationDate"></xsl:value-of>
+ 		<xsl:element name="br" />
+		</xsl:if>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/ig/src/main/java/gov/nist/hit/hl7/igamt/ig/controller/IGDocumentController.java b/ig/src/main/java/gov/nist/hit/hl7/igamt/ig/controller/IGDocumentController.java
@@ -1292,7 +1292,7 @@ public ResponseMessage<IGDisplayInfo> addValueSets(@PathVariable("id") String id
   public @ResponseBody ResponseMessage<String> updateSharedUser(@PathVariable("id") String id, @RequestBody SharedUsersInfo sharedUsersInfo, Authentication authentication)
       throws IGNotFoundException, IGUpdateException, ResourceNotFoundException, ForbiddenOperationException {
     Ig ig = findIgById(id);
-    commonService.checkRight(authentication, ig.getCurrentAuthor(), ig.getUsername());
+    commonService.checkRight(authentication, ig.getUsername(), ig.getUsername());
     this.sharingService.shareIg(id, sharedUsersInfo);
     return new ResponseMessage<String>(Status.SUCCESS, "", "Ig Shared Users Successfully Updated", id, false,
         new Date(), id);

diff --git a/.../core/components/conformance-statement-editor/conformance-statement-editor.component.html b/.../core/components/conformance-statement-editor/conformance-statement-editor.component.html
@@ -61,7 +61,7 @@ <h5>Associated datatypes conformance statements</h5>
     <tr>
       <th style="width: 100px;">ID</th>
       <th>Description</th>
-      <th *ngIf="tmpl" style="width: 190px;"></th>
+      <th *ngIf="tmpl && !(viewOnly$ | async)" style="width: 190px;"></th>
     </tr>
     <tr *ngFor="let cs of csList; let i = index;" [ngClass]="{
       'table-warning': cs.changeType === 'UPDATE',
@@ -76,7 +76,7 @@ <h5>Associated datatypes conformance statements</h5>
         <span class="badge badge-warning" *ngIf="cs.payload?.locked">derived</span>
       </td>
       <td>{{ getDescription(cs.payload) }}</td>
-      <ng-container *ngIf="tmpl">
+      <ng-container *ngIf="tmpl && !(viewOnly$ | async)">
         <ng-container *ngTemplateOutlet="tmpl; context: { $implicit: cs, index: i }"></ng-container>
       </ng-container>
     </tr>

diff --git a/igamt-hl7-client-v2/src/app/modules/core/components/header/header.component.html b/igamt-hl7-client-v2/src/app/modules/core/components/header/header.component.html
@@ -2,7 +2,7 @@
   <div style="position: relative;">
     <img height="45px" src="../../../../../assets/nist_logo.png">
     <a class="navbar-brand toolbar-name"> Implementation Guide Authoring and Management Tool
-      <span class="toolname-abbrv">(IGAMT) v1.3.1-beta</span>
+      <span class="toolname-abbrv">(IGAMT) v1.4.1-beta</span>
 
     </a>
   </div>

diff --git a/...nfiguration/components/font-export-configuration/font-export-configuration.component.html b/...nfiguration/components/font-export-configuration/font-export-configuration.component.html
@@ -14,13 +14,11 @@ <h5 class="card-title title-text custom-card-title">Font Size</h5>
           [disabled]="viewOnly"
           [(ngModel)]="config.fontSize"
           (input)="onInputChange($event)"
-          thumbLabel
-          [displayWith]="formatLabel"
           tickInterval="1"
           min="1"
           max="25">
         </mat-slider>
-        
+
         </div>
 
   <div class="card card-configuration" style="flex-grow: 1; margin-right: 10px;" >
@@ -36,8 +34,8 @@ <h5 class="card-title title-text custom-card-title">Font Type</h5>
 </mat-radio-group>
   </div>
 
-  
+
   <!-- </div> -->
 
 
-</div>
+</div>
diff --git a/igamt-hl7-client-v2/src/app/modules/shared/components/hl7-v2-tree/hl7-v2-tree.component.html b/igamt-hl7-client-v2/src/app/modules/shared/components/hl7-v2-tree/hl7-v2-tree.component.html
@@ -78,7 +78,6 @@
                           [globalViewOnly]="viewOnly"
                           [enforceChangeReason]="derived"
                           [changeLog]="rowData.changeLog"
-                          [type]="rowData.type"
                           [location]="rowData.pathId"
                           [position]="rowData.position"
                           [level]="rowData.level"

diff --git a/igamt-hl7-client-v2/src/app/modules/shared/components/hl7-v2-tree/hl7-v2-tree.component.ts b/igamt-hl7-client-v2/src/app/modules/shared/components/hl7-v2-tree/hl7-v2-tree.component.ts
@@ -190,8 +190,10 @@ export class Hl7V2TreeComponent implements OnInit, OnDestroy {
   s_resource: Subscription;
   context: IBindingContext;
   treeSubscriptions: Subscription[];
-  nodeType = this.treeService.nodeType;
 
+  nodeType(node: IHL7v2TreeNode): Type {
+    return this.treeService.nodeType(node);
+  }
   readonly trackBy = (index, item) => {
     return item.node.data.id;
   }

diff --git a/...-client-v2/src/app/modules/shared/components/select-messages/select-messages.component.ts b/...-client-v2/src/app/modules/shared/components/select-messages/select-messages.component.ts
@@ -25,7 +25,7 @@ export class SelectMessagesComponent implements OnInit {
   @Input()
   selectedVersion: string;
   @Input()
-  selectedScope: Scope;
+  selectedScope: Scope = Scope.HL7STANDARD;
   @Input()
   existing: IDisplayElement[] = [];
   @Input()

diff --git a/.../app/modules/structure-editor/components/table-of-content/table-of-content.component.html b/.../app/modules/structure-editor/components/table-of-content/table-of-content.component.html
@@ -18,7 +18,6 @@
           <div #rla="routerLinkActive"
             [routerLink]="getElementUrl(node.data)"
             routerLinkActive
-            [contextMenu]="conformanceProfileContextMenu"
             class="inline-label">
 
             <app-entity-bagde [type]="node.data.type"></app-entity-bagde>
@@ -32,11 +31,11 @@
 
           </div>
 
-          <context-menu #conformanceProfileContextMenu>
-            <ng-template (execute)="publishStructure(node.data.id, node.data.type)" [enabled]="!rla.isActive && node.data.status !== 'PUBLISHED'" contextMenuItem>
-              <i class="fa fa-lock"></i> Lock Structure
-            </ng-template>
-          </context-menu>
+<!--          <context-menu #conformanceProfileContextMenu>-->
+<!--            <ng-template (execute)="publishStructure(node.data.id, node.data.type)" [enabled]="!rla.isActive && node.data.status !== 'PUBLISHED'" contextMenuItem>-->
+<!--              <i class="fa fa-lock"></i> Lock Structure-->
+<!--            </ng-template>-->
+<!--          </context-menu>-->
 
           <ng-container *ngIf="rla.isActive" >
             <ng-container *ngTemplateOutlet="subMenu; context: { $implicit : node.data }"></ng-container>
@@ -62,7 +61,6 @@
           <div #rla="routerLinkActive"
             [routerLink]="getElementUrl(node.data)"
             routerLinkActive
-            [contextMenu]="segmentContextMenu"
             class="inline-label">
 
             <app-entity-bagde [type]="node.data.type"></app-entity-bagde>
@@ -76,11 +74,11 @@
 
           </div>
 
-          <context-menu #segmentContextMenu>
-            <ng-template (execute)="publishStructure(node.data.id, node.data.type)" [enabled]="!rla.isActive && node.data.status !== 'PUBLISHED'" contextMenuItem>
-              <i class="fa fa-lock"></i> Lock Structure
-            </ng-template>
-          </context-menu>
+<!--          <context-menu #segmentContextMenu>-->
+<!--            <ng-template (execute)="publishStructure(node.data.id, node.data.type)" [enabled]="!rla.isActive && node.data.status !== 'PUBLISHED'" contextMenuItem>-->
+<!--              <i class="fa fa-lock"></i> Lock Structure-->
+<!--            </ng-template>-->
+<!--          </context-menu>-->
 
           <ng-container *ngIf="rla.isActive" >
             <ng-container *ngTemplateOutlet="subMenu; context: { $implicit : node.data }"></ng-container>

diff --git a/igamt-hl7-client-v2/src/app/root-store/dam-igamt/igamt.selected-resource.selectors.ts b/igamt-hl7-client-v2/src/app/root-store/dam-igamt/igamt.selected-resource.selectors.ts
@@ -72,7 +72,7 @@ export const selectedValueSet = createSelector(
 export const selectedResourceHasOrigin = createSelector(
   selectSelectedResource,
   (state: IResource) => {
-    return !!state.origin;
+    return state.derived;
   },
 );