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
15 changes: 13 additions & 2 deletions console/packages/starwhale-core/src/widget/WidgetFactory.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { WidgetGroupType, WidgetType } from '../types'
import WidgetPlugin from './WidgetPlugin'
import { generateId } from '../utils/generators'
import modules from './WidgetModules'

export type DerivedPropertiesMap = Record<string, string>

Expand All @@ -16,6 +17,10 @@ class WidgetFactory {
}
}

static hasWidget(widgetType: WidgetType) {
return this.widgetMap.has(widgetType)
}

static getWidgetTypes(): WidgetType[] {
return Array.from(this.widgetMap.keys())
}
Expand All @@ -27,12 +32,12 @@ class WidgetFactory {
}

static getWidget(widgetType: WidgetType) {
if (!this.widgetTypes[widgetType]) return null
if (!this.widgetTypes[widgetType]) return undefined
return this.widgetMap.get(widgetType)
}

static newWidget(widgetType: WidgetType) {
if (!this.widgetMap.has(widgetType)) return null
if (!this.widgetMap.has(widgetType)) return undefined
const widget = this.widgetMap.get(widgetType) as WidgetPlugin
const id = generateId(widget.defaults?.group ?? '')

Expand All @@ -47,4 +52,10 @@ class WidgetFactory {
}
}

modules.forEach((w: WidgetPlugin<any>) => {
if (!w.getType()) return
if (WidgetFactory.hasWidget(w.getType())) return
WidgetFactory.register(w.getType(), w)
})

export default WidgetFactory
7 changes: 7 additions & 0 deletions console/packages/starwhale-core/src/widget/WidgetModules.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import DNDListWidget from '@starwhale/widgets/DNDListWidget'
import SectionWidget from '@starwhale/widgets/SectionWidget'
import PanelTableWidget from '@starwhale/widgets/PanelTableWidget'
import PanelRocAucWidget from '@starwhale/widgets/PanelRocAucWidget'
import PanelHeatmapWidget from '@starwhale/widgets/PanelConfusionMatrixWidget'

export default [DNDListWidget, SectionWidget, PanelTableWidget, PanelRocAucWidget, PanelHeatmapWidget]
17 changes: 2 additions & 15 deletions console/packages/starwhale-core/src/widget/hooks/useWidget.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,12 @@
import { useEffect, useState } from 'react'
import DNDListWidget from '@starwhale/widgets/DNDListWidget'
import SectionWidget from '@starwhale/widgets/SectionWidget'
import PanelTableWidget from '@starwhale/widgets/PanelTableWidget'
import PanelRocAucWidget from '@starwhale/widgets/PanelRocAucWidget'
import PanelHeatmapWidget from '@starwhale/widgets/PanelConfusionMatrixWidget'
import WidgetFactory from '../WidgetFactory'
import WidgetPlugin from '../WidgetPlugin'

const modules = [DNDListWidget, SectionWidget, PanelTableWidget, PanelRocAucWidget, PanelHeatmapWidget]

export function useWidget(widgetType: string) {
const [widget, setWidget] = useState<WidgetPlugin | undefined>(WidgetFactory.widgetMap.get(widgetType))
const [widget, setWidget] = useState<WidgetPlugin | undefined>(WidgetFactory.getWidget(widgetType))

useEffect(() => {
if (!WidgetFactory.widgetMap.has(widgetType)) {
modules.forEach((w: WidgetPlugin<any>) => {
if (w.getType() === widgetType) WidgetFactory.register(w.getType(), w)
})
}

const temp = WidgetFactory.widgetMap.get(widgetType)
const temp = WidgetFactory.getWidget(widgetType)

if (temp && temp !== widget) {
setWidget(temp)
Expand Down
2 changes: 1 addition & 1 deletion console/src/domain/model/services/modelVersion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export async function fetchModelVersionPanelSetting(
token: string
) {
return fetchModelVersionFile(projectName, modelName, modelVersionId, token, 'eval_panel_layout.json').then((raw) =>
JSON.parse(raw)
raw ? JSON.parse(raw) : undefined
)
}

Expand Down