Merge pull request #1220 from qoretechnologies/develop

v4.3.2

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 4.3.2
+
+#### Bug fixes
+
+- Fixed a bug where duplicated config items would be shown in the WebView & saved in YAML
+
 ## Version 4.3.1
 
 #### Bug fixes

README.md

@@ -10,6 +10,12 @@ Qorus developer tools for the [Qorus Integration Engine](https://qoretechnologie
 This extension makes it possible to easily create, deploy, and test Qorus interfaces directly from the Visual Studio Code editor.
 It is a perfect tool for creating no-code solutions for the Qorus Integration Engine. The Qorus Developer Tools extension enables creating, editing, and extending reusable IT and AI building blocks for advanced automation challenges.
 
+## Version 4.3.2
+
+#### Bug fixes
+
+- Fixed a bug where duplicated config items would be shown in the WebView & saved in YAML
+
 ## Version 4.3.1
 
 #### Bug fixes

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "private": false,
   "dependencies": {
     "@andrewhead/python-program-analysis": "^0.4.8",

package.json

@@ -2,7 +2,7 @@
   "name": "qorus-vscode",
   "displayName": "Qorus Developer Tools",
   "description": "Qorus Integration Engine developer tools",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "publisher": "qoretechnologies",
   "author": {
     "name": "Qore Technologies",

src/QorusProjectInterfaceInfo.ts

@@ -860,6 +860,18 @@ export class QorusProjectInterfaceInfo {
     this.code_info.waitForPending(['yaml'], 500).then(() => this.getConfigItemsImpl(params));
   };
 
+  public static removeDuplicateConfigItems(items) {
+    return items.reduce((newItems, item) => {
+      const itemIndex = newItems.findIndex((existingItem) => existingItem.name === item.name);
+
+      if (itemIndex === -1) {
+        return [...newItems, item];
+      } else {
+        return newItems;
+      }
+    }, []);
+  }
+
   private getConfigItemsImpl = ({
     'base-class-name': base_class_name,
     classes,
@@ -1110,9 +1122,15 @@ export class QorusProjectInterfaceInfo {
         )
     );
 
+    // #issue #1218
+    // remove config items with the same name
+    local_items = QorusProjectInterfaceInfo.removeDuplicateConfigItems(local_items);
+    global_items = QorusProjectInterfaceInfo.removeDuplicateConfigItems(global_items);
+
     let message: any;
     if (iface_kind === 'workflow') {
-      const workflow_items = local_items.map((item) => checkValueLevel({ ...item }, 'workflow'));
+      let workflow_items = local_items.map((item) => checkValueLevel({ ...item }, 'workflow'));
+      workflow_items = QorusProjectInterfaceInfo.removeDuplicateConfigItems(workflow_items);
 
       message = {
         action: 'return-config-items',

src/interface_creator/InterfaceCreator.ts

@@ -6,6 +6,7 @@ import { t } from 'ttag';
 import { Position } from 'vscode';
 import { projects } from '../QorusProject';
 import { QorusProjectCodeInfo } from '../QorusProjectCodeInfo';
+import { QorusProjectInterfaceInfo } from '../QorusProjectInterfaceInfo';
 import { qorus_webview } from '../QorusWebview';
 import * as globals from '../global_config_item_values';
 import { isLangClientAvailable } from '../qore_vscode';
@@ -615,7 +616,7 @@ export abstract class InterfaceCreator {
   ): string => {
     let result: string = `${indent.repeat(indent_level)}config-items:\n`;
 
-    items = items.filter(
+    items = [...items].filter(
       (item) =>
         !item.parent ||
         InterfaceCreator.checkParentConfigItem(
@@ -626,6 +627,9 @@ export abstract class InterfaceCreator {
         )
     );
 
+    // Issue #1218: remove duplicate config items
+    items = QorusProjectInterfaceInfo.removeDuplicateConfigItems(items);
+
     for (const item of [...items]) {
       result += `${indent.repeat(indent_level)}${list_indent}name: ${item.name}\n`;