Merge branch 'Update/EVSREPEXP-476' into Update/EVSREPEXP-475

NCIEVS · May 30, 2023 · 5dc5b21 · 5dc5b21
2 parents 612b6fe + d32a7d2
commit 5dc5b21
Show file tree

Hide file tree

Showing 17 changed files with 309 additions and 285 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@
 /.settings/
 .project
 .DS_Store
+
+.idea/
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/clientui/.DS_Store b/clientui/.DS_Store
diff --git a/clientui/.env.local b/clientui/.env.local
@@ -1,5 +1,5 @@
 NODE_ENV=development
 VUE_APP_BASE_URL=http://localhost:8080
-VUE_APP_ROOT_CONTEXT=/
+VUE_APP_ROOT_CONTEXT=/report-exporter/
 VUE_APP_GA_CODE=googleId
 VUE_APP_TITLE=My App - LOCAL
diff --git a/clientui/pom.xml b/clientui/pom.xml
@@ -21,7 +21,7 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>${frontend-maven-plugin.version}</version>
+        <version>1.9.1</version>
         <executions>
           <!-- Install our node and npm version to run npm/node scripts-->
           <execution>
@@ -86,4 +86,27 @@
     </plugins>
   </build>
 
+  <repositories>
+    <repository>
+      <id>nci.maven.releases</id>
+      <name>NCI Maven Release Repository</name>
+      <url>https://ncimvn.nci.nih.gov/nexus/content/repositories/LexEVSRelease</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>nci.maven.thirdparty</id>
+      <name>NCI Maven 3rd Party Repository</name>
+      <url>https://ncimvn.nci.nih.gov/nexus/content/repositories/LexEVS3rdParty</url>
+    </repository>
+    <repository>
+      <id>nci.maven.public</id>
+      <name>NCI Maven public passthrough</name>
+      <url>https://ncimvn.nci.nih.gov/nexus/content/repositories/public</url>
+    </repository>
+  </repositories>
 </project>
diff --git a/clientui/src/components/ReportSelection.vue b/clientui/src/components/ReportSelection.vue
@@ -40,64 +40,64 @@
             <ul class="list-unstyled mt-3 mb-4">
               <li>Export entities and selected properties from concept code matches</li>
             </ul>
-          <router-link v-bind:to="'/report-exporter/readCodeEntry'" class="mt-auto">
-            <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Concepts</button>
-          </router-link>
-        </div>
-      </div>
-      <div class="card mb-4 box-shadow">
-        <div class="card-header">
-          <h5 class="my-0 font-weight-normal"><b>Export Resolved Branch</b></h5>
+            <router-link v-bind:to="'/report-exporter/readCodeEntry'" class="mt-auto">
+              <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Concepts</button>
+            </router-link>
+          </div>
         </div>
-        <div class="card-body d-flex flex-column">
-          <h3 class="card-title pricing-card-title">Branch Resolve</h3>
-          <ul class="list-unstyled mt-3 mb-4">
-            <li>Export resolved branch of entities from a root concept code match</li>
-          </ul>
-          <div class="mt-auto"></div>
-          <div class="mt-auto"></div>
-          <router-link v-bind:to="'/report-exporter/resolveBranchEntry'" >
-            <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Root Nodes</button>
-          </router-link>
+        <div class="card mb-4 box-shadow">
+          <div class="card-header">
+            <h5 class="my-0 font-weight-normal"><b>Export Resolved Branch</b></h5>
+          </div>
+          <div class="card-body d-flex flex-column">
+            <h3 class="card-title pricing-card-title">Branch Resolve</h3>
+            <ul class="list-unstyled mt-3 mb-4">
+              <li>Export resolved branch of entities from a root concept code match</li>
+            </ul>
+            <div class="mt-auto"></div>
+            <div class="mt-auto"></div>
+            <router-link v-bind:to="'/report-exporter/resolveBranchEntry'" >
+              <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Root Nodes</button>
+            </router-link>
+          </div>
         </div>
-      </div>
 
-      <div class="card mb-4 box-shadow">
-        <div class="card-header">
-          <h5 class="my-0 font-weight-normal"><b>Export Roles</b></h5>
-        </div>
-        <div class="card-body d-flex flex-column">
-          <h3 class="card-title pricing-card-title">Get Concept Roles</h3>
-          <ul class="list-unstyled mt-3 mb-4">
-            <li>Export entities with roles and targets</li>
-          </ul>
-          <div class="mt-auto"></div>
-          <div class="mt-auto"></div>
-          <div class="mt-auto"></div>
-          <router-link v-bind:to="'/report-exporter/roles'" >
-            <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Concepts</button>
-          </router-link>
+        <div class="card mb-4 box-shadow">
+          <div class="card-header">
+            <h5 class="my-0 font-weight-normal"><b>Export Roles</b></h5>
+          </div>
+          <div class="card-body d-flex flex-column">
+            <h3 class="card-title pricing-card-title">Get Concept Roles</h3>
+            <ul class="list-unstyled mt-3 mb-4">
+              <li>Export entities with roles and targets</li>
+            </ul>
+            <div class="mt-auto"></div>
+            <div class="mt-auto"></div>
+            <div class="mt-auto"></div>
+            <router-link v-bind:to="'/report-exporter/roles'" >
+              <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Concepts</button>
+            </router-link>
+          </div>
         </div>
-      </div>
 
-      <div class="card mb-4 box-shadow">
-        <div class="card-header">
-          <h5 class="my-0 font-weight-normal"><b>Export Associations</b></h5>
-        </div>
-        <div class="card-body d-flex flex-column">
-          <h3 class="card-title pricing-card-title">Get Concept Associations</h3>
-          <ul class="list-unstyled mt-3 mb-4">
-            <li>Export entities with assocations and targets</li>
-          </ul>
-          <div class="mt-auto"></div>
-          <div class="mt-auto"></div>
-          <router-link v-bind:to="'/report-exporter/associations'" >
-            <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Concepts</button>
-          </router-link>
+        <div class="card mb-4 box-shadow">
+          <div class="card-header">
+            <h5 class="my-0 font-weight-normal"><b>Export Associations</b></h5>
+          </div>
+          <div class="card-body d-flex flex-column">
+            <h3 class="card-title pricing-card-title">Get Concept Associations</h3>
+            <ul class="list-unstyled mt-3 mb-4">
+              <li>Export entities with assocations and targets</li>
+            </ul>
+            <div class="mt-auto"></div>
+            <div class="mt-auto"></div>
+            <router-link v-bind:to="'/report-exporter/associations'" >
+              <button type="button" class="align-self-end btn btn btn-block btn-primary selectButton">Start Selecting Concepts</button>
+            </router-link>
+          </div>
         </div>
       </div>
     </div>
-  </div>
 
   </div>
 </template>
@@ -146,7 +146,7 @@ export default {
   methods: {
     showModal() {
       var warningCookie = this.$cookies.get(this.warningCookie);
-     // alert(warningCookie);
+      // alert(warningCookie);
       if (!warningCookie) {
         alert ("       You are accessing a US Government web site which may\n" +
             "          contain information that must be protected under the US Privacy Act\n" +
@@ -172,12 +172,12 @@ export default {
 
 
 
-  created() {
-    // scroll to the top of the page
-    window.scrollTo(0, 0);
-    this.showModal()
-  }
-}}
+    created() {
+      // scroll to the top of the page
+      window.scrollTo(0, 0);
+      this.showModal()
+    }
+  }}
 </script>
 
 
@@ -288,3 +288,6 @@ a:hover {
 }
 
 </style>
+
+
+