-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Annotations: FE #6481
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
Open
apata
wants to merge
9
commits into
master
Choose a base branch
from
annotations/fe
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Annotations: FE #6481
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
44a252f
Add Annotations feature
apata 54d45dd
Add separate line items for Annotations and Shared Annotations into b…
apata d7c9811
Refactor name Site-wide annotation to Site annotation
apata 871810c
Update changelog
apata deaf248
Add Annotations to grandfathered plan benefits lists
apata 31a422d
Add site annotations feature to sandbox plans
apata 061612b
Fix issue with first tap event on graph potentially misrouting to des…
apata 70bd01a
Align annotation and segment upgrade prompts with the goal settings p…
sanne-san e81e9a5
Wire up with the BE
apata File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,6 +63,10 @@ | |
| disabled:cursor-not-allowed; | ||
| } | ||
|
|
||
| .btn-xs { | ||
| @apply px-2 py-1; | ||
| } | ||
|
|
||
| .btn-sm { | ||
| @apply px-3 py-2; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import React, { ReactNode } from 'react' | ||
| import classNames from 'classnames' | ||
| import { | ||
| Annotation, | ||
| getAnnotationAttribution, | ||
| getAttributionDateLabel | ||
| } from './annotations' | ||
|
|
||
| export const AnnotationsListContainer = ({ | ||
| children | ||
| }: { | ||
| children: ReactNode | ||
| }) => ( | ||
| <div className="text-sm font-normal text-gray-100 flex flex-col gap-2"> | ||
| {children} | ||
| </div> | ||
| ) | ||
|
|
||
| const VerticalBar = () => ( | ||
| <div className="rounded-xs w-[3px] bg-green-500 shrink-0" /> | ||
| ) | ||
|
|
||
| export const AnnotationItemRow = ({ children }: { children: ReactNode }) => ( | ||
| <div className="group flex flex-row gap-x-2"> | ||
| <VerticalBar /> | ||
| {children} | ||
| </div> | ||
| ) | ||
|
|
||
| export const AnnotationAttributionLine = ({ | ||
| annotation | ||
| }: { | ||
| annotation: Annotation | ||
| }) => ( | ||
| <div className="flex items-baseline text-xs text-gray-300 pr-8"> | ||
| <span className="truncate min-w-0"> | ||
| {getAnnotationAttribution(annotation)} | ||
| </span> | ||
| <span className="whitespace-nowrap shrink-0"> | ||
| {` • ${getAttributionDateLabel(annotation)}`} | ||
| </span> | ||
| </div> | ||
| ) | ||
|
|
||
| export const AnnotationNote = ({ | ||
| note, | ||
| clamp | ||
| }: { | ||
| note: string | ||
| clamp?: boolean | ||
| }) => ( | ||
| <div | ||
| className={classNames( | ||
| 'text-left whitespace-pre-wrap [overflow-wrap:anywhere] [word-break:normal]', | ||
| { 'line-clamp-2': clamp } | ||
| )} | ||
| > | ||
| {note} | ||
| </div> | ||
| ) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor nit: the word "attribution" threw me off a bit when first reading it. How about "signature" instead?