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.

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

mrc-6023 POC static build #236

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

mrc-6023 POC static build #236

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6a4a090
poc done
M-Kusumgar Nov 17, 2024
182af9a
Merge branch 'mrc-6018' of github.com:mrc-ide/wodin into mrc-6023
M-Kusumgar Dec 3, 2024
16e61ec
regen package lock
M-Kusumgar Dec 3, 2024
4a62a0b
extract STATIC_BUILD from app vue files
M-Kusumgar Dec 3, 2024
373401d
better types
M-Kusumgar Dec 3, 2024
c6048f6
as any in test
M-Kusumgar Dec 3, 2024
b0b59dc
fix test
M-Kusumgar Dec 3, 2024
c84f147
Merge branch 'main' of github.com:mrc-ide/wodin into mrc-6023
M-Kusumgar Dec 5, 2024
84aeb2a
address comments
M-Kusumgar Dec 5, 2024
e41acbf
create package script for action
M-Kusumgar Dec 6, 2024
e97c76a
add copy static files script
M-Kusumgar Dec 6, 2024
e901ead
update path to wodin js and css
M-Kusumgar Dec 6, 2024
50d66a1
refactor of POC done!
M-Kusumgar Dec 18, 2024
4c7926d
fix tests
M-Kusumgar Dec 18, 2024
ef39bce
clean up diff
M-Kusumgar Dec 18, 2024
3ee3588
clean up further
M-Kusumgar Dec 18, 2024
4534546
ready
M-Kusumgar Dec 18, 2024
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
7 changes: 5 additions & 2 deletions app/static/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ import type BasicApp from "./components/basic/BasicApp.vue";
import type FitApp from "./components/fit/FitApp.vue";
import type StochasticApp from "./components/stochastic/StochasticApp.vue";

type UnionAppComponent = typeof BasicApp | typeof FitApp | typeof StochasticApp
type IntersectionAppComponent = typeof BasicApp & typeof FitApp & typeof StochasticApp

export function initialiseRouter(
appComponent: typeof BasicApp | typeof FitApp | typeof StochasticApp,
appComponent: UnionAppComponent,
appName: string,
baseUrl: string,
appsPath: string
Expand All @@ -31,7 +34,7 @@ export function initialiseRouter(
component: appComponent,
props: {
initSelectedTab: STATIC_BUILD ? "Options" : undefined
} as Parameters<NonNullable<(typeof appComponent)["setup"]>>["0"]
} as Parameters<NonNullable<IntersectionAppComponent["setup"]>>["0"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line basically gets the type of the first argument of setup function (which is props), so we can be sure that the selected tab exists for every app type

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see why you've done this but it's quite confusing to read! I don't really love invoking the first parameter of setup as a way of getting out of declaring actual props types - it does save you that maintenance overhead but with something of a loss of clarity! Could we at least declare this type above and put a comment on it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure yh, sadly i couldnt actually find a way to extract the prop types any other way from defineComponent type which sucks, feel like they couldve made that easier

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, agreed. We've usually just defined the types ourselves in the past. It's boring boilerplate, but it's easy to comprehend...

};

const sessionsRoute: RouteRecordRaw = {
Expand Down
Loading