Skip to content

Commit

Permalink
Merge branch 'master' into titus-bake-info
Browse files Browse the repository at this point in the history
  • Loading branch information
caseyhebebrand committed Feb 17, 2021
2 parents 23aaed6 + c008913 commit 8ae991e
Show file tree
Hide file tree
Showing 179 changed files with 2,445 additions and 821 deletions.
2 changes: 1 addition & 1 deletion app/scripts/modules/amazon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@spinnaker/amazon",
"license": "Apache-2.0",
"version": "0.0.289",
"version": "0.0.290",
"main": "lib/lib.js",
"typings": "lib/index.d.ts",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ export class ServerGroupBasicSettings
AWSProviderSettings?.serverGroups?.enableIPv6 &&
AWSProviderSettings?.serverGroups?.setIPv6InTest &&
accountDetails.environment === 'test';
if (enableIPv6InTest) {
setFieldValue('associateIPv6Address', enableIPv6InTest);
}

setFieldValue('associateIPv6Address', enableIPv6InTest);
};

private regionUpdated = (region: string): void => {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@spinnaker/core",
"license": "Apache-2.0",
"version": "0.0.547",
"version": "0.0.549",
"main": "lib/lib.js",
"typings": "lib/index.d.ts",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';

import { Overridable } from '../overrideRegistry/Overridable';

import { Illustration } from '../presentation';
import { Illustration } from '@spinnaker/presentation';

@Overridable('applicationIcon')
export class ApplicationFreshIcon extends React.Component<{}> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import { $window } from 'ngimport';

import { ApplicationFreshIcon } from '../ApplicationFreshIcon';
import { SchedulerFactory } from 'core/scheduler';
import { Illustration, Tooltip } from 'core/presentation';
import { Tooltip } from 'core/presentation';
import { relativeTime, timestamp } from 'core/utils/timeFormatters';

import { Illustration } from '@spinnaker/presentation';

export interface IAppRefreshIconProps {
appName: string;
lastRefresh: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { SETTINGS } from 'core/config/settings';

import { AppRefresher } from './AppRefresher';
import { NavSection } from './NavSection';
import { Icon, Tooltip, useIsMobile, usePrevious } from '../../presentation';
import { Tooltip, useIsMobile, usePrevious } from '../../presentation';

import { navigationCategoryRegistry } from './navigationCategory.registry';
import { verticalNavExpandedAtom } from './navAtoms';
Expand All @@ -16,6 +16,8 @@ import { ApplicationDataSource } from '../service/applicationDataSource';

import './verticalNav.less';

import { Icon } from '@spinnaker/presentation';

export interface IApplicationNavigationProps {
app: Application;
}
Expand Down
4 changes: 3 additions & 1 deletion app/scripts/modules/core/src/application/nav/NavItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import React from 'react';
import { useRecoilValue } from 'recoil';

import { DataSourceNotifications } from 'core/entityTag/notifications/DataSourceNotifications';
import { Icon, Tooltip, useDataSource } from '../../presentation';
import { Tooltip, useDataSource } from '../../presentation';
import { verticalNavExpandedAtom } from './navAtoms';

import { ApplicationDataSource } from '../service/applicationDataSource';
import { Application } from '../application.model';
import { IEntityTags } from '../../domain';

import { Icon } from '@spinnaker/presentation';

export interface INavItemProps {
app: Application;
dataSource: ApplicationDataSource;
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/modules/core/src/ci/CIReader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ function transformBuildToUIFormat(build: ICiBuildAPI) {
const startTime = parseInt(properties.startedTs, 10);

const transformedBuild = {
author: scm[0].committer,
author: scm.length == 0 ? '' : scm[0].committer,
artifacts: artifacts.map((artifact) => ({ name: artifact.fileName, url: artifact.displayPath })),
branchName: scm[0].branch,
commitId: scm[0].sha1.substr(0, 7), // naive shortening of the commit hash.
commitLink: scm[0].compareUrl,
commitMessage: scm[0].message,
branchName: scm.length == 0 ? '' : scm[0].branch,
commitId: scm.length == 0 ? '' : scm[0].sha1.substr(0, 7), // naive shortening of the commit hash.
commitLink: scm.length == 0 ? '' : scm[0].compareUrl,
commitMessage: scm.length == 0 ? '' : scm[0].message,
duration: build.duration,
fullDisplayName: build.fullDisplayName,
id: build.id,
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/modules/core/src/ci/igor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ export class IgorService {
}

public static listJobsForMaster(master: string): PromiseLike<string[]> {
return REST('/v2/builds').path(master, 'jobs').get();
return REST('/v3/builds').path(master, 'jobs').get();
}

public static listBuildsForJob(master: string, job: string): PromiseLike<IBuild[]> {
return REST('/v2/builds').path(master, 'builds', job).get();
return REST('/v3/builds').path(master, 'builds').query({ job }).get();
}

public static getJobConfig(master: string, job: string): PromiseLike<IJobConfig> {
return REST('/v2/builds').path(master, 'jobs', job).get();
return REST('/v3/builds').path(master, 'job').query({ job }).get();
}

public static getGcbAccounts(): PromiseLike<string[]> {
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/header/SpinnakerHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { CollapsibleSectionStateCache } from 'core/cache';
import { Overridable } from 'core/overrideRegistry';
import { GlobalSearch } from 'core/search/global/GlobalSearch';
import { HelpMenu } from 'core/help/HelpMenu';
import { Icon } from 'core/presentation';

import './SpinnakerHeader.css';

import { Icon } from '@spinnaker/presentation';

@UIRouterContext
@Overridable('spinnakerHeader')
export class SpinnakerHeader extends React.Component<{}, {}> {
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/managed/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';

import { Icon, IconNames } from '../presentation';

import './Button.less';

import { Icon, IconNames } from '@spinnaker/presentation';

const DEFAULT_APPEARANCE = 'secondary';

export interface IButtonProps {
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/managed/ColumnHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';

import { Icon, IconNames } from '../presentation';

import './ColumnHeader.less';

import { Icon, IconNames } from '@spinnaker/presentation';

export interface IColumnHeaderProps {
text: string;
icon: IconNames;
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/managed/EnvironmentsHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React from 'react';
import { Dropdown } from 'react-bootstrap';

import { Application } from '../application';
import { Illustration, IllustrationName } from '../presentation';
import { showToggleManagedResourceModal } from './ToggleManagedResourceForApplication';

import './EnvironmentsHeader.less';

import { Illustration, IllustrationName } from '@spinnaker/presentation';

interface IEnvironmentsHeaderProps {
app: Application;
resourceInfo: { managed: number; total: number };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import React, { memo } from 'react';
import { useSref } from '@uirouter/react';

import { Application } from 'core/application';
import { Icon } from '../presentation';
import { IManagedResourceSummary, IManagedEnvironmentSummary, IManagedArtifactSummary } from '../domain/IManagedEntity';

import { getKindName } from './ManagedReader';

import { ObjectRow } from './ObjectRow';
import { AnimatingPill, Pill } from './Pill';
import { getResourceIcon, getExperimentalDisplayLink } from './resources/resourceRegistry';
import { getArtifactVersionDisplayName } from './displayNames';
import { StatusBubble } from './StatusBubble';
import { viewConfigurationByStatus } from './managedResourceStatusConfig';
import { ManagedResourceStatusPopover } from './ManagedResourceStatusPopover';
import { Icon } from '@spinnaker/presentation';

export interface IManagedResourceObjectProps {
application: Application;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import classNames from 'classnames';

import { IManagedResourceSummary } from 'core/domain';
import { Application } from 'core/application';
import { Icon } from 'core/presentation';

import { viewConfigurationByStatus } from './managedResourceStatusConfig';

import { ManagedResourceStatusPopover } from './ManagedResourceStatusPopover';
import './ManagedResourceStatusIndicator.less';
import { Icon } from '@spinnaker/presentation';

export interface IManagedResourceStatusIndicatorProps {
shape: 'square' | 'circle';
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/managed/ObjectRow.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';

import { Icon, IconNames } from '../presentation';

import './ObjectRow.less';

import { Icon, IconNames } from '@spinnaker/presentation';

interface IObjectRowProps {
content?: JSX.Element;
icon: IconNames;
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/managed/StatusBubble.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React, { ReactNode, memo } from 'react';
import { useTransition, animated } from 'react-spring';
import classNames from 'classnames';

import { Icon, IconNames } from '../presentation';

import './StatusBubble.less';

import { Icon, IconNames } from '@spinnaker/presentation';

const QUANITITY_SIZES = ['small', 'medium', 'large', 'extraLarge'];

export interface IStatusBubbleProps {
Expand Down
6 changes: 3 additions & 3 deletions app/scripts/modules/core/src/managed/StatusCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import React from 'react';
import classNames from 'classnames';
import { DateTime } from 'luxon';

import { IconNames } from '../presentation';

import { StatusBubble } from './StatusBubble';
import { RelativeTimestamp } from './RelativeTimestamp';

import { RelativeTimestamp } from './RelativeTimestamp';
import './StatusCard.less';

import { IconNames } from '@spinnaker/presentation';

export interface IStatusCardProps {
appearance: 'future' | 'neutral' | 'info' | 'progress' | 'success' | 'warning' | 'error' | 'archived';
background?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import ReactGA from 'react-ga';
import { Application } from '../application';
import { Button } from './Button';
import {
Illustration,
IllustrationName,
IModalComponentProps,
ModalBody,
ModalFooter,
Expand All @@ -15,6 +13,8 @@ import {
} from '../presentation';
import { ManagedWriter } from './ManagedWriter';

import { Illustration, IllustrationName } from '@spinnaker/presentation';

const logClick = (label: string, application: string) =>
ReactGA.event({
category: 'Environments - toggle application management modal',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';

import { Icon } from '../../presentation';
import { IManagedArtifactVersion } from '../../domain';
import { Icon } from '@spinnaker/presentation';

import { IManagedArtifactVersion } from '../../domain';
import { getArtifactVersionDisplayName } from '../displayNames';

import './ArtifactDetailHeader.less';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React, { memo, useCallback, useEffect } from 'react';
import ReactGA from 'react-ga';
import { Option } from 'react-select';

import { Illustration } from '@spinnaker/presentation';

import {
IModalComponentProps,
ModalHeader,
Expand All @@ -13,7 +15,6 @@ import {
showModal,
SpinFormik,
ValidationMessage,
Illustration,
} from '../../presentation';
import { HelpField } from '../../help';
import { IManagedArtifactVersion, IManagedResourceSummary } from '../../domain';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React, { memo, useCallback, useEffect } from 'react';
import ReactGA from 'react-ga';
import { Option } from 'react-select';

import { Illustration } from '@spinnaker/presentation';

import {
IModalComponentProps,
ModalHeader,
Expand All @@ -13,7 +15,6 @@ import {
showModal,
SpinFormik,
ValidationMessage,
Illustration,
} from '../../presentation';
import { HelpField } from '../../help';
import { IManagedArtifactVersion, IManagedResourceSummary } from '../../domain';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { memo, useEffect, useState } from 'react';
import ReactGA from 'react-ga';

import { Illustration } from '@spinnaker/presentation';

import {
IModalComponentProps,
ModalHeader,
Expand All @@ -9,7 +11,6 @@ import {
showModal,
ValidationMessage,
IRequestStatus,
Illustration,
} from '../../presentation';
import { IManagedArtifactVersion, IManagedResourceSummary } from '../../domain';
import { Application } from '../../application';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import React, { memo, useMemo } from 'react';
import { DateTime } from 'luxon';

import { IconNames } from '@spinnaker/presentation';

import { IManagedArtifactVersion } from '../../domain';
import { Markdown, IconNames } from '../../presentation';
import { Markdown } from '../../presentation';

import { getArtifactVersionDisplayName } from '../displayNames';
import { StatusCard, IStatusCardProps } from '../StatusCard';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React from 'react';
import { DateTime } from 'luxon';

import { IconNames } from '@spinnaker/presentation';

import {
IStatefulConstraint,
StatefulConstraintStatus,
IStatelessConstraint,
IManagedArtifactVersionEnvironment,
} from '../../../domain';
import { IconNames } from '../../../presentation';

const NO_FAILURE_MESSAGE = 'no details available';
const UNKNOWN_CONSTRAINT_ICON = 'mdConstraintGeneric';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import React, { useMemo, useEffect, useRef, useState } from 'react';
import classNames from 'classnames';
import { DateTime } from 'luxon';

import { Icon, IconNames } from '@spinnaker/presentation';

import {
IManagedArtifactSummary,
IManagedArtifactVersion,
IStatefulConstraint,
StatefulConstraintStatus,
} from '../../domain/IManagedEntity';
import { Icon, IconNames } from '../../presentation';

import { isConstraintSupported, getConstraintIcon } from '../artifactDetail/constraints/constraintRegistry';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React, { useState } from 'react';
import classNames from 'classnames';

import { IManagedResourceSummary, IManagedEnvironmentSummary } from '../../domain';
import { Icon } from '../../presentation';
import { Icon } from '@spinnaker/presentation';

import { IManagedResourceSummary, IManagedEnvironmentSummary } from '../../domain';
import { StatusBubble } from '../StatusBubble';

import { EnvironmentBadge } from '../EnvironmentBadge';
import { useEnvironmentTypeFromResources } from '../useEnvironmentTypeFromResources.hooks';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ReactGA from 'react-ga';

import { Application } from 'core/application';
import { IManagedResourceSummary, ManagedResourceStatus } from 'core/domain';
import { IconNames } from 'core/presentation';
import { IconNames } from '@spinnaker/presentation';

interface IViewConfiguration {
appearance: 'info' | 'warning' | 'error';
Expand Down
Loading

0 comments on commit 8ae991e

Please sign in to comment.