Merge branch 'master' into develop

.github/workflows/build-and-test.yaml

@@ -19,7 +19,7 @@
 #
 
 name: Build and Test
-on: [push]
+on: [push, pull_request]
 jobs:
   build-js:
     runs-on: ubuntu-20.04

.readthedocs.yaml

@@ -6,10 +6,10 @@
 version: 2
 
 # Set the version of Python and other tools you might need
-# build:
-#   os: ubuntu-22.04
-#   tools:
-#     python: "3.10"
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
 
 mkdocs:
   configuration: mkdocs.yml

README.md

@@ -39,6 +39,9 @@ on how to install Yarn 1 (Classic).
     pip install -r requirements.txt
     ```
 
+    - **Windows note**: Use ```venv\Scripts\activate``` instead of ```source venv/bin/activate```
+      <!-- https://docs.python.org/3/library/venv.html -->
+
     - **macOS note**: to install the MySQL dependencies you need to have the
       MySQL development headers and libraries installed. Also, on macOS you need
       to have openssl installed. See the

django_airavata/apps/auth/package.json

@@ -22,16 +22,17 @@
     "vuex": "^3.6.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-service": "~5.0.8",
+    "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
     "prettier": "^2.1.2",
     "vue-template-compiler": "^2.5.21",
-    "webpack-bundle-tracker": "^0.4.2-beta",
-    "eslint": "^7.32.0",
-    "@babel/eslint-parser": "^7.12.16",
-    "@babel/core": "^7.12.16"
+    "webpack": "5.0.0",
+    "webpack-bundle-tracker": "^0.4.2-beta"
   },
   "eslintConfig": {
     "root": true,

django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py

@@ -0,0 +1,23 @@
+
+import json
+
+from django.core.management.base import BaseCommand
+from wagtail.core.models import PageRevision
+
+
+class Command(BaseCommand):
+    help = "Fix the content_type id in the page revisions content_type which may be correct due to being imported from a different Django instance"
+
+    def handle(self, **options):
+        fixed_count = 0
+        for pr in PageRevision.objects.all():
+            content_json = json.loads(pr.content_json)
+            if content_json['content_type'] != pr.page.content_type.id:
+                content_json['content_type'] = pr.page.content_type.id
+                pr.content_json = json.dumps(content_json)
+                pr.save()
+                fixed_count = fixed_count + 1
+        if fixed_count > 0:
+            self.stdout.write(
+                self.style.SUCCESS(f"Successfully fixed the content type of {fixed_count} page revisions")
+            )

django_airavata/wagtailapps/base/management/commands/load_cms_data.py

@@ -35,5 +35,8 @@ def handle(self, **options):
 
         call_command('loaddata', fixture_file, verbosity=0)
         call_command('set_wagtail_site')
+        call_command('fix_page_revision_content_type')
 
-        print(f"{options['filename']} is loaded successfully....!")
+        self.stdout.write(
+            self.style.SUCCESS(f"{options['filename']} is loaded successfully....!")
+        )