chore: clean up js

rdmorganiser · Dec 11, 2023 · 8b60c37 · 8b60c37
1 parent ec9c5ee
commit 8b60c37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/rdmo/management/assets/js/actions/elementActions.js b/rdmo/management/assets/js/actions/elementActions.js
@@ -75,13 +75,11 @@ export function fetchElements(elementType) {
         action = (dispatch) => TasksApi.fetchTasks(true)
           .then(tasks => dispatch(fetchElementsSuccess({ tasks })))
         break
-        // TODO add the action join_site here?
 
       case 'views':
         action = (dispatch) => ViewsApi.fetchViews(true)
           .then(views => dispatch(fetchElementsSuccess({ views })))
         break
-        // TODO add the action join_site here?
     }
 
     return dispatch(action)
@@ -316,7 +314,6 @@ export function fetchElementError(error) {
 
 export function storeElement(elementType, element, back, elementAction=null) {
   return function(dispatch, getState) {
-    // updateLocation(getState().config.baseUrl, elementType, element.id, elementAction)
 
     dispatch(storeElementInit(element, elementAction))
 
@@ -539,13 +536,13 @@ export function createElementError(error) {
 
 // delete element
 
-export function deleteElement(elementType, element, elementAction=null) {
+export function deleteElement(elementType, element) {
   return function(dispatch) {
-    dispatch(deleteElementInit(element, elementAction))
+    dispatch(deleteElementInit(element))
 
     let action
     switch (elementType) {
-      case 'catalogs' :
+      case 'catalogs':
         action = () => QuestionsApi.deleteCatalog(element)
         break
       case 'sections':
@@ -599,8 +596,8 @@ export function deleteElement(elementType, element, elementAction=null) {
   }
 }
 
-export function deleteElementInit(element, elementAction) {
-  return {type: 'elements/deleteElementInit', element, elementAction}
+export function deleteElementInit(element) {
+  return {type: 'elements/deleteElementInit', element}
 }
 
 export function deleteElementSuccess(element) {

diff --git a/rdmo/management/assets/js/api/QuestionsApi.js b/rdmo/management/assets/js/api/QuestionsApi.js
@@ -18,7 +18,6 @@ class QuestionsApi extends BaseApi {
   }
 
   static storeCatalog(catalog, action) {
-    console.log('storeCatalog', catalog, action)
     if (isNil(catalog.id)) {
       return this.post('/api/v1/questions/catalogs/', catalog)
     } else {
@@ -30,10 +29,8 @@ class QuestionsApi extends BaseApi {
     }
   }
 
-  static deleteCatalog(catalog, action) {
-    let url = `/api/v1/questions/catalogs/${catalog.id}/`
-    if (action == 'join_site') url += 'join_site/'
-    return this.delete(url)
+  static deleteCatalog(catalog) {
+    return this.delete(`/api/v1/questions/catalogs/${catalog.id}/`)
   }
 
   static fetchSections(action) {