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: add patch merge strategy in deployment template #2151

Closed
wants to merge 129 commits into from
Closed

feat: add patch merge strategy in deployment template #2151

wants to merge 129 commits into from

Conversation

AbhishekA1509
Copy link
Member

@AbhishekA1509 AbhishekA1509 commented Oct 24, 2024 •
edited
Loading

Description

This PR includes changes:

  • to support patch merge strategy in deployment template.
  • to move configHeaderTabs to URL.
  • to fix the schema url on which comes on bottom of tooltip on editor hover.

Fixes # (issue)

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

Checklist:

  • The title of the PR states what changed and the related issues number (used for the release note).
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas

Elessar1802 and others added 21 commits October 3, 2024 11:38
@Elessar1802
feat: add new gui view model to hide unhide features
3104567
@AbhishekA1509 @Elessar1802
feat: add NoOverrideEmptyState
eafd841
@AbhishekA1509 @Elessar1802
feat: add common compare config view
c1f3d61
@AbhishekA1509 @Elessar1802
feat: add GA Events
644c78a
@AbhishekA1509 @Elessar1802
feat: add NoPublishedVersionEmptyState
0ccf070
@AbhishekA1509 @Elessar1802
fix: unsaved changes locked keys mode
7c92d78
@Elessar1802
fix: proper instantiate model ref
8924e5e
@Elessar1802
Merge branch 'refactor/compare-manifest' of github.com:devtron-labs/d…
9d9ed98 
…ashboard into feat/rjsf-field-selector
@Elessar1802
fix: proper handle arrays in schema
77c64c1
@Elessar1802
chore: uat changes to reduce spacing
ee45de9
@Elessar1802
chore: move gui view types to types file
2106af6
@Elessar1802
chore: move gui view into its own folder
eafdada
@Elessar1802
Merge branch 'refactor/compare-manifest' of github.com:devtron-labs/d…
d781a76 
…ashboard into feat/rjsf-field-selector
@Elessar1802
chore: move label inside checkbox & change padding
6b853d8
@Elessar1802
chore: use title case for types & add typings to state
11b2d5c
@Elessar1802
Merge branch 'refactor/compare-manifest' of github.com:devtron-labs/d…
41f4a83 
…ashboard into feat/rjsf-field-selector
@Elessar1802
feat: add or remove keys based on toggle state in gui view
53216e2
@Elessar1802
fix: handle json schema array of types
3bea6cd
@AbhishekA1509
feat: add patch strategy for SelectMergeStrategy
7ed5bf5
@AbhishekA1509
feat: add merge strategy service parsing
7aa200b
@AbhishekA1509
feat: add non-scaling-stroke on icons
f9fb4f8
@AbhishekA1509 AbhishekA1509 changed the base branch from main to develop October 24, 2024 16:50
@github-actions github-actions bot added the PR:Issue-verification-failed PR:Issue-verification-failed label Oct 24, 2024
@AbhishekA1509 AbhishekA1509 marked this pull request as draft October 24, 2024 16:50
@AbhishekA1509 AbhishekA1509 changed the title feat: add path merge strategy in deployment template feat: add patch merge strategy in deployment template Oct 24, 2024
@AbhishekA1509 AbhishekA1509 self-assigned this Oct 24, 2024
AbhishekA1509 and others added 18 commits December 3, 2024 13:26
@AbhishekA1509
Merge branch 'develop' into feat/patch-dt
9e1cf40
@Elessar1802
fix: toggle configurable gui view panel on mergeStrategy change
e3532b1
@RohitRaj011
Merge branch 'feat/patch-dt' of github.com:devtron-labs/dashboard int…
e0da0e5 
…o feat/cm-secret-patch-dry-run
@RohitRaj011
chore: common-lib version bump
224c043
@Elessar1802
fix: filter out undefined(s) from flatMapOfJSON output
81aa32f
@Elessar1802
fix: use key to re-mount gui view on merge strategy change
9bf6ded
@AbhishekA1509
fix: add toast and lock diff modal after isLockConfigError is true wh…
455e831 
…ile updating draft
@Elessar1802
chore: add prefix to gui view component key
1f531c4
@AbhishekA1509
Merge pull request #2259 from devtron-labs/fix/draft-lock-error
dd7242d 
fix: add toast and lock diff modal after isLockConfigError is true while updating draft
@AbhishekA1509
Merge pull request #2254 from devtron-labs/fix/patch-concurrency
6f6185d 
fix: gui view errors
@RohitRaj011
Merge pull request #2232 from devtron-labs/feat/cm-secret-patch-dry-run
470eb35 
feat: cm secret patch dry run
@RohitRaj011
chore: common-lib version bump
20f8291
@RohitRaj011
fix: ConfigMapSecret - hidePatchOption condition fix
38fe173
@Elessar1802
fix: remove sync operation of gui view model on unmount
dd706c1
@AbhishekA1509
Merge branch 'develop' into feat/patch-dt
180761e
@AbhishekA1509
Merge pull request #2264 from devtron-labs/fix/gui-view
4248bb6 
fix: remove sync operation of gui view model on unmount
@AbhishekA1509
chore: update common lib to beta-7
55609f2
@AbhishekA1509
revert: fe-lib chunks
4fc0043
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Dec 6, 2024

Quality Gate Passed Quality Gate passed

Issues
8 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vivek-devtron vivek-devtron vivek-devtron left review comments

@RohitRaj011 RohitRaj011 RohitRaj011 left review comments

@vikramdevtron vikramdevtron Awaiting requested review from vikramdevtron vikramdevtron is a code owner

Assignees

@AbhishekA1509 AbhishekA1509

Labels
PR:Issue-verification-failed PR:Issue-verification-failed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AbhishekA1509 @RohitRaj011 @vivek-devtron @Elessar1802