From 4a9d1f821a30437e73631fac98b1aabc65473fba Mon Sep 17 00:00:00 2001
From: Guilherme Caponetto <638737+caponetto@users.noreply.github.com>
Date: Wed, 15 May 2024 09:38:46 -0300
Subject: [PATCH] fix(orchestrator): export the `OrchestratorPlugin`
 accordingly (#1644)

* fix(orchestrator): export the OrchestratorPlugin accordingly to be used in the New Backend System

* Remove extra dependency
---
 plugins/orchestrator-backend/src/alpha.ts |  2 +-
 plugins/orchestrator/README.md            |  9 +++++----
 plugins/orchestrator/package.json         |  6 +++---
 yarn.lock                                 | 15 ++-------------
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/plugins/orchestrator-backend/src/alpha.ts b/plugins/orchestrator-backend/src/alpha.ts
index 3abf26968d..b49b213a08 100644
--- a/plugins/orchestrator-backend/src/alpha.ts
+++ b/plugins/orchestrator-backend/src/alpha.ts
@@ -1,2 +1,2 @@
-export { orchestratorPlugin } from './OrchestratorPlugin';
+export { orchestratorPlugin as default } from './OrchestratorPlugin';
 export { dynamicPluginInstaller } from './dynamic/alpha';
diff --git a/plugins/orchestrator/README.md b/plugins/orchestrator/README.md
index f6ab9f659a..47c4e65caa 100644
--- a/plugins/orchestrator/README.md
+++ b/plugins/orchestrator/README.md
@@ -150,14 +150,15 @@ For more information about the configuration options, including other optional p
    yarn workspace backend add @janus-idp/backstage-plugin-orchestrator-backend
    ```
 
-1. Add the following code to `packages/backend/src/index.ts` file:
+1. Add the following code to the `packages/backend/src/index.ts` file:
 
    ```ts title="packages/backend/src/index.ts"
-   import { orchestratorPlugin } from '@janus-idp/backstage-plugin-orchestrator-backend/alpha';
-
    const backend = createBackend();
+
    /* highlight-add-next-line */
-   backend.add(orchestratorPlugin);
+   backend.add(
+     import('@janus-idp/backstage-plugin-orchestrator-backend/alpha'),
+   );
 
    backend.start();
    ```
diff --git a/plugins/orchestrator/package.json b/plugins/orchestrator/package.json
index bc414a950b..05b91c38de 100644
--- a/plugins/orchestrator/package.json
+++ b/plugins/orchestrator/package.json
@@ -55,9 +55,9 @@
     "@material-ui/lab": "^4.0.0-alpha.45",
     "@monaco-editor/react": "^4.6.0",
     "@mui/icons-material": "^5.15.3",
-    "@rjsf/core": "^5.7.3",
-    "@rjsf/material-ui": "^5.7.3",
-    "@rjsf/utils": "5.7.3",
+    "@rjsf/core": "^5.18.2",
+    "@rjsf/material-ui": "^5.18.2",
+    "@rjsf/utils": "^5.18.2",
     "@rjsf/validator-ajv8": "5.7.3",
     "moment": "^2.29.4",
     "monaco-editor": "^0.39.0",
diff --git a/yarn.lock b/yarn.lock
index d8e9262b86..5b48d2ed6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9511,7 +9511,7 @@
     nanoid "^3.3.7"
     prop-types "^15.8.1"
 
-"@rjsf/core@^5.18.2", "@rjsf/core@^5.7.3":
+"@rjsf/core@^5.18.2":
   version "5.18.3"
   resolved "https://registry.yarnpkg.com/@rjsf/core/-/core-5.18.3.tgz#7cef908598c77ec0f0caaa301148e3e4a909292e"
   integrity sha512-HVqqoVzcjYX1BUCqHm7iUjBoVx1UDud1KP6bJ5drtOOvHChfKEbMUt2hWJcuXIlmNPuw2lRxETtcuRbEM2wsRA==
@@ -9527,7 +9527,7 @@
   resolved "https://registry.yarnpkg.com/@rjsf/material-ui/-/material-ui-5.17.1.tgz#009f31d0e8b0c5801bc858847060081a074e0a1d"
   integrity sha512-WCk3wZ+oiBCEKz/uwF9VwTl0XNYrcgsQwIh+qBk6JcB2TGSguRM7KtGcLSq/91+lqFvR9PWjP2pvnTJgyfO2cA==
 
-"@rjsf/material-ui@^5.7.3":
+"@rjsf/material-ui@^5.18.2":
   version "5.18.3"
   resolved "https://registry.yarnpkg.com/@rjsf/material-ui/-/material-ui-5.18.3.tgz#fa0405752c023779c24db9125b340824b287d898"
   integrity sha512-H4Ed0qPtUjP8BesBXvM82W1zK3c4SFGToiEefE35EN49yOn4E5ERk5kDmVoBNMlalcN2rE4w08b0FuL0vQt9SA==
@@ -9548,17 +9548,6 @@
     lodash-es "^4.17.21"
     react-is "^18.2.0"
 
-"@rjsf/utils@5.7.3":
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/@rjsf/utils/-/utils-5.7.3.tgz#715e14011d5740a1c3c60589ac6fa73710ac7f25"
-  integrity sha512-4bUJE4u1A7/wGupiOIKicm50QJ5iJ+C9Zq27EKnk7TeKKIr2MLdg3ljYSV7aKp2ZiGX6CFtXBX3RpaTjugpKAw==
-  dependencies:
-    json-schema-merge-allof "^0.8.1"
-    jsonpointer "^5.0.1"
-    lodash "^4.17.21"
-    lodash-es "^4.17.21"
-    react-is "^18.2.0"
-
 "@rjsf/utils@^5.18.2":
   version "5.18.3"
   resolved "https://registry.yarnpkg.com/@rjsf/utils/-/utils-5.18.3.tgz#a5c00aadd679098cab88b994e188851f426392c7"