Merge pull request #14 from CIAT-DAPA/develop

Develop

Author: jchemutt

.github/workflows/pipeline.yml

@@ -2,22 +2,16 @@ name: Devops GapAnalysis
 
 on:
   push:
-    branches: [ "stage" ]
+    branches: ["stage"]
     tags:
-    - 'v*'
-
+      - "v*"
 
 permissions:
   contents: read
 
 jobs:
+  # ------- START FRONT PROCCESS -------- #
 
-
-
-
-# ------- START FRONT PROCCESS -------- #
-  
-    
   TestFront:
     runs-on: ubuntu-latest
     steps:
@@ -31,11 +25,10 @@ jobs:
           ls
           npm install
           npm test
-       
 
-# ------- END FRONT PROCCESS -------- #
+  # ------- END FRONT PROCCESS -------- #
 
-# ------- START MERGE PROCCESS -------- #
+  # ------- START MERGE PROCCESS -------- #
 
   MergeMainFront:
     needs: [TestFront]
@@ -53,76 +46,75 @@ jobs:
           target_branch: main
           github_token: ${{ github.token }}
 
-# ------- END MERGE PROCCESS -------- #
+  # ------- END MERGE PROCCESS -------- #
 
-# ------- START RELEASE PROCCESS -------- #
+  # ------- START RELEASE PROCCESS -------- #
 
   PostRelease:
     needs: MergeMainFront
     name: Create Release
     runs-on: ubuntu-latest
     permissions: write-all
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: '0'
-    - uses: actions/setup-node@v3
-      with:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: "0"
+      - uses: actions/setup-node@v3
+        with:
           node-version: 18
-    # Front Zip
-    - name: Install packages
-      run: |
+      # Front Zip
+      - name: Install packages
+        run: |
           cd ./src
           ls
           npm install
           npm run build
 
-    - name: Zip artifact front for deployment
-      run: |
+      - name: Zip artifact front for deployment
+        run: |
           cd ./src/build
           ls
           zip releaseFront.zip ./* -r
-          
-    # Upload Artifacts
-    - name: Upload Front artifact for deployment job
-      uses: actions/upload-artifact@v3
-      with:
-        name: Frontend
-        path: releaseFront.zip
-    # Generate Tagname
-    - name: Generate Tagname for release
-      id: taggerDryRun
-      uses: anothrNick/github-tag-action@1.61.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        WITH_V: true
-        DRY_RUN: true
-        DEFAULT_BUMP: patch
-        RELEASE_BRANCHES : stage,main
-        BRANCH_HISTORY: last
-    # Create release
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      with:
-        tag_name: ${{ steps.taggerDryRun.outputs.new_tag }}
-        release_name: Release ${{ steps.taggerDryRun.outputs.new_tag }}
-        #body_path: ./body.md
-        body: ${{ github.event.head_commit.message }}
-        draft: false
-        prerelease: false
-    # Upload Assets to release
-    - name: Upload Release Asset Front
-      id: upload-front-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-        asset_path: ./src/build/releaseFront.zip
-        asset_name: releaseFront.zip
-        asset_content_type: application/zip
 
-# ------- END RELEASE PROCCESS -------- #
+      # Upload Artifacts
+      - name: Upload Front artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: Frontend
+          path: releaseFront.zip
+      # Generate Tagname
+      - name: Generate Tagname for release
+        id: taggerDryRun
+        uses: anothrNick/github-tag-action@1.61.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: true
+          DRY_RUN: true
+          DEFAULT_BUMP: patch
+          RELEASE_BRANCHES: stage,main
+          BRANCH_HISTORY: last
+      # Create release
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          tag_name: ${{ steps.taggerDryRun.outputs.new_tag }}
+          release_name: Release ${{ steps.taggerDryRun.outputs.new_tag }}
+          #body_path: ./body.md
+          body: ${{ github.event.head_commit.message }}
+          draft: false
+          prerelease: false
+      # Upload Assets to release
+      - name: Upload Release Asset Front
+        id: upload-front-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          asset_path: ./src/build/releaseFront.zip
+          asset_name: releaseFront.zip
+          asset_content_type: application/zip
+# ------- END RELEASE PROCCESS -------- #

src/src/assets/icons/amaranth.png

@@ -106,17 +106,24 @@ const LayersMarkers=({option1Checked,option2Checked,accessions,
             {option1Checked == false &&
               option2Checked == true &&
               layerr.length > 0 &&
-              layerr.map((layerr, index) => (
-                <WMSTileLayer
-                  key={layerr}
-                  url={Configuration.get_geoserver_url()+Configuration.get_geoserver_service()}
-                  layers={`${Configuration.get_gap_worspace()}:${layerr}`}
-                  format="image/png"
-                  transparent={true}
-                  zIndex={1000 + index}
-                  styles={`Gap` + index}
-                />
-              ))}
+              layerr.map((layerr, index) => {
+              const geoserverUrl = Configuration.get_geoserver_url() + Configuration.get_geoserver_service();
+              const layerName = `${Configuration.get_gap_worspace()}:${layerr}`;
+
+              //console.log("GeoServer URL:", geoserverUrl);
+              //console.log("Loading Layer:", layerName);
+              return (
+                          <WMSTileLayer
+                            key={layerr}
+                            url={geoserverUrl}
+                            layers={layerName}
+                            format="image/png"
+                            transparent={true}
+                            zIndex={1000 + index}
+                            styles={`Gap` + index}
+                          />
+                        );
+                      })}
 
             {option1Checked == true && option2Checked == true && (
               <>
@@ -186,17 +193,23 @@ const LayersMarkers=({option1Checked,option2Checked,accessions,
                     ) : null
                   )}
                 {layerr.length > 0 &&
-                  layerr.map((layerr, index) => (
+                layerr.map((layerr, index) => {
+                const geoserverUrl = Configuration.get_geoserver_url() + Configuration.get_geoserver_service();
+                const layerName = `${Configuration.get_gap_worspace()}:${layerr}`;
+
+              //console.log("GeoServer URL:", geoserverUrl);
+              //console.log("Loading Layer:", layerName);
+              return (
                     <WMSTileLayer
                       key={layerr}
-                      url={Configuration.get_geoserver_url()+Configuration.get_geoserver_service()}
-                      layers={`${Configuration.get_gap_worspace()}:${layerr}`}
+                      url={geoserverUrl}
+                      layers={layerName}
                       format="image/png"
                       transparent={true}
                       zIndex={1000 + index}
                       styles={`Gap` + index}
-                    />
-                  ))}
+                    /> );
+                  })}
               </>
             )}
             {accesionsInput &&