-
Notifications
You must be signed in to change notification settings - Fork 3
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
Feature/conversion check server #452
Changes from 14 commits
e03e8fc
bdd832f
a284edf
ac19aca
5ab337e
c4b2300
9aaa87e
38d40ac
11e383b
9befb07
66c6ffb
6fa7a3d
342025b
447b72e
26bc097
825bac6
8f5b16a
39541bd
2b615cb
3034ee2
f8bd674
09652c1
8e08476
6464a98
63e81c2
c699c84
bdd6060
5b314a1
82eb0da
4ec7f9a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,10 +2,9 @@ import { Button } from "antd"; | |
import React from "react"; | ||
|
||
import CustomModal from "../CustomModal"; | ||
import { Exclamation } from "../Icons"; | ||
import { AvailableEngines } from "../../state/trajectory/conversion-data-types"; | ||
|
||
import styles from "./style.css"; | ||
import { AvailableEngines } from "../../state/trajectory/conversion-data-types"; | ||
|
||
interface ConversionFileErrorModalProps { | ||
closeModal: () => void; | ||
|
@@ -33,7 +32,7 @@ const ConversionFileErrorModal: React.FC<ConversionFileErrorModalProps> = ({ | |
onCancel={closeModal} | ||
> | ||
<div> | ||
<div className={styles.redText}> | ||
<div className={styles.redWarningText}> | ||
{" "} | ||
meganrm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{"We're sorry, there was a problem importing your file."} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: you don't need the |
||
</div>{" "} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import { Button } from "antd"; | ||
import React from "react"; | ||
|
||
import CustomModal from "../CustomModal"; | ||
import { Exclamation } from "../Icons"; | ||
|
||
import styles from "./style.css"; | ||
|
||
interface ConversionServerErrorModalProps { | ||
closeModal: () => void; | ||
} | ||
|
||
const ConversionServerErrorModal: React.FC<ConversionServerErrorModalProps> = ({ | ||
closeModal, | ||
}) => { | ||
return ( | ||
<CustomModal | ||
className={styles.serverErrorModal} | ||
title="File import cannot be completed" | ||
open | ||
footer={ | ||
<Button type="primary" onClick={closeModal}> | ||
OK | ||
</Button> | ||
} | ||
centered | ||
onCancel={closeModal} | ||
> | ||
<p className={styles.redText}> | ||
meganrm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{" "} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you delete these and try to figure out how to keep them from happening? Are you adding spaces while you're typing that then get converted? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've removed these and made a note for myself to look through the repo for these things and keep them from showing up. |
||
{Exclamation} We're sorry, the server is currently | ||
experiencing an issue. | ||
</p> | ||
<p> | ||
{" "} | ||
Please try again at a later time. For further assistance, please | ||
visit{" "} | ||
meganrm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<a | ||
href="https://forum.allencell.org/" | ||
target="_blank" | ||
rel="noreferrer" | ||
> | ||
{" "} | ||
The Allen Cell Discussion Forum.{" "} | ||
</a> | ||
</p> | ||
</CustomModal> | ||
); | ||
}; | ||
|
||
export default ConversionServerErrorModal; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
.server-error-modal :global(.ant-modal-content) { | ||
width: 425px; | ||
} | ||
|
||
.server-error-modal :global(.ant-modal-close-x) { | ||
/* specifying here prevents hover behavior */ | ||
color: var(--light-theme-modal-close-x); | ||
font-size: 12px; | ||
position: relative; | ||
top: -3px; | ||
} | ||
|
||
.server-error-modal :global(.ant-modal-header) { | ||
padding: 12px 24px; | ||
} | ||
|
||
.server-error-modal :global(.ant-modal-title) { | ||
font-size: 14px; | ||
font-weight: 400; | ||
} | ||
|
||
.server-error-modal :global(.ant-modal-body) { | ||
padding: 20px 20px 0px; | ||
} | ||
|
||
.server-error-modal .red-text { | ||
color: var(--warning-text-color); | ||
padding-bottom: 1px; | ||
} | ||
|
||
.server-error-modal :global(.ant-modal-footer) { | ||
background-color: var(--modal-content-bg); | ||
padding: 6px 16px 12px; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
npm
is warning about some dependency issues. May want to runnpm audit fix
.