Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.17-buster-slim
FROM node:14.21.3-slim

ARG TIMESTAMP
ARG VERSION
Expand All @@ -9,11 +9,11 @@ COPY . /gridappsd/viz/

WORKDIR /gridappsd/viz/client
RUN npm install \
&& npm run build version=$VERSION
&& npm run build version=$VERSION

WORKDIR /gridappsd/viz/server
RUN npm install \
&& npm run build
&& npm run build

RUN echo $TIMESTAMP > /gridappsd/viz/dockerbuildversion.txt

Expand Down
2 changes: 1 addition & 1 deletion assets/config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "v1.0",
"version": "develop",
"host": "127.0.0.1:61614"
}
8,496 changes: 0 additions & 8,496 deletions client/package-lock.json

This file was deleted.

126 changes: 63 additions & 63 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
{
"name": "gridappsd-viz-client",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"start": "webpack serve --config webpack.development.config.js --progress",
"build": "webpack --config webpack.production.config.js --env ignored",
"lint": "eslint . --ext .ts,.tsx"
},
"author": "Nhuy Van",
"license": "ISC",
"dependencies": {
"@stomp/stompjs": "^5.4.4",
"codemirror": "^5.64.0",
"d3": "^7.1.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^6.0.2",
"react-table": "^7.7.0",
"rxjs": "^7.4.0",
"socket.io-client": "^4.4.0"
},
"devDependencies": {
"@ianwalter/exclude-assets-plugin": "^1.0.0",
"@types/codemirror": "5.60.5",
"@types/d3": "^7.1.0",
"@types/node": "^12.20.37",
"@types/react": "^17.0.37",
"@types/react-dom": "^17.0.11",
"@types/react-router-dom": "^5.3.2",
"@types/react-table": "^7.7.8",
"@types/stompjs": "^2.3.5",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^10.0.0",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.2.0",
"eslint": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsdoc": "^37.0.3",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-unused-imports": "^2.0.0",
"html-webpack-plugin": "^5.5.0",
"lint-staged": "^12.1.2",
"mini-css-extract-plugin": "^2.4.5",
"node-sass": "^7.0.0",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"sass-loader": "^12.3.0",
"source-map-loader": "^3.0.0",
"terser-webpack-plugin": "^5.2.5",
"ts-loader": "^9.2.6",
"tsconfig-paths-webpack-plugin": "^3.5.2",
"typescript": "^4.5.2",
"webpack": "^5.64.4",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.8.1"
},
"lint-staged": {
"**/*.{ts,tsx}": "eslint --cache --fix"
}
"name": "gridappsd-viz-client",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"start": "webpack serve --config webpack.development.config.js --progress",
"build": "webpack --config webpack.production.config.js --env ignored",
"lint": "eslint . --ext .ts,.tsx"
},
"author": "Nhuy Van",
"license": "ISC",
"dependencies": {
"@stomp/stompjs": "^5.4.4",
"codemirror": "^5.64.0",
"d3": "^7.1.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^6.0.2",
"react-table": "^7.7.0",
"rxjs": "^7.4.0",
"socket.io-client": "^4.4.0"
},
"devDependencies": {
"@ianwalter/exclude-assets-plugin": "^1.0.0",
"@types/codemirror": "5.60.5",
"@types/d3": "^6.3.0",
"@types/node": "^12.20.37",
"@types/react": "^17.0.37",
"@types/react-dom": "^17.0.11",
"@types/react-router-dom": "^5.3.2",
"@types/react-table": "^7.7.8",
"@types/stompjs": "^2.3.5",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^10.0.0",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.2.0",
"eslint": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsdoc": "^37.0.3",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-unused-imports": "^2.0.0",
"html-webpack-plugin": "^5.5.0",
"lint-staged": "^12.1.2",
"mini-css-extract-plugin": "^2.4.5",
"node-sass": "^7.0.0",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"sass-loader": "^12.3.0",
"source-map-loader": "^3.0.0",
"terser-webpack-plugin": "^5.2.5",
"ts-loader": "^9.2.6",
"tsconfig-paths-webpack-plugin": "^3.5.2",
"typescript": "^4.5.2",
"webpack": "^5.64.4",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.8.1"
},
"lint-staged": {
"**/*.{ts,tsx}": "eslint --cache --fix"
}
}
13 changes: 7 additions & 6 deletions client/src/app/AppContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,12 @@ export class AppContainer extends Component<Props, State> {
});
}

onSimulationConfigFormSubmitted(config: SimulationConfiguration) {
this._simulationQueue.push(new Simulation(config));
this._stateStore.update({
simulationId: ''
});
}
onSimulationConfigFormSubmitted(config: SimulationConfiguration) {
const simulation = new Simulation(config);
this._simulationQueue.push(simulation);
this._stateStore.update({
simulationId: ''
});
}

}
114 changes: 82 additions & 32 deletions client/src/app/common/simulation/SimulationConfiguration.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,86 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable camelcase */
/**
* Previous Interface that works with GridAPPS-D
*/
// export interface SimulationConfiguration {
// power_system_config: {
// GeographicalRegion_name: string;
// SubGeographicalRegion_name: string;
// Line_name: string;
// };
// simulation_config: {
// start_time: string;
// duration: string;
// simulator: string;
// run_realtime: boolean;
// timestep_frequency: string;
// timestep_increment: string;
// simulation_name: string;
// power_flow_solver_method: string;
// model_creation_config: {
// load_scaling_factor: string;
// schedule_name: string;
// z_fraction: string;
// i_fraction: string;
// p_fraction: string;
// randomize_zipload_fractions: boolean;
// use_houses: boolean;
// };
// };
// application_config: {
// applications: Array<{ name: string; config_string: string }>;
// };
// service_configs: Array<{ id: string; user_options: any }>;
// test_config: {
// events: Array<any>;
// appId: string;
// };
// }

interface PowerSystemConfig {
SubGeographicalRegion_name: string;
GeographicalRegion_name: string;
Line_name: string;
simulator_config: {
simulator: string;
simulation_output: object;
power_flow_solver_method: string;
model_creation_config: {
load_scaling_factor: string;
schedule_name: string;
triplex: string;
encoding: string;
system_frequency: string;
voltage_multiplier: string;
power_unit_conversion: string;
unique_names: string;
z_fraction: string;
i_fraction: string;
p_fraction: string;
randomize_zipload_fractions: boolean;
use_houses: boolean;
};
};
}

export interface SimulationConfiguration {
power_system_config: {
GeographicalRegion_name: string;
SubGeographicalRegion_name: string;
Line_name: string;
};
simulation_config: {
start_time: string;
duration: string;
simulator: string;
run_realtime: boolean;
timestep_frequency: string;
timestep_increment: string;
simulation_name: string;
power_flow_solver_method: string;
model_creation_config: {
load_scaling_factor: string;
schedule_name: string;
z_fraction: string;
i_fraction: string;
p_fraction: string;
randomize_zipload_fractions: boolean;
use_houses: boolean;
};
};
application_config: {
applications: Array<{ name: string; config_string: string }>;
};
service_configs: Array<{ id: string; user_options: any }>;
test_config: {
events: Array<any>;
appId: string;
};
power_system_configs: Array<PowerSystemConfig>;
simulation_config: {
start_time: string;
duration: string;
run_realtime: boolean;
timestep_frequency: string;
timestep_increment: string;
simulation_name: string;
};
application_config: {
applications: Array<{ name: string; config_string: string }>;
};
service_configs: Array<{ id: string; user_options: any }>;
test_config: {
events: Array<any>;
appId: string;
compareWithSimId?: number;
};
}
Loading