Skip to content

Commit 76bf416

Browse files
mcioffimcioffi
committed
Cont'd
1 parent 7be653e commit 76bf416

File tree

8 files changed

+100
-38
lines changed

8 files changed

+100
-38
lines changed

‎train/data/training.sqlite3‎

0 Bytes
Binary file not shown.

‎webtools/src/Styles.tsx‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ export function GlobalStyles({ children }: { children: React.ReactNode }) {
117117
}),
118118
Popover: Popover.extend({
119119
classNames: popoverClasses,
120+
defaultProps: {
121+
shadow: "sm",
122+
offset: 8,
123+
keepMounted: false,
124+
position: "bottom-end",
125+
},
120126
}),
121127
Drawer: Drawer.extend({
122128
classNames: drawerClasses,
@@ -239,6 +245,12 @@ export function GlobalStyles({ children }: { children: React.ReactNode }) {
239245
Grid: Grid.extend({}),
240246
Menu: Menu.extend({
241247
classNames: menuClasses,
248+
defaultProps: {
249+
shadow: "sm",
250+
offset: 8,
251+
keepMounted: false,
252+
position: "bottom-end",
253+
},
242254
}),
243255
Tooltip: Tooltip.extend({
244256
defaultProps: {
@@ -270,12 +282,12 @@ export function GlobalStyles({ children }: { children: React.ReactNode }) {
270282
scale: 1,
271283
components: components,
272284
shadows: {
273-
// rgba(251, 241, 199) = var(--fg)
274-
xs: "0 0.0625rem 0.1875rem rgba(251,241,199,0.05) , 0 0.0625rem 0.125rem rgba(251,241,199,0.05)",
275-
sm: "0 0.0625rem 0.1875rem rgba(251,241,199,0.05), rgba(251,241,199,0.05) 0 0.625rem 0.9375rem -0.3125rem, rgba(251,241,199,0.04) 0 0.4375rem 0.4375rem -0.3125rem",
276-
md: "0 0.0625rem 0.1875rem rgba(251,241,199,0.05), rgba(251,241,199,0.05) 0 1.25rem 1.5625rem -0.3125rem, rgba(251,241,199,0.04) 0 0.625rem 0.625rem -0.3125rem",
277-
lg: "0 0.0625rem 0.1875rem rgba(251,241,199,0.05), rgba(251,241,199,0.05) 0 1.75rem 1.4375rem -0.4375rem, rgba(251,241,199,0.04) 0 0.75rem 0.75rem -0.4375rem",
278-
xl: "0 0.0625rem 0.1875rem rgba(251,241,199,0.05), rgba(251,241,199,0.05) 0 2.25rem 1.75rem -0.4375rem, rgba(251,241,199,0.04) 0 1.0625rem 1.0625rem -0.4375rem",
285+
// rgba(189, 174, 147) = var(--fg-3)
286+
xs: "0 0.0625rem 0.1875rem rgb(189, 174, 147, 0.05) , 0 0.0625rem 0.125rem rgb(189, 174, 147, 0.05)",
287+
sm: "0 0.0625rem 0.1875rem rgb(189, 174, 147, 0.05), rgb(189, 174, 147, 0.05) 0 0.625rem 0.9375rem -0.3125rem, rgb(189, 174, 147, 0.04) 0 0.4375rem 0.4375rem -0.3125rem",
288+
md: "0 0.0625rem 0.1875rem rgb(189, 174, 147, 0.05), rgb(189, 174, 147, 0.05) 0 1.25rem 1.5625rem -0.3125rem, rgb(189, 174, 147, 0.04) 0 0.625rem 0.625rem -0.3125rem",
289+
lg: "0 0.0625rem 0.1875rem rgb(189, 174, 147, 0.05), rgb(189, 174, 147, 0.05) 0 1.75rem 1.4375rem -0.4375rem, rgb(189, 174, 147, 0.04) 0 0.75rem 0.75rem -0.4375rem",
290+
xl: "0 0.0625rem 0.1875rem rgb(189, 174, 147, 0.05), rgb(189, 174, 147, 0.05) 0 2.25rem 1.75rem -0.4375rem, rgb(189, 174, 147, 0.04) 0 1.0625rem 1.0625rem -0.4375rem",
279291
},
280292
});
281293

‎webtools/src/components/PageTabLabeller/ButtonUpload/ButtonUpload.tsx‎

Lines changed: 79 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,23 @@ import {
33
Box,
44
Button,
55
type ButtonProps,
6+
Center,
67
Drawer,
78
type DrawerOverlayProps,
89
type DrawerProps,
910
Group,
1011
Stepper,
12+
Transition,
1113
} from "@mantine/core";
1214
import { useDisclosure } from "@mantine/hooks";
1315
// {{{ASSETS}}}
14-
import { IconUpload } from "@tabler/icons-react";
16+
import {
17+
IconBan,
18+
IconCircleCheckFilled,
19+
IconUpload,
20+
} from "@tabler/icons-react";
1521
import type React from "react";
16-
import { useEffect } from "react";
22+
import { useEffect, useMemo } from "react";
1723
import { useShallow } from "zustand/react/shallow";
1824
import {
1925
TOTAL_UPLOAD_STEPS,
@@ -26,6 +32,75 @@ import { Sectionable } from "../../Shared";
2632
import classes from "./ButtonUpload.module.css";
2733
import { StepOne, StepThree, StepTwo } from "./steps";
2834

35+
interface ButtonUploadEntriesProps extends ButtonProps {
36+
onClick?: () => void;
37+
}
38+
39+
function ButtonUploadEntries(props: ButtonUploadEntriesProps) {
40+
const { onClick, children, ...others } = props;
41+
42+
const { publisherSource, parsedSentences } = useUploadNewLabellersStore(
43+
useShallow((state) => ({
44+
publisherSource: state.publisherSource,
45+
parsedSentences: state.parsedSentences,
46+
})),
47+
);
48+
49+
const chosenParsedSentences = useMemo(
50+
() => parsedSentences.filter(({ removed }) => !removed),
51+
[parsedSentences],
52+
);
53+
54+
return (
55+
<Button
56+
variant="light"
57+
disabled={!publisherSource || chosenParsedSentences.length === 0}
58+
onClick={onClick}
59+
leftSection={
60+
<Box style={{ height: 24, width: 24, position: "relative" }}>
61+
<Transition
62+
mounted={!publisherSource || chosenParsedSentences.length === 0}
63+
transition="fade-left"
64+
>
65+
{(styles) => (
66+
<Center
67+
style={{
68+
...styles,
69+
height: "100%",
70+
width: "100%",
71+
position: "absolute",
72+
}}
73+
>
74+
<IconBan size={24} />
75+
</Center>
76+
)}
77+
</Transition>
78+
<Transition
79+
mounted={!(!publisherSource || chosenParsedSentences.length === 0)}
80+
transition="fade-right"
81+
>
82+
{(styles) => (
83+
<Center
84+
style={{
85+
...styles,
86+
height: "100%",
87+
width: "100%",
88+
position: "absolute",
89+
}}
90+
>
91+
<IconCircleCheckFilled size={24} />
92+
</Center>
93+
)}
94+
</Transition>
95+
</Box>
96+
}
97+
{...others}
98+
>
99+
{children}
100+
</Button>
101+
);
102+
}
103+
29104
function UploadMountListener() {
30105
useEffect(() => {
31106
const { setState, resetState, onIngredientSentenceEntryHandler } =
@@ -188,13 +263,9 @@ export function ButtonUpload(props: ButtonProps) {
188263
</Button>
189264
)}
190265
{activeStep === TOTAL_UPLOAD_STEPS - 1 && (
191-
<Button
192-
variant="light"
193-
disabled={!publisherSource}
194-
onClick={onUploadBulkApiHandler}
195-
>
266+
<ButtonUploadEntries onClick={onUploadBulkApiHandler}>
196267
Upload entries
197-
</Button>
268+
</ButtonUploadEntries>
198269
)}
199270
</Group>
200271
}

‎webtools/src/components/PageTabLabeller/ButtonUpload/steps/StepThree/StepThree.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ export function TextCount(props: TextProps) {
166166

167167
return (
168168
<Text c="var(--mantine-color-gray-3)" size="sm" {...props}>
169-
There are {chosenParsedSentences.length} sentence
170-
{chosenParsedSentences.length === 1 ? null : "s"} to be uploaded
169+
{chosenParsedSentences.length} sentence
170+
{chosenParsedSentences.length === 1 ? null : "s"} selected for upload
171171
</Text>
172172
);
173173
}

‎webtools/src/components/PageTabLabeller/TextInputSubmit/TextInputSubmit.tsx‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,7 @@ function ActionIconQuestion(props: ActionIconProps) {
120120
const [opened, { close, open }] = useDisclosure(false);
121121

122122
return (
123-
<Popover
124-
opened={opened}
125-
shadow="xs"
126-
keepMounted={false}
127-
position="bottom-end"
128-
width={350}
129-
offset={8}
130-
>
123+
<Popover opened={opened} width={350}>
131124
<Popover.Target>
132125
<ActionIcon
133126
onMouseEnter={open}
@@ -258,12 +251,8 @@ function ActionIconFilter(props: ActionIconProps) {
258251

259252
return (
260253
<Menu
261-
shadow="md"
262-
keepMounted={false}
263-
position="bottom-end"
264254
width={350}
265255
closeOnItemClick={false}
266-
offset={8}
267256
opened={opened}
268257
onChange={setOpened}
269258
trigger="click"

‎webtools/src/components/PageTabParser/InputSubmit/InputSubmit.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,9 @@ function ActionIconFilter(props: ActionIconProps) {
212212

213213
return (
214214
<Menu
215-
shadow="md"
216215
position="top-end"
217216
width={350}
218217
closeOnItemClick={false}
219-
offset={8}
220218
opened={opened}
221219
onChange={setOpened}
222220
trigger="click"

‎webtools/src/components/PageTabTrain/ButtonRunModel/ButtonRunModel.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,8 @@ export function ButtonRunModel() {
250250
Run train model
251251
</Button>
252252
<Menu
253-
shadow="md"
254-
keepMounted={false}
255-
position="bottom-end"
256253
width={500}
257254
closeOnItemClick={false}
258-
offset={8}
259255
opened={opened}
260256
onChange={setOpened}
261257
trigger="click"

‎webtools/src/components/PageTabTrain/ButtonRunModelGridSearch/ButtonRunModelGridSearch.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,8 @@ export function ButtonRunModelGridSearch() {
178178
Run gridsearch
179179
</Button>
180180
<Menu
181-
shadow="md"
182-
keepMounted={false}
183-
position="bottom-end"
184181
width={500}
185182
closeOnItemClick={false}
186-
offset={8}
187183
opened={opened}
188184
onChange={setOpened}
189185
trigger="click"

0 commit comments

Comments
 (0)