load and apply patch changes #748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 6cd7f76 The changes in this PR will be included in the next version bump. This PR includes changesets to release 28 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Codecov Report
@@ Coverage Diff @@
## master #748 +/- ##
==========================================
+ Coverage 42.97% 42.99% +0.02%
==========================================
Files 931 933 +2
Lines 41221 41350 +129
Branches 9470 9498 +28
==========================================
+ Hits 17713 17780 +67
- Misses 23438 23500 +62
Partials 70 70
|
MauricioUyaguari
force-pushed
the
patch
branch
3 times, most recently
from
d8e2ed9
to
f86c40a
Compare
MauricioUyaguari
requested review from
akphi and
pierredebelen
as code owners
MauricioUyaguari
force-pushed
the
patch
branch
4 times, most recently
from
5504413
to
9311543
Compare
akphi
requested changes
Dec 29, 2021
packages/legend-studio/style/components/editor/side-bar/_patch-changes.scss
Outdated
Show resolved
Hide resolved
| import { entityDiffSorter } from '../../../stores/EditorSDLCState'; | ||
| import { useEditorStore } from '../EditorStoreProvider'; | ||
| import { useApplicationStore } from '@finos/legend-application'; | ||
| import { Dialog } from '@material-ui/core'; | ||
|
|
||
| const PatchModalEditor = observer(() => { |
There was a problem hiding this comment.
Can we use something like react-dropzone?
There was a problem hiding this comment.
Also let's rename this to PatchLoader
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
MauricioUyaguari
force-pushed
the
patch
branch
2 times, most recently
from
e65f79a
to
99840ee
Compare
MauricioUyaguari
force-pushed
the
patch
branch
from
99840ee
to
e46bb61
Compare
akphi
requested changes
Dec 29, 2021
packages/legend-studio/src/components/editor/side-bar/LocalChanges.tsx
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/components/editor/side-bar/LocalChanges.tsx
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
packages/legend-studio/src/stores/sidebar-state/LocalChangesState.ts
Outdated
Show resolved
Hide resolved
akphi
reviewed
Dec 30, 2021
| this.setModal(false); | ||
| } | ||
|
|
||
| setModal(val: boolean): void { |
akphi
reviewed
Dec 30, 2021
| } | ||
| } | ||
|
|
||
| applyEntityChanges( |
There was a problem hiding this comment.
This is an utility method, we can move it outside of the class, in fact, let's move this out to EntityChangeUtils or something like that.
akphi
approved these changes
Dec 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Ability to apply patches (no Conflict resolution).
Ability to revert local changes
How did you test this change?
Legend.Studio.Mozilla.Firefox.2021-12-28.12-10-33.mp4