Skip to content

Commit

Permalink
chore: migrate import statements from es5 to es6 (argoproj#11042)
Browse files Browse the repository at this point in the history
* Migrating import syntax from es5 to es6

Signed-off-by: trishnakalita660 <[email protected]>

* Migrating import syntax from es5 to es6

Signed-off-by: trishnakalita660 <[email protected]>

* Run build, test and lint UI code Signed-off-by: Trishna Kalita [email protected]

Signed-off-by: trishnakalita660 <[email protected]>

* Removed package-lock.json

Signed-off-by: trishnakalita660 <[email protected]>

Signed-off-by: trishnakalita660 <[email protected]>
  • Loading branch information
trishnakalita660 authored Oct 27, 2022
1 parent 309654c commit 45fc484
Show file tree
Hide file tree
Showing 23 changed files with 24 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Timestamp} from '../../../shared/components';
import * as models from '../../../shared/models';
import {getConditionCategory} from '../utils';

require('./application-conditions.scss');
import './application-conditions.scss';

export const ApplicationConditions = ({conditions}: {conditions: models.ApplicationCondition[]}) => {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ import {ApplicationRetryOptions} from '../application-retry-options/application-
import {ApplicationSyncOptionsField} from '../application-sync-options/application-sync-options';
import {RevisionFormField} from '../revision-form-field/revision-form-field';
import {SetFinalizerOnApplication} from './set-finalizer-on-application';
import './application-create-panel.scss';

const jsonMergePatch = require('json-merge-patch');

require('./application-create-panel.scss');

const appTypes = new Array<{field: string; type: models.AppSourceType}>(
{type: 'Helm', field: 'helm'},
{type: 'Kustomize', field: 'kustomize'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import * as models from '../../../shared/models';
import {services} from '../../../shared/services';
import {ApplicationParameters} from '../application-parameters/application-parameters';
import {RevisionMetadataRows} from './revision-metadata-rows';

require('./application-deployment-history.scss');
import './application-deployment-history.scss';

export const ApplicationDeploymentHistory = ({
app,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {ResourceStatus} from '../../../shared/models';
import {ApplicationsDetailsAppDropdown} from './application-details-app-dropdown';
import {useSidebarTarget} from '../../../sidebar/sidebar';

require('./application-details.scss');
import './application-details.scss';

interface ApplicationDetailsState {
page: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ResourceTreeNode} from '../application-resource-tree/application-resourc
import {ApplicationResourcesDiff} from '../application-resources-diff/application-resources-diff';
import {ComparisonStatusIcon, formatCreationTimestamp, getPodStateReason, HealthStatusIcon} from '../utils';

require('./application-node-info.scss');
import './application-node-info.scss';

export const ApplicationNodeInfo = (props: {
application: models.Application;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import * as models from '../../../shared/models';
import {services} from '../../../shared/services';
import * as utils from '../utils';

require('./application-operation-state.scss');
import './application-operation-state.scss';

interface Props {
application: models.Application;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ import {
import {NodeUpdateAnimation} from './node-update-animation';
import {PodGroup} from '../application-pod-view/pod-view';
import {ArrowConnector} from './arrow-connector';
import './application-resource-tree.scss';

function treeNodeKey(node: NodeId & {uid?: string}) {
return node.uid || nodeKey(node);
}

const color = require('color');

require('./application-resource-tree.scss');

export interface ResourceTreeNode extends models.ResourceNode {
status?: models.SyncStatusCode;
health?: models.HealthStatus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as models from '../../../shared/models';
import {services} from '../../../shared/services';
import {IndividualDiffSection} from './individual-diff-section';

require('./application-resources-diff.scss');
import './application-resources-diff.scss';

export interface ApplicationResourcesDiffProps {
states: models.ResourceDiff[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {useState} from 'react';
import {Diff, Hunk} from 'react-diff-view';
import 'react-diff-view/style/index.css';

require('./application-resources-diff.scss');
import './application-resources-diff.scss';

export interface IndividualDiffSectionProps {
file: any;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {omit} from 'lodash-es';
import {NumberField} from '../../../shared/components';
import * as models from '../../../shared/models';

require('./application-retry-options.scss');
import './application-retry-options.scss';

const durationRegex = /^([\d\.]+[HMS])+$/i;
const durationRegexError = 'Should be 1h10m10s/10h10m/10m/10s';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import * as models from '../../../shared/models';

require('./application-retry-view.scss');
import './application-retry-view.scss';

function buildRetryOptionView(label: string, data: string | number) {
const result = data || 'not installed';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {services} from '../../../shared/services';
import {ApplicationSyncWindowStatusIcon, ComparisonStatusIcon, getAppOperationState, getConditionCategory, HealthStatusIcon, OperationState, syncStatusMessage} from '../utils';
import {RevisionMetadataPanel} from './revision-metadata-panel';

require('./application-status-panel.scss');
import './application-status-panel.scss';

interface Props {
application: models.Application;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {Link} from 'react-router-dom';
import {EditNotificationSubscriptions, useEditNotificationSubscriptions} from './edit-notification-subscriptions';
import {EditAnnotations} from './edit-annotations';

require('./application-summary.scss');
import './application-summary.scss';

function swap(array: any[], a: number, b: number) {
array = array.slice();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {services} from '../../../shared/services';

import {ApplicationSummaryProps} from './application-summary';

require('./edit-notification-subscriptions.scss');
import './edit-notification-subscriptions.scss';

export const NOTIFICATION_SUBSCRIPTION_ANNOTATION_PREFIX = 'notifications.argoproj.io/subscribe';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as classNames from 'classnames';
import * as React from 'react';
import * as ReactForm from 'react-form';

require('./application-sync-options.scss');
import './application-sync-options.scss';

export const REPLACE_WARNING = `The resources will be synced using 'kubectl replace/create' command that is a potentially destructive action and might cause resources recreation.`;
export const FORCE_WARNING = `The resources will be synced using '--force' that is a potentially destructive action and will immediately remove resources from the API and bypasses graceful deletion. Immediate deletion of some resources may result in inconsistency or data loss.`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ApplicationRetryOptions} from '../application-retry-options/application-
import {ApplicationManualSyncFlags, ApplicationSyncOptions, FORCE_WARNING, SyncFlags, REPLACE_WARNING} from '../application-sync-options/application-sync-options';
import {ComparisonStatusIcon, nodeKey} from '../utils';

require('./application-sync-panel.scss');
import './application-sync-panel.scss';

export const ApplicationSyncPanel = ({application, selectedResource, hide}: {application: models.Application; selectedResource: string; hide: () => any}) => {
const [form, setForm] = React.useState<FormApi>(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import {Tooltip} from 'argo-ui';
import {Application} from '../../../shared/models';

require('./applications-labels.scss');
import './applications-labels.scss';

export const ApplicationsLabels = ({app}: {app: Application}) => {
const labels = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import {ApplicationTiles} from './applications-tiles';
import {ApplicationsRefreshPanel} from '../applications-refresh-panel/applications-refresh-panel';
import {useSidebarTarget} from '../../../sidebar/sidebar';

require('./applications-list.scss');
require('./flex-top-bar.scss');
import './applications-list.scss';
import './flex-top-bar.scss';

const EVENTS_BUFFER_TIMEOUT = 500;
const WATCH_RETRY_TIMEOUT = 500;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Tooltip} from 'argo-ui';
import * as React from 'react';
import {ApplicationSource as ApplicationSourceType} from '../../../shared/models';

require('./applications-source.scss');
import './applications-source.scss';

export const ApplicationsSource = ({source}: {source: ApplicationSourceType}) => {
const sourceString = `${source.repoURL}/${source.path || source.chart}`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {COLORS} from '../../../shared/components';
import {Consumer} from '../../../shared/context';
import * as models from '../../../shared/models';

require('./applications-status-bar.scss');
import './applications-status-bar.scss';

export interface ApplicationsStatusBarProps {
applications: models.Application[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {OperationState} from '../utils';
import {ApplicationsLabels} from './applications-labels';
import {ApplicationsSource} from './applications-source';
import {services} from '../../../shared/services';
require('./applications-table.scss');
import './applications-table.scss';

export const ApplicationsTable = (props: {
applications: models.Application[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as AppUtils from '../utils';
import {OperationState} from '../utils';
import {services} from '../../../shared/services';

require('./applications-tiles.scss');
import './applications-tiles.scss';

export interface ApplicationTilesProps {
applications: models.Application[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {DataLoader, ErrorNotification, Page, Spinner} from '../../../shared/comp
import {AppContext} from '../../../shared/context';
import {services} from '../../../shared/services';

require('./user-info-overview.scss');
import './user-info-overview.scss';

export class UserInfoOverview extends React.Component<RouteComponentProps<any>, {connecting: boolean}> {
public static contextTypes = {
Expand Down

0 comments on commit 45fc484

Please sign in to comment.