Merge branch 'main' into addIntegrationTestsForEachFeature

.github/workflows/build-and-deploy.yml

@@ -191,17 +191,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'temurin'
-          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
-          server-username: MAVEN_USERNAME # env variable for username in deploy
-          server-password: MAVEN_PASSWORD # env variable for token in deploy
-          gpg-private-key: ${{ secrets.MVN_GPG_KEY }} # Value of the GPG private key to import
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-
       - name: Restore Cached Test Tool
         uses: actions/cache@v3
         with:
@@ -218,6 +207,18 @@ jobs:
           unzip webrtc-load-test-tool-*.zip
           mkdir ~/test
           mv webrtc-load-test ~/test
+          ls -al ~/test
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'temurin'
+          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_USERNAME # env variable for username in deploy
+          server-password: MAVEN_PASSWORD # env variable for token in deploy
+          gpg-private-key: ${{ secrets.MVN_GPG_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
 
       - name: Download circle-conferencing.war Artifact
         uses: actions/download-artifact@v4
@@ -298,6 +299,7 @@ jobs:
         
       - name: Run Integration Test for webinar
         run: |
+          sleep 10
           cd test
           python3 test_main.py ${{ secrets.STAGING_SERVER_URL }} ${{ secrets.USER_NAME }} ${{ secrets.PASSWORD }} /tmp/circle-webinar.war true
 
@@ -340,12 +342,40 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: 17
+        distribution: 'temurin'
+        server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: MAVEN_USERNAME # env variable for username in deploy
+        server-password: MAVEN_PASSWORD # env variable for token in deploy
+        gpg-private-key: ${{ secrets.MVN_GPG_KEY }} # Value of the GPG private key to import
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+
+    - name: Build React application for conferencing
+      env:
+        CI: false
+        NODE_OPTIONS: '--max-old-space-size=4096'
+      run: |
+        cd react
+        mv .env.production.conferencing .env.production
+        sed -i "s#^REACT_APP_TURN_SERVER_URL=.*#REACT_APP_TURN_SERVER_URL=\"turn:${{ secrets.STAGING_TURN_URL }}\"#" .env.production
+        sed -i "s#^REACT_APP_TURN_SERVER_USERNAME=.*#REACT_APP_TURN_SERVER_USERNAME=\"${{ secrets.STAGING_TURN_USERNAME }}\"#" .env.production
+        sed -i "s#^REACT_APP_TURN_SERVER_CREDENTIAL=.*#REACT_APP_TURN_SERVER_CREDENTIAL=\"${{ secrets.STAGING_TURN_PASSWORD }}\"#" .env.production
+        npm install
+        npm run build
+        cd ..
+        rm -r webapp/src/main/webapp/static/*
+        cp -a react/build/. webapp/src/main/webapp
+
     - name: Publish to Maven Central
       run: |
         cd webapp
         ls -alh
         ls -alh target/
         mvn -e deploy -DskipTests --quiet --settings ../mvn-settings.xml
+        sleep 60
       env:
         MAVEN_USERNAME: ${{ secrets.MVN_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.MVN_PASSWORD }}

react/.env.production

@@ -54,10 +54,12 @@ REACT_APP_LAYOUT_OTHERS_CARD_VISIBILITY=true
 REACT_APP_TIME_ZONE_LIVE_TEXT_VISIBILITY=true
 
 # Video Overlay configurations
-REACT_APP_VIDEO_OVERLAY_ADMIN_MODE_ENABLED=true
+REACT_APP_VIDEO_OVERLAY_ADMIN_MODE_ENABLED=false
+REACT_APP_VIDEO_OVERLAY_ADMIN_CAMERA_CONTROL_ENABLED=false
 
 # Participant Tab configurations
 REACT_APP_PARTICIPANT_TAB_ADMIN_MODE_ENABLED=true
+REACT_APP_PARTICIPANT_TAB_MUTE_PARTICIPANT_BUTTON_ENABLED=true
 
 # Meeting Recording configuration
 REACT_APP_RECORDING_MANAGED_BY_ADMIN=false
@@ -68,6 +70,9 @@ REACT_APP_RECORDING_MANAGED_BY_ADMIN=false
 # Speed Test configurations
 REACT_APP_SPEED_TEST_BEFORE_JOINING_THE_ROOM=false
 
+# Virtual Background configurations
+REACT_APP_VIRTUAL_BACKGROUND_IMAGES="https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background0.png,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background1.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background2.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background3.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background4.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background5.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background7.jpg"
+
 # URL configurations
 REACT_APP_FOOTER_LOGO_ON_CLICK_URL="https://antmedia.io/circle"
 REACT_APP_REPORT_PROBLEM_URL="https://github.com/ant-media/conference-call-application/issues"

react/.env.production.webinar

@@ -55,12 +55,14 @@ REACT_APP_TIME_ZONE_LIVE_TEXT_VISIBILITY=true
 
 # Video Overlay configurations
 REACT_APP_VIDEO_OVERLAY_ADMIN_MODE_ENABLED=true
+REACT_APP_VIDEO_OVERLAY_ADMIN_CAMERA_CONTROL_ENABLED=false
 
 # Speed Test configurations
 REACT_APP_SPEED_TEST_BEFORE_JOINING_THE_ROOM=true
 
 # Participant Tab configurations
 REACT_APP_PARTICIPANT_TAB_ADMIN_MODE_ENABLED=true
+REACT_APP_PARTICIPANT_TAB_MUTE_PARTICIPANT_BUTTON_ENABLED=true
 
 # Meeting Recording configuration
 REACT_APP_RECORDING_MANAGED_BY_ADMIN=true
@@ -71,6 +73,9 @@ REACT_APP_FORCE_THEME="white"
 # Speed Test configurations
 REACT_APP_SPEED_TEST_BEFORE_JOINING_THE_ROOM=true
 
+# Virtual Background configurations
+REACT_APP_VIRTUAL_BACKGROUND_IMAGES="https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background0.png,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background1.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background2.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background3.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background4.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background5.jpg,https://raw.githubusercontent.com/ant-media/conference-call-application/main/static/virtualBackgroundImages/virtual-background7.jpg"
+
 # URL configurations
 REACT_APP_FOOTER_LOGO_ON_CLICK_URL=""
 REACT_APP_REPORT_PROBLEM_URL=""

react/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "homepage": ".",
   "dependencies": {
-    "@antmedia/webrtc_adaptor": "^2.12.0-SNAPSHOT-2024-Oct-19-07-47",
+    "@antmedia/webrtc_adaptor": "2.12.0-SNAPSHOT-2024-Nov-29-04-11",
     "@charkour/react-reactions": "^0.11.0",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",