[DONE] Feature: Webinar management in the meetings module

.env.dev-exemple

@@ -2,7 +2,7 @@ DJANGO_SUPERUSER_USERNAME=<USER>
 DJANGO_SUPERUSER_PASSWORD=<PWD>
 DJANGO_SUPERUSER_EMAIL=<MAIL>
 ### You can use internal registry
-ELASTICSEARCH_TAG=elasticsearch:8.8.1
+ELASTICSEARCH_TAG=elasticsearch:8.13.0
 NODE_TAG=node:19
 PYTHON_TAG=python:3.9-buster
 REDIS_TAG=redis:alpine3.16

.github/workflows/pod_dev.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Flake8 compliance
         run: |
           flake8 --max-complexity=7 --ignore=E501,W503,E203 --exclude .git,pod/*/migrations/*.py,*_settings.py
-      
+
       ## Start remote encoding and transcoding test ##
       - name: Create settings local file
         run: |
@@ -93,8 +93,8 @@ jobs:
           sudo rm -rf ./pod/log
           sudo rm -rf ./pod/static
           sudo rm -rf ./pod/node_modules
-          docker-compose -f ./docker-compose-full-dev-with-volumes-test.yml -p esup-pod build --build-arg ELASTICSEARCH_VERSION=$ELASTICSEARCH_TAG --build-arg NODE_VERSION=$NODE_TAG --build-arg PYTHON_VERSION=$PYTHON_TAG --no-cache
-          docker-compose -f ./docker-compose-full-dev-with-volumes-test.yml up --detach --force-recreate --always-recreate-deps
+          docker compose -f ./docker-compose-full-dev-with-volumes-test.yml -p esup-pod build --build-arg ELASTICSEARCH_VERSION=$ELASTICSEARCH_TAG --build-arg NODE_VERSION=$NODE_TAG --build-arg PYTHON_VERSION=$PYTHON_TAG --no-cache
+          docker compose -f ./docker-compose-full-dev-with-volumes-test.yml up --detach --force-recreate --always-recreate-deps
       - name: Sleep for 60 seconds to wait run server on pod back
         uses: jakejarvis/wait-action@master
         with:
@@ -107,19 +107,19 @@ jobs:
           docker exec pod-back-with-volumes python manage.py loaddata pod/video/fixtures/sample_videos.json
       - name: run test in docker
         run: docker exec pod-back-with-volumes coverage run --append --source='.' manage.py test -v 3 --keepdb pod.video_encode_transcript.tests.test_remote_encode_transcode
-      
+
       - name: Run pa11y-ci full
         run: docker exec pa11y-ci pa11y-ci -c /usr/src/app/dockerfile-dev-with-volumes/pa11y-ci/config.json
 
       - name: Run pa11y-ci mobile
         run: docker exec pa11y-ci pa11y-ci -c /usr/src/app/dockerfile-dev-with-volumes/pa11y-ci/config_mobile.json
-      
+
       - name: show pa11y results
         run: cat pa11y-results.json
 
       - name: Stop containers
         if: always()
-        run: docker-compose -f ./docker-compose-full-dev-with-volumes-test.yml down
+        run: docker compose -f ./docker-compose-full-dev-with-volumes-test.yml down
       - name: delete unused file and change owner
         run: |
           sudo rm -f pod/custom/settings_local.py

CONFIGURATION_FR.md

@@ -599,9 +599,11 @@ Vous pouvez tout à fait rajouter des langues comme vous le souhaitez. Il faudra
 
  - `SECURE_SSL_REDIRECT`
 
-  > valeur par défaut : `not DEBUG`
-
+  > valeur par défaut : `False`
 
+  >> À moins que votre site ne doive être disponible sur des connexions SSL et non SSL, <br>
+  >>  vous souhaiterez probablement définir ce paramètre sur True ou configurer un <br>
+  >>  load balancer ou reverse-proxy pour rediriger toutes les connexions vers HTTPS. <br>
 
  - `SESSION_COOKIE_AGE`
 

Makefile

@@ -89,9 +89,9 @@ createconfigs:
 # Use for docker run and docker exec commands
 -include .env.dev
 export
-COMPOSE = docker-compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod
-COMPOSE_FULL = docker-compose -f ./docker-compose-full-dev-with-volumes.yml -p esup-pod
-COMPOSE_FULL_TEST = docker-compose -f ./docker-compose-full-dev-with-volumes-test.yml -p esup-pod
+COMPOSE = docker compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod
+COMPOSE_FULL = docker compose -f ./docker-compose-full-dev-with-volumes.yml -p esup-pod
+COMPOSE_FULL_TEST = docker compose -f ./docker-compose-full-dev-with-volumes-test.yml -p esup-pod
 DOCKER_LOGS = docker logs -f
 
 #docker-start-build:

docker-compose-dev-with-volumes.yml

@@ -41,7 +41,7 @@ services:
       - ./.env.dev
     ports:
       - 6379:6379
-  
+
 #  redis-commander:
 #    container_name: redis-commander
 #    hostname: redis-commander

docker-compose-full-dev-with-volumes-test.yml

@@ -31,7 +31,7 @@ services:
     env_file:
       - ./.env.dev
     volumes: *pod-volumes
-  
+
   pod-transcript:
     container_name: pod-transcript-with-volumes
     build:
@@ -83,7 +83,7 @@ services:
     depends_on:
       - pod-back
     volumes: *pod-volumes
-  
+
 #  redis-commander:
 #    container_name: redis-commander
 #    hostname: redis-commander

docker-compose-full-dev-with-volumes.yml

@@ -31,7 +31,7 @@ services:
     env_file:
       - ./.env.dev
     volumes: *pod-volumes
-  
+
   pod-transcript:
     container_name: pod-transcript-with-volumes
     build:
@@ -74,7 +74,7 @@ services:
       - ./.env.dev
     ports:
       - 6379:6379
-  
+
 #  redis-commander:
 #    container_name: redis-commander
 #    hostname: redis-commander

dockerfile-dev-with-volumes/README.adoc

@@ -5,7 +5,7 @@ v1.2, 2023-08-30
 :toc-title: Liste des rubriques
 :imagesdir: ./images
 
-== Docker / docker-compose avec volumes sur la machine hôte
+== Docker / docker compose avec volumes sur la machine hôte
 
 === Conteneur ElasticSearch
 http://localhost:9200

make.bat

@@ -3,39 +3,39 @@ for /f "delims=" %%a in (.env.dev) do call set %%a
 if /i "%1"=="docker-build" (
   echo "Suppression du repertoire node_modules"
   rmdir /s /q .\pod\node_modules
-  echo "Suppression du repertoire node_modules"
+  echo "Suppression du repertoire static"
   rmdir /s /q .\pod\static
   echo "Suppression du repertoire log"
   rmdir /s /q .\pod\log
   echo "Chargement des variables d'environnement depuis le fichier .env.dev"
   for /f "delims=" %%a in (.env.dev) do call set %%a
   echo "Debut du build"
-  docker-compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod build --build-arg ELASTICSEARCH_VERSION=%ELASTICSEARCH_TAG% --build-arg NODE_VERSION=%NODE_TAG% --build-arg PYTHON_VERSION=%PYTHON_TAG% --no-cache
+  docker compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod build --build-arg ELASTICSEARCH_VERSION=%ELASTICSEARCH_TAG% --build-arg NODE_VERSION=%NODE_TAG% --build-arg PYTHON_VERSION=%PYTHON_TAG% --no-cache
   echo "Debut du start"
-  docker-compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod up
+  docker compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod up
   echo "Vous devriez obtenir ce message une fois esup-pod lance"
   echo "pod-dev-with-volumes        | Superuser created successfully."
   echo "Fin du build"
 ) else if /i "%1"=="docker-start" (
   echo "Debut du start"
-  docker-compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod up
+  docker compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod up
   echo "Fin du start"
 ) else if /i "%1"=="docker-stop" (
   echo "Debut du stop"
-  docker-compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod down -v
+  docker compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod down -v
   echo "Fin du stop"
 ) else if /i "%1"=="docker-reset" (
   echo "Debut du reset"
-  docker-compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod down -v
+  docker compose -f ./docker-compose-dev-with-volumes.yml -p esup-pod down -v
   echo "Suppression du repertoire node_modules"
   rmdir /s /q .\pod\node_modules
-  echo "Suppression du repertoire node_modules"
+  echo "Suppression du repertoire static"
   rmdir /s /q .\pod\static
   echo "Suppression du repertoire log"
   rmdir /s /q .\pod\log
   echo "Suppression du repertoire db_migrations"
   rmdir /s /q .\pod\db_migrations
-  echo "Suppression du repertoire db.sqlite3"
+  echo "Suppression du fichier db.sqlite3"
   del /s /q .\pod\db.sqlite3
   echo "Suppression du repertoire media"
   rmdir /s /q .\pod\media

pod/live/templates/live/direct.html

@@ -259,46 +259,5 @@ <h2 class="card-title pod-card__title h4">
     if ($("#divvideoplayer")) { $("#divvideoplayer").css("display", "block"); }
   })
 </script>
-{% if display_chat %}
-  <script>
-  // Send question for BBB live
-  $(document).ready(function () {
-    $('.send-message').click(function (e) {
-      e.preventDefault();
-      var message = $('#message').val();
-      $.ajax
-      ({
-        type: "GET",
-        url: "{% url 'bbb:live_publish_chat' id=broadcaster.id %}",
-        data: { "message": message },
-        success: function (data) {
-          $('#live_bbb_chat_form')[0].reset();
-          if (data.is_sent) {
-            // message_sent
-            displayReturnMessage("info", data.message_return);
-          } else {
-            // error_no_broadcaster_found: Message not sent: no broadcaster found
-            // error_no_connection: Message not sent: no connection to REDIS
-            displayReturnMessage("error", data.message_return);
-          }
-        }
-      });
-    });
-  });
-  function displayReturnMessage(level, returnCode) {
-    let returnMessage = "";
-    if (level == "info"){
-      $("#message_return").attr('class', 'alert alert-info');
-    } else {
-      $("#message_return").attr('class', 'alert alert-warning');
-    }
-    if (returnCode == "message_sent") { returnMessage = "{% trans 'Message sent' %}";}
-    if (returnCode == "error_no_broadcaster_found") { returnMessage = "{% trans 'Message not sent: no broadcaster found' %}";}
-    if (returnCode == "error_no_connection") { returnMessage = "{% trans 'Message not sent: connection problem (REDIS)' %}";}
-    $("#message_return").html(returnMessage);
-    $("#message_return").show("slow").delay(3000).hide("slow");
-  }
-  </script>
-{% endif %}
 
 {% endblock more_script %}

pod/live/templates/live/event-script.html

@@ -684,69 +684,69 @@
         {% endif %}
     }
 
-    // BBB message sending
-    {% if display_chat %}
-        function displayReturnMessage(level, returnCode) {
-            let toReturn = "";
-            let returnElement = document.getElementById("message_return");
-            if (level === "info") {
-                returnElement.classList.add('alert');
-                returnElement.classList.add('alert-info');
-            } else {
-                returnElement.classList.add('alert');
-                returnElement.classList.add('alert-warning');
-            }
-            if (returnCode === "message_sent") {
-                toReturn = "{% trans 'Message sent' %}";
-            }
-            if (returnCode === "error_no_broadcaster_found") {
-                toReturn = "{% trans 'Message not sent: no broadcaster found' %}";
-            }
-            if (returnCode === "error_no_connection") {
-                toReturn = "{% trans 'Message not sent: connection problem (REDIS)' %}";
-            }
-
-            returnElement.innerHTML = toReturn;
-            returnElement.style.display = "block";
-            setTimeout(function() {
-                returnElement.style.display = "none";
-            }, 3000)
-        }
+    // Webinar message sending
+    {% if enable_chat %}
+      /**
+       *  Display if message was sent, or not, to the server.
+       */
+      function displayReturnMessage(level, returnCode) {
+          let toReturn = "";
+          let returnElement = document.getElementById("message_return");
+          if (level === "info") {
+              returnElement.classList.add('alert', 'alert-info');
+          } else {
+              returnElement.classList.add('alert', 'alert-danger');
+          }
+          if (returnCode === "message_sent") {
+              toReturn = "{% trans 'Message sent' %}";
+          }
+          if (returnCode === "error") {
+              toReturn = "{% trans 'Message not sent' %}";
+          }
 
-        function sendBBBMessage(e) {
-            e.preventDefault();
-            let message = document.getElementById("message").value;
-            fetch("{% url 'bbb:live_publish_chat' id=event.broadcaster.id %}", {
-                method: 'POST',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json',
-                    "X-CSRFToken": '{{ csrf_token }}'
-                },
-                body: JSON.stringify({"message": message}),
-            }).then((response) => {
-                if (response.ok)
-                    return response.json();
-                else
-                    return Promise.reject(response);
-            }).then((data) => {
-                document.getElementById('live_bbb_chat_form').reset();
-                if (data.is_sent) {
-                    // message_sent
-                    displayReturnMessage("info", data.message_return);
-                } else {
-                    // error_no_broadcaster_found: Message not sent: no broadcaster found
-                    // error_no_connection: Message not sent: no connection to REDIS
-                    displayReturnMessage("error", data.message_return);
-                }
-            }).catch((error) => {
-                console.log("{% trans 'Error calling' %} 'sendBBBMessage' " + error);
-            });
-        }
+          returnElement.innerHTML = toReturn;
+          returnElement.classList.remove("d-none");
+          setTimeout(function() {
+              returnElement.classList.add("d-none");
+          }, 3000)
+      }
+
+      /**
+       * Send a message to a webinar live.
+       * */
+      function sendWebinarMessage(e) {
+          e.preventDefault();
+          let message = document.getElementById("message").value;
+          fetch("{% url 'meeting:live_publish_chat' id=event.id %}", {
+              method: 'POST',
+              headers: {
+                  'Accept': 'application/json',
+                  'Content-Type': 'application/json',
+                  "X-CSRFToken": '{{ csrf_token }}'
+              },
+              body: JSON.stringify({"message": message}),
+          }).then((response) => {
+              if (response.ok)
+                  return response.json();
+              else
+                  return Promise.reject(response);
+          }).then((data) => {
+              document.getElementById('live_meeting_chat_form').reset();
+              console.info(data);
+              if (data.res) {
+                  // Message_sent
+                  displayReturnMessage("info", data.message_return);
+              } else {
+                  displayReturnMessage("error", data.message_return);
+              }
+          }).catch((error) => {
+              console.log("{% trans 'Error calling' %} 'sendWebinarMessage' " + error);
+          });
+      }
 
-        document.getElementById('bbb-send-message').onclick = function ($this) {
-            sendBBBMessage($this);
-        };
+      document.getElementById('webinar-send-message').onclick = function ($this) {
+          sendWebinarMessage($this);
+      };
 
     {% endif %}
 

pod/live/templates/live/event.html

@@ -123,8 +123,8 @@ <h1 class="h2" id="livename" data-eventid="{{ event.id }}"><i class="bi bi-broad
         </iframe>
       {% endif %}
 
-      {% if USE_BBB and USE_BBB_LIVE and display_chat %}
-        {% include "bbb/bbb_form.html" %}
+      {% if USE_MEETING and USE_MEETING_WEBINAR and enable_chat %}
+        {% include "meeting/meeting_live_form.html" %}
       {% endif %}
 
       <div id="viewers-list"><ul id="viewers-ul"></ul></div>