Merge branch 'main' into fix/devportal-overview

Author: AqeelMuhammad

.github/workflows/main.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           node-version: '22'
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2

.github/workflows/ui-test.yml

@@ -30,9 +30,9 @@ jobs:
         with:
           java-version: 11.0.19+7
           distribution: 'temurin'
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '22'
       - name: Cache maven packages
         uses: actions/cache@v2
         with:
@@ -53,39 +53,42 @@ jobs:
           ref: refs/heads/master
           path: product-apim
       - name: Build Product-Apim with Maven
-        run: mvn clean install -Dcarbon.apimgt.ui.version=$(cat ../APIM_APPS_VERSION_FILE) -fae --file product-apim/pom.xml -DskipBenchMarkTest=true -DskipIntegrationTests=true
+        run: mvn clean install -Dcarbon.apimgt.ui.version=$(cat ../APIM_APPS_VERSION_FILE) -fae --file product-apim/all-in-one-apim/pom.xml -DskipBenchMarkTest=true -DskipIntegrationTests=true
       - name: Get product.version
-        run: mvn help:evaluate -Dexpression=project.version -q --file product-apim/pom.xml -DforceStdout > ../PRODUCT_APIM_VERSION_FILE
+        run: mvn help:evaluate -Dexpression=project.version -q --file product-apim/all-in-one-apim/pom.xml -DforceStdout > ../PRODUCT_APIM_VERSION_FILE
       - name: Print product.apim.version
         run: |
           echo $(cat ../PRODUCT_APIM_VERSION_FILE)
       - name: start APIM server
         run: |
-          unzip product-apim/modules/distribution/product/target/wso2am-$(cat ../PRODUCT_APIM_VERSION_FILE).zip
+          unzip product-apim/all-in-one-apim/modules/distribution/product/target/wso2am-$(cat ../PRODUCT_APIM_VERSION_FILE).zip
           printf "\n[apim.devportal]\nenable_application_sharing = true\napplication_sharing_type = \"default\"\n" >> wso2am-$(cat ../PRODUCT_APIM_VERSION_FILE)/repository/conf/deployment.toml
           sh wso2am-$(cat ../PRODUCT_APIM_VERSION_FILE)/bin/api-manager.sh start
           sleep 5m # sleep for 5 min to start the server
           nc -zv localhost 9443
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
       - name: Cypress run
         uses: cypress-io/github-action@v4
         with:
           record: false
           working-directory: 'apim-apps/tests'
           spec: '**/*.spec.js'
       - name: Upload ScreenShots
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: apim-apps/tests/cypress/screenshots
       - name: Upload videos
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: cypress-videos
           path: apim-apps/tests/cypress/videos
       - name: Upload Logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: server-logs

pom.xml

@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt.ui</groupId>
     <artifactId>apim.ui.apps</artifactId>
     <packaging>pom</packaging>
-    <version>9.2.16-SNAPSHOT</version>
+    <version>9.2.86-SNAPSHOT</version>
     <name>WSO2 API Manager UI - Parent</name>
     <url>https://wso2.org</url>
 

portals/admin/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt.ui</groupId>
         <artifactId>apim.ui.apps</artifactId>
-        <version>9.2.16-SNAPSHOT</version>
+        <version>9.2.86-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

portals/admin/src/main/webapp/.eslintrc.js

@@ -23,6 +23,7 @@ module.exports = {
             jsx: true,
             modules: true,
         },
+        requireConfigFile: false,
         babelOptions: {
             presets: ['@babel/preset-react', '@babel/preset-typescript'],
         },

portals/admin/src/main/webapp/package.json

@@ -10,8 +10,8 @@
     "scripts": {
         "test:ci": "echo To be implemented",
         "test:coverage": "jest --coverage",
-        "build:prod": "rm -R site/public/dist/; npm run i18n:en && npm run i18n:fr && NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production --stats=errors-only",
-        "build:dev": "NODE_ENV=development; npm run i18n:en && rimraf site/public/dist/ && webpack --mode development --watch",
+        "build:prod": "rimraf site/public/dist/ && npm run i18n:en && npm run i18n:fr && NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production --stats=errors-only",
+        "build:dev": "NODE_ENV=development && npm run i18n:en && rimraf site/public/dist/ && webpack --mode development --watch",
         "analysis": "NODE_ENV=analysis NODE_OPTIONS=--max_old_space_size=8172 webpack --mode production --progress",
         "lint": "eslint --ignore-pattern '*.test.js' --ignore-pattern '*.test.jsx' --quiet -c .eslintrc.js --ext .jsx,.js source",
         "i18n": "extract-messages -l=en,fr -o site/public/locales/ -d en --extractFromFormatMessageCall --flat 'source/src/app/**/*.jsx'",

portals/admin/src/main/webapp/site/public/conf/settings.json

@@ -20,6 +20,6 @@
       "timeout": 2000
     },
     "logoutSessionStateAppender" : "OIDC" ,
-    "docUrl": "https://apim.docs.wso2.com/en/4.4.0/"
+    "docUrl": "https://apim.docs.wso2.com/en/4.5.0/"
   }
 }