F t31116 demosplan UI no longer use routing

src/components/core/DpDashboardTaskCard.vue

@@ -41,6 +41,21 @@ export default {
     procedureId: {
       type: String,
       required: true
+    },
+
+    resourceListRoute: {
+      type: String,
+      required: true
+    },
+
+    segmentListHashUpdateRoute: {
+      type: String,
+      required: true
+    },
+
+    segmentsListRoute: {
+      type: String,
+      required: true
     }
   },
 
@@ -53,7 +68,7 @@ export default {
 
   computed: {
     userFilteredSegmentUrl () {
-      return Routing.generate('dplan_segments_list', { procedureId: this.procedureId }) + '/' + this.userHash
+      return Routing.generate(this.segmentsListRoute, { procedureId: this.procedureId }) + '/' + this.userHash
     }
   },
 
@@ -75,7 +90,7 @@ export default {
     }
 
     // Get count of segments assigned to the current user
-    const segmentUrl = Routing.generate('api_resource_list', { resourceType: 'StatementSegment' })
+    const segmentUrl = Routing.generate(this.resourceListRoute, { resourceType: 'StatementSegment' })
     dpApi.get(segmentUrl, { filter: filterQuery }, { serialize: true }).then(response => {
       this.assignedSegmentCount = response.data.data.length
     })
@@ -87,7 +102,7 @@ export default {
      * redirected response. The redirected response will contain the default filter hash, which can then be extracted
      * and used to obtain an updated filter hash.
      */
-    dpApi.get(Routing.generate('dplan_segments_list', { procedureId: this.procedureId }))
+    dpApi.get(Routing.generate(this.segmentsListRoute, { procedureId: this.procedureId }))
       .then(response => {
         const redirectUrl = response.request.responseURL
         const splitUrl = redirectUrl.split('/')
@@ -100,7 +115,7 @@ export default {
         }
 
         // Get the actual filter hash
-        const url = Routing.generate('dplan_rpc_segment_list_query_update', { queryHash })
+        const url = Routing.generate(this.segmentListHashUpdateRoute, { queryHash })
         dpApi.patch(url, {}, filterData)
           .then(response => checkResponse(response))
           .then(response => {

src/components/core/DpEditor/DpBoilerPlateModal.vue

@@ -15,7 +15,7 @@
       <div class="flex flex-items-center u-mt">
         <a
           class="weight--bold font-size-small"
-          :href="Routing.generate('DemosPlan_procedure_boilerplate_list', { procedure: procedureId })">
+          :href="Routing.generate(boilerplateListRoute, { procedure: procedureId })">
           {{ Translator.trans('boilerplates.edit') }} ({{ Translator.trans('view.leave.hint') }})
         </a>
         <dp-button-row
@@ -59,6 +59,11 @@ export default {
       default: ''
     },
 
+    boilerplateListRoute: {
+      type: String,
+      required: true
+    },
+
     editorId: {
       required: false,
       type: String,

src/components/core/DpEditor/DpEditor.vue

@@ -8,6 +8,7 @@
       v-if="toolbar.boilerPlate && boilerPlateEnabled"
       ref="boilerPlateModal"
       :editor-id="editorId"
+      :boilerplate-list-route="boilerplateListRoute"
       :procedure-id="procedureId"
       :boiler-plate-type="toolbar.boilerPlate"
       @insertBoilerPlate="text => handleInsertText(text)" />
@@ -18,6 +19,7 @@
     <dp-upload-modal
       v-if="toolbar.imageButton"
       ref="uploadModal"
+      :file-route="fileRoute"
       @insert-image="insertImage"
       @add-alt="addAltTextToImage"
       @close="resetEditingImage" />
@@ -26,7 +28,8 @@
       ref="recommendationModal"
       @insert-recommendation="text => appendText(text)"
       :procedure-id="procedureId"
-      :segment-id="segmentId" />
+      :segment-id="segmentId"
+      :similar-recommendations-route="similarRecommendationsRoute" />
     <div :class="prefixClass('row tiptap')">
       <div :class="prefixClass('col')">
         <div
@@ -416,6 +419,15 @@ export default {
       default: ''
     },
 
+    /**
+     * Needed to get the core_file Route, when DpEditor has imageButton attr.
+     */
+    fileRoute: {
+      type: String,
+      required: false,
+      default: ''
+    },
+
     /**
      * Array with numbers 1-6 defining which heading-buttons we want to show
      *
@@ -555,6 +567,15 @@ export default {
       default: false
     },
 
+    /**
+     * Needed to get the 'DemosPlan_procedure_boilerplate_list' Route, when DpEditor has boilerPlate attr.
+     */
+    boilerplateListRoute: {
+      type: String,
+      required: false,
+      default: ''
+    },
+
     /**
      * ProcedureId is required if we want to enable boilerplates
      */
@@ -595,6 +616,15 @@ export default {
       default: false
     },
 
+    /**
+     * Needed to get the 'api_resource_list' Route, when DpEditor has recommendationButton attr.
+     */
+    similarRecommendationsRoute: {
+      type: String,
+      required: false,
+      default: ''
+    },
+
     /**
      * Pass in an Array of suggestions if you would like to use the suggestion plugin in tiptap.
      */
@@ -906,7 +936,7 @@ export default {
           const imageHash = placeholder.substr(7, 36)
           const imageWidth = placeholder.match(/width=(\d*?)&/)[1]
           const imageHeight = placeholder.match(/height=(\d*?)$/)[1]
-          return `<img src="${Routing.generate('core_file', { hash: imageHash })}" width="${imageWidth}" height="${imageHeight}" alt="${altText}">`
+          return `<img src="${Routing.generate(this.fileRoute, { hash: imageHash })}" width="${imageWidth}" height="${imageHeight}" alt="${altText}">`
         })
       } catch (e) {
         return text

src/components/core/DpEditor/DpRecommendationModal.vue

@@ -89,6 +89,11 @@ export default {
     segmentId: {
       type: String,
       required: true
+    },
+
+    similarRecommendationsRoute: {
+      type: String,
+      required: true
     }
   },
 
@@ -212,7 +217,7 @@ export default {
     },
 
     fetchSimilarRecommendations () {
-      const url = Routing.generate('api_resource_list', { resourceType: 'StatementSegment' })
+      const url = Routing.generate(this.similarRecommendationsRoute, { resourceType: 'StatementSegment' })
       const params = {
         include: 'parentStatement,parentStatement.procedure',
         fields: {

src/components/core/DpEditor/DpUploadModal.vue

@@ -17,6 +17,7 @@
         <dp-upload-files
           allowed-file-types="img"
           id="imageFile"
+          :file-route="fileRoute"
           :max-file-size="20 * 1024 * 1024/* 20 MiB */"
           :max-number-of-files="1"
           ref="uploader"
@@ -63,6 +64,13 @@ export default {
     DpUploadFiles
   },
 
+  props: {
+    fileRoute: {
+      type: String,
+      required: true
+    }
+  },
+
   data () {
     return {
       fileUrl: '',
@@ -90,7 +98,7 @@ export default {
     },
 
     setFile ({ hash }) {
-      this.fileUrl = Routing.generate('core_file', { hash: hash })
+      this.fileUrl = Routing.generate(this.fileRoute, { hash: hash })
       // Force-update the component so that DpModal updates and therefore check for new focusable elements
       this.$forceUpdate()
     },

src/components/core/DpRegisterFlyout.vue

@@ -15,11 +15,11 @@
     <div class="space-stack-s">
       <a
         class="display--block"
-        :href="Routing.generate('DemosPlan_citizen_registration_form')"
+        :href="Routing.generate(citizenRegisterFormRoute)"
         v-text="Translator.trans('register')" />
       <a
         class="display--block"
-        :href="Routing.generate('DemosPlan_orga_register_form')"
+        :href="Routing.generate(orgaRegisterFormRoute)"
         v-text="Translator.trans('register.orga')" />
     </div>
   </dp-flyout>
@@ -35,6 +35,18 @@ export default {
     DpFlyout
   },
 
+  props: {
+    citizenRegisterFormRoute: {
+      type: String,
+      required: true
+    },
+
+    orgaRegisterFormRoute: {
+      type: String,
+      required: true
+    }
+  },
+
   mounted () {
     /*
      * The placeholder element is shown until all javascript has been loaded

src/components/core/DpUpload/DpUploadFiles.vue

@@ -22,6 +22,7 @@
 
  --><dp-uploaded-file-list
       v-if="uploadedFiles.length > 0"
+      :file-route="fileRoute"
       @file-remove="handleRemove"
       :class="[prefixClass('layout__item u-1-of-1-palm'), prefixClass(sideBySide ? 'u-1-of-2' : 'u-1-of-1 u-mt')]"
       :files="uploadedFiles" />
@@ -88,6 +89,11 @@ export default {
       default: false
     },
 
+    fileRoute: {
+      type: String,
+      required: true
+    },
+
     id: {
       type: String,
       required: false,

src/components/core/DpUpload/DpUploadedFile.vue

@@ -8,7 +8,7 @@
     </span>
     <span v-if="isImage">
       <img
-        :src="Routing.generate('core_file', { hash: file.hash })"
+        :src="Routing.generate(fileRoute, { hash: file.hash })"
         :aria-label="Translator.trans('image.preview')"
         width="50px">
     </span>
@@ -43,6 +43,11 @@ export default {
     fileString: {
       type: String,
       required: true
+    },
+
+    fileRoute: {
+      type: String,
+      required: true
     }
   },
 

src/components/core/DpUpload/DpUploadedFileList.vue

@@ -7,6 +7,7 @@
       <dp-uploaded-file
         v-for="(fileString, idx) in fileStrings"
         :file-string="fileString"
+        :file-route="fileRoute"
         @file-remove="file => $emit('file-remove', file)"
         :key="idx" />
     </ul>
@@ -31,6 +32,11 @@ export default {
       type: Array,
       required: false,
       default: () => ([])
+    },
+
+    fileRoute: {
+      type: String,
+      required: true
     }
   },
 

src/components/core/DpUpload/utils/GetFileIdsByHash.js

@@ -7,9 +7,9 @@ import { dpApi } from '../../../../lib'
  *
  * @returns {Array<Ids>}
  */
-function getFileIdsByHash (hashes) {
+function getFileIdsByHash (hashes, route) {
   return dpApi.get(
-    Routing.generate('api_resource_list', { resourceType: 'File' }),
+    Routing.generate(route, { resourceType: 'File' }),
     {
       filter: {
         hasHash: {

src/lib/DpApi.js

@@ -73,7 +73,7 @@ dpApi.delete = (url, params = {}, data = {}, options = {}) => doRequest({ method
  * @param {string} id
  * @return {Promise}
  */
-const dpRpc = function (method, parameters, id = null) {
+const dpRpc = function (method, parameters, route, id = null) {
   const data = {
     jsonrpc: '2.0',
     method: method,
@@ -83,7 +83,7 @@ const dpRpc = function (method, parameters, id = null) {
 
   return doRequest({
     method: 'post',
-    url: Routing.generate('rpc_generic_post'),
+    url: Routing.generate(route),
     data
   })
 }