Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

chore: merged repo and org config #691

Merged
merged 9 commits into from
Sep 7, 2023

Conversation

devpanther
Copy link
Contributor

Resolves #648

QA: one-two-test/one#3

@netlify
Copy link

netlify bot commented Aug 29, 2023

Deploy Preview for ubiquibot-staging ready!

Name Link
🔨 Latest commit 2f0631c
🔍 Latest deploy log https://app.netlify.com/sites/ubiquibot-staging/deploys/64f9809e12cce50008bcd308
😎 Deploy Preview https://deploy-preview-691--ubiquibot-staging.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.

Copy link
Collaborator

@whilefoo whilefoo left a comment

Choose a reason for hiding this comment

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

If it wasn't clear, the spec is to have nested inheritance for the entire config, not just for incentives. Ideally I'd like to get rid of every function in helpers.ts and just merge repo, org and default config using lodash - that way we don't need to keep adding new functions for every property.

@0xcodercrane
Copy link
Contributor

we can get the nested inheritance for the entire config without using the lodash simply like this.

const config = {...parsedOrgConfig, ...parsedRepoConfig}

What's the benefit to use lodash here? @whilefoo

@whilefoo
Copy link
Collaborator

we can get the nested inheritance for the entire config without using the lodash simply like this.

const config = {...parsedOrgConfig, ...parsedRepoConfig}

What's the benefit to use lodash here? @whilefoo

that would work only for top-level properties not nested, example: https://jsfiddle.net/8qhbj7r2/

@devpanther
Copy link
Contributor Author

that way we don't need to keep adding new functions for every property.

Got that, I'm pushing a new commit with helpers function removed and lodash used in merging all objs

@devpanther
Copy link
Contributor Author

All configs merged: one-two-test/one#3 (comment)

src/utils/private.ts Outdated Show resolved Hide resolved
src/utils/private.ts Outdated Show resolved Hide resolved
devpanther and others added 2 commits August 30, 2023 09:39
whilefoo
whilefoo previously approved these changes Aug 31, 2023
@whilefoo
Copy link
Collaborator

whilefoo commented Sep 2, 2023

@devpanther please resolve conflicts

@devpanther
Copy link
Contributor Author

@devpanther please resolve conflicts

resolved

@devpanther
Copy link
Contributor Author

@whilefoo @Draeieg This should be QA'd and merged asap.. there are new configs been added everyday and that's merge conflicts for me

@devpanther
Copy link
Contributor Author

@whilefoo @Draeieg ping

Copy link
Collaborator

@whilefoo whilefoo left a comment

Choose a reason for hiding this comment

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

@whilefoo whilefoo merged commit 87c01de into ubiquity:development Sep 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Config nested inheritance
4 participants