diff --git a/plugins/circleci/src/components/App.tsx b/plugins/circleci/src/components/App.tsx
index 46b70cb500..1649c01b70 100644
--- a/plugins/circleci/src/components/App.tsx
+++ b/plugins/circleci/src/components/App.tsx
@@ -14,9 +14,9 @@
* limitations under the License.
*/
import React from 'react';
-import { Switch, Route } from 'react-router';
-import { BuildsPage } from '../pages/BuildsPage';
-import { DetailedViewPage } from '../pages/BuildWithStepsPage';
+import { Switch, Route, MemoryRouter } from 'react-router';
+import { BuildsPage, Builds } from '../pages/BuildsPage';
+import { DetailedViewPage, BuildWithSteps } from '../pages/BuildWithStepsPage';
import { AppStateProvider } from '../state';
import { Settings } from './Settings';
@@ -37,3 +37,24 @@ export const App = () => {
);
};
+
+// TODO: allow pass in settings as props
+// When some shared settings workflow
+// will be established
+export const CircleCIWidget = () => (
+
+
+ <>
+
+
+
+
+
+ >
+
+
+);
diff --git a/plugins/circleci/src/index.ts b/plugins/circleci/src/index.ts
index 33b8fe0067..69fdf02416 100644
--- a/plugins/circleci/src/index.ts
+++ b/plugins/circleci/src/index.ts
@@ -17,3 +17,4 @@
export { plugin } from './plugin';
export * from './api';
export * from './proxy';
+export { CircleCIWidget } from './components/App';
diff --git a/plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx b/plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx
index 041c495c90..24ef39a05c 100644
--- a/plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx
+++ b/plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx
@@ -92,7 +92,15 @@ const pickClassName = (
return classes.neutral;
};
-const BuildWithStepsPage: FC<{}> = () => {
+const Page = () => (
+
+
+
+
+
+);
+
+const BuildWithSteps: FC<{}> = () => {
const { buildId = '' } = useParams();
const classes = useStyles();
const [settings] = useSettings();
@@ -106,23 +114,21 @@ const BuildWithStepsPage: FC<{}> = () => {
}, [buildId, settings]);
return (
-
-
-
+ <>
+
-
-
- }
- cardClassName={classes.cardContent}
- >
- {loading ? : }
-
-
+
+
+ }
+ cardClassName={classes.cardContent}
+ >
+ {loading ? : }
+
-
-
+
+ >
);
};
@@ -156,4 +162,5 @@ const ActionsList: FC<{ actions: BuildStepAction[]; name: string }> = ({
);
};
-export default BuildWithStepsPage;
+export default Page;
+export { BuildWithSteps };
diff --git a/plugins/circleci/src/pages/BuildWithStepsPage/index.ts b/plugins/circleci/src/pages/BuildWithStepsPage/index.ts
index 2fb1f48e12..fddff7088c 100644
--- a/plugins/circleci/src/pages/BuildWithStepsPage/index.ts
+++ b/plugins/circleci/src/pages/BuildWithStepsPage/index.ts
@@ -13,4 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-export { default as DetailedViewPage } from './BuildWithStepsPage';
+export {
+ default as DetailedViewPage,
+ BuildWithSteps,
+} from './BuildWithStepsPage';
diff --git a/plugins/circleci/src/pages/BuildsPage/BuildsPage.tsx b/plugins/circleci/src/pages/BuildsPage/BuildsPage.tsx
index 01593ebf4d..7b124c03c1 100644
--- a/plugins/circleci/src/pages/BuildsPage/BuildsPage.tsx
+++ b/plugins/circleci/src/pages/BuildsPage/BuildsPage.tsx
@@ -16,21 +16,28 @@
import React, { FC } from 'react';
import { Content } from '@backstage/core';
import { Grid } from '@material-ui/core';
-import { Builds } from './lib/Builds';
+import { Builds as BuildsComp } from './lib/Builds';
import { Layout } from '../../components/Layout';
import { PluginHeader } from '../../components/PluginHeader';
const BuildsPage: FC<{}> = () => (
-
-
-
-
-
-
+
);
+const Builds = () => (
+ <>
+
+
+
+
+
+
+ >
+);
+
export default BuildsPage;
+export { Builds };
diff --git a/plugins/circleci/src/pages/BuildsPage/index.ts b/plugins/circleci/src/pages/BuildsPage/index.ts
index 9b555f0f12..72b46d6bc9 100644
--- a/plugins/circleci/src/pages/BuildsPage/index.ts
+++ b/plugins/circleci/src/pages/BuildsPage/index.ts
@@ -13,4 +13,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-export { default as BuildsPage } from './BuildsPage';
+export { default as BuildsPage, Builds } from './BuildsPage';