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.

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

feat: inbox #1023

Merged
merged 87 commits into from
Jun 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
c818485
dev: initialize inbox
pablohashescobar May 6, 2023
f04ded6
dev: inbox and inbox issues models, views and serializers
pablohashescobar May 7, 2023
500184f
dev: issue object filter for inbox
pablohashescobar May 8, 2023
f38358f
dev: filter for search issues
pablohashescobar May 8, 2023
515fd70
dev: inbox snooze and duplicates
pablohashescobar May 8, 2023
5f05833
dev: set duplicate to null by default
pablohashescobar May 10, 2023
2536808
feat: inbox ui and services
dakshesh14 May 11, 2023
84a7d30
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
dakshesh14 May 11, 2023
5f66db4
Merge branch 'develop' of github.com:makeplane/plane into feat/inbox
pablohashescobar May 11, 2023
777fa07
feat: inbox issue status done
dakshesh14 May 12, 2023
f030c99
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
dakshesh14 May 12, 2023
071bbb9
fix: resolved conflict
dakshesh14 May 12, 2023
07faca3
feat: project detail in inbox
pablohashescobar May 15, 2023
f9dd00c
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar May 15, 2023
8e6dc97
style: layout, popover, icons, sidebar
dakshesh14 May 15, 2023
fbeaa08
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
dakshesh14 May 15, 2023
f0718f2
fix: resolved merge conflict
dakshesh14 May 15, 2023
b1a150a
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
dakshesh14 May 17, 2023
7a97b61
dev: default inbox for project and pending issues count
pablohashescobar May 17, 2023
2960469
dev: fix exception when creating default inbox
pablohashescobar May 17, 2023
df09d6e
feat: added inbox link in issue list view, fixed some mutation
dakshesh14 May 17, 2023
642f3ae
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
dakshesh14 May 17, 2023
286566e
fix: empty state for inbox
dakshesh14 May 17, 2023
bb8beb0
dev: auto issue state updation when rejected or marked duplicate
pablohashescobar May 17, 2023
9a8c808
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar May 17, 2023
f33fb1a
fix: inbox update status
pablohashescobar May 22, 2023
ff700d1
fix: hydrating chose with old values
dakshesh14 May 23, 2023
133192b
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
dakshesh14 May 23, 2023
16dbd95
feat: inbox issue filtering
pablohashescobar May 23, 2023
3dedc09
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar May 23, 2023
6d95ce3
fix: issue inbox filtering
pablohashescobar May 23, 2023
d1ed925
feat: filter inbox issues
dakshesh14 May 24, 2023
612631c
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
dakshesh14 May 24, 2023
9a5ddbb
dev: merge conflicts resolved
gurusainath May 29, 2023
c364698
fix: merge conflict & build error
dakshesh14 Jun 7, 2023
9b41e83
fix: merge conflict & build error
dakshesh14 Jun 7, 2023
e437f1d
refactor: analytics, border colors
dakshesh14 Jun 7, 2023
bf12a07
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
dakshesh14 Jun 7, 2023
0fcc7a6
Merge branch 'develop' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 8, 2023
ee85af7
dev: filters and views for inbox
pablohashescobar Jun 8, 2023
1bc20e7
dev: source for inboxissue and update list inbox issue
pablohashescobar Jun 12, 2023
fc7a520
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
aaryan610 Jun 12, 2023
485e73a
dev: update list endpoint to house filters and additional data
pablohashescobar Jun 12, 2023
80d7963
dev: bridge id for list
pablohashescobar Jun 12, 2023
e493d6c
dev: remove print logs
pablohashescobar Jun 12, 2023
a085eba
dev: update inbox issue workflow
pablohashescobar Jun 13, 2023
acd4a48
dev: add description_html in issue details
pablohashescobar Jun 13, 2023
bec324f
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
aaryan610 Jun 13, 2023
66adb18
fix: inbox track event auth, chore: inbox issue action authorization
aaryan610 Jun 13, 2023
b06468b
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 13, 2023
006eb1b
fix: removed unnecessary api calls
aaryan610 Jun 13, 2023
fabe8e6
style: viewed issues
aaryan610 Jun 14, 2023
b9bb144
fix: priority validation
pablohashescobar Jun 14, 2023
2b760fd
dev: remove print logs
pablohashescobar Jun 14, 2023
601a287
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 14, 2023
db5b213
dev: update issue inbox update workflow
pablohashescobar Jun 14, 2023
70be9b5
chore: added inbox view context
aaryan610 Jun 14, 2023
64fdab3
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 14, 2023
c8e0a3e
fix: type errors
aaryan610 Jun 14, 2023
0edf1ab
fix: build errors and warnings
aaryan610 Jun 14, 2023
f783ee4
Merge branch 'develop' of https://github.com/makeplane/plane into fea…
aaryan610 Jun 15, 2023
21476a6
dev: update issue inbox workflow and log all the changes
pablohashescobar Jun 15, 2023
326a79c
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 15, 2023
426e5ab
fix: filters logic, sidebar fields to show
aaryan610 Jun 15, 2023
0edcf22
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 15, 2023
8c78c50
dev: update issue filtering status
pablohashescobar Jun 15, 2023
84ef7c4
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 15, 2023
8b6b523
chore: update create inbox issue modal, fix: mutation issues
aaryan610 Jun 15, 2023
2a55376
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 15, 2023
3558833
dev: update issue accept workflow
pablohashescobar Jun 15, 2023
61d644a
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 15, 2023
41666f9
chore: add comment to inbox issues
aaryan610 Jun 15, 2023
febb719
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 15, 2023
8398f2f
chore: remove inboxIssueId from url after deleting
aaryan610 Jun 15, 2023
da6421d
dev: update the issue triage workflow
pablohashescobar Jun 15, 2023
589b5a5
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 15, 2023
9701849
fix: mutation after issue status change
aaryan610 Jun 15, 2023
c89657b
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 15, 2023
9bd611d
chore: issue details sidebar divider
aaryan610 Jun 15, 2023
8bd79b8
fix: issue activity for inbox issues
pablohashescobar Jun 15, 2023
8b86114
Merge branch 'feat/inbox' of github.com:makeplane/plane into feat/inbox
pablohashescobar Jun 15, 2023
5d176fb
dev: update inbox perrmissions
pablohashescobar Jun 15, 2023
a0fbdf6
dev: create new permission layer
pablohashescobar Jun 15, 2023
7aefb69
chore: auth layer for inbox
aaryan610 Jun 15, 2023
c6d1081
Merge branch 'feat/inbox' of https://github.com/makeplane/plane into …
aaryan610 Jun 15, 2023
fddc28b
chore: show accepting status
aaryan610 Jun 16, 2023
ace5331
chore: show issue status at the top of issue details
aaryan610 Jun 16, 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
Prev Previous commit
Next Next commit
chore: show accepting status
aaryan610 committed Jun 16, 2023
commit fddc28b9293cac822f1f0c116d4dcf76d0db2b67
14 changes: 11 additions & 3 deletions apps/app/components/inbox/inbox-action-headers.tsx
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ type Props = {
issueCount: number;
currentIssueIndex: number;
issue?: IInboxIssue;
onAccept: () => void;
onAccept: () => Promise<void>;
onDecline: () => void;
onMarkAsDuplicate: () => void;
onSnooze: (date: Date | string) => void;
@@ -51,6 +51,7 @@ export const InboxActionHeader: React.FC<Props> = (props) => {
issue,
} = props;

const [isAccepting, setIsAccepting] = useState(false);
const [date, setDate] = useState(new Date());

const router = useRouter();
@@ -60,6 +61,12 @@ export const InboxActionHeader: React.FC<Props> = (props) => {
const { filters, setFilters, filtersLength } = useInboxView();
const { user } = useUserAuth();

const handleAcceptIssue = () => {
setIsAccepting(true);

onAccept().finally(() => setIsAccepting(false));
};

useEffect(() => {
if (!issue?.issue_inbox[0].snoozed_till) return;

@@ -185,11 +192,12 @@ export const InboxActionHeader: React.FC<Props> = (props) => {
<SecondaryButton
size="sm"
className="flex gap-2 items-center"
onClick={onAccept}
onClick={handleAcceptIssue}
disabled={issueStatus !== -2}
loading={isAccepting}
>
<CheckCircleIcon className="h-4 w-4 text-green-500" />
<span>Accept</span>
<span>{isAccepting ? "Accepting..." : "Accept"}</span>
</SecondaryButton>
<SecondaryButton
size="sm"