Skip to content

Update data extensions modelling table title bar #2574

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

Merged
robertbrignull merged 2 commits into from
Jul 4, 2023
Merged

Update data extensions modelling table title bar #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15be27c
Add new buttons to title bar
robertbrignull Jul 3, 2023
97219b9
Remove old status info
robertbrignull Jul 3, 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
119 changes: 63 additions & 56 deletions extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { useCallback, useMemo, useState } from "react";
import styled from "styled-components";
import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
import { pluralize } from "../../common/word";
import { ModeledMethodDataGrid } from "./ModeledMethodDataGrid";
import { calculateModeledPercentage } from "../../data-extensions-editor/shared/modeled-percentage";
import { decimalFormatter, percentFormatter } from "./formatters";
import { percentFormatter } from "./formatters";
import { Codicon } from "../common";
import { Mode } from "../../data-extensions-editor/shared/mode";
import { VSCodeButton } from "@vscode/webview-ui-toolkit/react";

const LibraryContainer = styled.div`
margin-bottom: 1rem;
Expand All @@ -19,30 +19,52 @@ const TitleContainer = styled.button`
gap: 0.5em;
align-items: center;
width: 100%;
font-size: 1.2em;
font-weight: bold;

color: var(--vscode-editor-foreground);
background-color: transparent;
border: none;
cursor: pointer;
`;

const StatusContainer = styled.div`
const NameContainer = styled.div`
display: flex;
gap: 1em;
align-items: center;
gap: 0.5em;
align-items: baseline;
flex-grow: 1;
text-align: left;
`;

const DependencyName = styled.span`
font-size: 1.2em;
font-weight: bold;
`;

const ModeledPercentage = styled.span`
color: var(--vscode-descriptionForeground);
`;

const UnsavedLabel = styled.span`
text-transform: uppercase;
background-color: var(--vscode-input-background);
padding: 0.2em 0.4em;
border-radius: 0.2em;
`;

const TitleButton = styled(VSCodeButton)`
background-color: transparent;

margin-top: 0.5em;
margin-bottom: 0.5em;
margin-left: 1em;
&:hover {
pointer: cursor;
background-color: var(--vscode-button-secondaryBackground);
}
`;

type Props = {
title: string;
externalApiUsages: ExternalApiUsage[];
modeledMethods: Record<string, ModeledMethod>;
mode: Mode;
hasUnsavedChanges: boolean;
onChange: (
externalApiUsage: ExternalApiUsage,
modeledMethod: ModeledMethod,
Expand All @@ -54,6 +76,7 @@ export const LibraryRow = ({
externalApiUsages,
modeledMethods,
mode,
hasUnsavedChanges,
onChange,
}: Props) => {
const modeledPercentage = useMemo(() => {
Expand All @@ -66,9 +89,15 @@ export const LibraryRow = ({
setExpanded((oldIsExpanded) => !oldIsExpanded);
}, []);

const usagesCount = useMemo(() => {
return externalApiUsages.reduce((acc, curr) => acc + curr.usages.length, 0);
}, [externalApiUsages]);
const handleModelWithAI = useCallback(async (e: React.MouseEvent) => {
e.stopPropagation();
e.preventDefault();
}, []);

const handleModelFromSource = useCallback(async (e: React.MouseEvent) => {
e.stopPropagation();
e.preventDefault();
}, []);

return (
<LibraryContainer>
Expand All @@ -78,51 +107,29 @@ export const LibraryRow = ({
) : (
<Codicon name="chevron-right" label="Expand" />
)}
{title}
{isExpanded ? null : (
<>
{" "}
(
{pluralize(
externalApiUsages.length,
"method",
"methods",
decimalFormatter.format.bind(decimalFormatter),
)}
, {percentFormatter.format(modeledPercentage / 100)} modeled)
</>
)}
<NameContainer>
<DependencyName>{title}</DependencyName>
<ModeledPercentage>
{percentFormatter.format(modeledPercentage / 100)} modeled
</ModeledPercentage>
{hasUnsavedChanges ? <UnsavedLabel>UNSAVED</UnsavedLabel> : null}
</NameContainer>
<TitleButton onClick={handleModelWithAI}>
<Codicon name="lightbulb-autofix" label="Model with AI" />
&nbsp;Model with AI
</TitleButton>
<TitleButton onClick={handleModelFromSource}>
<Codicon name="code" label="Model from source" />
&nbsp;Model from source
</TitleButton>
</TitleContainer>
{isExpanded && (
<>
<StatusContainer>
<div>
{pluralize(
externalApiUsages.length,
"method",
"methods",
decimalFormatter.format.bind(decimalFormatter),
)}
</div>
<div>
{pluralize(
usagesCount,
"usage",
"usages",
decimalFormatter.format.bind(decimalFormatter),
)}
</div>
<div>
{percentFormatter.format(modeledPercentage / 100)} modeled
</div>
</StatusContainer>
<ModeledMethodDataGrid
externalApiUsages={externalApiUsages}
modeledMethods={modeledMethods}
mode={mode}
onChange={onChange}
/>
</>
<ModeledMethodDataGrid
externalApiUsages={externalApiUsages}
modeledMethods={modeledMethods}
mode={mode}
onChange={onChange}
/>
)}
</LibraryContainer>
);
Expand Down
1 change: 1 addition & 0 deletions extensions/ql-vscode/src/view/data-extensions-editor/ModeledMethodsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export const ModeledMethodsList = ({
externalApiUsages={grouped[libraryName]}
modeledMethods={modeledMethods}
mode={mode}
hasUnsavedChanges={false}
Copy link
Copy Markdown
Contributor Author

@robertbrignull robertbrignull Jul 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've made this hidden by default, but to see it for testing just change this to true. You can use the "Data extensions editor" storybook to view it.

We could also add a storybook for the LibraryRow component, if that would be helpful.

onChange={onChange}
/>
))}
Expand Down