Skip to content
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

Jump to bottom

fix: flyte decks height #813

Merged
merged 4 commits into from
Aug 9, 2023
Merged

fix: flyte decks height #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adce429
fix: flyte decks height
ursucarina Aug 9, 2023
29993e0
chore: cleanup
ursucarina Aug 9, 2023
c2860fd
chore: cleanup
ursucarina Aug 9, 2023
170af69
chore: cleanup
ursucarina Aug 9, 2023
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
2 changes: 1 addition & 1 deletion packages/console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flyteorg/console",
"version": "0.0.48",
"version": "0.0.49",
"description": "Flyteconsole main app module",
"main": "./dist/index.js",
"module": "./lib/index.js",
Expand Down
18 changes: 16 additions & 2 deletions packages/console/src/components/Executions/ExecutionDetails/ExecutionDetailsActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import React, { useEffect, useState } from 'react';
import { Button, Dialog, Grid, IconButton } from '@material-ui/core';
import {
Button,
Dialog,
DialogContent,
Grid,
IconButton,
} from '@material-ui/core';
import { ResourceIdentifier, Identifier } from 'models/Common/types';
import { makeStyles, Theme } from '@material-ui/core/styles';
import { getTask } from 'models/Task/api';
Expand Down Expand Up @@ -224,7 +230,15 @@ export const ExecutionDetailsActions = ({
</IconButton>
</Grid>
</Grid>
<ExecutionNodeDeck nodeExecutionId={nodeExecutionId} />

<DialogContent
style={{
padding: 0,
overflow: 'hidden',
}}
>
<ExecutionNodeDeck nodeExecutionId={nodeExecutionId} />
</DialogContent>
</Dialog>
)}
</>
Expand Down
15 changes: 10 additions & 5 deletions packages/console/src/components/Executions/ExecutionDetails/ExecutionNodeDeck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
import React from 'react';
import { useDownloadLink } from 'components/hooks/useDataProxy';
import { WaitForData } from 'components/common/WaitForData';
import * as React from 'react';
import { Core } from '@flyteorg/flyteidl-types';
import { LoadingSpinner, WaitForData } from 'components/common';

/** Fetches and renders the deck data for a given `nodeExecutionId` */
export const ExecutionNodeDeck: React.FC<{
nodeExecutionId: Core.NodeExecutionIdentifier;
className?: string;
}> = ({ nodeExecutionId, className = '' }) => {
const downloadLink = useDownloadLink(nodeExecutionId);
const iFrameSrc = downloadLink?.value?.signedUrl?.[0];

Check warning on line 12 in packages/console/src/components/Executions/ExecutionDetails/ExecutionNodeDeck.tsx

View check run for this annotation

Codecov / codecov/patch

packages/console/src/components/Executions/ExecutionDetails/ExecutionNodeDeck.tsx#L12 

Added line #L12 was not covered by tests

return (
<WaitForData {...downloadLink}>
<WaitForData {...downloadLink} loadingComponent={LoadingSpinner}>
<iframe
title="deck"
src={iFrameSrc}
width="100%"
height="100%"
src={downloadLink?.value?.signedUrl?.[0]}
className={className}
style={{ border: 'none' }}
style={{
border: 'none',
width: '100%',
height: '100%',
}}
/>
</WaitForData>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/console/src/components/Launch/LaunchForm/inputHelpers/union.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import t from '../../../common/strings';
import { getInputDefintionForLiteralType } from '../utils';

export function isScalarType(value: any): value is Literal {
return isObject(value) && !value.type && !!(value as any).scalar;
return isObject(value) && !(value as any).type && !!(value as any).scalar;
}

function getUnionValueFromUnknownLiteral(
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"dependencies": {
"@flyteorg/common": "^0.0.4",
"@flyteorg/console": "^0.0.48",
"@flyteorg/console": "^0.0.49",
"long": "^4.0.0",
"protobufjs": "~6.11.3",
"react-ga4": "^1.4.1",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2032,7 +2032,7 @@ __metadata:
resolution: "@flyteconsole/client-app@workspace:website"
dependencies:
"@flyteorg/common": ^0.0.4
"@flyteorg/console": ^0.0.48
"@flyteorg/console": ^0.0.49
"@types/long": ^3.0.32
long: ^4.0.0
protobufjs: ~6.11.3
Expand Down Expand Up @@ -2071,7 +2071,7 @@ __metadata:
languageName: unknown
linkType: soft

"@flyteorg/console@^0.0.48, @flyteorg/console@workspace:packages/console":
"@flyteorg/console@^0.0.49, @flyteorg/console@workspace:packages/console":
version: 0.0.0-use.local
resolution: "@flyteorg/console@workspace:packages/console"
dependencies:
Expand Down
Loading