Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Redirect Dialog for Open Block #29076

Merged
merged 2 commits into from Jun 12, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/src/applab/AppLabView.jsx
Expand Up @@ -12,7 +12,7 @@ import CodeWorkspace from '../templates/CodeWorkspace';
import DataWorkspace from '../storage/dataBrowser/DataWorkspace';
import ProtectedDesignWorkspace from './ProtectedDesignWorkspace';
import VisualizationResizeBar from '../lib/ui/VisualizationResizeBar';
import RedirectDialog from '@cdo/apps/applab/RedirectDialog';
import ExternalRedirectDialog from '@cdo/apps/applab/ExternalRedirectDialog';

/**
* Top-level React wrapper for App Lab.
Expand Down Expand Up @@ -46,7 +46,7 @@ class AppLabView extends React.Component {
<StudioAppWrapper>
<ImportProjectDialog />
<ImportScreensDialog />
<RedirectDialog />
<ExternalRedirectDialog />
<ApplabVisualizationColumn
isEditingProject={this.props.isEditingProject}
screenIds={this.props.screenIds}
Expand Down
Expand Up @@ -8,7 +8,14 @@ import {connect} from 'react-redux';
import {actions} from './redux/applab';
import {studio} from '@cdo/apps/lib/util/urlHelpers';

class RedirectDialog extends React.Component {
const styles = {
title: {
display: 'inline',
wordWrap: 'break-word'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
};

class ExternalRedirectDialog extends React.Component {
static propTypes = {
handleClose: PropTypes.func,
redirects: PropTypes.array
Expand All @@ -26,7 +33,7 @@ class RedirectDialog extends React.Component {
title = i18n.redirectTitle();
body = (
<div>
<h2>{i18n.redirectConfirm({url: url})}</h2>
<h2 style={styles.title}>{i18n.redirectConfirm({url: url})}</h2>
<p>
{i18n.redirectExplanation()}
<span>
Expand Down Expand Up @@ -77,7 +84,7 @@ class RedirectDialog extends React.Component {
}
}

export const UnconnectedRedirectDialog = RedirectDialog;
export const UnconnectedExternalRedirectDialog = ExternalRedirectDialog;
export default connect(
state => ({
redirects: state.redirectDisplay
Expand All @@ -87,4 +94,4 @@ export default connect(
dispatch(actions.dismissRedirectNotice());
}
})
)(UnconnectedRedirectDialog);
)(UnconnectedExternalRedirectDialog);
31 changes: 31 additions & 0 deletions apps/src/applab/ExternalRedirectDialog.story.jsx
@@ -0,0 +1,31 @@
import React from 'react';
import {UnconnectedExternalRedirectDialog as ExternalRedirectDialog} from '@cdo/apps/applab/ExternalRedirectDialog';

export default storybook => {
storybook.storiesOf('ExternalRedirectDialog', module).addStoryTable([
{
name: 'Approved Site',
story: () => (
<ExternalRedirectDialog
handleClose={() => {}}
redirects={[
{
url:
'www.google.com/super_duper/long_url/should_be_wrapped/to-the-next-line.html',
approved: true
}
]}
/>
)
},
{
name: 'Rejected Site',
story: () => (
<ExternalRedirectDialog
handleClose={() => {}}
redirects={[{url: 'www.google.com', approved: false}]}
/>
)
}
]);
};
15 changes: 0 additions & 15 deletions apps/src/applab/RedirectDialog.story.jsx

This file was deleted.