* Move all tests over to electron * Pass the correct param to playwright-electron.sh * Add shebang to script and add macos-14-large as a target * Get sketch-tests.spec.ts passing in electron * Try out 4 workers * Got testing-segment-overlays passing * Pass testing-selections.spec.ts * Go back to fix up sketch-tests test * Pass various.spec.ts, by far the hardest one * Pass can-sketch-on-all-planes... with ease * Pass command bar tests * fmt * Completely fix code mirror text navigating for tests * Pass debug pane tests * Pass desktop export tests * Pass editor tests * Pass file tree tests * Pass onboarding tests * Corrected a fixme in file-tree.spec! * Painfully fix hardcoded coordinates in point-click.spec * Pass machine.spec tests * Pass projects, fought hard with filechooser * Pass regresion-tests.spec tests * Pass network and connection tests * Pass camera-movement.spec tests * Extreme time eaten by gizmo test fixes. All passing now. * Merge main (tests changed x_x) and pass all constraints.spec tests (pain) * Pass another painful spec suite: testing-settings * Pass perspective-toggle, interesting note * Pass samples loading tests * Pass app header tests * Pass text-to-cad tests * Pass segment-overlays (minor ache) and ability to switch to web if needed :) * Fix a ton of syntax changes and deflake 2 more tests (pain) * Correct all tsc errors * Remove to-electron script * Add an f-ton of shit because playwright doesnt want S P R E A D * Try CI again * Stop snapshots of exports (already test in e2e) * Fix flake in double click editor * Hopefully help CI flake * Fixmes, fixmes everywhere * One more fixme to settings * Skip another code pane flake * Port jess's projects.spec tests * fixup * Reuse electron window; difficult task * Rebased and refixed * Remove duplicate cases * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * Reduce the workers to something CI can handle * Lower it further, we need to think about the others * Update package.json Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com> * Update package.json Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com> * Fix the last tests and tsc errors * Timeout to 120 and windows-2022-16core * Fix windows runner detection, enable concurrency temporarily * Hopefully this time fix windows runner detection * Comment out Vector, add back removed camera test code * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * Fix camera tests again * Massively deflake a whole class of tests * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * Try new CI and fix small onboarding test * Derp * No github tuning * Try mac * Add back all the OS * Lord, hallow be thy name * A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * One last try with window-16-cores * Trigger CI * Try AWS Windows runner * Passing on windows locally with a few skips * Skip more win tests, add back all three oses * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-16-cores) * Add two more fixmes * 2 more fixmes * skip segment overlays on win32 * Another fixme * Trigger CI * Trigger CI * Quick clean up * Move all tests over to electron * Pass the correct param to playwright-electron.sh * Add shebang to script and add macos-14-large as a target * Get sketch-tests.spec.ts passing in electron * Try out 4 workers * Got testing-segment-overlays passing * Pass testing-selections.spec.ts * Go back to fix up sketch-tests test * Pass various.spec.ts, by far the hardest one * Pass can-sketch-on-all-planes... with ease * Pass command bar tests * fmt * Completely fix code mirror text navigating for tests * Pass debug pane tests * Pass desktop export tests * Pass editor tests * Pass file tree tests * Pass onboarding tests * Corrected a fixme in file-tree.spec! * Painfully fix hardcoded coordinates in point-click.spec * Pass machine.spec tests * Pass projects, fought hard with filechooser * Pass regresion-tests.spec tests * Pass network and connection tests * Pass camera-movement.spec tests * Extreme time eaten by gizmo test fixes. All passing now. * Merge main (tests changed x_x) and pass all constraints.spec tests (pain) * Pass another painful spec suite: testing-settings * Pass perspective-toggle, interesting note * Pass samples loading tests * Pass app header tests * Pass text-to-cad tests * Pass segment-overlays (minor ache) and ability to switch to web if needed :) * Fix a ton of syntax changes and deflake 2 more tests (pain) * Correct all tsc errors * Remove to-electron script * Add an f-ton of shit because playwright doesnt want S P R E A D * Try CI again * Stop snapshots of exports (already test in e2e) * Fix flake in double click editor * Hopefully help CI flake * Fixmes, fixmes everywhere * One more fixme to settings * Skip another code pane flake * Port jess's projects.spec tests * fixup * Reuse electron window; difficult task * Rebased and refixed * Remove duplicate cases * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * Reduce the workers to something CI can handle * Lower it further, we need to think about the others * Update package.json Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com> * Update package.json Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com> * Fix the last tests and tsc errors * Timeout to 120 and windows-2022-16core * Fix windows runner detection, enable concurrency temporarily * Hopefully this time fix windows runner detection * Comment out Vector, add back removed camera test code * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * Fix camera tests again * Massively deflake a whole class of tests * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * A snapshot a day keeps the bugs away! 📷🐛 (OS: macos-14-large) * Try new CI and fix small onboarding test * Derp * No github tuning * Try mac * Add back all the OS * Lord, hallow be thy name * A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest-8-cores) * Try AWS Windows runner * Passing on windows locally with a few skips * Trigger CI * A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores) * fmt, tsc, lint * Enable two fixmes again * Fix lint, codespell, fmt * Fix lint * Don't run e2e on draft, add back concurrency, clean up * One last windows skip --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com> Co-authored-by: Pierre Jacquier <pierre@zoo.dev>
197 lines
5.9 KiB
TypeScript
197 lines
5.9 KiB
TypeScript
import { ActionFunction, LoaderFunction, redirect } from 'react-router-dom'
|
|
import { FileLoaderData, HomeLoaderData, IndexLoaderData } from './types'
|
|
import { getProjectMetaByRouteId, PATHS } from './paths'
|
|
import { isDesktop } from './isDesktop'
|
|
import { BROWSER_PATH } from 'lib/paths'
|
|
import {
|
|
BROWSER_FILE_NAME,
|
|
BROWSER_PROJECT_NAME,
|
|
PROJECT_ENTRYPOINT,
|
|
} from 'lib/constants'
|
|
import { loadAndValidateSettings } from './settings/settingsUtils'
|
|
import makeUrlPathRelative from './makeUrlPathRelative'
|
|
import { codeManager } from 'lib/singletons'
|
|
import { fileSystemManager } from 'lang/std/fileSystemManager'
|
|
import { getProjectInfo } from './desktop'
|
|
import { createSettings } from './settings/initialSettings'
|
|
import { normalizeLineEndings } from 'lib/codeEditor'
|
|
import { OnboardingStatus } from 'wasm-lib/kcl/bindings/OnboardingStatus'
|
|
|
|
// The root loader simply resolves the settings and any errors that
|
|
// occurred during the settings load
|
|
export const settingsLoader: LoaderFunction = async ({
|
|
params,
|
|
}): Promise<
|
|
ReturnType<typeof createSettings> | ReturnType<typeof redirect>
|
|
> => {
|
|
let { settings, configuration } = await loadAndValidateSettings()
|
|
|
|
// I don't love that we have to read the settings again here,
|
|
// but we need to get the project path to load the project settings
|
|
if (params.id) {
|
|
const projectPathData = await getProjectMetaByRouteId(
|
|
params.id,
|
|
configuration
|
|
)
|
|
if (projectPathData) {
|
|
const { projectPath } = projectPathData
|
|
const { settings: s } = await loadAndValidateSettings(
|
|
projectPath || undefined
|
|
)
|
|
return s
|
|
}
|
|
}
|
|
|
|
return settings
|
|
}
|
|
|
|
export const telemetryLoader: LoaderFunction = async ({
|
|
params,
|
|
}): Promise<null> => {
|
|
return null
|
|
}
|
|
|
|
// Redirect users to the appropriate onboarding page if they haven't completed it
|
|
export const onboardingRedirectLoader: ActionFunction = async (args) => {
|
|
const { settings } = await loadAndValidateSettings()
|
|
const onboardingStatus: OnboardingStatus =
|
|
settings.app.onboardingStatus.current || ''
|
|
const notEnRouteToOnboarding = !args.request.url.includes(
|
|
PATHS.ONBOARDING.INDEX
|
|
)
|
|
// '' is the initial state, 'completed' and 'dismissed' are the final states
|
|
const hasValidOnboardingStatus =
|
|
onboardingStatus.length === 0 ||
|
|
!(onboardingStatus === 'completed' || onboardingStatus === 'dismissed')
|
|
const shouldRedirectToOnboarding =
|
|
notEnRouteToOnboarding && hasValidOnboardingStatus
|
|
|
|
if (shouldRedirectToOnboarding) {
|
|
return redirect(
|
|
makeUrlPathRelative(PATHS.ONBOARDING.INDEX) + onboardingStatus.slice(1)
|
|
)
|
|
}
|
|
|
|
return settingsLoader(args)
|
|
}
|
|
|
|
export const fileLoader: LoaderFunction = async (
|
|
routerData
|
|
): Promise<FileLoaderData | Response> => {
|
|
const { params } = routerData
|
|
let { configuration } = await loadAndValidateSettings()
|
|
|
|
const projectPathData = await getProjectMetaByRouteId(
|
|
params.id,
|
|
configuration
|
|
)
|
|
const isBrowserProject = params.id === decodeURIComponent(BROWSER_PATH)
|
|
|
|
let code = ''
|
|
|
|
if (!isBrowserProject && projectPathData) {
|
|
const { projectName, projectPath, currentFileName, currentFilePath } =
|
|
projectPathData
|
|
|
|
const urlObj = new URL(routerData.request.url)
|
|
|
|
if (!urlObj.pathname.endsWith('/settings')) {
|
|
const fallbackFile = isDesktop()
|
|
? (await getProjectInfo(projectPath)).default_file
|
|
: ''
|
|
let fileExists = isDesktop()
|
|
if (currentFilePath && fileExists) {
|
|
try {
|
|
await window.electron.stat(currentFilePath)
|
|
} catch (e) {
|
|
if (e === 'ENOENT') {
|
|
fileExists = false
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!fileExists || !currentFileName || !currentFilePath || !projectName) {
|
|
return redirect(
|
|
`${PATHS.FILE}/${encodeURIComponent(
|
|
isDesktop() ? fallbackFile : params.id + '/' + PROJECT_ENTRYPOINT
|
|
)}`
|
|
)
|
|
}
|
|
|
|
code = await window.electron.readFile(currentFilePath, {
|
|
encoding: 'utf-8',
|
|
})
|
|
code = normalizeLineEndings(code)
|
|
|
|
// If persistCode in localStorage is present, it'll persist that code
|
|
// through *anything*. INTENDED FOR TESTS.
|
|
code = codeManager.localStoragePersistCode() || code
|
|
|
|
// Update both the state and the editor's code.
|
|
// We explicitly do not write to the file here since we are loading from
|
|
// the file system and not the editor.
|
|
codeManager.updateCurrentFilePath(currentFilePath)
|
|
// We pass true on the end here to clear the code editor history.
|
|
// This way undo and redo are not super weird when opening new files.
|
|
codeManager.updateCodeStateEditor(code, true)
|
|
}
|
|
|
|
// Set the file system manager to the project path
|
|
// So that WASM gets an updated path for operations
|
|
fileSystemManager.dir = projectPath
|
|
|
|
const defaultProjectData = {
|
|
name: projectName || 'unnamed',
|
|
path: projectPath,
|
|
children: [],
|
|
kcl_file_count: 0,
|
|
directory_count: 0,
|
|
metadata: null,
|
|
default_file: projectPath,
|
|
}
|
|
|
|
const maybeProjectInfo = isDesktop()
|
|
? await getProjectInfo(projectPath)
|
|
: null
|
|
|
|
const projectData: IndexLoaderData = {
|
|
code,
|
|
project: maybeProjectInfo ?? defaultProjectData,
|
|
file: {
|
|
name: currentFileName || '',
|
|
path: currentFilePath || '',
|
|
children: [],
|
|
},
|
|
}
|
|
|
|
return {
|
|
...projectData,
|
|
}
|
|
}
|
|
|
|
return {
|
|
code,
|
|
project: {
|
|
name: BROWSER_PROJECT_NAME,
|
|
path: '/' + BROWSER_PROJECT_NAME,
|
|
children: [],
|
|
},
|
|
file: {
|
|
name: BROWSER_FILE_NAME,
|
|
path: decodeURIComponent(BROWSER_PATH),
|
|
children: [],
|
|
},
|
|
}
|
|
}
|
|
|
|
// Loads the settings and by extension the projects in the default directory
|
|
// and returns them to the Home route, along with any errors that occurred
|
|
export const homeLoader: LoaderFunction = async (): Promise<
|
|
HomeLoaderData | Response
|
|
> => {
|
|
if (!isDesktop()) {
|
|
return redirect(PATHS.FILE + '/%2F' + BROWSER_PROJECT_NAME)
|
|
}
|
|
return {}
|
|
}
|