fix: Fix bug when editing dataset

diverso-lab · Jan 8, 2025 · 2478709 · 2478709
1 parent d62db9f
commit 2478709
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 31 deletions.
diff --git a/app/modules/dataset/templates/dataset/create_and_edit_dataset.html b/app/modules/dataset/templates/dataset/create_and_edit_dataset.html
@@ -400,9 +400,12 @@ <h4 class="alert-heading"><i class="align-middle" data-feather="alert-triangle">
 
 {% block scripts %}
 
+    {% if not is_edit %}
     <script>
         let hubfiles = {{ hubfiles|tojson|safe }};
     </script>
+    {% endif %}
+
 
     <script src="{{ url_for('zenodo.assets', subfolder='js', filename='scripts.js') }}"></script>
     <script src="{{ url_for('dataset.assets', subfolder='js', filename='scripts.js') }}"></script>

diff --git a/app/modules/dataset/templates/dataset/view_dataset.html b/app/modules/dataset/templates/dataset/view_dataset.html
@@ -335,22 +335,6 @@ <h4 style="margin-bottom: 0px;"><span class="badge bg-dark">{{ dataset.count_fea
                                     <i data-feather="tag"></i> Fact Label
                                 </button>
 
-                                <div class="btn-group" role="group">
-                                    <button id="btnGroupDrop{{ file.id }}" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" style=" border-radius: 5px;">
-                                        <i data-feather="check"></i> Check
-                                    </button>
-                                    <ul class="dropdown-menu" aria-labelledby="btnGroupDrop{{ file.id }}">
-                                        <li>
-                                            <a class="dropdown-item" onclick="checkUVL('{{ file.id }}')">Syntax check</a>
-                                        </li>
-                                        <!-- 
-                                        <li>
-                                            <a class="dropdown-item" onclick="checkSAT('{{ file.id }}')">SAT validity check</a>
-                                        </li>
-                                        -->
-                                    </ul>
-                                </div>
-
                                 <button onclick="addToCart('{{ file.id }}')" class="btn btn-outline-secondary btn-sm" style="border-radius: 5px;">
                                     <i data-feather="plus"></i> <i data-feather="download"></i> Add
                                 </button>

diff --git a/app/static/css/app.css b/app/static/css/app.css
diff --git a/app/static/css/own.css b/app/static/css/own.css
@@ -197,3 +197,11 @@
     overflow: hidden;
     text-overflow: ellipsis;
 }
+
+a{
+    color: #147ABB;
+}
+
+.bg-primary{
+    background-color: #147ABB !important;
+}
diff --git a/app/static/js/app.js b/app/static/js/app.js
diff --git a/docker/redis/worker.py b/docker/redis/worker.py
@@ -1,22 +1,29 @@
 import logging
-from rq import Worker, Queue, Connection
+from rq import Worker, Queue
 from dotenv import load_dotenv
 from app import create_app
 
+# Load environment variables
 load_dotenv()
-logger = logging.getLogger(__name__)
-
 
-if __name__ == '__main__':
+# Configure logger
+logger = logging.getLogger(__name__)
 
+if __name__ == "__main__":
+    # Create Flask application and load configuration
     app = create_app()
 
     with app.app_context():
+        # Create Flask application and load configuration
+        redis_connection = app.config["SESSION_REDIS"]
+
+        # Define the queues to be listened to
+        listen = ["default"]
 
-        # Connect to Redis and start listening to the queue
-        listen = ['default']
-        conn = app.config['SESSION_REDIS']
+        # Create queue list
+        queues = [Queue(name, connection=redis_connection) for name in listen]
 
-        with Connection(conn):
-            worker = Worker(list(map(Queue, listen)))
-            worker.work()
+        # Initialise the worker
+        logger.info(f"Starting worker for queues: {listen}")
+        worker = Worker(queues)
+        worker.work()