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
8 changes: 7 additions & 1 deletion src/backend/shared/utils/default-zod-schema-values.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-unsafe-argument */
Expand All @@ -20,7 +20,13 @@
} from 'zod'

export const getDefaultSchemaValues = (schema: ZodTypeAny): unknown => {
if (schema instanceof ZodDefault) return schema._def.defaultValue()
if (schema instanceof ZodDefault) {
const innerType = schema._def.innerType as ZodTypeAny
if (innerType instanceof ZodObject) {
return getDefaultSchemaValues(innerType)
}
return schema._def.defaultValue()
}
if (schema instanceof ZodObject) {
const shape = schema.shape
return Object.fromEntries(Object.entries(shape).map(([k, v]) => [k, getDefaultSchemaValues(v as ZodTypeAny)]))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
import { useState } from 'react'
import { Controller, SubmitHandler, useForm } from 'react-hook-form'
Expand Down Expand Up @@ -42,9 +42,7 @@
const [intervalValue, setIntervalValue] = useState('T#20ms')
const projectPort = useProject()
const {
projectActions: { setProject },
deviceActions: { setDeviceDefinitions },
workspaceActions: { setEditingState },
sharedWorkspaceActions: { handleOpenProjectResponse },
} = useOpenPLCStore()

const handleFormSubmit: SubmitHandler<FormData> = async (data) => {
Expand Down Expand Up @@ -73,18 +71,7 @@
return
}

// Hydrate store with returned project data
setProject({
meta: result.data.meta,
data: result.data.projectData,
})
if (result.data.deviceConfiguration || result.data.devicePinMapping) {
setDeviceDefinitions({
configuration: result.data.deviceConfiguration,
pinMapping: result.data.devicePinMapping,
})
}
setEditingState('saved')
handleOpenProjectResponse(result.data)
} catch (_error) {
toast({
title: 'Cannot create a project!',
Expand Down
6 changes: 5 additions & 1 deletion src/middleware/editor-platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export function setRuntimeIpAddress(ip: string): void {
_runtimeIpAddress = ip
}

// macOS has a native application menu bar; Windows and Linux do not
// (the Electron menu is hidden on those platforms — see menu.ts buildDefaultTemplate).
const isMac = navigator.platform.startsWith('Mac')

/**
* Editor platform ports — all port interfaces wired to Electron IPC bridge.
*/
Expand All @@ -54,5 +58,5 @@ export const editorPorts: PlatformPorts = {
accelerator: createEditorAcceleratorAdapter(),
theme: createEditorThemeAdapter(),
versionControl: createEditorVersionControlAdapter(),
capabilities: { ...EDITOR_CAPABILITIES, isDevMode: process.env.NODE_ENV === 'development' },
capabilities: { ...EDITOR_CAPABILITIES, isDevMode: process.env.NODE_ENV === 'development', hasNativeMenu: isMac },
}
Loading