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

feat: added RawOutputDataConfig in ExecutionSpec #patch #329

Merged
merged 10 commits into from
Mar 18, 2022
Merged

feat: added RawOutputDataConfig in ExecutionSpec #patch #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81ddad5
feat: added RawOutputDataConfig in ExecutionSpec
pingsutw Mar 15, 2022
931b2dc
Merged master
pingsutw Mar 17, 2022
ff80038
Lint fixed
pingsutw Mar 17, 2022
33ff020
Lint fixed
pingsutw Mar 17, 2022
992e39a
Lint fixed
pingsutw Mar 17, 2022
a06ac41
Lint fixed
pingsutw Mar 17, 2022
c2f2eed
Lint fixed
pingsutw Mar 17, 2022
ed1c3f3
Lint fixed
pingsutw Mar 17, 2022
f5b0f4e
Lint fixed
pingsutw Mar 17, 2022
5a8818d
Lint fixed
pingsutw Mar 17, 2022
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@date-io/moment": "1.3.9",
"@flyteorg/flyteidl": "0.21.24",
"@flyteorg/flyteidl": "0.23.1",
"@material-ui/core": "^4.0.0",
"@material-ui/icons": "^4.0.0",
"@material-ui/pickers": "^3.2.2",
Expand Down
118 changes: 49 additions & 69 deletions src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ import { getLaunchPlan } from 'models/Launch/api';
import { LaunchPlanSpec } from 'models/Launch/types';

const useStyles = makeStyles((theme: Theme) => {
return {
detailItem: {
flexShrink: 0,
marginLeft: theme.spacing(4)
}
};
return {
detailItem: {
flexShrink: 0,
marginLeft: theme.spacing(4)
}
};
});

interface DetailItem {
className?: string;
label: React.ReactNode;
value: React.ReactNode;
className?: string;
label: React.ReactNode;
value: React.ReactNode;
}

/**
Expand All @@ -29,70 +29,50 @@ interface DetailItem {
* @constructor
*/
export const ExecutionMetadataExtra: React.FC<{
execution: Execution;
execution: Execution;
}> = ({ execution }) => {
const commonStyles = useCommonStyles();
const styles = useStyles();
const commonStyles = useCommonStyles();
const styles = useStyles();

const {
launchPlan: launchPlanId,
maxParallelism,
authRole
} = execution.spec;
const { launchPlan: launchPlanId, maxParallelism, rawOutputDataConfig, authRole } = execution.spec;

const [launchPlanSpec, setLaunchPlanSpec] = React.useState<
Partial<LaunchPlanSpec>
>({});
const [launchPlanSpec, setLaunchPlanSpec] = React.useState<Partial<LaunchPlanSpec>>({});

React.useEffect(() => {
getLaunchPlan(launchPlanId).then(({ spec }) => setLaunchPlanSpec(spec));
}, [launchPlanId]);
React.useEffect(() => {
getLaunchPlan(launchPlanId).then(({ spec }) => setLaunchPlanSpec(spec));
}, [launchPlanId]);

const details: DetailItem[] = [
{
label: ExecutionMetadataLabels.iam,
value:
authRole?.assumableIamRole ||
ExecutionMetadataLabels.securityContextDefault
},
{
label: ExecutionMetadataLabels.serviceAccount,
value:
authRole?.kubernetesServiceAccount ||
ExecutionMetadataLabels.securityContextDefault
},
{
label: ExecutionMetadataLabels.rawOutputPrefix,
value: launchPlanSpec?.rawOutputDataConfig?.outputLocationPrefix
},
{
label: ExecutionMetadataLabels.parallelism,
value: maxParallelism
}
];
const details: DetailItem[] = [
{
label: ExecutionMetadataLabels.iam,
value: authRole?.assumableIamRole || ExecutionMetadataLabels.securityContextDefault
},
{
label: ExecutionMetadataLabels.serviceAccount,
value: authRole?.kubernetesServiceAccount || ExecutionMetadataLabels.securityContextDefault
},
{
label: ExecutionMetadataLabels.rawOutputPrefix,
value: rawOutputDataConfig?.outputLocationPrefix || launchPlanSpec?.rawOutputDataConfig?.outputLocationPrefix
},
{
label: ExecutionMetadataLabels.parallelism,
value: maxParallelism
}
];

return (
<>
{details.map(({ className, label, value }, idx) => (
<div
className={classnames(styles.detailItem, className)}
key={idx}
>
<Typography
className={commonStyles.truncateText}
variant="subtitle1"
>
{label}
</Typography>
<Typography
className={commonStyles.truncateText}
variant="h6"
data-testid={`metadata-${label}`}
>
{value}
</Typography>
</div>
))}
</>
);
return (
<>
{details.map(({ className, label, value }, idx) => (
<div className={classnames(styles.detailItem, className)} key={idx}>
<Typography className={commonStyles.truncateText} variant="subtitle1">
{label}
</Typography>
<Typography className={commonStyles.truncateText} variant="h6" data-testid={`metadata-${label}`}>
{value}
</Typography>
</div>
))}
</>
);
};
Loading