Skip to content

fix: OPTIC-1748: [Timebox] UI polish #7149

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.

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
merged 47 commits into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
6372b9f
fix: OPTIC-1748: [Timebox] UI polish
yyassi-heartex Feb 28, 2025
d3466f0
changing Delete back to Remove
yyassi-heartex Feb 28, 2025
4d0ae2f
standardizing utils/dom
yyassi-heartex Feb 28, 2025
bd3a74e
fixing an issue that affects columns on datamanger table
yyassi-heartex Feb 28, 2025
28146cd
lint cleanup
yyassi-heartex Feb 28, 2025
0606f9b
more cleanup
yyassi-heartex Feb 28, 2025
5b2adc9
tweaking tooltip top-right positioning + view toggle switch to icons …
yyassi-heartex Feb 28, 2025
2b8e5a4
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Feb 28, 2025
3ba40aa
lint cleanup
yyassi-heartex Feb 28, 2025
3e81361
unifying Userpic
yyassi-heartex Feb 28, 2025
3be5308
classname fix for Userpic
yyassi-heartex Mar 1, 2025
277b4bd
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 3, 2025
f53c76c
adding test ids and updating how we check for toggle
yyassi-heartex Mar 3, 2025
7156451
lint cleanup
yyassi-heartex Mar 3, 2025
b323995
fixing column check
yyassi-heartex Mar 3, 2025
470829e
lint cleanup
yyassi-heartex Mar 3, 2025
944fcb5
fixed unit test + reduced padding on datamanger view toggle buttons
yyassi-heartex Mar 3, 2025
f8b437f
lint + test fixes
yyassi-heartex Mar 3, 2025
1985de4
test fixes
yyassi-heartex Mar 3, 2025
3700375
addressing issues around datamanager columns checkboxes
yyassi-heartex Mar 3, 2025
ec20909
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 3, 2025
aed0587
addressing failing checks
yyassi-heartex Mar 3, 2025
d55bd05
fixing userDisplayName
yyassi-heartex Mar 4, 2025
67f46c4
lint cleanup
yyassi-heartex Mar 4, 2025
8f0245b
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 4, 2025
2983fb2
fixing AnnotationsCarousel tests
bmartel Mar 4, 2025
682f90d
cleaning up a situation where its possible for user to be null when w…
yyassi-heartex Mar 5, 2025
8ddd48a
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 5, 2025
d152e99
Merge branch 'develop' into 'fb-optic-1748/ui-improvements'
robot-ci-heartex Mar 6, 2025
a4f47f0
Sync Follow Merge dependencies
robot-ci-heartex Mar 6, 2025
d3a70e0
Sync Follow Merge dependencies
robot-ci-heartex Mar 6, 2025
0c800a6
Merge branch 'fb-optic-1748/ui-improvements' of github.com:heartexlab…
yyassi-heartex Mar 6, 2025
1c53cd9
fixing an issue that makes it impossible for a user to update the fields
yyassi-heartex Mar 6, 2025
291f6e3
Merge remote-tracking branch 'origin/develop' into fb-optic-1748/ui-i…
yyassi-heartex Mar 6, 2025
233340c
Revert "Merge remote-tracking branch 'origin/develop' into fb-optic-1…
yyassi-heartex Mar 6, 2025
5ef00d2
Reapply "Merge remote-tracking branch 'origin/develop' into fb-optic-…
yyassi-heartex Mar 6, 2025
2bd247c
fixing merge
yyassi-heartex Mar 6, 2025
f59c735
cleaning up imports
yyassi-heartex Mar 6, 2025
7cac18d
Sync Follow Merge dependencies
robot-ci-heartex Mar 7, 2025
66acccf
Update web/libs/core/src/pages/AccountSettings/sections/PersonalInfo.tsx
yyassi-heartex Mar 7, 2025
e538921
Update web/libs/ui/src/lib/Userpic/Userpic.tsx
yyassi-heartex Mar 7, 2025
f46cec4
Update web/libs/ui/src/lib/Userpic/Userpic.tsx
yyassi-heartex Mar 7, 2025
b06aaa8
Merge branch 'develop' into fb-optic-1748/ui-improvements
yyassi-heartex Mar 7, 2025
93aa9f4
cleaned out unused files + fixed tooltip breakage due to quick toggle…
yyassi-heartex Mar 7, 2025
1a2c954
lint cleanup
yyassi-heartex Mar 7, 2025
6bf7829
Sync Follow Merge dependencies
robot-ci-heartex Mar 10, 2025
3c17586
Merge branch 'develop' into 'fb-optic-1748/ui-improvements'
yyassi-heartex Mar 10, 2025
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
276 changes: 45 additions & 231 deletions poetry.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Children, cloneElement, forwardRef, useCallback } from "react";
import { useCopyText } from "../../hooks/useCopyText";
import { Tooltip } from "../Tooltip/Tooltip";
import { Tooltip } from "@humansignal/ui";

export const CopyableTooltip = forwardRef(({ children, title, textForCopy, ...restProps }, ref) => {
const [copied, copyText] = useCopyText({ defaultText: textForCopy });
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { cn } from "../../utils/bem";
import "./DescriptionList.scss";
import { IconInfoOutline } from "../../assets/icons";
import { Tooltip } from "../../components/Tooltip/Tooltip";
import { Tooltip } from "@humansignal/ui";

export const DescriptionList = ({ style, className, children }) => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { cloneElement, forwardRef, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
import ReactDOM from "react-dom";
import { Block, cn } from "../../utils/bem";
import { alignElements } from "../../utils/dom";
import { aroundTransition } from "../../utils/transition";
import { alignElements } from "@humansignal/core/lib/utils/dom";
import { aroundTransition } from "@humansignal/core/lib/utils/transition";
import "./Dropdown.scss";
import { DropdownContext } from "./DropdownContext";
import { DropdownTrigger } from "./DropdownTrigger";
Expand Down
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/HeidiTips/HeidiTip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "./HeidiTip.scss";
import { Button } from "../Button/Button";
import { HeidiSpeaking } from "../../assets/images";
import type { HeidiTipProps, Tip } from "./types";
import { Tooltip } from "../Tooltip/Tooltip";
import { Tooltip } from "@humansignal/ui";
import { createURL } from "./utils";

const HeidiLink: FC<{ link: Tip["link"]; onClick: () => void }> = ({ link, onClick }) => {
Expand Down
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/Menubar/Menubar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { Breadcrumbs } from "../Breadcrumbs/Breadcrumbs";
import { Dropdown } from "../Dropdown/Dropdown";
import { Hamburger } from "../Hamburger/Hamburger";
import { Menu } from "../Menu/Menu";
import { Userpic } from "../Userpic/Userpic";
import { Userpic } from "@humansignal/ui";
import { VersionNotifier, VersionProvider } from "../VersionNotifier/VersionNotifier";
import "./Menubar.scss";
import "./MenuContent.scss";
Expand Down
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/Modal/ModalPopup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { createContext, useContext } from "react";
import { createPortal } from "react-dom";
import { IconCross } from "@humansignal/ui";
import { BemWithSpecifiContext, cn } from "../../utils/bem";
import { aroundTransition } from "../../utils/transition";
import { aroundTransition } from "@humansignal/core/lib/utils/transition";
import { Button } from "../Button/Button";
import "./Modal.scss";

Expand Down
114 changes: 0 additions & 114 deletions web/apps/labelstudio/src/components/Tooltip/Tooltip.jsx

This file was deleted.

84 changes: 0 additions & 84 deletions web/apps/labelstudio/src/components/Tooltip/Tooltip.scss

This file was deleted.

84 changes: 0 additions & 84 deletions web/apps/labelstudio/src/components/Userpic/Userpic.jsx

This file was deleted.

31 changes: 0 additions & 31 deletions web/apps/labelstudio/src/components/Userpic/Userpic.scss

This file was deleted.

1 change: 0 additions & 1 deletion web/apps/labelstudio/src/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ export { Menubar } from "./Menubar/Menubar";
export { SidebarMenu } from "./SidebarMenu/SidebarMenu";
export { Spinner } from "./Spinner/Spinner";
export { ToggleItems } from "./ToggleItems/ToggleItems";
export { Userpic } from "./Userpic/Userpic";
export { VersionNotifier } from "./VersionNotifier/VersionNotifier";
export { Pagination } from "./Pagination/Pagination";
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { formatDistance } from "date-fns";
import { useCallback, useEffect, useState } from "react";
import { Pagination, Spinner, Userpic } from "../../../components";
import { Userpic } from "@humansignal/ui";
import { Pagination, Spinner } from "../../../components";
import { usePage, usePageSize } from "../../../components/Pagination/Pagination";
import { useAPI } from "../../../providers/ApiProvider";
import { Block, Elem } from "../../../utils/bem";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { format } from "date-fns";
import { NavLink } from "react-router-dom";
import { IconCross } from "@humansignal/ui";
import { Button, Userpic } from "../../../components";
import { IconCross, Userpic } from "@humansignal/ui";
import { Button } from "../../../components";
import { Block, Elem } from "../../../utils/bem";
import "./SelectedUser.scss";

Expand Down
Loading
Loading