diff --git a/app/scripts/modules/amazon/src/loadBalancer/configure/common/LoadBalancerLocation.tsx b/app/scripts/modules/amazon/src/loadBalancer/configure/common/LoadBalancerLocation.tsx index 38fc482422b..a7c159fa3ea 100644 --- a/app/scripts/modules/amazon/src/loadBalancer/configure/common/LoadBalancerLocation.tsx +++ b/app/scripts/modules/amazon/src/loadBalancer/configure/common/LoadBalancerLocation.tsx @@ -5,6 +5,7 @@ import { chain, find, isEqual, isNil, trimEnd, uniq } from 'lodash'; import { Field, FormikErrors } from 'formik'; import { + AccountSelectField, AccountService, Application, HelpField, @@ -14,7 +15,6 @@ import { ISubnet, IWizardPageProps, NameUtils, - NgReact, RegionSelectField, Spinner, SubnetReader, @@ -311,7 +311,6 @@ class LoadBalancerLocationImpl extends React.Component
diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/artifactSettings.cf.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/artifactSettings.cf.tsx index f8bc8a73e61..08809e7bbf5 100644 --- a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/artifactSettings.cf.tsx +++ b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/artifactSettings.cf.tsx @@ -4,6 +4,7 @@ import { FormikErrors } from 'formik'; import Select, { Option } from 'react-select'; import { + AccountSelectField, AccountService, HelpField, IAccountDetails, @@ -12,7 +13,6 @@ import { IRegion, wizardPage, RegionSelectField, - NgReact, ValidationMessage, } from '@spinnaker/core'; @@ -254,7 +254,6 @@ class ArtifactSettingsImpl extends React.Component< const { values, errors } = this.props.formik; const { artifact } = values; const { regions, filteredClusters, serverGroups, allCloudFoundryCredentials } = this.state; - const { AccountSelectField } = NgReact; return (
diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/basicSettings.cf.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/basicSettings.cf.tsx index 2f85d0e2c2a..566d4ac2d91 100644 --- a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/basicSettings.cf.tsx +++ b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/sections/basicSettings.cf.tsx @@ -4,12 +4,12 @@ import { FormikErrors } from 'formik'; import Select, { Option } from 'react-select'; import { + AccountSelectField, AccountService, IAccount, IDeploymentStrategy, IRegion, IWizardPageProps, - NgReact, wizardPage, HelpField, RegionSelectField, @@ -111,7 +111,6 @@ class BasicSettingsImpl extends React.Component< public render(): JSX.Element { const { accounts, regions } = this.state; const { values, errors } = this.props.formik; - const { AccountSelectField } = NgReact; return (
diff --git a/app/scripts/modules/core/src/account/account.module.js b/app/scripts/modules/core/src/account/account.module.js index 720f119b638..a605d3a95e4 100644 --- a/app/scripts/modules/core/src/account/account.module.js +++ b/app/scripts/modules/core/src/account/account.module.js @@ -1,6 +1,5 @@ 'use strict'; -import { ACCOUNT_SELECT_FIELD_WRAPPER } from './accountSelectFieldWrapper.component'; import { ACCOUNT_TAG_COMPONENT } from './accountTag.component'; const angular = require('angular'); @@ -9,6 +8,5 @@ module.exports = angular.module('spinnaker.core.account', [ require('./providerToggles.directive').name, require('./accountSelectField.directive').name, require('./collapsibleAccountTag.directive').name, - ACCOUNT_SELECT_FIELD_WRAPPER, ACCOUNT_TAG_COMPONENT, ]); diff --git a/app/scripts/modules/core/src/account/accountSelectFieldWrapper.component.ts b/app/scripts/modules/core/src/account/accountSelectFieldWrapper.component.ts deleted file mode 100644 index f94b9f03a8d..00000000000 --- a/app/scripts/modules/core/src/account/accountSelectFieldWrapper.component.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { IComponentOptions, module } from 'angular'; - -export class AccountSelectFieldWrapperComponent implements IComponentOptions { - public bindings: any = { - accounts: '<', - component: '<', - field: '<', - provider: '<', - loading: '<', - onChange: '<', - labelColumns: '<', - readOnly: '<', - multiselect: '<', - }; - public template = ` - - - `; -} - -export const ACCOUNT_SELECT_FIELD_WRAPPER = 'spinnaker.core.account.accountSelectFieldWrapper.component'; -module(ACCOUNT_SELECT_FIELD_WRAPPER, []).component( - 'accountSelectFieldWrapper', - new AccountSelectFieldWrapperComponent(), -); diff --git a/app/scripts/modules/core/src/reactShims/ngReact.ts b/app/scripts/modules/core/src/reactShims/ngReact.ts index a901aef1006..739709a4cea 100644 --- a/app/scripts/modules/core/src/reactShims/ngReact.ts +++ b/app/scripts/modules/core/src/reactShims/ngReact.ts @@ -2,7 +2,6 @@ import * as React from 'react'; import { angular2react } from 'angular2react'; import IInjectorService = angular.auto.IInjectorService; -import { AccountSelectFieldWrapperComponent } from '../account/accountSelectFieldWrapper.component'; import { AddEntityTagLinksWrapperComponent } from 'core/entityTag/addEntityTagLinks.component'; import { ButtonBusyIndicatorComponent } from '../forms/buttonBusyIndicator/buttonBusyIndicator.component'; import { CopyToClipboardComponent } from '../utils/clipboard/copyToClipboard.component'; @@ -10,7 +9,6 @@ import { DeploymentStrategySelectorWrapper } from 'core/deploymentStrategy/deplo import { IDiffViewProps } from '../pipeline/config/actions/history/DiffView'; import { EntitySourceComponent } from 'core/entityTag/entitySource.component'; import { HelpFieldWrapperComponent } from '../help/helpField.component'; -import { IAccountSelectFieldProps } from 'core/account/AccountSelectField'; import { IAddEntityTagLinksProps } from 'core/entityTag/AddEntityTagLinks'; import { IButtonBusyIndicatorProps } from '../forms/buttonBusyIndicator/ButtonBusyIndicator'; import { ICopyToClipboardProps } from '../utils/clipboard/CopyToClipboard'; @@ -43,7 +41,6 @@ export class NgReactInjector extends ReactInject { public $injectorProxy = {} as IInjectorService; // Reactified components - public AccountSelectField: React.ComponentClass = angular2react('accountSelectFieldWrapper', new AccountSelectFieldWrapperComponent(), this.$injectorProxy) as any; public AddEntityTagLinks: React.ComponentClass = angular2react('addEntityTagLinksWrapper', new AddEntityTagLinksWrapperComponent(), this.$injectorProxy) as any; public ButtonBusyIndicator: React.ComponentClass = angular2react('buttonBusyIndicator', new ButtonBusyIndicatorComponent(), this.$injectorProxy) as any; public CopyToClipboard: React.ComponentClass = angular2react('copyToClipboard', new CopyToClipboardComponent(), this.$injectorProxy) as any; diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx index 756cec152fb..f4df0d3ba0d 100644 --- a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx +++ b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { FormikErrors } from 'formik'; -import { NgReact, HelpField, IWizardPageProps, wizardPage, Application } from '@spinnaker/core'; +import { AccountSelectField, HelpField, IWizardPageProps, wizardPage, Application } from '@spinnaker/core'; import { IKubernetesManifestCommandData } from 'kubernetes/v2/manifest/manifestCommandBuilder.service'; @@ -24,7 +24,6 @@ class ManifestBasicSettingsImpl extends React.Component