ENG-1680 reverting widget codes

entando · Dec 23, 2020 · 617672c · 617672c
1 parent eb10ae0
commit 617672c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/env-bundler.js b/lib/env-bundler.js
@@ -292,10 +292,7 @@ const componentResponseProcessor = {
     }));
 
     const schema = {
-      code: [{
-        key: 'code',
-        transform: function(code) { return code.trim().toLowerCase().replace(new RegExp('[\\s\\-_]+', 'g'), '_') }
-      }],
+      'code': 'code',
       'titles': 'titles',
       'group': 'group',
       'customUi': 'customUi',
@@ -746,6 +743,10 @@ function canonizeCode (code) {
   return code.trim().toLowerCase().replace(new RegExp(' ', 'g'), '-').replace(new RegExp('-+', 'g'), '-');
 }
 
+function canonizeCodeUnderline (code) {
+  return code.trim().toLowerCase().replace(new RegExp('[\\s\\-_]+', 'g'), '_');
+}
+
 const urlEncoder = function (payload) {
   return Object.keys(payload)
     .map((k) => `${k}=${payload[k]}`)
@@ -961,8 +962,8 @@ async function generateBundle (options, components) {
 }
 
 async function filterWidgetFragments(components) {
-  const widgets = components['widget'];
-  components['fragment'] = components['fragment'].filter(f => !widgets.includes(f));
+  const widgets = components['widget'].map(w => canonizeCodeUnderline(w));
+  components['fragment'] = components['fragment'].filter(f => !widgets.includes(canonizeCodeUnderline(f)));
   return components;
 }