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

Jump to bottom

Join common from a space #2076 #2091

Merged
merged 23 commits into from
Sep 26, 2023
Merged

Join common from a space #2076 #2091

merged 23 commits into from
Sep 26, 2023

Conversation

andreymikhadyuk
Copy link
Collaborator

@andreymikhadyuk andreymikhadyuk commented Sep 19, 2023 •
edited
Loading

  • PR title equals to the ticket name
  • I added the ticket to the Development section of this PR.

What was changed?

  • created renderChatInput prop in ChatComponent to abstract the logic with joining
  • updated join logic on front and back pages based on the ticket

@andreymikhadyuk
make parent common name in the back page to be a link
f912cca
@andreymikhadyuk
check autojoin ability in spaces redirection
d2563ac
@andreymikhadyuk
add rootCommonId to Common model
1087153
@andreymikhadyuk
add hasPublicItems field usage
3e51f35
@andreymikhadyuk
add renderChatInput prop to ChatComponent
f5055d6
@andreymikhadyuk
move join related logic to common feed page component
d4ba822
@andreymikhadyuk
refactor root and parent common member fetches
c7249c0
@andreymikhadyuk
add root common join logic
3d83fa5
@andreymikhadyuk
add text to join parent common
9ec4632
@andreymikhadyuk
display chat input for non-authorized users
49312bb
@andreymikhadyuk
add root common member to the common back page
293b8fd
@andreymikhadyuk
pass root common to the data provider of back page
cb64531
@andreymikhadyuk
add root and parent common member to the back page context
2c7d8b9
@andreymikhadyuk
display "Join via common page" on the back page
c9e6597
@andreymikhadyuk
remove space's automatic acceptance check
b22a08b
@andreymikhadyuk
display root and parent common names in join text
c403776
@andreymikhadyuk
move root common member check after auth to separate useEffect
67e1515
@andreymikhadyuk
skip redirecting after log in for common feed pages
47e61d5
@andreymikhadyuk
move root and parent common members fetch to global data
e663da4
@andreymikhadyuk
fix membership modals showing based on global data fetched flag
6d9df4c
@netlify
Copy link

netlify bot commented Sep 19, 2023 •
edited
Loading

✅ Deploy Preview for preview-common ready!

Name Link
🔨 Latest commit 5e9c6c3
🔍 Latest deploy log https://app.netlify.com/sites/preview-common/deploys/65128e5a3010d00008dda2c9
😎 Deploy Preview https://deploy-preview-2091--preview-common.netlify.app/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@andreymikhadyuk andreymikhadyuk linked an issue Sep 19, 2023 that may be closed by this pull request
Join common from a space #2076
Closed
7 tasks
@andreymikhadyuk andreymikhadyuk marked this pull request as ready for review September 19, 2023 14:40
budnik9
budnik9 suggested changes Sep 19, 2023
View reviewed changes
src/pages/commonFeed/hooks/useCommonData/index.ts Outdated Show resolved Hide resolved
src/pages/commonFeed/hooks/useCommonData/index.ts Outdated Show resolved Hide resolved
src/shared/hooks/useCases/useFullCommonData/index.ts Outdated Show resolved Hide resolved
@andreymikhadyuk
Merge branch 'dev' into feature/CW-2076-join-common-from-space
4033e3d 
# Conflicts:
#	src/pages/common/components/ChatComponent/ChatComponent.tsx
@andreymikhadyuk
remove getRootCommon duplication
cfbc6da
@andreymikhadyuk andreymikhadyuk merged commit bceb42d into dev Sep 26, 2023
@andreymikhadyuk andreymikhadyuk deleted the feature/CW-2076-join-common-from-space branch September 26, 2023 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@budnik9 budnik9 budnik9 approved these changes

@pvm-code pvm-code Awaiting requested review from pvm-code

@roienatan roienatan Awaiting requested review from roienatan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Join common from a space
2 participants
@andreymikhadyuk @budnik9