Merge branch 'redmine-issue/13534' into 'develop'

REDMINE_ISSUE-13534

See merge request !345

src/components/Account/UserProjectsList.vue

@@ -206,15 +206,15 @@ export default {
 
 <style lang="less" scoped>
 
+.ui.divided.items {
   .item {
-
     .item-content-wrapper {
       width: 100%;
+      margin: 0;
+      padding: 1em 0;
       display: flex;
-    align-items: flex-start;
 
       .middle.aligned.content {
-      width: 100%;
         .header {
           font-size: 1.28571429em;
           font-weight: 600;
@@ -223,4 +223,31 @@ export default {
       }
     }
   }
+  > .item:nth-child(2) {
+    border: none !important;
+  }
+}
+
+@media only screen and (min-width: 767px) {
+  .item-content-wrapper {
+    align-items: flex-start;
+
+    .middle.aligned.content {
+      width: 100%;
+      padding: 0 0 0 1.5em;
+    }
+  }
+}
+@media only screen and (max-width: 767px) {
+  .item-content-wrapper {
+    flex-direction: column;
+    align-items: center;
+
+    .middle.aligned.content {
+      width: 70%;
+      padding: 1.5em 0 0;
+    }
+  }
+}
+
 </style>

src/components/Project/Detail/ProjectFeatureTypes.vue

@@ -675,8 +675,7 @@ export default {
     },
 
     toggleDeleteFeatureType(featureType) {
-      this.featureTypeToDelete = featureType;
-      this.$emit('modal', 'deleteFeatureType');
+      this.$emit('delete', featureType);
     },
   }
 

src/components/Project/Detail/ProjectHeader.vue

@@ -274,6 +274,7 @@ export default {
 .project-header {
 
   .row {
+    margin-top: 3em;
 
     .right-column {
       display: flex;

src/components/Project/Detail/ProjectModal.vue

@@ -75,6 +75,12 @@ export default {
     isSubscriber: {
       type: Boolean,
       default: false
+    },
+    featureTypeToDelete: {
+      type: Object,
+      default: () => {
+        return {};
+      }
     }
   },
 
@@ -91,14 +97,20 @@ export default {
     ]),
 
     handleModalAction() {
-      this.$emit('action');
+      this.$emit('action', this.projectModalType);
     }
   }
 
 };
 </script>
 
-<style lang="less" scoped>
+<style scoped>
+
+.page {
+  margin: 0;
+  min-width: 100%;
+  z-index: 9999999999;
+}
 
 .alert {
   color: red;

src/views/Project/ProjectDetail.vue

@@ -57,6 +57,7 @@
             <ProjectFeatureTypes
               :loading="projectInfoLoading"
               :project="project"
+              @delete="toggleDeleteFeatureTypeModal"
             />
           </div>
 
@@ -110,6 +111,7 @@
 
     <ProjectModal
       :is-subscriber="is_suscriber"
+      :feature-type-to-delete="featureTypeToDelete"
       @action="handleModalAction"
     />
   </div>
@@ -247,6 +249,7 @@ export default {
       'DISCARD_LOADER',
     ]),
     ...mapMutations('modals', [
+      'OPEN_PROJECT_MODAL',
       'CLOSE_PROJECT_MODAL'
     ]),
     ...mapActions('projects', [
@@ -329,7 +332,7 @@ export default {
         })
         .then((data) => {
           this.is_suscriber = data.is_suscriber;
-          this.modalType = false;
+          this.CLOSE_PROJECT_MODAL();
           if (this.is_suscriber) {
             this.infoMessage =
               'Vous êtes maintenant abonné aux notifications de ce projet.';
@@ -361,7 +364,7 @@ export default {
     deleteFeatureType() {
       featureTypeAPI.deleteFeatureType(this.featureTypeToDelete.slug)
         .then((response) => {
-          this.modalType = false;
+          this.CLOSE_PROJECT_MODAL();
           if (response === 'success') {
             this.GET_PROJECT();
             this.retrieveProjectInfo();
@@ -376,6 +379,13 @@ export default {
             });
           }
           this.featureTypeToDelete = null;
+        })
+        .catch(() => {
+          this.DISPLAY_MESSAGE({
+            comment: `Une erreur est survenu lors de la suppression du type de signalement ${this.featureTypeToDelete.title}.`,
+            level: 'negative',
+          });
+          this.CLOSE_PROJECT_MODAL();
         });
     },
 
@@ -393,9 +403,9 @@ export default {
       }
     },
 
-    toggleModalType(featureType) {
+    toggleDeleteFeatureTypeModal(featureType) {
       this.featureTypeToDelete = featureType;
-      this.modalType = 'deleteFeatureType';
+      this.OPEN_PROJECT_MODAL('deleteFeatureType');
     },
 
     async initMap() {