feat: add WaveComponent (#220)

scolladon · Dec 16, 2021 · bcacdaa · bcacdaa
1 parent 8379424
commit bcacdaa
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 15 deletions.
diff --git a/__tests__/unit/lib/service/waveHandler.test.js b/__tests__/unit/lib/service/waveHandler.test.js
@@ -5,12 +5,30 @@ jest.mock('fs')
 const testContext = {
   handler: WaveHandler,
   testData: [
+    [
+      'discovery',
+      'force-app/main/default/discovery/DiscoveryAIModelTest.model',
+      new Set(['DiscoveryAIModelTest']),
+      'DiscoveryAIModel',
+    ],
+    [
+      'discovery',
+      'force-app/main/default/discovery/DiscoveryGoalTest.goal',
+      new Set(['DiscoveryGoalTest']),
+      'DiscoveryGoal',
+    ],
     [
       'wave',
       'force-app/main/default/wave/WaveApplicationTest.wapp',
       new Set(['WaveApplicationTest']),
       'WaveApplication',
     ],
+    [
+      'wave',
+      'force-app/main/default/wave/WaveComponentTest.wcomp',
+      new Set(['WaveComponentTest']),
+      'WaveComponent',
+    ],
     [
       'wave',
       'force-app/main/default/wave/WaveDataflowTest.wdf',
@@ -47,12 +65,30 @@ const testContext = {
       new Set(['WaveXmdTest']),
       'WaveXmd',
     ],
+    [
+      'discovery',
+      'force-app/main/default/discovery/Test/DiscoveryAIModelTest.model',
+      new Set(['DiscoveryAIModelTest']),
+      'DiscoveryAIModel',
+    ],
+    [
+      'discovery',
+      'force-app/main/default/discovery/Test/DiscoveryGoalTest.goal',
+      new Set(['DiscoveryGoalTest']),
+      'DiscoveryGoal',
+    ],
     [
       'wave',
       'force-app/main/default/wave/Test/WaveApplicationTest.wapp',
       new Set(['WaveApplicationTest']),
       'WaveApplication',
     ],
+    [
+      'wave',
+      'force-app/main/default/wave/Test/WaveComponentTest.wcomp',
+      new Set(['WaveComponentTest']),
+      'WaveComponent',
+    ],
     [
       'wave',
       'force-app/main/default/wave/Test/WaveDataflowTest.wdf',
@@ -97,7 +133,10 @@ const testContext = {
 }
 
 require('fs').__setMockFiles({
+  'force-app/main/default/discovery/DiscoveryAIModelTest.model': 'test',
+  'force-app/main/default/discovery/DiscoveryGoalTest.goal': 'test',
   'force-app/main/default/wave/WaveApplicationTest.wapp': 'test',
+  'force-app/main/default/wave/WaveComponentTest.wcomp': 'test',
   'force-app/main/default/wave/WaveDataflowTest.wdf': 'test',
   'force-app/main/default/wave/WaveDashboardTest.wdash': 'test',
   'force-app/main/default/wave/WaveDatasetTest.wds': 'test',

diff --git a/src/metadata/a48.json b/src/metadata/a48.json
@@ -1164,6 +1164,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -1173,6 +1188,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/metadata/v46.json b/src/metadata/v46.json
@@ -917,6 +917,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -926,6 +941,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/metadata/v47.json b/src/metadata/v47.json
@@ -1143,6 +1143,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -1152,6 +1167,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/metadata/v49.json b/src/metadata/v49.json
@@ -1157,6 +1157,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -1166,6 +1181,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/metadata/v50.json b/src/metadata/v50.json
@@ -1157,6 +1157,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -1166,6 +1181,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/metadata/v51.json b/src/metadata/v51.json
@@ -1163,6 +1163,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -1172,6 +1187,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/metadata/v52.json b/src/metadata/v52.json
@@ -1163,6 +1163,21 @@
     "suffix": "mlDomain",
     "xmlName": "MlDomain"
   },
+  {
+    "directoryName": "discovery",
+    "inFolder": false,
+    "metaFile": true,
+    "content": [
+      {
+        "suffix": "model",
+        "xmlName": "DiscoveryAIModel"
+      },
+      {
+        "suffix": "goal",
+        "xmlName": "DiscoveryGoal"
+      }
+    ]
+  },
   {
     "directoryName": "wave",
     "inFolder": false,
@@ -1172,6 +1187,10 @@
         "suffix": "wapp",
         "xmlName": "WaveApplication"
       },
+      {
+        "suffix": "wcomp",
+        "xmlName": "WaveComponent"
+      },
       {
         "suffix": "wdf",
         "xmlName": "WaveDataflow"

diff --git a/src/service/typeHandlerFactory.js b/src/service/typeHandlerFactory.js
@@ -16,6 +16,7 @@ const classes = {
   businessProcesses: SubCustomObject,
   compactLayouts: SubCustomObject,
   dashboards: InFolder,
+  discovery: Wave,
   documents: InFolder,
   email: InFolder,
   experiences: InResource,

diff --git a/src/service/waveHandler.js b/src/service/waveHandler.js
@@ -4,20 +4,14 @@ const path = require('path')
 
 const WAVE_SUBTYPE = {}
 
-const isEmpty = obj => {
-  for (let i in obj) return false
-  return true
-}
-
 class WaveHandler extends StandardHandler {
   constructor(line, type, work, metadata) {
     super(line, type, work, metadata)
-    if (isEmpty(WAVE_SUBTYPE)) {
-      StandardHandler.metadata[this.type].content.reduce((acc, val) => {
-        acc[val.suffix] = val.xmlName
-        return acc
-      }, WAVE_SUBTYPE)
-    }
+
+    StandardHandler.metadata[this.type].content.reduce((acc, val) => {
+      acc[val.suffix] = val.xmlName
+      return acc
+    }, WAVE_SUBTYPE)
     this.ext = path.parse(this.line).ext.substring(1)
     this.suffixRegex = new RegExp(`\\.${this.ext}$`)
   }

diff --git a/src/utils/metadataConstants.js b/src/utils/metadataConstants.js
@@ -8,7 +8,6 @@ const LABEL_EXTENSION = 'labels'
 const LABEL_DIRECTORY_NAME = `labels.${LABEL_EXTENSION}`
 const OBJECT_TRANSLATION_META_XML_SUFFIX = `objectTranslation${METAFILE_SUFFIX}`
 const INFOLDER_SUFFIX = `Folder`
-const WAVE_SUB_TYPES_PREFIX = 'Wave'
 module.exports.METAFILE_SUFFIX = METAFILE_SUFFIX
 module.exports.META_REGEX = META_REGEX
 module.exports.OBJECT_META_XML_SUFFIX = OBJECT_META_XML_SUFFIX
@@ -19,4 +18,3 @@ module.exports.LABEL_DIRECTORY_NAME = LABEL_DIRECTORY_NAME
 module.exports.INFOLDER_SUFFIX = INFOLDER_SUFFIX
 module.exports.OBJECT_TRANSLATION_META_XML_SUFFIX =
   OBJECT_TRANSLATION_META_XML_SUFFIX
-module.exports.WAVE_SUB_TYPES_PREFIX = WAVE_SUB_TYPES_PREFIX
diff --git a/src/utils/packageConstructor.js b/src/utils/packageConstructor.js
@@ -1,12 +1,16 @@
 'use strict'
 const xmlbuilder = require('xmlbuilder')
 const xmlConf = { indent: '    ', newline: '\n', pretty: true }
-const mc = require('./metadataConstants')
 
 module.exports = class PackageConstructor {
   constructor(config, metadata) {
     this.config = config
     this.metadata = metadata
+    this.looseMetadata = Object.keys(this.metadata)
+      .filter(type => this.metadata[type].content)
+      .flatMap(type =>
+        this.metadata[type].content.map(content => content.xmlName)
+      )
   }
 
   constructPackage(strucDiffPerType) {
@@ -20,7 +24,7 @@ module.exports = class PackageConstructor {
       .filter(
         type =>
           Object.prototype.hasOwnProperty.call(this.metadata, type) ||
-          type.startsWith(mc.WAVE_SUB_TYPES_PREFIX)
+          this.looseMetadata.includes(type)
       )
       .sort()
       // @deprecated To remove when the order will not impact the result of the deployment