Skip to content

Commit 1e778d8

Browse files
authored
fix(orchestrator): allows serving the editor envelope in disconnected environments (janus-idp#1450)
chore(orchestrator): adds orchestrator-swf-editor-envelopes chore(orchestrator): adds a script to import the envelope files Adds missing peer dependencies on monaco-editor and monaco-yaml chore(orchestrator): updates yarn.lock after applying nohoist chore(orchestrator): remove -x flag Update plugins/orchestrator-swf-editor-envelope/package.json Co-authored-by: Guilherme Caponetto <[email protected]> Don't hoist @kie-tools and friends Adds OWNERS file Allows overriding the build mode Removes the void operator Updates README.md Updates yarn.lock Removes import-editor-envelope.sh embeds the editor-envelope into the orchestrator-backend package removes the preinstall script REmoves pkg_cli.sh v1.0.0-rc.1 refactor(orchestrator-backend): removes swf-editor-envelope refactor(orchestrator): intro swf-editor-envelope as a private package refactor(orchestrator): adds static files refactor(orchestrator): updates postbuild script refactor(orchestrator): update editor envelope files refactor(orchestrator): nohoist @kie-tools and co refactor(orchestrator): updates yarn.lock refactor(orchestrator): removes setupTests.ts from editor-envelope refactor(orchestrator): don't lint stuff in static/generated/** refactor(orchestrator): read package name from package.json docs(orchestrator): update docs hard-code the orchestrator static endpoint fixes a typo and removes traces of DEFAULT_EDITOR_PATH const.
1 parent eefd264 commit 1e778d8

File tree

77 files changed

+43997
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+43997
-61
lines changed
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
module.exports = require('@backstage/cli/config/eslint-factory')(__dirname);
1+
const backstageEslintConfig = require('@backstage/cli/config/eslint-factory')(
2+
__dirname,
3+
);
4+
5+
module.exports = {
6+
...backstageEslintConfig,
7+
ignorePatterns: [
8+
...backstageEslintConfig.ignorePatterns,
9+
'static/generated/**',
10+
],
11+
};

plugins/orchestrator-backend/dist-dynamic/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,22 @@
3535
"files": [
3636
"app-config.janus-idp.yaml",
3737
"dist",
38+
"static",
3839
"alpha"
3940
],
4041
"scripts": {},
4142
"dependencies": {
4243
"@urql/core": "^4.1.4",
44+
"ajv-formats": "^2.1.1",
4345
"cloudevents": "^8.0.0",
4446
"express": "^4.18.2",
4547
"express-promise-router": "^4.1.1",
4648
"fs-extra": "^10.1.0",
4749
"json-schema": "^0.4.0",
50+
"moment": "^2.29.4",
4851
"openapi-backend": "^5.10.5",
4952
"winston": "^3.11.0",
5053
"yn": "^5.0.0",
51-
"moment": "^2.29.4",
52-
"ajv-formats": "^2.1.1",
5354
"@severlessworkflow/sdk-typescript": "^3.0.3",
5455
"js-yaml": "^4.1.0"
5556
},
@@ -58,8 +59,8 @@
5859
"peerDependencies": {
5960
"@backstage/backend-app-api": "^0.6.2",
6061
"@backstage/backend-common": "^0.21.6",
61-
"@backstage/backend-plugin-api": "^0.6.16",
6262
"@backstage/backend-dynamic-feature-service": "^0.2.8",
63+
"@backstage/backend-plugin-api": "^0.6.16",
6364
"@backstage/backend-tasks": "^0.5.21",
6465
"@backstage/catalog-client": "^1.6.3",
6566
"@backstage/config": "^1.2.0",

plugins/orchestrator-backend/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"dist",
4242
"dist-dynamic/*.*",
4343
"dist-dynamic/dist/**",
44-
"dist-dynamic/alpha/*"
44+
"dist-dynamic/alpha/*",
45+
"static"
4546
],
4647
"scripts": {
4748
"start": "backstage-cli package start",
@@ -58,8 +59,8 @@
5859
"dependencies": {
5960
"@backstage/backend-app-api": "^0.6.2",
6061
"@backstage/backend-common": "^0.21.6",
61-
"@backstage/backend-plugin-api": "^0.6.16",
6262
"@backstage/backend-dynamic-feature-service": "^0.2.8",
63+
"@backstage/backend-plugin-api": "^0.6.16",
6364
"@backstage/backend-tasks": "^0.5.21",
6465
"@backstage/catalog-client": "^1.6.3",
6566
"@backstage/config": "^1.2.0",
@@ -73,23 +74,23 @@
7374
"@backstage/types": "^1.1.1",
7475
"@janus-idp/backstage-plugin-orchestrator-common": "1.6.3",
7576
"@urql/core": "^4.1.4",
77+
"ajv-formats": "^2.1.1",
7678
"cloudevents": "^8.0.0",
7779
"express": "^4.18.2",
7880
"express-promise-router": "^4.1.1",
7981
"fs-extra": "^10.1.0",
8082
"json-schema": "^0.4.0",
83+
"moment": "^2.29.4",
8184
"openapi-backend": "^5.10.5",
8285
"winston": "^3.11.0",
83-
"yn": "^5.0.0",
84-
"moment": "^2.29.4",
85-
"ajv-formats": "^2.1.1"
86+
"yn": "^5.0.0"
8687
},
8788
"devDependencies": {
89+
"@backstage/backend-test-utils": "0.3.6",
8890
"@backstage/cli": "0.26.2",
8991
"@janus-idp/cli": "1.8.0",
9092
"@types/express": "4.17.20",
9193
"@types/fs-extra": "11.0.1",
92-
"@types/json-schema": "7.0.12",
93-
"@backstage/backend-test-utils": "0.3.6"
94+
"@types/json-schema": "7.0.12"
9495
}
9596
}

plugins/orchestrator-backend/src/service/DevModeService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Logger } from 'winston';
66
import {
77
DEFAULT_SONATAFLOW_BASE_URL,
88
DEFAULT_SONATAFLOW_CONTAINER_IMAGE,
9-
DEFAULT_SONATAFLOW_PERSISTANCE_PATH,
9+
DEFAULT_SONATAFLOW_PERSISTENCE_PATH,
1010
DEFAULT_WORKFLOWS_PATH,
1111
} from '@janus-idp/backstage-plugin-orchestrator-common';
1212

@@ -185,7 +185,7 @@ export class DevModeService {
185185
const persistencePath =
186186
config.getOptionalString(
187187
'orchestrator.sonataFlowService.persistence.path',
188-
) ?? DEFAULT_SONATAFLOW_PERSISTANCE_PATH;
188+
) ?? DEFAULT_SONATAFLOW_PERSISTENCE_PATH;
189189

190190
const jiraHost = config.getOptionalString('orchestrator.jira.host');
191191
const jiraBearerToken = config.getOptionalString(

plugins/orchestrator-backend/src/service/router.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { errorHandler } from '@backstage/backend-common';
1+
import { errorHandler, resolvePackagePath } from '@backstage/backend-common';
22
import { PluginTaskScheduler } from '@backstage/backend-tasks';
33
import { Config } from '@backstage/config';
44
import { DiscoveryApi } from '@backstage/core-plugin-api';
@@ -19,6 +19,7 @@ import {
1919
WorkflowInputSchemaResponse,
2020
} from '@janus-idp/backstage-plugin-orchestrator-common';
2121

22+
import * as pkg from '../../package.json';
2223
import { RouterArgs } from '../routerWrapper';
2324
import { buildPagination } from '../types/pagination';
2425
import { V1 } from './api/v1';
@@ -57,6 +58,7 @@ export async function createBackendRouter(
5758
const router = Router();
5859
router.use(express.json());
5960
router.use('/workflows', express.text());
61+
router.use('/static', express.static(resolvePackagePath(pkg.name, 'static')));
6062

6163
router.get('/health', (_, response) => {
6264
logger.info('PONG!');

plugins/orchestrator-backend/static/generated/envelope/combined.bundle.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/orchestrator-backend/static/generated/envelope/diagram.bundle.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/orchestrator-backend/static/generated/envelope/diagram/org.kie.workbench.common.stunner.sw.KogitoSWEditor/7B8391DDA1E35A2797E163B741F050D7.cache.js

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/orchestrator-backend/static/generated/envelope/diagram/org.kie.workbench.common.stunner.sw.KogitoSWEditor/E0FAC72ADB096551A5346E4435AA4F35.cache.js

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)