Merge remote-tracking branch 'origin/main' into refactor-segment-export

# Conflicts: # demosplan/DemosPlanCoreBundle/Logic/ImageLinkConverter.php # demosplan/DemosPlanCoreBundle/Logic/Segment/Export/ImageManager.php # demosplan/DemosPlanCoreBundle/Logic/Segment/SegmentsByStatementsExporter.php # demosplan/DemosPlanCoreBundle/Logic/Segment/SegmentsExporter.php # tests/backend/core/Statement/Functional/ImageLinkConverterTest.php
demos-europe · Sep 20, 2024 · 4350619 · 4350619
2 parents 1e7e33a + d7be9e1
commit 4350619
Show file tree

Hide file tree

Showing 303 changed files with 8,710 additions and 6,243 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,7 @@ logs
 /projects/core/web/js
 /projects/core/web/video
 /projects/core/web/files
+!/var/.gitkeep
 
 ###> symfony/framework-bundle ###
 /.env.local

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,5 @@
 enableTelemetry: 0
 
 nodeLinker: node-modules
+# reset the cache when the checksum does not match and check again
+checksumBehavior: reset
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -50,14 +50,16 @@ pipeline {
         stage('Preparations') {
             steps {
                 withCredentials([usernamePassword(credentialsId: 'Docker', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-                sh '''docker login --username $USERNAME --password $PASSWORD && docker pull demosdeutschland/demosplan-base:latest'''
+                sh '''docker login --username $USERNAME --password $PASSWORD && docker pull demosdeutschland/demosplan-ci:latest'''
                 }
                 script{
                     containerName = "testContainer" + env.BRANCH_NAME + env.BUILD_NUMBER
-                    commandDockerRun = 'docker run --cpus=1 -d --name ' + containerName + ' -v ${PWD}:/srv/www -v /var/cache/demosplanCI/:/srv/www/.cache/ --env CURRENT_HOST_USERNAME=$(whoami) --env CURRENT_HOST_USERID=$(id -u $(whoami)) demosdeutschland/demosplan-base:latest'
+                    commandDockerRun = 'docker run --cpus=1 -d --name ' + containerName + ' -v ${PWD}:/srv/www -v /var/cache/demosplanCI/:/srv/www/.cache/ --env CURRENT_HOST_USERNAME=$(whoami) --env CURRENT_HOST_USERID=$(id -u $(whoami)) demosdeutschland/demosplan-ci:latest'
                     commandExecYarn =  _dockerExecAsUser('YARN_CACHE_FOLDER=/srv/www/.cache/yarn yarn install --immutable --check-cache', containerName)
-                    commandExecComposer = _dockerExecAsRoot('composer install --no-interaction', containerName)
-                    sh "mkdir -p .cache"
+                    commandExecComposer = _dockerExecAsRoot('COMPOSER_CACHE_DIR=/srv/www/.cache/composer composer install --classmap-authoritative --no-interaction', containerName)
+                    sh "mkdir -p .cache var"
+                    sh "chmod -R 2775 var"
+                    sh "chown -R dplanup:dplanup var"
                     sh "echo ${PWD}"
                     sh "$commandDockerRun"
                     //sh "sleep 10"

diff --git a/client/js/bundles/document/elementsAdminImport.js b/client/js/bundles/document/elementsAdminImport.js
@@ -17,9 +17,9 @@ const components = { DpCheckbox }
 initialize(components, {}).then(() => {
   $('form').submit(function (e) {
     setInterval(function () { getImportStatus() }, 3000)
-    $(this).find('input[type="submit"]').prev('p').removeClass('hide-visually')
-    $(this).find('input[type="submit"]').next('a').addClass('hide-visually')
-    $(this).find('input[type="submit"]').addClass('hide-visually')
+    $(this).find('input[type="submit"]').prev('p').removeClass('sr-only')
+    $(this).find('input[type="submit"]').next('a').addClass('sr-only')
+    $(this).find('input[type="submit"]').addClass('sr-only')
   })
 
   /**

diff --git a/client/js/bundles/misccontent/dataProtection.js b/client/js/bundles/misccontent/dataProtection.js
@@ -7,10 +7,13 @@
  * All rights reserved
  */
 
+import { DpDataTable, DpIcon } from '@demos-europe/demosplan-ui'
 import { initialize } from '@DpJs/InitVue'
 import RegisterFlyout from '@DpJs/components/user/RegisterFlyout'
 
 const components = {
+  DpDataTable,
+  DpIcon,
   RegisterFlyout
 }
 

diff --git a/client/js/bundles/user/alternativeLogin.js b/client/js/bundles/user/alternativeLogin.js
@@ -15,13 +15,13 @@ import { DpDataTableExtended, dpValidate } from '@demos-europe/demosplan-ui'
 import AlternativeLogin from '@DpJs/components/user/AlternativeLogin'
 import { initialize } from '@DpJs/InitVue'
 import RegisterFlyout from '@DpJs/components/user/RegisterFlyout'
-import SamlLoginForm from '@DpJs/components/user/samlLoginForm/SamlLoginForm'
+import IdpLoginForm from '@DpJs/components/user/IdpLoginForm/IdpLoginForm'
 
 const components = {
   AlternativeLogin,
   DpDataTableExtended,
   RegisterFlyout,
-  SamlLoginForm
+  IdpLoginForm
 }
 
 initialize(components).then(() => {

diff --git a/client/js/bundles/user/listUser.js b/client/js/bundles/user/listUser.js
@@ -29,7 +29,7 @@ const apiStores = [
   'Department',
   'Orga',
   'Role',
-  'User'
+  'AdministratableUser'
 ]
 
 initialize(components, stores, apiStores)
diff --git a/client/js/components/button/BackToTopButton.vue b/client/js/components/button/BackToTopButton.vue
@@ -1,7 +1,7 @@
 <template>
   <dp-button
     class="sticky z-above-zero"
-    :class="{ 'hide-visually': hide }"
+    :class="{ 'sr-only': hide }"
     hide-text
     icon="arrow-up"
     icon-size="large"

diff --git a/client/js/components/document/DpMapSettingsPreview.vue b/client/js/components/document/DpMapSettingsPreview.vue
@@ -65,14 +65,14 @@
  --><div class="layout__item u-1-of-2">
       <ul>
         <li
-          v-for="link in permittedLinks"
+          v-for="(link, index) in permittedLinks"
           class="layout__item"
           :key="link.tooltipContent">
           <a
             v-tooltip="Translator.trans(link.tooltipContent)"
             class="o-link"
             :class="{'color-status-complete-text': link.done()}"
-            :data-cy="Translator.trans(link.label)"
+            :data-cy="`gisLayerLink:${index}`"
             :href="href(link)">
             <i
               aria-hidden="true"
@@ -103,6 +103,7 @@
             <button
               v-if="false === isPlanStatusEditing"
               class="btn--blank o-link--default"
+              data-cy="planStatusEditing"
               :title="Translator.trans('edit')"
               type="button"
               @click="setEditingStatus('isPlanStatusEditing', true)">
@@ -152,6 +153,7 @@
             <button
               v-if="false === isMapStatusEditing"
               class="btn--blank o-link--default"
+              data-cy="mapStatusEditing"
               :title="Translator.trans('edit')"
               type="button"
               @click="setEditingStatus('isMapStatusEditing', true)">
@@ -162,6 +164,7 @@
             <button
               v-if="isMapStatusEditing"
               class="btn--blank o-link--default"
+              data-cy="mapStatusEditingSave"
               :title="Translator.trans('save')"
               type="button"
               @click="updateIsMapEnabled">
@@ -172,6 +175,7 @@
             <button
               v-if="isMapStatusEditing"
               class="btn--blank o-link--default"
+              data-cy="mapStatusEditingReset"
               :title="Translator.trans('reset')"
               type="button"
               @click="reset('isMapEnabled', 'isMapStatusEditing')">

diff --git a/client/js/components/document/ElementsList/IconPublished.vue b/client/js/components/document/ElementsList/IconPublished.vue
@@ -19,7 +19,7 @@
       v-tooltip="text"
     />
     <span
-      class="hide-visually"
+      class="sr-only"
       v-text="text" />
   </div>
 </template>

diff --git a/client/js/components/document/ElementsList/IconStatementEnabled.vue b/client/js/components/document/ElementsList/IconStatementEnabled.vue
@@ -19,7 +19,7 @@
       v-tooltip="text"
     />
     <span
-      class="hide-visually"
+      class="sr-only"
       v-text="text" />
   </div>
 </template>

diff --git a/client/js/components/faq/DpFaqCategoryItem.vue b/client/js/components/faq/DpFaqCategoryItem.vue
@@ -13,25 +13,29 @@
       {{ faqCategoryItem.attributes.title }}
     </div><!--
  --><div class="layout__item u-2-of-12 text-center">
-      <a
-        class="btn--blank o-link--default u-mh-0_25"
-        :href="Routing.generate('DemosPlan_faq_administration_category_edit', {categoryId: this.faqCategoryItem.id})"
-        :aria-label="Translator.trans('item.edit')"
-        data-cy="editCategoryItem">
-        <i
-          class="fa fa-pencil"
-          aria-hidden="true" />
-      </a>
-      <a
-        v-if="categoryChildren.length === 0"
-        class="btn--blank o-link--default u-mh-0_25 u-pr"
-        :href="Routing.generate('DemosPlan_faq_administration_category_delete', {categoryId: this.faqCategoryItem.id})"
-        :aria-label="Translator.trans('item.delete')"
-        data-cy="deleteCategoryItem">
-        <i
-          class="fa fa-trash"
-          aria-hidden="true" />
-      </a>
+      <div class="flex flex-col sm:flex-row justify-center">
+        <a
+          class="btn--blank o-link--default"
+          :href="Routing.generate('DemosPlan_faq_administration_category_edit', {categoryId: this.faqCategoryItem.id})"
+          :aria-label="Translator.trans('item.edit')"
+          data-cy="editCategoryItem">
+          <i
+            class="fa fa-pencil"
+            aria-hidden="true" />
+        </a>
+        <div class="sm:ml-2 min-w-1">
+          <a
+            v-if="categoryChildren.length === 0"
+            class="btn--blank o-link--default"
+            :href="Routing.generate('DemosPlan_faq_administration_category_delete', {categoryId: this.faqCategoryItem.id})"
+            :aria-label="Translator.trans('item.delete')"
+            data-cy="deleteCategoryItem">
+            <i
+              class="fa fa-trash"
+              aria-hidden="true" />
+          </a>
+        </div>
+      </div>
     </div>
   </div>
 </template>

diff --git a/client/js/components/faq/DpFaqItem.vue b/client/js/components/faq/DpFaqItem.vue
@@ -44,26 +44,28 @@
         class="u-mt-0_125"
         data-cy="enabledFaqItem" />
     </div><!--
- --><div class="layout__item u-2-of-12 text-center u-pv-0_25">
-      <a
-        class="btn--blank o-link--default u-mh-0_25"
-        :href="Routing.generate('DemosPlan_faq_administration_faq_edit', {faqID: this.faqItem.id})"
-        :aria-label="Translator.trans('item.edit')"
-        data-cy="editFaqItem">
-        <i
-          class="fa fa-pencil"
-          aria-hidden="true" />
-      </a>
-      <button
-        type="button"
-        @click="deleteFaqItem"
-        data-cy="deleteFaqItem"
-        :aria-label="Translator.trans('item.delete')"
-        class="btn--blank o-link--default u-mh-0_25">
-        <i
-          class="fa fa-trash"
-          aria-hidden="true" />
-      </button>
+ --><div class="layout__item u-2-of-12 text-center py-1">
+      <div class="flex flex-col sm:flex-row justify-center">
+        <a
+          class="btn--blank o-link--default"
+          :href="Routing.generate('DemosPlan_faq_administration_faq_edit', {faqID: this.faqItem.id})"
+          :aria-label="Translator.trans('item.edit')"
+          data-cy="editFaqItem">
+          <i
+            class="fa fa-pencil"
+            aria-hidden="true" />
+        </a>
+        <button
+          type="button"
+          @click="deleteFaqItem"
+          data-cy="deleteFaqItem"
+          :aria-label="Translator.trans('item.delete')"
+          class="btn--blank o-link--default sm:ml-2">
+          <i
+            class="fa fa-trash"
+            aria-hidden="true" />
+        </button>
+      </div>
     </div>
   </div>
 </template>

diff --git a/client/js/components/map/admin/AdminLayerListItem.vue b/client/js/components/map/admin/AdminLayerListItem.vue
@@ -17,15 +17,16 @@
 </documentation>
 <template>
   <div
+    :id="layer.id"
     class="o-sortablelist__item u-pv-0_5 u-pl-0_5 border--top"
     :class="{
       'is-active' : isActive,
       'cursor-pointer' : (false === layer.attributes.isBaseLayer && 'GisLayerCategory' !== layer.type && false === isChildOfCategoryThatAppearsAsLayer),
     }"
+    data-cy="adminLayerListItem:setLayerActive"
     @click="setActiveState"
     @mouseover="mouseOverElement"
-    @mouseout="mouseOutElement"
-    :id="layer.id">
+    @mouseout="mouseOutElement">
     <div class="c-at-item__row-icon layout__item u-pl-0">
       <i
         class="fa fa-bars handle w-[20px] cursor-grab"
@@ -43,61 +44,62 @@
         v-if="layer.type === 'GisLayerCategory' && false === layer.attributes.layerWithChildrenHidden"
         aria-hidden="true"
         class="fa u-mr-0_125"
-        @click="toggleChildren"
-        :class="[childElements.length > 0 ? (showChildren ? 'fa-folder-open' : 'fa-folder') :'fa-folder-o']" />
+        :class="[childElements.length > 0 ? (showChildren ? 'fa-folder-open' : 'fa-folder') :'fa-folder-o']"
+        @click="toggleChildren" />
       {{ layer.attributes.name }}
       <span
-        class="font-size-smaller u-mr-0_5"
-        v-if="isChildOfCategoryThatAppearsAsLayer && 'mapOrder' === sortingType">
+        v-if="isChildOfCategoryThatAppearsAsLayer && 'mapOrder' === sortingType"
+        class="font-size-smaller u-mr-0_5">
           <!-- children of categories that should appear as Layer
                     only in map-list (where no categories are shown)
                     -->
         <br>{{ Translator.trans('maplayer.hidden.child.of.category') }}
       </span>
       <span
-        class="font-size-smaller u-mr-0_5"
-        v-if="layer.attributes.layerWithChildrenHidden">
+        v-if="layer.attributes.layerWithChildrenHidden"
+        class="font-size-smaller u-mr-0_5">
           <!-- categories that should appear as Layer -->
         <br>{{ Translator.trans('maplayer.category.with.hidden.children') }}
       </span>
       <span
-        class="font-size-smaller u-mr-0_5"
-        v-if="layer.attributes.description">
+        v-if="layer.attributes.description"
+        class="font-size-smaller u-mr-0_5">
         <br>{{ layer.attributes.description }}
       </span>
       <span
-        class="font-size-smaller u-mr-0_5"
-        v-if="layer.attributes.isBplan">
+        v-if="layer.attributes.isBplan"
+        class="font-size-smaller u-mr-0_5">
         <br>{{ Translator.trans('explanation.gislayer.useas.bplan') }}
       </span>
       <span
-        class="font-size-smaller u-mr-0_5"
-        v-if="layer.attributes.isScope">
+        v-if="layer.attributes.isScope"
+        class="font-size-smaller u-mr-0_5">
         <br>{{ Translator.trans('explanation.gislayer.useas.scope') }}
       </span>
       <span
-        class="font-size-smaller"
-        v-if="false === layer.attributes.isEnabled">
+        v-if="false === layer.attributes.isEnabled"
+        class="font-size-smaller">
         <br>{{ Translator.trans('explanation.gislayer.useas.invisible') }}
       </span>
       <span
-        class="font-size-smaller"
-        v-if="layer.attributes.isPrint">
+        v-if="layer.attributes.isPrint"
+        class="font-size-smaller">
         <br>{{ Translator.trans('explanation.gislayer.useas.print') }}
       </span>
     </div><!--
             Show this Stuff (Visibility-group / show initially on load) only for layer, not for Categories
  --><template v-if="(layer.type === 'GisLayer') && hasPermission('feature_map_layer_visibility')"><!--
     --><div class="inline-block w-1/12 text-right">
         <a
-          v-if="('undefined' !== typeof activeLayer.id || '' !== hoverLayerId) && false === layer.attributes.isBaseLayer && (false === isChildOfCategoryThatAppearsAsLayer)"
+          v-if="layer.attributes.isBaseLayer === false && isChildOfCategoryThatAppearsAsLayer === false"
+          data-cy="adminLayerListItem:toggleVisibilityGroup"
+          :title="hintTextForLockedLayer"
           @click.stop.prevent="toggleVisibilityGroup"
           @mouseover="setIconHoverState"
-          @mouseout="unsetIconHoverState"
-          :title="hintTextForLockedLayer">
+          @mouseout="unsetIconHoverState">
           <i
-            :class="[iconClass,showGroupableIcon]"
-            :aria-label="Translator.trans('gislayer.visibilitygroup.toggle')" />
+            :aria-label="Translator.trans('gislayer.visibilitygroup.toggle')"
+            :class="[iconClass,showGroupableIcon]"/>
         </a>
       </div><!--
    --><div class="inline-block w-1/12 text-right">
@@ -134,7 +136,7 @@
         <i
           class="fa fa-pencil u-mr-0_5"
           aria-hidden="true"
-          :title="Translator.trans('edit')" /><span class="hide-visually">{{ Translator.trans('edit') }}</span>
+          :title="Translator.trans('edit')" /><span class="sr-only">{{ Translator.trans('edit') }}</span>
       </a>
       <button
         v-if="childElements.length <= 0"
@@ -144,7 +146,7 @@
         @click.prevent="deleteElement">
         <i
           class="fa fa-trash"
-          aria-hidden="true" /><span class="hide-visually">{{ Translator.trans('delete') }}</span>
+          aria-hidden="true" /><span class="sr-only">{{ Translator.trans('delete') }}</span>
         </button>
       </div>
     </div>
@@ -759,7 +761,7 @@ export default {
      * Set active state when clicking on an overlay
      */
     setActiveState () {
-      if (!hasPermission('feature_map_category') ||
+      if (!hasPermission('feature_map_layer_visibility') ||
           this.layer.type !== 'GisLayer' ||
           this.layer.attributes.isBaseLayer ||
           this.isLoading ||