Merge pull request #47 from mountaindude/main

0.1.1
ptarmiganlabs · Sep 9, 2023 · b1f8665 · b1f8665
2 parents c2eeb9a + 34703a8
commit b1f8665
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,27 +2,24 @@
 
 ## [0.1.0](https://github.com/ptarmiganlabs/ctrl-q-nr/compare/v0.0.6...v0.1.0) (2023-09-07)
 
-
 ### ⚠ BREAKING CHANGES
 
-* Updated README and prettified example files
+-   Updated README and prettified example files
 
 ### Features
 
-* Add support for comments in cloud app ID definition editor ([e56f389](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/e56f389acef3cf0d4065cb7de4a54485b465e526)), closes [#38](https://github.com/ptarmiganlabs/ctrl-q-nr/issues/38)
-
+-   Add support for comments in cloud app ID definition editor ([e56f389](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/e56f389acef3cf0d4065cb7de4a54485b465e526)), closes [#38](https://github.com/ptarmiganlabs/ctrl-q-nr/issues/38)
 
 ### Miscellaneous
 
-* Make breaking changes pre 1.0.0 result in minor updates ([4721bd4](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/4721bd4d34288e690de1fa3d0656ef71b00bbc2b))
-
+-   Make breaking changes pre 1.0.0 result in minor updates ([4721bd4](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/4721bd4d34288e690de1fa3d0656ef71b00bbc2b))
 
 ### Documentation
 
-* Add missing output property for cloud app reload node ([986f235](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/986f2357e3d5fe53eea2d037e8645bd44c235240))
-* Add more examples of using cloud nodes ([ba7d54c](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/ba7d54cd8e97abb45fe2f598337e42910b79ccf1))
-* Added numerous examples for both Cloud and QSEoW. ([ef7209e](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/ef7209e68bb5170201c136c6cd1aa8ed47976a02))
-* Updated README and prettified example files ([ba8ccbb](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/ba8ccbb74f26e2cfc6611af9b12f352a4ee2bf4a))
+-   Add missing output property for cloud app reload node ([986f235](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/986f2357e3d5fe53eea2d037e8645bd44c235240))
+-   Add more examples of using cloud nodes ([ba7d54c](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/ba7d54cd8e97abb45fe2f598337e42910b79ccf1))
+-   Added numerous examples for both Cloud and QSEoW. ([ef7209e](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/ef7209e68bb5170201c136c6cd1aa8ed47976a02))
+-   Updated README and prettified example files ([ba8ccbb](https://github.com/ptarmiganlabs/ctrl-q-nr/commit/ba8ccbb74f26e2cfc6611af9b12f352a4ee2bf4a))
 
 ## [0.0.6](https://github.com/ptarmiganlabs/ctrl-q-nr/compare/v0.0.5...v0.0.6) (2023-09-06)
 

diff --git a/src/config/qscloud-tenant-config-nr.html b/src/config/qscloud-tenant-config-nr.html
@@ -6,7 +6,7 @@
             name: { value: '' },
             tenant: { value: '', required: true },
             region: { value: 'eu', required: true, options: ['eu', 'us'] },
-            authType: { value: 'oauth-m2m', required: true, options: ['oauth2-m2m', 'apikey'] },
+            authType: { value: 'apikey', required: true, options: ['oauth2-m2m', 'apikey'] },
             clientId: { value: '', required: false },
             clientSecret: { value: '', required: false },
             apiKey: { value: '', required: false },
@@ -65,7 +65,6 @@
         <select id="node-config-input-authType">
             <option value="oauth2-m2m">OAuth2 m2m</option>
             <option value="apikey">API key</option>
-
         </select>
     </div>
     <div class="form-row">

diff --git a/src/lib/cloud/appconfig.js b/src/lib/cloud/appconfig.js
@@ -38,7 +38,7 @@ function getCandidateApps(node, msg, done) {
 
         // Use the apps in the node configuration
         // Break the \n separated list of apps into an array
-        appIdsPredefined = node.appId.split('\n');
+        appIdsPredefined = node.appId.split(/\r?\n/);
 
         // Remove any empty elements from the arrayy
         appIdsPredefined = appIdsPredefined.filter((el) => el !== '');

diff --git a/src/lib/qseow/appconfig.js b/src/lib/qseow/appconfig.js
@@ -36,7 +36,7 @@ function getCandidateAppsPredefAndIncoming(node, done, msg) {
     } else if (node.appSource1 === 'predefined') {
         // Use the app Ids in the node configuration
         // Break the \n separated list of app ids into an array
-        let appIdsPredefined = node.appId.split('\n');
+        let appIdsPredefined = node.appId.split(/\r?\n/);
 
         // Remove any empty elements from the arrayy
         appIdsPredefined = appIdsPredefined.filter((el) => el !== '');

diff --git a/src/lib/qseow/tagconfig.js b/src/lib/qseow/tagconfig.js
@@ -7,7 +7,7 @@ function getCandidateTags(node, done, msg) {
     if (node.tagSource === 'predefined') {
         // Use the tags in the node configuration
         // Break the \n separated list of tags into an array
-        let tagsPredefined = node.tagName.split('\n');
+        let tagsPredefined = node.tagName.split(/\r?\n/);
 
         // Remove any empty elements from the arrayy
         tagsPredefined = tagsPredefined.filter((el) => el !== '');

diff --git a/src/lib/qseow/taskconfig.js b/src/lib/qseow/taskconfig.js
@@ -9,7 +9,7 @@ function getCandidateTasks(node, done, msg) {
 
         // Use the tasks in the node configuration
         // Break the \n separated list of tasks into an array
-        taskIdsPredefined = node.taskId.split('\n');
+        taskIdsPredefined = node.taskId.split(/\r?\n/);
 
         // Remove any empty elements from the arrayy
         taskIdsPredefined = taskIdsPredefined.filter((el) => el !== '');