chore(orchestrator): reorganize components into folders (#1404)

LiorSoffer · web-flow · commit d87ba9ea4196 · 2025-09-09T10:16:33.000+03:00
Signed-off-by: Lior Soffer &lt;liorsoffer1@gmail.com&gt;
diff --git a/workspaces/orchestrator/.changeset/late-apples-switch.md b/workspaces/orchestrator/.changeset/late-apples-switch.md
@@ -0,0 +1,21 @@
+---
+'@red-hat-developer-hub/backstage-plugin-orchestrator': patch
+---
+
+### Move components to `ui` folder:
+
+- BaseOrchestratorPage
+- InfoDialog
+- Selector
+- WorkflowInstanceStatusIndicator
+- WorkflowStatus
+
+### Move components to `WorkflowInstancePage` folder:
+
+- Paragraph
+- WorkflowDescriptionModal
+- WorkflowRunDetails
+
+### Move types to `types` folder:
+
+- WorkflowRunDetail
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/ExecuteWorkflowPage/ExecuteWorkflowPage.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/ExecuteWorkflowPage/ExecuteWorkflowPage.tsx
@@ -49,7 +49,7 @@ import {
   workflowInstanceRouteRef,
 } from '../../routes';
 import { getErrorObject } from '../../utils/ErrorUtils';
-import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
+import { BaseOrchestratorPage } from '../ui/BaseOrchestratorPage';
 import MissingSchemaNotice from './MissingSchemaNotice';
 import { getSchemaUpdater } from './schemaUpdater';
 
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/InputSchemaDialog.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/InputSchemaDialog.tsx
@@ -29,7 +29,7 @@ import { InputSchemaResponseDTO } from '@red-hat-developer-hub/backstage-plugin-
 import { orchestratorApiRef } from '../../api/api';
 import { FormattedWorkflowOverview } from '../../dataFormatters/WorkflowOverviewFormatter';
 import { useIsDarkMode } from '../../utils/isDarkMode';
-import { InfoDialog } from '../InfoDialog';
+import { InfoDialog } from '../ui/InfoDialog';
 import { JsonCodeBlock } from '../ui/JsonCodeBlock';
 
 const InputSchemaDialogContent = ({
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/OrchestratorPage.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/OrchestratorPage.tsx
@@ -21,7 +21,7 @@ import { makeStyles } from 'tss-react/mui';
 
 import { workflowInstancesRouteRef } from '../../routes';
 import { useIsDarkMode } from '../../utils/isDarkMode';
-import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
+import { BaseOrchestratorPage } from '../ui/BaseOrchestratorPage';
 import { WorkflowRunsTabContent } from './WorkflowRunsTabContent';
 import { WorkflowsTabContent } from './WorkflowsTabContent';
 
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/WorkflowRunsTabContent.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/WorkflowRunsTabContent.tsx
@@ -50,11 +50,11 @@ import {
   workflowInstanceRouteRef,
   workflowRouteRef,
 } from '../../routes';
-import { Selector } from '../Selector';
+import { WorkflowRunDetail } from '../types/WorkflowRunDetail';
 import OverrideBackstageTable from '../ui/OverrideBackstageTable';
+import { Selector } from '../ui/Selector';
+import { WorkflowInstanceStatusIndicator } from '../ui/WorkflowInstanceStatusIndicator';
 import { mapProcessInstanceToDetails } from '../WorkflowInstancePage/WorkflowInstancePageContent';
-import { WorkflowInstanceStatusIndicator } from '../WorkflowInstanceStatusIndicator';
-import { WorkflowRunDetail } from '../WorkflowRunDetail';
 
 const makeSelectItemsFromProcessInstanceValues = (): SelectItem[] => [
   { label: 'Running', value: ProcessInstanceStatusDTO.Active },
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/WorkflowsTable.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/WorkflowsTable.tsx
@@ -49,8 +49,8 @@ import {
   workflowRunsRouteRef,
 } from '../../routes';
 import OverrideBackstageTable from '../ui/OverrideBackstageTable';
-import { WorkflowInstanceStatusIndicator } from '../WorkflowInstanceStatusIndicator';
-import { WorkflowStatus } from '../WorkflowStatus';
+import { WorkflowInstanceStatusIndicator } from '../ui/WorkflowInstanceStatusIndicator';
+import { WorkflowStatus } from '../ui/WorkflowStatus';
 import { InputSchemaDialog } from './InputSchemaDialog';
 
 export interface WorkflowsTableProps {
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/Paragraph.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/Paragraph.tsx
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/VariablesDialog.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/VariablesDialog.tsx
@@ -24,7 +24,7 @@ import {
 } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';
 
 import { useIsDarkMode } from '../../utils/isDarkMode';
-import { InfoDialog } from '../InfoDialog';
+import { InfoDialog } from '../ui/InfoDialog';
 import { JsonCodeBlock } from '../ui/JsonCodeBlock';
 
 export const VariablesDialog = ({
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowDescriptionModal.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowDescriptionModal.tsx
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowInstancePage.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowInstancePage.tsx
@@ -73,8 +73,8 @@ import {
 import { deepSearchObject } from '../../utils/deepSearchObject';
 import { isNonNullable } from '../../utils/TypeGuards';
 import { buildUrl } from '../../utils/UrlUtils';
-import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
-import { InfoDialog } from '../InfoDialog';
+import { BaseOrchestratorPage } from '../ui/BaseOrchestratorPage';
+import { InfoDialog } from '../ui/InfoDialog';
 import { WorkflowInstancePageContent } from './WorkflowInstancePageContent';
 
 const useStyles = makeStyles()(theme => ({
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowInstancePageContent.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowInstancePageContent.tsx
@@ -35,12 +35,12 @@ import {
 
 import { orchestratorApiRef } from '../../api/api';
 import { VALUE_UNAVAILABLE } from '../../constants';
-import { WorkflowRunDetail } from '../WorkflowRunDetail';
-import { WorkflowRunDetails } from '../WorkflowRunDetails';
+import { WorkflowRunDetail } from '../types/WorkflowRunDetail';
 import { VariablesDialog } from './VariablesDialog';
 import { WorkflowInputs } from './WorkflowInputs';
 import { WorkflowProgress } from './WorkflowProgress';
 import { WorkflowResult } from './WorkflowResult';
+import { WorkflowRunDetails } from './WorkflowRunDetails';
 
 export const mapProcessInstanceToDetails = (
   instance: ProcessInstanceDTO,
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowProgress.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowProgress.tsx
@@ -19,7 +19,7 @@ import React from 'react';
 import { ProcessInstanceDTO } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';
 
 import { compareNodes } from '../../utils/NodeInstanceUtils';
-import { Paragraph } from '../Paragraph';
+import { Paragraph } from './Paragraph';
 import { WorkflowProgressNode } from './WorkflowProgressNode';
 import { fromNodeInstanceToWorkflowProgressNodeModel } from './WorkflowProgressNodeModel';
 
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowProgressNode.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowProgressNode.tsx
@@ -29,7 +29,7 @@ import { ProcessInstanceStatusDTO } from '@red-hat-developer-hub/backstage-plugi
 
 import { VALUE_UNAVAILABLE } from '../../constants';
 import { useWorkflowInstanceStateColors } from '../../hooks/useWorkflowInstanceStatusColors';
-import { Paragraph } from '../Paragraph';
+import { Paragraph } from './Paragraph';
 import { WorkflowProgressNodeModel } from './WorkflowProgressNodeModel';
 
 const WorkflowProgressNodeIcon: React.FC<{
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowResult.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowResult.tsx
@@ -49,7 +49,7 @@ import { buildUrl } from '../../utils/UrlUtils';
 import {
   WorkflowDescriptionModal,
   WorkflowDescriptionModalProps,
-} from '../WorkflowDescriptionModal';
+} from './WorkflowDescriptionModal';
 
 const useStyles = makeStyles()(theme => ({
   outputGrid: {
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowRunDetails.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowRunDetails.tsx
@@ -30,12 +30,12 @@ import {
   WorkflowOverviewDTO,
 } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';
 
-import { orchestratorApiRef } from '../api';
-import { VALUE_UNAVAILABLE } from '../constants';
-import { workflowRouteRef } from '../routes';
-import { WorkflowInstanceStatusIndicator } from './WorkflowInstanceStatusIndicator';
-import { WorkflowRunDetail } from './WorkflowRunDetail';
-import { WorkflowStatus } from './WorkflowStatus';
+import { orchestratorApiRef } from '../../api';
+import { VALUE_UNAVAILABLE } from '../../constants';
+import { workflowRouteRef } from '../../routes';
+import { WorkflowRunDetail } from '../types/WorkflowRunDetail';
+import { WorkflowInstanceStatusIndicator } from '../ui/WorkflowInstanceStatusIndicator';
+import { WorkflowStatus } from '../ui/WorkflowStatus';
 
 type WorkflowDetailsCardProps = {
   details: WorkflowRunDetail;
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowPage/WorkflowDetailsCard.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowPage/WorkflowDetailsCard.tsx
@@ -26,7 +26,7 @@ import { makeStyles } from 'tss-react/mui';
 import { WorkflowOverviewDTO } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';
 
 import WorkflowOverviewFormatter from '../../dataFormatters/WorkflowOverviewFormatter';
-import { WorkflowStatus } from '../WorkflowStatus';
+import { WorkflowStatus } from '../ui/WorkflowStatus';
 
 const useStyles = makeStyles()(() => ({
   details: {
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowPage/WorkflowPage.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowPage/WorkflowPage.tsx
@@ -26,8 +26,8 @@ import { makeStyles } from 'tss-react/mui';
 import { orchestratorApiRef } from '../../api';
 import { workflowRouteRef, workflowRunsRoutePath } from '../../routes';
 import { useIsDarkMode } from '../../utils/isDarkMode';
-import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
 import { WorkflowRunsTabContent } from '../OrchestratorPage/WorkflowRunsTabContent';
+import { BaseOrchestratorPage } from '../ui/BaseOrchestratorPage';
 import { RunButton } from './RunButton';
 import { WorkflowDetailsTabContent } from './WorkflowDetailsTabContent';
 
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/catalogComponents/CatalogWorkflowPage.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/catalogComponents/CatalogWorkflowPage.tsx
@@ -23,8 +23,8 @@ import { Grid } from '@material-ui/core';
 
 import { orchestratorApiRef } from '../../api';
 import { entityWorkflowRouteRef } from '../../routes';
-import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
 import { WorkflowRunsTabContent } from '../OrchestratorPage/WorkflowRunsTabContent';
+import { BaseOrchestratorPage } from '../ui/BaseOrchestratorPage';
 import { RunButton } from '../WorkflowPage/RunButton';
 import { WorkflowDetailsTabContent } from '../WorkflowPage/WorkflowDetailsTabContent';
 
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/types/WorkflowRunDetail.ts b/workspaces/orchestrator/plugins/orchestrator/src/components/types/WorkflowRunDetail.ts
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/ui/BaseOrchestratorPage.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/ui/BaseOrchestratorPage.tsx
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/ui/InfoDialog.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/ui/InfoDialog.tsx
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/ui/Selector.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/ui/Selector.tsx
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/ui/WorkflowInstanceStatusIndicator.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/ui/WorkflowInstanceStatusIndicator.tsx
@@ -27,8 +27,8 @@ import {
   ProcessInstanceStatusDTO,
 } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';
 
-import { VALUE_UNAVAILABLE } from '../constants';
-import { useWorkflowInstanceStateColors } from '../hooks/useWorkflowInstanceStatusColors';
+import { VALUE_UNAVAILABLE } from '../../constants';
+import { useWorkflowInstanceStateColors } from '../../hooks/useWorkflowInstanceStatusColors';
 
 export const WorkflowInstanceStatusIndicator = ({
   status,
diff --git a/workspaces/orchestrator/plugins/orchestrator/src/components/ui/WorkflowStatus.tsx b/workspaces/orchestrator/plugins/orchestrator/src/components/ui/WorkflowStatus.tsx
@@ -20,7 +20,7 @@ import Box from '@mui/material/Box';
 import Tooltip from '@mui/material/Tooltip';
 import { makeStyles } from 'tss-react/mui';
 
-import { AVAILABLE, UNAVAILABLE } from '../constants';
+import { AVAILABLE, UNAVAILABLE } from '../../constants';
 
 const useStyles = makeStyles()(theme => ({
   warning: {
