Skip to content

feat: update set deafult layout and dashbord save #346

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

Merged
merged 1 commit into from
Apr 17, 2025
Merged

feat: update set deafult layout and dashbord save #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions services/webui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions services/webui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"swagger-typescript-api": "^13.0.23",
"swr": "^2.2.4",
"typescript": "^4.9.5",
"uuid": "^11.1.0",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
2 changes: 0 additions & 2 deletions services/webui/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ const GetLayout = (meResponse :any) => {
})
}
const SetDefaultLayout = (layout: any, meResponse: any) => {
console.log(layout)
let url = ''
if (window.location.origin === 'http://localhost:3000') {
url = window.__RUNTIME_CONFIG__.REACT_APP_BASE_URL
Expand All @@ -131,7 +130,6 @@ const SetDefaultLayout = (layout: any, meResponse: any) => {
is_default: true,
is_private: true,
}
console.log(body)

axios
.post(`${url}/main/core/api/v4/layout/set/widgets`, body, config)
Expand Down
104 changes: 60 additions & 44 deletions services/webui/src/components/widgets/WidgetLayout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import { array } from 'prop-types'
import Shortcuts from '../Shortcuts'
import Integrations from '../Integrations'
import SRE from '../KPI_Cards'
import { APIToWidget, WidgetAPI, WidgetToAPI } from '../../../utilities/widget'

import { APIToWidget, Widget, WidgetAPI, WidgetToAPI } from '../../../utilities/widget'
import { v4 as uuid } from 'uuid'
const COMPONENT_MAPPING = {
table: TableWidget,
chart: ChartWidget,
Expand Down Expand Up @@ -121,7 +121,9 @@ export default function WidgetLayout({
id: layout?.id,
is_default: layout.is_default,
user_id: me?.username,
layout_config: layout_config,
widget_ids: layout_config?.map((widget: any) => {
return widget?.id
}),
name: layout.name,
description: layout.description,
is_private: layout.is_private,
Expand All @@ -134,43 +136,57 @@ export default function WidgetLayout({
console.log(err)
})
}
const GetDefaultLayout = () => {
setLayoutLoading(true)
let url = ''
if (window.location.origin === 'http://localhost:3000') {
url = window.__RUNTIME_CONFIG__.REACT_APP_BASE_URL
} else {
url = window.location.origin
}
// @ts-ignore
const token = JSON.parse(localStorage.getItem('openg_auth')).token
const GetDefaultLayout = () => {
const id = layout?.id
axios
.get(
`https://raw.githubusercontent.com/opengovern/platform-configuration/refs/heads/main/default_layout.json`
)
.then((res) => {
SetDefaultLayoutWithDashbord(res?.data, me, id)
setLayout(res?.data)

const config = {
headers: {
Authorization: `Bearer ${token}`,
},
}
const body = {
user_id: me?.username,
}
setLayoutLoading(false)
})
.catch((err) => {
setLayoutLoading(false)
})
}
const SetDefaultLayoutWithDashbord = (layout: any, meResponse: any,id: string) => {
let url = ''
if (window.location.origin === 'http://localhost:3000') {
url = window.__RUNTIME_CONFIG__.REACT_APP_BASE_URL
} else {
url = window.location.origin
}
// @ts-ignore
const token = JSON.parse(localStorage.getItem('openg_auth')).token

const config = {
headers: {
Authorization: `Bearer ${token}`,
},
}
const body = {
user_id: meResponse?.username,
widgets: layout?.widgets?.map((widget: Widget) => {
return WidgetToAPI(widget, meResponse?.username, true, true)
}),
name: layout?.name,
description: layout?.description,
is_default: true,
is_private: true,
id: id,
}

axios
.post(`${url}/main/core/api/v4/layout/set/widgets`, body, config)
.then((res) => {})
.catch((err) => {
console.log(err)
})
}

axios
.post(`${url}/main/core/api/v4/layout/get-default`, body, config)
.then((res) => {
const layout = res?.data
layout.widgets = layout?.widgets?.map((widget: WidgetAPI) => {
return APIToWidget(widget)
})
setLayout(res?.data)
setLayoutLoading(false)
})
.catch((err) => {
console.log(err)
// check if error is 404
GetDefaultLayout()
setLayoutLoading(false)
})
}
const HandleRemoveItemByID = (id: string) => {
const newItems = items.filter((item: any) => item.id !== id)
setItems(newItems)
Expand Down Expand Up @@ -323,7 +339,7 @@ export default function WidgetLayout({
return
}
const newItem = {
id: `${selectedAddItem}-${items?.length}`,
id: uuid(),
data: {
componentId: selectedAddItem,
props: widgetProps,
Expand Down Expand Up @@ -351,7 +367,7 @@ export default function WidgetLayout({
}
if (id == 'integration') {
const new_item = {
id: 'integration',
id: uuid(),
data: {
componentId: 'integration',
title: 'Integrations',
Expand All @@ -366,7 +382,7 @@ export default function WidgetLayout({
}
if (id == 'shortcut') {
const new_item = {
id: 'shortcut',
id: uuid(),
data: {
componentId: 'shortcut',
title: 'Shortcuts',
Expand All @@ -381,7 +397,7 @@ export default function WidgetLayout({
}
if (id == 'sre') {
const new_item = {
id: 'sre',
id: uuid(),
data: {
componentId: 'sre',
title: 'SRE',
Expand Down Expand Up @@ -493,7 +509,7 @@ export default function WidgetLayout({
// description={}
actions={
<div className="flex flex-row gap-2">
{/* <ButtonDropdown
<ButtonDropdown
items={[
{ id: 'add', text: 'Add new dashboard' },

Expand Down Expand Up @@ -547,7 +563,7 @@ export default function WidgetLayout({
ariaLabel="Board item settings"
>
Add Widget
</ButtonDropdown> */}
</ButtonDropdown>
</div>
}
>
Expand Down