This commit is contained in:
Frank Noirot
2025-02-07 17:51:24 -05:00
parent e2dd6e742a
commit 5e89683801
2 changed files with 40 additions and 31 deletions

View File

@ -99,8 +99,8 @@ export const FileMachineProvider = ({
navigate( navigate(
`..${PATHS.FILE}/${encodeURIComponent( `..${PATHS.FILE}/${encodeURIComponent(
context.selectedDirectory + context.selectedDirectory +
window.electron.path.sep + window.electron.path.sep +
event.output.name event.output.name
)}` )}`
) )
} else if ( } else if (
@ -163,7 +163,9 @@ export const FileMachineProvider = ({
) )
} else { } else {
const codeToWrite = changeKclSettings(input.content ?? '', { const codeToWrite = changeKclSettings(input.content ?? '', {
defaultLengthUnits: unitLengthToUnitLen(settings.context.modeling.defaultUnit.current), defaultLengthUnits: unitLengthToUnitLen(
settings.context.modeling.defaultUnit.current
),
defaultAngleUnits: { type: 'Degrees' }, defaultAngleUnits: { type: 'Degrees' },
}) })
if (err(codeToWrite)) return Promise.reject(codeToWrite) if (err(codeToWrite)) return Promise.reject(codeToWrite)
@ -198,7 +200,9 @@ export const FileMachineProvider = ({
createdPath = path createdPath = path
const codeToWrite = changeKclSettings(input.content ?? '', { const codeToWrite = changeKclSettings(input.content ?? '', {
defaultLengthUnits: unitLengthToUnitLen(settings.context.modeling.defaultUnit.current), defaultLengthUnits: unitLengthToUnitLen(
settings.context.modeling.defaultUnit.current
),
defaultAngleUnits: { type: 'Degrees' }, defaultAngleUnits: { type: 'Degrees' },
}) })
if (err(codeToWrite)) return Promise.reject(codeToWrite) if (err(codeToWrite)) return Promise.reject(codeToWrite)
@ -316,8 +320,9 @@ export const FileMachineProvider = ({
} }
return { return {
message: `Successfully deleted ${isDir ? 'folder' : 'file'} "${input.name message: `Successfully deleted ${isDir ? 'folder' : 'file'} "${
}"`, input.name
}"`,
} }
}), }),
}, },

View File

@ -86,25 +86,25 @@ const ProjectsContextWeb = ({ children }: { children: React.ReactNode }) => {
const [state, send, actor] = useMachine( const [state, send, actor] = useMachine(
projectsMachine.provide({ projectsMachine.provide({
actions: { actions: {
navigateToProject: () => { }, navigateToProject: () => {},
navigateToProjectIfNeeded: () => { }, navigateToProjectIfNeeded: () => {},
navigateToFile: () => { }, navigateToFile: () => {},
toastSuccess: ({ event }) => toastSuccess: ({ event }) =>
toast.success( toast.success(
('data' in event && typeof event.data === 'string' && event.data) || ('data' in event && typeof event.data === 'string' && event.data) ||
('output' in event && ('output' in event &&
'message' in event.output && 'message' in event.output &&
typeof event.output.message === 'string' && typeof event.output.message === 'string' &&
event.output.message) || event.output.message) ||
'' ''
), ),
toastError: ({ event }) => toastError: ({ event }) =>
toast.error( toast.error(
('data' in event && typeof event.data === 'string' && event.data) || ('data' in event && typeof event.data === 'string' && event.data) ||
('output' in event && ('output' in event &&
typeof event.output === 'string' && typeof event.output === 'string' &&
event.output) || event.output) ||
'' ''
), ),
}, },
actors: { actors: {
@ -125,7 +125,9 @@ const ProjectsContextWeb = ({ children }: { children: React.ReactNode }) => {
// Browser version doesn't navigate, just overwrites the current file // Browser version doesn't navigate, just overwrites the current file
clearImportSearchParams() clearImportSearchParams()
const codeToWrite = changeKclSettings(input.code ?? '', { const codeToWrite = changeKclSettings(input.code ?? '', {
defaultLengthUnits: unitLengthToUnitLen(settings.context.modeling.defaultUnit.current), defaultLengthUnits: unitLengthToUnitLen(
settings.context.modeling.defaultUnit.current
),
defaultAngleUnits: { type: 'Degrees' }, defaultAngleUnits: { type: 'Degrees' },
}) })
if (err(codeToWrite)) return Promise.reject(codeToWrite) if (err(codeToWrite)) return Promise.reject(codeToWrite)
@ -305,19 +307,19 @@ const ProjectsContextDesktop = ({
toastSuccess: ({ event }) => toastSuccess: ({ event }) =>
toast.success( toast.success(
('data' in event && typeof event.data === 'string' && event.data) || ('data' in event && typeof event.data === 'string' && event.data) ||
('output' in event && ('output' in event &&
'message' in event.output && 'message' in event.output &&
typeof event.output.message === 'string' && typeof event.output.message === 'string' &&
event.output.message) || event.output.message) ||
'' ''
), ),
toastError: ({ event }) => toastError: ({ event }) =>
toast.error( toast.error(
('data' in event && typeof event.data === 'string' && event.data) || ('data' in event && typeof event.data === 'string' && event.data) ||
('output' in event && ('output' in event &&
typeof event.output === 'string' && typeof event.output === 'string' &&
event.output) || event.output) ||
'' ''
), ),
}, },
actors: { actors: {
@ -381,8 +383,8 @@ const ProjectsContextDesktop = ({
input.method === 'newProject' input.method === 'newProject'
? PROJECT_ENTRYPOINT ? PROJECT_ENTRYPOINT
: input.name.endsWith(FILE_EXT) : input.name.endsWith(FILE_EXT)
? input.name ? input.name
: input.name + FILE_EXT : input.name + FILE_EXT
let message = 'File created successfully' let message = 'File created successfully'
const needsInterpolated = doesProjectNameNeedInterpolated(projectName) const needsInterpolated = doesProjectNameNeedInterpolated(projectName)
@ -414,7 +416,9 @@ const ProjectsContextDesktop = ({
fileName = name fileName = name
const codeToWrite = changeKclSettings(input.code ?? '', { const codeToWrite = changeKclSettings(input.code ?? '', {
defaultLengthUnits: unitLengthToUnitLen(settings.context.modeling.defaultUnit.current), defaultLengthUnits: unitLengthToUnitLen(
settings.context.modeling.defaultUnit.current
),
defaultAngleUnits: { type: 'Degrees' }, defaultAngleUnits: { type: 'Degrees' },
}) })
if (err(codeToWrite)) return Promise.reject(codeToWrite) if (err(codeToWrite)) return Promise.reject(codeToWrite)