Bugfix/tags remember choices on edit idea (#389)

* added forgotten groupedTags from cache

* Clean up test code

* Added fallback when choosing static form with dynamic fields

packages/cms/lib/modules/openstad-pages/lib/load-tags.js

@@ -31,6 +31,8 @@ module.exports =  function (req, res, next) {
 
     if (Array.isArray(tags)) {
       req.data.openstadTags = tags;
+      req.data.groupedOpenstadTags = _.groupBy(tags, function(tag){return tag.type});
+
       next();
     } else if(retrievedEmpty) {
       req.data.openstadTags = [];

packages/cms/lib/modules/resource-form-widgets/index.js

@@ -185,6 +185,12 @@ module.exports = {
         const isReactedTo = activeResource ? (activeResource.yes > 0 || activeResource.no > 0 || activeResource.argumentCount > 0) : false;
         const isOwnerOrAdmin = ((!isReactedTo || !widget.hideAdminAfterPublicAction) && isOwner) || req.data.hasModeratorRights;
 
+
+        widget.isTagSelected = function(tagId) {
+          if(!activeResource || !Array.isArray(activeResource.tags)) return false;
+          return activeResource.tags.findIndex(t => t.id === tagId) !== -1;
+        }
+
         widget.mapConfig = self.getMapConfigBuilder(globalData)
           .setDefaultSettings({
             mapCenterLat: (activeResource && activeResource.location && activeResource.location.coordinates && activeResource.location.coordinates[0]) || globalData.mapCenterLat,

packages/cms/lib/modules/resource-form-widgets/public/js/main.js

@@ -188,7 +188,6 @@ $(document).ready(function () {
 
         $(form).find('input[type="submit"]').each(function(index, button) {
           oldButtonValues.push($(this).val());
-
           if(button.id === "btnSaveAsConcept" && publishField.val()) {
             $(this).val('Verzenden...');
           } else if(!publishField.val()) {
@@ -206,6 +205,12 @@ $(document).ready(function () {
           success:function(response) {
               formHasChanged = false;
               var redirect = $(form).find('.form-redirect-uri').val();
+
+              // for some reason when you select the dynamic form then the input field with class .form-redirect-uri is not within the form
+              if(!redirect) {
+                redirect = document.querySelector('.form-redirect-uri').value;
+              }
+
               redirect = redirect.replace(':id', response.id);
               redirect = window.siteUrl + redirect;
 

packages/cms/lib/modules/resource-form-widgets/views/includes/fields/tags.html

@@ -18,8 +18,8 @@
     {% endfor %}
   {% endif %}
   </div>
-
-
+  
+  
   {% if field.tagType === '' or field.tagType === undefined %}
   {% for key, tagList in data.groupedOpenstadTags %}
     {% set outer_loop = loop %}
@@ -42,7 +42,7 @@
           value="{{tag.id}}"
           id="checkbox-{{outer_loop.index}}-{{loop.index}}-{{tag.id}}"
           {% if field.fieldRequired %}required{% endif %}
-          {% if field.idea.tags %}checked{% endif %}
+          {% if data.widget.isTagSelected(tag.id) %}checked{% endif %}
         />
         <label for="checkbox-{{outer_loop.index}}-{{loop.index}}-{{tag.id}}" class="checkbox-label">{{tag.name}}</label>
       </div>