Skip to content

Commit

Permalink
bugfix/collection-group-timeseries (#210)
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinJJackson authored Feb 6, 2024
1 parent 6a762a0 commit 6360cee
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 254 deletions.
1 change: 0 additions & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
VITE_INSTRUMENT_CHART: true
VITE_CROSS_SECTION: true
VITE_DEVELOPMENT_BANNER: true
VITE_MOVING_BANNER: true
VITE_API_URL: https://develop-midas-api.rsgis.dev
VITE_URL_BASE_PATH: ''
runs-on: ubuntu-latest
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/stable.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/test.yml

This file was deleted.

78 changes: 31 additions & 47 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hhd-ui",
"version": "0.15.3",
"version": "0.15.4",
"private": true,
"dependencies": {
"@ag-grid-community/client-side-row-model": "^30.0.3",
Expand Down Expand Up @@ -63,7 +63,7 @@
"prettier": "^3.0.0",
"rollup-plugin-visualizer": "^5.9.2",
"sass": "^1.63.6",
"vite": "^4.4.3",
"vite": "^4.5.2",
"vite-plugin-checker": "^0.6.1",
"vite-plugin-svgr": "^3.2.0"
},
Expand All @@ -79,8 +79,7 @@
"lint": "eslint . --ext .js,.jsx",
"lint: fix": "eslint . --ext .js,.jsx --fix",
"clean-install": "rm -rf node_modules/ && rm -rf package-lock.json && npm i",
"deploy-develop": "aws s3 rm s3://cwbi-apps-develop/midas --recursive && aws s3 cp ./build/ s3://cwbi-apps-develop/midas --recursive",
"deploy-stable": "aws s3 rm s3://cwbi-apps-stable/midas --recursive && aws s3 cp ./build/ s3://cwbi-apps-stable/midas --recursive"
"deploy-develop": "aws s3 rm s3://cwbi-apps-develop/midas --recursive && aws s3 cp ./build/ s3://cwbi-apps-develop/midas --recursive"
},
"eslintConfig": {
"extends": [
Expand Down
4 changes: 0 additions & 4 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { connect } from 'redux-bundler-react';
import { ToastContainer } from 'react-toastify';

import Modal from './app-components/modal';
import MovingBanner from './common/moving-banner';
import NavBar from './app-components/navigation';
import PageContent from './app-components/pageContent';

Expand All @@ -14,14 +13,11 @@ import './css/bootstrap/css/bootstrap.water.min.css';
import './css/ms/css/mapskin.min.css';
import './css/index.scss';

const isMovingBannerActive = import.meta.env.VITE_MOVING_BANNER === 'true';

export default connect('selectRoute', ({ route: Route }) => (
<>
<NavBar theme='primary' />
<ToastContainer autoClose={3500} hideProgressBar={false} />
<PageContent>
{isMovingBannerActive && <MovingBanner />}
<Route />
</PageContent>
<Modal closeWithEscape />
Expand Down
2 changes: 1 addition & 1 deletion src/app-bundles/time-series-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export default createRestBundle({
}
),
selectNonComputedTimeseriesItemsByRoute: createSelector(
'selectInstrumentTimeseriesItemsByRoute',
'selectInstrumentTimeseriesItems',
(timeseries) => {
if (!timeseries) return [];

Expand Down
60 changes: 0 additions & 60 deletions src/common/moving-banner-modal.jsx

This file was deleted.

Loading

0 comments on commit 6360cee

Please sign in to comment.