chore: Move supporting classes to support folder

As preparation to reorganize Visual entities classes, the first step is to move the non-visual classes to the `support` folder.
KaotoIO · Mar 21, 2024 · 762c337 · 762c337
1 parent d6e068f
commit 762c337
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/packages/ui/src/components/Visualization/ContextToolbar/FlowType/NewFlow.tsx b/packages/ui/src/components/Visualization/ContextToolbar/FlowType/NewFlow.tsx
@@ -3,7 +3,7 @@ import { PlusIcon } from '@patternfly/react-icons';
 import { FunctionComponent, PropsWithChildren, useCallback, useContext, useState } from 'react';
 import { useEntityContext } from '../../../../hooks/useEntityContext/useEntityContext';
 import { SourceSchemaType } from '../../../../models/camel';
-import { FlowTemplateService } from '../../../../models/visualization/flows/flow-templates-service';
+import { FlowTemplateService } from '../../../../models/visualization/flows/support/flow-templates-service';
 import { SourceCodeApiContext } from '../../../../providers';
 import { VisibleFlowsContext } from '../../../../providers/visible-flows.provider';
 import { FlowTypeSelector } from './FlowTypeSelector';

diff --git a/packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsList.test.tsx b/packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsList.test.tsx
@@ -1,11 +1,11 @@
-import { FlowsList } from './FlowsList';
 import { act, fireEvent, render } from '@testing-library/react';
+import { EntitiesContextResult } from '../../../../hooks';
 import { SourceSchemaType } from '../../../../models/camel';
 import { CamelRouteVisualEntity } from '../../../../models/visualization/flows';
+import { IVisibleFlows, VisualFlowsApi } from '../../../../models/visualization/flows/support/flows-visibility';
 import { EntitiesContext } from '../../../../providers/entities.provider';
-import { EntitiesContextResult } from '../../../../hooks';
-import { IVisibleFlows, VisualFlowsApi } from '../../../../models/visualization/flows/flows-visibility';
-import { VisibleFlowsContext, VisibleFLowsContextResult } from '../../../../providers/visible-flows.provider';
+import { VisibleFLowsContextResult, VisibleFlowsContext } from '../../../../providers/visible-flows.provider';
+import { FlowsList } from './FlowsList';
 
 const getContextValue = () => {
   return {

diff --git a/packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsMenu.test.tsx b/packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsMenu.test.tsx
@@ -2,7 +2,7 @@ import { act, fireEvent, render } from '@testing-library/react';
 import { EntitiesContextResult } from '../../../../hooks';
 import { SourceSchemaType } from '../../../../models/camel';
 import { CamelRouteVisualEntity } from '../../../../models/visualization/flows';
-import { IVisibleFlows } from '../../../../models/visualization/flows/flows-visibility';
+import { IVisibleFlows } from '../../../../models/visualization/flows/support/flows-visibility';
 import { EntitiesContext } from '../../../../providers/entities.provider';
 import { VisibleFLowsContextResult, VisibleFlowsContext } from '../../../../providers/visible-flows.provider';
 import { FlowsMenu } from './FlowsMenu';

diff --git a/packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsMenu.tsx b/packages/ui/src/components/Visualization/ContextToolbar/Flows/FlowsMenu.tsx
@@ -1,7 +1,7 @@
 import { Badge, Icon, MenuToggle, MenuToggleAction, MenuToggleElement, Select } from '@patternfly/react-core';
 import { ListIcon } from '@patternfly/react-icons';
 import { FunctionComponent, Ref, useCallback, useContext, useState } from 'react';
-import { getVisibleFlowsInformation } from '../../../../models/visualization/flows/flows-visibility';
+import { getVisibleFlowsInformation } from '../../../../models/visualization/flows/support/flows-visibility';
 import { VisibleFlowsContext } from '../../../../providers/visible-flows.provider';
 import { FlowsList } from './FlowsList';
 

diff --git a/packages/ui/src/models/camel/camel-route-resource.ts b/packages/ui/src/models/camel/camel-route-resource.ts
@@ -5,10 +5,10 @@ import { AddStepMode } from '../visualization/base-visual-entity';
 import { CamelRouteVisualEntity, isCamelFrom, isCamelRoute } from '../visualization/flows';
 import { CamelErrorHandlerVisualEntity } from '../visualization/flows/camel-error-handler-visual-entity';
 import { CamelOnExceptionVisualEntity } from '../visualization/flows/camel-on-exception-visual-entity';
-import { FlowTemplateService } from '../visualization/flows/flow-templates-service';
 import { NonVisualEntity } from '../visualization/flows/non-visual-entity';
 import { CamelComponentFilterService } from '../visualization/flows/support/camel-component-filter.service';
 import { CamelRouteVisualEntityData } from '../visualization/flows/support/camel-component-types';
+import { FlowTemplateService } from '../visualization/flows/support/flow-templates-service';
 import { BeansEntity, isBeans } from '../visualization/metadata';
 import { BeansAwareResource, CamelResource } from './camel-resource';
 import { BaseCamelEntity } from './entities';

diff --git a/packages/ui/src/models/camel/kamelet-resource.ts b/packages/ui/src/models/camel/kamelet-resource.ts
@@ -2,17 +2,17 @@ import set from 'lodash/set';
 import { TileFilter } from '../../public-api';
 import { IKameletDefinition } from '../kamelets-catalog';
 import { AddStepMode } from '../visualization/base-visual-entity';
-import { FlowTemplateService } from '../visualization/flows/flow-templates-service';
 import { CamelComponentFilterService } from '../visualization/flows/support/camel-component-filter.service';
 import { CamelRouteVisualEntityData } from '../visualization/flows/support/camel-component-types';
-import { KameletVisualEntity } from './../visualization/flows/kamelet-visual-entity';
-import { CamelKResource } from './camel-k-resource';
-import { SourceSchemaType } from './source-schema-type';
-import { RouteTemplateBeansAwareResource } from './camel-resource';
+import { FlowTemplateService } from '../visualization/flows/support/flow-templates-service';
 import {
   RouteTemplateBeansEntity,
   RouteTemplateBeansParentType,
 } from '../visualization/metadata/routeTemplateBeansEntity';
+import { KameletVisualEntity } from './../visualization/flows/kamelet-visual-entity';
+import { CamelKResource } from './camel-k-resource';
+import { RouteTemplateBeansAwareResource } from './camel-resource';
+import { SourceSchemaType } from './source-schema-type';
 
 export class KameletResource extends CamelKResource implements RouteTemplateBeansAwareResource {
   private flow: KameletVisualEntity;

diff --git a/packages/ui/src/models/camel/pipe-resource.ts b/packages/ui/src/models/camel/pipe-resource.ts
@@ -3,7 +3,7 @@ import { ITile, TileFilter } from '../../components/Catalog/Catalog.models';
 import { CatalogKind } from '../catalog-kind';
 import { AddStepMode, IVisualizationNodeData } from '../visualization/base-visual-entity';
 import { PipeVisualEntity } from '../visualization/flows';
-import { FlowTemplateService } from '../visualization/flows/flow-templates-service';
+import { FlowTemplateService } from '../visualization/flows/support/flow-templates-service';
 import { PipeErrorHandlerEntity } from '../visualization/metadata/pipeErrorHandlerEntity';
 import { CamelKResource } from './camel-k-resource';
 import { BaseCamelEntity, PipeSpecErrorHandler } from './entities';

diff --git a/...alization/flows/flow-templates-service.ts → ...n/flows/support/flow-templates-service.ts b/...alization/flows/flow-templates-service.ts → ...n/flows/support/flow-templates-service.ts
@@ -1,8 +1,8 @@
 import { parse } from 'yaml';
-import { SourceSchemaType } from '../../camel/source-schema-type';
-import { kameletTemplate } from './templates/kamelet';
-import { pipeTemplate } from './templates/pipe';
-import { routeTemplate } from './templates/route';
+import { SourceSchemaType } from '../../../camel/source-schema-type';
+import { kameletTemplate } from '../templates/kamelet';
+import { pipeTemplate } from '../templates/pipe';
+import { routeTemplate } from '../templates/route';
 
 export class FlowTemplateService {
   static getFlowTemplate = (type: SourceSchemaType) => {

diff --git a/...s/visualization/flows/flows-visibility.ts → ...ization/flows/support/flows-visibility.ts b/...s/visualization/flows/flows-visibility.ts → ...ization/flows/support/flows-visibility.ts
diff --git a/packages/ui/src/providers/visible-flows.provider.tsx b/packages/ui/src/providers/visible-flows.provider.tsx
@@ -1,5 +1,9 @@
 import { FunctionComponent, PropsWithChildren, createContext, useContext, useEffect, useMemo, useReducer } from 'react';
-import { IVisibleFlows, VisibleFlowsReducer, VisualFlowsApi } from '../models/visualization/flows/flows-visibility';
+import {
+  IVisibleFlows,
+  VisibleFlowsReducer,
+  VisualFlowsApi,
+} from '../models/visualization/flows/support/flows-visibility';
 import { EntitiesContext } from './entities.provider';
 
 export interface VisibleFLowsContextResult {