Skip to content

Commit ba0f15d

Browse files
Added fixes for logs and for local image. (#541)
Co-authored-by: [email protected] <[email protected]>
1 parent c4d7e60 commit ba0f15d

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

dashboard/src/components/custom-node-no-interaction/CustomNodeNoInteraction.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ interface Props {
3333
log: string,
3434
isInteractive: boolean,
3535
menuItems?: NodeMenuItem[],
36+
taskId: string;
3637
};
3738
}
3839

39-
const CustomNodeNoInteraction = ({ data: { status, label, isInteractive, menuItems } }: Props) => {
40+
const CustomNodeNoInteraction = ({ data: { status, label, isInteractive, menuItems, taskId } }: Props) => {
4041
const connectionNodeId = useStore(connectionNodeIdSelector);
4142
const [ statusColor, setStatusColor ] = useState('green');
4243
const [ tooltip, setTooltip ] = useState('green');
@@ -69,7 +70,7 @@ const CustomNodeNoInteraction = ({ data: { status, label, isInteractive, menuIte
6970
<PopoverBody>
7071
{
7172
menuItems.map(item =>
72-
<Box className="custom-node-no-interaction-menu-item" key={item.label} onClick={() => { item.callback({ taskName: label, tasks: item.tasks }) }}>
73+
<Box className="custom-node-no-interaction-menu-item" key={item.label} onClick={() => { item.callback({ taskName: label, taskId, tasks: item.tasks }) }}>
7374
{ item.label }
7475
</Box>
7576
)

dashboard/src/features/job-details/components/job-topology/JobTopology.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ const JobTopology = ({ tasks, experiment, runs, mutate }: Props) => {
5656
}, [tasks])
5757

5858

59-
const onLogsDisplay = (data: { taskName: string, tasks: Task[] }) => {
60-
const taskLog = data.tasks?.find(task => task.role === data.taskName)?.log || '';
59+
const onLogsDisplay = (data: { taskName: string, taskId: string, tasks: Task[] }) => {
60+
const taskLog = data.tasks?.find(task => task.taskId === data.taskId)?.log || '';
6161
setTaskName(data.taskName);
6262
setTaskLog(taskLog);
6363
onOpen();
@@ -68,8 +68,9 @@ const JobTopology = ({ tasks, experiment, runs, mutate }: Props) => {
6868
const edges = getEdges(tasks);
6969
const nodes = getNodes(
7070
getTasksWithLevelsAndCounts(tasks).map(task => ({
71-
...task,
72-
menuItems: getNodeMenuOptions(task)
71+
...task,
72+
menuItems: getNodeMenuOptions(task),
73+
taskId: task.taskId
7374
}))
7475
);
7576
const layouted = getGraphLayoutedElements(nodes, edges, 'TB', 200, 200);

dashboard/src/features/job-details/components/task-logs/TaskLogs.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import { Box, Icon, IconButton, Menu, MenuButton, Text, MenuItem, MenuList, Modal, ModalBody, ModalCloseButton, ModalContent, ModalHeader, ModalOverlay, Table, TableContainer, Tbody, Td, Th, Thead, Tr } from '@chakra-ui/react'
2-
import { colors } from '@mui/material';
1+
import { Text, Modal, ModalBody, ModalCloseButton, ModalContent, ModalHeader, ModalOverlay, Table, TableContainer, Tbody, Td, Th, Thead, Tr } from '@chakra-ui/react'
32
import React, { useEffect, useRef, useState } from 'react'
4-
import { FaEllipsisVertical } from 'react-icons/fa6';
53
import { COLORS } from '../../../../constants';
6-
import { Design } from '../../../../entities/Design';
74
import { getMappedLogs } from '../../utils';
85

96
interface Props {

dashboard/src/features/job-details/utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ export const getNodes = (tasks: Task[]) => {
108108
label: task.role,
109109
id: task.taskId,
110110
status: task.state,
111-
menuItems: task.menuItems
111+
menuItems: task.menuItems,
112+
taskId: task.taskId
112113
},
113114
position: { x: 0, y: 0 },
114115
type: 'customNodeNoInteraction',

fiab/helm-chart/control/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ minio:
6363
hosts:
6464
- minio.flame.test
6565

66-
imageName: ciscoresearch/flame
67-
imageTag: v0.4.0
68-
workerImageName: ciscoresearch/flame
69-
workerImageTag: v0.4.0
66+
imageName: flame
67+
imageTag: dev
68+
workerImageName: flame
69+
workerImageTag: dev
7070

7171
broker:
7272
- sort: mqtt

0 commit comments

Comments
 (0)