Skip to content
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

Staging #409

Merged
merged 5 commits into from
Dec 3, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/client-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
working-directory: client
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
working-directory: cdk
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/server-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
working-directory: server
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
working-directory: cdk
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v4
Expand Down
1,587 changes: 973 additions & 614 deletions client/package-lock.json

Large diffs are not rendered by default.

21 changes: 9 additions & 12 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,26 @@
"homepage": "https://github.com/lbl-srg/ctrl-flow-dev",
"dependencies": {
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^13.5.0",
"@types/node": "^20.9.4",
"@types/react-dom": "^17.0.11",
"@types/react-dom": "^18.3.1",
"css-loader": "^7.1.2",
"formik": "^2.2.9",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-localization": "^1.0.19",
"react-router-dom": "^6.2.2",
"react-scripts": "5.0.0",
"react-scripts": "^5.0.1",
"react-zoom-pan-pinch": "^2.1.3",
"typescript": "^4.5.4",
"use-debounce": "^7.0.1",
"web-vitals": "^2.1.2",
"zustand": "^3.6.7"
},
"overrides": {
"body-parser": "^1.20.3",
"http-proxy-middleware": "^2.0.7",
"superagent": "^9.0.0",
"semver": "^7.5.2",
"rollup": "^3.29.5",
"nth-check": "^2.0.1"
"nth-check": "^2.1.0",
"postcss": "^8.4.31"
},
"scripts": {
"start": "react-app-rewired start",
Expand Down Expand Up @@ -66,7 +63,7 @@
"@picocss/pico": "^1.4.4",
"@types/jest": "^29.2.2",
"@types/jsdom": "^20.0.1",
"@types/react": "^17.0.40",
"@types/react": "^18.3.12",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
Expand Down
3 changes: 0 additions & 3 deletions client/src/components/layouts/SidebarLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ import { useLocation } from "react-router-dom";
import { useStores } from "../../data";
import { observer } from "mobx-react";

import itl from "../../translations";

const Sidebarlayout = observer(
({ contentLeft, contentRight, isFullScreen = true }) => {
const { uiStore, projectStore } = useStores();
const projectDetails = projectStore.getProjectDetails();

const [isDragging, setIsDragging] = useState(false);
const [modalOpen, setModalOpen] = useState(false);
Expand Down
5 changes: 1 addition & 4 deletions client/src/components/modal/EditDetailsModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// import { Field, Form, Formik } from "formik";
import Modal, { ModalInterface } from "./Modal";
import itl from "../../translations";
import { useStores } from "../../data";
import { getFormData } from "../../utils/dom-utils";
import { observer } from "mobx-react";
import { ChangeEvent, SyntheticEvent, useState } from "react";
import { ProjectDetailInterface } from "../../data/project";
Expand All @@ -19,7 +17,6 @@ import {
import {
applyValueModifiers,
applyVisibilityModifiers,
Modifiers,
ConfigValues,
} from "../../utils/modifier-helpers";

Expand Down Expand Up @@ -318,7 +315,7 @@ const EditDetailsModal = observer(
defaultValue={formInputs.size}
/>
</label>*/}

{/*<div className="grid">
<label htmlFor="units">
{itl.terms.units}
Expand Down
7 changes: 1 addition & 6 deletions client/src/components/steps/Configs/Config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import SlideOut from "./SlideOut";
import { useStores } from "../../../data";

import { OptionInterface, TemplateInterface } from "../../../data/template";
import { Modifiers, ConfigValues } from "../../../utils/modifier-helpers";
import { ConfigValues } from "../../../utils/modifier-helpers";
import { ConfigInterface } from "../../../data/config";
import Spinner from "../../Spinner";

Expand All @@ -21,11 +21,6 @@ const Config = observer(({ configId }: ConfigProps) => {
const template = templateStore.getTemplateByPath(
config.templatePath,
) as TemplateInterface;
const templateOptions: OptionInterface[] =
templateStore.getOptionsForTemplate(template?.modelicaPath);
const templateModifiers: Modifiers = templateStore.getModifiersForTemplate(
template?.modelicaPath,
);
const selections: ConfigValues = configStore.getConfigSelections(configId);
const allOptions: { [key: string]: OptionInterface } =
templateStore.getAllOptions();
Expand Down
Loading