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

Added the UI changes for check constraints #5

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Added the UI changes for check constraints #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68e9051
Add the UI changes for check constraints
Nov 21, 2024
e03351c
remove the commented code
Nov 21, 2024
ce202d7
code refactor
Dec 2, 2024
560a37c
code refactor
Dec 2, 2024
1b3542e
code refactor
Dec 2, 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
45 changes: 45 additions & 0 deletions ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"babel-loader": "^9.1.3",
"jszip": "^3.10.1",
"loader-utils": "^3.2.1",
"node-sql-parser": "^5.3.5",
"rxjs": "~7.8.1",
"terser": "^5.22.0",
"tslib": "^2.6.2",
Expand All @@ -44,4 +45,4 @@
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "^5.3.3"
}
}
}
4 changes: 3 additions & 1 deletion ui/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'
import { FormsModule } from '@angular/forms'
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
import { MatChipsModule } from '@angular/material/chips'
import { MatTooltipModule } from '@angular/material/tooltip';

import { AppComponent } from './app.component'
import { HeaderComponent } from './components/header/header.component'
Expand Down Expand Up @@ -113,7 +114,8 @@ import { AddNewSequenceComponent } from './components/add-new-sequence/add-new-s
MatRadioModule,
ClipboardModule,
MatProgressSpinnerModule,
MatChipsModule
MatChipsModule,
MatTooltipModule,
],
providers: [
{
Expand Down
142 changes: 137 additions & 5 deletions ui/src/app/components/object-detail/object-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ <h3 class="title">
</ng-container>
</mat-select>
</mat-form-field>
</ng-container>
</ng-container>
<ng-container *ngIf="!isEditMode">
<p>{{ element.get('spAutoGen').value.Name !== '' ? element.get('spAutoGen').value.Name : 'None' }}</p>
</ng-container>
Expand Down Expand Up @@ -381,7 +381,7 @@ <h3 class="title">
<div class="pk-tab-container">
<table mat-table [dataSource]="pkDataSource">
<ng-container matColumnDef="srcDatabase">
<th mat-header-cell class="db_name" *matHeaderCellDef colspan="5">{{ srcDbName }}</th>
<th mat-header-cell class="db_name" *matHeaderCellDef colspan="6">{{ srcDbName }}</th>
</ng-container>

<ng-container matColumnDef="spDatabase">
Expand Down Expand Up @@ -707,6 +707,129 @@ <h3 class="title">
</div>
</mat-tab>

<mat-tab>
<ng-template mat-tab-label>
<span>CHECK CONSTRAINTS</span>
</ng-template>
<div class="cc-tab-container">
<table mat-table [dataSource]="ccDataSource">
<ng-container matColumnDef="srcDatabase">
<th mat-header-cell class="db_name" *matHeaderCellDef [attr.colspan]="3">{{ srcDbName }}</th>
</ng-container>

<ng-container matColumnDef="spDatabase">
<th mat-header-cell *matHeaderCellDef class="db_name" [attr.colspan]="4" >
<div class="spanner_edit-button">
<span>Spanner</span>
<div *ngIf="
!isCcEditMode &&
ccDataSource.length > 0 &&
currentObject!.isSpannerNode &&
!currentObject.isDeleted
">
<button mat-stroked-button color="primary" (click)="toggleCcEdit()">
<mat-icon class="edit-icon">edit</mat-icon>
EDIT
</button>
</div>
</div>
</th>
</ng-container>

<ng-container matColumnDef="srcSno">
<th class="table_header" mat-header-cell *matHeaderCellDef>S. No.</th>
<td mat-cell *matCellDef="let element" >
<span *ngIf="element.get('srcSno').value != 0">
{{ element.get('srcSno').value }}
</span>
</td>
</ng-container>

<ng-container matColumnDef="srcConstraintName">
<th class="table_header" mat-header-cell *matHeaderCellDef>Constraint Name</th>
<td mat-cell *matCellDef="let element">
{{ element.get('srcConstraintName').value }}
</td>

</ng-container>

<ng-container matColumnDef="srcCondition">
<th class="table_header" mat-header-cell *matHeaderCellDef>Condition</th>
<td mat-cell *matCellDef="let element" matTooltip="{{ element.get('srcCondition').value }}"
matTooltipPosition="above" class="overflow-cell">

{{ element.get('srcCondition').value }}
</td>
</ng-container>

<ng-container matColumnDef="spSno">
<th mat-header-cell class="table_header" *matHeaderCellDef>S. No.</th>
<td mat-cell *matCellDef="let element">
{{ element.get('spSno').value }}
</td>
</ng-container>

<ng-container matColumnDef="spConstraintName">
<th class="table_header" mat-header-cell *matHeaderCellDef>Constraint Name</th>
<td mat-cell *matCellDef="let element">
<div *ngIf="isCcEditMode">
<input
matInput
class="name_input"
type="text"
[formControl]="element.get('spConstraintName')"
matTooltip="No special characters allowed except underscore."
/>
</div>
<p *ngIf="!isCcEditMode">{{ element.get('spConstraintName').value }}</p>
</td>
</ng-container>

<ng-container matColumnDef="spCondition">
<th class="table_header" mat-header-cell *matHeaderCellDef>Condition</th>
<td mat-cell *matCellDef="let element" >
<div *ngIf="isCcEditMode">
<textarea name="spConstraintName" matInput
class="name_input" [formControl]="element.get('spCondition')"
matTooltip="Enter valid clause for CHECK constraints" id="ck1"></textarea>
</div>
<p *ngIf="!isCcEditMode" matTooltip="{{ element.get('spCondition').value }}"
matTooltipPosition="above" class="overflow-cell">{{ element.get('spCondition').value }}</p>
</td>
</ng-container>

<ng-container matColumnDef="dropButton">
<th mat-header-cell class="table_header" *matHeaderCellDef></th>
<td mat-cell *matCellDef="let element" [ngClass]="{ 'drop-button-left-border': isCcEditMode }">
<div class="actions" *ngIf="
isCcEditMode &&
currentObject!.isSpannerNode
">
<mat-icon [matMenuTriggerFor]="menu">more_vert</mat-icon>
<mat-menu #menu="matMenu" xPosition="before">
<button [disabled]="!isCcEditMode" mat-menu-item (click)="dropCc(element)">
<span>Remove constraint</span>
</button>
</mat-menu>
</div>
</td>
</ng-container>

<tr mat-header-row *matHeaderRowDef="['srcDatabase', 'spDatabase']"></tr>
<tr mat-header-row *matHeaderRowDef="displayedCCColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedCCColumns"></tr>
</table>

<div *ngIf="isCcEditMode" class="add-cc-column">
<button mat-button color="primary" class="add-column-btn" type="button" (click)="addCcColumn()">
<mat-icon>add</mat-icon>
ADD COLUMN
</button>
</div>

</div>
</mat-tab>

<mat-tab label="INTERLEAVE" *ngIf="
((interleaveStatus.tableInterleaveStatus &&
interleaveStatus.tableInterleaveStatus.Possible) ||
Expand Down Expand Up @@ -901,7 +1024,7 @@ <h3 class="title">
</ng-container>
</div>
</td>
</ng-container>
</ng-container>
<ng-container matColumnDef="spSkipRangeMin">
<th mat-header-cell class="table_header" *matHeaderCellDef>Skip Range Min</th>
<td mat-cell *matCellDef="let element">
Expand Down Expand Up @@ -952,7 +1075,7 @@ <h3 class="title">
<tr mat-header-row *matHeaderRowDef="sequenceDisplayedColumns"></tr>
<tr mat-row class="sequence-data-row" *matRowDef="let row; columns: sequenceDisplayedColumns"></tr>
</table>

</div>

<div class="save-edits">
Expand All @@ -976,6 +1099,15 @@ <h3 class="title">
CANCEL
</button>
</div>
<div class="save-button" *ngIf="isCcEditMode && currentTabIndex === 3">
<button mat-raised-button color="primary" (click)="saveCc()" [disabled]="!ccArray.valid" >
SAVE & CONVERT
</button>
<button class="cancel-button" mat-raised-button color="primary" (click)="toggleCcEdit()"
*ngIf="currentObject!.isSpannerNode">
CANCEL
</button>
</div>
<div class="save-button" *ngIf="isFkEditMode && currentTabIndex === 2">
<button mat-raised-button color="primary" (click)="saveFk()">SAVE & CONVERT</button>
<button class="cancel-button" mat-raised-button color="primary" (click)="toggleFkEdit()"
Expand All @@ -1000,4 +1132,4 @@ <h3 class="title">
</button>
</div>
</div>
</div>
</div>
12 changes: 11 additions & 1 deletion ui/src/app/components/object-detail/object-detail.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
}
}
.add-pk-column,
.add-cc-column,
.add-column {
margin-left: 50%;
padding: 10px;
Expand All @@ -99,6 +100,7 @@
.column-tab-container,
.fk-tab-container,
.pk-tab-container,
.cc-tab-container,
.index-tab-container,
.sequence-tab-container {
height: 84%;
Expand Down Expand Up @@ -201,7 +203,7 @@
.mat-column-srcColMaxLength {
min-width: 100px;
}

.mat-column-spSequenceKind{
min-width: 250px;
}
Expand Down Expand Up @@ -315,3 +317,11 @@ tr.mat-mdc-row {
.custom-mat-form-field .mat-select-panel .mat-option {
white-space: nowrap;
}

.overflow-cell {
max-width: 150px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer;
}
Loading
Loading