You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by zh...@apache.org on 2022/07/18 02:46:43 UTC
[incubator-devlake] branch main updated: feat: setup create blueprint ux workflow (#2026)
This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 7a4ac0ee feat: setup create blueprint ux workflow (#2026)
7a4ac0ee is described below
commit 7a4ac0eec917fa62348f841f1539ccee6ac1cf3c
Author: Julien Chinapen <ju...@merico.dev>
AuthorDate: Sun Jul 17 22:46:37 2022 -0400
feat: setup create blueprint ux workflow (#2026)
* feat: setup create blueprint ux workflow
* fix: extract connection list tabs component
* fix: add provider icon to connection list items
* fix: set data entities dynamically per connection
* fix: set projects dynamically per connection
* fix: update blueprint tasks config and null state
* fix: add data entities to task scope configuration
* fix: create data scope configuration by provider
* fix: add data source connection manager dialog
* fix: add mode setting to manage connection dialog
* fix: create projects stacked list selector
* fix: update connection dialog parameters
* fix: use real connections list from all providers
* fix: active and disabled state props on conn item
* refactor: convert stacked list to standard comp
* fix: build transformation entries for settings
* fix: extract data vars and no-data component
* fix: add additional fields to pipeline validation
* fix: update connection dialog workflow
* fix: enable testing on connection dialog
* fix: restore conflicted changes with hooks
* refactor: extract worfklow steps as components
* fix: update css rules for transformation settings
* fix: resolve state issues with settings fields
* fix: preselect initial data entities
* fix: use workflow steps configuration dynamically
* fix: enable advanced mode workflow steps
* fix: add advanced json validation step
* fix: add cancel and save to transformation subview
* feat: add github personal tokens form ux
* fix: set autocomplete to false on connxn fields
* fix: set initial token store state for modify mode
* fix: set auto-complete false as string not bool
* fix: add missing props to edit connection flow
* fix: resolve transformation settings lost bug
* fix: update github refdiff settings fields
* feat: setup ux layout for blueprint detail
* fix: blueprint detail ux and restore jira settings
* fix: update jira transformation settings
* fix: resolve errors with eslint and babel
* chore: apply eslint fixes to config-ui
* fix: resolve primary eslint errors on config-ui
* fix: remove prior pipeline validation rules
* fix: clear react missing dependency warnings
* fix: prevent null id on new connection dialog save
* fix: restore github connection token testing
* fix: update connection form props on integrations
* fix: add connection form props on integrations
* fix: update jira transformation settings data flow
* fix: hide clear all transform action
* fix: update blueprint detail workflow
* fix: update stage lane css content justification
* fix: update tasks completed display text
* fix: enable blueprint save and run action
* fix: adjust current run status icon top margin
* fix: enable blueprint detail activity polling
* fix: enable historical run activity dialog
* fix: no pipelines check on new blueprint btn
---
.gitignore | 3 +
config-ui/.eslintrc | 7 +-
config-ui/.gitignore | 6 +-
config-ui/package-lock.json | 458 ++-----
config-ui/package.json | 3 +-
config-ui/src/App.js | 19 +-
config-ui/src/components/NoData.jsx | 53 +
config-ui/src/components/SaveAlert.jsx | 2 +-
config-ui/src/components/Sidebar.jsx | 22 +-
.../src/components/Sidebar/MenuConfiguration.jsx | 112 +-
config-ui/src/components/Sidebar/SidebarMenu.jsx | 11 -
config-ui/src/components/Toast.jsx | 2 +-
config-ui/src/components/actions/DeleteAction.jsx | 13 -
.../components/blueprints/AddBlueprintDialog.jsx | 348 ++++--
.../components/blueprints/BlueprintNameCard.jsx | 64 +
.../src/components/blueprints/BlueprintsGrid.jsx | 58 +-
.../src/components/blueprints/BoardsSelector.jsx | 133 ++
.../src/components/blueprints/ConnectionDialog.jsx | 375 ++++++
.../blueprints/ConnectionTabs.jsx} | 50 +-
.../components/blueprints/ConnectionsSelector.jsx | 149 +++
.../components/blueprints/DataEntitiesSelector.jsx | 152 +++
.../src/components/blueprints/PipelineTasks.jsx | 4 +-
.../blueprints/ProviderTransformationSettings.jsx | 118 ++
.../components/blueprints/StandardStackedList.jsx | 124 ++
.../src/components/blueprints/WorkflowActions.jsx | 120 ++
.../src/components/blueprints/WorkflowStepsBar.jsx | 78 ++
.../blueprints/create-workflow/AdvancedJSON.jsx | 158 +++
.../create-workflow/AdvancedJSONValidation.jsx | 116 ++
.../blueprints/create-workflow/DataConnections.jsx | 202 +++
.../blueprints/create-workflow/DataScopes.jsx | 208 ++++
.../blueprints/create-workflow/DataSync.jsx | 312 +++++
.../create-workflow/DataTransformations.jsx | 336 +++++
.../src/components/menus/PipelineConfigsMenu.jsx | 101 +-
.../src/components/menus/PipelinePresetsMenu.jsx | 1 -
.../src/components/menus/RefDiffTasksMenu.jsx | 1 -
.../src/components/pipelines/CodeInspector.jsx | 8 +-
.../src/components/pipelines/ProviderSettings.jsx | 14 +-
config-ui/src/components/pipelines/StageLane.jsx | 35 +-
.../src/components/pipelines/StageLaneStatus.jsx | 10 +-
config-ui/src/components/pipelines/StagePanel.jsx | 2 -
config-ui/src/components/pipelines/StageTask.jsx | 14 +-
.../src/components/pipelines/StageTaskCaption.jsx | 18 +-
.../components/pipelines/StageTaskIndicator.jsx | 9 +-
.../src/components/pipelines/StageTaskName.jsx | 25 +-
.../src/components/pipelines/TaskActivity.jsx | 14 +-
.../pipelines/pipeline-settings/refdiff.jsx | 10 +-
.../components/validation/InputValidationError.jsx | 120 +-
.../NullBlueprint.js => config/jiraApiProxy.js} | 25 +-
config-ui/src/data/BlueprintWorkflow.js | 130 ++
.../src/data/{NullBlueprint.js => DataEntities.js} | 31 +-
config-ui/src/data/NullBlueprint.js | 27 +-
...NullBlueprint.js => NullBlueprintConnection.js} | 28 +-
config-ui/src/data/NullConnection.js | 2 +-
config-ui/src/data/Providers.js | 51 +-
config-ui/src/data/integrations.jsx | 2 +-
config-ui/src/hooks/useBlueprintManager.jsx | 77 +-
config-ui/src/hooks/useBlueprintValidation.jsx | 10 +-
config-ui/src/hooks/useConnectionManager.jsx | 629 +++++++---
config-ui/src/hooks/useConnectionValidation.jsx | 4 +-
config-ui/src/hooks/useJIRA.jsx | 70 +-
config-ui/src/hooks/usePipelineManager.jsx | 16 +-
config-ui/src/hooks/usePipelineValidation.jsx | 88 +-
config-ui/src/hooks/useSettingsManager.jsx | 2 +-
config-ui/src/images/devlake-logo.svg | 6 +
config-ui/src/images/devlake-textmark.svg | 3 +
.../src/pages/blueprints/blueprint-detail.jsx | 1306 ++++++++++++++++++++
.../src/pages/blueprints/create-blueprint.jsx | 1207 ++++++++++++++++++
config-ui/src/pages/blueprints/index.jsx | 73 +-
.../pages/configure/connections/AddConnection.jsx | 7 +
.../configure/connections/ConfigureConnection.jsx | 26 +-
.../pages/configure/connections/ConnectionForm.jsx | 613 ++++++---
.../pages/configure/connections/EditConnection.jsx | 2 +-
.../src/pages/configure/integration/manage.jsx | 2 +-
config-ui/src/pages/configure/settings/github.jsx | 280 +++--
config-ui/src/pages/configure/settings/gitlab.jsx | 382 +-----
config-ui/src/pages/configure/settings/jenkins.jsx | 9 +-
config-ui/src/pages/configure/settings/jira.jsx | 276 ++---
.../pages/configure/settings/jira/MappingTag.jsx | 2 +-
config-ui/src/pages/connections/index.jsx | 64 +
config-ui/src/pages/offline/index.jsx | 12 +-
config-ui/src/pages/pipelines/activity.jsx | 17 +-
config-ui/src/pages/pipelines/create.jsx | 9 +-
config-ui/src/pages/pipelines/index.jsx | 3 +-
config-ui/src/styles/app.scss | 4 +-
config-ui/src/styles/blueprints.scss | 357 ++++++
config-ui/src/styles/breadcrumbs.scss | 2 +-
config-ui/src/styles/common.scss | 13 +-
config-ui/src/styles/connections.scss | 19 +-
config-ui/src/styles/globals.scss | 15 +-
config-ui/src/styles/libraries/blueprint.scss | 47 +-
config-ui/src/styles/pipelines.scss | 126 +-
config-ui/src/styles/sidebar-menu.scss | 15 +-
config-ui/src/styles/sidebar.scss | 19 +-
config-ui/src/styles/theme.scss | 14 +-
config-ui/src/utils/request.js | 2 +-
95 files changed, 8182 insertions(+), 2140 deletions(-)
diff --git a/.gitignore b/.gitignore
index 82318dec..b47c22b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,6 +128,9 @@ config/local.js
.idea
*.iml
.vscode
+/.nova
+*.sublime*
+
# OS metadata
.DS_Store
diff --git a/config-ui/.eslintrc b/config-ui/.eslintrc
index 78d57810..35a7c953 100644
--- a/config-ui/.eslintrc
+++ b/config-ui/.eslintrc
@@ -1,6 +1,6 @@
{
"root": true,
- "parser": "babel-eslint",
+ "parser": "@babel/eslint-parser",
"extends": [
"standard",
"standard-jsx",
@@ -47,10 +47,13 @@
"rules": {
"camelcase": "off",
"max-len": [1, 140, 2],
+ "react/jsx-indent": ["error", 2],
"import/no-named-as-default": "off",
"comma-dangle": "off",
"react/prop-types": "off",
"react/jsx-boolean-value": 0,
- "header/header": ["error", ".file-headerrc"]
+ "header/header": ["error", ".file-headerrc"],
+ "no-unused-vars": "off",
+ "multiline-ternary": 0
}
}
diff --git a/config-ui/.gitignore b/config-ui/.gitignore
index 165936df..26bf26ec 100644
--- a/config-ui/.gitignore
+++ b/config-ui/.gitignore
@@ -19,7 +19,7 @@ cypress.env.json
# misc
.DS_Store
*.pem
-
+
# debug
npm-debug.log*
yarn-debug.log*
@@ -33,3 +33,7 @@ yarn-error.log*
# vercel
.vercel
+
+# ide & workspace files
+/.nova
+*.sublime*
diff --git a/config-ui/package-lock.json b/config-ui/package-lock.json
index f8b25e6c..476d942c 100644
--- a/config-ui/package-lock.json
+++ b/config-ui/package-lock.json
@@ -8,9 +8,11 @@
"name": "frontend",
"version": "0.1.0",
"dependencies": {
+ "@babel/eslint-parser": "^7.18.2",
"@blueprintjs/core": "^3.49.1",
"@blueprintjs/popover2": "^0.11.4",
"@blueprintjs/select": "^3.18.10",
+ "@fontsource/inter": "^4.5.11",
"@uiw/react-textarea-code-editor": "^1.4.16",
"axios": "^0.21.4",
"babel-plugin-module-resolver": "^4.1.0",
@@ -37,7 +39,6 @@
"@testing-library/react": "^12.1.1",
"@testing-library/user-event": "^13.2.1",
"autoprefixer": "^9.8.6",
- "babel-eslint": "^10.1.0",
"babel-jest": "^27.2.3",
"babel-loader": "^8.2.2",
"clean-webpack-plugin": "^4.0.0",
@@ -91,7 +92,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
"integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
- "dev": true,
"dependencies": {
"@babel/highlight": "^7.16.0"
},
@@ -103,7 +103,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz",
"integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==",
- "dev": true,
"engines": {
"node": ">=6.9.0"
}
@@ -112,7 +111,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
"integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
- "dev": true,
"dependencies": {
"@babel/code-frame": "^7.16.0",
"@babel/generator": "^7.16.0",
@@ -139,10 +137,9 @@
}
},
"node_modules/@babel/eslint-parser": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz",
- "integrity": "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw==",
- "dev": true,
+ "version": "7.18.2",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz",
+ "integrity": "sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==",
"dependencies": {
"eslint-scope": "^5.1.1",
"eslint-visitor-keys": "^2.1.0",
@@ -160,7 +157,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
- "dev": true,
"engines": {
"node": ">=10"
}
@@ -169,7 +165,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
"integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0",
"jsesc": "^2.5.1",
@@ -208,7 +203,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz",
"integrity": "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==",
- "dev": true,
"dependencies": {
"@babel/compat-data": "^7.16.0",
"@babel/helper-validator-option": "^7.14.5",
@@ -293,7 +287,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
"integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
- "dev": true,
"dependencies": {
"@babel/helper-get-function-arity": "^7.16.0",
"@babel/template": "^7.16.0",
@@ -307,7 +300,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
"integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -319,7 +311,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
"integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -331,7 +322,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz",
"integrity": "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -343,7 +333,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",
"integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -355,7 +344,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz",
"integrity": "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==",
- "dev": true,
"dependencies": {
"@babel/helper-module-imports": "^7.16.0",
"@babel/helper-replace-supers": "^7.16.0",
@@ -374,7 +362,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz",
"integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -409,7 +396,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz",
"integrity": "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==",
- "dev": true,
"dependencies": {
"@babel/helper-member-expression-to-functions": "^7.16.0",
"@babel/helper-optimise-call-expression": "^7.16.0",
@@ -424,7 +410,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",
"integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -448,7 +433,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
"integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
- "dev": true,
"dependencies": {
"@babel/types": "^7.16.0"
},
@@ -460,7 +444,6 @@
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
- "dev": true,
"engines": {
"node": ">=6.9.0"
}
@@ -469,7 +452,6 @@
"version": "7.14.5",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
"integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
- "dev": true,
"engines": {
"node": ">=6.9.0"
}
@@ -493,7 +475,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.0.tgz",
"integrity": "sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==",
- "dev": true,
"dependencies": {
"@babel/template": "^7.16.0",
"@babel/traverse": "^7.16.0",
@@ -507,7 +488,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
"integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
- "dev": true,
"dependencies": {
"@babel/helper-validator-identifier": "^7.15.7",
"chalk": "^2.0.0",
@@ -521,7 +501,6 @@
"version": "7.16.2",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz",
"integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==",
- "dev": true,
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -1844,7 +1823,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
"integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
- "dev": true,
"dependencies": {
"@babel/code-frame": "^7.16.0",
"@babel/parser": "^7.16.0",
@@ -1858,7 +1836,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz",
"integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
- "dev": true,
"dependencies": {
"@babel/code-frame": "^7.16.0",
"@babel/generator": "^7.16.0",
@@ -1878,7 +1855,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
"integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
- "dev": true,
"dependencies": {
"@babel/helper-validator-identifier": "^7.15.7",
"to-fast-properties": "^2.0.0"
@@ -2110,7 +2086,6 @@
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
- "dev": true,
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.1.1",
@@ -2130,7 +2105,6 @@
"version": "13.15.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
- "dev": true,
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -2145,7 +2119,6 @@
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
- "dev": true,
"engines": {
"node": ">= 4"
}
@@ -2154,7 +2127,6 @@
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true,
"engines": {
"node": ">=10"
},
@@ -2162,6 +2134,11 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/@fontsource/inter": {
+ "version": "4.5.11",
+ "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.11.tgz",
+ "integrity": "sha512-toizzQkfXL8YJcG/f8j3EYXYGQe4OxiDEItThSigvHU+cYNDw8HPp3wLYQX745hddsnHqOGCM4exitFSBOU8+w=="
+ },
"node_modules/@gar/promisify": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
@@ -2172,7 +2149,6 @@
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
- "dev": true,
"dependencies": {
"@humanwhocodes/object-schema": "^1.2.0",
"debug": "^4.1.1",
@@ -2185,8 +2161,7 @@
"node_modules/@humanwhocodes/object-schema": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
- "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
- "dev": true
+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
},
"node_modules/@hypnosphi/create-react-context": {
"version": "0.3.1",
@@ -4185,7 +4160,6 @@
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
- "dev": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -4207,7 +4181,6 @@
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
- "dev": true,
"peerDependencies": {
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
}
@@ -4343,7 +4316,6 @@
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
- "dev": true,
"engines": {
"node": ">=6"
}
@@ -4445,7 +4417,6 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
- "dev": true,
"dependencies": {
"sprintf-js": "~1.0.2"
}
@@ -4652,7 +4623,6 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
- "dev": true,
"engines": {
"node": ">=8"
}
@@ -4838,27 +4808,6 @@
"node": ">=0.8.0"
}
},
- "node_modules/babel-eslint": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
- "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
- "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
- "dev": true,
- "dependencies": {
- "@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.7.0",
- "@babel/traverse": "^7.7.0",
- "@babel/types": "^7.7.0",
- "eslint-visitor-keys": "^1.0.0",
- "resolve": "^1.12.0"
- },
- "engines": {
- "node": ">=6"
- },
- "peerDependencies": {
- "eslint": ">= 4.12.1"
- }
- },
"node_modules/babel-jest": {
"version": "27.3.1",
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
@@ -5616,7 +5565,6 @@
"version": "4.17.6",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz",
"integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
- "dev": true,
"dependencies": {
"caniuse-lite": "^1.0.30001274",
"electron-to-chromium": "^1.3.886",
@@ -5638,8 +5586,7 @@
"node_modules/browserslist/node_modules/picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
- "dev": true
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
},
"node_modules/bser": {
"version": "2.1.1",
@@ -5862,7 +5809,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "dev": true,
"engines": {
"node": ">=6"
}
@@ -5937,7 +5883,6 @@
"version": "1.0.30001279",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz",
"integrity": "sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ==",
- "dev": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/browserslist"
@@ -6796,7 +6741,6 @@
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.1.1"
}
@@ -7016,7 +6960,6 @@
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
- "dev": true,
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@@ -7919,7 +7862,6 @@
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
- "dev": true,
"dependencies": {
"ms": "2.1.2"
},
@@ -8020,8 +7962,7 @@
"node_modules/deep-is": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
- "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
- "dev": true
+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
},
"node_modules/deepmerge": {
"version": "4.2.2",
@@ -8407,7 +8348,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
- "dev": true,
"dependencies": {
"esutils": "^2.0.2"
},
@@ -8715,8 +8655,7 @@
"node_modules/electron-to-chromium": {
"version": "1.3.892",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.892.tgz",
- "integrity": "sha512-YDW4yIjdfMnbRoBjRZ/aNQYmT6JgQFLwmTSDRJMQdrY4MByEzppdXp3rnJ0g4LBWcsYTUvwKKClYN1ofZ0COOQ==",
- "dev": true
+ "integrity": "sha512-YDW4yIjdfMnbRoBjRZ/aNQYmT6JgQFLwmTSDRJMQdrY4MByEzppdXp3rnJ0g4LBWcsYTUvwKKClYN1ofZ0COOQ=="
},
"node_modules/elliptic": {
"version": "6.5.4",
@@ -8809,7 +8748,6 @@
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
- "dev": true,
"dependencies": {
"ansi-colors": "^4.1.1"
},
@@ -8943,7 +8881,6 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
- "dev": true,
"engines": {
"node": ">=6"
}
@@ -9057,7 +8994,6 @@
"version": "7.32.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
- "dev": true,
"dependencies": {
"@babel/code-frame": "7.12.11",
"@eslint/eslintrc": "^0.4.3",
@@ -9700,7 +9636,6 @@
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "dev": true,
"dependencies": {
"esrecurse": "^4.3.0",
"estraverse": "^4.1.1"
@@ -9713,7 +9648,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "dev": true,
"engines": {
"node": ">=4.0"
}
@@ -9747,7 +9681,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
- "dev": true,
"dependencies": {
"eslint-visitor-keys": "^1.1.0"
},
@@ -9762,7 +9695,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
"integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
- "dev": true,
"engines": {
"node": ">=4"
}
@@ -9796,7 +9728,6 @@
"version": "7.12.11",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
- "dev": true,
"dependencies": {
"@babel/highlight": "^7.10.4"
}
@@ -9805,7 +9736,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -9820,7 +9750,6 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -9836,7 +9765,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
@@ -9847,14 +9775,12 @@
"node_modules/eslint/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/eslint/node_modules/escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true,
"engines": {
"node": ">=10"
},
@@ -9866,7 +9792,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
- "dev": true,
"engines": {
"node": ">=10"
}
@@ -9875,7 +9800,6 @@
"version": "13.15.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
- "dev": true,
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -9890,7 +9814,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
"engines": {
"node": ">=8"
}
@@ -9899,7 +9822,6 @@
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
"integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
- "dev": true,
"engines": {
"node": ">= 4"
}
@@ -9908,7 +9830,6 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
"dependencies": {
"brace-expansion": "^1.1.7"
},
@@ -9920,7 +9841,6 @@
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
- "dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
},
@@ -9935,7 +9855,6 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -9947,7 +9866,6 @@
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true,
"engines": {
"node": ">=10"
},
@@ -9959,7 +9877,6 @@
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
- "dev": true,
"dependencies": {
"acorn": "^7.4.0",
"acorn-jsx": "^5.3.1",
@@ -9985,7 +9902,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
- "dev": true,
"dependencies": {
"estraverse": "^5.1.0"
},
@@ -10499,8 +10415,7 @@
"node_modules/fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
- "dev": true
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
},
"node_modules/fastest-levenshtein": {
"version": "1.0.12",
@@ -10570,7 +10485,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
- "dev": true,
"dependencies": {
"flat-cache": "^3.0.4"
},
@@ -10806,7 +10720,6 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
- "dev": true,
"dependencies": {
"flatted": "^3.1.0",
"rimraf": "^3.0.2"
@@ -10818,8 +10731,7 @@
"node_modules/flatted": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
- "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
- "dev": true
+ "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="
},
"node_modules/flush-write-stream": {
"version": "1.1.1",
@@ -11006,8 +10918,7 @@
"node_modules/functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
- "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
- "dev": true
+ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
},
"node_modules/functions-have-names": {
"version": "1.2.3",
@@ -11070,7 +10981,6 @@
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
- "dev": true,
"engines": {
"node": ">=6.9.0"
}
@@ -11241,7 +11151,6 @@
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "devOptional": true,
"dependencies": {
"is-glob": "^4.0.1"
},
@@ -11272,7 +11181,6 @@
"version": "11.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
- "dev": true,
"engines": {
"node": ">=4"
}
@@ -12404,7 +12312,6 @@
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
- "dev": true,
"dependencies": {
"parent-module": "^1.0.0",
"resolve-from": "^4.0.0"
@@ -12420,7 +12327,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "dev": true,
"engines": {
"node": ">=4"
}
@@ -12980,7 +12886,6 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
- "devOptional": true,
"engines": {
"node": ">=0.10.0"
}
@@ -13010,7 +12915,6 @@
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
- "devOptional": true,
"dependencies": {
"is-extglob": "^2.1.1"
},
@@ -15198,7 +15102,6 @@
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
- "dev": true,
"dependencies": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
@@ -15275,7 +15178,6 @@
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
- "dev": true,
"bin": {
"jsesc": "bin/jsesc"
},
@@ -15313,8 +15215,7 @@
"node_modules/json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
- "dev": true
+ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
},
"node_modules/json-stringify-safe": {
"version": "5.0.1",
@@ -15332,7 +15233,6 @@
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
- "dev": true,
"dependencies": {
"minimist": "^1.2.5"
},
@@ -15466,7 +15366,6 @@
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
- "dev": true,
"dependencies": {
"prelude-ls": "^1.2.1",
"type-check": "~0.4.0"
@@ -16324,8 +16223,7 @@
"node_modules/lodash.merge": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
- "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
- "dev": true
+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
},
"node_modules/lodash.once": {
"version": "4.1.1",
@@ -16336,8 +16234,7 @@
"node_modules/lodash.truncate": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
- "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
- "dev": true
+ "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
},
"node_modules/lodash.uniq": {
"version": "4.5.0",
@@ -16590,7 +16487,6 @@
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
"dependencies": {
"yallist": "^4.0.0"
},
@@ -17403,8 +17299,7 @@
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
- "dev": true
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"node_modules/multicast-dns": {
"version": "6.2.3",
@@ -17483,8 +17378,7 @@
"node_modules/natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
- "dev": true
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
},
"node_modules/negotiator": {
"version": "0.6.2",
@@ -17623,8 +17517,7 @@
"node_modules/node-releases": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
- "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
- "dev": true
+ "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
},
"node_modules/node-sass": {
"version": "6.0.1",
@@ -18194,7 +18087,6 @@
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
- "dev": true,
"dependencies": {
"deep-is": "^0.1.3",
"fast-levenshtein": "^2.0.6",
@@ -18382,7 +18274,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
- "dev": true,
"dependencies": {
"callsites": "^3.0.0"
},
@@ -18563,7 +18454,6 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
- "dev": true,
"engines": {
"node": ">=8"
}
@@ -19452,7 +19342,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
- "dev": true,
"engines": {
"node": ">= 0.8.0"
}
@@ -19536,7 +19425,6 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
- "dev": true,
"engines": {
"node": ">=0.4.0"
}
@@ -20274,7 +20162,6 @@
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
- "dev": true,
"engines": {
"node": ">=8"
},
@@ -20582,7 +20469,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -20786,7 +20672,6 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "dev": true,
"dependencies": {
"glob": "^7.1.3"
},
@@ -21439,7 +21324,6 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
- "dev": true,
"dependencies": {
"shebang-regex": "^3.0.0"
},
@@ -21451,7 +21335,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
- "dev": true,
"engines": {
"node": ">=8"
}
@@ -21514,7 +21397,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
- "dev": true,
"dependencies": {
"ansi-styles": "^4.0.0",
"astral-regex": "^2.0.0",
@@ -21531,7 +21413,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -21546,7 +21427,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
@@ -21557,14 +21437,12 @@
"node_modules/slice-ansi/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true,
"engines": {
"node": ">=8"
}
@@ -21965,8 +21843,7 @@
"node_modules/sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
- "dev": true
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"node_modules/sshpk": {
"version": "1.16.1",
@@ -22365,7 +22242,6 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
- "dev": true,
"engines": {
"node": ">=8"
},
@@ -22610,7 +22486,6 @@
"version": "6.8.0",
"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
- "dev": true,
"dependencies": {
"ajv": "^8.0.1",
"lodash.truncate": "^4.4.2",
@@ -22626,7 +22501,6 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
- "dev": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -22641,14 +22515,12 @@
"node_modules/table/node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
- "dev": true
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"node_modules/table/node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true,
"engines": {
"node": ">=8"
}
@@ -22656,14 +22528,12 @@
"node_modules/table/node_modules/json-schema-traverse": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "dev": true
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
},
"node_modules/table/node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@@ -22839,8 +22709,7 @@
"node_modules/text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
- "dev": true
+ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
},
"node_modules/throat": {
"version": "6.0.1",
@@ -22935,7 +22804,6 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
"integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
- "dev": true,
"engines": {
"node": ">=4"
}
@@ -23142,7 +23010,6 @@
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
- "dev": true,
"dependencies": {
"prelude-ls": "^1.2.1"
},
@@ -23814,8 +23681,7 @@
"node_modules/v8-compile-cache": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
- "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
- "dev": true
+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
},
"node_modules/v8-to-istanbul": {
"version": "8.1.0",
@@ -25731,7 +25597,6 @@
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -25906,8 +25771,7 @@
"node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"node_modules/yaml": {
"version": "1.10.2",
@@ -26055,7 +25919,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
"integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
- "dev": true,
"requires": {
"@babel/highlight": "^7.16.0"
}
@@ -26063,14 +25926,12 @@
"@babel/compat-data": {
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz",
- "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==",
- "dev": true
+ "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew=="
},
"@babel/core": {
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz",
"integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==",
- "dev": true,
"requires": {
"@babel/code-frame": "^7.16.0",
"@babel/generator": "^7.16.0",
@@ -26090,10 +25951,9 @@
}
},
"@babel/eslint-parser": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.16.0.tgz",
- "integrity": "sha512-c+AsYOHjI+FgCa+ifLd8sDXp4U4mjkfFgL9NdQWhuA731kAUJs0WdJIXET4A14EJAR9Jv9FFF/MzPWJfV9Oirw==",
- "dev": true,
+ "version": "7.18.2",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz",
+ "integrity": "sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==",
"requires": {
"eslint-scope": "^5.1.1",
"eslint-visitor-keys": "^2.1.0",
@@ -26103,8 +25963,7 @@
"eslint-visitor-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
- "dev": true
+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
}
}
},
@@ -26112,7 +25971,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
"integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0",
"jsesc": "^2.5.1",
@@ -26142,7 +26000,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.0.tgz",
"integrity": "sha512-S7iaOT1SYlqK0sQaCi21RX4+13hmdmnxIEAnQUB/eh7GeAnRjOUgTYpLkUOiRXzD+yog1JxP0qyAQZ7ZxVxLVg==",
- "dev": true,
"requires": {
"@babel/compat-data": "^7.16.0",
"@babel/helper-validator-option": "^7.14.5",
@@ -26203,7 +26060,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
"integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
- "dev": true,
"requires": {
"@babel/helper-get-function-arity": "^7.16.0",
"@babel/template": "^7.16.0",
@@ -26214,7 +26070,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
"integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26223,7 +26078,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
"integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26232,7 +26086,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz",
"integrity": "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26241,7 +26094,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",
"integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26250,7 +26102,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz",
"integrity": "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==",
- "dev": true,
"requires": {
"@babel/helper-module-imports": "^7.16.0",
"@babel/helper-replace-supers": "^7.16.0",
@@ -26266,7 +26117,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz",
"integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26292,7 +26142,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz",
"integrity": "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==",
- "dev": true,
"requires": {
"@babel/helper-member-expression-to-functions": "^7.16.0",
"@babel/helper-optimise-call-expression": "^7.16.0",
@@ -26304,7 +26153,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",
"integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26322,7 +26170,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
"integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
- "dev": true,
"requires": {
"@babel/types": "^7.16.0"
}
@@ -26330,14 +26177,12 @@
"@babel/helper-validator-identifier": {
"version": "7.15.7",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
- "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
- "dev": true
+ "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
},
"@babel/helper-validator-option": {
"version": "7.14.5",
"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
- "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
- "dev": true
+ "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
},
"@babel/helper-wrap-function": {
"version": "7.16.0",
@@ -26355,7 +26200,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.0.tgz",
"integrity": "sha512-dVRM0StFMdKlkt7cVcGgwD8UMaBfWJHl3A83Yfs8GQ3MO0LHIIIMvK7Fa0RGOGUQ10qikLaX6D7o5htcQWgTMQ==",
- "dev": true,
"requires": {
"@babel/template": "^7.16.0",
"@babel/traverse": "^7.16.0",
@@ -26366,7 +26210,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
"integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
- "dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.15.7",
"chalk": "^2.0.0",
@@ -26376,8 +26219,7 @@
"@babel/parser": {
"version": "7.16.2",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.2.tgz",
- "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw==",
- "dev": true
+ "integrity": "sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
"version": "7.16.2",
@@ -27256,7 +27098,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
"integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
- "dev": true,
"requires": {
"@babel/code-frame": "^7.16.0",
"@babel/parser": "^7.16.0",
@@ -27267,7 +27108,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.0.tgz",
"integrity": "sha512-qQ84jIs1aRQxaGaxSysII9TuDaguZ5yVrEuC0BN2vcPlalwfLovVmCjbFDPECPXcYM/wLvNFfp8uDOliLxIoUQ==",
- "dev": true,
"requires": {
"@babel/code-frame": "^7.16.0",
"@babel/generator": "^7.16.0",
@@ -27284,7 +27124,6 @@
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
"integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
- "dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.15.7",
"to-fast-properties": "^2.0.0"
@@ -27479,7 +27318,6 @@
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
"integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
- "dev": true,
"requires": {
"ajv": "^6.12.4",
"debug": "^4.1.1",
@@ -27496,7 +27334,6 @@
"version": "13.15.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
- "dev": true,
"requires": {
"type-fest": "^0.20.2"
}
@@ -27504,17 +27341,20 @@
"ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
- "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
- "dev": true
+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
},
"type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
}
}
},
+ "@fontsource/inter": {
+ "version": "4.5.11",
+ "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-4.5.11.tgz",
+ "integrity": "sha512-toizzQkfXL8YJcG/f8j3EYXYGQe4OxiDEItThSigvHU+cYNDw8HPp3wLYQX745hddsnHqOGCM4exitFSBOU8+w=="
+ },
"@gar/promisify": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
@@ -27525,7 +27365,6 @@
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
"integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
- "dev": true,
"requires": {
"@humanwhocodes/object-schema": "^1.2.0",
"debug": "^4.1.1",
@@ -27535,8 +27374,7 @@
"@humanwhocodes/object-schema": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
- "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
- "dev": true
+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
},
"@hypnosphi/create-react-context": {
"version": "0.3.1",
@@ -29096,8 +28934,7 @@
"acorn": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
- "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
- "dev": true
+ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
},
"acorn-globals": {
"version": "6.0.0",
@@ -29113,7 +28950,6 @@
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
- "dev": true,
"requires": {}
},
"acorn-walk": {
@@ -29219,8 +29055,7 @@
"ansi-colors": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
- "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
- "dev": true
+ "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
},
"ansi-escapes": {
"version": "4.3.2",
@@ -29284,7 +29119,6 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
- "dev": true,
"requires": {
"sprintf-js": "~1.0.2"
}
@@ -29446,8 +29280,7 @@
"astral-regex": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
- "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
- "dev": true
+ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
},
"async": {
"version": "2.6.3",
@@ -29592,20 +29425,6 @@
}
}
},
- "babel-eslint": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
- "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.7.0",
- "@babel/traverse": "^7.7.0",
- "@babel/types": "^7.7.0",
- "eslint-visitor-keys": "^1.0.0",
- "resolve": "^1.12.0"
- }
- },
"babel-jest": {
"version": "27.3.1",
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
@@ -30208,7 +30027,6 @@
"version": "4.17.6",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.6.tgz",
"integrity": "sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw==",
- "dev": true,
"requires": {
"caniuse-lite": "^1.0.30001274",
"electron-to-chromium": "^1.3.886",
@@ -30220,8 +30038,7 @@
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
- "dev": true
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
}
}
},
@@ -30409,8 +30226,7 @@
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "dev": true
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
},
"camel-case": {
"version": "4.1.2",
@@ -30470,8 +30286,7 @@
"caniuse-lite": {
"version": "1.0.30001279",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz",
- "integrity": "sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ==",
- "dev": true
+ "integrity": "sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ=="
},
"capture-stack-trace": {
"version": "1.0.1",
@@ -31145,7 +30960,6 @@
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.1"
}
@@ -31328,7 +31142,6 @@
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
- "dev": true,
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@@ -32015,7 +31828,6 @@
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
"integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
- "dev": true,
"requires": {
"ms": "2.1.2"
}
@@ -32089,8 +31901,7 @@
"deep-is": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
- "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
- "dev": true
+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
},
"deepmerge": {
"version": "4.2.2",
@@ -32400,7 +32211,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
- "dev": true,
"requires": {
"esutils": "^2.0.2"
}
@@ -32652,8 +32462,7 @@
"electron-to-chromium": {
"version": "1.3.892",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.892.tgz",
- "integrity": "sha512-YDW4yIjdfMnbRoBjRZ/aNQYmT6JgQFLwmTSDRJMQdrY4MByEzppdXp3rnJ0g4LBWcsYTUvwKKClYN1ofZ0COOQ==",
- "dev": true
+ "integrity": "sha512-YDW4yIjdfMnbRoBjRZ/aNQYmT6JgQFLwmTSDRJMQdrY4MByEzppdXp3rnJ0g4LBWcsYTUvwKKClYN1ofZ0COOQ=="
},
"elliptic": {
"version": "6.5.4",
@@ -32732,7 +32541,6 @@
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
- "dev": true,
"requires": {
"ansi-colors": "^4.1.1"
}
@@ -32835,8 +32643,7 @@
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
- "dev": true
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
},
"escape-goat": {
"version": "2.1.1",
@@ -32919,7 +32726,6 @@
"version": "7.32.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
"integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
- "dev": true,
"requires": {
"@babel/code-frame": "7.12.11",
"@eslint/eslintrc": "^0.4.3",
@@ -32967,7 +32773,6 @@
"version": "7.12.11",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
"integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
- "dev": true,
"requires": {
"@babel/highlight": "^7.10.4"
}
@@ -32976,7 +32781,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
"requires": {
"color-convert": "^2.0.1"
}
@@ -32985,7 +32789,6 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -32995,7 +32798,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
"requires": {
"color-name": "~1.1.4"
}
@@ -33003,26 +32805,22 @@
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
},
"eslint-visitor-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
- "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
- "dev": true
+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
},
"globals": {
"version": "13.15.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
"integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
- "dev": true,
"requires": {
"type-fest": "^0.20.2"
}
@@ -33030,20 +32828,17 @@
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
- "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
- "dev": true
+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
},
"minimatch": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
- "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -33052,7 +32847,6 @@
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
- "dev": true,
"requires": {
"lru-cache": "^6.0.0"
}
@@ -33061,7 +32855,6 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
"requires": {
"has-flag": "^4.0.0"
}
@@ -33069,8 +32862,7 @@
"type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
- "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
- "dev": true
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
}
}
},
@@ -33479,7 +33271,6 @@
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "dev": true,
"requires": {
"esrecurse": "^4.3.0",
"estraverse": "^4.1.1"
@@ -33488,8 +33279,7 @@
"estraverse": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "dev": true
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
}
}
},
@@ -33518,7 +33308,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
- "dev": true,
"requires": {
"eslint-visitor-keys": "^1.1.0"
}
@@ -33526,8 +33315,7 @@
"eslint-visitor-keys": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
- "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
- "dev": true
+ "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
},
"eslint-webpack-plugin": {
"version": "2.5.4",
@@ -33547,7 +33335,6 @@
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
"integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
- "dev": true,
"requires": {
"acorn": "^7.4.0",
"acorn-jsx": "^5.3.1",
@@ -33563,7 +33350,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
- "dev": true,
"requires": {
"estraverse": "^5.1.0"
}
@@ -33974,8 +33760,7 @@
"fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
- "dev": true
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
},
"fastest-levenshtein": {
"version": "1.0.12",
@@ -34036,7 +33821,6 @@
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
- "dev": true,
"requires": {
"flat-cache": "^3.0.4"
}
@@ -34213,7 +33997,6 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
- "dev": true,
"requires": {
"flatted": "^3.1.0",
"rimraf": "^3.0.2"
@@ -34222,8 +34005,7 @@
"flatted": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz",
- "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==",
- "dev": true
+ "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="
},
"flush-write-stream": {
"version": "1.1.1",
@@ -34356,8 +34138,7 @@
"functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
- "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
- "dev": true
+ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
},
"functions-have-names": {
"version": "1.2.3",
@@ -34409,8 +34190,7 @@
"gensync": {
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
- "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
- "dev": true
+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
},
"get-caller-file": {
"version": "2.0.5",
@@ -34537,7 +34317,6 @@
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "devOptional": true,
"requires": {
"is-glob": "^4.0.1"
}
@@ -34560,8 +34339,7 @@
"globals": {
"version": "11.12.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
- "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
- "dev": true
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
},
"globby": {
"version": "11.0.4",
@@ -35430,7 +35208,6 @@
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
- "dev": true,
"requires": {
"parent-module": "^1.0.0",
"resolve-from": "^4.0.0"
@@ -35439,8 +35216,7 @@
"resolve-from": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "dev": true
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
}
}
},
@@ -35849,8 +35625,7 @@
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
- "devOptional": true
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
},
"is-fullwidth-code-point": {
"version": "1.0.0",
@@ -35871,7 +35646,6 @@
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
- "devOptional": true,
"requires": {
"is-extglob": "^2.1.1"
}
@@ -37500,7 +37274,6 @@
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
- "dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
@@ -37558,8 +37331,7 @@
"jsesc": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
- "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
- "dev": true
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
},
"json-buffer": {
"version": "3.0.0",
@@ -37591,8 +37363,7 @@
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
- "dev": true
+ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
},
"json-stringify-safe": {
"version": "5.0.1",
@@ -37610,7 +37381,6 @@
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
- "dev": true,
"requires": {
"minimist": "^1.2.5"
}
@@ -37714,7 +37484,6 @@
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
- "dev": true,
"requires": {
"prelude-ls": "^1.2.1",
"type-check": "~0.4.0"
@@ -38381,8 +38150,7 @@
"lodash.merge": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
- "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
- "dev": true
+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
},
"lodash.once": {
"version": "4.1.1",
@@ -38393,8 +38161,7 @@
"lodash.truncate": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
- "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
- "dev": true
+ "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
},
"lodash.uniq": {
"version": "4.5.0",
@@ -38586,7 +38353,6 @@
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
- "dev": true,
"requires": {
"yallist": "^4.0.0"
}
@@ -39209,8 +38975,7 @@
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
- "dev": true
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"multicast-dns": {
"version": "6.2.3",
@@ -39277,8 +39042,7 @@
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
- "dev": true
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
},
"negotiator": {
"version": "0.6.2",
@@ -39402,8 +39166,7 @@
"node-releases": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
- "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
- "dev": true
+ "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
},
"node-sass": {
"version": "6.0.1",
@@ -39832,7 +39595,6 @@
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
- "dev": true,
"requires": {
"deep-is": "^0.1.3",
"fast-levenshtein": "^2.0.6",
@@ -39980,7 +39742,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
- "dev": true,
"requires": {
"callsites": "^3.0.0"
}
@@ -40121,8 +39882,7 @@
"path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
- "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
- "dev": true
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
},
"path-parse": {
"version": "1.0.7",
@@ -40868,8 +40628,7 @@
"prelude-ls": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
- "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
- "dev": true
+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
},
"prepend-http": {
"version": "1.0.4",
@@ -40930,8 +40689,7 @@
"progress": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
- "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
- "dev": true
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
},
"promise-inflight": {
"version": "1.0.1",
@@ -41535,8 +41293,7 @@
"regexpp": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
- "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
- "dev": true
+ "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
},
"regexpu-core": {
"version": "4.8.0",
@@ -41772,8 +41529,7 @@
"require-from-string": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
- "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
- "dev": true
+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
},
"require-main-filename": {
"version": "2.0.0",
@@ -41926,7 +41682,6 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "dev": true,
"requires": {
"glob": "^7.1.3"
}
@@ -42449,7 +42204,6 @@
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
- "dev": true,
"requires": {
"shebang-regex": "^3.0.0"
}
@@ -42457,8 +42211,7 @@
"shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
- "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
- "dev": true
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
},
"side-channel": {
"version": "1.0.4",
@@ -42514,7 +42267,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
- "dev": true,
"requires": {
"ansi-styles": "^4.0.0",
"astral-regex": "^2.0.0",
@@ -42525,7 +42277,6 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
"requires": {
"color-convert": "^2.0.1"
}
@@ -42534,7 +42285,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
"requires": {
"color-name": "~1.1.4"
}
@@ -42542,14 +42292,12 @@
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
}
}
},
@@ -42892,8 +42640,7 @@
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
- "dev": true
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"sshpk": {
"version": "1.16.1",
@@ -43212,8 +42959,7 @@
"strip-json-comments": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
- "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
- "dev": true
+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
},
"style-loader": {
"version": "1.3.0",
@@ -43405,7 +43151,6 @@
"version": "6.8.0",
"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
- "dev": true,
"requires": {
"ajv": "^8.0.1",
"lodash.truncate": "^4.4.2",
@@ -43418,7 +43163,6 @@
"version": "8.11.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
- "dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -43429,26 +43173,22 @@
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
- "dev": true
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
},
"json-schema-traverse": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "dev": true
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
@@ -43577,8 +43317,7 @@
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
- "dev": true
+ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
},
"throat": {
"version": "6.0.1",
@@ -43663,8 +43402,7 @@
"to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
- "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
- "dev": true
+ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
},
"to-object-path": {
"version": "0.3.0",
@@ -43834,7 +43572,6 @@
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
- "dev": true,
"requires": {
"prelude-ls": "^1.2.1"
}
@@ -44339,8 +44076,7 @@
"v8-compile-cache": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
- "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
- "dev": true
+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
},
"v8-to-istanbul": {
"version": "8.1.0",
@@ -45862,8 +45598,7 @@
"word-wrap": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
- "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
- "dev": true
+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
},
"worker-farm": {
"version": "1.7.0",
@@ -45993,8 +45728,7 @@
"yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
- "dev": true
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
},
"yaml": {
"version": "1.10.2",
diff --git a/config-ui/package.json b/config-ui/package.json
index 409c18b2..235469bd 100644
--- a/config-ui/package.json
+++ b/config-ui/package.json
@@ -11,9 +11,11 @@
"cypress": "./node_modules/.bin/cypress open"
},
"dependencies": {
+ "@babel/eslint-parser": "^7.18.2",
"@blueprintjs/core": "^3.49.1",
"@blueprintjs/popover2": "^0.11.4",
"@blueprintjs/select": "^3.18.10",
+ "@fontsource/inter": "^4.5.11",
"@uiw/react-textarea-code-editor": "^1.4.16",
"axios": "^0.21.4",
"babel-plugin-module-resolver": "^4.1.0",
@@ -40,7 +42,6 @@
"@testing-library/react": "^12.1.1",
"@testing-library/user-event": "^13.2.1",
"autoprefixer": "^9.8.6",
- "babel-eslint": "^10.1.0",
"babel-jest": "^27.2.3",
"babel-loader": "^8.2.2",
"clean-webpack-plugin": "^4.0.0",
diff --git a/config-ui/src/App.js b/config-ui/src/App.js
index 27c12e4a..e137152c 100644
--- a/config-ui/src/App.js
+++ b/config-ui/src/App.js
@@ -24,8 +24,11 @@ import {
import 'normalize.css'
import '@/styles/app.scss'
-import 'typeface-montserrat'
-import 'jetbrains-mono'
+// import 'typeface-montserrat'
+// import 'jetbrains-mono'
+import '@fontsource/inter/400.css'
+import '@fontsource/inter/600.css'
+import '@fontsource/inter/variable-full.css'
// Theme variables (@styles/theme.scss) injected via Webpack w/ @sass-loader additionalData option!
// import '@/styles/theme.scss'
@@ -41,6 +44,9 @@ import Pipelines from '@/pages/pipelines/index'
import CreatePipeline from '@/pages/pipelines/create'
import PipelineActivity from '@/pages/pipelines/activity'
import Blueprints from '@/pages/blueprints/index'
+import CreateBlueprint from '@/pages/blueprints/create-blueprint'
+import BlueprintDetail from '@/pages/blueprints/blueprint-detail'
+import Connections from '@/pages/connections/index'
function App () {
return (
@@ -79,9 +85,18 @@ function App () {
<Route exact path='/pipelines/activity/:pId'>
<PipelineActivity />
</Route>
+ <Route exact path='/blueprints/create'>
+ <CreateBlueprint />
+ </Route>
+ <Route exact path='/blueprints/detail/:bId'>
+ <BlueprintDetail />
+ </Route>
<Route exact path='/blueprints'>
<Blueprints />
</Route>
+ <Route exact path='/connections'>
+ <Connections />
+ </Route>
<Route exact path='/lake/api/configuration'>
<Configure />
</Route>
diff --git a/config-ui/src/components/NoData.jsx b/config-ui/src/components/NoData.jsx
new file mode 100644
index 00000000..88b4f183
--- /dev/null
+++ b/config-ui/src/components/NoData.jsx
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment } from 'react'
+import { Button, Intent, Icon } from '@blueprintjs/core'
+
+const NoData = (props) => {
+ const {
+ title = 'No Data',
+ message = 'Please check configuration and retry.',
+ icon = 'offline',
+ iconSize = 32,
+ actionText = 'Go Back',
+ onClick = () => {},
+ } = props
+
+ return (
+ <>
+ <div className='bp3-non-ideal-state no-data'>
+ <div className='bp3-non-ideal-state-visual'>
+ <Icon icon={icon} size={iconSize} />
+ </div>
+ <div className='bp3-non-ideal-state-text'>
+ <h4 className='bp3-heading' style={{ margin: 0 }}>
+ {title}
+ </h4>
+ <div>{message}</div>
+ </div>
+ {onClick && actionText && (
+ <Button intent={Intent.NONE} onClick={onClick}>
+ {actionText}
+ </Button>
+ )}
+ </div>
+ </>
+ )
+}
+
+export default NoData
diff --git a/config-ui/src/components/SaveAlert.jsx b/config-ui/src/components/SaveAlert.jsx
index c4a1b8dc..424a1747 100644
--- a/config-ui/src/components/SaveAlert.jsx
+++ b/config-ui/src/components/SaveAlert.jsx
@@ -29,7 +29,7 @@ const SaveAlert = ({ alertOpen, onClose }) => {
intent={Intent.PRIMARY}
>
<h2 style={{ fontWeight: 'bold' }}><span style={{ fontWeight: 800 }}>API</span> Configuration Updated</h2>
- <p style={{ fontSize: '16px', fontFamily: 'Montserrat', color: '#E8471C' }}>
+ <p style={{ fontSize: '16px', color: '#E8471C' }}>
To apply new configuration, <strong>restart</strong> devlake by running <code>docker-compose up -d</code>.
</p>
<TextArea
diff --git a/config-ui/src/components/Sidebar.jsx b/config-ui/src/components/Sidebar.jsx
index b5b42b84..612a88dc 100644
--- a/config-ui/src/components/Sidebar.jsx
+++ b/config-ui/src/components/Sidebar.jsx
@@ -20,11 +20,13 @@ import {
// BrowserRouter as Router,
useRouteMatch,
} from 'react-router-dom'
-import { Button, Card, Elevation } from '@blueprintjs/core'
+import { Card, Elevation } from '@blueprintjs/core'
import request from '@/utils/request'
import SidebarMenu from '@/components/Sidebar/SidebarMenu'
import MenuConfiguration from '@/components/Sidebar/MenuConfiguration'
-import { DEVLAKE_ENDPOINT, GRAFANA_URL } from '@/utils/config'
+import { DEVLAKE_ENDPOINT } from '@/utils/config'
+import { ReactComponent as Logo } from '@/images/devlake-logo.svg'
+import { ReactComponent as LogoText } from '@/images/devlake-textmark.svg'
import '@/styles/sidebar.scss'
@@ -56,29 +58,31 @@ const Sidebar = () => {
return (
<Card interactive={false} elevation={Elevation.ZERO} className='card sidebar-card'>
- <img src='/logo.svg' className='logo' />
- <a href={GRAFANA_URL} rel='noreferrer' target='_blank' className='dashboardBtnLink'>
+ <div className='devlake-logo'>
+ <Logo width={48} height={48} className='logo' />
+ <LogoText width={100} height={13} className='logo-textmark' />
+ </div>
+ {/* <a href={GRAFANA_URL} rel='noreferrer' target='_blank' className='dashboardBtnLink'>
<Button icon='grouped-bar-chart' outlined={true} className='dashboardBtn'>View Dashboards</Button>
- </a>
+ </a> */}
- <h3
+ {/* <h3
className='sidebar-app-heading'
style={{
marginTop: '30px',
letterSpacing: '3px',
marginBottom: 0,
- fontFamily: '"Montserrat", sans-serif',
fontWeight: 900,
color: '#444444',
textAlign: 'center'
}}
>
<sup style={{ fontSize: '9px', color: '#cccccc', marginLeft: '-30px' }}>DEV</sup>LAKE
- </h3>
+ </h3> */}
<SidebarMenu menu={menu} />
<span className='copyright-tag'>
<span className='version-tag'>{versionTag || ''}</span><br />
- <strong>Apache 2.0 License</strong><br />© 2021 Merico
+ <strong>Apache 2.0 License</strong><br />
</span>
</Card>
)
diff --git a/config-ui/src/components/Sidebar/MenuConfiguration.jsx b/config-ui/src/components/Sidebar/MenuConfiguration.jsx
index ed01ca8c..c6fad4d4 100644
--- a/config-ui/src/components/Sidebar/MenuConfiguration.jsx
+++ b/config-ui/src/components/Sidebar/MenuConfiguration.jsx
@@ -16,6 +16,7 @@
*
*/
import { ProviderLabels } from '@/data/Providers'
+import { GRAFANA_URL } from '@/utils/config'
const MenuConfiguration = (activeRoute) => {
return [
@@ -61,61 +62,80 @@ const MenuConfiguration = (activeRoute) => {
}
]
},
- // {
- // id: 1,
- // label: 'Tasks',
- // icon: 'automatic-updates',
- // route: '/tasks',
- // disabled: true,
- // active: activeRoute.url === '/tasks',
- // children: [
- // ]
- // },
- // {
- // id: 2,
- // label: 'Triggers',
- // icon: 'asterisk',
- // classNames: [],
- // route: '/triggers',
- // active: activeRoute.url === '/triggers',
- // children: [
- // ]
- // },
{
- id: 3,
- label: 'Pipelines',
- icon: 'git-merge',
- classNames: [],
- route: '/pipelines',
- active: activeRoute.url.startsWith('/pipelines'),
+ id: 1,
+ label: 'Blueprints',
+ icon: 'home',
+ route: '/blueprints',
+ disabled: false,
+ active: activeRoute.url === '/blueprints',
children: [
{
id: 0,
- label: 'Create Pipeline Run',
- route: '/pipelines/create',
- active: activeRoute.url.endsWith('/pipelines/create'),
+ label: 'Create Bluepint',
+ route: '/blueprints/create',
+ active: activeRoute.url.endsWith('/blueprints/create'),
icon: 'git-pull',
classNames: [],
},
- {
- id: 1,
- label: 'All Pipeline Runs',
- route: '/pipelines',
- active: activeRoute.url.endsWith('/pipelines'),
- icon: 'layers',
- classNames: [],
- disabled: false
- },
- {
- id: 2,
- label: 'Pipeline Blueprints',
- route: '/blueprints',
- active: activeRoute.url.endsWith('/blueprints'),
- icon: 'grid',
- classNames: [],
- },
]
},
+ {
+ id: 2,
+ label: 'Connections',
+ disabled: true,
+ icon: 'git-merge',
+ classNames: [],
+ route: '/connections',
+ active: activeRoute.url === '/connections',
+ children: [
+ ]
+ },
+ {
+ id: 2,
+ label: 'Dashboard',
+ icon: 'dashboard',
+ classNames: [],
+ route: GRAFANA_URL,
+ active: false,
+ children: [
+ ]
+ },
+ // {
+ // id: 3,
+ // label: 'Pipelines',
+ // icon: 'git-merge',
+ // classNames: [],
+ // route: '/pipelines',
+ // active: activeRoute.url.startsWith('/pipelines'),
+ // children: [
+ // {
+ // id: 0,
+ // label: 'Create Pipeline Run',
+ // route: '/pipelines/create',
+ // active: activeRoute.url.endsWith('/pipelines/create'),
+ // icon: 'git-pull',
+ // classNames: [],
+ // },
+ // {
+ // id: 1,
+ // label: 'All Pipeline Runs',
+ // route: '/pipelines',
+ // active: activeRoute.url.endsWith('/pipelines'),
+ // icon: 'layers',
+ // classNames: [],
+ // disabled: false
+ // },
+ // {
+ // id: 2,
+ // label: 'Pipeline Blueprints',
+ // route: '/blueprints',
+ // active: activeRoute.url.endsWith('/blueprints'),
+ // icon: 'grid',
+ // classNames: [],
+ // },
+ // ]
+ // },
// {
// id: 3,
// label: 'Documentation',
diff --git a/config-ui/src/components/Sidebar/SidebarMenu.jsx b/config-ui/src/components/Sidebar/SidebarMenu.jsx
index 59d397d7..af1b3fd4 100644
--- a/config-ui/src/components/Sidebar/SidebarMenu.jsx
+++ b/config-ui/src/components/Sidebar/SidebarMenu.jsx
@@ -67,17 +67,6 @@ const SidebarMenu = (props) => {
)
))}
<Menu.Divider />
- {/* <Menu.Item
- text='API Configuration'
- icon='cog' href='/lake/api/configuration'
- active={top.location.href.endsWith('/lake/api/configuration')}
- /> */}
- <Menu.Item text='Documentation' icon='help' href='https://github.com/apache/incubator-devlake/blob/main/README.md' target='_blank' />
- <Menu.Item text='Merico Network' icon='globe-network'>
- <Menu.Item text='Merico GitHub' href='https://github.com/merico-dev' target='_blank' />
- <Menu.Item text='DevLake Github' href='https://github.com/apache/incubator-devlake' target='_blank' />
- <Menu.Item text='Merico Enterprise' href='https://meri.co/' target='_blank' />
- </Menu.Item>
</Menu>
</>
)
diff --git a/config-ui/src/components/Toast.jsx b/config-ui/src/components/Toast.jsx
index e5c176f3..31612ec3 100644
--- a/config-ui/src/components/Toast.jsx
+++ b/config-ui/src/components/Toast.jsx
@@ -19,5 +19,5 @@ import { Position, Toaster } from '@blueprintjs/core'
export const ToastNotification = Toaster.create({
className: 'recipe-toaster',
- position: Position.BOTTOM_RIGHT,
+ position: Position.BOTTOM,
})
diff --git a/config-ui/src/components/actions/DeleteAction.jsx b/config-ui/src/components/actions/DeleteAction.jsx
index 54f1114e..6ec40033 100644
--- a/config-ui/src/components/actions/DeleteAction.jsx
+++ b/config-ui/src/components/actions/DeleteAction.jsx
@@ -59,19 +59,6 @@ const DeleteAction = (props) => {
<>
<div style={{ padding: '15px 20px 15px 15px' }}>
{children}
- {/* <h3 style={{ color: 'rgb(219, 55, 55)' }}>DELETE CONFIRMATION</h3>
- <p className='confirmation-text'>
- <strong style={{
- fontFamily: 'Montserrat, sans-serif',
- fontSize: '14px',
- fontWeight: '800',
- color: 'rgb(219, 55, 55)'
- }}
- >
- Are you sure you want to continue?
- </strong>
- This instance will be permanently deleted and cannot be restored.
- </p> */}
<div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: 15 }}>
<Button
className={Classes.POPOVER2_DISMISS}
diff --git a/config-ui/src/components/blueprints/AddBlueprintDialog.jsx b/config-ui/src/components/blueprints/AddBlueprintDialog.jsx
index 2673773c..aed0fa21 100644
--- a/config-ui/src/components/blueprints/AddBlueprintDialog.jsx
+++ b/config-ui/src/components/blueprints/AddBlueprintDialog.jsx
@@ -76,21 +76,24 @@ const AddBlueprintDialog = (props) => {
isValidBlueprint = false,
pipelines = [],
detectedProviders = [],
- tasksLocked = false
+ tasksLocked = false,
} = props
- useEffect(() => {
- }, [enable, cronConfig, customCronConfig])
+ useEffect(() => {}, [enable, cronConfig, customCronConfig])
return (
<>
<Dialog
className='dialog-manage-blueprint'
icon={draftBlueprint ? 'edit' : 'add'}
- title={draftBlueprint ? `Edit ${draftBlueprint.name}` : 'Create Pipeline Blueprint'}
+ title={
+ draftBlueprint
+ ? `Edit ${draftBlueprint.name}`
+ : 'Create Pipeline Blueprint'
+ }
isOpen={isOpen}
onClose={() => setIsOpen(false)}
- onClosed={() => !tasksLocked ? setDraftBlueprint(null) : {}}
+ onClosed={() => (!tasksLocked ? setDraftBlueprint(null) : {})}
style={{ backgroundColor: '#ffffff' }}
>
<div className={Classes.DIALOG_BODY}>
@@ -111,10 +114,14 @@ const AddBlueprintDialog = (props) => {
className='formGroup-inline'
contentClassName='formGroupContent'
>
- <Label style={{ display: 'inline', marginRight: 0, fontWeight: 'bold' }}>
-
+ <Label
+ style={{
+ display: 'inline',
+ marginRight: 0,
+ fontWeight: 'bold',
+ }}
+ >
Blueprint Name
-
<span className='requiredStar'>*</span>
</Label>
<InputGroup
@@ -122,26 +129,44 @@ const AddBlueprintDialog = (props) => {
placeholder='Enter Blueprint Name'
value={name}
onChange={(e) => setBlueprintName(e.target.value)}
- className={`blueprint-name-input ${fieldHasError('Blueprint Name') ? 'invalid-field' : ''}`}
+ className={`blueprint-name-input ${
+ fieldHasError('Blueprint Name') ? 'invalid-field' : ''
+ }`}
inline={true}
style={{ marginBottom: '10px' }}
- rightElement={(
+ rightElement={
<InputValidationError
error={getFieldError('Blueprint Name')}
/>
- )}
+ }
/>
- <Label style={{ display: 'inline', lineHeight: '18px', marginRight: 0, marginBottom: 0, fontWeight: 'bold' }}>
+ <Label
+ style={{
+ display: 'inline',
+ lineHeight: '18px',
+ marginRight: 0,
+ marginBottom: 0,
+ fontWeight: 'bold',
+ }}
+ >
Frequency
<span className='requiredStar'>*</span>
</Label>
{getCronPresetByConfig(cronConfig)
? (
- <small style={{ fontSize: '10px', color: Colors.GRAY2, display: 'block' }}>
+ <small
+ style={{
+ fontSize: '10px',
+ color: Colors.GRAY2,
+ display: 'block',
+ }}
+ >
{getCronPresetByConfig(cronConfig).description}
</small>
)
- : ''}
+ : (
+ ''
+ )}
<RadioGroup
inline={true}
label={false}
@@ -151,28 +176,42 @@ const AddBlueprintDialog = (props) => {
required
>
{/* Dynamic Presets from Connection Manager */}
- {[getCronPreset('hourly'),
+ {[
+ getCronPreset('hourly'),
getCronPreset('daily'),
getCronPreset('weekly'),
- getCronPreset('monthly')].map((preset, prIdx) => (
- <Radio
- key={`cron-preset-tooltip-key${prIdx}`}
- label={(
- <>
- <Tooltip
- position={Position.TOP}
- intent={Intent.PRIMARY}
- content={preset.description}
- >{preset.label}
- </Tooltip>
- </>
- )}
- value={preset.cronConfig}
- style={{ fontWeight: cronConfig === preset.cronConfig ? 'bold' : 'normal', outline: 'none !important' }}
- />
-
+ getCronPreset('monthly'),
+ ].map((preset, prIdx) => (
+ <Radio
+ key={`cron-preset-tooltip-key${prIdx}`}
+ label={
+ <>
+ <Tooltip
+ position={Position.TOP}
+ intent={Intent.PRIMARY}
+ content={preset.description}
+ >
+ {preset.label}
+ </Tooltip>
+ </>
+ }
+ value={preset.cronConfig}
+ style={{
+ fontWeight:
+ cronConfig === preset.cronConfig
+ ? 'bold'
+ : 'normal',
+ outline: 'none !important',
+ }}
+ />
))}
- <Radio label='Custom' value='custom' style={{ fontWeight: cronConfig === 'custom' ? 'bold' : 'normal' }} />
+ <Radio
+ label='Custom'
+ value='custom'
+ style={{
+ fontWeight: cronConfig === 'custom' ? 'bold' : 'normal',
+ }}
+ />
</RadioGroup>
<div style={{ display: 'flex' }}>
<FormGroup
@@ -185,25 +224,50 @@ const AddBlueprintDialog = (props) => {
style={{ marginBottom: '5px' }}
fill={false}
>
- <Label style={{ display: 'inline', marginRight: 0, fontWeight: 'bold' }}>
+ <Label
+ style={{
+ display: 'inline',
+ marginRight: 0,
+ fontWeight: 'bold',
+ }}
+ >
Custom Schedule
- {cronConfig === 'custom' && <span className='requiredStar'>*</span>}
+ {cronConfig === 'custom' && (
+ <span className='requiredStar'>*</span>
+ )}
</Label>
<InputGroup
id='cron-custom'
readOnly={cronConfig !== 'custom'}
- leftElement={cronConfig !== 'custom'
- ? <Icon icon='lock' size={11} style={{ alignSelf: 'center', margin: '4px 10px -2px 6px' }} />
- : null}
- rightElement={(
+ leftElement={
+ cronConfig !== 'custom'
+ ? (
+ <Icon
+ icon='lock'
+ size={11}
+ style={{
+ alignSelf: 'center',
+ margin: '4px 10px -2px 6px',
+ }}
+ />
+ )
+ : null
+ }
+ rightElement={
<InputValidationError
error={getFieldError('Blueprint Cron')}
/>
- )}
+ }
placeholder='Enter Crontab Syntax'
- value={cronConfig !== 'custom' ? cronConfig : customCronConfig}
+ value={
+ cronConfig !== 'custom'
+ ? cronConfig
+ : customCronConfig
+ }
onChange={(e) => setCustomCronConfig(e.target.value)}
- className={`cron-custom-input ${fieldHasError('Blueprint Cron') ? 'invalid-field' : ''}`}
+ className={`cron-custom-input ${
+ fieldHasError('Blueprint Cron') ? 'invalid-field' : ''
+ }`}
inline={true}
fill={false}
style={{ transition: 'none' }}
@@ -218,44 +282,79 @@ const AddBlueprintDialog = (props) => {
enforceFocus={false}
usePortal={false}
>
- <a href='#' rel='noreferrer'><Icon icon='help' size={14} style={{ marginLeft: '10px', transition: 'none' }} /></a>
+ <a href='#' rel='noreferrer'>
+ <Icon
+ icon='help'
+ size={14}
+ style={{ marginLeft: '10px', transition: 'none' }}
+ />
+ </a>
<>
- <div style={{ textShadow: 'none', fontSize: '12px', padding: '12px', maxWidth: '300px' }}>
- <div style={{
- marginBottom: '10px',
- fontWeight: 700,
- fontSize: '14px',
- fontFamily: '"Montserrat", sans-serif'
+ <div
+ style={{
+ textShadow: 'none',
+ fontSize: '12px',
+ padding: '12px',
+ maxWidth: '300px',
}}
+ >
+ <div
+ style={{
+ marginBottom: '10px',
+ fontWeight: 700,
+ fontSize: '14px',
+ }}
>
- <Icon icon='help' size={16} style={{ marginRight: '5px' }} /> Cron Expression Format
+ <Icon
+ icon='help'
+ size={16}
+ style={{ marginRight: '5px' }}
+ />{' '}
+ Cron Expression Format
</div>
- <p>Need Help? — For additional information on <strong>Crontab</strong>,
- please reference the{' '}
+ <p>
+ Need Help? — For additional information on{' '}
+ <strong>Crontab</strong>, please reference the{' '}
<a
href='https://man7.org/linux/man-pages/man5/crontab.5.html'
rel='noreferrer'
- target='_blank' style={{ textDecoration: 'underline' }}
+ target='_blank'
+ style={{ textDecoration: 'underline' }}
>
Crontab Linux manual
- </a>.
+ </a>
+ .
</p>
- <img src={CronHelp} style={{ border: 0, margin: 0, maxWidth: '100%' }} />
+ <img
+ src={CronHelp}
+ style={{ border: 0, margin: 0, maxWidth: '100%' }}
+ />
</div>
</>
</Popover>
</div>
</div>
-
</FormGroup>
</div>
<div className='formContainer'>
<FormGroup
disabled={isSaving}
- label={<strong>Pipeline Tasks<span className='requiredStar'>*</span></strong>}
- labelInfo={tasksLocked
- ? ''
- : <span style={{ display: 'block' }}>Choose Pipeline Run Template for task configuration</span>}
+ label={
+ <strong>
+ Pipeline Tasks<span className='requiredStar'>*</span>
+ </strong>
+ }
+ labelInfo={
+ tasksLocked
+ ? (
+ ''
+ )
+ : (
+ <span style={{ display: 'block' }}>
+ Choose Pipeline Run Template for task configuration
+ </span>
+ )
+ }
inline={false}
labelFor='blueprint-tasks'
className=''
@@ -268,12 +367,19 @@ const AddBlueprintDialog = (props) => {
<Select
disabled={isSaving || pipelines.length === 0}
className='selector-blueprint-tasks'
- popoverProps={{ usePortal: false, popoverClassName: 'blueprint-tasks-popover', fill: true }}
+ popoverProps={{
+ usePortal: false,
+ popoverClassName: 'blueprint-tasks-popover',
+ fill: true,
+ }}
inline={true}
fill={true}
items={pipelines}
activeItem={selectedPipelineTemplate}
- itemPredicate={(query, item) => item?.title?.toLowerCase().indexOf(query.toLowerCase()) >= 0}
+ itemPredicate={(query, item) =>
+ item?.title
+ ?.toLowerCase()
+ .indexOf(query.toLowerCase()) >= 0}
itemRenderer={(item, { handleClick, modifiers }) => (
<MenuItem
active={modifiers.active}
@@ -283,14 +389,26 @@ const AddBlueprintDialog = (props) => {
text={
<span style={{ paddingRight: '20px' }}>
<Icon
- color={item.status === 'TASK_COMPLETED' ? Colors.GREEN4 : Colors.GRAY4}
- icon={item.status === 'TASK_COMPLETED' ? 'small-tick' : 'dot'} size={11}
- /> {item.title}
+ color={
+ item.status === 'TASK_COMPLETED'
+ ? Colors.GREEN4
+ : Colors.GRAY4
+ }
+ icon={
+ item.status === 'TASK_COMPLETED'
+ ? 'small-tick'
+ : 'dot'
+ }
+ size={11}
+ />{' '}
+ {item.title}
</span>
- }
+ }
/>
)}
- noResults={<MenuItem disabled={true} text='No Pipeline Runs.' />}
+ noResults={
+ <MenuItem disabled={true} text='No Pipeline Runs.' />
+ }
onItemSelect={(item) => {
setSelectedPipelineTemplate(item)
}}
@@ -298,24 +416,35 @@ const AddBlueprintDialog = (props) => {
<Button
className='btn-pipeline-selector'
disabled={isSaving}
- style={{ justifyContent: 'space-between', minWidth: '300px', maxWidth: '460px', whiteSpace: 'nowrap' }}
- text={selectedPipelineTemplate ? `${selectedPipelineTemplate?.title}` : 'Select Pipeline Run Tasks'}
+ style={{
+ justifyContent: 'space-between',
+ minWidth: '300px',
+ maxWidth: '460px',
+ whiteSpace: 'nowrap',
+ }}
+ text={
+ selectedPipelineTemplate
+ ? `${selectedPipelineTemplate?.title}`
+ : 'Select Pipeline Run Tasks'
+ }
icon='double-caret-vertical'
fill={true}
- rightIcon={(
+ rightIcon={
<span style={{ marginRight: '5px' }}>
<InputValidationError
error={getFieldError('Blueprint Tasks')}
/>
</span>
- )}
+ }
/>
</Select>
<Button
icon='eraser'
intent={Intent.WARNING}
disabled={isSaving}
- onClick={() => setSelectedPipelineTemplate(null) | setBlueprintTasks([])}
+ onClick={() =>
+ setSelectedPipelineTemplate(null) |
+ setBlueprintTasks([])}
/>
</ButtonGroup>
)}
@@ -323,14 +452,16 @@ const AddBlueprintDialog = (props) => {
</div>
<div>
<PipelineTasks tasks={detectedProviders} />
- {!tasksLocked && tasks.length > 0 &&
- (
- <Button
- onClick={() => setBlueprintTasks([]) | setSelectedPipelineTemplate(null)}
- icon='eraser'
- round minimal text='Clear'
- />
- )}
+ {!tasksLocked && tasks.length > 0 && (
+ <Button
+ onClick={() =>
+ setBlueprintTasks([]) | setSelectedPipelineTemplate(null)}
+ icon='eraser'
+ round
+ minimal
+ text='Clear'
+ />
+ )}
</div>
<div className='formContainer'>
<FormGroup
@@ -341,7 +472,13 @@ const AddBlueprintDialog = (props) => {
contentClassName='formGroupContent'
style={{ marginBottom: '5px' }}
>
- <Label style={{ display: 'inline', marginRight: 0, fontWeight: 'bold' }}>
+ <Label
+ style={{
+ display: 'inline',
+ marginRight: 0,
+ fontWeight: 'bold',
+ }}
+ >
Enable Blueprint?
<span className='requiredStar'>*</span>
</Label>
@@ -350,42 +487,67 @@ const AddBlueprintDialog = (props) => {
name='blueprint-enable'
checked={enable}
label={enable ? 'Active' : 'Inactive'}
- onChange={() => setEnableBlueprint(e => !e)}
+ onChange={() => setEnableBlueprint((e) => !e)}
style={{ marginBottom: 0, marginTop: 0 }}
/>
</FormGroup>
</div>
<div>
<div>
- <Label style={{ display: 'inline', marginRight: 0, marginBottom: 0 }}>
+ <Label
+ style={{
+ display: 'inline',
+ marginRight: 0,
+ marginBottom: 0,
+ }}
+ >
Next Run Date
</Label>
</div>
<div style={{ fontSize: '14px', fontWeight: 800 }}>
{getFieldError('Blueprint Cron') && (
- <Icon icon='warning-sign' size={14} color={Colors.RED4} style={{ marginRight: '5px' }} />
+ <Icon
+ icon='warning-sign'
+ size={14}
+ color={Colors.RED4}
+ style={{ marginRight: '5px' }}
+ />
)}
- {dayjs(createCron(cronConfig === 'custom'
- ? customCronConfig
- : cronConfig).next().toString()).format('L LTS')} ·{' '}
- <span style={{ color: Colors.GRAY3 }}>({dayjs(createCron(cronConfig === 'custom'
- ? customCronConfig
- : cronConfig).next().toString()).fromNow()})
+ {dayjs(
+ createCron(
+ cronConfig === 'custom' ? customCronConfig : cronConfig
+ )
+ .next()
+ .toString()
+ ).format('L LTS')}{' '}
+ ·{' '}
+ <span style={{ color: Colors.GRAY3 }}>
+ (
+ {dayjs(
+ createCron(
+ cronConfig === 'custom' ? customCronConfig : cronConfig
+ )
+ .next()
+ .toString()
+ ).fromNow()}
+ )
</span>
</div>
</div>
</div>
)}
-
</div>
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
- <Button disabled={isSaving} onClick={() => setIsOpen(false)}>Cancel</Button>
+ <Button disabled={isSaving} onClick={() => setIsOpen(false)}>
+ Cancel
+ </Button>
<Button
disabled={isSaving || !isValidBlueprint}
icon='cloud-upload'
intent={Intent.PRIMARY}
- onClick={() => saveBlueprint(draftBlueprint ? draftBlueprint.id : null)}
+ onClick={() =>
+ saveBlueprint(draftBlueprint ? draftBlueprint.id : null)}
>
{draftBlueprint ? 'Modify Blueprint' : 'Save Blueprint'}
</Button>
diff --git a/config-ui/src/components/blueprints/BlueprintNameCard.jsx b/config-ui/src/components/blueprints/BlueprintNameCard.jsx
new file mode 100644
index 00000000..7ccf46d6
--- /dev/null
+++ b/config-ui/src/components/blueprints/BlueprintNameCard.jsx
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import { InputGroup, Divider, Elevation, Card } from '@blueprintjs/core'
+import InputValidationError from '@/components/validation/InputValidationError'
+
+const BlueprintNameCard = (props) => {
+ const {
+ activeStep,
+ name,
+ setBlueprintName = () => {},
+ fieldHasError = () => {},
+ getFieldError = () => {},
+ advancedMode = false,
+ } = props
+
+ return (
+ <Card
+ className='workflow-card'
+ elevation={Elevation.TWO}
+ style={{ width: '100%' }}
+ >
+ <h3>
+ {advancedMode ? 'Advanced' : ''} Blueprint Name{' '}
+ <span className='required-star'>*</span>
+ </h3>
+ <Divider className='section-divider' />
+ <p>
+ Give your Blueprint a unique name to help you identify it in the future.
+ </p>
+ <InputGroup
+ id='blueprint-name'
+ placeholder='Enter Blueprint Name'
+ value={name}
+ onChange={(e) => setBlueprintName(e.target.value)}
+ className={`blueprint-name-input ${
+ fieldHasError('Blueprint Name') ? 'invalid-field' : ''
+ }`}
+ inline={true}
+ style={{ marginBottom: '10px' }}
+ rightElement={
+ <InputValidationError error={getFieldError('Blueprint Name')} />
+ }
+ />
+ </Card>
+ )
+}
+
+export default BlueprintNameCard
diff --git a/config-ui/src/components/blueprints/BlueprintsGrid.jsx b/config-ui/src/components/blueprints/BlueprintsGrid.jsx
index 9b9318c2..d7370e56 100644
--- a/config-ui/src/components/blueprints/BlueprintsGrid.jsx
+++ b/config-ui/src/components/blueprints/BlueprintsGrid.jsx
@@ -173,7 +173,6 @@ const BlueprintsGrid = (props) => {
marginLeft: '25px',
fontSize: '9px',
fontWeight: '400',
- fontFamily: 'Montserrat, sans-serif',
color: '#777777'
}}
>
@@ -209,17 +208,12 @@ const BlueprintsGrid = (props) => {
<label style={{
fontSize: '9px',
fontWeight: '400',
- fontFamily: 'Montserrat, sans-serif',
color: '#777777'
}}
>
Blueprint Name
</label>
</div>
- <Icon
- size={16}
- icon={b.enable ? 'calendar' : 'disable'}
- />
{b.name}
</div>
<div className='blueprint-interval' style={{ flex: 1, minWidth: '60px' }}>
@@ -227,7 +221,6 @@ const BlueprintsGrid = (props) => {
<label style={{
fontSize: '9px',
fontWeight: '400',
- fontFamily: 'Montserrat, sans-serif',
color: '#777777'
}}
>
@@ -241,7 +234,6 @@ const BlueprintsGrid = (props) => {
<label style={{
fontSize: '9px',
fontWeight: '400',
- fontFamily: 'Montserrat, sans-serif',
color: '#777777'
}}
>
@@ -251,18 +243,17 @@ const BlueprintsGrid = (props) => {
<div>
{dayjs(getNextRunDate(b.cronConfig)).format('L LTS')}
</div>
- <div>
+ {/* <div>
<span style={{ color: b.enable ? Colors.GREEN5 : Colors.GRAY3, position: 'absolute', bottom: '4px' }}>
{b.cronConfig}
</span>
- </div>
+ </div> */}
</div>
<div className='blueprint-actions' style={{ flex: 1, textAlign: 'right' }}>
<div style={{ height: '24px', lineHeight: '24px' }}>
<label style={{
fontSize: '9px',
fontWeight: '400',
- fontFamily: 'Montserrat, sans-serif',
color: '#777777'
}}
>
@@ -272,18 +263,18 @@ const BlueprintsGrid = (props) => {
<div style={{ display: 'flex', alignItems: 'center', justifySelf: 'flex-end' }}>
<Button small minimal style={{ marginLeft: 'auto', marginRight: '5px' }} onClick={() => configureBlueprint(b)}>
<Tooltip
- content='Blueprint Settings'
+ content='Blueprint Detail'
interactionKind={PopoverInteractionKind.HOVER}
openOnTargetFocus={false}
enforceFocus={false}
autoFocus={false}
>
- <Icon icon='cog' size={16} color={Colors.GRAY3} />
+ <Icon icon='eye-open' size={16} color={Colors.GRAY3} />
</Tooltip>
</Button>
- <Popover position={Position.LEFT}>
- <Button small minimal style={{ marginRight: '10px' }}>
- <Icon icon='trash' color={Colors.GRAY3} size={15} />
+ <Popover position={Position.LEFT} disabled>
+ <Button disabled small minimal style={{ marginRight: '10px' }}>
+ <Icon icon='trash' color={Colors.LIGHT_GRAY3} size={15} />
</Button>
<DeletePopover
activeBlueprint={b}
@@ -313,7 +304,7 @@ const BlueprintsGrid = (props) => {
}}
>
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', margin: '0', padding: '10px' }}>
- <div style={{ fontFamily: 'Montserrat', letterSpacing: '1px', fontWeight: 800 }}>
+ <div style={{ letterSpacing: '1px', fontWeight: 800 }}>
<Icon icon='bold' color={Colors.BLUE4} size={14} style={{ marginRight: '5px' }} /> BLUEPRINT ID {activeBlueprint?.id}
{isLoading && (
<span style={{ paddingLeft: '20px', fontWeight: 700, color: '#777777', fontSize: '11px' }}>
@@ -339,10 +330,10 @@ const BlueprintsGrid = (props) => {
<Divider style={{ marginRight: 0, marginLeft: 0 }} />
<div style={{ padding: '20px', display: 'flex' }}>
<div style={{ flex: 2, paddingRight: '30px' }}>
- <h3 style={{ margin: 0, textTransform: 'uppercase' }}>Pipeline Run Schedule</h3>
+ <h3 style={{ margin: 0, textTransform: 'uppercase' }}>Run Schedule</h3>
<p style={{ margin: 0 }}>
Based on the current CRON settings, here are next{' '}
- <strong>5</strong> expected pipeline collection dates.
+ <strong>5</strong> expected data collection dates.
</p>
<div style={{ margin: '10px 0' }}>
{activeBlueprint?.id && blueprintSchedule.map((s, sIdx) => (
@@ -359,7 +350,7 @@ const BlueprintsGrid = (props) => {
<div className='related-pipelines-list' style={{ marginBottom: '20px' }}>
{!isLoading && (
<h3 style={{ margin: '0 0 5px 0', textTransform: 'uppercase' }}>
- Pipeline Runs <small style={{ color: Colors.GRAY5 }}>(last 5)</small>
+ Historical Runs <small style={{ color: Colors.GRAY5 }}>(last 5)</small>
</h3>
)}
{!isLoading && pipelines.length === 0 && (<p>No Pipelines have been found for this blueprint.</p>)}
@@ -367,7 +358,7 @@ const BlueprintsGrid = (props) => {
<div
key={`pipeline-run-key-${pIdx}`}
className='pipeline-run-entry'
- style={{ display: 'flex', justifyContent: 'flex-start', alignItems: 'center' }}
+ style={{ display: 'flex', justifyContent: 'flex-start', alignItems: 'center', padding: '4px 0' }}
>
<div
className='pipeline-id'
@@ -397,39 +388,39 @@ const BlueprintsGrid = (props) => {
</div>
<div>{p.status?.replace('TASK_', '')}</div>
<div style={{ padding: '0 15px' }}>
- <Button
- onClick={() => onViewPipeline(p.id || p.ID)}
+ {/* <Button
+ onClick={() => onViewPipeline(b.blueprintId)}
icon='eye-open'
size={14}
color={Colors.GRAY3}
small minimal
- />
+ /> */}
</div>
</div>
))}
</div>
{!b.enable && (
- <p style={{ marginTop: '10px 0 0 0', fontSize: '9px', fontFamily: 'Montserrat, sans-serif' }}>
+ <p style={{ marginTop: '10px 0 0 0', fontSize: '9px' }}>
<Icon icon='warning-sign' size={11} color={Colors.ORANGE5} style={{ float: 'left', marginRight: '5px' }} />
Blueprint is NOT Enabled / Active this schedule will not run.
</p>
)}
</div>
<div style={{ flex: 1 }}>
- <label style={{ color: Colors.GRAY1, fontFamily: 'Montserrat,sans-serif' }}>Blueprint</label>
+ <label style={{ color: Colors.GRAY1 }}>Blueprint</label>
<h3 style={{ marginTop: 0, fontSize: '18px', fontWeight: 800 }}>
{b.name}
</h3>
- <label style={{ color: Colors.GRAY1, fontFamily: 'Montserrat,sans-serif' }}>Crontab Configuration</label>
+ <label style={{ color: Colors.GRAY1 }}>Crontab Configuration</label>
<h3 style={{ margin: '0 0 20px 0', fontSize: '18px' }}>{b.cronConfig}</h3>
- <label style={{ color: Colors.GRAY1, fontFamily: 'Montserrat,sans-serif' }}>Next Run</label>
+ <label style={{ color: Colors.GRAY1 }}>Next Run</label>
<h3 style={{ margin: '0 0 20px 0', fontSize: '18px' }}>
{dayjs(getNextRunDate(b.cronConfig)).fromNow()}
</h3>
- <label style={{ color: Colors.GRAY3, fontFamily: 'Montserrat,sans-serif' }}>Operations</label>
+ {/* <label style={{ color: Colors.GRAY3 }}>Operations</label> */}
<div style={{
marginTop: '5px',
display: 'flex',
@@ -439,7 +430,7 @@ const BlueprintsGrid = (props) => {
fontSize: '10px'
}}
>
- <Button
+ {/* <Button
intent={Intent.PRIMARY}
icon='cog'
text='Settings'
@@ -461,7 +452,7 @@ const BlueprintsGrid = (props) => {
label={b.enable ? 'Disable' : 'Enable'}
onChange={() => handleBlueprintActivation(b)}
style={{ marginBottom: '0', fontSize: '11px' }}
- />
+ /> */}
</div>
</div>
@@ -478,7 +469,6 @@ const BlueprintsGrid = (props) => {
letterSpacing: '2px',
textTransform: 'uppercase',
margin: 0,
- fontFamily: '"Montserrat", sans-serif'
}}
>0 Blueprints
</h3>
@@ -489,7 +479,7 @@ const BlueprintsGrid = (props) => {
)}
</div>
</Card>
- <div style={{
+ {/* <div style={{
display: 'flex',
margin: '20px 10px',
alignSelf: 'flex-start',
@@ -503,7 +493,7 @@ const BlueprintsGrid = (props) => {
<span>by {' '} <strong>Administrator</strong></span><br />
Displaying {activeFilterStatus ? filteredBlueprints.length : blueprints.length} Blueprints from API.
</div>
- </div>
+ </div> */}
</>
)
}
diff --git a/config-ui/src/components/blueprints/BoardsSelector.jsx b/config-ui/src/components/blueprints/BoardsSelector.jsx
new file mode 100644
index 00000000..baf026d0
--- /dev/null
+++ b/config-ui/src/components/blueprints/BoardsSelector.jsx
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React from 'react'
+import {
+ Intent,
+ MenuItem,
+} from '@blueprintjs/core'
+import { MultiSelect, Select } from '@blueprintjs/select'
+const BoardsSelector = (props) => {
+ const {
+ boards = [],
+ configuredConnection,
+ placeholder = 'Select boards',
+ items = [],
+ selectedItems = [],
+ // eslint-disable-next-line max-len
+ restrictedItems = [],
+ activeItem = null,
+ disabled = false,
+ isSaving = false,
+ onItemSelect = () => {},
+ onRemove = () => {},
+ onClear = () => {},
+ itemRenderer = (item, { handleClick, modifiers }) => (
+ <MenuItem
+ active={modifiers.active || selectedItems.find(i => i.id === item.id)}
+ disabled={
+ selectedItems.find(i => i.id === item.id)
+ }
+ key={item.value}
+ // label=
+ onClick={handleClick}
+ text={
+ selectedItems.find(i => i.id === item.id)
+ ? (
+ <>
+ <input type='checkbox' checked readOnly /> {item.title}
+ </>
+ )
+ : (
+ <span style={{ fontWeight: 700 }}>
+ <input type='checkbox' readOnly /> {item.title}
+ </span>
+ )
+ }
+ style={{
+ marginBottom: '2px',
+ fontWeight: items.includes(item) ? 700 : 'normal',
+ }}
+ />
+ ),
+ tagRenderer = (item) => item.title,
+ } = props
+ return (
+ <>
+ <div
+ className='boards-multiselect'
+ style={{ display: 'flex', marginBottom: '10px' }}
+ >
+ <div
+ className='boards-multiselect-selector'
+ style={{ minWidth: '200px', width: '100%' }}
+ >
+ <MultiSelect
+ disabled={disabled || isSaving}
+ // openOnKeyDown={true}
+ resetOnSelect={true}
+ placeholder={placeholder}
+ popoverProps={{ usePortal: false, minimal: true }}
+ className='multiselector-boards'
+ inline={true}
+ fill={true}
+ items={items}
+ selectedItems={selectedItems}
+ activeItem={activeItem}
+ itemPredicate={(query, item) =>
+ item?.title.toLowerCase().indexOf(query.toLowerCase()) >= 0}
+ itemRenderer={itemRenderer}
+ tagRenderer={tagRenderer}
+ tagInputProps={{
+ tagProps: {
+ intent: Intent.PRIMARY,
+ minimal: true,
+ },
+ }}
+ noResults={<MenuItem disabled={true} text='No Boards Available.' />}
+ onRemove={(item) => {
+ onRemove((rT) => {
+ return {
+ ...rT,
+ [configuredConnection.id]: rT[configuredConnection.id].filter(
+ (t) => t.id !== item.id
+ ),
+ }
+ })
+ }}
+ onItemSelect={(item) => {
+ onItemSelect((rT) => {
+ return !rT[configuredConnection.id].includes(item)
+ ? {
+ ...rT,
+ [configuredConnection.id]: [
+ ...rT[configuredConnection.id],
+ item,
+ ],
+ }
+ : { ...rT }
+ })
+ }}
+ style={{ borderRight: 0 }}
+ />
+ </div>
+ </div>
+ </>
+ )
+}
+
+export default BoardsSelector
diff --git a/config-ui/src/components/blueprints/ConnectionDialog.jsx b/config-ui/src/components/blueprints/ConnectionDialog.jsx
new file mode 100644
index 00000000..05079dcd
--- /dev/null
+++ b/config-ui/src/components/blueprints/ConnectionDialog.jsx
@@ -0,0 +1,375 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { useEffect, useState, useRef, useCallback } from 'react'
+// import dayjs from '@/utils/time'
+import {
+ Button,
+ Classes,
+ Colors,
+ Dialog,
+ Elevation,
+ FormGroup,
+ Icon,
+ Intent,
+ Label,
+ MenuItem,
+} from '@blueprintjs/core'
+import { Select } from '@blueprintjs/select'
+import {
+ Providers,
+ // ProviderTypes,
+ ProviderLabels,
+ ProviderFormLabels,
+ ProviderFormPlaceholders,
+ ProviderConnectionLimits,
+ // ProviderIcons,
+} from '@/data/Providers'
+import { NullBlueprintConnection } from '@/data/NullBlueprintConnection'
+import InputValidationError from '@/components/validation/InputValidationError'
+import ContentLoader from '@/components/loaders/ContentLoader'
+import ConnectionForm from '@/pages/configure/connections/ConnectionForm'
+
+const Modes = {
+ CREATE: 'create',
+ EDIT: 'edit',
+}
+
+// @todo: lift data sources list to configuration level, requires expansion when more providers are added..
+const DATA_SOURCES_LIST = [
+ {
+ id: 1,
+ name: Providers.JIRA,
+ title: ProviderLabels[Providers.JIRA.toUpperCase()],
+ value: Providers.JIRA,
+ },
+ {
+ id: 2,
+ name: Providers.GITHUB,
+ title: ProviderLabels[Providers.GITHUB.toUpperCase()],
+ value: Providers.GITHUB,
+ },
+ {
+ id: 3,
+ name: Providers.GITLAB,
+ title: ProviderLabels[Providers.GITLAB.toUpperCase()],
+ value: Providers.GITLAB,
+ },
+ {
+ id: 4,
+ name: Providers.JENKINS,
+ title: ProviderLabels[Providers.JENKINS.toUpperCase()],
+ value: Providers.JENKINS,
+ },
+]
+
+const ConnectionDialog = (props) => {
+ const {
+ isOpen = false,
+ activeProvider,
+ integrations = [],
+ setProvider = () => {},
+ setTestStatus = () => {},
+ setTestResponse = () => {},
+ connection = NullBlueprintConnection,
+ name,
+ endpointUrl,
+ proxy,
+ token,
+ initialTokenStore = {},
+ username,
+ password,
+ isLocked = false,
+ isLoading = false,
+ isTesting = false,
+ isSaving = false,
+ isValid = false,
+ // editMode = false,
+ dataSourcesList = DATA_SOURCES_LIST,
+ labels = ProviderLabels[connection.provider],
+ placeholders = ProviderFormPlaceholders[connection.provider],
+ onTest = () => {},
+ onSave = () => {},
+ onClose = () => {},
+ onCancel = () => {},
+ onValidate = () => {},
+ onNameChange = () => {},
+ onEndpointChange = () => {},
+ onProxyChange = () => {},
+ onTokenChange = () => {},
+ onUsernameChange = () => {},
+ onPasswordChange = () => {},
+ showConnectionError = false,
+ testStatus,
+ testResponse,
+ allTestResponses,
+ errors = [],
+ validationErrors = [],
+ canOutsideClickClose = false,
+ // authType,
+ // showLimitWarning = false
+ } = props
+
+ const [datasource, setDatasource] = useState(
+ connection?.id
+ ? dataSourcesList.find((d) => d.value === connection.provider)
+ : dataSourcesList[0]
+ )
+
+ const [stateErrored, setStateErrored] = useState(false)
+
+ const [mode, setMode] = useState(Modes.CREATE)
+
+ const getFieldError = (fieldId) => {
+ return errors.find((e) => e.includes(fieldId))
+ }
+
+ const activateErrorStates = (elementId) => {
+ setStateErrored(elementId || false)
+ }
+
+ const getConnectionStatusIcon = useCallback(() => {
+ let i = <Icon icon='full-circle' size='10' color={Colors.RED5} />
+ switch (testStatus) {
+ case 1:
+ i = <Icon icon='full-circle' size='10' color={Colors.GREEN3} />
+ break
+ case 2:
+ i = <Icon icon='full-circle' size='10' color={Colors.RED5} />
+ break
+ case 0:
+ default:
+ i = <Icon icon='full-circle' size='10' color={Colors.GRAY3} />
+ break
+ }
+ return i
+ }, [testStatus])
+
+ useEffect(() => {
+ if (connection?.id !== null && connection?.id !== undefined) {
+ setMode(Modes.EDIT)
+ setDatasource(
+ dataSourcesList.find((d) => d.value === connection.provider)
+ )
+ } else {
+ setMode(Modes.CREATE)
+ }
+ }, [connection, dataSourcesList])
+
+ useEffect(() => {
+ console.log('>>> DATASOURCE CHANGED....', datasource)
+ setProvider(integrations.find((p) => p.id === datasource.value))
+ setTestStatus(0)
+ setTestResponse(null)
+ }, [datasource, integrations, setProvider, setTestResponse, setTestStatus])
+
+ useEffect(() => {}, [testStatus])
+
+ return (
+ <>
+ <Dialog
+ className='dialog-manage-connection'
+ icon={mode === Modes.EDIT ? 'edit' : 'add'}
+ title={
+ mode === Modes.EDIT
+ ? `Modify ${connection?.name} [#${connection?.value}]`
+ : 'Create a New Data Connection'
+ }
+ isOpen={isOpen}
+ onClose={onClose}
+ onClosed={() => {}}
+ // prevent outside close so user can edit without accidental closing of dialog
+ canOutsideClickClose={canOutsideClickClose}
+ style={{ backgroundColor: '#ffffff' }}
+ >
+ <div className={Classes.DIALOG_BODY}>
+ {isLoading || isSaving ? (
+ <ContentLoader
+ title={`${isSaving ? 'Saving' : 'Loading'} Connection...`}
+ elevation={Elevation.ZERO}
+ message='Please wait.'
+ />
+ ) : (
+ <>
+ <div className='manage-connection'>
+ <div className='formContainer'>
+ <FormGroup
+ disabled={isTesting || isSaving || isLocked}
+ label=''
+ inline={true}
+ labelFor='selector-datasource'
+ className='formGroup-inline'
+ contentClassName='formGroupContent'
+ >
+ <Label style={{ display: 'inline', marginRight: 0 }}>
+ {labels ? labels.datasource : <>Data Source</>}
+ <span className='requiredStar'>*</span>
+ </Label>
+ <Select
+ popoverProps={{ usePortal: false }}
+ className='selector-datasource'
+ id='selector-datasource'
+ inline={false}
+ fill={true}
+ items={dataSourcesList}
+ activeItem={datasource}
+ itemPredicate={(query, item) =>
+ item.title.toLowerCase().indexOf(query.toLowerCase()) >=
+ 0}
+ itemRenderer={(item, { handleClick, modifiers }) => (
+ <MenuItem
+ active={modifiers.active}
+ key={item.value}
+ label={item.value}
+ onClick={handleClick}
+ text={item.title}
+ />
+ )}
+ noResults={
+ <MenuItem disabled={true} text='No data sources.' />
+ }
+ onItemSelect={(item) => {
+ setDatasource(item)
+ }}
+ readOnly={connection?.id !== null && mode === Modes.EDIT}
+ >
+ <Button
+ disabled={
+ connection?.id !== null && mode === Modes.EDIT
+ }
+ className='btn-select-datasource'
+ intent={Intent.NONE}
+ text={
+ datasource
+ ? `${datasource.title}`
+ : '< Select Datasource >'
+ }
+ rightIcon='double-caret-vertical'
+ fill
+ style={{
+ maxWidth: '260px',
+ display: 'flex',
+ justifyContent: 'space-between',
+ }}
+ />
+ </Select>
+ </FormGroup>
+ </div>
+
+ <div
+ className='connection-form-wrapper'
+ style={{ display: 'flex' }}
+ >
+ <ConnectionForm
+ isValid={isValid}
+ validationErrors={validationErrors}
+ activeProvider={activeProvider}
+ name={name}
+ endpointUrl={endpointUrl}
+ proxy={proxy}
+ token={token}
+ initialTokenStore={initialTokenStore}
+ username={username}
+ password={password}
+ onSave={onSave}
+ onTest={onTest}
+ onCancel={onCancel}
+ onValidate={onValidate}
+ onNameChange={onNameChange}
+ onEndpointChange={onEndpointChange}
+ onProxyChange={onProxyChange}
+ onTokenChange={onTokenChange}
+ onUsernameChange={onUsernameChange}
+ onPasswordChange={onPasswordChange}
+ isSaving={isSaving}
+ isTesting={isTesting}
+ testStatus={testStatus}
+ testResponse={testResponse}
+ allTestResponses={allTestResponses}
+ errors={errors}
+ showError={showConnectionError}
+ authType={
+ [Providers.JENKINS, Providers.JIRA].includes(
+ activeProvider?.id
+ )
+ ? 'plain'
+ : 'token'
+ }
+ showLimitWarning={false}
+ sourceLimits={ProviderConnectionLimits}
+ labels={ProviderFormLabels[activeProvider?.id]}
+ placeholders={ProviderFormPlaceholders[activeProvider?.id]}
+ enableActions={false}
+ // formGroupClassName='formGroup-inline'
+ showHeadline={false}
+ />
+ </div>
+ </div>
+ </>
+ )}
+ </div>
+ <div className={Classes.DIALOG_FOOTER}>
+ <div className={Classes.DIALOG_FOOTER_ACTIONS}>
+ <div
+ className='test-response-message'
+ style={{ marginRight: 'auto' }}
+ >
+ {testResponse && (
+ <>
+ {testResponse.success
+ ? (
+ <span style={{ color: Colors.GREEN5 }}>
+ Successfully Connected!
+ </span>
+ )
+ : (
+ <span style={{ color: Colors.RED5 }}>
+ Connection Failed
+ </span>
+ )}
+ </>
+ )}
+ </div>
+ <Button
+ className='btn-test'
+ icon={getConnectionStatusIcon()}
+ disabled={isSaving || !isValid || isTesting}
+ onClick={() => onTest(false)}
+ loading={isTesting}
+ outlined
+ >
+ Test Connection
+ </Button>
+ <Button
+ className='btn-save'
+ disabled={isSaving || !isValid || isTesting}
+ // icon='cloud-upload'
+ intent={Intent.PRIMARY}
+ onClick={() => onSave(connection ? connection.id : null)}
+ loading={isSaving}
+ outlined
+ >
+ Save Connection
+ </Button>
+ </div>
+ </div>
+ </Dialog>
+ </>
+ )
+}
+
+export default ConnectionDialog
diff --git a/config-ui/src/data/NullConnection.js b/config-ui/src/components/blueprints/ConnectionTabs.jsx
similarity index 52%
copy from config-ui/src/data/NullConnection.js
copy to config-ui/src/components/blueprints/ConnectionTabs.jsx
index af5d75c5..ff775176 100644
--- a/config-ui/src/data/NullConnection.js
+++ b/config-ui/src/components/blueprints/ConnectionTabs.jsx
@@ -15,26 +15,34 @@
* limitations under the License.
*
*/
-const NullConnection = {
- // id: null,
- ID: null,
- name: null,
- endpoint: null,
- proxy: null,
- token: null,
- username: null,
- password: null,
- basicAuthEncoded: null, // NOTE: we probably want to exclude/null this when exposing this object
- JIRA_ISSUE_TYPE_MAPPING: null,
- JIRA_ISSUE_EPIC_KEY_FIELD: null,
- JIRA_ISSUE_STORYPOINT_FIELD: null,
- JIRA_BOARD_GITLAB_PROJECTS: null,
- JIRA_ISSUE_INCIDENT_STATUS_MAPPING: null,
- JIRA_ISSUE_STORY_STATUS_MAPPING: null,
- createdAt: null,
- updatedAt: null,
-}
+import React from 'react'
+import { Button, Intent, Colors, Classes, Tabs, Tab } from '@blueprintjs/core'
+
+const ConnectionTabs = (props) => {
+ const { connections = [], selectedTabId, onChange = () => {} } = props
-export {
- NullConnection
+ return (
+ <>
+ <Tabs
+ className='connection-tabs'
+ animate={false}
+ vertical={true}
+ id='connection-tabs'
+ onChange={(tabId) => onChange(tabId)}
+ selectedTabId={selectedTabId}
+ >
+ {connections.map((c, cIdx) => (
+ <Tab
+ key={`tab-key-${cIdx}`}
+ id={`connection-${c.id}`}
+ title={c.title}
+ connection={c}
+ // disabled=
+ />
+ ))}
+ </Tabs>
+ </>
+ )
}
+
+export default ConnectionTabs
diff --git a/config-ui/src/components/blueprints/ConnectionsSelector.jsx b/config-ui/src/components/blueprints/ConnectionsSelector.jsx
new file mode 100644
index 00000000..71e9d5b6
--- /dev/null
+++ b/config-ui/src/components/blueprints/ConnectionsSelector.jsx
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React from 'react'
+import { Button, Intent, MenuItem } from '@blueprintjs/core'
+import { MultiSelect } from '@blueprintjs/select'
+import { ProviderIcons } from '@/data/Providers'
+
+const ConnectionsSelector = (props) => {
+ const {
+ // eslint-disable-next-line no-unused-vars
+ connections = [],
+ placeholder = 'Select connections',
+ items = [],
+ selectedItems = [],
+ activeItem = null,
+ disabled = false,
+ isSaving = false,
+ onItemSelect = () => {},
+ onRemove = () => {},
+ onClear = () => {},
+ itemRenderer = (item, { handleClick, modifiers }) => (
+ <MenuItem
+ active={modifiers.active || selectedItems.find((i) => i.id === item.id)}
+ disabled={
+ selectedItems.find((i) => i.id === item.id) || modifiers.active
+ }
+ key={item.id}
+ label={
+ <span style={{ marginLeft: '20px' }}>
+ <span
+ style={{
+ display: 'inline-block',
+ marginTop: '2px',
+ width: '14px',
+ height: '14px',
+ }}
+ >
+ {ProviderIcons[item.provider]
+ ? (
+ ProviderIcons[item.provider](14, 14)
+ )
+ : (
+ <></>
+ )}
+ </span>
+ </span>
+ }
+ onClick={handleClick}
+ text={
+ selectedItems.find((i) => i.id === item.id)
+ ? (
+ <>
+ <input type='checkbox' checked readOnly /> {item.title}
+ </>
+ )
+ : (
+ <span style={{ fontWeight: 700 }}>
+ <input type='checkbox' readOnly /> {item.title}
+ </span>
+ )
+ }
+ style={{
+ marginBottom: '2px',
+ fontWeight: items.includes(item) ? 700 : 'normal',
+ }}
+ />
+ ),
+ tagRenderer = (item) => item.title,
+ } = props
+ return (
+ <>
+ <div
+ className='connections-multiselect'
+ style={{ display: 'flex', marginBottom: '10px' }}
+ >
+ <div
+ className='connections-multiselect-selector'
+ style={{ minWidth: '200px', width: '100%' }}
+ >
+ <MultiSelect
+ disabled={disabled || isSaving}
+ // openOnKeyDown={true}
+ resetOnSelect={true}
+ placeholder={placeholder}
+ popoverProps={{ usePortal: false, minimal: true }}
+ className='multiselector-connections'
+ inline={true}
+ fill={true}
+ items={items}
+ selectedItems={selectedItems}
+ activeItem={activeItem}
+ itemPredicate={(query, item) =>
+ item?.title?.toLowerCase().indexOf(query.toLowerCase()) >= 0}
+ itemRenderer={itemRenderer}
+ tagRenderer={tagRenderer}
+ tagInputProps={{
+ tagProps: {
+ intent: Intent.PRIMARY,
+ minimal: true,
+ },
+ }}
+ noResults={<MenuItem disabled={true} text='No connections.' />}
+ onRemove={(item) => {
+ onRemove((rT) => rT.filter((t) => t.id !== item.id))
+ }}
+ onItemSelect={(item) => {
+ onItemSelect((rT) =>
+ !rT.includes(item) ? [...rT, item] : [...rT]
+ )
+ }}
+ style={{ borderRight: 0 }}
+ />
+ </div>
+ <div className='multiselect-clear-action' style={{ marginLeft: '0' }}>
+ <Button
+ icon='eraser'
+ disabled={items.length === 0 || disabled || isSaving}
+ intent={Intent.NONE}
+ minimal={false}
+ onClick={() => onClear([])}
+ style={{
+ borderLeft: 0,
+ borderTopLeftRadius: 0,
+ borderBottomLeftRadius: 0,
+ marginLeft: '-2px',
+ }}
+ />
+ </div>
+ </div>
+ </>
+ )
+}
+
+export default ConnectionsSelector
diff --git a/config-ui/src/components/blueprints/DataEntitiesSelector.jsx b/config-ui/src/components/blueprints/DataEntitiesSelector.jsx
new file mode 100644
index 00000000..68f9cac3
--- /dev/null
+++ b/config-ui/src/components/blueprints/DataEntitiesSelector.jsx
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React from 'react'
+import {
+ Button,
+ Icon,
+ Intent,
+ Switch,
+ FormGroup,
+ ButtonGroup,
+ RadioGroup,
+ Radio,
+ InputGroup,
+ Divider,
+ Elevation,
+ TextArea,
+ Tabs,
+ Tab,
+ Card,
+ Popover,
+ Tooltip,
+ Label,
+ MenuItem,
+ Position,
+ Colors,
+ Tag,
+} from '@blueprintjs/core'
+import { MultiSelect, Select } from '@blueprintjs/select'
+const DataEntitiesSelector = (props) => {
+ const {
+ connections = [],
+ configuredConnection,
+ placeholder = 'Select data entities',
+ items = [],
+ selectedItems = [],
+ restrictedItems = [],
+ activeItem = null,
+ disabled = false,
+ isSaving = false,
+ onItemSelect = () => {},
+ onRemove = () => {},
+ onClear = () => {},
+ itemRenderer = (item, { handleClick, modifiers }) => (
+ <MenuItem
+ active={modifiers.active || selectedItems.find(i => i.id === item.id)}
+ disabled={
+ selectedItems.find(i => i.id === item.id)
+ }
+ key={item.value}
+ // label=
+ onClick={handleClick}
+ text={
+ selectedItems.find(i => i.id === item.id)
+ ? (
+ <>
+ <input type='checkbox' checked readOnly /> {item.title}
+ </>
+ )
+ : (
+ <span style={{ fontWeight: 700 }}>
+ <input type='checkbox' readOnly /> {item.title}
+ </span>
+ )
+ }
+ style={{
+ marginBottom: '2px',
+ fontWeight: items.includes(item) ? 700 : 'normal',
+ }}
+ />
+ ),
+ tagRenderer = (item) => item.title,
+ } = props
+ return (
+ <>
+ <div
+ className='data-entities-multiselect'
+ style={{ display: 'flex', marginBottom: '10px' }}
+ >
+ <div
+ className='data-entities-multiselect-selector'
+ style={{ minWidth: '200px', width: '100%' }}
+ >
+ <MultiSelect
+ disabled={disabled || isSaving}
+ // openOnKeyDown={true}
+ resetOnSelect={true}
+ placeholder={placeholder}
+ popoverProps={{ usePortal: false, minimal: true }}
+ className='multiselector-connections'
+ inline={true}
+ fill={true}
+ items={items}
+ selectedItems={selectedItems}
+ activeItem={activeItem}
+ itemPredicate={(query, item) =>
+ item?.title.toLowerCase().indexOf(query.toLowerCase()) >= 0}
+ itemRenderer={itemRenderer}
+ tagRenderer={tagRenderer}
+ tagInputProps={{
+ tagProps: {
+ intent: Intent.PRIMARY,
+ minimal: true,
+ },
+ }}
+ noResults={<MenuItem disabled={true} text='No Data Entities.' />}
+ onRemove={(item) => {
+ onRemove((rT) => {
+ return {
+ ...rT,
+ [configuredConnection.id]: rT[configuredConnection.id].filter(
+ (t) => t.id !== item.id
+ ),
+ }
+ })
+ }}
+ onItemSelect={(item) => {
+ onItemSelect((rT) => {
+ return !rT[configuredConnection.id].includes(item)
+ ? {
+ ...rT,
+ [configuredConnection.id]: [
+ ...rT[configuredConnection.id],
+ item,
+ ],
+ }
+ : { ...rT }
+ })
+ }}
+ style={{ borderRight: 0 }}
+ />
+ </div>
+ </div>
+ </>
+ )
+}
+
+export default DataEntitiesSelector
diff --git a/config-ui/src/components/blueprints/PipelineTasks.jsx b/config-ui/src/components/blueprints/PipelineTasks.jsx
index 27c8fbe5..9673f7c7 100644
--- a/config-ui/src/components/blueprints/PipelineTasks.jsx
+++ b/config-ui/src/components/blueprints/PipelineTasks.jsx
@@ -45,12 +45,12 @@ const PipelineTasks = (props) => {
<span className='detected-provider-icon' style={{ margin: '2px 3px 0 0px', float: 'left' }}>
{ProviderIcons[provider] ? ProviderIcons[provider](20, 20) : <></>}
</span>
- <span style={{ display: 'flex', marginTop: '3px', fontFamily: 'Montserrat, sans-serif', fontWeight: 800 }}>
+ <span style={{ display: 'flex', marginTop: '3px', fontWeight: 800 }}>
{ProviderLabels[provider?.toUpperCase()] ? ProviderLabels[provider?.toUpperCase()] : 'Data Provider'}
</span>
</Tag>
<div style={{ padding: '10px', maxWidth: '340px', overflow: 'hidden', overflowX: 'auto' }}>
- <div style={{ marginBottom: '10px', fontWeight: 700, fontSize: '14px', fontFamily: '"Montserrat", sans-serif' }}>
+ <div style={{ marginBottom: '10px', fontWeight: 700, fontSize: '14px' }}>
<Icon icon='layers' size={16} /> {ProviderLabels[provider?.toUpperCase()] ? ProviderLabels[provider?.toUpperCase()] : 'Plugin'}
</div>
<code>
diff --git a/config-ui/src/components/blueprints/ProviderTransformationSettings.jsx b/config-ui/src/components/blueprints/ProviderTransformationSettings.jsx
new file mode 100644
index 00000000..59148639
--- /dev/null
+++ b/config-ui/src/components/blueprints/ProviderTransformationSettings.jsx
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import {
+ Providers,
+ ProviderTypes,
+ ProviderIcons,
+ ConnectionStatus,
+ ConnectionStatusLabels,
+} from '@/data/Providers'
+import { DataEntities, DataEntityTypes } from '@/data/DataEntities'
+import JiraSettings from '@/pages/configure/settings/jira'
+import GitlabSettings from '@/pages/configure/settings/gitlab'
+import JenkinsSettings from '@/pages/configure/settings/jenkins'
+import GithubSettings from '@/pages/configure/settings/github'
+
+const ProviderTransformationSettings = (props) => {
+ const {
+ provider,
+ configuredConnection,
+ configuredProject,
+ configuredBoard,
+ transformation,
+ newTransformation,
+ boards = [],
+ issueTypes = [],
+ fields = [],
+ onSettingsChange = () => {},
+ changeTransformation = () => {},
+ isSaving = false,
+ isSavingConnection = false,
+ jiraProxyError,
+ isFetchingJIRA = false
+ } = props
+
+ useEffect(() => {
+ console.log('>>> newTransformation?', newTransformation)
+ }, [newTransformation])
+ // }, [transformation, boards, issueTypes, fields, configuredBoard])
+
+ return (
+ <div className='transformation-settings' data-provider={provider?.id}>
+ {provider?.id === Providers.GITHUB && (
+ <GithubSettings
+ provider={provider}
+ connection={configuredConnection}
+ configuredProject={configuredProject}
+ transformation={transformation}
+ onSettingsChange={onSettingsChange}
+ entity={DataEntityTypes.TICKET}
+ isSaving={isSaving}
+ isSavingConnection={isSavingConnection}
+ />
+ )}
+
+ {provider?.id === Providers.GITLAB && (
+ <GitlabSettings
+ provider={provider}
+ connection={configuredConnection}
+ configuredProject={configuredProject}
+ transformation={transformation}
+ onSettingsChange={onSettingsChange}
+ entity={DataEntityTypes.TICKET}
+ isSaving={isSaving}
+ isSavingConnection={isSavingConnection}
+ />
+ )}
+
+ {provider?.id === Providers.JIRA && (
+ <JiraSettings
+ provider={provider}
+ connection={configuredConnection}
+ configuredBoard={configuredBoard}
+ boards={boards}
+ issueTypes={issueTypes}
+ fields={fields}
+ transformation={transformation}
+ newTransformation={newTransformation}
+ onSettingsChange={changeTransformation}
+ entity={DataEntityTypes.TICKET}
+ isSaving={isSaving}
+ isSavingConnection={isSavingConnection}
+ jiraProxyError={jiraProxyError}
+ isFetchingJIRA={isFetchingJIRA}
+ />
+ )}
+
+ {provider?.id === Providers.JENKINS && (
+ <JenkinsSettings
+ provider={provider}
+ connection={configuredConnection}
+ transformation={transformation}
+ onSettingsChange={onSettingsChange}
+ entity={DataEntityTypes.TICKET}
+ isSaving={isSaving}
+ isSavingConnection={isSavingConnection}
+ />
+ )}
+ </div>
+ )
+}
+
+export default ProviderTransformationSettings
diff --git a/config-ui/src/components/blueprints/StandardStackedList.jsx b/config-ui/src/components/blueprints/StandardStackedList.jsx
new file mode 100644
index 00000000..1e692adf
--- /dev/null
+++ b/config-ui/src/components/blueprints/StandardStackedList.jsx
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import { CSSTransition } from 'react-transition-group'
+import {
+ Button,
+ Icon,
+ Intent,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+
+const StandardStackedList = (props) => {
+ const {
+ items = [],
+ transformations = {},
+ className = 'selected-items-list',
+ connection,
+ activeItem,
+ editButtonText = 'Edit Transformation',
+ addButtonText = 'Add Transformation',
+ onAdd = () => {},
+ onChange = () => {},
+ style = { padding: 0, marginTop: '10px' }
+ } = props
+
+ const isEditing = useCallback((item) => {
+ const storedTransform = transformations[item] || transformations[item?.id]
+ return Object.values(storedTransform).some(v => v.length > 0)
+ }, [transformations])
+
+ // useEffect(() => {
+ // console.log('>>> Selector List Transformations...', transformations, activeItem)
+ // }, [transformations, activeItem])
+
+ return (
+ <>
+ {items[connection.id]?.length > 0 && (
+ <Card
+ className={className}
+ elevation={Elevation.ZERO}
+ style={style}
+ >
+ {items[connection.id]?.map((item, pIdx) => (
+ <div
+ className='item-entry'
+ key={`item-row-key-${pIdx}`}
+ style={{
+ display: 'flex',
+ width: '100%',
+ height: '32px',
+ lineHeight: '100%',
+ justifyContent: 'space-between',
+ // margin: '8px 0',
+ padding: '8px 12px',
+ borderBottom: '1px solid #f0f0f0',
+ backgroundColor:
+ activeItem === item
+ ? 'rgba(116, 151, 247, 0.2)'
+ : '#fff',
+ }}
+ >
+ <div>
+ <div className='item-name' style={{ fontWeight: 600 }}>
+ <label onClick={() => onAdd(item)} style={{ cursor: 'pointer' }}>{item?.name || item}</label>
+ </div>
+ </div>
+ <div
+ style={{
+ display: 'flex',
+ alignContent: 'center',
+ }}
+ >
+ <div
+ className='item-actions'
+ style={{ paddingLeft: '20px' }}
+ >
+ <Button
+ intent={Intent.PRIMARY}
+ className='item-action-transformation'
+ icon={
+ <Icon
+ size={12}
+ color={Colors.BLUE4}
+ />
+ }
+ text={isEditing(item) ? editButtonText : addButtonText}
+ color={Colors.BLUE3}
+ small
+ minimal={activeItem || activeItem?.id !== item}
+ style={{
+ minWidth: '18px',
+ minHeight: '18px',
+ fontSize: '11px',
+ }}
+ onClick={() => onAdd(item)}
+ />
+ </div>
+ </div>
+ </div>
+ ))}
+ </Card>
+ )}
+ </>
+ )
+}
+
+export default StandardStackedList
diff --git a/config-ui/src/components/blueprints/WorkflowActions.jsx b/config-ui/src/components/blueprints/WorkflowActions.jsx
new file mode 100644
index 00000000..3efd97f7
--- /dev/null
+++ b/config-ui/src/components/blueprints/WorkflowActions.jsx
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import { CSSTransition } from 'react-transition-group'
+import {
+ PopoverInteractionKind,
+ Button,
+ Icon,
+ Intent,
+ Elevation,
+ Popover,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+import FormValidationErrors from '@/components/messages/FormValidationErrors'
+
+const WorkflowActions = (props) => {
+ const {
+ activeStep,
+ blueprintSteps = [],
+ setShowBlueprintInspector = () => {},
+ validationErrors = [],
+ onPrev = () => {},
+ onNext = () => {},
+ onSave = () => {},
+ onSaveAndRun = () => {},
+ isLoading = false
+ } = props
+
+ return (
+ <div className='workflow-actions'>
+ <Button
+ loading={isLoading}
+ disabled={isLoading}
+ intent={Intent.PRIMARY}
+ text='Previous Step'
+ onClick={onPrev}
+ disabled={activeStep?.id === 1}
+ />
+
+ {activeStep?.id === blueprintSteps.length ? (
+ <div style={{ marginLeft: 'auto' }}>
+ <Button
+ loading={isLoading}
+ disabled={isLoading}
+ intent={Intent.PRIMARY}
+ text='Save Blueprint'
+ // disabled
+ onClick={onSave}
+ />
+ <Button
+ loading={isLoading}
+ disabled={isLoading}
+ intent={Intent.DANGER}
+ text='Save and Run Now'
+ style={{ marginLeft: '5px' }}
+ // disabled
+ onClick={onSaveAndRun}
+ />
+ </div>
+ ) : (
+ <div style={{ display: 'flex', marginLeft: 'auto' }}>
+ <Button
+ loading={isLoading}
+ intent={Intent.PRIMARY}
+ icon='code'
+ text='Inspect'
+ onClick={() => setShowBlueprintInspector(true)}
+ style={{ marginRight: '8px' }}
+ minimal
+ small
+ />
+ <Button
+ loading={isLoading}
+ disabled={isLoading}
+ intent={Intent.PRIMARY}
+ text='Next Step'
+ onClick={onNext}
+ rightIcon={
+ validationErrors.length > 0
+ ? (
+ <Popover
+ interactionKind={PopoverInteractionKind.HOVER_TARGET_ONLY}
+ >
+ <Icon
+ icon='warning-sign'
+ size={12}
+ color={Colors.ORANGE5}
+ style={{ outline: 'none', margin: '0 3px 2px 3px' }}
+ />
+ <div style={{ padding: '5px' }}>
+ <FormValidationErrors errors={validationErrors} />
+ </div>
+ </Popover>
+ )
+ : null
+ }
+ />
+ </div>
+ )}
+ </div>
+ )
+}
+
+export default WorkflowActions
diff --git a/config-ui/src/components/blueprints/WorkflowStepsBar.jsx b/config-ui/src/components/blueprints/WorkflowStepsBar.jsx
new file mode 100644
index 00000000..5f2b19de
--- /dev/null
+++ b/config-ui/src/components/blueprints/WorkflowStepsBar.jsx
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import { CSSTransition } from 'react-transition-group'
+import {
+ Button,
+ Icon,
+ Intent,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+import { WorkflowSteps } from '@/data/BlueprintWorkflow'
+
+const WorkflowStepsBar = (props) => {
+ const { activeStep, steps = [] } = props
+
+ const getWorkflowStep = (stepId) => {
+ return WorkflowSteps.find((s) => s.id === stepId)
+ }
+
+ return (
+ <div className='workflow-bar'>
+ {steps.length > 0 && (
+ <ul className='workflow-steps'>
+ {steps.map((step, sIdx) => (
+ <li
+ key={`workflow-step-key-${sIdx}`}
+ className={`workflow-step ${
+ activeStep?.id === step?.id ? 'active' : ''
+ } ${step.complete ? 'is-completed' : ''}`}
+ >
+ <a href='#' className='step-id'>
+ {step?.complete ? <Icon icon='tick' size={14} /> : step?.id}
+ </a>
+ {step.title}
+ </li>
+ ))}
+ {/* <li className={`workflow-step ${activeStep?.id === 2 ? 'active' : ''} ${activeStep?.completed ? 'is-completed' : ''}`}>
+ <a href='#' className='step-id'>
+ {activeStep?.id === 2 && activeStep?.completed ? <Icon icon='tick' size={14} /> : 2}
+ </a>
+ {getWorkflowStep(2)?.title || 'Set Data Scope'}
+ </li>
+ <li className={`workflow-step ${activeStep?.id === 3 ? 'active' : ''} ${activeStep?.completed ? 'is-completed' : ''}`}>
+ <a href='#' className='step-id'>
+ {activeStep?.id === 3 && activeStep?.completed ? <Icon icon='tick' size={14} /> : 3}
+ </a>
+ {getWorkflowStep(3)?.title || 'Add Transformation (Optional)'}
+ </li>
+ <li className={`workflow-step ${activeStep?.id === 4 ? 'active' : ''} ${activeStep?.completed ? 'is-completed' : ''}`}>
+ <a href='#' className='step-id'>
+ {activeStep?.id === 4 && activeStep?.completed ? <Icon icon='tick' size={14} /> : 4}
+ </a>
+ {getWorkflowStep(4)?.title || 'Set Sync Frequency'}
+ </li> */}
+ </ul>
+ )}
+ </div>
+ )
+}
+
+export default WorkflowStepsBar
diff --git a/config-ui/src/components/blueprints/create-workflow/AdvancedJSON.jsx b/config-ui/src/components/blueprints/create-workflow/AdvancedJSON.jsx
new file mode 100644
index 00000000..b4a5bd04
--- /dev/null
+++ b/config-ui/src/components/blueprints/create-workflow/AdvancedJSON.jsx
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import {
+ Button,
+ Icon,
+ Intent,
+ TextArea,
+ InputGroup,
+ ButtonGroup,
+ Popover,
+ Position,
+ Divider,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+import PipelineConfigsMenu from '@/components/menus/PipelineConfigsMenu'
+import BlueprintNameCard from '@/components/blueprints/BlueprintNameCard'
+
+const AdvancedJSON = (props) => {
+ const {
+ activeStep,
+ name,
+ runTasksAdvanced = [],
+ rawConfiguration,
+ blueprintConnections = [],
+ connectionsList = [],
+ setBlueprintName = () => {},
+ fieldHasError = () => {},
+ getFieldError = () => {},
+ onAdvancedMode = () => {},
+ isMultiStagePipeline = () => {},
+ setRawConfiguration = () => {},
+ isSaving = false,
+ isRunning = false,
+ isValidConfiguration = false,
+ advancedMode = false,
+ validationAdvancedError,
+ validationErrors = []
+ } = props
+
+ return (
+ <div className='workflow-step workflow-step-advanced-json' data-step={activeStep?.id}>
+ <BlueprintNameCard
+ activeStep={activeStep}
+ advancedMode={advancedMode}
+ name={name}
+ setBlueprintName={setBlueprintName}
+ />
+
+ <Card
+ className='workflow-card workflow-panel-card'
+ elevation={Elevation.TWO}
+ style={{ width: '100%' }}
+ >
+ <h3>
+ JSON Configuration
+ </h3>
+ <Divider className='section-divider' />
+
+ <h4>Task Editor</h4>
+ <p>Enter JSON Configuration or preload from a template</p>
+
+ <Card
+ className='code-editor-card'
+ interactive={false}
+ elevation={Elevation.ZERO}
+ style={{ padding: '2px', minWidth: '320px', width: '100%', maxWidth: '100%', marginBottom: '20px' }}
+ >
+ <TextArea
+ growVertically={false}
+ fill={true}
+ className='codeArea'
+ style={{ minHeight: '240px' }}
+ value={rawConfiguration}
+ onChange={(e) => setRawConfiguration(e.target.value)}
+ />
+ <div
+ className='code-editor-card-footer'
+ style={{
+ display: 'flex',
+ justifyContent: 'flex-end',
+ padding: '5px',
+ borderTop: '1px solid #eeeeee',
+ fontSize: '11px'
+ }}
+ >
+ <ButtonGroup
+ intent={Intent.PRIMARY}
+ minimal
+ className='code-editor-controls' style={{
+ borderRadius: '3px',
+ // boxShadow: '0px 0px 2px rgba(0, 0, 0, 0.30)'
+ }}
+ >
+ <Button
+ small text='Reset'
+ icon='eraser'
+ onClick={() => setRawConfiguration('[[]]')}
+ />
+ <Popover
+ className='popover-options-menu-trigger'
+ popoverClassName='popover-options-menu'
+ position={Position.TOP}
+ usePortal={true}
+ >
+ <Button
+ disabled={isRunning}
+ rightIcon='caret-down'
+ text='Load Templates'
+ />
+ <>
+ <PipelineConfigsMenu
+ setRawConfiguration={setRawConfiguration}
+ advancedMode={advancedMode}
+ />
+ </>
+ </Popover>
+ {/* <Button
+ disabled={!isValidConfiguration}
+ small text='Format' icon='align-left'
+ onClick={() => formatRawCode()}
+ /> */}
+ {/* <Button
+ small text='Revert' icon='reset'
+ onClick={() => setRawConfiguration(JSON.stringify([runTasks], null, ' '))}
+ /> */}
+ </ButtonGroup>
+ </div>
+ </Card>
+
+ </Card>
+
+ <div className='mode-notice normal-mode-notice'>
+ <p>To visually define blueprint tasks, please use <a href='#' rel='noreferrer' onClick={() => onAdvancedMode(false)}>Normal Mode</a></p>
+ </div>
+
+ </div>
+ )
+}
+
+export default AdvancedJSON
diff --git a/config-ui/src/components/blueprints/create-workflow/AdvancedJSONValidation.jsx b/config-ui/src/components/blueprints/create-workflow/AdvancedJSONValidation.jsx
new file mode 100644
index 00000000..e434026d
--- /dev/null
+++ b/config-ui/src/components/blueprints/create-workflow/AdvancedJSONValidation.jsx
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React from 'react'
+import {
+ Divider,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+
+const AdvancedJSONValidation = (props) => {
+ const {
+ activeStep,
+ // name,
+ // runTasksAdvanced = [],
+ rawConfiguration,
+ // blueprintConnections = [],
+ // connectionsList = [],
+ // setBlueprintName = () => {},
+ // fieldHasError = () => {},
+ // getFieldError = () => {},
+ // onAdvancedMode = () => {},
+ // isMultiStagePipeline = () => {},
+ // setRawConfiguration = () => {},
+ onPrev = () => {},
+ // isSaving = false,
+ // isRunning = false,
+ isValidConfiguration = false,
+ // advancedMode = false,
+ validationAdvancedError = null,
+ // validationErrors = [],
+ } = props
+
+ return (
+ <div
+ className='workflow-step workflow-step-advanced-json'
+ data-step={activeStep?.id}
+ >
+ <Card
+ className='workflow-card workflow-panel-card'
+ elevation={Elevation.TWO}
+ style={{ width: '100%' }}
+ >
+ <h3>Validate JSON Tasks</h3>
+ <Divider className='section-divider' />
+
+ {isValidConfiguration ? (
+ <p className='alert neutral'>
+ <strong>Your Blueprint JSON Configuration is valid</strong>. Please
+ see below for detected data providers.
+ <br />
+ <a
+ href='#'
+ className='more-link'
+ rel='noreferrer'
+ style={{
+ // color: '#7497F7',
+ marginTop: '5px',
+ display: 'inline-block',
+ }}
+ >
+ Find out more
+ </a>
+ </p>
+ ) : (
+ <p className='alert error'>
+ <strong>Your Blueprint JSON Configuration is invalid.</strong>{' '}
+ {validationAdvancedError}
+ <br />
+ <a
+ href='#'
+ className='more-link'
+ rel='noreferrer'
+ style={{
+ marginTop: '5px',
+ display: 'inline-block',
+ }}
+ onClick={onPrev}
+ >
+ Go Back
+ </a>
+ </p>
+ )}
+
+ <code style={{ fontSize: '10px', borderRadius: '8px' }}>
+ <pre
+ style={{
+ borderRadius: '8px',
+ backgroundColor: '#f0f0f0',
+ padding: '10px',
+ }}
+ >
+ {rawConfiguration}
+ </pre>
+ </code>
+ </Card>
+ </div>
+ )
+}
+
+export default AdvancedJSONValidation
diff --git a/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx b/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx
new file mode 100644
index 00000000..6fa3f261
--- /dev/null
+++ b/config-ui/src/components/blueprints/create-workflow/DataConnections.jsx
@@ -0,0 +1,202 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import {
+ Button,
+ Icon,
+ Intent,
+ InputGroup,
+ Divider,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+
+import BlueprintNameCard from '../BlueprintNameCard'
+// import InputValidationError from '@/components/validation/InputValidationError'
+import ConnectionsSelector from '@/components/blueprints/ConnectionsSelector'
+
+const DataConnections = (props) => {
+ const {
+ activeStep,
+ name,
+ blueprintConnections = [],
+ connectionsList = [],
+ setBlueprintName = () => {},
+ setBlueprintConnections = () => {},
+ fieldHasError = () => {},
+ getFieldError = () => {},
+ addConnection = () => {},
+ manageConnection = () => {},
+ onAdvancedMode = () => {},
+ isSaving = false,
+ advancedMode = false
+ } = props
+
+ return (
+ <div className='workflow-step workflow-step-data-connections' data-step={activeStep?.id}>
+ <BlueprintNameCard
+ advancedMode={advancedMode}
+ activeStep={activeStep}
+ name={name}
+ setBlueprintName={setBlueprintName}
+ fieldHasError={fieldHasError}
+ getFieldError={getFieldError}
+ />
+ {/* <Card
+ className='workflow-card'
+ elevation={Elevation.TWO}
+ style={{ width: '100%' }}
+ >
+ <h3>
+ Blueprint Name <span className='required-star'>*</span>
+ </h3>
+ <Divider className='section-divider' />
+ <p>
+ Give your Blueprint a unique name to help you identify it in the
+ future.
+ </p>
+ <InputGroup
+ id='blueprint-name'
+ placeholder='Enter Blueprint Name'
+ value={name}
+ onChange={(e) => setBlueprintName(e.target.value)}
+ className={`blueprint-name-input ${
+ fieldHasError('Blueprint Name') ? 'invalid-field' : ''
+ }`}
+ inline={true}
+ style={{ marginBottom: '10px' }}
+ rightElement={
+ <InputValidationError error={getFieldError('Blueprint Name')} />
+ }
+ />
+ </Card> */}
+
+ <Card
+ className='workflow-card'
+ elevation={Elevation.TWO}
+ style={{ width: '100%' }}
+ >
+ <div
+ style={{
+ display: 'flex',
+ justifyContent: 'space-between',
+ }}
+ >
+ <h3 style={{ margin: 0 }}>
+ Add Data Connections <span className='required-star'>*</span>
+ </h3>
+ <div>
+ <Button
+ text='Add Connection'
+ icon='plus'
+ intent={Intent.PRIMARY}
+ small
+ onClick={addConnection}
+ />
+ </div>
+ </div>
+ <Divider className='section-divider' />
+
+ <h4>Select Connections</h4>
+ <p>Select from existing or create new connections</p>
+
+ <ConnectionsSelector
+ items={connectionsList}
+ selectedItems={blueprintConnections}
+ onItemSelect={setBlueprintConnections}
+ onClear={setBlueprintConnections}
+ onRemove={setBlueprintConnections}
+ disabled={isSaving}
+ />
+ {blueprintConnections.length > 0 && (
+ <Card
+ className='selected-connections-list'
+ elevation={Elevation.ZERO}
+ style={{ padding: 0, marginTop: '10px' }}
+ >
+ {blueprintConnections.map((bC, bcIdx) => (
+ <div
+ className='connection-entry'
+ key={`connection-row-key-${bcIdx}`}
+ style={{
+ display: 'flex',
+ width: '100%',
+ height: '32px',
+ lineHeight: '100%',
+ justifyContent: 'space-between',
+ // margin: '8px 0',
+ padding: '8px 12px',
+ borderBottom: '1px solid #f0f0f0',
+ }}
+ >
+ <div>
+ <div className='connection-name' style={{ fontWeight: 600 }}>
+ {bC.title}
+ </div>
+ </div>
+ <div
+ style={{
+ display: 'flex',
+ alignContent: 'center',
+ }}
+ >
+ <div
+ className='connection-status'
+ style={{ textTransform: 'capitalize' }}
+ >
+ {bC.status}
+ </div>
+ <div
+ className='connection-actions'
+ style={{ paddingLeft: '20px' }}
+ >
+ <Button
+ className='connection-action-settings'
+ icon={
+ <Icon
+ icon='cog'
+ size={12}
+ color={Colors.BLUE4}
+ onClick={() => manageConnection(bC)}
+ />
+ }
+ color={Colors.BLUE3}
+ small
+ minimal
+ style={{
+ minWidth: '18px',
+ minHeight: '18px',
+ }}
+ />
+ </div>
+ </div>
+ </div>
+ ))}
+ </Card>
+ )}
+ </Card>
+
+ <div className='mode-notice advanced-mode-notice'>
+ <p>To customize how tasks are executed in the blueprint, please use <a href='#' rel='noreferrer' onClick={() => onAdvancedMode(true)}>Advanced Mode</a></p>
+ </div>
+ </div>
+ )
+}
+
+export default DataConnections
diff --git a/config-ui/src/components/blueprints/create-workflow/DataScopes.jsx b/config-ui/src/components/blueprints/create-workflow/DataScopes.jsx
new file mode 100644
index 00000000..23dbae01
--- /dev/null
+++ b/config-ui/src/components/blueprints/create-workflow/DataScopes.jsx
@@ -0,0 +1,208 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import {
+ Button,
+ Icon,
+ Intent,
+ TagInput,
+ Divider,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+import {
+ Providers,
+ ProviderTypes,
+ ProviderIcons,
+ ConnectionStatus,
+ ConnectionStatusLabels,
+} from '@/data/Providers'
+
+import ConnectionTabs from '@/components/blueprints/ConnectionTabs'
+import BoardsSelector from '@/components/blueprints/BoardsSelector'
+import DataEntitiesSelector from '@/components/blueprints/DataEntitiesSelector'
+import NoData from '@/components/NoData'
+
+const DataScopes = (props) => {
+ const {
+ activeStep,
+ activeConnectionTab,
+ blueprintConnections = [],
+ dataEntitiesList = [],
+ boardsList = [],
+ dataEntities = [],
+ projects = [],
+ boards = [],
+ configuredConnection,
+ handleConnectionTabChange = () => {},
+ setDataEntities = () => {},
+ setProjects = () => {},
+ setBoards = () => {},
+ prevStep = () => {},
+ isSaving = false,
+ isRunning = false,
+ } = props
+
+ return (
+ <div className='workflow-step workflow-step-data-scope' data-step={activeStep?.id}>
+ {blueprintConnections.length > 0 && (
+ <div style={{ display: 'flex' }}>
+ <div
+ className='connection-tab-selector'
+ style={{ minWidth: '200px' }}
+ >
+ <Card
+ className='workflow-card connection-tabs-card'
+ elevation={Elevation.TWO}
+ style={{ padding: '10px' }}
+ >
+ <ConnectionTabs
+ connections={blueprintConnections}
+ onChange={handleConnectionTabChange}
+ selectedTabId={activeConnectionTab}
+ />
+ </Card>
+ </div>
+ <div
+ className='connection-scope'
+ style={{ marginLeft: '10px', width: '100%' }}
+ >
+ <Card
+ className='workflow-card worfklow-panel-card'
+ elevation={Elevation.TWO}
+ >
+ {configuredConnection && (
+ <>
+ <h3>
+ <span style={{ float: 'left', marginRight: '8px' }}>
+ {ProviderIcons[configuredConnection.provider]
+ ? (
+ ProviderIcons[configuredConnection.provider](24, 24)
+ )
+ : (
+ <></>
+ )}
+ </span>{' '}
+ {configuredConnection.title}
+ </h3>
+ <Divider className='section-divider' />
+
+ {[Providers.GITLAB, Providers.GITHUB].includes(
+ configuredConnection.provider
+ ) && (
+ <>
+ <h4>Projects *</h4>
+ <p>Enter the projects you would like to sync.</p>
+ <TagInput
+ id='project-id'
+ disabled={isRunning}
+ placeholder={
+ configuredConnection.provider === Providers.GITHUB
+ ? 'username/repo, username/another-repo'
+ : '1000000, 200000'
+ }
+ values={projects[configuredConnection.id] || []}
+ fill={true}
+ onChange={(values) =>
+ setProjects((p) => ({
+ ...p,
+ [configuredConnection.id]: [...new Set(values)],
+ }))}
+ addOnPaste={true}
+ addOnBlur={true}
+ rightElement={
+ <Button
+ disabled={isRunning}
+ icon='eraser'
+ minimal
+ onClick={() =>
+ setProjects((p) => ({
+ ...p,
+ [configuredConnection.id]: [],
+ }))}
+ />
+ }
+ onKeyDown={(e) =>
+ e.key === 'Enter' && e.preventDefault()}
+ tagProps={{
+ intent: Intent.PRIMARY,
+ minimal: true,
+ }}
+ className='input-project-id tagInput'
+ />
+ </>
+ )}
+
+ {[Providers.JIRA].includes(configuredConnection.provider) && (
+ <>
+ <h4>Boards *</h4>
+ <p>Select the boards you would like to sync.</p>
+ <BoardsSelector
+ items={boardsList}
+ selectedItems={boards[configuredConnection.id] || []}
+ onItemSelect={setBoards}
+ onClear={setBoards}
+ onRemove={setBoards}
+ disabled={isSaving}
+ configuredConnection={configuredConnection}
+ />
+ </>
+ )}
+
+ <h4>Data Entities</h4>
+ <p>
+ Select the data entities you wish to collect for the
+ projects.{' '}
+ <a
+ href='https://devlake.apache.org/docs/DataModels/DevLakeDomainLayerSchema'
+ target='_blank'
+ rel='noreferrer'
+ >
+ Learn about data entities
+ </a>
+ </p>
+ <DataEntitiesSelector
+ items={dataEntitiesList}
+ selectedItems={dataEntities[configuredConnection.id] || []}
+ // restrictedItems={getRestrictedDataEntities()}
+ onItemSelect={setDataEntities}
+ onClear={setDataEntities}
+ onRemove={setDataEntities}
+ disabled={isSaving}
+ configuredConnection={configuredConnection}
+ isSaving={isSaving}
+ />
+ </>
+ )}
+ </Card>
+ </div>
+ </div>
+ )}
+ {blueprintConnections.length === 0 && (
+ <NoData
+ title='No Data Connections'
+ message='Please select at least one connection source.'
+ onClick={prevStep}
+ />
+ )}
+ </div>
+ )
+}
+
+export default DataScopes
diff --git a/config-ui/src/components/blueprints/create-workflow/DataSync.jsx b/config-ui/src/components/blueprints/create-workflow/DataSync.jsx
new file mode 100644
index 00000000..c36611fc
--- /dev/null
+++ b/config-ui/src/components/blueprints/create-workflow/DataSync.jsx
@@ -0,0 +1,312 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import dayjs from '@/utils/time'
+import {
+ Button,
+ Icon,
+ Intent,
+ Tooltip,
+ FormGroup,
+ InputGroup,
+ Position,
+ RadioGroup,
+ Popover,
+ Radio,
+ Divider,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+import {
+ Providers,
+ ProviderTypes,
+ ProviderIcons,
+ ConnectionStatus,
+ ConnectionStatusLabels,
+} from '@/data/Providers'
+
+import InputValidationError from '@/components/validation/InputValidationError'
+
+import CronHelp from '@/images/cron-help.png'
+
+const DataSync = (props) => {
+ const {
+ activeStep,
+ cronConfig,
+ customCronConfig,
+ setCronConfig = () => {},
+ getCronPreset = () => {},
+ fieldHasError = () => {},
+ getFieldError = () => {},
+ createCron = () => {},
+ setCustomCronConfig = () => {},
+ getCronPresetByConfig = () => {},
+ advancedMode = false
+ } = props
+
+ return (
+ <div className='workflow-step workflow-step-set-sync-frequency' data-step={activeStep?.id}>
+ <Card className='workflow-card' elevation={Elevation.TWO}>
+ <h3 style={{ marginBottom: '8px' }}>Set Sync Frequency</h3>
+ {getCronPresetByConfig(cronConfig)
+ ? (
+ <p
+ style={{
+ display: 'block',
+ }}
+ >
+ <strong>Automated</strong> —{' '}
+ {getCronPresetByConfig(cronConfig).description}
+ </p>
+ )
+ : (
+ <small
+ style={{
+ fontSize: '10px',
+ color: Colors.GRAY2,
+ textTransform: 'uppercase',
+ }}
+ >
+ {cronConfig}
+ </small>
+ )}
+ <Divider className='section-divider' />
+
+ <h4>Frequency</h4>
+ <p>Blueprints will run recurringly based on the sync frequency.</p>
+
+ <RadioGroup
+ inline={false}
+ label={false}
+ name='blueprint-frequency'
+ onChange={(e) => setCronConfig(e.target.value)}
+ selectedValue={cronConfig}
+ required
+ >
+ <Radio
+ label='Manual'
+ value='manual'
+ style={{
+ fontWeight: cronConfig === 'manual' ? 'bold' : 'normal',
+ }}
+ />
+ {/* Dynamic Presets from Connection Manager */}
+ {[
+ getCronPreset('hourly'),
+ getCronPreset('daily'),
+ getCronPreset('weekly'),
+ getCronPreset('monthly'),
+ ].map((preset, prIdx) => (
+ <Radio
+ key={`cron-preset-tooltip-key${prIdx}`}
+ label={
+ <>
+ <Tooltip
+ position={Position.RIGHT}
+ intent={Intent.PRIMARY}
+ content={preset.description}
+ >
+ {preset.label}
+ </Tooltip>
+ </>
+ }
+ value={preset.cronConfig}
+ style={{
+ fontWeight:
+ cronConfig === preset.cronConfig ? 'bold' : 'normal',
+ outline: 'none !important',
+ }}
+ />
+ ))}
+ <Radio
+ label='Custom'
+ value='custom'
+ style={{
+ fontWeight: cronConfig === 'custom' ? 'bold' : 'normal',
+ }}
+ />
+ </RadioGroup>
+ <div
+ style={{
+ display: cronConfig === 'custom' ? 'flex' : 'none',
+ }}
+ >
+ <FormGroup
+ disabled={cronConfig !== 'custom'}
+ label=''
+ inline={true}
+ labelFor='cron-custom'
+ className='formGroup-inline'
+ contentClassName='formGroupContent'
+ style={{ marginBottom: '5px' }}
+ fill={false}
+ >
+ <InputGroup
+ id='cron-custom'
+ inline={true}
+ fill={false}
+ readOnly={cronConfig !== 'custom'}
+ leftElement={
+ cronConfig !== 'custom'
+ ? (
+ <Icon
+ icon='lock'
+ size={11}
+ style={{
+ alignSelf: 'center',
+ margin: '4px 10px -2px 6px',
+ }}
+ />
+ )
+ : null
+ }
+ rightElement={
+ <>
+ <InputValidationError
+ error={getFieldError('Blueprint Cron')}
+ />
+ </>
+ }
+ placeholder='Enter Crontab Syntax'
+ value={cronConfig !== 'custom' ? cronConfig : customCronConfig}
+ onChange={(e) => setCustomCronConfig(e.target.value)}
+ className={`cron-custom-input ${
+ fieldHasError('Blueprint Cron') ? 'invalid-field' : ''
+ }`}
+ style={{ transition: 'none' }}
+ />
+ </FormGroup>
+ <div
+ style={{
+ display: 'inline',
+ marginTop: 'auto',
+ paddingBottom: '15px',
+ }}
+ >
+ <Popover
+ className='trigger-crontab-help'
+ popoverClassName='popover-help-crontab'
+ position={Position.RIGHT}
+ autoFocus={false}
+ enforceFocus={false}
+ usePortal={false}
+ >
+ <a rel='noreferrer'>
+ <Icon
+ icon='help'
+ size={14}
+ style={{ marginLeft: '10px', transition: 'none' }}
+ />
+ </a>
+ <>
+ <div
+ style={{
+ textShadow: 'none',
+ fontSize: '12px',
+ padding: '12px',
+ maxWidth: '300px',
+ }}
+ >
+ <div
+ style={{
+ marginBottom: '10px',
+ fontWeight: 700,
+ fontSize: '14px',
+ }}
+ >
+ <Icon
+ icon='help'
+ size={16}
+ style={{ marginRight: '5px' }}
+ />{' '}
+ Cron Expression Format
+ </div>
+ <p>
+ Need Help? — For additional information on{' '}
+ <strong>Crontab</strong>, please reference the{' '}
+ <a
+ href='https://man7.org/linux/man-pages/man5/crontab.5.html'
+ rel='noreferrer'
+ target='_blank'
+ style={{ textDecoration: 'underline' }}
+ >
+ Crontab Linux manual
+ </a>
+ .
+ </p>
+ <img
+ src={CronHelp}
+ style={{
+ border: 0,
+ margin: 0,
+ maxWidth: '100%',
+ }}
+ />
+ </div>
+ </>
+ </Popover>
+ </div>
+ </div>
+
+ {cronConfig !== 'manual' && (
+ <div>
+ <Divider
+ className='section-divider'
+ style={{ marginTop: ' 20px' }}
+ />
+ <div>
+ <Button
+ text='View Schedule'
+ icon='time'
+ intent={Intent.NONE}
+ small
+ style={{ float: 'right', fontSize: '11px' }}
+ />
+
+ <h4 style={{ marginRight: 0, marginBottom: 0 }}>Next Run Date</h4>
+ </div>
+ <div style={{ fontSize: '14px', fontWeight: 800 }}>
+ {dayjs(
+ createCron(
+ cronConfig === 'custom' ? customCronConfig : cronConfig
+ )
+ .next()
+ .toString()
+ ).format('L LTS')}{' '}
+ ·{' '}
+ <span style={{ color: Colors.GRAY3 }}>
+ (
+ {dayjs(
+ createCron(
+ cronConfig === 'custom' ? customCronConfig : cronConfig
+ )
+ .next()
+ .toString()
+ ).fromNow()}
+ )
+ </span>
+ </div>
+ </div>
+ )}
+ </Card>
+ </div>
+ )
+}
+
+export default DataSync
diff --git a/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx b/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
new file mode 100644
index 00000000..a3bb699a
--- /dev/null
+++ b/config-ui/src/components/blueprints/create-workflow/DataTransformations.jsx
@@ -0,0 +1,336 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { Fragment, useEffect, useState, useCallback } from 'react'
+import {
+ Button,
+ Icon,
+ Intent,
+ InputGroup,
+ Divider,
+ Elevation,
+ Card,
+ Colors,
+} from '@blueprintjs/core'
+import { integrationsData } from '@/data/integrations'
+import {
+ Providers,
+ ProviderTypes,
+ ProviderIcons,
+ ConnectionStatus,
+ ConnectionStatusLabels,
+} from '@/data/Providers'
+import { DataEntities, DataEntityTypes } from '@/data/DataEntities'
+
+import ConnectionTabs from '@/components/blueprints/ConnectionTabs'
+import NoData from '@/components/NoData'
+import StandardStackedList from '@/components/blueprints/StandardStackedList'
+import ProviderTransformationSettings from '@/components/blueprints/ProviderTransformationSettings'
+import GithubSettings from '@/pages/configure/settings/github'
+
+const DataTransformations = (props) => {
+ const {
+ provider,
+ activeStep,
+ activeConnectionTab,
+ blueprintConnections = [],
+ dataEntities = {},
+ projects = [],
+ boards = [],
+ issueTypes = [],
+ fields = [],
+ transformations = {},
+ configuredConnection,
+ configuredProject,
+ configuredBoard,
+ handleConnectionTabChange = () => {},
+ prevStep = () => {},
+ addBoardTransformation = () => {},
+ addProjectTransformation = () => {},
+ activeTransformation,
+ setTransformations = () => {},
+ setTransformationSettings = () => {},
+ onSave = () => {},
+ onCancel = () => {},
+ onClear = () => {},
+ isSaving = false,
+ isSavingConnection = false,
+ isRunning = false,
+ jiraProxyError,
+ isFetchingJIRA = false
+ } = props
+
+ const [newTransformation, setNewTransformation] = useState({})
+
+ const changeTransformation = useCallback((settings, entity) => {
+ console.log('>>>>> CHANGING TRANSFORMATION FOR ENTITY!', entity, settings)
+ setNewTransformation(currentTransforms => ({
+ ...currentTransforms,
+ [entity]: {
+ ...currentTransforms[entity],
+ ...settings
+ }
+ }))
+ }, [setNewTransformation])
+
+ // const clearTransformation = useCallback(() => {
+ // console.log('>>>>> CLEARING!!!!!', configuredBoard)
+ // setNewTransformation({
+ // [configuredBoard?.id]: {}
+ // })
+ // onClear()
+ // }, [configuredProject, configuredBoard, onClear, setNewTransformation])
+
+ // useEffect(() => {
+ // console.log('>>> LOOK HERE DataTransformationSettings:activeTransformation!!!!', activeTransformation)
+ // }, [activeTransformation])
+
+ // useEffect(() => {
+ // console.log('>>> NEW TRANSFORMATION SETTINGS...', newTransformation)
+ // // AUTO-SAVE All Transformation Keys
+ // // Object.keys(newTransformation).forEach((k, kIdx) => setTransformationSettings(Object.values(newTransformation)[kIdx], k))
+ // }, [newTransformation])
+
+ return (
+ <div className='workflow-step workflow-step-add-transformation' data-step={activeStep?.id}>
+ <p
+ className='alert neutral'
+ >
+ Set transformation rules for your selected data to view more complex
+ metrics in the dashboards.
+ <br />
+ <a
+ href='#'
+ className='more-link'
+ rel='noreferrer'
+ style={{
+ // color: '#7497F7',
+ marginTop: '5px',
+ display: 'inline-block',
+ }}
+ >
+ Find out more
+ </a>
+ </p>
+ {blueprintConnections.length > 0 && (
+ <div style={{ display: 'flex' }}>
+ <div
+ className='connection-tab-selector'
+ style={{ minWidth: '200px' }}
+ >
+ <Card
+ className='workflow-card connection-tabs-card'
+ elevation={Elevation.TWO}
+ style={{ padding: '10px' }}
+ >
+ <ConnectionTabs
+ connections={blueprintConnections}
+ onChange={handleConnectionTabChange}
+ selectedTabId={activeConnectionTab}
+ />
+ </Card>
+ </div>
+ <div
+ className='connection-transformation'
+ style={{ marginLeft: '10px', width: '100%' }}
+ >
+ <Card
+ className='workflow-card workflow-panel-card'
+ elevation={Elevation.TWO}
+ >
+ {configuredConnection && (
+ <>
+ <h3>
+ <span style={{ float: 'left', marginRight: '8px' }}>
+ {ProviderIcons[configuredConnection.provider]
+ ? (
+ ProviderIcons[configuredConnection.provider](24, 24)
+ )
+ : (
+ <></>
+ )}
+ </span>{' '}
+ {configuredConnection.title}
+ </h3>
+ <Divider className='section-divider' />
+
+ {[Providers.GITLAB, Providers.GITHUB].includes(
+ configuredConnection.provider
+ ) && (!configuredProject) && (
+ <>
+ <StandardStackedList
+ items={projects}
+ transformations={transformations}
+ className='selected-items-list selected-projects-list'
+ connection={configuredConnection}
+ activeItem={configuredProject}
+ onAdd={addProjectTransformation}
+ onChange={addProjectTransformation}
+ />
+ {projects[configuredConnection.id].length === 0 && (
+ <NoData
+ title='No Projects Selected'
+ icon='git-branch'
+ message='Please select specify at least one project.'
+ onClick={prevStep}
+ />
+ )}
+ </>
+ )}
+
+ {[Providers.JIRA].includes(
+ configuredConnection.provider
+ ) && (!configuredBoard) && (
+ <>
+ <StandardStackedList
+ items={boards}
+ transformations={transformations}
+ className='selected-items-list selected-boards-list'
+ connection={configuredConnection}
+ activeItem={configuredBoard}
+ onAdd={addBoardTransformation}
+ onChange={addBoardTransformation}
+ />
+ {boards[configuredConnection.id].length === 0 && (
+ <NoData
+ title='No Boards Selected'
+ icon='th'
+ message='Please select specify at least one board.'
+ onClick={prevStep}
+ />
+ )}
+ </>
+ )}
+
+ {(configuredProject || configuredBoard) && (
+ <div>
+ <h4>Project</h4>
+ <p style={{ color: '#292B3F' }}>{configuredProject || configuredBoard?.name || '< select a project >'}</p>
+ <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+ <h4 style={{ margin: 0 }}>
+ Data Transformation Rules
+ </h4>
+ <div>
+ {/* @todo: reactivate clear all functionality */}
+ {/* <Button
+ minimal
+ small
+ text='Clear All'
+ intent={Intent.NONE}
+ href='#'
+ onClick={clearTransformation}
+ style={{ float: 'right' }}
+ disabled={Object.keys(activeTransformation || {}).length === 0}
+ /> */}
+ </div>
+ </div>
+
+ {!dataEntities[configuredConnection.id] ||
+ (dataEntities[configuredConnection.id]?.length ===
+ 0 && <p>(No Data Entities Selected)</p>)}
+ {dataEntities[configuredConnection.id]?.find(
+ (e) => e.value === DataEntityTypes.TICKET
+ ) && (
+ <ProviderTransformationSettings
+ provider={integrationsData.find(i => i.id === configuredConnection?.provider)}
+ connection={configuredConnection}
+ configuredProject={configuredProject}
+ configuredBoard={configuredBoard}
+ issueTypes={issueTypes}
+ fields={fields}
+ boards={boards}
+ transformation={activeTransformation}
+ newTransformation={newTransformation}
+ setNewTransformation={setNewTransformation}
+ changeTransformation={changeTransformation}
+ onSettingsChange={setTransformationSettings}
+ // onSettingsChange={changeTransformation}
+ entity={DataEntityTypes.TICKET}
+ isSaving={isSaving}
+ isSavingConnection={isSavingConnection}
+ jiraProxyError={jiraProxyError}
+ isFetchingJIRA={isFetchingJIRA}
+ />
+ )}
+
+ <div className='transformation-actions' style={{ display: 'flex', justifyContent: 'flex-end' }}>
+ <Button
+ text='Cancel'
+ small
+ outlined
+ onClick={onCancel}
+ />
+ <Button
+ text='Save'
+ intent={Intent.PRIMARY}
+ small
+ outlined
+ onClick={() => onSave(newTransformation[configuredBoard?.id], configuredBoard?.id)}
+ disabled={[Providers.GITLAB].includes(configuredConnection?.provider)}
+ style={{ marginLeft: '5px' }}
+ />
+ </div>
+ </div>
+ )}
+ </>
+ )}
+
+ {[Providers.JENKINS].includes(configuredConnection.provider) && (
+ <>
+ <div className='bp3-non-ideal-state'>
+ <div className='bp3-non-ideal-state-visual'>
+ <Icon icon='disable' size={32} />
+ </div>
+ <div className='bp3-non-ideal-state-text'>
+ <h4 className='bp3-heading' style={{ margin: 0 }}>
+ No Data Transformations
+ </h4>
+ <div>No additional settings are available at this time.</div>
+ </div>
+ </div>
+ </>
+ )}
+ </Card>
+ </div>
+ </div>
+ )}
+ {blueprintConnections.length === 0 && (
+ <>
+ <div className='bp3-non-ideal-state'>
+ <div className='bp3-non-ideal-state-visual'>
+ <Icon icon='offline' size={32} />
+ </div>
+ <div className='bp3-non-ideal-state-text'>
+ <h4 className='bp3-heading' style={{ margin: 0 }}>
+ No Data Connections
+ </h4>
+ <div>Please select at least one connection source.</div>
+ </div>
+ <button
+ className='bp3-button bp4-intent-primary'
+ onClick={prevStep}
+ >
+ Go Back
+ </button>
+ </div>
+ </>
+ )}
+ </div>
+ )
+}
+
+export default DataTransformations
diff --git a/config-ui/src/components/menus/PipelineConfigsMenu.jsx b/config-ui/src/components/menus/PipelineConfigsMenu.jsx
index ad7ff491..50a224d1 100644
--- a/config-ui/src/components/menus/PipelineConfigsMenu.jsx
+++ b/config-ui/src/components/menus/PipelineConfigsMenu.jsx
@@ -31,60 +31,101 @@ import { starRocksConfig as sampleStarRocksConfigPipelineConfig } from '@/data/p
const PipelineConfigsMenu = (props) => {
const {
setRawConfiguration = () => {},
+ showTitle = false,
// advancedMode = false
} = props
return (
<Menu className='pipeline-configs-menu'>
- <label style={{
- fontSize: '10px',
- fontWeight: 800,
- fontFamily: '"Montserrat", sans-serif',
- textTransform: 'uppercase',
- padding: '6px 8px',
- display: 'block'
- }}
- >SAMPLE PIPELINE CONFIGURATIONS
- </label>
+ {showTitle && (
+ <label
+ style={{
+ fontSize: '10px',
+ fontWeight: 800,
+ textTransform: 'uppercase',
+ padding: '6px 8px',
+ display: 'block',
+ }}
+ >
+ SAMPLE PIPELINE CONFIGURATIONS
+ </label>
+ )}
<Menu.Item
- icon='group-objects' text='Load General Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(samplePipelineConfig, null, ' '))}
+ icon='code'
+ text='Load General Configuration'
+ onClick={() =>
+ setRawConfiguration(JSON.stringify(samplePipelineConfig, null, ' '))}
/>
<Menu.Item
- icon='group-objects'
+ icon='code'
text='Load RefDiff Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleRefdiffPipelineConfig, null, ' '))}
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleRefdiffPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load GitExtractor Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleGitextractorPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load GitExtractor Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleGitextractorPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load GitHub Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleGithubPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load GitHub Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleGithubPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load GitLab Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleGitlabPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load GitLab Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleGitlabPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load JIRA Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleJiraPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load JIRA Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleJiraPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load Jenkins Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleJenkinsPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load Jenkins Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleJenkinsPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load Feishu Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleFeishuPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load Feishu Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleFeishuPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load DBT Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleDbtPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load DBT Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleDbtPipelineConfig, null, ' ')
+ )}
/>
<Menu.Item
- icon='group-objects' text='Load StarRocks Configuration'
- onClick={() => setRawConfiguration(JSON.stringify(sampleStarRocksConfigPipelineConfig, null, ' '))}
+ icon='code'
+ text='Load StarRocks Configuration'
+ onClick={() =>
+ setRawConfiguration(
+ JSON.stringify(sampleStarRocksConfigPipelineConfig, null, ' ')
+ )}
/>
</Menu>
)
diff --git a/config-ui/src/components/menus/PipelinePresetsMenu.jsx b/config-ui/src/components/menus/PipelinePresetsMenu.jsx
index 0a495805..341e1344 100644
--- a/config-ui/src/components/menus/PipelinePresetsMenu.jsx
+++ b/config-ui/src/components/menus/PipelinePresetsMenu.jsx
@@ -33,7 +33,6 @@ const PipelinePresetsMenu = (props) => {
<label style={{
fontSize: '10px',
fontWeight: 800,
- fontFamily: '"Montserrat", sans-serif',
textTransform: 'uppercase',
padding: '6px 8px',
display: 'block'
diff --git a/config-ui/src/components/menus/RefDiffTasksMenu.jsx b/config-ui/src/components/menus/RefDiffTasksMenu.jsx
index 0df06ebf..ee062587 100644
--- a/config-ui/src/components/menus/RefDiffTasksMenu.jsx
+++ b/config-ui/src/components/menus/RefDiffTasksMenu.jsx
@@ -36,7 +36,6 @@ const RefDiffTasksMenu = (props) => {
<label style={{
fontSize: '10px',
fontWeight: 800,
- fontFamily: '"Montserrat", sans-serif',
textTransform: 'uppercase',
padding: '6px 8px',
display: 'block'
diff --git a/config-ui/src/components/pipelines/CodeInspector.jsx b/config-ui/src/components/pipelines/CodeInspector.jsx
index 7ef849cb..9800ad43 100644
--- a/config-ui/src/components/pipelines/CodeInspector.jsx
+++ b/config-ui/src/components/pipelines/CodeInspector.jsx
@@ -29,14 +29,14 @@ import {
} from '@blueprintjs/core'
const CodeInspector = (props) => {
- const { activePipeline, isOpen, onClose, hasBackdrop = true } = props
+ const { activePipeline, isOpen, onClose, titleIcon = 'code', title = `Inspect RUN #${activePipeline.id}`, subtitle = 'JSON RESPONSE', hasBackdrop = true } = props
return (
<Drawer
className='drawer-json-inspector'
- icon='code'
+ icon={titleIcon}
onClose={() => onClose(false)}
- title={`Inspect RUN #${activePipeline.ID}`}
+ title={title}
position={Position.RIGHT}
size={DrawerSize.SMALL}
autoFocus
@@ -50,7 +50,7 @@ const CodeInspector = (props) => {
<div className={Classes.DRAWER_BODY}>
<div className={Classes.DIALOG_BODY}>
<h3 className='no-user-select' style={{ margin: 0, padding: '8px 0' }}>
- <span style={{ float: 'right', fontSize: '9px', color: '#aaaaaa' }}>application/json</span> JSON RESPONSE
+ <span style={{ float: 'right', fontSize: '9px', color: '#aaaaaa' }}>application/json</span> {subtitle}
</h3>
<p className='no-user-select'>
If you are submitting a
diff --git a/config-ui/src/components/pipelines/ProviderSettings.jsx b/config-ui/src/components/pipelines/ProviderSettings.jsx
index be0062fe..9f08a715 100644
--- a/config-ui/src/components/pipelines/ProviderSettings.jsx
+++ b/config-ui/src/components/pipelines/ProviderSettings.jsx
@@ -129,7 +129,7 @@ const ProviderSettings = (props) => {
>{boardId.length}
</span>
</strong>
- }
+ }
labelInfo={<span style={{ display: 'block' }}>Enter JIRA Board ID.</span>}
inline={false}
labelFor='board-id'
@@ -154,7 +154,7 @@ const ProviderSettings = (props) => {
minimal
onClick={() => setBoardId([])}
/>
- }
+ }
onKeyDown={e => e.key === 'Enter' && e.preventDefault()}
className='input-board-id tagInput'
/>
@@ -279,7 +279,7 @@ const ProviderSettings = (props) => {
>{projectId.length}
</span>
</strong>
- }
+ }
labelInfo={<span style={{ display: 'block' }}>Enter GitLab Project ID.</span>}
inline={false}
labelFor='project-id'
@@ -303,7 +303,7 @@ const ProviderSettings = (props) => {
minimal
onClick={() => setProjectId([])}
/>
- }
+ }
onKeyDown={e => e.key === 'Enter' && e.preventDefault()}
className='input-project-id tagInput'
/>
@@ -388,9 +388,9 @@ const ProviderSettings = (props) => {
disabled={isRunning || !isEnabled(providerId)}
style={{ justifyContent: 'space-between', minWidth: '220px', maxWidth: '420px', whiteSpace: 'nowrap' }}
text={(
- selectedGithubRepo
- ? <>{selectedGithubRepo.title} <span style={{ fontSize: '10px', color: Colors.GRAY3 }}>[{selectedGithubRepo.value}]</span></>
- : 'Select Repository')}
+ selectedGithubRepo
+ ? <>{selectedGithubRepo.title} <span style={{ fontSize: '10px', color: Colors.GRAY3 }}>[{selectedGithubRepo.value}]</span></>
+ : 'Select Repository')}
rightIcon='double-caret-vertical'
fill
/>
diff --git a/config-ui/src/components/pipelines/StageLane.jsx b/config-ui/src/components/pipelines/StageLane.jsx
index c7768785..1b1581e6 100644
--- a/config-ui/src/components/pipelines/StageLane.jsx
+++ b/config-ui/src/components/pipelines/StageLane.jsx
@@ -21,13 +21,15 @@ import {
Icon,
Colors,
H4,
+ Spinner,
+ Intent,
} from '@blueprintjs/core'
import dayjs from '@/utils/time'
import StageTask from '@/components/pipelines/StageTask'
import StageLaneStatus from '@/components/pipelines/StageLaneStatus'
const StageLane = (props) => {
- const { stages = [], sK = 1, sIdx } = props
+ const { stages = [], sK = 1, sIdx, showStageTasks = true } = props
const [activeStage, setActiveStage] = useState(stages[sK])
const [readyStageModules, setReadyStageModules] = useState([])
@@ -86,7 +88,7 @@ const StageLane = (props) => {
const diffDuration = (pV, cV) => pV + dayjs(cV.status === 'TASK_RUNNING'
? now
: (cV.status === 'TASK_FAILED' ? cV.finishedAt == null : cV.updatedAt || cV.finishedAt)).diff(dayjs(cV.beganAt), unit)
- const filterParallel = (pV, cV) => !pV.some(t => t.CreatedAt.split('.')[0] === cV.CreatedAt.split('.')[0]) ? [...pV, cV] : [...pV]
+ const filterParallel = (pV, cV) => !pV.some(t => t.createdAt.split('.')[0] === cV.createdAt.split('.')[0]) ? [...pV, cV] : [...pV]
const parallelTasks = stageTasks.reduce(filterParallel, [])
duration = parallelMode && !isStageFailed(sK) ? parallelTasks.reduce(diffDuration, 0) : stageTasks.reduce(diffDuration, 0)
// console.log('>> CALCULATED DURATION =', stageTasks, duration)
@@ -127,40 +129,37 @@ const StageLane = (props) => {
<>
<div
// key={`stage-lane-key-${sIdx}`}
- className={`stage-lane ${generateStageCssClasses(sK)} ${isStageActive(sK) ? 'bp3-elevation-2' : ''}`}
+ className={`stage-lane ${generateStageCssClasses(sK)} ${isStageActive(sK) ? '' : ''}`}
style={{
position: 'relative',
display: 'flex',
flexDirection: 'column',
flex: 1,
- justifyContent: 'center',
+ justifyContent: 'flex-start',
alignContent: 'flex-start',
alignItems: 'center',
padding: '0'
}}
>
{isStageActive(sK) && (
- <Icon
- icon='dot'
- color={Colors.GREEN5}
- size={14}
- style={{ position: 'absolute', display: 'inline-block', right: '5px', top: '5px' }}
- />
+ <span style={{ position: 'absolute', display: 'inline-block', right: '8px', top: '8px' }}>
+ <Spinner size={14} intent={Intent.PRIMARY} />
+ </span>
)}
{isStageFailed(sK) && (
<Icon
- icon='warning-sign'
+ icon='error'
color={Colors.RED5}
- size={10}
- style={{ position: 'absolute', display: 'inline-block', right: '5px', top: '5px' }}
+ size={14}
+ style={{ position: 'absolute', display: 'inline-block', right: '8px', top: '8px' }}
/>
)}
{isStageCompleted(sK) && (
<Icon
icon='tick'
color={Colors.GREEN5}
- size={12}
- style={{ position: 'absolute', display: 'inline-block', right: '5px', top: '5px' }}
+ size={14}
+ style={{ position: 'absolute', display: 'inline-block', right: '8px', top: '8px' }}
/>
)}
<H4
@@ -172,7 +171,7 @@ const StageLane = (props) => {
Stage {sIdx + 1}
</H4>
{/* {sIdx} */}
- {stages[sK].map((t, tIdx) => (
+ {showStageTasks && stages[sK].map((t, tIdx) => (
<CSSTransition
key={`fx-key-stage-task-${tIdx}`}
in={readyStageModules.includes(tIdx)}
@@ -183,7 +182,7 @@ const StageLane = (props) => {
<StageTask task={t} key={`stage-task-key-${tIdx}`} />
</CSSTransition>
))}
- <StageLaneStatus
+ {/* <StageLaneStatus
sK={sK}
stage={activeStage}
stages={stages}
@@ -200,7 +199,7 @@ const StageLane = (props) => {
getTotalTasksCount={getTotalTasksCount}
getCompletedTaskCount={getCompletedTaskCount}
getRunningTaskCount={getRunningTaskCount}
- />
+ /> */}
</div>
</>
)
diff --git a/config-ui/src/components/pipelines/StageLaneStatus.jsx b/config-ui/src/components/pipelines/StageLaneStatus.jsx
index 3fc1e108..b145d30e 100644
--- a/config-ui/src/components/pipelines/StageLaneStatus.jsx
+++ b/config-ui/src/components/pipelines/StageLaneStatus.jsx
@@ -50,7 +50,6 @@ const StageLaneStatus = (props) => {
<div
className='stage-status'
style={{
- fontFamily: 'Montserrat',
fontWeight: 900,
fontSize: '10px',
letterSpacing: '1px',
@@ -66,20 +65,19 @@ const StageLaneStatus = (props) => {
{isStageCompleted(sK) ? getCompletedTaskCount(stage) : getRunningTaskCount(stage)}/{getTotalTasksCount(stage)}
</span>
</div>
- <div className='stage-caption'>
+ {/* <div className='stage-caption'>
{isStageActive(sK) && <>Stage Running ~{duration}</>}
- {/* {isStageFailed(sK) && <>Stage Failed</>} */}
{(isStageCompleted(sK) || isStageFailed(sK)) && <>{duration.startsWith('0') ? '< 1min' : duration}</>}
{isStagePending(sK) && <><Icon icon='more' color={Colors.GRAY5} size={12} /></>}
- </div>
+ </div> */}
</div>
- {isStageActive(sK) && (
+ {/* {isStageActive(sK) && (
<ProgressBar
className='stage-lane-progressbar'
stripes={true}
intent={Intent.SUCCESS} value={calculateStageLaneProgress(stage)} style={{ borderRadius: 0 }}
/>
- )}
+ )} */}
</>
)
}
diff --git a/config-ui/src/components/pipelines/StagePanel.jsx b/config-ui/src/components/pipelines/StagePanel.jsx
index 6d055802..ee29b356 100644
--- a/config-ui/src/components/pipelines/StagePanel.jsx
+++ b/config-ui/src/components/pipelines/StagePanel.jsx
@@ -173,7 +173,6 @@ const StagePanel = (props) => {
textTransform: 'uppercase',
lineHeight: '33px',
margin: 0,
- fontFamily: 'Montserrat',
fontWeight: 800,
fontSize: '13px',
letterSpacing: '2px',
@@ -225,7 +224,6 @@ const StagePanel = (props) => {
textTransform: 'uppercase',
lineHeight: '33px',
margin: 0,
- fontFamily: 'Montserrat',
fontWeight: 800,
fontSize: '13px',
letterSpacing: '2px',
diff --git a/config-ui/src/components/pipelines/StageTask.jsx b/config-ui/src/components/pipelines/StageTask.jsx
index f01ecfc7..857b9f08 100644
--- a/config-ui/src/components/pipelines/StageTask.jsx
+++ b/config-ui/src/components/pipelines/StageTask.jsx
@@ -36,15 +36,15 @@ const StageTask = (props) => {
}
const determineCardElevation = (status, isElevated = false) => {
- let elevation = Elevation.ONE
+ let elevation = Elevation.ZERO
if (status === 'TASK_RUNNING' && isElevated) {
- elevation = Elevation.THREE
+ elevation = Elevation.ZERO
} else if (status === 'TASK_RUNNING' && !isElevated) {
- elevation = Elevation.TWO
+ elevation = Elevation.ZERO
} else if (isElevated) {
- elevation = Elevation.THREE
+ elevation = Elevation.ZERO
} else {
- elevation = Elevation.ONE
+ elevation = Elevation.ZERO
}
return elevation
}
@@ -71,14 +71,14 @@ const StageTask = (props) => {
<StageTaskCaption task={task} options={task.options} />
</div>
</div>
- <div
+ {/* <div
className='task-module-progress'
style={{
fontWeight: task.status === 'TASK_COMPLETED' ? 700 : 300
}}
>
{Number(task.status === 'TASK_COMPLETED' ? 100 : (task.progress / 1) * 100).toFixed(0)}%
- </div>
+ </div> */}
</Card>
</>
)
diff --git a/config-ui/src/components/pipelines/StageTaskCaption.jsx b/config-ui/src/components/pipelines/StageTaskCaption.jsx
index 5a3e23bc..6e0cfb0a 100644
--- a/config-ui/src/components/pipelines/StageTaskCaption.jsx
+++ b/config-ui/src/components/pipelines/StageTaskCaption.jsx
@@ -16,6 +16,8 @@
*
*/
import React from 'react'
+import { Colors } from '@blueprintjs/core'
+import dayjs from '@/utils/time'
import { Providers } from '@/data/Providers'
const StageTaskCaption = (props) => {
@@ -27,17 +29,23 @@ const StageTaskCaption = (props) => {
style={{
opacity: 0.4,
display: 'block',
- width: '90%',
+ width: '100%',
fontSize: '9px',
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis'
}}
>
- {(task.plugin === Providers.GITLAB || task.plugin === Providers.JIRA) && (<>ID {options.projectId || options.boardId}</>)}
- {task.plugin === Providers.GITHUB && (<>@{options.owner}/{options.repositoryName}</>)}
- {task.plugin === Providers.JENKINS && (<>Task #{task.ID}</>)}
- {(task.plugin === Providers.GITEXTRACTOR || task.plugin === Providers.REFDIFF) && (<>{options.repoId || `ID ${task.ID}`}</>)}
+ {(task.status === 'TASK_RUNNING' || task.status === 'TASK_COMPLETED') && (<span style={{ float: 'right' }}>
+ {task.status === 'TASK_RUNNING'
+ ? dayjs(task.beganAt).toNow(true)
+ : dayjs(task.beganAt).from(task.finishedAt || task.updatedAt, true)}
+ </span>)}
+ {task.status === 'TASK_RUNNING' && <span>Subtask {task?.progressDetail?.finishedSubTasks} / {task?.progressDetail?.totalSubTasks}</span>}
+ {task.status === 'TASK_COMPLETED' && <span>{task?.progressDetail?.finishedSubTasks || 'All'} Subtasks completed</span>}
+ {task.status === 'TASK_COMPLETED' && <span>{task?.progressDetail?.finishedRecords}</span>}
+ {task.status === 'TASK_CREATED' && <span>Records Pending</span>}
+ {task.status === 'TASK_FAILED' && <span style={{ color: Colors.RED3 }}>Task failed — <strong>{task?.failedSubTask || task?.message}</strong></span>}
</span>
)
}
diff --git a/config-ui/src/components/pipelines/StageTaskIndicator.jsx b/config-ui/src/components/pipelines/StageTaskIndicator.jsx
index 79e0e316..3f27e811 100644
--- a/config-ui/src/components/pipelines/StageTaskIndicator.jsx
+++ b/config-ui/src/components/pipelines/StageTaskIndicator.jsx
@@ -24,6 +24,7 @@ import {
Position,
Intent,
} from '@blueprintjs/core'
+import { ProviderIcons } from '@/data/Providers'
const StageTaskIndicator = (props) => {
const { task } = props
@@ -40,7 +41,10 @@ const StageTaskIndicator = (props) => {
outline: 'none'
}}
>
- {task.status === 'TASK_COMPLETED' && (
+ <span>
+ {ProviderIcons[task?.plugin] && ProviderIcons[task?.plugin](14, 14)}
+ </span>
+ {/* {task.status === 'TASK_COMPLETED' && (
<Tooltip content={`Task Complete [STAGE ${task.pipelineRow}]`} position={Position.TOP} intent={Intent.SUCCESS}>
<Icon icon='small-tick' size={18} color={Colors.GREEN5} style={{ marginLeft: '0', outline: 'none' }} />
</Tooltip>
@@ -72,9 +76,8 @@ const StageTaskIndicator = (props) => {
size={14}
value={0}
/>
- {/* <Icon icon='stopwatch' size={14} color={Colors.GRAY3} style={{ marginLeft: '0', marginBottom: '3px' }} /> */}
</Tooltip>
- )}
+ )} */}
</div>
)
}
diff --git a/config-ui/src/components/pipelines/StageTaskName.jsx b/config-ui/src/components/pipelines/StageTaskName.jsx
index db09fc9a..fbd6847c 100644
--- a/config-ui/src/components/pipelines/StageTaskName.jsx
+++ b/config-ui/src/components/pipelines/StageTaskName.jsx
@@ -59,8 +59,9 @@ const StageTaskName = (props) => {
autoFocus={false}
enforceFocus={false}
usePortal={true}
+ disabled
>
- <span className='task-plugin-text' ref={popoverTriggerRef}>{task.plugin}</span>
+ <span className='task-plugin-text' ref={popoverTriggerRef} style={{ display: 'block', margin: '5px 0 5px 0' }}><strong>Task ID {task.id}</strong> {' '} {ProviderLabels[task?.plugin?.toUpperCase()]}</span>
<>
<div style={{ textShadow: 'none', fontSize: '12px', padding: '12px', maxWidth: '400px' }}>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
@@ -69,13 +70,11 @@ const StageTaskName = (props) => {
color: Colors.GRAY2,
fontWeight: 700,
fontSize: '14px',
- fontFamily: '"Montserrat", sans-serif',
maxWidth: '60%'
}}
>
<H3 style={{
margin: 0,
- fontFamily: '"JetBrains Mono", monospace',
fontSize: '18px',
color: Colors.BLACK,
textOverflow: 'ellipsis',
@@ -95,7 +94,6 @@ const StageTaskName = (props) => {
)}
</div>
<div style={{
- fontFamily: '"Montserrat", sans-serif',
fontWeight: 800,
displays: 'flex',
alignItems: 'center',
@@ -141,25 +139,6 @@ const StageTaskName = (props) => {
<div style={{ marginTop: '6px' }}>
<label style={{ color: Colors.GRAY2 }}>Status</label><br />
<strong>{task.status}</strong>{' '}
- <strong
- className='bp3-tag'
- style={{ minHeight: '16px', fontSize: '10px', padding: '2px 6px', borderRadius: '6px' }}
- >PROGRESS {task.progress * 100}%
- </strong>
- </div>
- <div style={{ marginTop: '6px' }}>
- <label style={{ color: Colors.GRAY2 }}>Options</label><br />
- <TextArea
- readOnly
- fill value={JSON.stringify(task.options)} style={{ fontSize: '10px', backgroundColor: '#f8f8f8', resize: 'none' }}
- />
- {/* <span>
- <pre style={{ margin: 0 }}>
- <code>
- {JSON.stringify(task.options)}
- </code>
- </pre>
- </span> */}
</div>
{task.message !== '' && (
<div style={{ marginTop: '6px' }}>
diff --git a/config-ui/src/components/pipelines/TaskActivity.jsx b/config-ui/src/components/pipelines/TaskActivity.jsx
index d9bcb9d7..ecf8194b 100644
--- a/config-ui/src/components/pipelines/TaskActivity.jsx
+++ b/config-ui/src/components/pipelines/TaskActivity.jsx
@@ -52,10 +52,10 @@ const TaskActivity = (props) => {
}
useEffect(() => {
- setProgressDetail(initialDetail => getActiveTask(activePipeline.tasks)
- ? getActiveTask(activePipeline.tasks).progressDetail
+ setProgressDetail(initialDetail => getActiveTask(activePipeline.plan)
+ ? getActiveTask(activePipeline.plan).progressDetail
: initialDetail)
- setActiveTask(activePipeline.tasks.find(t => t.status === 'TASK_RUNNING'))
+ setActiveTask(activePipeline.plan.find(t => t.status === 'TASK_RUNNING'))
}, [activePipeline])
useEffect(() => {
@@ -82,11 +82,11 @@ const TaskActivity = (props) => {
))}
</div>
)}
- {Object.keys(stages).length === 1 && activePipeline?.ID && activePipeline.tasks && activePipeline.tasks.map((t, tIdx) => (
+ {Object.keys(stages).length === 1 && activePipeline?.ID && activePipeline.plan && activePipeline.plan.map((t, tIdx) => (
<div className='pipeline-task-block' key={`pipeline-task-key-${tIdx}`}>
<div
className='pipeline-task-row'
- // key={`pipeline-task-key-${tIdx}`}
+ // key={`pipeline-task-key-${tIdx}`}
style={{
display: 'flex',
padding: '6px 10px',
@@ -142,7 +142,7 @@ const TaskActivity = (props) => {
icon={expandedTask?.id === t.id ? 'collapse-all' : 'expand-all'}
style={{ margin: '0 6px 0 0' }}
/>
- )}
+ )}
small
style={{
minHeight: '20px',
@@ -331,7 +331,7 @@ const TaskActivity = (props) => {
</Collapse>
</div>
))}
- {(!activePipeline.tasks || activePipeline.tasks.length === 0) && (
+ {(!activePipeline.plan || activePipeline.plan.length === 0) && (
<>
<div style={{ display: 'flex' }}>
<Icon
diff --git a/config-ui/src/components/pipelines/pipeline-settings/refdiff.jsx b/config-ui/src/components/pipelines/pipeline-settings/refdiff.jsx
index 3df3fa5b..c3e06f34 100644
--- a/config-ui/src/components/pipelines/pipeline-settings/refdiff.jsx
+++ b/config-ui/src/components/pipelines/pipeline-settings/refdiff.jsx
@@ -123,7 +123,7 @@ const RefDiffSettings = (props) => {
disabled={isRunning || !isEnabled(providerId)}
content={(
<RefDiffTasksMenu onSelect={handleRefDiffTaskSelect} selected={tasks} />
- )}
+ )}
placement='top-center'
>
<ButtonGroup disabled={isRunning || !isEnabled(providerId)}>
@@ -156,7 +156,7 @@ const RefDiffSettings = (props) => {
>{pairs.length}
</span>
</strong>
- )}
+ )}
labelInfo={<span style={{ display: 'block' }}>Specify tag Ref Pairs</span>}
inline={false}
labelFor='refdiff-pair-newref'
@@ -176,7 +176,7 @@ const RefDiffSettings = (props) => {
}}
>New Ref
</Tag>
- )}
+ )}
inline={true}
disabled={isRunning || !isEnabled(providerId)}
placeholder='eg. refs/tags/v0.6.0'
@@ -196,7 +196,7 @@ const RefDiffSettings = (props) => {
}}
>Old Ref
</Tag>
- )}
+ )}
inline={true}
disabled={isRunning || !isEnabled(providerId)}
placeholder='eg. refs/tags/v0.5.0'
@@ -215,7 +215,7 @@ const RefDiffSettings = (props) => {
onClick={() => addRefDiffPairObject(refDiffOldTag, refDiffNewTag)}
/>
</Tooltip>
- )}
+ )}
/>
</div>
<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
diff --git a/config-ui/src/components/validation/InputValidationError.jsx b/config-ui/src/components/validation/InputValidationError.jsx
index ff95cfa5..8110f867 100644
--- a/config-ui/src/components/validation/InputValidationError.jsx
+++ b/config-ui/src/components/validation/InputValidationError.jsx
@@ -22,7 +22,7 @@ import {
Popover,
PopoverInteractionKind,
Intent,
- Position
+ Position,
} from '@blueprintjs/core'
const InputValidationError = (props) => {
@@ -31,39 +31,54 @@ const InputValidationError = (props) => {
position = Position.TOP,
// eslint-disable-next-line no-unused-vars
validateOnFocus = false,
- elementRef, onError = () => {},
+ elementRef,
+ onError = () => {},
onSuccess = () => {},
- interactionKind = PopoverInteractionKind.HOVER_TARGET_ONLY
+ interactionKind = PopoverInteractionKind.HOVER_TARGET_ONLY,
} = props
const [elementIsFocused, setElementIsFocused] = useState(false)
// eslint-disable-next-line no-unused-vars
const [inputElement, setInputElement] = useState(null)
- const handleElementFocus = useCallback((isFocused, ref) => {
- setElementIsFocused(isFocused)
- if (error) {
- elementRef?.current.parentElement.classList.remove('valid-field')
- elementRef?.current.parentElement.classList.add('invalid-field')
- } else {
- elementRef?.current.parentElement.classList.remove('invalid-field')
- elementRef?.current.parentElement.classList.add('valid-field')
- }
- }, [elementRef, error])
+ const handleElementFocus = useCallback(
+ (isFocused, ref) => {
+ setElementIsFocused(isFocused)
+ if (error) {
+ elementRef?.current.parentElement.classList.remove('valid-field')
+ elementRef?.current.parentElement.classList.add('invalid-field')
+ } else {
+ elementRef?.current.parentElement.classList.remove('invalid-field')
+ elementRef?.current.parentElement.classList.add('valid-field')
+ }
+ },
+ [elementRef, error]
+ )
- const handleElementBlur = useCallback((isFocused, ref) => {
- setElementIsFocused(isFocused)
- if (!error) {
- elementRef?.current.parentElement.classList.remove('invalid-field')
- }
- }, [elementRef, error])
+ const handleElementBlur = useCallback(
+ (isFocused, ref) => {
+ setElementIsFocused(isFocused)
+ if (!error) {
+ elementRef?.current.parentElement.classList.remove('invalid-field')
+ }
+ },
+ [elementRef, error]
+ )
useEffect(() => {
const iRef = elementRef?.current
if (iRef) {
setInputElement(iRef)
- iRef.addEventListener('focus', (e) => handleElementFocus(true, iRef), true)
- iRef.addEventListener('keyup', (e) => handleElementFocus(true, iRef), true)
+ iRef.addEventListener(
+ 'focus',
+ (e) => handleElementFocus(true, iRef),
+ true
+ )
+ iRef.addEventListener(
+ 'keyup',
+ (e) => handleElementFocus(true, iRef),
+ true
+ )
iRef.addEventListener('blur', (e) => handleElementBlur(false, iRef), true)
} else {
setInputElement(null)
@@ -87,34 +102,45 @@ const InputValidationError = (props) => {
}
}, [error, onError, onSuccess, elementIsFocused, validateOnFocus, elementRef])
- useEffect(() => {
-
- }, [validateOnFocus])
+ useEffect(() => {}, [validateOnFocus])
- return error
- ? (
- <div className='inline-input-error' style={{ outline: 'none', cursor: 'pointer', margin: '5px 5px 3px 5px' }}>
- <Popover
- position={position}
- usePortal={true}
- openOnTargetFocus={true}
- intent={Intent.WARNING}
- interactionKind={interactionKind}
- enforceFocus={false}
- // autoFocus={false}
+ return error ? (
+ <div
+ className='inline-input-error'
+ style={{ outline: 'none', cursor: 'pointer', margin: '5px 5px 3px 5px' }}
+ >
+ <Popover
+ position={position}
+ usePortal={true}
+ openOnTargetFocus={true}
+ intent={Intent.WARNING}
+ interactionKind={interactionKind}
+ enforceFocus={false}
+ // autoFocus={false}
+ >
+ <Icon
+ icon='warning-sign'
+ size={12}
+ color={
+ (validateOnFocus && elementIsFocused) || (error && !validateOnFocus)
+ ? Colors.RED5
+ : Colors.GRAY5
+ }
+ style={{ outline: 'none' }}
+ onClick={(e) => e.stopPropagation()}
+ />
+ <div
+ style={{
+ outline: 'none',
+ padding: '5px',
+ borderTop: `2px solid ${Colors.RED5}`,
+ }}
>
- <Icon
- icon='warning-sign'
- size={12}
- color={(validateOnFocus && elementIsFocused) || (error && !validateOnFocus) ? Colors.RED5 : Colors.GRAY5}
- style={{ outline: 'none' }}
- onClick={(e) => e.stopPropagation()}
- />
- <div style={{ outline: 'none', padding: '5px', borderTop: `2px solid ${Colors.RED5}` }}>{error}</div>
- </Popover>
- </div>
- )
- : null
+ {error}
+ </div>
+ </Popover>
+ </div>
+ ) : null
}
export default InputValidationError
diff --git a/config-ui/src/data/NullBlueprint.js b/config-ui/src/config/jiraApiProxy.js
similarity index 63%
copy from config-ui/src/data/NullBlueprint.js
copy to config-ui/src/config/jiraApiProxy.js
index 079291af..cf349cdd 100644
--- a/config-ui/src/data/NullBlueprint.js
+++ b/config-ui/src/config/jiraApiProxy.js
@@ -15,20 +15,17 @@
* limitations under the License.
*
*/
-const NullBlueprint = {
- id: null,
- createdAt: null,
- updatedAt: null,
- name: null,
- tasks: [
- []
- ],
- cronConfig: '0 0 * * *',
- description: '',
- interval: 'daily',
- enabled: false,
-}
+const API_VERSION = 2
+// @todo: add string replacer for [:connectionId] or refactor this const
+const API_PROXY_ENDPOINT = '/api/plugins/jira/connections/[:connectionId:]/proxy/rest'
+const ISSUE_TYPES_ENDPOINT = `${API_PROXY_ENDPOINT}/api/${API_VERSION}/issuetype`
+const ISSUE_FIELDS_ENDPOINT = `${API_PROXY_ENDPOINT}/api/${API_VERSION}/field`
+const BOARDS_ENDPOINT = `${API_PROXY_ENDPOINT}/agile/1.0/board`
export {
- NullBlueprint
+ API_VERSION,
+ API_PROXY_ENDPOINT,
+ ISSUE_TYPES_ENDPOINT,
+ ISSUE_FIELDS_ENDPOINT,
+ BOARDS_ENDPOINT,
}
diff --git a/config-ui/src/data/BlueprintWorkflow.js b/config-ui/src/data/BlueprintWorkflow.js
new file mode 100644
index 00000000..33508ee2
--- /dev/null
+++ b/config-ui/src/data/BlueprintWorkflow.js
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import { DataEntityTypes } from '@/data/DataEntities'
+
+const WorkflowSteps = [
+ {
+ id: 1,
+ active: 1,
+ name: 'add-connections',
+ title: 'Add Data Connections',
+ complete: false,
+ icon: null,
+ errors: []
+ },
+ {
+ id: 2,
+ active: 0,
+ name: 'set-data-scope',
+ title: 'Set Data Scope',
+ complete: false,
+ icon: null,
+ errors: []
+ },
+ {
+ id: 3,
+ active: 0,
+ name: 'add-transformation',
+ title: 'Add Transformation (Optional)',
+ complete: false,
+ icon: null,
+ errors: []
+ },
+ {
+ id: 4,
+ active: 0,
+ name: 'set-sync-frequeny',
+ title: 'Set Sync Frequency',
+ complete: false,
+ icon: null,
+ errors: []
+ },
+]
+
+const WorkflowAdvancedSteps = [
+ {
+ id: 1,
+ active: 1,
+ name: 'add-advanced-configuration',
+ title: 'Create Advanced Configuration',
+ complete: false,
+ icon: null,
+ errors: []
+ },
+ // {
+ // id: 2,
+ // active: 0,
+ // name: 'validate-advanced-configuration',
+ // title: 'Validate Blueprint JSON',
+ // complete: false,
+ // icon: null,
+ // errors: []
+ // },
+ {
+ id: 2,
+ active: 0,
+ name: 'set-sync-frequeny',
+ title: 'Set Sync Frequency',
+ complete: false,
+ icon: null,
+ errors: []
+ },
+]
+
+const DEFAULT_DATA_ENTITIES = [
+ {
+ id: 1,
+ name: 'source-code-management',
+ title: 'Source Code Management',
+ value: DataEntityTypes.CODE,
+ },
+ {
+ id: 2,
+ name: 'issue-tracking',
+ title: 'Issue Tracking',
+ value: DataEntityTypes.TICKET,
+ },
+ {
+ id: 3,
+ name: 'cross-domain',
+ title: 'Crossdomain',
+ value: DataEntityTypes.CROSSDOMAIN,
+ },
+ { id: 4, name: 'ci-cd', title: 'CI/CD', value: DataEntityTypes.DEVOPS },
+]
+
+const DEFAULT_BOARDS = [
+ {
+ id: 1,
+ name: 'scrum-lake',
+ title: 'DEVLAKE BOARD',
+ value: 'scrum-lake',
+ type: 'scrum',
+ self: 'https://your-domain.atlassian.net/rest/agile/1.0/board/1',
+ },
+ {
+ id: 2,
+ name: 'scrum-stream',
+ title: 'DEVSTREAM BOARD',
+ value: 'scrum-stream',
+ type: 'scrum',
+ self: 'https://your-domain.atlassian.net/rest/agile/1.0/board/2',
+ },
+]
+
+export { WorkflowSteps, WorkflowAdvancedSteps, DEFAULT_DATA_ENTITIES, DEFAULT_BOARDS }
diff --git a/config-ui/src/data/NullBlueprint.js b/config-ui/src/data/DataEntities.js
similarity index 71%
copy from config-ui/src/data/NullBlueprint.js
copy to config-ui/src/data/DataEntities.js
index 079291af..d187fcf0 100644
--- a/config-ui/src/data/NullBlueprint.js
+++ b/config-ui/src/data/DataEntities.js
@@ -15,20 +15,21 @@
* limitations under the License.
*
*/
-const NullBlueprint = {
- id: null,
- createdAt: null,
- updatedAt: null,
- name: null,
- tasks: [
- []
- ],
- cronConfig: '0 0 * * *',
- description: '',
- interval: 'daily',
- enabled: false,
-}
-export {
- NullBlueprint
+const DataEntityTypes = {
+ CODE: 'CODE',
+ CROSSDOMAIN: 'CROSS',
+ DEVOPS: 'CICD',
+ TICKET: 'TICKET',
+ // USER: 'user',
}
+
+const DataEntities = [
+ DataEntityTypes.CODE,
+ DataEntityTypes.CROSSDOMAIN,
+ DataEntityTypes.DEVOPS,
+ DataEntityTypes.TICKET,
+ // DataEntityTypes.USER,
+]
+
+export { DataEntityTypes, DataEntities }
diff --git a/config-ui/src/data/NullBlueprint.js b/config-ui/src/data/NullBlueprint.js
index 079291af..8249a34c 100644
--- a/config-ui/src/data/NullBlueprint.js
+++ b/config-ui/src/data/NullBlueprint.js
@@ -15,20 +15,43 @@
* limitations under the License.
*
*/
+const BlueprintMode = {
+ NORMAL: 'NORMAL',
+ ADVANCED: 'ADVANCED'
+}
+
+const BlueprintStatus = {
+ ENABLED: true,
+ DISABLED: false
+}
+
const NullBlueprint = {
id: null,
createdAt: null,
updatedAt: null,
name: null,
+ // Advanced mode uses tasks
+ // @todo sort out which key is to be used
tasks: [
[]
],
+ plan: [
+ []
+ ],
+ // Normal mode uses settings
+ settings: {
+ version: '1.0',
+ connections: []
+ },
cronConfig: '0 0 * * *',
description: '',
interval: 'daily',
- enabled: false,
+ enabled: BlueprintStatus.DISABLED,
+ mode: BlueprintMode.NORMAL
}
export {
- NullBlueprint
+ NullBlueprint,
+ BlueprintMode,
+ BlueprintStatus
}
diff --git a/config-ui/src/data/NullBlueprint.js b/config-ui/src/data/NullBlueprintConnection.js
similarity index 75%
copy from config-ui/src/data/NullBlueprint.js
copy to config-ui/src/data/NullBlueprintConnection.js
index 079291af..4a05d1fa 100644
--- a/config-ui/src/data/NullBlueprint.js
+++ b/config-ui/src/data/NullBlueprintConnection.js
@@ -15,20 +15,20 @@
* limitations under the License.
*
*/
-const NullBlueprint = {
- id: null,
- createdAt: null,
- updatedAt: null,
- name: null,
- tasks: [
- []
+const NullBlueprintConnection = {
+ plugin: null,
+ connectionId: null,
+ scope: [
+ {
+ owner: null,
+ repo: null,
+ options: null,
+ boardId: null,
+ transformation: {
+ },
+ entities: [],
+ },
],
- cronConfig: '0 0 * * *',
- description: '',
- interval: 'daily',
- enabled: false,
}
-export {
- NullBlueprint
-}
+export { NullBlueprintConnection }
diff --git a/config-ui/src/data/NullConnection.js b/config-ui/src/data/NullConnection.js
index af5d75c5..f10daa02 100644
--- a/config-ui/src/data/NullConnection.js
+++ b/config-ui/src/data/NullConnection.js
@@ -16,7 +16,7 @@
*
*/
const NullConnection = {
- // id: null,
+ id: null,
ID: null,
name: null,
endpoint: null,
diff --git a/config-ui/src/data/Providers.js b/config-ui/src/data/Providers.js
index c9455df1..0174d57d 100644
--- a/config-ui/src/data/Providers.js
+++ b/config-ui/src/data/Providers.js
@@ -62,9 +62,11 @@ const ProviderLabels = {
}
const ProviderConnectionLimits = {
- jenkins: 1,
- // jira: null, // (Multi-connection, no-limit)
+ // (All providers are mult-connection, no source limits defined)
+ // jenkins: null,
+ // jira: null,
// github: null
+ // gitlab: null
}
// NOTE: Not all fields may be referenced/displayed for a provider,
@@ -99,8 +101,29 @@ const ProviderFormLabels = {
endpoint: 'Endpoint URL',
proxy: 'Proxy URL',
token: 'Basic Auth Token',
- username: 'Username',
- password: 'Password'
+ username: 'Username / E-mail',
+ // password; 'Password',
+ password: (
+ <>
+ Password
+ <Tooltip
+ content={(<span>If you are using JIRA Cloud or JIRA Server, <br />your API Token should be used as password.</span>)}
+ intent='primary'
+ >
+ <Icon
+ icon='info-sign'
+ size={12}
+ style={{
+ float: 'left',
+ display: 'inline-block',
+ alignContent: 'center',
+ marginBottom: '4px',
+ marginLeft: '8px',
+ color: '#999'
+ }}
+ />
+ </Tooltip>
+ </>),
},
github: {
name: 'Connection Name',
@@ -109,6 +132,7 @@ const ProviderFormLabels = {
// token: 'Auth Token(s)',
token: (
<>
+ Auth Token(s)
<Tooltip
content={(<span>Due to Github’s rate limit, input more tokens, <br />comma separated, to accelerate data collection.</span>)}
intent='primary'
@@ -121,12 +145,11 @@ const ProviderFormLabels = {
display: 'inline-block',
alignContent: 'center',
marginBottom: '4px',
- marginRight: '8px',
+ marginLeft: '8px',
color: '#999'
}}
/>
</Tooltip>
- Auth Token(s)
</>),
username: 'Username',
password: 'Password'
@@ -188,6 +211,18 @@ const ProviderIcons = {
[Providers.DBT]: (w, h) => <Icon icon='box' size={w || 24} />,
}
+const ConnectionStatus = {
+ OFFLINE: 0,
+ ONLINE: 1,
+ DISCONNECTED: 2
+}
+
+const ConnectionStatusLabels = {
+ [ConnectionStatus.OFFLINE]: 'Offline',
+ [ConnectionStatus.ONLINE]: 'Online',
+ [ConnectionStatus.DISCONNECTED]: 'Disconnected',
+}
+
export {
Providers,
ProviderTypes,
@@ -195,5 +230,7 @@ export {
ProviderLabels,
ProviderConnectionLimits,
ProviderFormLabels,
- ProviderFormPlaceholders
+ ProviderFormPlaceholders,
+ ConnectionStatus,
+ ConnectionStatusLabels
}
diff --git a/config-ui/src/data/integrations.jsx b/config-ui/src/data/integrations.jsx
index 7fa1d993..a63a0ae1 100644
--- a/config-ui/src/data/integrations.jsx
+++ b/config-ui/src/data/integrations.jsx
@@ -55,7 +55,7 @@ const integrationsData = [
id: Providers.JENKINS,
type: ProviderTypes.INTEGRATION,
enabled: true,
- multiConnection: false,
+ multiConnection: true,
name: ProviderLabels.JENKINS,
icon: <JenkinsProvider className='providerIconSvg' width='30' height='30' style={{ float: 'left', marginTop: '5px' }} />,
iconDashboard: <JenkinsProvider className='providerIconSvg' width='40' height='40' />,
diff --git a/config-ui/src/hooks/useBlueprintManager.jsx b/config-ui/src/hooks/useBlueprintManager.jsx
index 4f6cb65d..4323ba7f 100644
--- a/config-ui/src/hooks/useBlueprintManager.jsx
+++ b/config-ui/src/hooks/useBlueprintManager.jsx
@@ -19,8 +19,10 @@ import { useCallback, useState } from 'react'
import { DEVLAKE_ENDPOINT } from '@/utils/config'
import request from '@/utils/request'
import { ToastNotification } from '@/components/Toast'
+import { NullBlueprint, BlueprintMode } from '@/data/NullBlueprint'
import cron from 'cron-validate'
import parser from 'cron-parser'
+import { Intent } from '@blueprintjs/core'
function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`, initialConfiguration = {}) {
const [isFetching, setIsFetching] = useState(false)
@@ -35,6 +37,11 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
const [cronConfig, setCronConfig] = useState('0 0 * * *')
const [customCronConfig, setCustomCronConfig] = useState('0 0 * * *')
const [tasks, setTasks] = useState([])
+ const [settings, setSettings] = useState({
+ version: '1.0.0',
+ connections: []
+ })
+ const [mode, setMode] = useState(BlueprintMode.NORMAL)
const [enable, setEnable] = useState(true)
const [detectedProviderTasks, setDetectedProviderTasks] = useState([])
@@ -92,7 +99,7 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
setBlueprintCount(0)
setErrors([e.message])
}
- }, [])
+ }, [detectCronInterval])
const fetchBlueprint = useCallback((blueprintId = null) => {
console.log('>> FETCHING BLUEPRINT....')
@@ -105,14 +112,15 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
const b = await request.get(`${DEVLAKE_ENDPOINT}/blueprints/${blueprintId}`)
const blueprintData = b.data
console.log('>> RAW BLUEPRINT DATA FROM API...', b)
- setBlueprint({
+ setBlueprint(b => ({
+ ...b,
...blueprintData,
id: blueprintData.id,
- enable: blueprint.enable,
+ enable: blueprintData.enable,
status: 0,
nextRunAt: null, // @todo: calculate next run date
- interval: detectCronInterval(blueprint.cronConfig)
- })
+ interval: detectCronInterval(blueprintData.cronConfig)
+ }))
setTimeout(() => {
setIsFetching(false)
}, 500)
@@ -125,7 +133,7 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
ToastNotification.show({ message: `${e}`, intent: 'danger', icon: 'error' })
console.log('>> FAILED TO FETCH BLUEPRINT', e)
}
- }, [blueprint, detectCronInterval])
+ }, [detectCronInterval])
const saveBlueprint = useCallback((blueprintId = null) => {
console.log('>> SAVING BLUEPRINT....')
@@ -136,8 +144,11 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
const blueprintPayload = {
name,
cronConfig: cronConfig === 'custom' ? customCronConfig : cronConfig,
- tasks,
- enable: enable
+ // @todo: refactor tasks ===> plan at higher levels
+ plan: tasks,
+ settings,
+ enable: enable,
+ mode
}
console.log('>> DISPATCHING BLUEPRINT SAVE REQUEST', blueprintPayload)
const run = async () => {
@@ -157,11 +168,19 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
}
setBlueprint(blueprintObject)
setSaveComplete(blueprintObject)
- ToastNotification.show({
- message: `${blueprintId ? 'Updated' : 'Created'} Blueprint - ${name}.`,
- intent: 'danger',
- icon: 'small-tick'
- })
+ if ([200, 201].includes(b.status)) {
+ ToastNotification.show({
+ message: `${blueprintId ? 'Updated' : 'Created'} Blueprint - ${name}.`,
+ intent: Intent.SUCCESS,
+ icon: 'small-tick'
+ })
+ } else {
+ ToastNotification.show({
+ message: `Blueprint Failure - ${b.message}`,
+ intent: Intent.NONE,
+ icon: 'error'
+ })
+ }
setTimeout(() => {
setIsSaving(false)
}, 500)
@@ -173,7 +192,16 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
setSaveComplete(false)
console.log('>> FAILED TO SAVE BLUEPRINT!!', e)
}
- }, [name, cronConfig, customCronConfig, tasks, enable, detectCronInterval])
+ }, [
+ name,
+ mode,
+ settings,
+ cronConfig,
+ customCronConfig,
+ tasks,
+ enable,
+ detectCronInterval
+ ])
const deleteBlueprint = useCallback(async (blueprint) => {
try {
@@ -213,10 +241,10 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
console.log('>> INVALID CRON SCHEDULE!', e)
}
return schedule
- }, [])
+ }, [parseCronExpression])
const getNextRunDate = useCallback((cronExpression) => {
- return parseCronExpression(cronExpression).next().toString()
+ return cronExpression && parseCronExpression(cronExpression).next().toString()
}, [parseCronExpression])
const getCronPreset = useCallback((presetName) => {
@@ -248,9 +276,9 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
console.log('>> RAW BLUEPRINT DATA FROM API...', activateB.data)
// eslint-disable-next-line no-unused-vars
const updatedBlueprint = activateB.data
- // setBlueprint(b.data)
+ setBlueprint(b => ({ ...b, ...updatedBlueprint }))
// setSaveComplete(b.data)
- ToastNotification.show({ message: `Activated Blueprint - ${blueprint.name}.`, intent: 'danger', icon: 'small-tick' })
+ ToastNotification.show({ message: `Activated Blueprint - ${blueprint.name}.`, intent: Intent.SUCCESS, icon: 'small-tick' })
setTimeout(() => {
setIsSaving(false)
fetchAllBlueprints()
@@ -263,7 +291,7 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
// setSaveComplete(false)
console.log('>> FAILED TO ACTIVATE BLUEPRINT!!', e)
}
- }, [])
+ }, [fetchAllBlueprints])
const deactivateBlueprint = useCallback((blueprint) => {
console.log('>> DEACTIVATING BLUEPRINT....')
@@ -285,9 +313,9 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
console.log('>> RAW BLUEPRINT DATA FROM API...', deactivateB.data)
// eslint-disable-next-line no-unused-vars
const updatedBlueprint = deactivateB.data
- // setBlueprint(b.data)
+ setBlueprint(b => ({ ...b, ...updatedBlueprint }))
// setSaveComplete(b.data)
- ToastNotification.show({ message: `Deactivated Blueprint - ${blueprint.name}.`, intent: 'danger', icon: 'small-tick' })
+ ToastNotification.show({ message: `Deactivated Blueprint - ${blueprint.name}.`, intent: Intent.SUCCESS, icon: 'small-tick' })
setTimeout(() => {
setIsSaving(false)
fetchAllBlueprints()
@@ -300,9 +328,10 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
// setSaveComplete(false)
console.log('>> FAILED TO DEACTIVATE BLUEPRINT!!', e)
}
- }, [])
+ }, [fetchAllBlueprints])
return {
+ blueprint,
blueprints,
blueprintCount,
name,
@@ -310,8 +339,10 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
customCronConfig,
cronPresets,
tasks,
+ settings,
detectedProviderTasks,
enable,
+ mode,
saveBlueprint,
deleteBlueprint,
fetchAllBlueprints,
@@ -331,7 +362,9 @@ function useBlueprintManager (blueprintName = `BLUEPRINT WEEKLY ${Date.now()}`,
setCustomCronConfig,
setCronPresets,
setTasks,
+ setSettings,
setEnable,
+ setMode,
setDetectedProviderTasks,
isFetching,
isSaving,
diff --git a/config-ui/src/hooks/useBlueprintValidation.jsx b/config-ui/src/hooks/useBlueprintValidation.jsx
index e6e27d39..c0b85131 100644
--- a/config-ui/src/hooks/useBlueprintValidation.jsx
+++ b/config-ui/src/hooks/useBlueprintValidation.jsx
@@ -17,6 +17,7 @@
*/
import { useCallback, useEffect, useState } from 'react'
import parser from 'cron-parser'
+import { BlueprintMode } from '@/data/NullBlueprint'
function useBlueprintValidation ({
name,
@@ -24,6 +25,8 @@ function useBlueprintValidation ({
customCronConfig,
enable,
tasks = [],
+ mode = null,
+ activeStep = null
}) {
const [errors, setErrors] = useState([])
const [isValid, setIsValid] = useState(false)
@@ -71,13 +74,18 @@ function useBlueprintValidation ({
errs.push('Blueprint Tasks: Invalid/Empty Configuration')
}
+ if (mode !== null && ![BlueprintMode.NORMAL, BlueprintMode.ADVANCED].includes(mode)) {
+ errs.push('Invalid / Unsupported Blueprint Mode Detected!')
+ }
+
setErrors(errs)
}, [
name,
cronConfig,
customCronConfig,
tasks,
- enable
+ enable,
+ mode
])
const fieldHasError = useCallback((fieldId) => {
diff --git a/config-ui/src/hooks/useConnectionManager.jsx b/config-ui/src/hooks/useConnectionManager.jsx
index 56917613..bed4c227 100644
--- a/config-ui/src/hooks/useConnectionManager.jsx
+++ b/config-ui/src/hooks/useConnectionManager.jsx
@@ -16,40 +16,40 @@
*
*/
import { useState, useEffect, useCallback } from 'react'
-import {
- useHistory
-} from 'react-router-dom'
+import { useHistory } from 'react-router-dom'
import { ToastNotification } from '@/components/Toast'
import { DEVLAKE_ENDPOINT } from '@/utils/config'
import request from '@/utils/request'
import { NullConnection } from '@/data/NullConnection'
-import { Providers, ProviderConnectionLimits } from '@/data/Providers'
+import {
+ Providers,
+ ProviderConnectionLimits,
+ ConnectionStatus,
+ ConnectionStatusLabels
+} from '@/data/Providers'
import useNetworkOfflineMode from '@/hooks/useNetworkOfflineMode'
-function useConnectionManager ({
- activeProvider,
- connectionId,
- // activeConnection,
- // setActiveConnection,
- // name = null,
- // endpointUrl = null,
- // token = null,
- // username = null,
- // password = null,
- // isTesting, setIsTesting,
- // isSaving, setIsSaving,
- // testStatus, setTestStatus,
- // errors, setErrors,
- // showError, setShowError
-}, updateMode = false) {
+function useConnectionManager (
+ {
+ activeProvider,
+ connectionId,
+ },
+ updateMode = false
+) {
const history = useHistory()
const { handleOfflineMode } = useNetworkOfflineMode()
+ const [provider, setProvider] = useState(activeProvider)
const [name, setName] = useState()
const [endpointUrl, setEndpointUrl] = useState()
const [proxy, setProxy] = useState()
const [token, setToken] = useState()
+ const [initialTokenStore, setInitialTokenStore] = useState({
+ 0: '',
+ 1: '',
+ 2: ''
+ })
const [username, setUsername] = useState()
const [password, setPassword] = useState()
@@ -62,10 +62,13 @@ function useConnectionManager ({
const [errors, setErrors] = useState([])
const [showError, setShowError] = useState(false)
const [testStatus, setTestStatus] = useState(0) // 0=Pending, 1=Success, 2=Failed
+ const [testResponse, setTestResponse] = useState()
+ const [allTestResponses, setAllTestResponses] = useState({})
const [sourceLimits, setConnectionLimits] = useState(ProviderConnectionLimits)
const [activeConnection, setActiveConnection] = useState(NullConnection)
const [allConnections, setAllConnections] = useState([])
+ const [allProviderConnections, setAllProviderConnections] = useState([])
const [domainRepositories, setDomainRepositories] = useState([])
const [testedConnections, setTestedConnections] = useState([])
const [connectionCount, setConnectionCount] = useState(0)
@@ -74,77 +77,150 @@ function useConnectionManager ({
const [saveComplete, setSaveComplete] = useState(false)
const [deleteComplete, setDeleteComplete] = useState(false)
- const testConnection = useCallback((notify = true, manualPayload = {}, onSuccess = () => {}, onFail = () => {}) => {
- setIsTesting(true)
- setShowError(false)
- ToastNotification.clear()
- // TODO: run Save first
- const runTest = async () => {
- let connectionPayload
- switch (activeProvider.id) {
- case Providers.JIRA:
- connectionPayload = { endpoint: endpointUrl, username: username, password: password, proxy: proxy }
- break
- case Providers.GITHUB:
- connectionPayload = { endpoint: endpointUrl, token: token, proxy: proxy }
- break
- case Providers.JENKINS:
- connectionPayload = { endpoint: endpointUrl, username: username, password: password }
- break
- case Providers.GITLAB:
- connectionPayload = { endpoint: endpointUrl, token: token, proxy: proxy }
- break
- }
- connectionPayload = { ...connectionPayload, ...manualPayload }
- const testUrl = `${DEVLAKE_ENDPOINT}/plugins/${activeProvider.id}/test`
- console.log('INFO >>> Endopoint URL & Payload for testing: ', testUrl, connectionPayload)
- const res = await request.post(testUrl, connectionPayload)
- console.log('res.data', res.data)
- if (res.data?.success && res.status === 200) {
- setIsTesting(false)
- setTestStatus(1)
- if (notify) {
- ToastNotification.show({ message: `Connection test OK. ${connectionPayload.endpoint}`, intent: 'success', icon: 'small-tick' })
+ const testConnection = useCallback(
+ (
+ notify = true,
+ manualPayload = {},
+ onSuccess = () => {},
+ onFail = () => {}
+ ) => {
+ setIsTesting(true)
+ setShowError(false)
+ ToastNotification.clear()
+ setTestResponse(null)
+
+ const runTest = async () => {
+ let connectionPayload
+ switch (provider.id) {
+ case Providers.JIRA:
+ connectionPayload = {
+ endpoint: endpointUrl,
+ username: username,
+ password: password,
+ proxy: proxy,
+ }
+ break
+ case Providers.GITHUB:
+ connectionPayload = {
+ endpoint: endpointUrl,
+ token: token,
+ proxy: proxy,
+ }
+ break
+ case Providers.JENKINS:
+ connectionPayload = {
+ endpoint: endpointUrl,
+ username: username,
+ password: password,
+ }
+ break
+ case Providers.GITLAB:
+ connectionPayload = {
+ endpoint: endpointUrl,
+ token: token,
+ proxy: proxy,
+ }
+ break
}
- onSuccess(res)
- } else {
- setIsTesting(false)
- setTestStatus(2)
- const errorMessage = 'Connection test FAILED. ' + (res.data ? res.data.message : '')
- if (notify) {
- ToastNotification.show({ message: errorMessage, intent: 'danger', icon: 'error' })
+ connectionPayload = Object.keys(manualPayload).length > 0 ? manualPayload : connectionPayload
+ const testUrl = `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/test`
+ console.log(
+ 'INFO >>> Endopoint URL & Payload for testing: ',
+ testUrl,
+ connectionPayload
+ )
+ const res = await request.post(testUrl, connectionPayload)
+ setTestResponse(res.data)
+ if ([Providers.GITHUB].includes(provider.id)) {
+ console.log('>>> SETTING TOKEN TEST RESPONSE FOR TOKEN >>>', manualPayload?.token || token)
+ setAllTestResponses(tRs => ({ ...tRs, [manualPayload.token]: res.data }))
+ }
+ if (res.data?.success && res.status === 200) {
+ setIsTesting(false)
+ setTestStatus(1)
+ if (notify) {
+ ToastNotification.show({
+ message: `Connection test OK. ${connectionPayload.endpoint}`,
+ intent: 'success',
+ icon: 'small-tick',
+ })
+ }
+ onSuccess(res)
+ } else {
+ setIsTesting(false)
+ setTestStatus(2)
+ const errorMessage =
+ 'Connection test FAILED. ' + (res.data ? res.data.message : '')
+ if (notify) {
+ ToastNotification.show({
+ message: errorMessage,
+ intent: 'danger',
+ icon: 'error',
+ })
+ }
+ onFail(res)
}
- onFail(res)
}
- }
- runTest()
- }, [activeProvider.id, endpointUrl, password, proxy, token, username])
+ runTest()
+ },
+ [provider?.id, endpointUrl, password, proxy, token, username]
+ )
const saveConnection = (configurationSettings = {}) => {
setIsSaving(true)
let connectionPayload = { ...configurationSettings }
- switch (activeProvider.id) {
+ switch (provider.id) {
case Providers.JIRA:
- connectionPayload = { name: name, endpoint: endpointUrl, username: username, password: password, proxy: proxy, ...connectionPayload }
+ connectionPayload = {
+ name: name,
+ endpoint: endpointUrl,
+ // basicAuthEncoded: token,
+ username: username,
+ password: password,
+ proxy: proxy,
+ ...connectionPayload,
+ }
break
case Providers.GITHUB:
- connectionPayload = { name: name, endpoint: endpointUrl, token, proxy: proxy, ...connectionPayload }
+ connectionPayload = {
+ name: name,
+ endpoint: endpointUrl,
+ token: token,
+ // @todo: remove auth, testing only
+ auth: token,
+ proxy: proxy,
+ ...connectionPayload,
+ }
break
case Providers.JENKINS:
- // eslint-disable-next-line max-len
- connectionPayload = { name: name, endpoint: endpointUrl, username: username, password: password, ...connectionPayload }
+ // eslint-disable-next-line max-len
+ connectionPayload = {
+ name: name,
+ endpoint: endpointUrl,
+ username: username,
+ password: password,
+ ...connectionPayload,
+ }
break
case Providers.GITLAB:
- connectionPayload = { name: name, endpoint: endpointUrl, token: token, proxy: proxy, ...connectionPayload }
+ connectionPayload = {
+ name: name,
+ endpoint: endpointUrl,
+ token: token,
+ // @todo: remove auth, testing only
+ auth: token,
+ proxy: proxy,
+ ...connectionPayload,
+ }
break
}
let saveResponse = {
success: false,
connection: {
- ...connectionPayload
+ ...connectionPayload,
},
- errors: []
+ errors: [],
}
const saveConfiguration = async (configPayload) => {
@@ -152,13 +228,16 @@ function useConnectionManager ({
setShowError(false)
setErrors([])
ToastNotification.clear()
- const s = await request.post(`${DEVLAKE_ENDPOINT}/plugins/${activeProvider.id}/connections`, configPayload)
+ const s = await request.post(
+ `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/connections`,
+ configPayload
+ )
console.log('>> CONFIGURATION SAVED SUCCESSFULLY', configPayload, s)
saveResponse = {
...saveResponse,
success: [200, 201].includes(s.status),
connection: { ...s.data },
- errors: s.isAxiosError ? [s.message] : []
+ errors: s.isAxiosError ? [s.message] : [],
}
} catch (e) {
saveResponse.errors.push(e.message)
@@ -173,14 +252,19 @@ function useConnectionManager ({
setErrors([])
ToastNotification.clear()
// eslint-disable-next-line max-len
- const s = await request.patch(`${DEVLAKE_ENDPOINT}/plugins/${activeProvider.id}/connections/${activeConnection.id || activeConnection.ID}`, configPayload)
+ const s = await request.patch(
+ `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/connections/${
+ activeConnection.id || activeConnection.ID
+ }`,
+ configPayload
+ )
const silentRefetch = true
console.log('>> CONFIGURATION MODIFIED SUCCESSFULLY', configPayload, s)
saveResponse = {
...saveResponse,
success: [200, 201].includes(s.status),
connection: { ...s.data },
- errors: s.isAxiosError ? [s.message] : []
+ errors: s.isAxiosError ? [s.message] : [],
}
fetchConnection(silentRefetch)
} catch (e) {
@@ -190,7 +274,7 @@ function useConnectionManager ({
}
}
- if (updateMode && activeConnection) {
+ if (updateMode && activeConnection?.id !== null) {
modifyConfiguration(connectionPayload)
} else {
saveConfiguration(connectionPayload)
@@ -198,18 +282,30 @@ function useConnectionManager ({
setTimeout(() => {
if (saveResponse.success && errors.length === 0) {
- ToastNotification.show({ message: 'Connection saved successfully.', intent: 'success', icon: 'small-tick' })
+ ToastNotification.show({
+ message: 'Connection saved successfully.',
+ intent: 'success',
+ icon: 'small-tick',
+ })
setShowError(false)
setIsSaving(false)
setSaveComplete(saveResponse.connection)
- if ([Providers.GITHUB, Providers.JIRA, Providers.GITLAB].includes(activeProvider.id) && token !== '' && token?.toString().split(',').length > 1) {
+ if (
+ [Providers.GITHUB, Providers.JIRA, Providers.GITLAB].includes(provider.id) &&
+ token !== '' &&
+ token?.toString().split(',').length > 1
+ ) {
testConnection()
}
if (!updateMode) {
- history.push(`/integrations/${activeProvider.id}`)
+ history.push(`/integrations/${provider.id}`)
}
} else {
- ToastNotification.show({ message: 'Connection failed to save, please try again.', intent: 'danger', icon: 'error' })
+ ToastNotification.show({
+ message: 'Connection failed to save, please try again.',
+ intent: 'danger',
+ icon: 'error',
+ })
setShowError(true)
setIsSaving(false)
setSaveComplete(false)
@@ -219,130 +315,224 @@ function useConnectionManager ({
const runCollection = (options = {}) => {
setIsRunning(true)
- ToastNotification.show({ message: 'Triggered Collection Process', intent: 'info', icon: 'info' })
+ ToastNotification.show({
+ message: 'Triggered Collection Process',
+ intent: 'info',
+ icon: 'info',
+ })
console.log('>> RUNNING COLLECTION PROCESS', isRunning)
// Run Collection Tasks...
}
- const fetchConnection = useCallback((silent = false, notify = false) => {
- console.log('>> FETCHING CONNECTION....')
- try {
- setIsFetching(!silent)
- setErrors([])
- ToastNotification.clear()
- console.log('>> FETCHING CONNECTION SOURCE')
- const fetch = async () => {
- const f = await request.get(`${DEVLAKE_ENDPOINT}/plugins/${activeProvider.id}/connections/${connectionId}`)
- const connectionData = f.data
- console.log('>> RAW CONNECTION DATA FROM API...', connectionData)
- setActiveConnection({
- ...connectionData,
- ID: connectionData.ID || connectionData.id,
- name: connectionData.name || connectionData.Name,
- endpoint: connectionData.endpoint || connectionData.Endpoint,
- proxy: connectionData.proxy || connectionData.Proxy,
- username: connectionData.username || connectionData.Username,
- password: connectionData.password || connectionData.Password,
- token: connectionData.token,
+ const fetchConnection = useCallback(
+ (silent = false, notify = false, cId = null) => {
+ console.log(`>> FETCHING CONNECTION [PROVIDER = ${provider.id}]....`)
+ try {
+ setIsFetching(!silent)
+ setErrors([])
+ ToastNotification.clear()
+ console.log('>> FETCHING CONNECTION SOURCE')
+ const fetch = async () => {
+ const f = await request.get(
+ `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/connections/${cId || connectionId}`
+ )
+ const connectionData = f.data
+ console.log('>> RAW CONNECTION DATA FROM API...', connectionData)
+ setActiveConnection({
+ ...connectionData,
+ ID: connectionData.ID || connectionData.id,
+ name: connectionData.name || connectionData.Name,
+ endpoint: connectionData.endpoint || connectionData.Endpoint,
+ proxy: connectionData.proxy || connectionData.Proxy,
+ username: connectionData.username || connectionData.Username,
+ password: connectionData.password || connectionData.Password,
+ token: connectionData.token || connectionData.auth
+ })
+ setTimeout(() => {
+ setIsFetching(false)
+ }, 500)
+ }
+ fetch()
+ } catch (e) {
+ setIsFetching(false)
+ setActiveConnection(NullConnection)
+ setErrors([e.message])
+ ToastNotification.show({
+ message: `${e}`,
+ intent: 'danger',
+ icon: 'error',
})
- setTimeout(() => {
- setIsFetching(false)
- }, 500)
+ console.log('>> FAILED TO FETCH CONNECTION', e)
}
- fetch()
- } catch (e) {
- setIsFetching(false)
- setActiveConnection(NullConnection)
- setErrors([e.message])
- ToastNotification.show({ message: `${e}`, intent: 'danger', icon: 'error' })
- console.log('>> FAILED TO FETCH CONNECTION', e)
- }
- }, [activeProvider.id, connectionId])
+ },
+ [provider?.id, connectionId]
+ )
- const fetchAllConnections = useCallback(async (notify = false) => {
- try {
- setIsFetching(true)
- setErrors([])
- ToastNotification.clear()
- console.log('>> FETCHING ALL CONNECTION SOURCES')
- const f = await request.get(`${DEVLAKE_ENDPOINT}/plugins/${activeProvider.id}/connections`)
- console.log('>> RAW ALL CONNECTIONS DATA FROM API...', f.data)
- const providerConnections = [].concat(Array.isArray(f.data) ? f.data : []).map((conn, idx) => {
- return {
- ...conn,
- status: 0,
- ID: conn.ID || conn.id,
- name: conn.name,
- endpoint: conn.endpoint,
- errors: []
+ const fetchAllConnections = useCallback(
+ async (notify = false, allSources = false) => {
+ try {
+ setIsFetching(true)
+ setErrors([])
+ ToastNotification.clear()
+ console.log('>> FETCHING ALL CONNECTION SOURCES')
+ // const c = await request.get(
+ // `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/connections`
+ // )
+ let c = null
+ if (allSources) {
+ const aC = await Promise.all([
+ // @todo: re-enable JIRA & fix encKey warning msg (rebuild local db)
+ request.get(
+ `${DEVLAKE_ENDPOINT}/plugins/${Providers.JIRA}/connections`
+ ),
+ request.get(
+ `${DEVLAKE_ENDPOINT}/plugins/${Providers.GITLAB}/connections`
+ ),
+ request.get(
+ `${DEVLAKE_ENDPOINT}/plugins/${Providers.JENKINS}/connections`
+ ),
+ request.get(
+ `${DEVLAKE_ENDPOINT}/plugins/${Providers.GITHUB}/connections`
+ ),
+ ])
+ const builtConnections = aC
+ .map((providerResponse) => [].concat(providerResponse.data || []).map(c => ({
+ ...c,
+ connectionId: c.id,
+ provider: providerResponse.config?.url?.split('/')[3],
+ // @todo: inject realtime connection status...
+ status: ConnectionStatus.ONLINE
+ })))
+ // .map((providerResponse) => [
+ // {
+ // ...[].concat(providerResponse.data || []).reduce((cV, pV) => ({...pV, connectionId: pV.id}), {}),
+ // provider: providerResponse.config?.url?.split('/')[3],
+ // status: ConnectionStatus.ONLINE
+ // },
+ // ])
+ setAllProviderConnections(builtConnections.flat())
+ console.log(
+ '>> ALL SOURCE CONNECTIONS: FETCHING ALL CONNECTION FROM ALL DATA SOURCES'
+ )
+ console.log('>> ALL SOURCE CONNECTIONS: ', aC)
+ } else {
+ c = await request.get(
+ `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/connections`
+ )
}
- })
- if (notify) {
- ToastNotification.show({ message: 'Loaded all connections.', intent: 'success', icon: 'small-tick' })
+
+ console.log('>> RAW ALL CONNECTIONS DATA FROM API...', c?.data)
+ const providerConnections = []
+ .concat(Array.isArray(c?.data) ? c?.data : [])
+ .map((conn, idx) => {
+ return {
+ ...conn,
+ status: ConnectionStatus.OFFLINE,
+ ID: conn.ID || conn.id,
+ name: conn.name,
+ endpoint: conn.endpoint,
+ errors: [],
+ }
+ })
+ if (notify) {
+ ToastNotification.show({
+ message: 'Loaded all connections.',
+ intent: 'success',
+ icon: 'small-tick',
+ })
+ }
+ setAllConnections(providerConnections)
+ setConnectionCount(c?.data?.length)
+ setConnectionLimitReached(
+ sourceLimits[provider.id] &&
+ c.data?.length >= sourceLimits[provider.id]
+ )
+ setIsFetching(false)
+ } catch (e) {
+ console.log('>> FAILED TO FETCH ALL CONNECTIONS', e)
+ ToastNotification.show({
+ message: `Failed to Load Connections - ${e.message}`,
+ intent: 'danger',
+ icon: 'error',
+ })
+ setIsFetching(false)
+ setAllConnections([])
+ setConnectionCount(0)
+ setConnectionLimitReached(false)
+ setErrors([e.message])
+ handleOfflineMode(e.response?.status, e.response)
}
- setAllConnections(providerConnections)
- setConnectionCount(f.data?.length)
- setConnectionLimitReached(sourceLimits[activeProvider.id] && f.data?.length >= sourceLimits[activeProvider.id])
- setIsFetching(false)
- } catch (e) {
- console.log('>> FAILED TO FETCH ALL CONNECTIONS', e)
- ToastNotification.show({ message: `Failed to Load Connections - ${e.message}`, intent: 'danger', icon: 'error' })
- setIsFetching(false)
- setAllConnections([])
- setConnectionCount(0)
- setConnectionLimitReached(false)
- setErrors([e.message])
- handleOfflineMode(e.response.status, e.response)
- }
- }, [activeProvider.id, sourceLimits, handleOfflineMode])
+ },
+ [provider?.id, sourceLimits, handleOfflineMode]
+ )
- const deleteConnection = useCallback(async (connection) => {
- try {
- setIsDeleting(true)
- setErrors([])
- console.log('>> TRYING TO DELETE CONNECTION...', connection)
- const d = await request.delete(`${DEVLAKE_ENDPOINT}/plugins/${activeProvider.id}/connections/${connection.ID || connection.id}`)
- console.log('>> CONNECTION DELETED...', d)
- setIsDeleting(false)
- setDeleteComplete({
- provider: activeProvider,
- connection: d.data
- })
- } catch (e) {
- setIsDeleting(false)
- setDeleteComplete(false)
- setErrors([e.message])
- console.log('>> FAILED TO DELETE CONNECTION', e)
- }
- }, [activeProvider.id])
+ const deleteConnection = useCallback(
+ async (connection) => {
+ try {
+ setIsDeleting(true)
+ setErrors([])
+ console.log('>> TRYING TO DELETE CONNECTION...', connection)
+ const d = await request.delete(
+ `${DEVLAKE_ENDPOINT}/plugins/${provider.id}/connections/${
+ connection.ID || connection.id
+ }`
+ )
+ console.log('>> CONNECTION DELETED...', d)
+ setIsDeleting(false)
+ setDeleteComplete({
+ provider: activeProvider,
+ connection: d.data,
+ })
+ } catch (e) {
+ setIsDeleting(false)
+ setDeleteComplete(false)
+ setErrors([e.message])
+ console.log('>> FAILED TO DELETE CONNECTION', e)
+ }
+ },
+ [provider?.id, activeProvider]
+ )
const getConnectionName = useCallback((connectionId, connections) => {
- const source = connections.find(s => s.id === connectionId)
+ const source = connections.find((s) => s.id === connectionId)
return source ? source.title : '(Instance)'
}, [])
- const testAllConnections = useCallback((connections) => {
- console.log('>> TESTING ALL CONNECTION SOURCES...')
- connections.forEach((c, cIdx) => {
- console.log('>>> TESTING CONNECTION INSTANCE...', c)
- const notify = false
- const payload = {
- endpoint: c.Endpoint || c.endpoint,
- username: c.username,
- password: c.password,
- auth: c.basicAuthEncoded || c.auth,
- token: c.token,
- proxy: c.Proxy || c.Proxy
- }
- const onSuccess = (res) => {
- setTestedConnections(testedConnections => [...new Set([...testedConnections.filter(oC => oC.id !== c.id), { ...c, status: 1 }])])
- }
- const onFail = (res) => {
- setTestedConnections(testedConnections => [...new Set([...testedConnections.filter(oC => oC.ID !== c.ID), { ...c, status: 2 }])])
- }
- testConnection(notify, payload, onSuccess, onFail)
- })
- }, [testConnection])
+ const testAllConnections = useCallback(
+ (connections) => {
+ console.log('>> TESTING ALL CONNECTION SOURCES...')
+ connections.forEach((c, cIdx) => {
+ console.log('>>> TESTING CONNECTION INSTANCE...', c)
+ const notify = false
+ const payload = {
+ endpoint: c.Endpoint || c.endpoint,
+ username: c.username,
+ password: c.password,
+ // @todo: cleanup legacy auth fields and only use $token value
+ token: c.token || c.basicAuthEncoded || c.auth,
+ proxy: c.Proxy || c.Proxy,
+ }
+ const onSuccess = (res) => {
+ setTestedConnections((testedConnections) => [
+ ...new Set([
+ ...testedConnections.filter((oC) => oC.id !== c.id),
+ { ...c, status: ConnectionStatus.ONLINE },
+ ]),
+ ])
+ }
+ const onFail = (res) => {
+ setTestedConnections((testedConnections) => [
+ ...new Set([
+ ...testedConnections.filter((oC) => oC.ID !== c.ID),
+ { ...c, status: ConnectionStatus.DISCONNECTED },
+ ]),
+ ])
+ }
+ testConnection(notify, payload, onSuccess, onFail)
+ })
+ },
+ [testConnection]
+ )
const fetchDomainLayerRepositories = useCallback(() => {
console.log('>> FETCHING DOMAIN LAYER REPOS....')
@@ -363,29 +553,50 @@ function useConnectionManager ({
setIsFetching(false)
setDomainRepositories([])
setErrors([e.message])
- ToastNotification.show({ message: `${e}`, intent: 'danger', icon: 'error' })
+ ToastNotification.show({
+ message: `${e}`,
+ intent: 'danger',
+ icon: 'error',
+ })
console.log('>> FAILED TO FETCH DOMAIN LAYER REPOS', e)
}
}, [])
+ const clearConnection = useCallback(() => {
+ setName('')
+ setEndpointUrl('')
+ setUsername('')
+ setPassword('')
+ setToken('')
+ setInitialTokenStore({
+ 0: '',
+ 1: '',
+ 2: ''
+ })
+ setProxy('')
+ }, [])
+
useEffect(() => {
if (activeConnection && activeConnection.ID !== null) {
+ const connectionToken = activeConnection.auth || activeConnection.token || activeConnection.basicAuthEncoded
setName(activeConnection.name)
setEndpointUrl(activeConnection.endpoint)
- switch (activeProvider.id) {
+ switch (provider.id) {
case Providers.JENKINS:
setUsername(activeConnection.username)
setPassword(activeConnection.password)
break
case Providers.GITLAB:
- setToken(activeConnection.basicAuthEncoded || activeConnection.token)
+ setToken(activeConnection.basicAuthEncoded || activeConnection.token || activeConnection.auth)
setProxy(activeConnection.Proxy || activeConnection.proxy)
break
case Providers.GITHUB:
- setToken(activeConnection.basicAuthEncoded || activeConnection.token)
+ setToken(connectionToken)
+ setInitialTokenStore(connectionToken?.split(',')?.reduce((tS, cT, id) => ({ ...tS, [id]: cT }), {}))
setProxy(activeConnection.Proxy || activeConnection.proxy)
break
case Providers.JIRA:
+ // setToken(activeConnection.basicAuthEncoded || activeConnection.token)
setUsername(activeConnection.username)
setPassword(activeConnection.password)
setProxy(activeConnection.Proxy || activeConnection.proxy)
@@ -395,7 +606,7 @@ function useConnectionManager ({
// ToastNotification.show({ message: `Fetched settings for ${activeConnection.name}.`, intent: 'success', icon: 'small-tick' })
console.log('>> FETCHED CONNECTION FOR MODIFY', activeConnection)
}
- }, [activeConnection, activeProvider.id])
+ }, [activeConnection, provider?.id])
useEffect(() => {
if (saveComplete && saveComplete.ID) {
@@ -403,21 +614,24 @@ function useConnectionManager ({
setActiveConnection((ac) => {
return {
...ac,
- ...saveComplete
+ ...saveComplete,
}
})
}
}, [saveComplete])
useEffect(() => {
- console.log('>> CONNECTION MANAGER - RECEIVED ACTIVE PROVIDER...', activeProvider)
- if (activeProvider && activeProvider.id) {
+ console.log(
+ '>> CONNECTION MANAGER - SELECTING ACTIVE PROVIDER...',
+ provider
+ )
+ if (provider && provider?.id) {
// console.log(activeProvider)
}
- }, [activeProvider])
+ }, [provider])
useEffect(() => {
- if (connectionId) {
+ if (connectionId !== null && connectionId !== undefined) {
console.log('>>>> CONFIGURING CONNECTION ID ... ', connectionId)
fetchConnection()
}
@@ -427,6 +641,11 @@ function useConnectionManager ({
console.log('>> TESTED CONNECTION RESULTS...', testedConnections)
}, [testedConnections])
+ useEffect(() => {
+ console.log('>> CONNECTION MANAGER, ACTIVE PROVIDER CHANGED ====>', activeProvider)
+ setProvider(activeProvider)
+ }, [activeProvider])
+
return {
activeConnection,
fetchConnection,
@@ -449,10 +668,15 @@ function useConnectionManager ({
username,
password,
token,
+ initialTokenStore,
+ provider,
+ setActiveConnection,
+ setProvider,
setName,
setEndpointUrl,
setProxy,
setToken,
+ setInitialTokenStore,
setUsername,
setPassword,
setIsSaving,
@@ -461,8 +685,12 @@ function useConnectionManager ({
setErrors,
setShowError,
setTestStatus,
+ setTestResponse,
+ setAllTestResponses,
setConnectionLimits,
+ setSaveComplete,
allConnections,
+ allProviderConnections,
domainRepositories,
testedConnections,
sourceLimits,
@@ -471,7 +699,10 @@ function useConnectionManager ({
Providers,
saveComplete,
deleteComplete,
- getConnectionName
+ getConnectionName,
+ clearConnection,
+ testResponse,
+ allTestResponses
}
}
diff --git a/config-ui/src/hooks/useConnectionValidation.jsx b/config-ui/src/hooks/useConnectionValidation.jsx
index 8b168e62..20c300b8 100644
--- a/config-ui/src/hooks/useConnectionValidation.jsx
+++ b/config-ui/src/hooks/useConnectionValidation.jsx
@@ -42,7 +42,7 @@ function useConnectionValidation ({
const validate = useCallback(() => {
const errs = []
- console.log('>> VALIDATING PROVIDER ID: ', activeProvider.id)
+ console.log('>> VALIDATING PROVIDER ID: ', activeProvider?.id)
console.log('>> RUNNING FORM VALIDATIONS AGAINST FIELD VALUES...')
console.log(
'NAME', name,
@@ -77,7 +77,7 @@ function useConnectionValidation ({
errs.push('Proxy URL must be valid HTTP/S protocol')
}
- switch (activeProvider.id) {
+ switch (activeProvider?.id) {
case Providers.GITHUB:
case Providers.GITLAB:
if (!token || token.length <= 2) {
diff --git a/config-ui/src/hooks/useJIRA.jsx b/config-ui/src/hooks/useJIRA.jsx
index c4358e3e..1fb2b9a1 100644
--- a/config-ui/src/hooks/useJIRA.jsx
+++ b/config-ui/src/hooks/useJIRA.jsx
@@ -19,12 +19,14 @@ import { useEffect, useState, useCallback } from 'react'
import request from '@/utils/request'
import { ToastNotification } from '@/components/Toast'
-const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint }) => {
+const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint, boardsEndpoint }, activeConnection = null) => {
const [isFetching, setIsFetching] = useState(false)
const [issueTypes, setIssueTypes] = useState([])
const [fields, setFields] = useState([])
+ const [boards, setBoards] = useState([])
const [issueTypesResponse, setIssueTypesResponse] = useState([])
const [fieldsResponse, setFieldsResponse] = useState([])
+ const [boardsResponse, setBoardsResponse] = useState([])
const [error, setError] = useState()
const fetchIssueTypes = useCallback(() => {
@@ -36,7 +38,7 @@ const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint }) => {
const fetchIssueTypes = async () => {
const issues = await
request
- .get(issuesEndpoint)
+ .get(activeConnection?.connectionId ? issuesEndpoint.replace('[:connectionId:]', activeConnection?.connectionId) : issuesEndpoint)
.catch(e => setError(e))
console.log('>>> JIRA API PROXY: Issues Response...', issues)
setIssueTypesResponse(issues && Array.isArray(issues.data) ? issues.data : [])
@@ -50,7 +52,7 @@ const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint }) => {
setError(e)
ToastNotification.show({ message: e.message, intent: 'danger', icon: 'error' })
}
- }, [issuesEndpoint, apiProxyPath])
+ }, [issuesEndpoint, activeConnection, apiProxyPath])
const fetchFields = useCallback(() => {
try {
@@ -61,7 +63,7 @@ const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint }) => {
const fetchIssueFields = async () => {
const fields = await
request
- .get(fieldsEndpoint)
+ .get(activeConnection?.connectionId ? fieldsEndpoint.replace('[:connectionId:]', activeConnection?.connectionId) : fieldsEndpoint)
.catch(e => setError(e))
console.log('>>> JIRA API PROXY: Fields Response...', fields)
setFieldsResponse(fields && Array.isArray(fields.data) ? fields.data : [])
@@ -75,19 +77,42 @@ const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint }) => {
setError(e)
ToastNotification.show({ message: e.message, intent: 'danger', icon: 'error' })
}
- }, [fieldsEndpoint, apiProxyPath])
+ }, [fieldsEndpoint, activeConnection, apiProxyPath])
- const createListData = (data = [], titleProperty = 'name', valueProperty = 'name') => {
- return data.map((d, dIdx) => {
- return {
- ...d,
- id: dIdx,
- key: d.key ? d.key : dIdx,
- title: d[titleProperty],
- value: d[valueProperty],
- type: d.schema?.type || 'string'
+ const fetchBoards = useCallback(() => {
+ try {
+ if (apiProxyPath.includes('null')) {
+ throw new Error('Connection ID is Null')
+ }
+ setError(null)
+ const fetchApiBoards = async () => {
+ const boards = await
+ request
+ .get(activeConnection?.connectionId ? boardsEndpoint.replace('[:connectionId:]', activeConnection?.connectionId) : boardsEndpoint)
+ .catch(e => setError(e))
+ console.log('>>> JIRA API PROXY: Boards Response...', boards)
+ setBoardsResponse(boards && Array.isArray(boards.data?.values) ? boards.data?.values : [])
+ setTimeout(() => {
+ setIsFetching(false)
+ }, 1000)
}
- })
+ fetchApiBoards()
+ } catch (e) {
+ setIsFetching(false)
+ setError(e)
+ ToastNotification.show({ message: e.message, intent: 'danger', icon: 'error' })
+ }
+ }, [boardsEndpoint, activeConnection, apiProxyPath])
+
+ const createListData = (data = [], titleProperty = 'name', valueProperty = 'name') => {
+ return data.map((d, dIdx) => ({
+ ...d,
+ id: d.id || dIdx,
+ key: d.key ? d.key : dIdx,
+ title: d[titleProperty],
+ value: d[valueProperty],
+ type: d.schema?.type || 'string'
+ }))
}
useEffect(() => {
@@ -100,25 +125,40 @@ const useJIRA = ({ apiProxyPath, issuesEndpoint, fieldsEndpoint }) => {
setFields(fieldsResponse ? createListData(fieldsResponse, 'name', 'key') : [])
}, [fieldsResponse])
+ useEffect(() => {
+ setBoards(boardsResponse ? createListData(boardsResponse, 'name', 'name') : [])
+ }, [boardsResponse])
+
useEffect(() => {
console.log('>>> JIRA API PROXY: FIELD SELECTOR LIST DATA', fields)
}, [fields])
+ useEffect(() => {
+ console.log('>>> JIRA API PROXY: FIELD SELECTOR BOARDS DATA', boards)
+ }, [boards])
+
useEffect(() => {
if (error) {
console.log('>>> JIRA PROXY API ERROR!', error)
}
}, [error])
+ // useEffect(() => {
+ // console.log('>>> JIRA PROXY ACTIVE CONNECTION...', activeConnection)
+ // }, [activeConnection])
+
return {
isFetching,
fetchFields,
fetchIssueTypes,
+ fetchBoards,
createListData,
issueTypesResponse,
fieldsResponse,
+ boardsResponse,
issueTypes,
fields,
+ boards,
error
}
}
diff --git a/config-ui/src/hooks/usePipelineManager.jsx b/config-ui/src/hooks/usePipelineManager.jsx
index a6cd8463..8465966b 100644
--- a/config-ui/src/hooks/usePipelineManager.jsx
+++ b/config-ui/src/hooks/usePipelineManager.jsx
@@ -21,10 +21,12 @@ import request from '@/utils/request'
import { NullPipelineRun } from '@/data/NullPipelineRun'
import { ToastNotification } from '@/components/Toast'
import { Providers } from '@/data/Providers'
+import { Intent } from '@blueprintjs/core'
// import { integrationsData } from '@/data/integrations'
-function usePipelineManager (pipelineName = `COLLECTION ${Date.now()}`, initialTasks = []) {
+function usePipelineManager (myPipelineName = `COLLECTION ${Date.now()}`, initialTasks = []) {
// const [integrations, setIntegrations] = useState(integrationsData)
+ const [pipelineName, setPipelineName] = useState(myPipelineName ?? `COLLECTION ${Date.now()}`)
const [isFetching, setIsFetching] = useState(false)
const [isFetchingAll, setIsFetchingAll] = useState(false)
const [isRunning, setIsRunning] = useState(false)
@@ -32,7 +34,7 @@ function usePipelineManager (pipelineName = `COLLECTION ${Date.now()}`, initialT
const [errors, setErrors] = useState([])
const [settings, setSettings] = useState({
name: pipelineName,
- tasks: [
+ plan: [
[...initialTasks]
]
})
@@ -54,20 +56,20 @@ function usePipelineManager (pipelineName = `COLLECTION ${Date.now()}`, initialT
Providers.DBT
])
- const runPipeline = useCallback(() => {
+ const runPipeline = useCallback((runSettings = null) => {
console.log('>> RUNNING PIPELINE....')
try {
setIsRunning(true)
setErrors([])
ToastNotification.clear()
- console.log('>> DISPATCHING PIPELINE REQUEST', settings)
+ console.log('>> DISPATCHING PIPELINE REQUEST', runSettings || settings)
const run = async () => {
- const p = await request.post(`${DEVLAKE_ENDPOINT}/pipelines`, settings)
+ const p = await request.post(`${DEVLAKE_ENDPOINT}/pipelines`, runSettings || settings)
const t = await request.get(`${DEVLAKE_ENDPOINT}/pipelines/${p.data?.ID || p.data?.id}/tasks`)
console.log('>> RAW PIPELINE DATA FROM API...', p.data)
setPipelineRun({ ...p.data, ID: p.data?.ID || p.data?.id, tasks: [...t.data.tasks] })
setLastRunId(p.data?.ID || p.data?.id)
- ToastNotification.show({ message: `Created New Pipeline - ${pipelineName}.`, intent: 'danger', icon: 'small-tick' })
+ ToastNotification.show({ message: `Created New Pipeline - ${pipelineName}.`, intent: Intent.SUCCESS, icon: 'small-tick' })
setTimeout(() => {
setIsRunning(false)
}, 500)
@@ -215,8 +217,10 @@ function usePipelineManager (pipelineName = `COLLECTION ${Date.now()}`, initialT
isFetching,
isFetchingAll,
isCancelling,
+ pipelineName,
settings,
setSettings,
+ setPipelineName,
pipelineRun,
activePipeline,
pipelines,
diff --git a/config-ui/src/hooks/usePipelineValidation.jsx b/config-ui/src/hooks/usePipelineValidation.jsx
index 5e709323..e703533c 100644
--- a/config-ui/src/hooks/usePipelineValidation.jsx
+++ b/config-ui/src/hooks/usePipelineValidation.jsx
@@ -17,12 +17,16 @@
*/
import { useCallback, useEffect, useState } from 'react'
import { Providers, } from '@/data/Providers'
+import { BlueprintMode } from '@/data/NullBlueprint'
function usePipelineValidation ({
+ activeStep,
enabledProviders = [],
pipelineName,
projectId,
+ projects = [],
boardId,
+ boards = [],
owner,
repositoryName,
gitExtractorUrl,
@@ -33,7 +37,10 @@ function usePipelineValidation ({
connectionId,
tasks = [],
tasksAdvanced = [],
- advancedMode
+ advancedMode,
+ mode = null,
+ connection,
+ entities = []
}) {
const [errors, setErrors] = useState([])
const [isValid, setIsValid] = useState(false)
@@ -59,6 +66,11 @@ function usePipelineValidation ({
return Array.isArray(set) ? set.every(i => !isNaN(i)) : false
}
+ const validateRepositoryName = (set = []) => {
+ const repoRegExp = /([a-z0-9_-]){2,}\/([a-z0-9_-]){2,}/gi
+ return set.every(i => i.match(repoRegExp))
+ }
+
const validate = useCallback(() => {
const errs = []
console.log('>> VALIDATING PIPELINE RUN ', pipelineName)
@@ -66,77 +78,7 @@ function usePipelineValidation ({
if (!pipelineName || pipelineName.length <= 2) {
errs.push('Name: Enter a valid Pipeline Name')
}
- if (enabledProviders.includes(Providers.GITLAB) && (!connectionId || isNaN(connectionId))) {
- errs.push('GitLab: Select a valid Connection ID (Numeric)')
- }
- if (enabledProviders.includes(Providers.GITLAB) && (!projectId || projectId.length !== 1 || projectId.toString() === '')) {
- errs.push('GitLab: Enter one valid Project ID (Numeric)')
- }
-
- if (enabledProviders.includes(Providers.GITLAB) && !validateNumericSet(projectId)) {
- errs.push('GitLab: Entered Project ID is NOT numeric!')
- }
-
- if (enabledProviders.includes(Providers.JIRA) && (!connectionId || isNaN(connectionId))) {
- errs.push('JIRA: Select a valid Connection ID (Numeric)')
- }
-
- if (enabledProviders.includes(Providers.JIRA) && (!boardId || boardId.length !== 1 || boardId.toString() === '')) {
- errs.push('JIRA: Enter one valid Board ID (Numeric)')
- }
-
- if (enabledProviders.includes(Providers.JIRA) && !validateNumericSet(boardId)) {
- errs.push('JIRA: Entered Board ID is NOT numeric!')
- }
-
- if (enabledProviders.includes(Providers.GITHUB) && (!owner || owner <= 2)) {
- errs.push('GitHub: Owner/Developer is required')
- }
-
- if (enabledProviders.includes(Providers.GITHUB) && (owner.match(/^[a-zA-Z0-9_-]+$/g) === null)) {
- errs.push('GitHub: Owner invalid format')
- }
-
- if (enabledProviders.includes(Providers.GITHUB) && !repositoryName) {
- errs.push('GitHub: Repository Name is required')
- }
- if (enabledProviders.includes(Providers.GITHUB) && repositoryName.match(/^[a-zA-Z0-9._-]+$/g) === null) {
- errs.push('GitHub: Repository name invalid format')
- }
-
- if (enabledProviders.includes(Providers.GITEXTRACTOR) && !gitExtractorUrl) {
- errs.push('GitExtractor: Repository Git URL is required')
- }
-
- if (enabledProviders.includes(Providers.GITEXTRACTOR) &&
- gitExtractorUrl.toLowerCase().match(/^(http:\/\/|https:\/\/|ssh:\/\/|git@)+/g) === null) {
- errs.push('GitExtractor: Repository Git URL must be valid HTTP/S, SSH or Git@ protocol')
- }
-
- if (enabledProviders.includes(Providers.GITEXTRACTOR) && !gitExtractorUrl.toLowerCase().endsWith('.git')) {
- errs.push('GitExtractor: Invalid Git URL Extension')
- }
-
- if (enabledProviders.includes(Providers.GITEXTRACTOR) && !gitExtractorRepoId) {
- errs.push('GitExtractor: Repository Column ID Code is required')
- }
-
- if (enabledProviders.includes(Providers.REFDIFF) && !refDiffRepoId) {
- errs.push('RefDiff: Repository Column ID Code is required')
- }
-
- if (enabledProviders.includes(Providers.REFDIFF) && refDiffTasks.length === 0) {
- errs.push('RefDiff: Please select at least ONE (1) Plugin Task')
- }
-
- if (enabledProviders.includes(Providers.REFDIFF) && refDiffPairs.length === 0) {
- errs.push('RefDiff: Please enter at least ONE (1) Tag Ref Pair')
- }
-
- if (enabledProviders.length === 0) {
- errs.push('Pipeline: Invalid/Empty Configuration')
- }
setErrors(errs)
}, [
enabledProviders,
@@ -150,7 +92,9 @@ function usePipelineValidation ({
refDiffRepoId,
refDiffTasks,
refDiffPairs,
- connectionId
+ connectionId,
+ boards,
+ projects
])
const validateAdvanced = useCallback(() => {
diff --git a/config-ui/src/hooks/useSettingsManager.jsx b/config-ui/src/hooks/useSettingsManager.jsx
index 40ee3831..8ebcf131 100644
--- a/config-ui/src/hooks/useSettingsManager.jsx
+++ b/config-ui/src/hooks/useSettingsManager.jsx
@@ -49,7 +49,7 @@ function useSettingsManager ({
...connectionPayload,
name: connection.name,
endpoint: connection.endpoint,
- auth: connection.token,
+ token: connection.token,
proxy: connection.proxy || connection.Proxy
}
break
diff --git a/config-ui/src/images/devlake-logo.svg b/config-ui/src/images/devlake-logo.svg
new file mode 100644
index 00000000..6e713592
--- /dev/null
+++ b/config-ui/src/images/devlake-logo.svg
@@ -0,0 +1,6 @@
+<svg width="100" height="100" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="24" cy="24" r="24" fill="#7497F7"/>
+<path d="M36.3565 28.2413C34.8541 28.2762 33.4745 28.1777 32.198 27.9751C33.6367 26.6784 34.4828 24.8944 34.3781 22.9664C34.2789 21.1452 33.3483 19.5357 31.9202 18.3944C33.8344 17.5795 36.0517 16.3076 37.1975 14.4932C38.527 12.3879 37.7124 10.6129 37.0612 9.69778C36.801 9.33198 36.1886 9.29821 35.8106 9.63081L27.782 16.6965C27.3573 16.6453 26.9218 16.625 26.479 16.6363C27.8254 15.0447 29.1492 12.9501 29.5075 10.596C29.9739 7.53166 28.3696 6.0403 27.3037 5.40211C26.8779 5.14717 26.2317 5. [...]
+<path d="M23.4341 21.6448C23.4341 22.6578 24.256 23.4783 25.2694 23.4783C26.2834 23.4783 27.1048 22.6578 27.1048 21.6448C27.1048 20.6318 26.2834 19.8113 25.2694 19.8113C24.2554 19.8113 23.4341 20.6318 23.4341 21.6448Z" fill="#FF8B8B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.81165 39.6587C4.55094 38.1957 3.46375 36.5788 2.58203 34.8402C6.00017 33.819 10.6322 32.8665 15.667 32.8665C19.4684 32.8665 22.3446 33.5767 25.0905 34.2558L25.134 34.2666C27.8411 34.9361 30.4856 35.5902 34.1912 35.7548C38.5009 35.9463 42.5512 34.949 45.8368 33.972C44.6821 36.4964 43.1025 38.7859 41.1895 40.7489C38.9327 41.1367 36.4783 41.368 33.9468 41.2555C29.6929 41.0665 26.6085 40.3034 23.8871 39.6302L23.7685 39.6008C21.0418 38.9265 [...]
+</svg>
diff --git a/config-ui/src/images/devlake-textmark.svg b/config-ui/src/images/devlake-textmark.svg
new file mode 100644
index 00000000..2aa60a54
--- /dev/null
+++ b/config-ui/src/images/devlake-textmark.svg
@@ -0,0 +1,3 @@
+<svg width="100" height="100" viewBox="0 0 100 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.85853 9.7561H0L2.06835 2.20723C2.4255 0.903737 3.61017 0 4.96171 0H6.00651C7.15817 0 8.07188 0.970163 8.00292 2.11976L7.54484 9.7561H5.74167L6.01464 6.38223H2.77185L1.85853 9.7561ZM6.35354 2.19474L6.14328 4.7937H3.20176L3.88088 2.28505C3.9989 1.84909 4.39449 1.54636 4.84614 1.54636H5.7555C6.10594 1.54636 6.3818 1.84543 6.35354 2.19474ZM37.9166 3.81498L36.9686 9.90796H35.3434L36.2102 4.35017C36.2643 3.95221 36.1831 3.93848 35.8445 3.9384 [...]
+</svg>
diff --git a/config-ui/src/pages/blueprints/blueprint-detail.jsx b/config-ui/src/pages/blueprints/blueprint-detail.jsx
new file mode 100644
index 00000000..f45fccd8
--- /dev/null
+++ b/config-ui/src/pages/blueprints/blueprint-detail.jsx
@@ -0,0 +1,1306 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import React, { useEffect, useState, useCallback, useRef } from 'react'
+import { useParams, useHistory } from 'react-router-dom'
+// import { CSSTransition } from 'react-transition-group'
+import { DEVLAKE_ENDPOINT } from '@/utils/config'
+import request from '@/utils/request'
+import dayjs from '@/utils/time'
+import {
+ Button,
+ Elevation,
+ Intent,
+ Switch,
+ Card,
+ Tooltip,
+ Icon,
+ Colors,
+ Divider,
+ Spinner,
+ Classes,
+ Position,
+ Popover,
+ Collapse,
+ Dialog
+} from '@blueprintjs/core'
+import { NullBlueprint } from '@/data/NullBlueprint'
+import { NullPipelineRun } from '@/data/NullPipelineRun'
+import { Providers, ProviderLabels, ProviderIcons } from '@/data/Providers'
+
+// import {
+// WorkflowSteps,
+// WorkflowAdvancedSteps,
+// DEFAULT_DATA_ENTITIES,
+// DEFAULT_BOARDS,
+// } from '@/data/BlueprintWorkflow'
+
+import Nav from '@/components/Nav'
+import Sidebar from '@/components/Sidebar'
+import Content from '@/components/Content'
+import TaskActivity from '@/components/pipelines/TaskActivity'
+import CodeInspector from '@/components/pipelines/CodeInspector'
+import StageLane from '@/components/pipelines/StageLane'
+
+import useBlueprintManager from '@/hooks/useBlueprintManager'
+import usePipelineManager from '@/hooks/usePipelineManager'
+// import useConnectionManager from '@/hooks/useConnectionManager'
+// import { DataEntityTypes } from '@/data/DataEntities'
+
+const StageStatus = {
+ PENDING: 'Pending',
+ COMPLETE: 'Complete',
+ FAILED: 'Failed',
+ ACTIVE: 'In Progress',
+}
+
+const TaskStatus = {
+ COMPLETE: 'TASK_COMPLETED',
+ FAILED: 'TASK_FAILED',
+ ACTIVE: 'TASK_RUNNING',
+ RUNNING: 'TASK_RUNNING',
+ CREATED: 'TASK_CREATED',
+ PENDING: 'TASK_CREATED',
+ CANCELLED: 'TASK_CANCELLED',
+}
+
+const TaskStatusLabels = {
+ [TaskStatus.COMPLETE]: 'Succeeded',
+ [TaskStatus.FAILED]: 'Failed',
+ [TaskStatus.ACTIVE]: 'In Progress',
+ [TaskStatus.RUNNING]: 'In Progress',
+ [TaskStatus.CREATED]: 'Created (Pending)',
+ [TaskStatus.PENDING]: 'Created (Pending)',
+ [TaskStatus.PENDING]: 'Cancelled',
+}
+
+const StatusColors = {
+ PENDING: '#292B3F',
+ COMPLETE: '#4DB764',
+ FAILED: '#E34040',
+ ACTIVE: '#7497F7',
+}
+
+// eslint-disable-next-line no-unused-vars
+const StatusBgColors = {
+ PENDING: 'transparent',
+ COMPLETE: '#EDFBF0',
+ FAILED: '#FEEFEF',
+ ACTIVE: '#F0F4FE',
+}
+
+// eslint-disable-next-line no-unused-vars
+const TEST_BLUEPRINT = {
+ ...NullBlueprint,
+ id: 1,
+ name: 'DevLake Daily Blueprint',
+ createdAt: new Date().toLocaleString(),
+ updatedAt: new Date().toLocaleString(),
+}
+
+// eslint-disable-next-line no-unused-vars
+const TEST_CONNECTIONS = [
+ {
+ id: 0,
+ provider: Providers.GITHUB,
+ name: 'Merico GitHub',
+ dataScope: 'merico-dev/ake, merico-dev/lake-website',
+ dataEntities: ['code', 'ticket', 'user'],
+ },
+ {
+ id: 0,
+ provider: Providers.JIRA,
+ name: 'Merico JIRA',
+ dataScope: 'Sprint Dev Board, DevLake Sync Board ',
+ dataEntities: ['ticket'],
+ },
+]
+
+const TEST_RUN = {
+ id: null,
+ status: TaskStatus.RUNNING,
+ statusLabel: TaskStatusLabels[TaskStatus.RUNNING],
+ icon: <Spinner size={18} intent={Intent.PRIMARY} />,
+ startedAt: '7/7/2022, 5:31:33 PM',
+ duration: '1 min',
+ stage: 'Stage 1',
+ tasksTotal: 5,
+ tasksFinished: 8,
+ // totalTasks: 13,
+ error: null,
+}
+
+// eslint-disable-next-line no-unused-vars
+const EMPTY_RUN = {
+ id: null,
+ status: TaskStatus.CREATED,
+ statusLabel: TaskStatusLabels[TaskStatus.RUNNING],
+ icon: null,
+ startedAt: Date.now(),
+ duration: '0 min',
+ stage: 'Stage 1',
+ tasksTotal: 0,
+ tasksFinished: 0,
+ // totalTasks: 0,
+ error: null,
+}
+
+// eslint-disable-next-line no-unused-vars
+const TEST_BLUEPRINT_API_RESPONSE = {
+ name: 'DEVLAKE (Hourly)',
+ mode: 'NORMAL',
+ plan: [
+ [
+ {
+ plugin: 'github',
+ subtasks: [
+ 'collectApiRepo',
+ 'extractApiRepo',
+ 'collectApiIssues',
+ 'extractApiIssues',
+ 'collectApiPullRequests',
+ 'extractApiPullRequests',
+ 'collectApiComments',
+ 'extractApiComments',
+ 'collectApiEvents',
+ 'extractApiEvents',
+ 'collectApiPullRequestCommits',
+ 'extractApiPullRequestCommits',
+ 'collectApiPullRequestReviews',
+ 'extractApiPullRequestReviewers',
+ 'collectApiCommits',
+ 'extractApiCommits',
+ 'collectApiCommitStats',
+ 'extractApiCommitStats',
+ 'enrichPullRequestIssues',
+ 'convertRepo',
+ 'convertIssues',
+ 'convertCommits',
+ 'convertIssueLabels',
+ 'convertPullRequestCommits',
+ 'convertPullRequests',
+ 'convertPullRequestLabels',
+ 'convertPullRequestIssues',
+ 'convertIssueComments',
+ 'convertPullRequestComments',
+ ],
+ options: {
+ connectionId: 1,
+ owner: 'e2corporation',
+ repo: 'incubator-devlake',
+ transformationRules: {
+ issueComponent: '',
+ issuePriority: '',
+ issueSeverity: '',
+ issueTypeBug: '',
+ issueTypeIncident: '',
+ issueTypeRequirement: '',
+ prComponent: '',
+ prType: '',
+ },
+ },
+ },
+ {
+ plugin: 'gitextractor',
+ subtasks: null,
+ options: {
+ repoId: 'github:GithubRepo:1:506830252',
+ url: 'https://git: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@github.com/e2corporation/incubator-devlake.git',
+ },
+ },
+ ],
+ [
+ {
+ plugin: 'refdiff',
+ subtasks: null,
+ options: {
+ tagsLimit: 10,
+ tagsOrder: '',
+ tagsPattern: '',
+ },
+ },
+ ],
+ ],
+ enable: true,
+ cronConfig: '0 0 * * *',
+ isManual: false,
+ settings: {
+ version: '1.0.0',
+ connections: [
+ {
+ connectionId: 1,
+ plugin: 'github',
+ scope: [
+ {
+ entities: ['CODE', 'TICKET'],
+ options: {
+ owner: 'e2corporation',
+ repo: 'incubator-devlake',
+ },
+ transformation: {
+ prType: '',
+ prComponent: '',
+ issueSeverity: '',
+ issueComponent: '',
+ issuePriority: '',
+ issueTypeRequirement: '',
+ issueTypeBug: '',
+ issueTypeIncident: '',
+ refdiff: {
+ tagsOrder: '',
+ tagsPattern: '',
+ tagsLimit: 10,
+ },
+ },
+ },
+ ],
+ },
+ ],
+ },
+ id: 1,
+ createdAt: '2022-07-11T10:23:38.908-04:00',
+ updatedAt: '2022-07-11T10:23:38.908-04:00',
+}
+
+const TEST_STAGES = [
+ {
+ id: 1,
+ name: 'stage-1',
+ title: 'Stage 1',
+ status: StageStatus.COMPLETED,
+ icon: <Icon icon='tick-circle' size={14} color={StatusColors.COMPLETE} />,
+ tasks: [
+ {
+ id: 0,
+ provider: 'jira',
+ icon: ProviderIcons[Providers.JIRA](14, 14),
+ title: 'JIRA',
+ caption: 'STREAM Board',
+ duration: '4 min',
+ subTasksCompleted: 25,
+ recordsFinished: 1234,
+ message: 'All 25 subtasks completed',
+ status: TaskStatus.COMPLETE,
+ },
+ {
+ id: 0,
+ provider: 'jira',
+ icon: ProviderIcons[Providers.JIRA](14, 14),
+ title: 'JIRA',
+ caption: 'LAKE Board',
+ duration: '4 min',
+ subTasksCompleted: 25,
+ recordsFinished: 1234,
+ message: 'All 25 subtasks completed',
+ status: TaskStatus.COMPLETE,
+ },
+ ],
+ stageHeaderClassName: 'complete',
+ },
+ {
+ id: 2,
+ name: 'stage-2',
+ title: 'Stage 2',
+ status: StageStatus.PENDING,
+ icon: <Spinner size={14} intent={Intent.PRIMARY} />,
+ tasks: [
+ {
+ id: 0,
+ provider: 'jira',
+ icon: ProviderIcons[Providers.JIRA](14, 14),
+ title: 'JIRA',
+ caption: 'EE Board',
+ duration: '5 min',
+ subTasksCompleted: 25,
+ recordsFinished: 1234,
+ message: 'Subtask 5/25: Extracting Issues',
+ status: TaskStatus.ACTIVE,
+ },
+ {
+ id: 0,
+ provider: 'jira',
+ icon: ProviderIcons[Providers.JIRA](14, 14),
+ title: 'JIRA',
+ caption: 'EE Bugs Board',
+ duration: '0 min',
+ subTasksCompleted: 0,
+ recordsFinished: 0,
+ message: 'Invalid Board ID',
+ status: TaskStatus.FAILED,
+ },
+ ],
+ stageHeaderClassName: 'active',
+ },
+ {
+ id: 3,
+ name: 'stage-3',
+ title: 'Stage 3',
+ status: StageStatus.PENDING,
+ icon: null,
+ tasks: [
+ {
+ id: 0,
+ provider: 'github',
+ icon: ProviderIcons[Providers.GITHUB](14, 14),
+ title: 'GITHUB',
+ caption: 'merico-dev/lake',
+ duration: null,
+ subTasksCompleted: 0,
+ recordsFinished: 0,
+ message: 'Subtasks pending',
+ status: TaskStatus.CREATED,
+ },
+ ],
+ stageHeaderClassName: 'pending',
+ },
+ {
+ id: 4,
+ name: 'stage-4',
+ title: 'Stage 4',
+ status: StageStatus.PENDING,
+ icon: null,
+ tasks: [
+ {
+ id: 0,
+ providr: 'github',
+ icon: ProviderIcons[Providers.GITHUB](14, 14),
+ title: 'GITHUB',
+ caption: 'merico-dev/lake',
+ duration: null,
+ subTasksCompleted: 0,
+ recordsFinished: 0,
+ message: 'Subtasks pending',
+ status: TaskStatus.CREATED,
+ },
+ ],
+ stageHeaderClassName: 'pending',
+ },
+]
+
+const TEST_HISTORICAL_RUNS = [
+ {
+ id: 0,
+ status: 'TASK_COMPLETED',
+ statusLabel: 'Completed',
+ statusIcon: <Icon icon='tick-circle' size={14} color={Colors.GREEN5} />,
+ startedAt: '05/25/2022 0:00 AM',
+ completedAt: '05/25/2022 0:15 AM',
+ duration: '15 min',
+ },
+ {
+ id: 1,
+ status: 'TASK_COMPLETED',
+ statusLabel: 'Completed',
+ statusIcon: <Icon icon='tick-circle' size={14} color={Colors.GREEN5} />,
+ startedAt: '05/25/2022 0:00 AM',
+ completedAt: '05/25/2022 0:15 AM',
+ duration: '15 min',
+ },
+ {
+ id: 2,
+ status: 'TASK_FAILED',
+ statusLabel: 'Failed',
+ statusIcon: <Icon icon='delete' size={14} color={Colors.RED5} />,
+ startedAt: '05/25/2022 0:00 AM',
+ completedAt: '05/25/2022 0:00 AM',
+ duration: '0 min',
+ },
+ {
+ id: 3,
+ status: 'TASK_COMPLETED',
+ statusLabel: 'Completed',
+ statusIcon: <Icon icon='tick-circle' size={14} color={Colors.GREEN5} />,
+ startedAt: '05/25/2022 0:00 AM',
+ completedAt: '05/25/2022 0:15 AM',
+ duration: '15 min',
+ },
+ {
+ id: 4,
+ status: 'TASK_COMPLETED',
+ statusLabel: 'Completed',
+ statusIcon: <Icon icon='tick-circle' size={14} color={Colors.GREEN5} />,
+ startedAt: '05/25/2022 0:00 AM',
+ completedAt: '05/25/2022 0:15 AM',
+ duration: '15 min',
+ },
+ {
+ id: 5,
+ status: 'TASK_FAILED',
+ statusLabel: 'Failed',
+ statusIcon: <Icon icon='delete' size={14} color={Colors.RED5} />,
+ startedAt: '05/25/2022 0:00 AM',
+ completedAt: '05/25/2022 0:00 AM',
+ duration: '0 min',
+ },
+]
+
+const BlueprintDetail = (props) => {
+ // eslint-disable-next-line no-unused-vars
+ const history = useHistory()
+ const { bId } = useParams()
+
+ const [blueprintId, setBlueprintId] = useState()
+ // @todo: replace with live $blueprint from Hook
+ const [activeBlueprint, setActiveBlueprint] = useState(TEST_RUN)
+ // eslint-disable-next-line no-unused-vars
+ const [blueprintConnections, setBlueprintConnections] = useState([])
+ const [blueprintPipelines, setBlueprintPipelines] = useState([])
+ const [lastPipeline, setLastPipeline] = useState()
+ const [inspectedPipeline, setInspectedPipeline] = useState(NullPipelineRun)
+ const [currentRun, setCurrentRun] = useState()
+ const [showCurrentRunTasks, setShowCurrentRunTasks] = useState(true)
+ const [showInspector, setShowInspector] = useState(false)
+ const [currentStages, setCurrentStages] = useState([])
+ const [historicalRuns, setHistoricalRuns] = useState(TEST_HISTORICAL_RUNS)
+
+ const pollTimer = 5000
+ const pollInterval = useRef()
+ const [autoRefresh, setAutoRefresh] = useState(false)
+
+ const [expandRun, setExpandRun] = useState(null)
+
+ const {
+ // eslint-disable-next-line no-unused-vars
+ blueprint,
+ blueprints,
+ name,
+ cronConfig,
+ customCronConfig,
+ cronPresets,
+ tasks,
+ detectedProviderTasks,
+ enable,
+ setName: setBlueprintName,
+ setCronConfig,
+ setCustomCronConfig,
+ setTasks: setBlueprintTasks,
+ setDetectedProviderTasks,
+ setEnable: setEnableBlueprint,
+ isFetching: isFetchingBlueprints,
+ isSaving,
+ isDeleting,
+ createCronExpression: createCron,
+ getCronSchedule: getSchedule,
+ getCronPreset,
+ getCronPresetByConfig,
+ getNextRunDate,
+ activateBlueprint,
+ deactivateBlueprint,
+ // eslint-disable-next-line no-unused-vars
+ fetchBlueprint,
+ fetchAllBlueprints,
+ saveBlueprint,
+ deleteBlueprint,
+ saveComplete,
+ deleteComplete,
+ } = useBlueprintManager()
+
+ const {
+ activePipeline,
+ pipelines,
+ isFetchingAll: isFetchingAllPipelines,
+ fetchPipeline,
+ runPipeline,
+ cancelPipeline,
+ fetchAllPipelines,
+ lastRunId,
+ setSettings: setPipelineSettings,
+ // eslint-disable-next-line no-unused-vars
+ allowedProviders,
+ // eslint-disable-next-line no-unused-vars
+ detectPipelineProviders,
+ } = usePipelineManager()
+
+ const buildPipelineStages = useCallback((tasks = []) => {
+ let stages = {}
+ console.log('>>>> RECEIVED PIPELINE TASKS FOR STAGE...', tasks)
+ tasks?.forEach(tS => {
+ stages = {
+ ...stages,
+ [tS.pipelineRow]: tasks?.filter(t => t.pipelineRow === tS.pipelineRow)
+ }
+ })
+ console.log('>>> BUILDING PIPELINE STAGES...', stages)
+ return stages
+ }, [])
+
+ const runBlueprint = useCallback(() => {
+ if (activeBlueprint !== null) {
+ runPipeline()
+ }
+ }, [activeBlueprint, runPipeline])
+
+ const handleBlueprintActivation = useCallback((blueprint) => {
+ if (blueprint.enable) {
+ deactivateBlueprint(blueprint)
+ } else {
+ activateBlueprint(blueprint)
+ }
+ // fetchBlueprint(blueprint?.id)
+ // fetchAllPipelines()
+ }, [activateBlueprint, deactivateBlueprint])
+
+ const handlePipelineDialogClose = useCallback(() => {
+ setExpandRun(null)
+ }, [])
+
+ const inspectRun = useCallback((pipelineRun) => {
+ setInspectedPipeline(pipelineRun)
+ setShowInspector(true)
+ }, [])
+
+ const viewPipelineRun = useCallback((pipelineRun) => {
+ const fetchPipelineTasks = async () => {
+ const t = await request.get(`${DEVLAKE_ENDPOINT}/pipelines/${pipelineRun?.id}/tasks`)
+ setExpandRun({
+ ...pipelineRun,
+ tasks: t.data?.tasks || []
+ })
+ }
+ if (pipelineRun?.id !== null) {
+ fetchPipelineTasks()
+ }
+ }, [setExpandRun])
+
+ const handleInspectorClose = useCallback(() => {
+ setInspectedPipeline(NullPipelineRun)
+ setShowInspector(false)
+ }, [])
+
+ const cancelRun = () => {}
+
+ const getTaskStatusIcon = (status) => {
+ let icon = null
+ switch (status) {
+ case TaskStatus.ACTIVE:
+ case TaskStatus.RUNNING:
+ icon = <Spinner size={14} intent={Intent.PRIMARY} />
+ break
+ case TaskStatus.COMPLETE:
+ icon = <Icon icon='tick-circle' size={14} color={Colors.GREEN5} />
+ break
+ case TaskStatus.FAILED:
+ icon = <Icon icon='delete' size={14} color={Colors.RED5} />
+ break
+ case TaskStatus.CANCELLED:
+ case TaskStatus.CREATED:
+ break
+ }
+ return icon
+ }
+
+ useEffect(() => {
+ setBlueprintId(bId)
+ console.log('>>> REQUESTED BLUEPRINT ID ===', bId)
+ }, [bId])
+
+ useEffect(() => {
+ if (blueprintId) {
+ // @todo: enable blueprint data fetch
+ fetchBlueprint(blueprintId)
+ fetchAllPipelines()
+ }
+ }, [blueprintId, fetchBlueprint, fetchAllPipelines])
+
+ useEffect(() => {
+ console.log('>>>> SETTING ACTIVE BLUEPRINT...', blueprint)
+ if (blueprint?.id) {
+ setActiveBlueprint((b) => ({
+ ...b,
+ ...blueprint,
+ id: blueprint.id,
+ name: blueprint.name,
+ }))
+ setBlueprintConnections(
+ blueprint?.settings?.connections.map((connection, cIdx) => ({
+ id: cIdx,
+ provider: connection?.plugin,
+ name: `${
+ ProviderLabels[connection?.plugin.toUpperCase()]
+ } Connection (ID #${connection?.connectionId})`,
+ dataScope: connection?.scope
+ .map((s) => [`${s.options?.owner}/${s?.options?.repo}`])
+ .join(', '),
+ dataEntities: [],
+ }))
+ )
+ setPipelineSettings({
+ name: `${blueprint?.name} ${Date.now()}`,
+ blueprintId: blueprint?.id,
+ plan: blueprint?.plan,
+ })
+ }
+ }, [blueprint, setPipelineSettings])
+
+ useEffect(() => {
+ console.log('>>>> FETCHED ALL PIPELINES..', pipelines, activeBlueprint?.id)
+ // {id: 5, status: 'TASK_FAILED', statusLabel: 'Failed', statusIcon: <Icon icon='delete' size={14} color={Colors.RED5} />,startedAt: '05/25/2022 0:00 AM', completedAt: '05/25/2022 0:00 AM', duration: '0 min' },
+ setBlueprintPipelines(
+ pipelines.filter((p) => p.blueprintId === activeBlueprint?.id)
+ )
+ }, [pipelines, activeBlueprint])
+
+ useEffect(() => {
+ console.log('>>>> RELATED BLUEPRINT PIPELINES..', blueprintPipelines)
+ setLastPipeline(blueprintPipelines[0])
+ // blueprintPipelines.filter(p => p.status !== TaskStatus.RUNNING).map
+ setHistoricalRuns(
+ blueprintPipelines.map((p, pIdx) => ({
+ id: p.id,
+ status: p.status,
+ statusLabel: TaskStatusLabels[p.status],
+ statusIcon: getTaskStatusIcon(p.status),
+ startedAt: dayjs(p.beganAt).format('L LTS'),
+ completedAt:
+ p.status === 'TASK_RUNNING'
+ ? ' - '
+ : dayjs(p.finishedAt || p.updatedAt).format('L LTS'),
+ duration:
+ p.status === 'TASK_RUNNING'
+ ? dayjs(p.beganAt).toNow(true)
+ : dayjs(p.beganAt).from(p.finishedAt || p.updatedAt, true),
+ }))
+ )
+ }, [blueprintPipelines])
+
+ useEffect(() => {
+ // if (lastPipeline?.id && lastPipeline.status === TaskStatus.RUNNING) {
+ if (lastPipeline?.id && [TaskStatus.RUNNING, TaskStatus.COMPLETE, TaskStatus.FAILED].includes(lastPipeline.status)) {
+ fetchPipeline(lastPipeline?.id)
+ setCurrentRun((cR) => ({
+ ...cR,
+ id: lastPipeline.id,
+ status: lastPipeline.status,
+ statusLabel: TaskStatusLabels[lastPipeline.status],
+ icon: getTaskStatusIcon(lastPipeline.status),
+ startedAt: dayjs(lastPipeline.beganAt).format('L LTS'),
+ duration:
+ lastPipeline.status === 'TASK_RUNNING'
+ ? dayjs(lastPipeline.beganAt).toNow(true)
+ : dayjs(lastPipeline.beganAt).from(
+ lastPipeline.finishedAt || lastPipeline.updatedAt,
+ true
+ ),
+ stage: `Stage ${lastPipeline.stage}`,
+ tasksFinished: Number(lastPipeline.finishedTasks),
+ tasksTotal: Number(lastPipeline.totalTasks),
+ // totalTasks: Number(lastPipeline.totalTasks),
+ error: lastPipeline.message || null,
+ }))
+ }
+ }, [
+ fetchPipeline,
+ lastPipeline
+ ])
+
+ useEffect(() => {
+ fetchAllPipelines()
+ }, [lastRunId, fetchAllPipelines])
+
+ useEffect(() => {
+ if (activePipeline?.id && activePipeline?.id !== null) {
+ setCurrentStages(buildPipelineStages(activePipeline.tasks))
+ setAutoRefresh(activePipeline?.status === TaskStatus.RUNNING)
+ }
+ }, [activePipeline, buildPipelineStages])
+
+ useEffect(() => {
+ console.log('>> BUILDING CURRENT STAGES...', currentStages)
+ }, [currentStages])
+
+ useEffect(() => {
+ if (autoRefresh && activePipeline?.id) {
+ console.log('>> ACTIVITY POLLING ENABLED!')
+ pollInterval.current = setInterval(() => {
+ fetchPipeline(activePipeline?.id)
+ }, pollTimer)
+ } else {
+ console.log('>> ACTIVITY POLLING DISABLED!')
+ clearInterval(pollInterval.current)
+ if (activePipeline?.id) {
+ fetchPipeline(activePipeline?.id)
+ fetchAllPipelines()
+ }
+ }
+ }, [autoRefresh, fetchPipeline, fetchAllPipelines, activePipeline?.id, pollTimer])
+
+ // useEffect(() => {
+ // console.log('>> VIEW PIPELINE RUN....', expandRun)
+ // }, [expandRun])
+
+ return (
+ <>
+ <div className='container'>
+ <Nav />
+ <Sidebar />
+ <Content>
+ <main className='main'>
+ <div
+ className='blueprint-header'
+ style={{
+ display: 'flex',
+ width: '100%',
+ justifyContent: 'space-between',
+ marginBottom: '10px',
+ }}
+ >
+ <div className='blueprint-name' style={{}}>
+ <h2 style={{ fontWeight: 'bold' }}>{activeBlueprint?.name}</h2>
+ </div>
+ <div
+ className='blueprint-info'
+ style={{ display: 'flex', alignItems: 'center' }}
+ >
+ <div className='blueprint-schedule'>
+ <span
+ className='blueprint-schedule-interval'
+ style={{ textTransform: 'capitalize', padding: '0 10px' }}
+ >
+ {activeBlueprint?.interval} (at{' '}
+ {dayjs(getNextRunDate(activeBlueprint?.cronConfig)).format(
+ 'hh:mm A'
+ )}
+ )
+ </span>{' '}
+ {' '}
+ <span className='blueprint-schedule-nextrun'>
+ Next Run{' '}
+ {dayjs(
+ getNextRunDate(activeBlueprint?.cronConfig)
+ ).fromNow()}
+ </span>
+ </div>
+ <div
+ className='blueprint-actions'
+ style={{ padding: '0 10px' }}
+ >
+ <Button
+ intent={Intent.PRIMARY}
+ small
+ text='Run Now'
+ onClick={runBlueprint}
+ disabled={!activeBlueprint?.enable}
+ // disabled={currentRun?.status === TaskStatus.RUNNING}
+ />
+ </div>
+ <div className='blueprint-enabled'>
+ <Switch
+ id='blueprint-enable'
+ name='blueprint-enable'
+ checked={activeBlueprint?.enable}
+ label={
+ activeBlueprint?.enable
... 5564 lines suppressed ...