Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Rename Package Flyouts to be consistent with rest of UI #1087

Merged
merged 4 commits into from
Sep 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/components/pages/packages/flyouts/deletePackage/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/pages/packages/flyouts/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft. All rights reserved.

export * from './newPackage';
export * from './deletePackage';
export * from './packageNew';
export * from './packageDelete';
4 changes: 0 additions & 4 deletions src/components/pages/packages/flyouts/newPackage/index.js

This file was deleted.

4 changes: 4 additions & 0 deletions src/components/pages/packages/flyouts/packageDelete/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Copyright (c) Microsoft. All rights reserved.

export * from './packageDelete';
export * from './packageDelete.container';
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { DeletePackage } from './deletePackage';
import { PackageDelete } from './packageDelete';
import {
getDeletePackageError,
getDeletePackagePendingStatus,
Expand All @@ -20,4 +20,4 @@ const mapDispatchToProps = dispatch => ({
deletePackage: packageId => dispatch(packagesEpics.actions.deletePackage(packageId))
});

export const DeletePackageContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(DeletePackage));
export const PackageDeleteContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(PackageDelete));
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import {
} from 'components/shared';
import { svgs } from 'utilities';

import './deletePackage.css';
import './packageDelete.css';

export class DeletePackage extends LinkedComponent {
export class PackageDelete extends LinkedComponent {

constructor(props) {
super(props);
Expand Down
4 changes: 4 additions & 0 deletions src/components/pages/packages/flyouts/packageNew/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Copyright (c) Microsoft. All rights reserved.

export * from './packageNew';
export * from './packageNew.container';
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import { NewPackage } from './newPackage';
import { PackageNew } from './packageNew';
import {
getCreatePackageError,
getCreatePackagePendingStatus,
Expand All @@ -20,4 +20,4 @@ const mapDispatchToProps = dispatch => ({
createPackage: packageModel => dispatch(packagesEpics.actions.createPackage(packageModel))
});

export const NewPackageContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(NewPackage));
export const PackageNewContainer = translate()(connect(mapStateToProps, mapDispatchToProps)(PackageNew));
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import {
Svg
} from 'components/shared';

import './newPackage.css';
import './packageNew.css';

const fileInputAccept = ".json,application/json";

export class NewPackage extends LinkedComponent {
export class PackageNew extends LinkedComponent {
constructor(props) {
super(props);

Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/packages/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
RefreshBar,
PageTitle
} from 'components/shared';
import { NewPackageContainer } from './flyouts';
import { PackageNewContainer } from './flyouts';
import { svgs } from 'utilities';

import './packages.css';
Expand Down Expand Up @@ -73,7 +73,7 @@ export class Packages extends Component {
<PageTitle className="package-title" titleValue={t('packages.title')} />
{!!error && <AjaxError t={t} error={error} />}
{!error && <PackagesGrid {...gridProps} />}
{this.state.openFlyoutName === 'new-Package' && <NewPackageContainer t={t} onClose={this.closeFlyout} />}
{this.state.openFlyoutName === 'new-Package' && <PackageNewContainer t={t} onClose={this.closeFlyout} />}
</PageContent>
];
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/packages/packagesGrid/packagesGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { packagesColumnDefs, defaultPackagesGridProps } from './packagesGridConf
import { Btn, PcsGrid, Protected } from 'components/shared';
import { isFunc, translateColumnDefs, svgs } from 'utilities';
import { checkboxColumn } from 'components/shared/pcsGrid/pcsGridConfig';
import { DeletePackageContainer } from '../flyouts';
import { PackageDeleteContainer } from '../flyouts';

import './packagesGrid.css';

Expand Down Expand Up @@ -39,7 +39,7 @@ export class PackagesGrid extends Component {

getOpenFlyout = () => {
if (this.state.openFlyoutName === 'delete-package') {
return <DeletePackageContainer key="delete-modal" package={this.state.hardSelectedPackages[0]} onClose={this.closeFlyout} />
return <PackageDeleteContainer key="delete-modal" package={this.state.hardSelectedPackages[0]} onClose={this.closeFlyout} />
}
return null;
}
Expand Down