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

Fix: Add Tag to Project on Creation #19

Merged
merged 1 commit into from
May 23, 2024
Merged

Fix: Add Tag to Project on Creation #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion front/src/app/(base)/annotation_projects/detail/annotation/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { useCallback, useContext, useMemo } from "react";
import { useMutation } from "@tanstack/react-query";
import toast from "react-hot-toast";

import UserContext from "@/app/(base)/context";
Expand All @@ -12,7 +13,8 @@ import { changeURLParam } from "@/utils/url";

import AnnotationProjectContext from "../context";

import type { AnnotationTask, SpectrogramParameters } from "@/types";
import api from "@/app/api";
import type { AnnotationTask, SpectrogramParameters, Tag } from "@/types";

export default function Page() {
const search = useSearchParams();
Expand Down Expand Up @@ -40,6 +42,12 @@ export default function Page() {
[setParameters],
);

const { mutate: handleTagCreate } = useMutation({
mutationFn: async (tag: Tag) => {
return await api.annotationProjects.addTag(project, tag);
},
});

const onChangeTask = useCallback(
(task: AnnotationTask) => {
const url = changeURLParam({
Expand Down Expand Up @@ -89,6 +97,7 @@ export default function Page() {
onCompleteTask={handleCompleteTask}
onRejectTask={handleRejectTask}
onVerifyTask={handleVerifyTask}
onCreateTag={handleTagCreate}
/>
);
}
6 changes: 4 additions & 2 deletions front/src/components/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ export default function Dialog({
children,
label,
open = false,
width = "max-w-md",
...rest
}: {
title?: ReactNode;
label: ReactNode;
open?: boolean;
width?: string;
children: ({ close }: { close: () => void }) => ReactNode;
} & Omit<ComponentProps<typeof Button>, "onClick" | "title" | "children">) {
let [isOpen, setIsOpen] = useState(open);
Expand All @@ -25,11 +27,11 @@ export default function Dialog({
{label}
</Button>
<DialogOverlay
title={<div className="max-w-md">{title}</div>}
title={<div>{title}</div>}
isOpen={isOpen}
onClose={() => setIsOpen(false)}
>
{({ close }) => <div className="max-w-md">{children({ close })}</div>}
{({ close }) => <div className={width}>{children({ close })}</div>}
</DialogOverlay>
</>
);
Expand Down
6 changes: 6 additions & 0 deletions front/src/components/annotation/AnnotateTasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default function AnnotateTasks({
annotationTask,
currentUser,
instructions,
onCreateTag,
onCreateSoundEventAnnotation,
onUpdateSoundEventAnnotation,
onAddSoundEventTag,
Expand All @@ -56,6 +57,7 @@ export default function AnnotateTasks({
annotationTask?: AnnotationTask;
/** The user who is annotating */
currentUser: User;
onCreateTag?: (tag: Tag) => void;
onCreateSoundEventAnnotation?: (annotation: SoundEventAnnotation) => void;
onUpdateSoundEventAnnotation?: (annotation: SoundEventAnnotation) => void;
onAddSoundEventTag?: (annotation: SoundEventAnnotation) => void;
Expand Down Expand Up @@ -178,6 +180,7 @@ export default function AnnotateTasks({
onParameterSave={onParameterSave}
onSelectAnnotation={setSelectedAnnotation}
tagFilter={tagFilter}
onCreateTag={onCreateTag}
onAddSoundEventTag={onAddSoundEventTag}
onRemoveSoundEventTag={onRemoveSoundEventTag}
onCreateSoundEventAnnotation={onCreateSoundEventAnnotation}
Expand All @@ -194,6 +197,7 @@ export default function AnnotateTasks({
tagFilter={tagFilter}
soundEventAnnotation={selectedAnnotation}
onAddTag={onAddSoundEventTag}
onCreateTag={onCreateTag}
onRemoveTag={onRemoveSoundEventTag}
/>
)}
Expand All @@ -205,6 +209,7 @@ export default function AnnotateTasks({
tags={tagPalette}
tagFilter={tagFilter}
onClick={addTag.mutate}
onCreateTag={onCreateTag}
onAddTag={handleAddTagToPalette}
onRemoveTag={handleRemoveTagFromPalette}
onClearTags={handleClearTagPalette}
Expand All @@ -215,6 +220,7 @@ export default function AnnotateTasks({
onAddTag={addTag.mutate}
onRemoveTag={removeTag.mutate}
onClearTags={onClearTags}
onCreateTag={onCreateTag}
/>
<ClipAnnotationNotes
onCreateNote={addNote.mutate}
Expand Down
4 changes: 3 additions & 1 deletion front/src/components/annotation/AnnotationTagPalette.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ export default function AnnotationTagPalette({
tagFilter,
onClick,
onAddTag,
onCreateTag,
onRemoveTag,
onClearTags,
}: {
tags: Tag[];
tagFilter?: TagFilter;
onCreateTag?: (tag: Tag) => void;
onClick?: (tag: Tag) => void;
onAddTag?: (tag: Tag) => void;
onRemoveTag?: (tag: Tag) => void;
Expand Down Expand Up @@ -51,7 +53,7 @@ export default function AnnotationTagPalette({
<div className="grow">
<TagSearchBar
onSelect={onAddTag}
onCreate={onAddTag}
onCreate={onCreateTag}
initialFilter={tagFilter}
placeholder="Add tags..."
/>
Expand Down
5 changes: 4 additions & 1 deletion front/src/components/annotation/SelectedSoundEventAnnotation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import SoundEventAnnotationTags from "@/components/sound_event_annotations/Sound
import useSoundEventAnnotation from "@/hooks/api/useSoundEventAnnotation";

import type { TagFilter } from "@/api/tags";
import type { ClipAnnotation, SoundEventAnnotation } from "@/types";
import type { ClipAnnotation, SoundEventAnnotation, Tag } from "@/types";

export default function SelectedSoundEventAnnotation({
soundEventAnnotation: data,
clipAnnotation,
tagFilter,
onAddTag,
onRemoveTag,
onCreateTag,
}: {
//* The sound event annotation to display */
soundEventAnnotation: SoundEventAnnotation;
Expand All @@ -22,6 +23,7 @@ export default function SelectedSoundEventAnnotation({
tagFilter?: TagFilter;
onAddTag?: (annotation: SoundEventAnnotation) => void;
onRemoveTag?: (annotation: SoundEventAnnotation) => void;
onCreateTag?: (tag: Tag) => void;
}) {
const soundEventAnnotation = useSoundEventAnnotation({
uuid: data.uuid,
Expand All @@ -43,6 +45,7 @@ export default function SelectedSoundEventAnnotation({
soundEventAnnotation={soundEventAnnotation.data || data}
onAddTag={soundEventAnnotation.addTag.mutate}
onRemoveTag={soundEventAnnotation.removeTag.mutate}
onCreateTag={onCreateTag}
/>
</div>
</Card>
Expand Down
7 changes: 2 additions & 5 deletions front/src/components/annotation_projects/AnnotationProjectList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,14 @@ export default function AnnotationProjectList({
<Dialog
mode="text"
title="Create Annotation Project"
width="w-96"
label={
<>
<AddIcon className="inline-block w-4 h-4 align-middle" /> Create
</>
}
>
{() => (
<div className="w-max-prose">
<AnnotationProjectCreate onCreate={onCreate} />
</div>
)}
{() => <AnnotationProjectCreate onCreate={onCreate} />}
</Dialog>
</div>
<div className="h-full">
Expand Down
3 changes: 3 additions & 0 deletions front/src/components/clip_annotations/ClipAnnotationSpectrogram.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default function ClipAnnotationSpectrogram({
onDeleteSoundEventAnnotation,
onParameterSave,
onSelectAnnotation,
onCreateTag,
}: {
clipAnnotation: ClipAnnotation;
parameters?: SpectrogramParameters;
Expand All @@ -66,6 +67,7 @@ export default function ClipAnnotationSpectrogram({
onDeleteSoundEventAnnotation?: (annotation: SoundEventAnnotation) => void;
onAddSoundEventTag?: (annotation: SoundEventAnnotation) => void;
onRemoveSoundEventTag?: (annotation: SoundEventAnnotation) => void;
onCreateTag?: (tag: Tag) => void;
}) {
const [isAnnotating, setIsAnnotating] = useState(false);
const canvasRef = useRef<HTMLCanvasElement>(null);
Expand Down Expand Up @@ -252,6 +254,7 @@ export default function ClipAnnotationSpectrogram({
disabled={disabled}
tags={annotate.tags}
filter={tagFilter}
onCreate={onCreateTag}
>
<canvas
ref={canvasRef}
Expand Down
3 changes: 3 additions & 0 deletions front/src/components/clip_annotations/ClipAnnotationTags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ export default function ClipAnnotationTags({
onRemoveTag,
onClickTag,
onClearTags,
onCreateTag,
disabled = false,
}: {
clipAnnotation?: ClipAnnotation;
tagFilter?: TagFilter;
onAddTag?: (tag: Tag) => void;
onClickTag?: (tag: Tag) => void;
onRemoveTag?: (tag: Tag) => void;
onCreateTag?: (tag: Tag) => void;
onClearTags?: () => void;
disabled?: boolean;
}) {
Expand Down Expand Up @@ -68,6 +70,7 @@ export default function ClipAnnotationTags({
<AddTagButton
variant="primary"
onAdd={onAddTag}
onCreate={onCreateTag}
filter={tagFilter}
text="Add tags"
placeholder="Add tags..."
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/datasets/DatasetList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default function DatasetList(props: {

return (
<div className="flex flex-col p-8 space-y-2 w-full">
<div className="flex flex-row space-x-4">
<div className96="flex flex-row space-x-4">
<div className="flex-grow">
<Search
label="Search"
Expand Down
3 changes: 3 additions & 0 deletions front/src/components/sound_event_annotations/SoundEventAnnotationTags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ export default function SoundEventAnnotationTags({
onAddTag,
onRemoveTag,
onClickTag,
onCreateTag,
}: {
soundEventAnnotation: SoundEventAnnotation;
tagFilter?: TagFilter;
onAddTag?: (tag: Tag) => void;
onClickTag?: (tag: Tag) => void;
onRemoveTag?: (tag: Tag) => void;
onCreateTag?: (tag: Tag) => void;
}) {
const tags = useMemo(
() => soundEventAnnotation.tags || [],
Expand Down Expand Up @@ -55,6 +57,7 @@ export default function SoundEventAnnotationTags({
<AddTagButton
variant="primary"
onAdd={onAddTag}
onCreate={onCreateTag}
filter={tagFilter}
text="Add tags"
placeholder="Add tags..."
Expand Down
6 changes: 6 additions & 0 deletions front/src/components/tags/AddTagButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ import type { HTMLProps } from "react";

function TagBarPopover({
onClose,
onCreate,
onAdd,
filter,
...props
}: {
onClose?: () => void;
onCreate?: (tag: TagType) => void;
filter?: TagFilter;
onAdd?: (tag: TagType) => void;
} & Omit<HTMLProps<HTMLInputElement>, "value" | "onChange" | "onBlur">) {
Expand All @@ -26,6 +28,7 @@ function TagBarPopover({
onAdd?.(tag);
}}
onCreate={(tag) => {
onCreate?.(tag);
onAdd?.(tag);
}}
autoFocus={true}
Expand All @@ -44,6 +47,7 @@ function TagBarPopover({

export default function AddTagButton({
onAdd,
onCreate,
text = "add",
variant = "secondary",
filter,
Expand All @@ -52,6 +56,7 @@ export default function AddTagButton({
text?: string;
filter?: TagFilter;
onAdd?: (tag: TagType) => void;
onCreate?: (tag: TagType) => void;
variant?: "primary" | "secondary" | "danger";
} & Omit<HTMLProps<HTMLInputElement>, "value" | "onChange" | "onBlur">) {
return (
Expand Down Expand Up @@ -79,6 +84,7 @@ export default function AddTagButton({
<TagBarPopover
onClose={close}
onAdd={onAdd}
onCreate={onCreate}
filter={filter}
{...props}
/>
Expand Down
1 change: 1 addition & 0 deletions front/src/components/tags/TagSearchBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export default forwardRef<HTMLInputElement, TagSearchBarProps>(
{
onSuccess: (tag) => {
onCreate?.(tag);
onSelect?.(tag);
},
},
);
Expand Down