Skip to content

Commit

Permalink
Merge branch 'master' into rf-version-update
Browse files Browse the repository at this point in the history
  • Loading branch information
anrusina authored Mar 14, 2022
2 parents 413cc74 + 50b5ef5 commit def2028
Show file tree
Hide file tree
Showing 12 changed files with 198 additions and 653 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ app/public/styles/*.css
venv/

# Frontend
.vscode/
.awcache/
.dist/
npm-debug.log
Expand Down
13 changes: 13 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"eamodio.gitlens"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": [

]
}
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"[html]": {
"editor.tabSize": 4
},
"[javascript][javascriptreact][typescript][typescriptreact]": {
"editor.detectIndentation": false,
"editor.tabSize": 2
},
}
10 changes: 8 additions & 2 deletions src/components/Executions/Tables/nodeExecutionColumns.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Typography } from '@material-ui/core';
import { Tooltip, Typography } from '@material-ui/core';
import { formatDateLocalTimezone, formatDateUTC, millisecondsToHMS } from 'common/formatters';
import { timestampToDate } from 'common/utils';
import { useCommonStyles } from 'components/common/styles';
Expand Down Expand Up @@ -63,6 +63,7 @@ const ExecutionName: React.FC<NodeExecutionCellRendererData> = ({ execution, sta
};

const DisplayId: React.FC<NodeExecutionCellRendererData> = ({ execution }) => {
const commonStyles = useCommonStyles();
const detailsContext = useNodeExecutionContext();
const [displayId, setDisplayId] = React.useState<string | undefined>();

Expand All @@ -78,7 +79,12 @@ const DisplayId: React.FC<NodeExecutionCellRendererData> = ({ execution }) => {
};
});

return <>{displayId ?? execution.id.nodeId}</>;
const nodeId = displayId ?? execution.id.nodeId;
return (
<Tooltip arrow title={nodeId} placement="top-start">
<div className={commonStyles.truncateText}>{nodeId}</div>
</Tooltip>
);
};

const DisplayType: React.FC<NodeExecutionCellRendererData> = ({ execution }) => {
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit def2028

Please sign in to comment.