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

feat: Restructure with site branch config relation #4192

Merged
merged 1 commit into from
Jul 24, 2023
Merged

feat: Restructure with site branch config relation #4192

merged 1 commit into from
Jul 24, 2023

Conversation

apburnes
Copy link
Contributor

@apburnes apburnes commented Jul 17, 2023 •
edited
Loading

Apart of #4101
Closes #4175

Changes proposed in this pull request:

  • Add unique index on branch and siteId to table
  • Add s3Key to site branch config table
  • Add context to site branch config table
  • Add site branch config API endpoints
  • Update site settings UI to work with new branch config
  • Move automatic build kickoff from site update to site branch config creation or update.
  • Add custom domains to its own page under a site

UI

Custom Domains Page

Screenshot 2023-07-21 at 11 35 00 AM

Site Branch Config

Screen.Recording.2023-07-21.at.11.35.19.AM.mov

security considerations

None.

@apburnes apburnes force-pushed the feat-add-site-branch-config branch from 3a75e85 to f820ab3 Compare July 17, 2023 17:30
@apburnes apburnes requested a review from a team July 17, 2023 20:34
svenaas
svenaas previously requested changes Jul 18, 2023
View reviewed changes
Copy link
Contributor

@svenaas svenaas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few small copy suggestions.

frontend/components/site/SiteSettings/BranchConfig.jsx Outdated Show resolved Hide resolved
frontend/components/site/SiteSettings/index.jsx Show resolved Hide resolved
frontend/components/site/SiteSettings/BranchConfigs.jsx Outdated Show resolved Hide resolved
api/controllers/site-branch-config.js Outdated Show resolved Hide resolved
api/controllers/site-branch-config.js Outdated Show resolved Hide resolved
drewbo
drewbo previously requested changes Jul 19, 2023
View reviewed changes
Copy link
Contributor

@drewbo drewbo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had one small question about flow and I'm seeing an error on s3Key validation when trying to edit a live site config. Once it's ready we should queue up a docs PR to match. Happy to pair review this later

api/controllers/site.js Outdated Show resolved Hide resolved
api/models/site-branch-config.js Show resolved Hide resolved
@apburnes apburnes force-pushed the feat-add-site-branch-config branch from 03c55ab to 685d03f Compare July 19, 2023 22:19
@apburnes apburnes requested review from drewbo and svenaas July 20, 2023 15:04
@apburnes apburnes force-pushed the feat-add-site-branch-config branch from ae97746 to 8032a3b Compare July 24, 2023 20:31
@apburnes apburnes dismissed stale reviews from drewbo and svenaas July 24, 2023 20:33

Resolved

@apburnes apburnes merged commit f81dea1 into staging Jul 24, 2023
3 checks passed
@apburnes apburnes deleted the feat-add-site-branch-config branch July 24, 2023 20:40
@drewbo drewbo mentioned this pull request Aug 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drewbo drewbo drewbo approved these changes

@svenaas svenaas Awaiting requested review from svenaas

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

Successfully merging this pull request may close these issues.

Update database model to normalize site branch config
3 participants
@apburnes @svenaas @drewbo