Merge pull request #941 from rdmorganiser/interview

feat(interview): Rewrite interview using React and Redux [0]
rdmorganiser · Dec 6, 2024 · 612c989 · 612c989
2 parents c486085 + 9c1477c
commit 612c989
Show file tree

Hide file tree

Showing 117 changed files with 5,527 additions and 50 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,8 @@
     "build:dist": "webpack --config webpack.config.js --mode production --env ignore-perf --fail-on-warnings",
     "build:prod": "webpack --config webpack.config.js --mode production",
     "build": "webpack --config webpack.config.js --mode development",
-    "watch": "webpack --config webpack.config.js --mode development --watch"
+    "watch": "webpack --config webpack.config.js --mode development --watch",
+    "lint": "eslint --ext .js rdmo/"
   },
   "author": "RDMO Arbeitsgemeinschaft <rdmorganiser.github.io>",
   "license": "Apache-2.0",
@@ -20,6 +21,7 @@
     "classnames": "^2.5.1",
     "date-fns": "^3.6.0",
     "font-awesome": "4.7.0",
+    "html-to-text": "^9.0.5",
     "jquery": "^3.7.1",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
@@ -28,6 +30,7 @@
     "react": "^18.3.1",
     "react-bootstrap": "0.33.1",
     "react-datepicker": "7.3.0",
+    "react-diff-viewer-continued": "^3.4.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.3.1",
@@ -37,7 +40,7 @@
     "redux": "^4.1.1",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
-    "react-diff-viewer-continued": "^3.4.0"
+    "use-debounce": "^10.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",

diff --git a/rdmo/core/assets/js/utils/lang.js b/rdmo/core/assets/js/utils/lang.js
@@ -0,0 +1,2 @@
+// take the baseurl from the <head> of the django template
+export default document.querySelector('html').getAttribute('lang')
diff --git a/rdmo/core/settings.py b/rdmo/core/settings.py
@@ -222,7 +222,21 @@
     'PROJECT_TABLE_PAGE_SIZE'
 ]
 
-TEMPLATES_API = []
+TEMPLATES_API = [
+    'projects/project_interview_add_set_help.html',
+    'projects/project_interview_add_value_help.html',
+    'projects/project_interview_buttons_help.html',
+    'projects/project_interview_done.html',
+    'projects/project_interview_error.html',
+    'projects/project_interview_multiple_values_warning.html',
+    'projects/project_interview_navigation_help.html',
+    'projects/project_interview_overview_help.html',
+    'projects/project_interview_page_help.html',
+    'projects/project_interview_page_tabs_help.html',
+    'projects/project_interview_progress_help.html',
+    'projects/project_interview_question_help.html',
+    'projects/project_interview_questionset_help.html',
+]
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 DEFAULT_FROM_EMAIL = '[email protected]'

diff --git a/rdmo/core/templates/core/base.html b/rdmo/core/templates/core/base.html
@@ -1,5 +1,5 @@
-{% load static compress core_tags %}<!DOCTYPE html>
-<html>
+{% load static compress core_tags i18n %}{% get_current_language as lang_code %}<!DOCTYPE html>
+<html lang="{{ lang_code }}">
 <head>
     {% include 'core/base_head.html' %}
 

diff --git a/rdmo/management/assets/js/containers/Pending.js b/rdmo/management/assets/js/containers/Pending.js
diff --git a/rdmo/management/assets/js/management.js b/rdmo/management/assets/js/management.js
@@ -7,9 +7,10 @@ import configureStore from './store/configureStore'
 import { DndProvider } from 'react-dnd'
 import { HTML5Backend } from 'react-dnd-html5-backend'
 
+import Pending from '../../../core/assets/js/containers/Pending'
+
 import Main from './containers/Main'
 import Sidebar from './containers/Sidebar'
-import Pending from './containers/Pending'
 
 const store = configureStore()
 

diff --git a/rdmo/options/providers.py b/rdmo/options/providers.py
@@ -15,6 +15,8 @@ def get_options(self, project, search=None, user=None, site=None):
 
 class SimpleProvider(Provider):
 
+    refresh = True
+
     def get_options(self, project, search=None, user=None, site=None):
         return [
             {

diff --git a/rdmo/projects/admin.py b/rdmo/projects/admin.py
@@ -129,7 +129,7 @@ def project_owners(self, obj):
 @admin.register(Value)
 class ValueAdmin(admin.ModelAdmin):
     search_fields = ('attribute__uri', 'project__title', 'snapshot__title', 'project__user__username')
-    list_display = ('attribute', 'set_prefix', 'set_index', 'collection_index', 'value_type',
+    list_display = ('attribute', 'set_prefix', 'set_index', 'collection_index', 'set_collection', 'value_type',
                     'project_title', 'project_owners', 'snapshot_title', 'updated', 'created')
     list_filter = ('value_type', )
 

diff --git a/rdmo/projects/assets/js/interview.js b/rdmo/projects/assets/js/interview.js
@@ -0,0 +1,35 @@
+import React from 'react'
+import { createRoot } from 'react-dom/client'
+import { Provider } from 'react-redux'
+
+import configureStore from './interview/store/configureStore'
+
+import { DndProvider } from 'react-dnd'
+import { HTML5Backend } from 'react-dnd-html5-backend'
+
+import Pending from '../../../core/assets/js/containers/Pending'
+
+import Main from './interview/containers/Main'
+import Sidebar from './interview/containers/Sidebar'
+
+const store = configureStore()
+
+createRoot(document.getElementById('main')).render(
+  <DndProvider backend={HTML5Backend}>
+    <Provider store={store}>
+      <Main />
+    </Provider>
+  </DndProvider>
+)
+
+createRoot(document.getElementById('sidebar')).render(
+  <Provider store={store}>
+    <Sidebar />
+  </Provider>
+)
+
+createRoot(document.getElementById('pending')).render(
+  <Provider store={store}>
+    <Pending />
+  </Provider>
+)
diff --git a/rdmo/projects/assets/js/interview/actions/actionTypes.js b/rdmo/projects/assets/js/interview/actions/actionTypes.js
@@ -0,0 +1,52 @@
+export const NOOP = 'NOOP'
+
+export const FETCH_OVERVIEW_INIT = 'FETCH_OVERVIEW_INIT'
+export const FETCH_OVERVIEW_ERROR = 'FETCH_OVERVIEW_ERROR'
+export const FETCH_OVERVIEW_SUCCESS = 'FETCH_OVERVIEW_SUCCESS'
+
+export const FETCH_PROGRESS_INIT = 'FETCH_PROGRESS_INIT'
+export const FETCH_PROGRESS_ERROR = 'FETCH_PROGRESS_ERROR'
+export const FETCH_PROGRESS_SUCCESS = 'FETCH_PROGRESS_SUCCESS'
+
+export const UPDATE_PROGRESS_INIT = 'UPDATE_PROGRESS_INIT'
+export const UPDATE_PROGRESS_SUCCESS = 'UPDATE_PROGRESS_SUCCESS'
+export const UPDATE_PROGRESS_ERROR = 'UPDATE_PROGRESS_ERROR'
+
+export const FETCH_PAGE_INIT = 'FETCH_PAGE_INIT'
+export const FETCH_PAGE_ERROR = 'FETCH_PAGE_ERROR'
+export const FETCH_PAGE_SUCCESS = 'FETCH_PAGE_SUCCESS'
+
+export const FETCH_NAVIGATION_INIT = 'FETCH_NAVIGATION_INIT'
+export const FETCH_NAVIGATION_ERROR = 'FETCH_NAVIGATION_ERROR'
+export const FETCH_NAVIGATION_SUCCESS = 'FETCH_NAVIGATION_SUCCESS'
+
+export const FETCH_OPTIONS_INIT = 'FETCH_OPTIONS_INIT'
+export const FETCH_OPTIONS_SUCCESS = 'FETCH_OPTIONS_SUCCESS'
+export const FETCH_OPTIONS_ERROR = 'FETCH_OPTIONS_ERROR'
+
+export const FETCH_VALUES_INIT = 'FETCH_VALUES_INIT'
+export const FETCH_VALUES_SUCCESS = 'FETCH_VALUES_SUCCESS'
+export const FETCH_VALUES_ERROR = 'FETCH_VALUES_ERROR'
+
+export const RESOLVE_CONDITION_INIT = 'RESOLVE_CONDITION_INIT'
+export const RESOLVE_CONDITION_SUCCESS = 'RESOLVE_CONDITION_SUCCESS'
+export const RESOLVE_CONDITION_ERROR = 'RESOLVE_CONDITION_ERROR'
+
+export const CREATE_VALUE = 'CREATE_VALUE'
+export const UPDATE_VALUE = 'UPDATE_VALUE'
+
+export const STORE_VALUE_INIT = 'STORE_VALUE_INIT'
+export const STORE_VALUE_SUCCESS = 'STORE_VALUE_SUCCESS'
+export const STORE_VALUE_ERROR = 'STORE_VALUE_ERROR'
+
+export const DELETE_VALUE_INIT = 'DELETE_VALUE_INIT'
+export const DELETE_VALUE_SUCCESS = 'DELETE_VALUE_SUCCESS'
+export const DELETE_VALUE_ERROR = 'DELETE_VALUE_ERROR'
+
+export const ACTIVATE_SET = 'ACTIVATE_SET'
+
+export const CREATE_SET = 'CREATE_SET'
+
+export const DELETE_SET_INIT = 'DELETE_SET_INIT'
+export const DELETE_SET_SUCCESS = 'DELETE_SET_SUCCESS'
+export const DELETE_SET_ERROR = 'DELETE_SET_ERROR'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// take the baseurl from the <head> of the django template
		export default document.querySelector('html').getAttribute('lang')