Merge pull request #343 from opengovern/ui-changes

feat: update tasks

Author: mohamadch91

Diff for: services/webui/src/App.tsx

@@ -15,6 +15,7 @@ import { useAuthApiV1MeList, useAuthApiV1UserDetail } from './api/auth.gen'
 import { PlatformEnginePkgAuthApiTheme } from './api/api'
 import { Modal } from '@cloudscape-design/components'
 import axios from 'axios'
+import { Widget, WidgetToAPI } from './utilities/widget'
 
 
 export default function App() {
@@ -119,9 +120,11 @@ const SetDefaultLayout = (layout: any, meResponse: any) => {
     }
     const body = {
         user_id: meResponse?.username,
-        layout_config: layout,
-        name: 'Default',
-        description: 'Default Layout',
+        widgets: layout?.widgets?.map(((widget : Widget) => {
+            return WidgetToAPI(widget, meResponse?.username, true)
+        })),
+        name: layout?.name,
+        description: layout?.description,
         is_default: true,
         is_private: true,
     }

Diff for: services/webui/src/pages/Tasks/TaskDetail/index.tsx

@@ -294,7 +294,7 @@ export default function TaskDetail() {
                                                             {typeof selected
                                                                 ?.params[
                                                                 key
-                                                            ] === 'string' ? (
+                                                            ] != 'object' ? (
                                                                 <Text>
                                                                     {
                                                                         selected

Diff for: services/webui/src/utilities/widget.tsx

@@ -0,0 +1,74 @@
+
+export interface Widget {
+    id:           string;
+    data:         Data;
+    rowSpan:      number;
+    columnSpan:   number;
+    columnOffset: number;
+}
+
+export interface ColumnOffset {
+    "4": number;
+}
+
+export interface Data {
+    componentId: string
+    title: string
+    description: string
+    user_id: string
+    is_public: boolean
+    props: any
+}
+
+
+
+export interface Kpi {
+    info:      string;
+    count_kpi: string;
+    list_kpi:  string;
+}
+
+export interface WidgetAPI {
+    id:           string;
+    title:        string;
+    description: string;
+    widget_type: string;
+    widget_props: any;
+    user_id:   string;
+    is_public: boolean;
+    row_span:      number;
+    column_span:   number;
+    column_offset: number;
+}
+
+export const  WidgetToAPI = (widget: Widget,user_id : string,is_public: boolean) => {
+    const widgetAPI  = {} as WidgetAPI
+    widgetAPI.id = widget.id
+    widgetAPI.title = widget.data.title
+    widgetAPI.description = widget.data.description
+    widgetAPI.widget_type = widget.data.componentId
+    widgetAPI.widget_props = widget.data.props
+    widgetAPI.user_id = user_id
+    widgetAPI.is_public = is_public
+    widgetAPI.row_span = widget.rowSpan
+    widgetAPI.column_span = widget.columnSpan
+    widgetAPI.column_offset = widget.columnOffset
+    return widgetAPI
+
+}
+export const APIToWidget = (widget: WidgetAPI) => {
+    const widgetData = {} as Widget
+    widgetData.id = widget.id
+    widgetData.data = {
+        componentId: widget.widget_type,
+        title: widget.title,
+        description: widget.description,
+        user_id: widget.user_id,
+        is_public: widget.is_public,
+        props: widget.widget_props,
+    }
+    widgetData.rowSpan = widget.row_span
+    widgetData.columnSpan = widget.column_span
+    widgetData.columnOffset = widget.column_offset
+    return widgetData
+}