[DA02-955] bugfix/Better publishing error handling in draft view

django/translations/master.pot

@@ -51,13 +51,13 @@ msgstr ""
 msgid "{name} (me)"
 msgstr ""
 
-#: components/project/ProjectData.vue:252
+#: components/project/ProjectData.vue:253
 #: components/project/sections/CountryCustom.vue:33
 #: components/project/sections/DonorCustom.vue:36
 msgid "{name} custom fields"
 msgstr ""
 
-#: components/project/ProjectData.vue:251
+#: components/project/ProjectData.vue:252
 msgid "{name} fields"
 msgstr ""
 
@@ -310,8 +310,8 @@ msgid ""
 "investors and implementation partners working in your country."
 msgstr ""
 
-#: components/project/ProjectData.vue:138
-#: components/project/ProjectForm.vue:256
+#: components/project/ProjectData.vue:139
+#: components/project/ProjectForm.vue:255
 msgid "Action cancelled"
 msgstr ""
 
@@ -548,9 +548,9 @@ msgid ""
 "a Health Focus Category only once."
 msgstr ""
 
-#: components/project/ProjectData.vue:152
-#: components/project/ProjectData.vue:199
-#: components/project/ProjectForm.vue:240
+#: components/project/ProjectData.vue:153
+#: components/project/ProjectData.vue:200
+#: components/project/ProjectForm.vue:239
 #: angular/Assessment/CountryMap/CountryMapController.js:42
 msgid "Attention"
 msgstr ""
@@ -702,8 +702,8 @@ msgstr ""
 #: components/dialogs/EditSubLevelDialog.vue:11
 #: components/dialogs/ProjectApprovalDialog.vue:47
 #: components/dialogs/SaveFilterDialog.vue:12
-#: components/project/ProjectData.vue:323
-#: components/project/ProjectForm.vue:243
+#: components/project/ProjectData.vue:325
+#: components/project/ProjectForm.vue:242
 #: components/project/ProjectNavigation.vue:109
 #: components/project/collection/AddEditorDialog.vue:7
 #: components/project/collection/AddEditorDialog.vue:2
@@ -771,8 +771,8 @@ msgid ""
 "software.  If there are no users of this type, put 0."
 msgstr ""
 
-#: components/project/ProjectForm.vue:218
-#: components/project/ProjectForm.vue:277
+#: components/project/ProjectForm.vue:217
+#: components/project/ProjectForm.vue:276
 #: angular/Assessment/CountryMap/CountryMapController.js:44
 msgid "Close"
 msgstr ""
@@ -827,14 +827,14 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: components/project/ProjectForm.vue:216
-#: components/project/ProjectForm.vue:275
+#: components/project/ProjectForm.vue:215
+#: components/project/ProjectForm.vue:274
 msgid "Congratulation"
 msgstr ""
 
-#: components/project/ProjectData.vue:162
-#: components/project/ProjectData.vue:182
-#: components/project/ProjectData.vue:205
+#: components/project/ProjectData.vue:163
+#: components/project/ProjectData.vue:183
+#: components/project/ProjectData.vue:206
 msgid "Congratulations"
 msgstr ""
 
@@ -1111,7 +1111,7 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
-#: components/project/ProjectData.vue:196
+#: components/project/ProjectData.vue:197
 #: components/project/ProjectNavigation.vue:96
 msgid "Discard draft"
 msgstr ""
@@ -1178,11 +1178,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#: components/project/ProjectData.vue:206
-msgid "Draft has been discard"
+#: components/project/ProjectData.vue:207
+msgid "Draft has been discarded"
 msgstr ""
 
-#: components/project/ProjectForm.vue:250
+#: components/project/ProjectForm.vue:249
 msgid "Draft overriden with published version"
 msgstr ""
 
@@ -1284,7 +1284,7 @@ msgid ""
 "Enter your email address and follow the instructions you will get by email."
 msgstr ""
 
-#: components/project/ProjectData.vue:186
+#: components/project/ProjectData.vue:187
 msgid "Error"
 msgstr ""
 
@@ -1932,7 +1932,7 @@ msgstr ""
 msgid "Inactivate API key"
 msgstr ""
 
-#: components/project/ProjectData.vue:137
+#: components/project/ProjectData.vue:138
 msgid "Info"
 msgstr ""
 
@@ -2496,8 +2496,8 @@ msgid "of."
 msgstr ""
 
 #: components/dialogs/ProjectApprovalDialog.vue:107
-#: components/project/ProjectData.vue:322
-#: components/project/ProjectForm.vue:242
+#: components/project/ProjectData.vue:324
+#: components/project/ProjectForm.vue:241
 msgid "Ok"
 msgstr ""
 
@@ -2791,7 +2791,7 @@ msgstr ""
 msgid "Project end date"
 msgstr ""
 
-#: components/project/ProjectData.vue:163
+#: components/project/ProjectData.vue:164
 msgid "Project has been unpublish"
 msgstr ""
 
@@ -2879,7 +2879,7 @@ msgstr ""
 msgid "Publish"
 msgstr ""
 
-#: components/project/ProjectData.vue:175
+#: components/project/ProjectData.vue:176
 msgid "Publish draft"
 msgstr ""
 
@@ -3465,12 +3465,12 @@ msgid ""
 "lines for which there may not yet be full agreement."
 msgstr ""
 
-#: components/project/ProjectData.vue:200
-#: components/project/ProjectForm.vue:237
+#: components/project/ProjectData.vue:201
+#: components/project/ProjectForm.vue:236
 msgid "The current draft will be overwritten by the published version"
 msgstr ""
 
-#: components/project/ProjectData.vue:153
+#: components/project/ProjectData.vue:154
 msgid "The current project will be unpublish"
 msgstr ""
 
@@ -3832,7 +3832,7 @@ msgid "Unique Project ID (UID)"
 msgstr ""
 
 #: components/common/ProjectCardActions.vue:30
-#: components/project/ProjectData.vue:149
+#: components/project/ProjectData.vue:150
 #: components/project/ProjectNavigation.vue:101
 msgid "Unpublish"
 msgstr ""
@@ -3974,8 +3974,10 @@ msgstr ""
 msgid "We are available via email on"
 msgstr ""
 
-#: components/project/ProjectData.vue:187
-msgid "We could not publish. Try again"
+#: components/project/ProjectData.vue:188
+msgid ""
+"We could not publish. Check required publish fields in edit mode and try "
+"again!"
 msgstr ""
 
 #: components/common/CookieConsent.vue:7
@@ -4227,15 +4229,15 @@ msgid ""
 "correct investors."
 msgstr ""
 
-#: components/project/ProjectData.vue:183
+#: components/project/ProjectData.vue:184
 msgid "Your draft has been published"
 msgstr ""
 
-#: components/project/ProjectForm.vue:274
+#: components/project/ProjectForm.vue:273
 msgid "Your draft has been published successfully"
 msgstr ""
 
-#: components/project/ProjectForm.vue:215
+#: components/project/ProjectForm.vue:214
 msgid "Your draft has been saved successfully"
 msgstr ""
 

frontend/assets/style/main.less

@@ -1405,6 +1405,10 @@ fieldset {
   }
 }
 
+.el-notification__content {
+  text-align: left;
+}
+
 @import "rtl.less";
 
 .Switch-container {

frontend/components/project/ProjectData.vue

@@ -134,7 +134,8 @@ export default {
     ...mapActions({
       publishProject: 'project/publishProject',
       discardDraft: 'project/discardDraft',
-      unpublishProject: 'project/unpublishProject'
+      unpublishProject: 'project/unpublishProject',
+      setLoading: 'project/setLoading'
     }),
     handleInit () {
       this.handleProject()
@@ -219,7 +220,7 @@ export default {
               },
               error: {
                 title: this.$gettext('Error'),
-                message: this.$gettext('We could not publish. Try again'),
+                message: this.$gettext('We could not publish. Check required publish fields in edit mode and try again!'),
                 type: 'error'
               }
             },
@@ -238,7 +239,7 @@ export default {
               },
               success: {
                 title: this.$gettext('Congratulations'),
-                message: this.$gettext('Draft has been discard')
+                message: this.$gettext('Draft has been discarded')
               },
               error: info
             }
@@ -343,6 +344,7 @@ export default {
       this.$router.push(this.localePath(obj))
     },
     handleNotification (obj) {
+      this.setLoading(false)
       this.$notify({
         type: 'success',
         position: 'top-left',

frontend/components/project/ProjectForm.vue

@@ -277,7 +277,6 @@ export default {
         this.$refs.countryCustom.validate(),
         this.$refs.donorCustom.validate()
       ])
-      console.log('root validations', validations)
       return validations.reduce((a, c) => a && c, true)
     },
     async validateDraft () {

frontend/components/project/sections/GeneralOverview.vue

@@ -400,7 +400,7 @@ export default {
         'setImplementingPartners',
         300,
         true
-      ],    
+      ],
       donors: ['project', 'getDonors', 'setDonors', 0],
     }),
     isGlobal: {
@@ -454,7 +454,6 @@ export default {
     async validate () {
       this.$refs.collapsible.expandCard()
       const validations = await Promise.all([this.$validator.validate()])
-      console.log('General overview published validation', validations)
       return validations.reduce((a, c) => a && c, true)
     },
     async validateDraft () {
@@ -465,7 +464,6 @@ export default {
         this.$validator.validate('contact_email'),
         this.$validator.validate('team')
       ])
-      console.log('General overview draft validation', validations)
       return validations.reduce((a, c) => a && c, true)
     }
   }

frontend/components/project/sections/StageOverview.vue

@@ -304,7 +304,6 @@ export default {
         Promise.resolve(this.endDateError === ''),
         Promise.resolve(this.stageDateError === '')
       ])
-      console.log('Project stages published validation', validations)
       return validations.reduce((a, c) => a && c, true)
     },
     async validateDraft () {
@@ -314,7 +313,6 @@ export default {
         this.$validator.validate('end_date'),
         Promise.resolve(this.stageDateError === '')
       ])
-      console.log('Project stages draft validation', validations)
       return validations.reduce((a, c) => a && c, true)
     },
     updateStagesDraft (id, key, value) {

frontend/package.json

@@ -47,7 +47,7 @@
     "default-passive-events": "^2.0.0",
     "django-channels": "^2.1.3",
     "dotenv": "^8.2.0",
-    "element-ui": "^2.15.1",
+    "element-ui": "^2.15.13",
     "eventsource-polyfill": "^0.9.6",
     "leaflet": "1.3.4",
     "leaflet.markercluster": "^1.4.1",

frontend/yarn.lock

@@ -4717,7 +4717,12 @@ core-js-compat@^3.8.1, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
     browserslist "^4.16.3"
     semver "7.0.0"
 
-core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
+core-js@^2.4.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
+core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -5492,10 +5497,10 @@ electron-to-chromium@^1.3.649:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.665.tgz#6d0937376f6a919c0f289202c4be77790a6175e5"
   integrity sha512-LIjx1JheOz7LM8DMEQ2tPnbBzJ4nVG1MKutsbEMLnJfwfVdPIsyagqfLp56bOWhdBrYGXWHaTayYkllIU2TauA==
 
-element-ui@^2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.15.1.tgz#ada00aa6e32c02774a2e77563dd84668f813cdff"
-  integrity sha512-TqlScAKGH97XndSScUDeEHIzL1x7yg7DvQdKPEOUdiDcyIz3y3FJJBlpHYaJT96FOn1xpIcUZb+I2FJeU9EcrQ==
+element-ui@^2.15.13:
+  version "2.15.13"
+  resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.15.13.tgz#380f019ee7d15b181105587b41fd5914c308a143"
+  integrity sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==
   dependencies:
     async-validator "~1.8.1"
     babel-helper-vue-jsx-merge-props "^2.0.0"
@@ -9472,7 +9477,7 @@ normalize-url@^3.0.0, normalize-url@^3.3.0:
 normalize-wheel@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz#aec886affdb045070d856447df62ecf86146ec45"
-  integrity sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=
+  integrity sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==
 
 npm-run-path@^2.0.0:
   version "2.0.2"