chore(core): Fix a batch of circular dependencies (#9545)

* chore(core): Fix circular dependencies

* chore(core): Circular deps in pipeline module

* chore(core): Fix circular dependencies

packages/core/src/application/config/dataSources/applicationDataSourceEditor.component.ts

@@ -1,7 +1,7 @@
 import { IController, module } from 'angular';
 
 import { Application } from '../../application.model';
-import { TaskReader } from '../../../index';
+import { TaskReader } from '../../../task';
 import { ApplicationReader } from '../../service/ApplicationReader';
 import { ApplicationWriter } from '../../service/ApplicationWriter';
 import { ApplicationDataSource } from '../../service/applicationDataSource';

packages/core/src/pipeline/config/preconditions/types/stageStatus/StageStatusPreconditionConfig.tsx

@@ -3,8 +3,8 @@ import { get } from 'lodash';
 import React from 'react';
 import { react2angular } from 'react2angular';
 
-import { FormField, IStage, ReactSelectInput } from '../../../../../index';
-import { withErrorBoundary } from '../../../../../presentation/SpinErrorBoundary';
+import { IStage } from '../../../../../domain';
+import { FormField, ReactSelectInput, withErrorBoundary } from '../../../../../presentation';
 import { STATUS_OPTIONS } from './stageStatusOptions';
 
 interface IStageStatusPreconditionConfigProps {

packages/core/src/pipeline/config/stages/awsCodeBuild/AwsCodeBuildStageConfig.tsx

@@ -1,9 +1,11 @@
 import { cloneDeep } from 'lodash';
 import React from 'react';
 
+import { IStage } from '../../../../domain';
+import { IStageConfigProps } from '../common';
 import { AwsCodeBuildStageForm } from './AwsCodeBuildStageForm';
 import { validate } from './AwsCodeBuildValidator';
-import { FormikStageConfig, IFormikStageConfigInjectedProps, IStage, IStageConfigProps } from '../../../../index';
+import { FormikStageConfig, IFormikStageConfigInjectedProps } from '../FormikStageConfig';
 
 export function AwsCodeBuildStageConfig({ application, pipeline, stage, updateStage }: IStageConfigProps) {
   const stageWithDefaults: IStage = React.useMemo(() => {

packages/core/src/pipeline/config/stages/awsCodeBuild/AwsCodeBuildStageForm.tsx

@@ -3,22 +3,23 @@ import React from 'react';
 
 import { AwsCodeBuildSecondarySourcesVersionList, AwsCodeBuildSourceList } from './AwsCodeBuildSourceList';
 import { EXCLUDED_ARTIFACT_TYPES, IAwsCodeBuildSource, SOURCE_TYPES } from './IAwsCodeBuildSource';
-import {
+
+import { StageArtifactSelector } from '../../../../artifact'; 
+import { IgorService } from '../../../../ci';
+import { IArtifact, IExpectedArtifact } from '../../../../domain';
+import { MapEditorInput } from '../../../../forms'; 
+import { HelpField } from '../../../../help';
+import { 
+  CheckboxInput, 
   FormikFormField,
-  HelpField,
-  IArtifact,
-  IExpectedArtifact,
-  IFormikStageConfigInjectedProps,
   IFormInputProps,
-  IgorService,
-  MapEditorInput,
-  ReactSelectInput,
-  StageArtifactSelector,
-  TextInput,
-  useData,
-  YamlEditor,
-} from '../../../../index';
-import { CheckboxInput } from '../../../../presentation';
+  ReactSelectInput, 
+  TextInput, 
+  useData 
+} from '../../../../presentation';
+import { YamlEditor } from '../../../../yamlEditor'; 
+import { IFormikStageConfigInjectedProps } from '../FormikStageConfig';
+
 
 export function AwsCodeBuildStageForm(props: IFormikStageConfigInjectedProps) {
   const stage = props.formik.values;

packages/core/src/pipeline/config/stages/awsCodeBuild/AwsCodeBuildValidator.ts

@@ -1,4 +1,6 @@
-import { FormValidator, IContextualValidator, IStage } from '../../../../index';
+import { IStage } from '../../../../domain';
+import { FormValidator } from '../../../../presentation'
+import { IContextualValidator } from '../FormikStageConfig';
 
 export const validate: IContextualValidator = (stage: IStage) => {
   const formValidator = new FormValidator(stage);

packages/core/src/pipeline/config/stages/awsCodeBuild/EditAwsCodeBuildSecondarySourceVersionModal.tsx

@@ -2,10 +2,17 @@ import { Form, Formik } from 'formik';
 import React from 'react';
 import { Modal } from 'react-bootstrap';
 
+import { HelpField } from '../../../../help';
+import { ModalClose, SubmitButton } from '../../../../modal';
+import { 
+  FormikFormField,
+  IFormInputProps,
+  ReactModal,
+  SpinFormik,
+  TextInput
+} from '../../../../presentation';
 import { IEditAwsCodeBuildSourceModalProps } from './EditAwsCodeBuildSourceModal';
 import { IAwsCodeBuildSecondarySourcesVersion } from './IAwsCodeBuildSource';
-import { FormikFormField, HelpField, IFormInputProps, ReactModal, SpinFormik, TextInput } from '../../../../index';
-import { ModalClose, SubmitButton } from '../../../../modal';
 
 export class EditAwsCodeBuildSecondarySourceVersionModal extends React.Component<IEditAwsCodeBuildSourceModalProps> {
   private formikRef = React.createRef<Formik<any>>();

packages/core/src/pipeline/config/stages/awsCodeBuild/EditAwsCodeBuildSourceModal.tsx

@@ -3,29 +3,31 @@ import { get } from 'lodash';
 import React from 'react';
 import { Modal } from 'react-bootstrap';
 
+import { StageArtifactSelector } from '../../../../artifact';
 import {
-  EXCLUDED_ARTIFACT_TYPES,
-  IAwsCodeBuildSecondarySourcesVersion,
-  IAwsCodeBuildSource,
-  SOURCE_TYPES,
-} from './IAwsCodeBuildSource';
-import {
-  FormikFormField,
-  FormValidator,
-  HelpField,
   IArtifact,
   IExpectedArtifact,
+  IPipeline,
+  IStage
+} from '../../../../domain';
+import { HelpField } from '../../../../help';
+import { ModalClose, SubmitButton } from '../../../../modal';
+import { 
+  FormikFormField,
+  FormValidator,
   IFormInputProps,
   IModalComponentProps,
-  IPipeline,
-  IStage,
   ReactModal,
   ReactSelectInput,
   SpinFormik,
-  StageArtifactSelector,
-  TextInput,
-} from '../../../../index';
-import { ModalClose, SubmitButton } from '../../../../modal';
+  TextInput
+} from '../../../../presentation';
+import {
+  EXCLUDED_ARTIFACT_TYPES,
+  IAwsCodeBuildSecondarySourcesVersion,
+  IAwsCodeBuildSource,
+  SOURCE_TYPES,
+} from './IAwsCodeBuildSource';
 
 export interface IEditAwsCodeBuildSourceModalProps extends IModalComponentProps {
   source: IAwsCodeBuildSource;

packages/core/src/pipeline/config/stages/awsCodeBuild/IAwsCodeBuildSource.tsx

@@ -1,4 +1,5 @@
-import { ArtifactTypePatterns, excludeAllTypesExcept, IArtifact } from '../../../../index';
+import { ArtifactTypePatterns, excludeAllTypesExcept } from '../../../../artifact';
+import { IArtifact } from '../../../../domain';
 
 export interface IAwsCodeBuildSource {
   type?: string;

packages/core/src/pipeline/config/stages/awsCodeBuild/awsCodeBuildStage.ts

@@ -1,7 +1,8 @@
+import { Registry } from '../../../../registry';
+import { ExecutionDetailsTasks } from '../common';
 import { AwsCodeBuildExecutionDetails } from './AwsCodeBuildExecutionDetails';
 import { AwsCodeBuildStageConfig } from './AwsCodeBuildStageConfig';
 import { validate } from './AwsCodeBuildValidator';
-import { ExecutionDetailsTasks, Registry } from '../../../../index';
 
 Registry.pipeline.registerStage({
   label: 'AWS CodeBuild',

packages/core/src/pipeline/config/stages/bakeManifest/BakeManifestDetailsTab.tsx

@@ -1,14 +1,11 @@
 import React from 'react';
 
-import {
-  decodeUnicodeBase64,
-  ExecutionDetailsSection,
-  IArtifact,
-  IExecutionDetailsSectionProps,
-  ManifestYaml,
-  Overridable,
-  StageFailureMessage,
-} from '../../../../index';
+import { IArtifact } from '../../../../domain';
+import { ManifestYaml } from '../../../../manifest';
+import { Overridable } from '../../../../overrideRegistry';
+import { decodeUnicodeBase64 } from '../../../../utils';
+import { StageFailureMessage } from '../../../details';
+import { ExecutionDetailsSection, IExecutionDetailsSectionProps } from '../common';
 
 @Overridable('bakeManifest.bakeManifestDetailsTab')
 export class BakeManifestDetailsTab extends React.Component<IExecutionDetailsSectionProps> {

packages/core/src/pipeline/config/stages/findArtifactFromExecution/findArtifactFromExecution.controller.ts

@@ -1,12 +1,9 @@
 import { IController, IScope } from 'angular';
 
-import {
-  ApplicationReader,
-  ExpectedArtifactService,
-  IExpectedArtifact,
-  IPipeline,
-  PipelineConfigService,
-} from '../../../../index';
+import { ApplicationReader } from '../../../../application';
+import { ExpectedArtifactService } from '../../../../artifact';
+import { IExpectedArtifact, IPipeline } from '../../../../domain';
+import { PipelineConfigService } from '../../services/PipelineConfigService';
 
 export interface IFindArtifactFromExecutionStage {
   application: string;

packages/core/src/pipeline/config/stages/googleCloudBuild/GoogleCloudBuildStageConfig.tsx

@@ -1,10 +1,11 @@
 import { cloneDeep } from 'lodash';
 import React from 'react';
 
+import { IStageConfigProps } from '../common';
+import { FormikStageConfig, IFormikStageConfigInjectedProps } from '../FormikStageConfig';
 import { GoogleCloudBuildStageForm } from './GoogleCloudBuildStageForm';
 import { BuildDefinitionSource, IGoogleCloudBuildStage } from './IGoogleCloudBuildStage';
 import { validate } from './googleCloudBuildValidators';
-import { FormikStageConfig, IFormikStageConfigInjectedProps, IStageConfigProps } from '../../../../index';
 
 export function GoogleCloudBuildStageConfig({ application, pipeline, stage, updateStage }: IStageConfigProps) {
   const stageWithDefaults: IGoogleCloudBuildStage = React.useMemo(() => {

packages/core/src/pipeline/config/stages/googleCloudBuild/GoogleCloudBuildStageForm.tsx

@@ -2,26 +2,22 @@ import { get } from 'lodash';
 import React from 'react';
 import { Option } from 'react-select';
 
-import { BuildDefinitionSource, TriggerType } from './IGoogleCloudBuildStage';
+import { ArtifactTypePatterns, excludeAllTypesExcept, StageArtifactSelectorDelegate } from '../../../../artifact';
+import { IgorService } from '../../../../ci';
+import { IArtifact, IExpectedArtifact } from '../../../../domain';
 import {
-  ArtifactTypePatterns,
-  excludeAllTypesExcept,
   FormikFormField,
   FormikSpelContextProvider,
-  IArtifact,
-  IExpectedArtifact,
-  IFormikStageConfigInjectedProps,
   IFormInputProps,
-  IgorService,
   RadioButtonInput,
   ReactSelectInput,
   SpelService,
-  StageArtifactSelectorDelegate,
   TextInput,
   useData,
-  yamlDocumentsToString,
-  YamlEditor,
-} from '../../../../index';
+} from '../../../../presentation';
+import { yamlDocumentsToString, YamlEditor } from '../../../../yamlEditor';
+import { IFormikStageConfigInjectedProps } from '../FormikStageConfig';
+import { BuildDefinitionSource, TriggerType } from './IGoogleCloudBuildStage';
 
 const SOURCE_OPTIONS: Array<Option<string>> = [
   { value: BuildDefinitionSource.TEXT, label: 'Text' },

packages/core/src/pipeline/config/stages/googleCloudBuild/googleCloudBuildStage.ts

@@ -1,13 +1,9 @@
+import { ArtifactReferenceService, ExecutionArtifactTab, ExpectedArtifactService } from '../../../../artifact';
+import { Registry } from '../../../../registry';
+import { ExecutionDetailsTasks } from '../common';
 import { GoogleCloudBuildExecutionDetails } from './GoogleCloudBuildExecutionDetails';
 import { GoogleCloudBuildStageConfig } from './GoogleCloudBuildStageConfig';
 import { validate } from './googleCloudBuildValidators';
-import {
-  ArtifactReferenceService,
-  ExecutionArtifactTab,
-  ExecutionDetailsTasks,
-  ExpectedArtifactService,
-  Registry,
-} from '../../../../index';
 
 Registry.pipeline.registerStage({
   label: 'Google Cloud Build',

packages/core/src/pipeline/config/stages/googleCloudBuild/googleCloudBuildValidators.ts

@@ -1,5 +1,7 @@
+import { IStage } from '../../../../domain';
+import { FormValidator } from '../../../../presentation';
+import { IContextualValidator } from '../FormikStageConfig';
 import { BuildDefinitionSource } from './IGoogleCloudBuildStage';
-import { FormValidator, IContextualValidator, IStage } from '../../../../index';
 
 export const validate: IContextualValidator = (stage: IStage) => {
   const formValidator = new FormValidator(stage);

packages/core/src/pipeline/config/stages/savePipelines/SavePipelinesStageConfig.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 
+import { StageArtifactSelector } from '../../../../artifact';
+import { IArtifact, IExpectedArtifact } from '../../../../domain';
 import { IStageConfigProps, StageConfigField } from '../common';
-import { IArtifact, IExpectedArtifact, StageArtifactSelector } from '../../../../index';
 
 export const SavePipelinesStageConfig: React.SFC<IStageConfigProps> = (props) => {
   const { stage, pipeline } = props;

packages/core/src/serverGroup/configure/common/wizard/fields/ServerGroupDetailsField.tsx

@@ -1,7 +1,10 @@
 import { FormikProps } from 'formik';
 import React from 'react';
 
-import { Application, HelpField, IServerGroupCommand, Overridable } from '../../../../../index';
+import { HelpField } from '../../../../../help';
+import { Overridable } from '../../../../../overrideRegistry';
+import { IServerGroupCommand } from '../../serverGroupCommandBuilder.service';
+import { Application } from '../../../../../application';
 
 export interface DetailsFieldProps<T extends IServerGroupCommand> {
   app: Application;

packages/core/src/serverGroup/details/scalingActivities/viewScalingActivitiesLink.component.ts

@@ -2,7 +2,7 @@ import { module } from 'angular';
 import { react2angular } from 'react2angular';
 
 import { ViewScalingActivitiesLink } from './ViewScalingActivitiesLink';
-import { withErrorBoundary } from '../../../index';
+import { withErrorBoundary } from '../../../presentation';
 
 export const VIEW_SCALING_ACTIVITIES_LINK = 'spinnaker.core.serverGroup.details.viewScalingActivities.link';
 

packages/core/src/slack/SlackChannelSelector.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Option } from 'react-select';
 
+import { ReactSelectInput, useLatestPromise } from '../presentation';
 import { ISlackChannel, SlackReader } from './SlackReader';
-import { ReactSelectInput, useLatestPromise } from '../index';
 
 export interface ISlackChannelSelectorProps {
   channel: ISlackChannel;

packages/core/src/slack/SlackReader.ts

@@ -1,4 +1,4 @@
-import { REST } from '../index';
+import { REST } from '../api';
 
 export interface ISlackChannel {
   id: string;