Merge pull request #1252 from qoretechnologies/develop

v4.3.9
qoretechnologies · Feb 2, 2024 · 889ec35 · 889ec35
2 parents b1b8014 + 97dd64a
commit 889ec35
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 52 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,5 +12,24 @@
   "docwriter.progress.trackTypes": true,
   "docwriter.hotkey.mac": "⌥ + .",
   "peacock.remoteColor": "#0b2016",
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "workbench.colorCustomizations": {
+    "activityBar.activeBackground": "#184630",
+    "activityBar.background": "#184630",
+    "activityBar.foreground": "#e7e7e7",
+    "activityBar.inactiveForeground": "#e7e7e799",
+    "activityBarBadge.background": "#9259c6",
+    "activityBarBadge.foreground": "#e7e7e7",
+    "commandCenter.border": "#e7e7e799",
+    "sash.hoverBorder": "#184630",
+    "statusBar.background": "#0b2016",
+    "statusBar.foreground": "#e7e7e7",
+    "statusBarItem.hoverBackground": "#184630",
+    "statusBarItem.remoteBackground": "#0b2016",
+    "statusBarItem.remoteForeground": "#e7e7e7",
+    "titleBar.activeBackground": "#0b2016",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveBackground": "#0b201699",
+    "titleBar.inactiveForeground": "#e7e7e799"
+  }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 4.3.9
+
+- Fixed a bug where a config item with a data provider value that contained a { character could not be read properly
+- Fixed a bug where git branches were not loaded properly in the Releases view beacuse of Microsoft API changes
+- Changed the `Add Error` button to properly display `Add Method` in the Mapper Code methods manager
+- Removed `Make Transition` option from FSMs context menu - please use the double click functionality to create transitions between states
+
 ## Version 4.3.6
 
 - Qorus Developer Tools is now available on Open VSX extension market https://open-vsx.org/extension/qoretechnologies/qorus-vscode

diff --git a/README.md b/README.md
@@ -8,9 +8,17 @@
 
 Qorus developer tools for the [Qorus Integration Engine](https://qoretechnologies.com/qorus_integration_engine/).
 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.
+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.6
+## Version 4.3.9
+
+- Fixed a bug where a config item with a data provider value that contained a { character could not be read properly
+- Fixed a bug where git branches were not loaded properly in the Releases view beacuse of Microsoft API changes
+- Changed the `Add Error` button to properly display `Add Method` in the Mapper Code methods manager
+- Removed `Make Transition` option from FSMs context menu - please use the double click functionality to create transitions between states
+
+## Version 4.3.8
 
 - Qorus Developer Tools is now available on Open VSX extension market https://open-vsx.org/extension/qoretechnologies/qorus-vscode
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "4.3.8",
+  "version": "4.3.9",
   "private": false,
   "dependencies": {
     "@andrewhead/python-program-analysis": "^0.4.8",
@@ -128,21 +128,37 @@
     "install-playwright": "npx playwright install --with-deps"
   },
   "eslintConfig": {
-    "extends": ["react-app", "react-app/jest"]
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
   },
   "browserslist": {
-    "production": [">0.2%", "not dead", "not op_mini all"],
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
     "development": [
       "last 1 chrome version",
       "last 1 firefox version",
       "last 1 safari version"
     ]
   },
   "jest": {
-    "roots": ["<rootDir>/__tests__"],
-    "collectCoverageFrom": ["src/**/*.{js,jsx,ts,tsx}", "!src/**/*.d.ts"],
-    "setupFiles": ["react-app-polyfill/jsdom"],
-    "setupFilesAfterEnv": ["<rootDir>/__tests__/setup.js"],
+    "roots": [
+      "<rootDir>/__tests__"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx,ts,tsx}",
+      "!src/**/*.d.ts"
+    ],
+    "setupFiles": [
+      "react-app-polyfill/jsdom"
+    ],
+    "setupFilesAfterEnv": [
+      "<rootDir>/__tests__/setup.js"
+    ],
     "testMatch": [
       "<rootDir>/__tests__/**/*.{spec,test}.{js,jsx,ts,tsx}",
       "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
@@ -187,7 +203,9 @@
     "testTimeout": 60000
   },
   "babel": {
-    "presets": ["react-app"]
+    "presets": [
+      "react-app"
+    ]
   },
   "devDependencies": {
     "@storybook/addon-actions": "^7.0.0-beta.59",

diff --git a/frontend/src/components/Field/connectors/index.tsx b/frontend/src/components/Field/connectors/index.tsx
@@ -255,13 +255,13 @@ export const maybeBuildOptionProvider = (provider) => {
     // Get everything between the < and >
     //const factory = provider.substring(provider.indexOf('<') + 1, provider.indexOf('>'));
     // Add / to the provider at the end if it doesn't already have it
-    const fixedProvider = provider.endsWith('/') ? provider : `${provider}/`;
+    const fixedProvider: string = provider.endsWith('/') ? provider : `${provider}/`;
     // Get the factory name
     const [factoryType]: string[] = fixedProvider.split('/');
     // Get everything between the first / and { bracket
     const factoryName = fixedProvider.substring(
       fixedProvider.indexOf('/') + 1,
-      fixedProvider.lastIndexOf('{')
+      fixedProvider.indexOf('{')
     );
     // Get everything in the provider between first { and last }, which are the options
     const options = fixedProvider.substring(

diff --git a/frontend/src/containers/InterfaceCreator/fsm/state.tsx b/frontend/src/containers/InterfaceCreator/fsm/state.tsx
@@ -686,13 +686,6 @@ const FSMState: React.FC<IFSMStateProps> = ({
             {
               title: t('Actions'),
             },
-            {
-              item: 'Make transition',
-              onClick: () => {
-                onDblClick();
-              },
-              icon: 'LinkUnlink' as IReqoreIconName,
-            },
             {
               item: t('ManageTransitions'),
               onClick: () => {

diff --git a/frontend/src/containers/InterfaceCreator/libraryView.tsx b/frontend/src/containers/InterfaceCreator/libraryView.tsx
@@ -121,7 +121,7 @@ const LibraryView: FunctionComponent<ILibraryView> = ({
                 tooltip={t('AddFunction')}
                 effect={PositiveColorEffect}
               >
-                {t('AddError')}
+                {t('Add Method')}
               </ReqoreMenuItem>
               {functions.map((fun: { id: number; name?: string }, index: number) => (
                 <MethodSelector

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "qorus-vscode",
   "displayName": "Qorus Developer Tools",
   "description": "Qorus Integration Engine developer tools",
-  "version": "4.3.8",
+  "version": "4.3.9",
   "publisher": "qoretechnologies",
   "author": {
     "name": "Qore Technologies",
@@ -11,7 +11,9 @@
   "engines": {
     "vscode": "^1.47.0"
   },
-  "extensionDependencies": ["qoretechnologies.qore-vscode"],
+  "extensionDependencies": [
+    "qoretechnologies.qore-vscode"
+  ],
   "license": "SEE LICENSE IN LICENSE.txt",
   "homepage": "https://github.com/qoretechnologies/qorus-vscode",
   "repository": {
@@ -21,26 +23,43 @@
   "bugs": {
     "url": "https://github.com/qoretechnologies/qorus-vscode/issues"
   },
-  "categories": ["Other", "Snippets"],
+  "categories": [
+    "Other",
+    "Snippets"
+  ],
   "icon": "images/QorusDeveloperTools_Medium.png",
   "galleryBanner": {
     "color": "#333333",
     "theme": "dark"
   },
   "quokka": {
     "babel": {
-      "presets": ["env"]
+      "presets": [
+        "env"
+      ]
     }
   },
-  "keywords": ["qore", "qorus", "ide", "integration", "engine"],
-  "activationEvents": ["onStartupFinished"],
+  "keywords": [
+    "qore",
+    "qorus",
+    "ide",
+    "integration",
+    "engine"
+  ],
+  "activationEvents": [
+    "onStartupFinished"
+  ],
   "main": "out/extension.js",
   "contributes": {
     "languages": [
       {
         "id": "qmapper",
-        "aliases": ["Qorus Mapper"],
-        "extensions": [".qmapper"],
+        "aliases": [
+          "Qorus Mapper"
+        ],
+        "extensions": [
+          ".qmapper"
+        ],
         "configuration": "./syntaxes/qmapper.configuration.json"
       }
     ],
@@ -1655,6 +1674,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/preset-typescript": "^7.6.0",
     "@types/fs-extra": "^9.0.13",
+    "@types/git": "^0.0.21",
     "@types/glob": "^5.0.35",
     "@types/mocha": "^2.2.43",
     "@types/node": "^10.16.0",

diff --git a/src/QorusRelease.ts b/src/QorusRelease.ts
@@ -290,10 +290,10 @@ class QorusRelease {
     }
   }
 
-  getCommits(filters: any) {
+  async getCommits(filters: any) {
     qorus_webview.postMessage({
       action: 'release-return-commits',
-      commits: this.repository.commits(filters.hash, filters.branch, filters.tag),
+      commits: await this.repository.commits(filters.hash, filters.branch, filters.tag),
     });
   }
 

diff --git a/src/QorusRepository.ts b/src/QorusRepository.ts
@@ -1,12 +1,12 @@
 export interface QorusRepositoryCurrentBranch {
-    name: string;
-    commit: string;
-    up_to_date: boolean;
+  name: string;
+  commit: string;
+  up_to_date: boolean;
 }
 
 export interface QorusRepository {
-    init(folder: string): Thenable<void>;
-    currentBranch(): QorusRepositoryCurrentBranch;
-    commits(hash_filter: string, branch_filter: string, tag_filter: string): string[];
-    changedFiles(commit: string, folder: string, source_dirs: string[]): Promise<string[]>;
+  init(folder: string): Thenable<void>;
+  currentBranch(): QorusRepositoryCurrentBranch;
+  commits(hash_filter: string, branch_filter: string, tag_filter: string): Promise<string[]>;
+  changedFiles(commit: string, folder: string, source_dirs: string[]): Promise<string[]>;
 }