Skip to content

Commit

Permalink
fix(angular-ui-bootstrap): Kludge: cast angular-ui-bootstrap default …
Browse files Browse the repository at this point in the history
…import as 'any'

This is due to the way the @types/angular-ui-bootstrap is structured.
There is no default import specified.
In a later version of the typings, there _is_ a default import declared, but the Interfaces are no longer exported (which we use).
Since we're not writing angularjs code anymore, I think this kludge is acceptable.

DefinitelyTyped/DefinitelyTyped#37813 (comment)
  • Loading branch information
christopherthielen authored and mergify[bot] committed Dec 12, 2019
1 parent 08c2b34 commit e4c06a7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { module } from 'angular';
import DOMPurify from 'dompurify';
import { IModalService, IModalSettings } from 'angular-ui-bootstrap';
import ANGULAR_UI_BOOTSTRAP, { IModalService, IModalSettings } from 'angular-ui-bootstrap';
import { CORE_CONFIRMATIONMODAL_CONFIRMATIONMODAL_CONTROLLER } from './confirmationModal.controller';
import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap';

export interface IConfirmationModalParams {
account?: string;
Expand Down Expand Up @@ -69,7 +68,7 @@ export class ConfirmationModalService {
}

export const CONFIRMATION_MODAL_SERVICE = 'spinnaker.core.confirmationModal.service';
module(CONFIRMATION_MODAL_SERVICE, [ANGULAR_UI_BOOTSTRAP, CORE_CONFIRMATIONMODAL_CONFIRMATIONMODAL_CONTROLLER]).service(
'confirmationModalService',
ConfirmationModalService,
);
module(CONFIRMATION_MODAL_SERVICE, [
ANGULAR_UI_BOOTSTRAP as any,
CORE_CONFIRMATIONMODAL_CONFIRMATIONMODAL_CONTROLLER,
]).service('confirmationModalService', ConfirmationModalService);
5 changes: 3 additions & 2 deletions app/scripts/modules/core/src/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ import { CORE_UTILS_UTILS_MODULE } from './utils/utils.module';
import { CORE_VALIDATION_VALIDATION_MODULE } from './validation/validation.module';
import ANGULAR_MESSAGES from 'angular-messages';
import ANGULAR_SANITIZE from 'angular-sanitize';
import { angularSpinner } from 'angular-spinner';
import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap';
import UI_SELECT from 'ui-select';

Expand All @@ -100,9 +101,9 @@ module(CORE_MODULE, [
UI_ROUTER_STATE_EVENTS_SHIM,
UI_ROUTER_REACT_HYBRID,
REACT_MODULE, // must precede modules which register states
ANGULAR_UI_BOOTSTRAP,
ANGULAR_UI_BOOTSTRAP as any,
UI_SELECT,
require('angular-spinner').angularSpinner.name,
angularSpinner.name,

ANALYTICS_MODULE,
APPLICATION_MODULE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IController, IPromise, module } from 'angular';
import { IModalInstanceService } from 'angular-ui-bootstrap';
import ANGULAR_UI_BOOTSTRAP, { IModalInstanceService } from 'angular-ui-bootstrap';

import { Application, ILoadBalancerDeleteCommand, LoadBalancerWriter, TaskMonitor } from '@spinnaker/core';

Expand All @@ -8,7 +8,6 @@ import {
GceHttpLoadBalancerUtils,
} from 'google/loadBalancer/httpLoadBalancerUtils.service';
import { GOOGLE_LOADBALANCER_CONFIGURE_HTTP_HTTPLOADBALANCER_WRITE_SERVICE } from '../../configure/http/httpLoadBalancer.write.service';
import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap';

class Verification {
public verified = false;
Expand Down Expand Up @@ -99,7 +98,7 @@ class DeleteLoadBalancerModalController implements IController {

export const DELETE_MODAL_CONTROLLER = 'spinnaker.gce.loadBalancer.deleteModal.controller';
module(DELETE_MODAL_CONTROLLER, [
ANGULAR_UI_BOOTSTRAP,
ANGULAR_UI_BOOTSTRAP as any,
GOOGLE_LOADBALANCER_CONFIGURE_HTTP_HTTPLOADBALANCER_WRITE_SERVICE,
GCE_HTTP_LOAD_BALANCER_UTILS,
]).controller('gceLoadBalancerDeleteModalCtrl', DeleteLoadBalancerModalController);
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IController, module } from 'angular';
import { IModalServiceInstance } from 'angular-ui-bootstrap';
import { StateService } from '@uirouter/angularjs';
import ANGULAR_UI_BOOTSTRAP, { IModalServiceInstance } from 'angular-ui-bootstrap';
import UIROUTER_ANGULARJS, { StateService } from '@uirouter/angularjs';

import { trimEnd } from 'lodash';

Expand Down Expand Up @@ -32,8 +32,6 @@ import {
ORACLE_LOAD_BALANCER_TRANSFORMER,
OracleLoadBalancerTransformer,
} from 'oracle/loadBalancer/loadBalancer.transformer';
import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap';
import UIROUTER_ANGULARJS from '@uirouter/angularjs';

export class OracleLoadBalancerController implements IController {
public oracle = 'oracle';
Expand Down Expand Up @@ -499,7 +497,7 @@ export class OracleLoadBalancerController implements IController {

export const ORACLE_LOAD_BALANCER_CREATE_CONTROLLER = 'spinnaker.oracle.loadBalancer.create.controller';
module(ORACLE_LOAD_BALANCER_CREATE_CONTROLLER, [
ANGULAR_UI_BOOTSTRAP,
ANGULAR_UI_BOOTSTRAP as any,
UIROUTER_ANGULARJS,
ORACLE_LOAD_BALANCER_TRANSFORMER,
]).controller('oracleCreateLoadBalancerCtrl', OracleLoadBalancerController);
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { IController, module } from 'angular';

import * as angular from 'angular';
import angular, { IController, module } from 'angular';

import {
Application,
Expand All @@ -12,13 +10,11 @@ import {
FirewallLabels,
} from '@spinnaker/core';

import { StateService } from '@uirouter/angularjs';
import { IModalService } from 'angular-ui-bootstrap';
import UIROUTER_ANGULARJS, { StateService } from '@uirouter/angularjs';
import ANGULAR_UI_BOOTSTRAP, { IModalService } from 'angular-ui-bootstrap';
import { IOracleLoadBalancer, ILoadBalancerDetails } from 'oracle/domain/IOracleLoadBalancer';
import { sortBy } from 'lodash';
import { OracleLoadBalancerController } from 'oracle/loadBalancer/configure/createLoadBalancer.controller';
import UIROUTER_ANGULARJS from '@uirouter/angularjs';
import ANGULAR_UI_BOOTSTRAP from 'angular-ui-bootstrap';

export class OracleLoadBalancerDetailController implements IController {
public static $inject = [
Expand Down Expand Up @@ -169,7 +165,7 @@ export class OracleLoadBalancerDetailController implements IController {
}

export const ORACLE_LOAD_BALANCER_DETAIL_CONTROLLER = 'spinnaker.oracle.loadBalancerDetail.controller';
module(ORACLE_LOAD_BALANCER_DETAIL_CONTROLLER, [UIROUTER_ANGULARJS, ANGULAR_UI_BOOTSTRAP]).controller(
module(ORACLE_LOAD_BALANCER_DETAIL_CONTROLLER, [UIROUTER_ANGULARJS, ANGULAR_UI_BOOTSTRAP as any]).controller(
'oracleLoadBalancerDetailCtrl',
OracleLoadBalancerDetailController,
);

0 comments on commit e4c06a7

Please sign in to comment.