Feature/539 - fixing base layout passed to the createStore by aranega · Pull Request #594 · MetaCell/NetPyNE-UI · GitHub
Skip to content

Feature/539 - fixing base layout passed to the createStore #594

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
enicolasgomez merged 6 commits into from
Nov 22, 2022
Merged

Feature/539 - fixing base layout passed to the createStore #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ab1319
#531 Save the file as JSON with the filename specified by the user. C…
r-makarov Aug 22, 2022
f94ce53
#539 minor changes to installation files
ddelpiano Nov 11, 2022
92b5e53
Merge branch 'feature/539' of https://github.com/MetaCell/netpyne-ui …
ddelpiano Nov 11, 2022
b9e9d16
#539 fixing base layout passed to the createStore
ddelpiano Nov 11, 2022
ad58ad9
#539 fixing package.json pushed by mistake
ddelpiano Nov 15, 2022
a87679a
Merge branch 'development' of https://github.com/MetaCell/netpyne-ui …
ddelpiano Nov 17, 2022
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
6 changes: 5 additions & 1 deletion webapp/components/layout/defaultLayout.js
View file
Open in desktop
4 changes: 3 additions & 1 deletion webapp/components/topbar/dialogs/SaveFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ const saveOptions = [
},
];

const getTimeStamp = () => new Date().toGMTString().replace(',', '').replace(/[ ,:]/g, '_');

export default class SaveFile extends React.Component {
constructor (props) {
super(props);
this.state = {
fileName: 'output',
fileName: 'output_' + getTimeStamp(),
netParams: true,
simConfig: true,
simData: true,
Expand Down
6 changes: 3 additions & 3 deletions webapp/dev_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"@material-ui/core": "4.12.1",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@metacell/geppetto-meta-client": "1.0.0-final",
"@metacell/geppetto-meta-core": "1.0.0-final",
"@metacell/geppetto-meta-ui": "1.0.0-final",
"@metacell/geppetto-meta-client": "file:.yalc/@metacell/geppetto-meta-client",
"@metacell/geppetto-meta-core": "file:.yalc/@metacell/geppetto-meta-core",
"@metacell/geppetto-meta-ui": "file:.yalc/@metacell/geppetto-meta-ui",
"@nosferatu500/react-sortable-tree": "3.0.5",
"@sentry/integrations": "^6.16.1",
"@sentry/react": "^6.16.1",
Expand Down
9 changes: 6 additions & 3 deletions webapp/geppetto_ui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ yarn global add yalc

app=$(pwd)

echo "#### geppetto core ####"
cd $app/../src/geppetto-meta/geppetto.js/geppetto-core
rm -rf node_modules
rm -rf node_modules build
yarn && yarn build:dev && yarn publish:yalc

echo "#### geppetto ui ####"
cd $app/../src/geppetto-meta/geppetto.js/geppetto-ui
rm -rf node_modules
rm -rf node_modules build
yarn && yarn build:dev && yarn publish:yalc

echo "#### geppetto client ####"
cd $app/../src/geppetto-meta/geppetto.js/geppetto-client
rm -rf node_modules
rm -rf node_modules build
yarn && yarn build:dev && yarn publish:yalc

cd $app
Expand Down
6 changes: 3 additions & 3 deletions webapp/package.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"@material-ui/core": "4.12.1",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@metacell/geppetto-meta-client": "1.0.0-final",
"@metacell/geppetto-meta-core": "1.0.0-final",
"@metacell/geppetto-meta-ui": "1.0.0-final",
"@metacell/geppetto-meta-client": "file:.yalc/@metacell/geppetto-meta-client",
"@metacell/geppetto-meta-core": "file:.yalc/@metacell/geppetto-meta-core",
"@metacell/geppetto-meta-ui": "file:.yalc/@metacell/geppetto-meta-ui",
"@nosferatu500/react-sortable-tree": "3.0.5",
"@sentry/integrations": "^6.16.1",
"@sentry/react": "^6.16.1",
Expand Down
6 changes: 2 additions & 4 deletions webapp/redux/middleware/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Base64 } from 'js-base64';

const getTimeStamp = () => new Date().toGMTString().replace(',', '').replace(/[ ,:]/g, '_');

const createFileName = (name) => name + getTimeStamp();
const createFileName = (name) => name

const forceBlobDownload = (blob, filename) => {
const url = window.URL.createObjectURL(blob);
Expand All @@ -18,7 +16,7 @@ export const downloadJsonResponse = (jsonData) => {
let filename = createFileName('NetPyNE_Model_');

if (jsonData.simConfig && jsonData.simConfig.filename) {
filename = createFileName(`${jsonData.simConfig.filename}_`);
filename = createFileName(`${jsonData.simConfig.filename}`);
}

filename += '.json';
Expand Down
4 changes: 2 additions & 2 deletions webapp/redux/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import middleware from './middleware/middleware';
import plotMiddleware from './middleware/plotMiddleware';
import rulesMiddleware from './middleware/rulesOperationsMiddleware';

import defaultLayout from '../components/layout/defaultLayout';
import baseLayout from '../components/layout/defaultLayout';
import componentMap from '../components/layout/componentsMap';

const INIT_STATE = {
Expand All @@ -22,7 +22,7 @@ const store = createStore(
all,
INIT_STATE,
[middleware, plotMiddleware, rulesMiddleware],
{ defaultLayout, componentMap },
{ undefined, baseLayout, componentMap },
);

export default store;
19 changes: 8 additions & 11 deletions webapp/yalc.lock
View file
Open in desktop
Loading