devgateway · jdeanquin-dg · Oct 26, 2023 · Oct 31, 2023 · Oct 31, 2023 · Nov 1, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate"]
+	path = amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
+	url = [email protected]:devgateway/amp-boilerplate.git
+[submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-translate"]
+	path = amp/TEMPLATE/ampTemplate/node_modules/amp-translate
+	url = [email protected]:devgateway/amp-translate.git
+[submodule "amp/TEMPLATE/ampTemplate/node_modules/amp-filter"]
+	path = amp/TEMPLATE/ampTemplate/node_modules/amp-filter
+	url = [email protected]:devgateway/amp-filter.git
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -46,13 +46,11 @@ def updateGitHubCommitStatus(context, message, state) {
         ]
     ])
 }
-
 def codeVersion
 def countries
 def environment
 
 stage('Build') {
-
     timeout(15) {
         milestone()
         environment = input(
@@ -63,15 +61,21 @@ stage('Build') {
 
     println "Using environment: ${environment}"
 
-    node {
+    node('ansible') {
         checkout scm
 
+
         // Find AMP version
         codeVersion = readMavenPom(file: 'amp/pom.xml').version
         println "AMP Version: ${codeVersion}"
-
+        //Used in the initial generation of keys when working with a new jenkins instance
+        //****************************************************************
+//        sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
+        sh "ssh-keyscan -H ${environment} >> ~/.ssh/known_hosts"
+//        sh "cat /root/.ssh/id_rsa.pub"
+        //******************************************************
         countries = sh(returnStdout: true,
-                script: "ssh ${environment} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'")
+                script: "ssh ${env.jenkinsUser}@${environment} 'cd /opt/amp_dbs && amp-db ls ${codeVersion} | sort'")
                 .trim()
         if (countries == "") {
             println "There are no database backups compatible with ${codeVersion}"
@@ -97,7 +101,7 @@ stage('Build') {
 
     println "amp url is ${ampUrl}"
 
-    node {
+    node('docker') {
         checkout scm
 
         def image = "${dockerRepo}amp/webapp:${tag}"
@@ -109,11 +113,13 @@ stage('Build') {
 
                 sshagent(credentials: ['GitHubDgReadOnlyKey']) {
                     withEnv(['DOCKER_BUILDKIT=1']) {
+                        sh "ssh-add -L"
                         sh "docker build " +
                                 "--progress=plain " +
                                 "--ssh default " +
                                 "-t ${image} " +
                                 "--build-arg BUILD_SOURCE='${tag}' " +
+                                "--build-arg AMP_URL='${ampUrl}' " +
                                 "--build-arg AMP_PULL_REQUEST='${pr}' " +
                                 "--build-arg AMP_BRANCH='${branch}' " +
                                 "--build-arg AMP_REGISTRY_PRIVATE_KEY='${registryKey}' " +
@@ -134,19 +140,16 @@ stage('Build') {
         }
     }
 }
-
 def deployed = false
-
 // If this stage fails then next stage will retry deployment. Otherwise next stage will be skipped.
 stage('Deploy') {
-    node {
+    node('ansible') {
         try {
             // Find latest database version compatible with ${codeVersion}
-            dbVersion = sh(returnStdout: true, script: "ssh ${environment} 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim()
+            dbVersion = sh(returnStdout: true, script: "ssh ${env.jenkinsUser}@${environment} 'cd /opt/amp_dbs && amp-db find ${codeVersion} ${country}'").trim()
 
             // Deploy AMP
-            sh "ssh ${environment} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'"
-
+            sh "ssh ${env.jenkinsUser}@${environment} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'"
             slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes")
 
             deployed = true
@@ -157,7 +160,6 @@ stage('Deploy') {
         }
     }
 }
-
 // Retry deploy with the same country.
 stage('Deploy again') {
     if (deployed) {
@@ -170,7 +172,7 @@ stage('Deploy again') {
         }
         node {
             try {
-                sh "ssh ${environment} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'"
+                sh "ssh ${env.jenkinsUser}@${environment} 'amp-up2 ${tag} ${country} ${dbVersion} ${pgVersion}'"
 
                 slackSend(channel: 'amp-ci', color: 'good', message: "Deploy AMP - Success\nDeployed ${changePretty} will be ready for testing at ${ampUrl} in about 3 minutes")
 

diff --git a/amp/Dockerfile b/amp/Dockerfile
@@ -14,6 +14,7 @@ RUN --mount=type=cache,target=/root/.npm \
 
 FROM node as compile-amp-boilerplate
 WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-boilerplate
+COPY TEMPLATE/ampTemplate/node_modules/amp-boilerplate/.git .
 COPY TEMPLATE/ampTemplate/node_modules/amp-boilerplate .
 COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate
 RUN --mount=type=cache,target=/root/.npm \
@@ -22,6 +23,7 @@ RUN --mount=type=cache,target=/root/.npm \
 
 FROM node as compile-amp-filter
 WORKDIR /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-filter
+COPY TEMPLATE/ampTemplate/node_modules/amp-filter/.git .
 COPY --from=compile-amp-translate /tmp/amp/TEMPLATE/ampTemplate/node_modules/amp-translate ../amp-translate
 COPY TEMPLATE/ampTemplate/node_modules/amp-filter .
 # HACK otherwise amp-filter won't compile!
@@ -113,7 +115,7 @@ COPY --from=compile-gis-layers-manager /tmp/amp/TEMPLATE/ampTemplate/node_module
 COPY --from=compile-gis-module /tmp/amp/TEMPLATE/ampTemplate/gisModule/dist TEMPLATE/ampTemplate/gisModule/dist
 COPY --from=compile-dashboard /tmp/amp/TEMPLATE/ampTemplate/dashboard/build TEMPLATE/ampTemplate/dashboard/build
 COPY --from=compile-reamp /tmp/amp/TEMPLATE/reamp TEMPLATE/reamp
-COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2/build TEMPLATE/reampv2/build
+COPY --from=compile-reampv2 /tmp/amp/TEMPLATE/reampv2 TEMPLATE/reampv2
 ARG BUILD_SOURCE
 RUN --mount=type=cache,target=/root/.m2 \
     mvn -B test war:exploded \

diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css b/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css
@@ -684,4 +684,14 @@ input[disabled], select[disabled]{
 
 .top-padding-10 {
     padding-top: 10px;
-}
+}
+.save-gray-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5); /* Black background with opacity */
+    z-index: 1000; /* Ensure it's above other elements */
+    display: none; /* Hidden by default */
+}
diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp.css b/amp/TEMPLATE/ampTemplate/css_2/amp.css
@@ -115,7 +115,7 @@ td.inside_inner_title { border-width: 1px 1px 1px 1px;border-color: #CCC; border
 .header { height:51px;text-align:center;width:1000px;margin:0 auto;position:relative;}
 .logo {color:#FFFFFF; font-size:14px; font-weight:bold; float:left;padding:0px; width:480px; border: 0px; margin: 8px 0px 0px 0px; display: inline;}
 .logo a {color:#FFFFFF; text-decoration: none !important;  display: table-cell;}
-.flag {width:30px; height: 20px; border: 0px; vertical-align: middle; float:left;margin-right:4px;}
+.flag {width:30px; height: 30px; border: 0px; vertical-align: middle; float:left;margin-right:4px;}
 .logo .title {display: table-cell; padding-left: 8px; vertical-align: middle; }
 .logo .title .label {display: block; text-align: left;}
 .top_nav {position:absolute; right:30px; top:30px;}
@@ -623,7 +623,7 @@ div.yui-ac-hd{border:1px solid red;}
 div.adminicon{float:right;}
 .t-name {font-size:11px;}
 .activity_me {background-color:#FFFFFF; border:1px solid #CCCCCC; margin-top:15px; padding:10px;}
-.activity_me td {padding-bottom:8px;}
+.activity_me td {padding-bottom:8px; padding-left: 10px;}
 .dijitToolbar .dijitButtonContents{padding:0px;}
 .soria .dijitButtonNode {
     -moz-border-bottom-colors: none;
@@ -684,7 +684,7 @@ div.yui-ac-hd{border:1px solid red;}
 div.adminicon{float:right;}
 .t-name {font-size:11px;}
 .activity_me {background-color:#FFFFFF; border:1px solid #CCCCCC; margin-top:15px; padding:10px;}
-.activity_me td {padding-bottom:8px;}
+.activity_me td {padding-bottom:8px; padding-left: 10px;}
 .dijitToolbar .dijitButtonContents{padding:0px;}
 .soria .dijitButtonNode {
     -moz-border-bottom-colors: none;