Log UI work, fix test

in4it · Sep 27, 2024 · 7e4fe01 · 7e4fe01
1 parent ab46309
commit 7e4fe01
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/pkg/observability/logs_test.go b/pkg/observability/logs_test.go
@@ -54,7 +54,7 @@ func TestGetLogs(t *testing.T) {
 	maxLogLines := 100
 	search := ""
 
-	logEntryResponse, err := o.getLogs(now, now, 0, maxLogLines, 0, search)
+	logEntryResponse, err := o.getLogs(now, now, 0, maxLogLines, 0, search, []string{}, []KeyValue{})
 	if err != nil {
 		t.Fatalf("get logs error: %s", err)
 	}

diff --git a/webapp/src/Routes/Logs/Logs.tsx b/webapp/src/Routes/Logs/Logs.tsx
@@ -140,15 +140,27 @@ export function Logs() {
                     <Button variant="default" size="xs">Columns</Button>
                   </Popover.Target>
                   <Popover.Dropdown>
-                    <MultiSelect
-                          searchable
-                          hidePickedOptions
-                          comboboxProps={{ offset: 0, withinPortal: false}}
-                          data={data?.pages[0].tags.map((tag) => { return tag.key })}
-                          value={columns}
-                          onChange={setColumns}
-                          size="xs"
-                      />
+                      {data?.pages[0].tags
+                      .filter((element, i) => {
+                        if(i === 0 || element.key !== data?.pages[0].tags[i-1].key) {
+                          return true
+                        } else {
+                          return false
+                        }
+                      })
+                      .map((element) => {
+                        return (
+                          <Checkbox
+                            key={element.key}
+                            label={element.key}
+                            radius="xs"
+                            size="xs"
+                            style={{marginBottom: 3}}
+                            onChange={(event) => event.currentTarget.checked ? setColumns([...columns, element.key]) : setColumns(columns.filter((column) => { return column !== element.key } ))}
+                            checked={columns.some((column) => column === element.key)}
+                          />
+                        )
+                      })}
                   </Popover.Dropdown>
                 </Popover>   
                 <Popover width={300} position="bottom" withArrow shadow="md">