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

Merge bloom core into doorway #89

Merged
merged 32 commits into from
May 12, 2023
Merged

Merge bloom core into doorway #89

merged 32 commits into from
May 12, 2023

Conversation

ludtkemorgan
Copy link
Collaborator

@ludtkemorgan ludtkemorgan commented May 4, 2023 •
edited
Loading

This pulls over the most recent commits from bloom core into Doorway

Notes:

  • This PR shows it has 31 commits, but it is really 7 commits and a couple of merge commits. Theoretically if we do a merge instead of a squash and merge on this PR we won't have this discrepancy next time we sync with bloom core.
  • I had to change the version of @types/react in the new doorway-ui-components to satisfy the compiler. This is now set to the version of @types/react that is getting pulled into public and partners, however we might run into a similar issue again if those are updated.

ludtkemorgan and others added 30 commits March 31, 2023 12:12
@ludtkemorgan
fix: user export fixes (bloom-housing#3371)
2068f9c 
* fix: user export fixes

* fix: update error message alert
chore(release): version
519011b 
 - @bloom-housing/[email protected]
@ludtkemorgan
feat: upgrade react to 18 (bloom-housing#3360)
e59111d 
* feat: upgrade react to 18

* feat: upgrade cypress to 12 for public

* feat: upgrade cypress for partners

* fix: update configs

* fix: update partner cypress tests

* fix: review comments

* fix: fix flaky cypress test
chore(release): version
1293b48 
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
@YazeedLoonat
fix: program/preference keys length uncap (bloom-housing#3376)
af64287 
* fix: program/preference keys length uncap

* fix: updates per pr comments
chore(release): version
499810f 
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
@ludtkemorgan
feat: upgrade nextjs to 13 (bloom-housing#3375)
c71ec15 
* feat: upgrade nextjs to 13

* fix: attempt to get cypress test working
chore(release): version
777f708 
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
@YazeedLoonat
feat: changing auth over to cookies (bloom-housing#3357)
cd03929
@YazeedLoonat
fix: resolves issues around markedAsDuplicate (bloom-housing#3373)
059291a
chore(release): version
13d9786 
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
@ludtkemorgan
fix: react type errors (bloom-housing#3382)
ed572ce
chore(release): version
ed11180 
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
 - @bloom-housing/[email protected]
@emilyjablonski
refactor: add cloudinary fxn to partners (bloom-housing#3393)
03cb224
@emilyjablonski
fix: remove max length from extra data app fields (bloom-housing#3394)
5efdb17
@emilyjablonski
refactor: uptake seeds FormErrorMessage (bloom-housing#3369)
4c1bb2a
@KrissDrawing
fix: add startDate to open house submit event (bloom-housing#3399)
6d1fe3a
@ludtkemorgan
fix: add three new fields to base view (bloom-housing#3406)
cb48ea7
@YazeedLoonat
feat: removing sensative info from leasing agent (bloom-housing#3409)
b66fa19 
* feat: removing sensative info from leasing agent

* fix: adding swagger changes

* fix: updates for tests
@dependabot
chore(deps): bump cookiejar from 2.1.2 to 2.1.4 (bloom-housing#3295)
4551530 
Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.2 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases)
- [Commits](https://github.com/bmeck/node-cookiejar/commits)

---
updated-dependencies:
- dependency-name: cookiejar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@YazeedLoonat
fix: updates around cookies (bloom-housing#3405)
a2d428b 
* fix: updates around cookies

* fix: creating new migration for token -> code
@emilyjablonski
fix: frontend validation for char max (bloom-housing#3413)
2ba7cc1
@KrissDrawing
fix: Searching on the applications table causes the page to crash (bl…
cb85ee8 
…oom-housing#3408)

* fix: pass proper value to to_tsquery function

* fix: search applications using ILIKE

* fix: change where to orWhere

* feat: add application search by confirmation code
@seanmalbert @ludtkemorgan @YazeedLoonat
updates proxy to support access control allow list (bloom-housing#3407)
3b816da 
* feat: updates proxy to support access control allow list

* fix: remove downstream access-control-allow-origin

* fix: update readme for m1

* fix: move purge call to the backend

* fix: test fix and add await

* fix: moving cache purge to helper

---------

Co-authored-by: Morgan Ludtke <[email protected]>
Co-authored-by: Yazeed Loonat <[email protected]>
@KrissDrawing
fix: add translation for 64 characters error (bloom-housing#3423)
7efc15d
@ludtkemorgan
fix: downgrade version of nest axios (bloom-housing#3419)
7cf1a89
@YazeedLoonat
fix: now removes criteria file if a url is input (bloom-housing#3421)
d50f469
@ludtkemorgan
fix: update ui-c to latest version (bloom-housing#3420)
da3b20b
@ludtkemorgan
Merge remote-tracking branch 'bloom/main' into release/2023-05-04
3e13254
@ludtkemorgan
Merge remote-tracking branch 'origin/main' into release/2023-05-04
9de98d5
@ludtkemorgan ludtkemorgan marked this pull request as ready for review May 5, 2023 15:36
@lisunshiny
Copy link

this overall lgtm i will pull down the branch and do some testing before stamping on monday ty!!

@lisunshiny
Copy link

features seem good -- couldnt' test the external listing stuff so I'll leave it to @chriscasto to take a look at that part!

@phattya phattya requested a review from chriscasto May 10, 2023 14:04
@chriscasto
Copy link

Lgtm, but the 28k line yarn.lock file has quite a few conflicts that need to be resolved. @lisunshiny @ludtkemorgan Do either of you want to take a stab at it or should I just give it a go? It looks like it mostly involves stuff I don't touch so I don't want to accidentally break anything.

@ludtkemorgan
Copy link
Collaborator Author

Lgtm, but the 28k line yarn.lock file has quite a few conflicts that need to be resolved. @lisunshiny @ludtkemorgan Do either of you want to take a stab at it or should I just give it a go? It looks like it mostly involves stuff I don't touch so I don't want to accidentally break anything.

@chriscasto I can take a stab at that

@ludtkemorgan
Copy link
Collaborator Author

@chriscasto @lisunshiny I've merged the most recent changes from Doorway into this branch and resolved the conflicts. I started it up and it appears to all work. The only thing I can't test is the map since I don't have an api key. But other than that it looks good from my side. I think this is ready to merge whenever you are. Just make sure you merge with "create a merge commit" option. 🤞 that it will make it so the next merge will only have the newest commits from core

@chriscasto chriscasto merged commit e0d9bd8 into main May 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lisunshiny lisunshiny lisunshiny approved these changes

@chriscasto chriscasto chriscasto approved these changes

Assignees

@chriscasto chriscasto

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ludtkemorgan @lisunshiny @chriscasto @YazeedLoonat @emilyjablonski @KrissDrawing @seanmalbert