Merge branch 'main' into CA-141-prevent-deleting-a-library-that-is-in…

…-use-in-an-assessment

.github/workflows/functional-tests.yml

@@ -56,17 +56,6 @@ jobs:
  working-directory: ${{ env.working-directory }}
  run: |
  touch .env
- echo DEFAULT_FROM_EMAIL='[email protected]' >> .env
- echo EMAIL_HOST='localhost' >> .env
- echo EMAIL_PORT=1025 >> .env
- echo EMAIL_HOST_USER='user' >> .env
- echo EMAIL_HOST_PASSWORD='pass' >> .env
- echo EMAIL_USE_TLS=True >> .env
- echo EMAIL_HOST_RESCUE='localhost' >> .env
- echo EMAIL_PORT_RESCUE=1025 >> .env
- echo EMAIL_HOST_USER_RESCUE='' >> .env
- echo EMAIL_HOST_PASSWORD_RESCUE='' >> .env
- echo EMAIL_USE_TLS_RESCUE=False >> .env
  echo PUBLIC_BACKEND_API_URL=http://127.0.0.1:8000/api >> .env
 
  - name: Create backend environment variables file
@@ -80,11 +69,6 @@ jobs:
  echo POSTGRES_USER=postgres >> .env
  echo POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} >> .env
  echo DB_HOST=localhost >> .env
- echo EMAIL_HOST=localhost >> .env
- echo EMAIL_PORT=1025 >> .env
- echo EMAIL_HOST_USER='' >> .env
- echo EMAIL_HOST_PASSWORD='' >> .env
- echo DEFAULT_FROM_EMAIL='[email protected]' >> .env
  echo CISO_ASSISTANT_SUPERUSER_EMAIL='' >> .env
  echo CISO_ASSISTANT_URL=http://127.0.0.1:4173 >> .env
  - name: Run migrations

.gitignore

@@ -1,19 +1,8 @@
-!__init__.py
-*.pyc
-__pycache__
 *.DS_Store
 *~$*
-staticfiles/*
-*.mo
 .env
-dump.json
-node_modules/
+**/node_modules/
 .vscode
 *.sqlite3
-backend/staticfiles/
-backend/venv/
 temp/
-backend/db/attachments/
-backend/db/django_secret_key
-backend/db/pg_password.txt
 ./db/

backend/.gitignore

@@ -0,0 +1,18 @@
+!__init__.py
+*.pyc
+__pycache__
+*.DS_Store
+*~$*
+staticfiles/*
+*.mo
+.env
+.vscode
+*.sqlite3
+staticfiles/
+venv/
+temp/
+db/attachments/
+db/django_secret_key
+db/pg_password.txt
+./db/
+.coverage

backend/ciso_assistant/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

frontend/.eslintrc.cjs

@@ -1,20 +1,30 @@
 module.exports = {
  root: true,
+ extends: [
+ 'eslint:recommended',
+ 'plugin:@typescript-eslint/recommended',
+ 'plugin:svelte/recommended',
+ 'prettier'
+ ],
  parser: '@typescript-eslint/parser',
- extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
- plugins: ['svelte3', '@typescript-eslint'],
- ignorePatterns: ['*.cjs'],
- overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
- settings: {
- 'svelte3/typescript': () => require('typescript')
- },
+ plugins: ['@typescript-eslint'],
  parserOptions: {
  sourceType: 'module',
- ecmaVersion: 2020
+ ecmaVersion: 2020,
+ extraFileExtensions: ['.svelte']
  },
  env: {
  browser: true,
  es2017: true,
  node: true
- }
+ },
+ overrides: [
+ {
+ files: ['*.svelte'],
+ parser: 'svelte-eslint-parser',
+ parserOptions: {
+ parser: '@typescript-eslint/parser'
+ }
+ }
+ ]
 };

frontend/package.json

@@ -37,6 +37,7 @@
  "autoprefixer": "^10.4.14",
  "eslint": "^8.53.0",
  "eslint-config-prettier": "^8.5.0",
+ "eslint-plugin-svelte": "^2.35.1",
  "jsdom": "^22.1.0",
  "postcss": "^8.4.23",
  "prettier": "^2.8.0",