Fix export links in management, again (#915)

rdmorganiser · Mar 26, 2024 · 4c7b1d3 · 4c7b1d3
1 parent c945d7d
commit 4c7b1d3
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 15 deletions.
diff --git a/rdmo/management/assets/js/components/element/Attribute.js b/rdmo/management/assets/js/components/element/Attribute.js
@@ -16,7 +16,7 @@ const Attribute = ({ config, attribute, elementActions, display='list', indent=0
   const editUrl = buildPath(config.baseUrl, 'attributes', attribute.id)
   const copyUrl = buildPath(config.baseUrl, 'attributes', attribute.id, 'copy')
   const nestedUrl = buildPath(config.baseUrl, 'attributes', attribute.id, 'nested')
-  const exportUrl = buildPath('/api/v1/', 'domain', 'attributes', attribute.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'domain', 'attributes', attribute.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('attributes', attribute.id)
   const fetchCopy = () => elementActions.fetchElement('attributes', attribute.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Catalog.js b/rdmo/management/assets/js/components/element/Catalog.js
@@ -18,7 +18,7 @@ const Catalog = ({ config, catalog, elementActions, display='list',
   const editUrl = buildPath(config.baseUrl, 'catalogs', catalog.id)
   const copyUrl = buildPath(config.baseUrl, 'catalogs', catalog.id, 'copy')
   const nestedUrl = buildPath(config.baseUrl, 'catalogs', catalog.id, 'nested')
-  const exportUrl = buildPath('/api/v1/', 'questions', 'catalogs', catalog.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'questions', 'catalogs', catalog.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('catalogs', catalog.id)
   const fetchCopy = () => elementActions.fetchElement('catalogs', catalog.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Condition.js b/rdmo/management/assets/js/components/element/Condition.js
@@ -14,7 +14,7 @@ const Condition = ({ config, condition, elementActions, filter=false, filterEdit
 
   const editUrl = buildPath(config.baseUrl, 'conditions', condition.id)
   const copyUrl = buildPath(config.baseUrl, 'conditions', condition.id, 'copy')
-  const exportUrl = buildPath('/api/v1/', 'conditions', 'conditions', condition.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'conditions', 'conditions', condition.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('conditions', condition.id)
   const fetchCopy = () => elementActions.fetchElement('conditions', condition.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Option.js b/rdmo/management/assets/js/components/element/Option.js
@@ -15,7 +15,7 @@ const Option = ({ config, option, elementActions, display='list', indent=0, filt
 
   const editUrl = buildPath(config.baseUrl, 'options', option.id)
   const copyUrl = buildPath(config.baseUrl, 'options', option.id, 'copy')
-  const exportUrl = buildPath('/api/v1/', 'options', 'options', option.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'options', 'options', option.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('options', option.id)
   const fetchCopy = () => elementActions.fetchElement('options', option.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/OptionSet.js b/rdmo/management/assets/js/components/element/OptionSet.js
@@ -16,7 +16,7 @@ const OptionSet = ({ config, optionset, elementActions, display='list', filter=f
   const editUrl = buildPath(config.baseUrl, 'optionsets', optionset.id)
   const copyUrl = buildPath(config.baseUrl, 'optionsets', optionset.id, 'copy')
   const nestedUrl = buildPath(config.baseUrl, 'optionsets', optionset.id, 'nested')
-  const exportUrl = buildPath('/api/v1/', 'options', 'optionsets', optionset.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'options', 'optionsets', optionset.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('optionsets', optionset.id)
   const fetchCopy = () => elementActions.fetchElement('optionsets', optionset.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Page.js b/rdmo/management/assets/js/components/element/Page.js
@@ -22,7 +22,7 @@ const Page = ({ config, page, configActions, elementActions, display='list', ind
   const editUrl = buildPath(config.baseUrl, 'pages', page.id)
   const copyUrl = buildPath(config.baseUrl, 'pages', page.id, 'copy')
   const nestedUrl = buildPath(config.baseUrl, 'pages', page.id, 'nested')
-  const exportUrl = buildPath('/api/v1/', 'questions', 'pages', page.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'questions', 'pages', page.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('pages', page.id)
   const fetchCopy = () => elementActions.fetchElement('pages', page.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Question.js b/rdmo/management/assets/js/components/element/Question.js
@@ -17,7 +17,7 @@ const Question = ({ config, question, elementActions, display='list', indent=0,
 
   const editUrl = buildPath(config.baseUrl, 'questions', question.id)
   const copyUrl = buildPath(config.baseUrl, 'questions', question.id, 'copy')
-  const exportUrl = buildPath('/api/v1/', 'questions', 'questions', question.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'questions', 'questions', question.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('questions', question.id)
   const fetchCopy = () => elementActions.fetchElement('questions', question.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/QuestionSet.js b/rdmo/management/assets/js/components/element/QuestionSet.js
@@ -21,7 +21,7 @@ const QuestionSet = ({ config, questionset, configActions, elementActions, displ
   const editUrl = buildPath(config.baseUrl, 'questionsets', questionset.id)
   const copyUrl = buildPath(config.baseUrl, 'questionsets', questionset.id, 'copy')
   const nestedUrl = buildPath(config.baseUrl, 'questionsets', questionset.id, 'nested')
-  const exportUrl = buildPath('/api/v1/', 'questions', 'questionsets', questionset.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'questions', 'questionsets', questionset.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('questionsets', questionset.id)
   const fetchCopy = () => elementActions.fetchElement('questionsets', questionset.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Section.js b/rdmo/management/assets/js/components/element/Section.js
@@ -23,7 +23,7 @@ const Section = ({ config, section, configActions, elementActions, display='list
   const editUrl = buildPath(config.baseUrl, 'sections', section.id)
   const copyUrl = buildPath(config.baseUrl, 'sections', section.id, 'copy')
   const nestedUrl = buildPath(config.baseUrl, 'sections', section.id, 'nested')
-  const exportUrl = buildPath('/api/v1/', 'questions', 'sections', section.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'questions', 'sections', section.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('sections', section.id)
   const fetchCopy = () => elementActions.fetchElement('sections', section.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/Task.js b/rdmo/management/assets/js/components/element/Task.js
@@ -15,7 +15,7 @@ const Task = ({ config, task, elementActions, filter=false, filterSites=false, f
 
   const editUrl = buildPath(config.baseUrl, 'tasks', task.id)
   const copyUrl = buildPath(config.baseUrl, 'tasks', task.id, 'copy')
-  const exportUrl = buildPath('/api/v1/', 'tasks', 'tasks', task.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'tasks', 'tasks', task.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('tasks', task.id)
   const fetchCopy = () => elementActions.fetchElement('tasks', task.id, 'copy')

diff --git a/rdmo/management/assets/js/components/element/View.js b/rdmo/management/assets/js/components/element/View.js
@@ -14,7 +14,7 @@ const View = ({ config, view, elementActions, filter=false, filterSites=false, f
 
   const editUrl = buildPath(config.baseUrl, 'views', view.id)
   const copyUrl = buildPath(config.baseUrl, 'views', view.id, 'copy')
-  const exportUrl = buildPath('/api/v1/', 'views', 'views', view.id, 'export')
+  const exportUrl = buildPath(config.apiUrl, 'views', 'views', view.id, 'export')
 
   const fetchEdit = () => elementActions.fetchElement('views', view.id)
   const fetchCopy = () => elementActions.fetchElement('views', view.id, 'copy')

diff --git a/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js b/rdmo/management/assets/js/components/sidebar/ElementsSidebar.js
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types'
 import isNil from 'lodash/isNil'
 import invert from 'lodash/invert'
 
-import baseUrl from 'rdmo/core/assets/js/utils/baseUrl'
-
 import { elementTypes, elementModules } from '../../constants/elements'
 
 import { buildPath } from '../../utils/location'
@@ -18,8 +16,8 @@ const ElementsSidebar = ({ config, elements, elementActions, importActions }) =>
   const { elementType, elementId } = elements
 
   const model = invert(elementTypes)[elementType]
-  const exportUrl = isNil(elementId) ? `${baseUrl}/api/v1/${elementModules[model]}/${elementType}/export/`
-                                     : `${baseUrl}/api/v1/${elementModules[model]}/${elementType}/${elementId}/export/`
+  const exportUrl = isNil(elementId) ? buildPath(config.apiUrl, elementModules[model], elementType, 'export')
+                                     : buildPath(config.apiUrl, elementModules[model], elementType, elementId, 'export')
   const exportParams = getExportParams(config.filter[elementType])
 
   return (

diff --git a/rdmo/management/assets/js/reducers/configReducer.js b/rdmo/management/assets/js/reducers/configReducer.js
@@ -4,6 +4,7 @@ import baseUrl from 'rdmo/core/assets/js/utils/baseUrl'
 
 const initialState = {
   baseUrl: baseUrl + '/management/',
+  apiUrl: baseUrl + '/api/v1/',
   settings: {},
   filter: {},
   display: {}