feat(interview): Value signals [6]

rdmo/projects/assets/js/interview/actions/interviewActions.js

@@ -279,16 +279,16 @@ export function storeValue(value) {
       const valueFile = value.file
       const valueSuccess = value.success
 
+      const page = getState().interview.page
+      const sets = getState().interview.sets
+      const question = page.questions.find((question) => question.attribute === value.attribute)
+      const refresh = question && question.optionsets.some((optionset) => optionset.has_refresh)
+
       dispatch(addToPending(pendingId))
       dispatch(storeValueInit(valueIndex))
 
-      return ValueApi.storeValue(projectId, value)
+      return ValueApi.storeValue(projectId, value, { page: page.id })
         .then((value) => {
-          const page = getState().interview.page
-          const sets = getState().interview.sets
-          const question = page.questions.find((question) => question.attribute === value.attribute)
-          const refresh = question && question.optionsets.some((optionset) => optionset.has_refresh)
-
           dispatch(fetchNavigation(page))
           dispatch(updateProgress())
 
@@ -401,15 +401,16 @@ export function deleteValue(value) {
       dispatch(addToPending(pendingId))
       dispatch(deleteValueInit(value))
 
+      const page = getState().interview.page
+      const sets = getState().interview.sets
+      const question = page.questions.find((question) => question.attribute === value.attribute)
+      const refresh = question.optionsets.some((optionset) => optionset.has_refresh)
+
       if (isNil(value.id)) {
         return dispatch(deleteValueSuccess(value))
       } else {
-        return ValueApi.deleteValue(projectId, value)
+        return ValueApi.deleteValue(projectId, value, { page: page.id })
           .then(() => {
-            const page = getState().interview.page
-            const sets = getState().interview.sets
-            const question = page.questions.find((question) => question.attribute === value.attribute)
-            const refresh = question.optionsets.some((optionset) => optionset.has_refresh)
 
             dispatch(fetchNavigation(page))
             dispatch(updateProgress())

rdmo/projects/assets/js/interview/api/ValueApi.js

@@ -12,11 +12,11 @@ class ValueApi extends BaseApi {
     return this.get(`/api/v1/projects/values/search/?${encodeParams(params)}`)
   }
 
-  static storeValue(projectId, value) {
+  static storeValue(projectId, value, params) {
     if (isUndefined(value.id)) {
-      return this.post(`/api/v1/projects/projects/${projectId}/values/`, value)
+      return this.post(`/api/v1/projects/projects/${projectId}/values/?${encodeParams(params)}`, value)
     } else {
-      return this.put(`/api/v1/projects/projects/${projectId}/values/${value.id}/`, value)
+      return this.put(`/api/v1/projects/projects/${projectId}/values/${value.id}/?${encodeParams(params)}`, value)
     }
   }
 
@@ -27,9 +27,9 @@ class ValueApi extends BaseApi {
     return this.postFormData(`/api/v1/projects/projects/${projectId}/values/${value.id}/file/`, formData)
   }
 
-  static deleteValue(projectId, value) {
+  static deleteValue(projectId, value, params) {
     if (!isUndefined(value.id)) {
-      return this.delete(`/api/v1/projects/projects/${projectId}/values/${value.id}/`)
+      return this.delete(`/api/v1/projects/projects/${projectId}/values/${value.id}/?${encodeParams(params)}`)
     }
   }
 

rdmo/projects/signals.py

@@ -0,0 +1,5 @@
+from django.dispatch import Signal
+
+value_created = Signal()
+value_updated = Signal()
+value_deleted = Signal()

rdmo/projects/viewsets.py

@@ -65,6 +65,7 @@
 )
 from .serializers.v1.overview import CatalogSerializer, ProjectOverviewSerializer
 from .serializers.v1.page import PageSerializer
+from .signals import value_created, value_deleted, value_updated
 from .utils import check_conditions, get_upload_accept, send_invite_email
 
 
@@ -437,6 +438,18 @@ def get_queryset(self):
             # this is needed for the swagger ui
             return Value.objects.none()
 
+    def perform_create(self, serializer):
+        super().perform_create(serializer)
+        value_created.send(sender=Value, request=self.request, instance=serializer.instance)
+
+    def perform_update(self, serializer):
+        super().perform_update(serializer)
+        value_updated.send(sender=Value, request=self.request, instance=serializer.instance)
+
+    def perform_destroy(self, instance):
+        super().perform_destroy(instance)
+        value_deleted.send(sender=Value, request=self.request, instance=instance)
+
     @action(detail=False, methods=['POST'], url_path='set',
             permission_classes=(HasModelPermission | HasProjectPermission, ))
     def copy_set(self, request, parent_lookup_project, pk=None):

rdmo/questions/models/page.py

@@ -235,6 +235,12 @@ def descendants(self):
             descendants += [element, *element.descendants]
         return descendants
 
+    @cached_property
+    def attributes(self):
+        attributes = [self.attribute] if self.attribute else []
+        attributes += [descendant.attribute for descendant in self.descendants if descendant.attribute]
+        return attributes
+
     def prefetch_elements(self):
         models.prefetch_related_objects([self], *self.prefetch_lookups)
 

rdmo/questions/models/questionset.py

@@ -206,6 +206,12 @@ def descendants(self):
             descendants += [element, *element.descendants]
         return descendants
 
+    @cached_property
+    def attributes(self):
+        attributes = [self.attribute] if self.attribute else []
+        attributes += [descendant.attribute for descendant in self.descendants if descendant.attribute]
+        return attributes
+
     def prefetch_elements(self):
         models.prefetch_related_objects([self], *self.prefetch_lookups)