filter allowed elements in dropzones

bsi-software · Nov 21, 2022 · ac84c83 · ac84c83
1 parent 3c45245
commit ac84c83
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.10.4-rc.1] - 21.11.2022
+
+### Fixed
+
+* Filter allowed elements for dropzones in respect of the elements listed in groups.
+
 ## [1.10.3] - 08.08.2022
 
 ### Fixed
@@ -463,6 +469,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 [Unreleased]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.10.3...HEAD
 
+[1.10.4-rc.1]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.10.4-rc.1...HEAD
+
 [1.10.3]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.10.2...1.10.3
 
 [1.10.2]: https://github.com/bsi-software/bsi-cx-design-build/compare/1.10.1...1.10.2

diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/dist/types.d.ts.map b/dist/types.d.ts.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bsi-cx/design-build",
-  "version": "1.10.3",
+  "version": "1.10.4-rc.1",
   "description": "A webpack config builder to create a design for BSI CX.",
   "private": false,
   "engines": {

diff --git a/src/bsi-cx-webpack-plugin.js b/src/bsi-cx-webpack-plugin.js
@@ -165,31 +165,49 @@ class _BsiCxWebpackPlugin {
    * @private
    */
   _createReplaceMap(designJsonObj) {
+    /**
+     * @type {Set<string>}
+     */
+    let knownElements = this._createSetOfKnownElements(designJsonObj);
     /**
      * @type {Map<string, function(string):string>}
      */
     let replaceMap = new Map();
 
-    this._addDropzonesToReplaceMap(designJsonObj, replaceMap);
+    this._addDropzonesToReplaceMap(designJsonObj, replaceMap, knownElements);
 
     designJsonObj[DesignJsonProperty.CONTENT_ELEMENT_GROUPS]
       ?.forEach(group => group[DesignJsonProperty.CONTENT_ELEMENTS]
-        ?.forEach(element => this._addElementToReplaceMap(element, replaceMap)));
+        ?.forEach(element => this._addElementToReplaceMap(element, replaceMap, knownElements)));
 
     let website = designJsonObj[DesignJsonProperty.WEBSITE] ?? {};
     Object.values(website[DesignJsonProperty.INCLUDES] ?? {})
-      .forEach(include => this._addDropzonesToReplaceMap(include, replaceMap));
+      .forEach(include => this._addDropzonesToReplaceMap(include, replaceMap, knownElements));
 
     return replaceMap;
   }
 
+  /**
+   * @param {{}} designJsonObj
+   * @returns {Set<string>}
+   * @private
+   */
+  _createSetOfKnownElements(designJsonObj) {
+    let knownElements = designJsonObj[DesignJsonProperty.CONTENT_ELEMENT_GROUPS]
+      ?.flatMap(group => group[DesignJsonProperty.CONTENT_ELEMENTS]
+        ?.map(element => element[DesignJsonProperty.ELEMENT_ID]));
+
+    return new Set(knownElements);
+  }
+
   /**
    * @param {{}} element
    * @param {Map<string, function(string):string>} replaceMap
+   * @param {Set<string>} knownElements
    * @private
    */
-  _addElementToReplaceMap(element, replaceMap) {
-    this._addDropzonesToReplaceMap(element, replaceMap);
+  _addElementToReplaceMap(element, replaceMap, knownElements) {
+    this._addDropzonesToReplaceMap(element, replaceMap, knownElements);
 
     element[DesignJsonProperty.PARTS]
       ?.filter(part => !!part[DesignJsonProperty.ID])
@@ -214,17 +232,18 @@ class _BsiCxWebpackPlugin {
   /**
    * @param {{}} objScope
    * @param {Map<string, function(string):string>} replaceMap
+   * @param {Set<string>} knownElements
    * @private
    */
-  _addDropzonesToReplaceMap(objScope, replaceMap) {
+  _addDropzonesToReplaceMap(objScope, replaceMap, knownElements) {
     /**
      * @type {{}[]}
      */
     let dropzones = objScope[DesignJsonPropertyExtension.DROPZONES] ?? [];
 
     dropzones.forEach(dropzone => {
       let dropzoneId = dropzone[DesignJsonPropertyExtension.DROPZONE];
-      let allowedElements = dropzone[DesignJsonPropertyExtension.ALLOWED_ELEMENTS]?.join(' ');
+      let allowedElements = dropzone[DesignJsonPropertyExtension.ALLOWED_ELEMENTS]?.filter(id => knownElements.has(id)).join(' ');
       let maxElements = dropzone[DesignJsonPropertyExtension.MAX_ALLOWED_ELEMENTS];
       let removeAllowed = dropzone[DesignJsonPropertyExtension.REMOVE_ALLOWED];
       let moveAllowed = dropzone[DesignJsonPropertyExtension.MOVE_ALLOWED];

diff --git a/test/webpack.config.js b/test/webpack.config.js
@@ -8,7 +8,7 @@ module.exports = WebpackConfigBuilder.fromConfigs(
     .withName('landingpage')
     .withVersion('1.0.0-alpha')
     .withDesignType(DesignType.WEBSITE)
-    .withTargetVersion(Version.CX_1_3)
+    .withTargetVersion(Version.CX_22_0)
     .withRootPath(path.resolve(__dirname, 'templates', 'landingpage'))
     .withPropertiesFilePath('properties.js')
     .withWebpackPlugins(new webpack.ProvidePlugin({