Skip to content

Show an error message if the API is not found #133

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 30, 2021
Merged

Show an error message if the API is not found #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2555644
WIP trying out some things to show when the API isn't found
mofojed Jul 28, 2021
c57a9ce
Write out an error if the API can't load
mofojed Jul 28, 2021
bb25a5c
Simplify how we detect if the API isn't loaded
mofojed Jul 28, 2021
e319237
Clean up after review
mofojed Jul 28, 2021
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
22 changes: 22 additions & 0 deletions packages/code-studio/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,28 @@
src="%REACT_APP_CORE_API_URL%/%REACT_APP_CORE_API_NAME%"
type="text/javascript"
></script>
<script>
(function () {
document.addEventListener('DOMContentLoaded', function() {
// If for some reason the API doesn't load, our app will not work. Write out a message to help the user.
if (!window.dh) {
document.getElementById('root').insertAdjacentHTML(
'afterbegin',
`<div class="modal d-block">
<div class="modal-dialog modal-dialog-centered theme-bg-light">
<div class="modal-content">
<div class="modal-body">
<h5 class="modal-title">Error: Unable to load API</h5>
<p class="text-break">Ensure the server is running and you are able to reach %REACT_APP_CORE_API_URL%/%REACT_APP_CORE_API_NAME%, then refresh the page.</p>
</div>
</div>
</div>
</div>`
);
}
});
})();
</script>
<title>Deephaven</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/scss/new_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $spacer-3: map-get($spacers, 3);
$spacer-4: map-get($spacers, 4);
$spacer-5: map-get($spacers, 5);

/* Marching Ants for golden layout dropzone and drag and drop */
//Marching Ants for golden layout dropzone and drag and drop
//top bottom, left right.
//create 4 background images that are 50% color 1, 50% color 2 using graidents, two veritical, two horizontal
//size them to ant-size and thickness
Expand Down
5 changes: 2 additions & 3 deletions packages/iris-grid/src/AdvancedFilterCreatorSelectValueList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { CSSTransition } from 'react-transition-group';
import dh from '@deephaven/jsapi-shim';
import dh, { PropTypes as APIPropTypes } from '@deephaven/jsapi-shim';
import { LoadingSpinner, SelectValueList } from '@deephaven/components';
import Log from '@deephaven/log';
import Formatter from './Formatter';
Expand Down Expand Up @@ -271,8 +271,7 @@ AdvancedFilterCreatorSelectValueList.propTypes = {
invertSelection: PropTypes.bool,
selectedValues: PropTypes.arrayOf(PropTypes.any),
onChange: PropTypes.func,
filters: PropTypes.arrayOf(PropTypes.instanceOf(dh.FilterCondition))
.isRequired,
filters: PropTypes.arrayOf(APIPropTypes.FilterCondition).isRequired,
formatter: PropTypes.instanceOf(Formatter).isRequired,
};

Expand Down