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

gh-899 Merge Diff improvements #902

Merged
merged 8 commits into from
Aug 29, 2024
Merged

gh-899 Merge Diff improvements #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f30975
gh-899 Fix styles in merge diff selector
pjmonks Aug 10, 2024
bdb6dcf
gh-899 Add comparison progress bar
pjmonks Aug 10, 2024
65e2fe0
gh-899 Improve performance of merge diff lists
pjmonks Aug 10, 2024
83e028c
gh-899 Fix styles of merge diff components
pjmonks Aug 10, 2024
4db6dd5
gh-899 Improve performance of check in dialog
pjmonks Aug 10, 2024
8325cf7
gh-899 Add progress display when committing merges
pjmonks Aug 10, 2024
5e01a90
gh-899 Fix styles blocking toolbar buttons on item comparison
pjmonks Aug 12, 2024
92ec8e4
Merge branch 'develop' into feature/gh-899-merge-diff-improvements
pjmonks Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions src/app/merge-diff/merge-comparsion/merge-comparison.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@
</div>
</div>
<div *ngIf="mergeItem.type === MergeType.Modification">
<div class="modified-item">
<mdm-path-name [path]="mergeItem.path"></mdm-path-name>
</div>
<div *ngIf="!isCommitting">
<div fxLayout="row">
<h4>{{ source.branchName }}</h4>
Expand Down Expand Up @@ -161,16 +164,18 @@ <h4 class="branchHeader">{{ sourceUsed }}</h4>
</div>
</div>
<div *ngIf="mergeItem.type === MergeType.Deletion">
<div class="deleteContent">
<h4 style="margin-top: 75px; color: red">
<mdm-path-name [path]="mergeItem.path"></mdm-path-name> will be deleted
</h4>
<div class="content">
<div class="delete-item">
<mdm-path-name [path]="mergeItem.path"></mdm-path-name>
</div>
<div class="delete-item">Item will be deleted</div>
</div>
</div>
<div *ngIf="mergeItem.type === MergeType.Creation">
<div class="deleteContent">
<h4 style="margin-top: 75px; color: green">
<mdm-path-name [path]="mergeItem.path"></mdm-path-name> will be created
</h4>
<div class="content">
<div class="create-item">
<mdm-path-name [path]="mergeItem.path"></mdm-path-name>
</div>
<div class="create-item">Item will be created</div>
</div>
</div>
26 changes: 19 additions & 7 deletions src/app/merge-diff/merge-comparsion/merge-comparison.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ SPDX-License-Identifier: Apache-2.0
*/
$changeColor: #e6ffe6;

.item-path {
margin: 1em;
}

.sourceCol {
height: 25vh;
overflow-y: auto;
Expand All @@ -32,16 +36,14 @@ $changeColor: #e6ffe6;
}
}



.spacer {
flex: 1 1 auto;
}

.panel {
.button {
padding-right: 10px !important;
font-size: small !important;
font-size: small !important;
width: fit-content !important;
}

Expand All @@ -50,9 +52,9 @@ $changeColor: #e6ffe6;
font-size: small;
}

.deleteContent {
.content {
height: 25vh;
text-align: center;
// text-align: center;
}

.textArea {
Expand All @@ -63,7 +65,17 @@ $changeColor: #e6ffe6;
width: 150px;
}

}

.create-item {
margin: 1em;
color: green;
}

.delete-item {
margin: 1em;
color: red;
}

.modified-item {
margin: 1em;
}
}
38 changes: 23 additions & 15 deletions src/app/merge-diff/merge-diff-container/merge-diff-container.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
type="button"
matToolTip="Commit Changes"
aria-label="Commit Changes"
[disabled]="!committingList || committingList.length === 0"
[disabled]="
!committingList || committingList.length === 0 || committingDiffs
"
(click)="onCommitChanges()"
>
<i
Expand Down Expand Up @@ -101,6 +103,20 @@ <h4 class="inline-block marginless">
</div>
<div>
<div
*ngIf="comparingBranches"
class="panel panel-default mdm--shadow-block"
>
<p>Comparing branches...</p>
<p>Depending on the size of the branches, this may take some time.</p>
<mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
</div>
<div *ngIf="committingDiffs" class="panel panel-default mdm--shadow-block">
<p>Committing your selected changes...</p>
<p>Depending on the of differences selected, this may take some time.</p>
<mat-progress-bar mode="indeterminate" color="accent"></mat-progress-bar>
</div>
<div
*ngIf="!comparingBranches && !committingDiffs"
class="tabContainer panel panel-default mdm--shadow-block"
fxLayout="row"
>
Expand All @@ -109,15 +125,14 @@ <h4 class="inline-block marginless">
[selectedIndex]="activeTab"
(selectedIndexChange)="tabSelected($event)"
>

<!-- Displays if no branch is selected -->
<!-- Displays if no branch is selected -->
<mat-tab *ngIf="!changesList">
<ng-template mat-tab-label> No Branch </ng-template>
<div class="noContent">
<h4 style="margin-top: 75px">No Target Branch Selected</h4>
</div>
</mat-tab>
<!-- Displays if a branch is selected -->
<!-- Displays if a branch is selected -->
<mat-tab *ngIf="changesList">
<ng-template mat-tab-label>
Changes ({{ changesList.length }})
Expand Down Expand Up @@ -156,10 +171,8 @@ <h4 style="margin-top: 75px">No Target Branch Selected</h4>
[mergeItems]="changesList"
style="display: flex"
></mdm-merge-item-selector>
<div class="noContent">
<h4 style="margin-top: 75px" *ngIf="changesList.length === 0">
No Pending Changes
</h4>
<div class="noContent" *ngIf="changesList.length === 0">
<h4 style="margin-top: 75px">No Pending Changes</h4>
</div>
</div>
</mat-tab>
Expand Down Expand Up @@ -189,13 +202,8 @@ <h4 style="margin-top: 75px" *ngIf="changesList.length === 0">
[mergeItems]="committingList"
style="display: flex"
></mdm-merge-item-selector>
<div class="noContent">
<h4
style="margin-top: 75px"
*ngIf="committingList.length === 0"
>
No Pending Commits
</h4>
<div class="noContent" *ngIf="committingList.length === 0">
<h4 style="margin-top: 75px">No Pending Commits</h4>
</div>
</div>
</mat-tab>
Expand Down
103 changes: 49 additions & 54 deletions src/app/merge-diff/merge-diff-container/merge-diff-container.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,68 +16,63 @@ limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/

.headerContainer{
justify-content:space-between;
flex-direction: row;
margin-top: 5px;
display:flex;
}


.tabContainer{
height: 20%;
min-height:300px
.headerContainer {
justify-content: space-between;
flex-direction: row;
margin-top: 5px;
display: flex;
}

.tabContainer {
height: 10%;
min-height: 200px;
// max-height: 500px;
}

.div {
position: relative;
margin: 2.5px;
}
.div {
position: relative;
margin: 2.5px;
}

.div1 {
@extend .div;
width:20%;
overflow-x: auto;
overflow-y: hidden;
}
.div1 {
@extend .div;
width: 20%;
overflow-x: auto;
overflow-y: hidden;
}

.div2 {
@extend .div;
width:80%;
}
.div2 {
@extend .div;
width: 80%;
}

.title
{
text-align: center;
}
.title {
text-align: center;
}

.noContent
{
height: 250px;
text-align: center;
}
.noContent {
height: 250px;
text-align: center;
}

.selectBtn
{
position: relative;
float: right;
margin-right: 75px;
margin-top: 15px;
}
.selectBtn {
position: relative;
float: right;
margin-right: 75px;
margin-top: 15px;
}

.spacer {
flex: 1 1 auto;
}
.spacer {
flex: 1 1 auto;
}

.button {
padding-right: 10px !important;
font-size: small !important;
width: fit-content !important;
}
.button {
padding-right: 10px !important;
font-size: small !important;
width: fit-content !important;
}

.cancelButton
{
padding-right: 90px;
font-size: small;
}
.cancelButton {
padding-right: 90px;
font-size: small;
}
Loading
Loading