From 24e430c964a49974dcc0262113de49bf34de8ad7 Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Thu, 1 Feb 2024 14:26:55 +0000 Subject: [PATCH 1/6] Fix translation --- frontend/src/containers/InterfaceCreator/libraryView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/containers/InterfaceCreator/libraryView.tsx b/frontend/src/containers/InterfaceCreator/libraryView.tsx index a4aaabb3..25ff69b3 100644 --- a/frontend/src/containers/InterfaceCreator/libraryView.tsx +++ b/frontend/src/containers/InterfaceCreator/libraryView.tsx @@ -121,7 +121,7 @@ const LibraryView: FunctionComponent = ({ tooltip={t('AddFunction')} effect={PositiveColorEffect} > - {t('AddError')} + {t('Add Method')} {functions.map((fun: { id: number; name?: string }, index: number) => ( Date: Thu, 1 Feb 2024 14:27:16 +0000 Subject: [PATCH 2/6] Fix string providers from config items --- frontend/src/components/Field/connectors/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Field/connectors/index.tsx b/frontend/src/components/Field/connectors/index.tsx index a53763ee..8c6e1529 100644 --- a/frontend/src/components/Field/connectors/index.tsx +++ b/frontend/src/components/Field/connectors/index.tsx @@ -261,7 +261,7 @@ export const maybeBuildOptionProvider = (provider) => { // Get everything between the first / and { bracket const factoryName = fixedProvider.substring( fixedProvider.indexOf('/') + 1, - fixedProvider.lastIndexOf('{') + fixedProvider.firstIndexOf('{') ); // Get everything in the provider between first { and last }, which are the options const options = fixedProvider.substring( From a549522d4b2079f9cd7a6a55455e086585f44a8d Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Thu, 1 Feb 2024 14:27:25 +0000 Subject: [PATCH 3/6] Remove "Make transition" option from FSMState component --- frontend/src/containers/InterfaceCreator/fsm/state.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/frontend/src/containers/InterfaceCreator/fsm/state.tsx b/frontend/src/containers/InterfaceCreator/fsm/state.tsx index 950a5511..7e8042bf 100644 --- a/frontend/src/containers/InterfaceCreator/fsm/state.tsx +++ b/frontend/src/containers/InterfaceCreator/fsm/state.tsx @@ -686,13 +686,6 @@ const FSMState: React.FC = ({ { title: t('Actions'), }, - { - item: 'Make transition', - onClick: () => { - onDblClick(); - }, - icon: 'LinkUnlink' as IReqoreIconName, - }, { item: t('ManageTransitions'), onClick: () => { From 5ac85f0cbb9395348341b6c021bdf7baab7fccf8 Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Thu, 1 Feb 2024 15:03:16 +0000 Subject: [PATCH 4/6] Update package-lock.json and package.json Update package-lock.json and package.json to include new dependencies and fix version numbers. --- package-lock.json | 43 ++++++++++++++++++++++++++++++--------- package.json | 34 ++++++++++++++++++++++++------- src/QorusRelease.ts | 4 ++-- src/QorusRepository.ts | 14 ++++++------- src/QorusRepositoryGit.ts | 9 ++++---- 5 files changed, 74 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5fa5860..7a03bbae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "qorus-vscode", - "version": "4.3.5", + "version": "4.3.8", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@andrewhead/python-program-analysis": "^0.4.8", @@ -19,7 +19,7 @@ "compressjs": "^1.0.3", "cron-validator": "^1.0.2", "cronstrue": "^1.81.0", - "crypto-js": "^4.2.0", + "crypto-js": "^4.0.0", "epoch-timeago": "^1.1.9", "eventlistener": "0.0.1", "fs-extra": "^8.1.0", @@ -59,6 +59,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", @@ -2339,6 +2340,12 @@ "@types/node": "*" } }, + "node_modules/@types/git": { + "version": "0.0.21", + "resolved": "https://registry.npmjs.org/@types/git/-/git-0.0.21.tgz", + "integrity": "sha512-uPbvsGarU5Q7Ice9KOA+URjKLPRPmIqWX0rTzjfC2eXmp0lI7qpyDqhWncdxSRpazJeX+dGg1eBompeRAwl/+A==", + "dev": true + }, "node_modules/@types/glob": { "version": "5.0.37", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.37.tgz", @@ -3646,7 +3653,9 @@ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", "dev": true, - "engines": ["node >= 0.8.0"], + "engines": [ + "node >= 0.8.0" + ], "bin": { "ansi-html": "bin/ansi-html" } @@ -5745,7 +5754,9 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, - "engines": ["node >= 0.8"], + "engines": [ + "node >= 0.8" + ], "dependencies": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -7918,7 +7929,9 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "engines": ["node >=0.6.0"] + "engines": [ + "node >=0.6.0" + ] }, "node_modules/fast-deep-equal": { "version": "3.1.3", @@ -8429,7 +8442,9 @@ "dev": true, "hasInstallScript": true, "optional": true, - "os": ["darwin"], + "os": [ + "darwin" + ], "engines": { "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } @@ -9841,7 +9856,9 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "engines": ["node >=0.6.0"], + "engines": [ + "node >=0.6.0" + ], "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -14833,7 +14850,9 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "engines": ["node >=0.6.0"], + "engines": [ + "node >=0.6.0" + ], "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -15012,7 +15031,9 @@ "dev": true, "hasInstallScript": true, "optional": true, - "os": ["darwin"], + "os": [ + "darwin" + ], "dependencies": { "bindings": "^1.5.0", "nan": "^2.12.1" @@ -15281,7 +15302,9 @@ "dev": true, "hasInstallScript": true, "optional": true, - "os": ["darwin"], + "os": [ + "darwin" + ], "dependencies": { "bindings": "^1.5.0", "nan": "^2.12.1" diff --git a/package.json b/package.json index 3ad07a36..dcdf1108 100644 --- a/package.json +++ b/package.json @@ -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,7 +23,10 @@ "bugs": { "url": "https://github.com/qoretechnologies/qorus-vscode/issues" }, - "categories": ["Other", "Snippets"], + "categories": [ + "Other", + "Snippets" + ], "icon": "images/QorusDeveloperTools_Medium.png", "galleryBanner": { "color": "#333333", @@ -29,18 +34,32 @@ }, "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 index 1ab23903..286634eb 100644 --- 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 index 1ba051f2..44ef7c54 100644 --- 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; - currentBranch(): QorusRepositoryCurrentBranch; - commits(hash_filter: string, branch_filter: string, tag_filter: string): string[]; - changedFiles(commit: string, folder: string, source_dirs: string[]): Promise; + init(folder: string): Thenable; + currentBranch(): QorusRepositoryCurrentBranch; + commits(hash_filter: string, branch_filter: string, tag_filter: string): Promise; + changedFiles(commit: string, folder: string, source_dirs: string[]): Promise; } diff --git a/src/QorusRepositoryGit.ts b/src/QorusRepositoryGit.ts index eda3dfc5..5584cd4c 100644 --- a/src/QorusRepositoryGit.ts +++ b/src/QorusRepositoryGit.ts @@ -2,7 +2,6 @@ import { t } from 'ttag'; import { extensions } from 'vscode'; import { API, Branch, GitExtension, Ref, Repository } from './@types/git'; import { QorusRepository, QorusRepositoryCurrentBranch } from './QorusRepository'; -import * as msg from './qorus_message'; export class QorusRepositoryGit implements QorusRepository { private git: API | undefined = undefined; @@ -22,7 +21,7 @@ export class QorusRepositoryGit implements QorusRepository { return Promise.reject(t`ErrorInInitializingGitExtension`); } for (const i in this.git.repositories) { - const repo: Repository = this.git.repositories[i]; + const repo = this.git.repositories[i]; if (folder.indexOf(repo.rootUri.fsPath) == 0) { this.repository = repo; return Promise.resolve(); @@ -55,14 +54,16 @@ export class QorusRepositoryGit implements QorusRepository { }; } - commits(hash_filter = '', branch_filter = '', tag_filter = ''): string[] { + async commits(hash_filter = '', branch_filter = '', tag_filter = ''): Promise { // issue #1118: work without a git repository if (typeof this.repository == 'undefined') { return []; } + const refs = await this.repository.getRefs?.(); + console.log('REFS', refs); const current_commit = this.currentBranch().commit; - const commits = this.repository.state.refs.reduce((accumulator, ref: Ref) => { + const commits = refs.reduce((accumulator, ref: Ref) => { if (ref.commit.indexOf(hash_filter) != 0 || ref.commit == current_commit) { return accumulator; } From c15db1386bd960967e590cf19063340fb745179d Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Fri, 2 Feb 2024 09:30:35 +0000 Subject: [PATCH 5/6] Add custom color customizations and fix provider issue --- .vscode/settings.json | 21 ++++++++++++++++++- .../src/components/Field/connectors/index.tsx | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 559e4232..6e2e40d0 100644 --- 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/frontend/src/components/Field/connectors/index.tsx b/frontend/src/components/Field/connectors/index.tsx index 8c6e1529..0b8bbc0d 100644 --- 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.firstIndexOf('{') + fixedProvider.indexOf('{') ); // Get everything in the provider between first { and last }, which are the options const options = fixedProvider.substring( From d3e5e36c3ff0bab78d1fae0f808e701cfa376a1f Mon Sep 17 00:00:00 2001 From: Foxhoundn Date: Fri, 2 Feb 2024 09:47:45 +0000 Subject: [PATCH 6/6] Update changelog and package versions --- CHANGELOG.md | 7 +++++++ README.md | 12 ++++++++++-- frontend/package.json | 34 ++++++++++++++++++++++++++-------- package.json | 2 +- 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8653b35c..8a91063f 100644 --- 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 index 258f62e8..4b3e27fe 100644 --- 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 index 86ed80ed..91898abd 100644 --- 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,10 +128,17 @@ "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", @@ -139,10 +146,19 @@ ] }, "jest": { - "roots": ["/__tests__"], - "collectCoverageFrom": ["src/**/*.{js,jsx,ts,tsx}", "!src/**/*.d.ts"], - "setupFiles": ["react-app-polyfill/jsdom"], - "setupFilesAfterEnv": ["/__tests__/setup.js"], + "roots": [ + "/__tests__" + ], + "collectCoverageFrom": [ + "src/**/*.{js,jsx,ts,tsx}", + "!src/**/*.d.ts" + ], + "setupFiles": [ + "react-app-polyfill/jsdom" + ], + "setupFilesAfterEnv": [ + "/__tests__/setup.js" + ], "testMatch": [ "/__tests__/**/*.{spec,test}.{js,jsx,ts,tsx}", "/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/package.json b/package.json index dcdf1108..7796df84 100644 --- 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",