Merge pull request #550 from oakdbca/main

Small fixes and Security Update
dbca-wa · Jan 22, 2025 · bc6697f · bc6697f
2 parents 30e7e02 + 9a1bd0b
commit bc6697f
Show file tree

Hide file tree

Showing 9 changed files with 3,258 additions and 3,236 deletions.
diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
@@ -2083,6 +2083,9 @@ def community_filter_list(self, request, *args, **kwargs):
             "commonwealth_conservation_categories": CommonwealthConservationList.get_lists_dict(
                 group_type
             ),
+            "other_conservation_assessments": OtherConservationAssessmentList.get_lists_dict(
+                group_type
+            ),
             "processing_status_list": processing_status_list,
         }
         res_json = json.dumps(res_json)

diff --git a/boranga/frontend/boranga/package-lock.json b/boranga/frontend/boranga/package-lock.json
diff --git a/boranga/frontend/boranga/src/components/internal/Home.vue b/boranga/frontend/boranga/src/components/internal/Home.vue
@@ -131,6 +131,11 @@
             </div>
         </div>
     </div>
+    <div v-else class="text-center mt-5">
+        <div class="spinner-border text-primary" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
 </template>
 
 <script>

diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
@@ -271,7 +271,7 @@
                                         <div class="row mb-2">
                                             <div class="col-sm-12">
                                                 <button
-                                                    class="btn btn-primary"
+                                                    class="btn btn-primary w-100"
                                                     @click.prevent="
                                                         renameCommunity()
                                                     "
@@ -338,7 +338,7 @@
                                     <div class="row">
                                         <div class="col-sm-12">
                                             <button
-                                                class="btn btn-primary"
+                                                class="btn btn-primary w-100"
                                                 @click.prevent="reopen()"
                                             >
                                                 Reopen</button

diff --git a/boranga/frontend/boranga/src/main.js b/boranga/frontend/boranga/src/main.js
@@ -34,7 +34,6 @@ import 'select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css';
 import '@/../node_modules/datatables.net-bs5/css/dataTables.bootstrap5.min.css';
 import '@/../node_modules/datatables.net-responsive-bs5/css/responsive.bootstrap5.min.css';
 import '@/../node_modules/@fortawesome/fontawesome-free/css/all.min.css';
-import '@/../node_modules/datatables.net-bs5/css/dataTables.bootstrap5.min.css';
 
 extendMoment(moment);
 

diff --git a/boranga/frontend/boranga/src/utils/vue/datatable.vue b/boranga/frontend/boranga/src/utils/vue/datatable.vue
@@ -1,10 +1,10 @@
 <template lang="html">
-    <div id="DataTable">
+    <div id="DataTable" class="table-responsive">
         <table
             :id="id"
-            class="hover table border table-striped table-bordered dt-responsive nowrap"
+            class="hover table border table-striped table-bordered dt-responsive nowrap w-100"
             cellspacing="0"
-            width="100%"
+            style="width: 100%"
         >
             <thead>
                 <tr>

diff --git a/boranga/frontend/boranga/vite.config.js b/boranga/frontend/boranga/vite.config.js
@@ -52,6 +52,10 @@ export default defineConfig({
             '@common-utils': path.resolve(__dirname, 'src/components/common/'),
         },
     },
+    esbuild: {
+        drop: ['console', 'debugger'],
+        minify: true,
+    },
     build: {
         manifest: 'manifest.json',
         filenameHashing: false,
@@ -62,7 +66,7 @@ export default defineConfig({
             `../../static/${applicationNameShort}_vue`
         ),
         publicPath: `/static/${applicationNameShort}_vue/`,
-        sourcemap: true,
+        sourcemap: false,
         rollupOptions: {
             input: {
                 main: path.resolve(__dirname, 'src/main.js'),

diff --git a/boranga/wsgi.py b/boranga/wsgi.py
@@ -2,16 +2,16 @@
 WSGI config for ledger project.
 It exposes the WSGI callable as a module-level variable named ``application``.
 """
+
 import os
-from django.core.wsgi import get_wsgi_application
-#from dj_static import Cling, MediaCling
 
 import confy
+from django.core.wsgi import get_wsgi_application
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-if os.path.exists(BASE_DIR+"/.env"):
-   confy.read_environment_file(BASE_DIR+"/.env")
+if os.path.exists(BASE_DIR + "/.env"):
+    confy.read_environment_file(BASE_DIR + "/.env")
 os.environ.setdefault("BASE_DIR", BASE_DIR)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "boranga.settings")
-#application = Cling(MediaCling(get_wsgi_application()))
 application = get_wsgi_application()
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 git+https://github.com/dbca-wa/webtemplate2.git#egg=webtemplate_dbca
 psycopg2-binary~=2.9
-Django~=5.0.9
+Django~=5.0.11
 django-extensions~=3.2
 ipython~=8.22
 git+https://github.com/dbca-wa/ledger_api_client.git#egg=ledger_api_client