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

Fix/angular migration style fixes #637

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Fix/angular migration style fixes #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc4b49a
feat: prevents text being cutoff in flow sipcapture/homer-app#542
AlexeyOplachko Jun 4, 2024
0837e08
fix: styles broken by migration to newer angular version #636
AlexeyOplachko Jun 5, 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
2 changes: 1 addition & 1 deletion src/app/components/controls/transaction-filter/transaction-filter.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<button mat-icon-button
class="button-icon-right-top"
class="button-icon-right-top fa-icon-custom"
(click)="doOpenFilter()">
<fa-icon icon="filter"></fa-icon>
</button>
Expand Down
12 changes: 7 additions & 5 deletions src/app/components/dashboard/edit-dialog/edit-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ <h4>{{'dashboard.editDialog.dashboardGridConfigurations.title' | translate}}</h4
<mat-option [value]="'horizontalFixed'">{{'dashboard.editDialog.dashboardGridConfigurations.gridTypes.horizontalFixed' | translate}}</mat-option>
</mat-select>
</mat-form-field>
<mat-checkbox labelPosition="before" [(ngModel)]="data.pushing">{{'dashboard.editDialog.dashboardGridConfigurations.pushing' | translate}}</mat-checkbox>
<mat-checkbox [(ngModel)]="data.pushing">{{'dashboard.editDialog.dashboardGridConfigurations.pushing' |
translate}}</mat-checkbox>
</div>
<div *ngIf="data.type !== 2 && data.type !== 7" style="display: flex; flex-direction: column">
<hr style="width: 100%;">
Expand All @@ -79,8 +80,10 @@ <h4>{{'dashboard.editDialog.widgetControl.title' | translate}}</h4>
<div *ngIf="data.type === 7" style="display: flex; flex-direction: column">
<hr style="width: 100%;">
<h4>{{'dashboard.editDialog.grafanaControl.title' | translate}}</h4>
<mat-checkbox labelPosition="before" [(ngModel)]="data.grafanaTimestamp">{{'dashboard.editDialog.grafanaControl.grafanaTimestamp' | translate}}</mat-checkbox>
<mat-checkbox labelPosition="before" [(ngModel)]="data.grafanaProxy">{{'dashboard.editDialog.grafanaControl.grafanaProxy' | translate}}</mat-checkbox>
<mat-checkbox [(ngModel)]="data.grafanaTimestamp">{{'dashboard.editDialog.grafanaControl.grafanaTimestamp' |
translate}}</mat-checkbox>
<mat-checkbox [(ngModel)]="data.grafanaProxy">{{'dashboard.editDialog.grafanaControl.grafanaProxy' |
translate}}</mat-checkbox>
<div *ngIf="isSameOrigin">
<mat-checkbox color="primary"
[(ngModel)]="data.hasVariables"
Expand All @@ -92,8 +95,7 @@ <h4>{{'dashboard.editDialog.grafanaControl.title' | translate}}</h4>
<hr style="width: 100%;">
<div>
<button mat-raised-button class="setting-btn-ok" (click)="onExport()">{{'dashboard.editDialog.export' | translate}}</button>
</div>
<hr style="width: 100%;">
</div>
</div>

<div mat-dialog-actions style="float: right; margin-bottom: 0rem;">
Expand Down
1 change: 0 additions & 1 deletion src/app/components/dashboard/edit-dialog/edit-dialog.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/menu/menu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ button {
margin-bottom: -11px;
margin-left: 40px;
}

.tab-menu-title {
justify-content: flex-end;
}
5 changes: 1 addition & 4 deletions src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
::ng-deep .mat-mdc-dialog-container {
padding:24px;
padding-bottom:12px;
.mat-mdc-dialog-actions {
padding:0px;
margin-top:3px;
}

}
.chack-list {
margin-right: 1.3rem;
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/preference/dialogs/dialog-users/dialog-users.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<p [ngClass]="isCopy && isNotChanged ? 'copy-warning': ''">
<span *ngIf="isCopy && isNotChanged">{{ 'preference.users.dialog.userCopy' | translate }}</span>
</p>
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 10px); grid-gap: 10px; ">
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 17px); grid-gap: 10px; ">
<mat-form-field *ngIf="username">
<mat-label>{{ 'preference.users.dialog.username' | translate }}</mat-label>
<input matInput
Expand Down Expand Up @@ -70,7 +70,7 @@
</mat-form-field> -->
</div>

<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 10px); grid-gap: 10px;">
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 17px); grid-gap: 10px;">
<mat-form-field>
<input matInput
autocomplete="new-password"
Expand Down Expand Up @@ -123,7 +123,7 @@
</div>
<strong>{{ 'preference.users.dialog.personalInfo' | translate }}</strong>
<hr />
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 10px); grid-gap: 10px;">
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 17px); grid-gap: 10px;">
<mat-form-field>
<mat-label>{{ 'preference.users.dialog.firstName' | translate }}</mat-label>
<input matInput
Expand Down Expand Up @@ -157,7 +157,7 @@
</mat-error>
</mat-form-field>
</div>
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 10px); grid-gap: 10px;">
<div style="display: grid; grid-template-columns: repeat(2, 50%); width: calc(100% - 17px); grid-gap: 10px;">
<mat-form-field>
<mat-label>{{ 'preference.users.dialog.email' | translate }}</mat-label>
<input matInput
Expand Down
47 changes: 0 additions & 47 deletions src/app/components/preference/pages/page-admin/page-admin.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,54 +41,7 @@
}
}

.in-widget {
margin-left: 0;

.setting-btn {
border-top-right-radius: 0px !important;
border-bottom-right-radius: 0px !important;
box-shadow: none !important;
width: 80%;
margin-right: 0px;
}

.setting-select {
position: relative;
width: 10px;
min-width: unset;
margin-left: 0px !important;
border-top-left-radius: 0px !important;
border-bottom-left-radius: 0px !important;
border-left: 1px black solid;
box-shadow: none !important;
background-color: #009cbf22;
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
::ng-deep.mat-select-value {
position: absolute;
}
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
::ng-deep.mat-select-arrow-wrapper {
display: block;
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
.mat-select-arrow {
margin: 0px !important;
margin-left: -5px !important;
}
}
}
}

.in-select {
width: 100%;
margin: unset;
background-color: #009cbf22;
color: #009cbf;
}

.page-admin {
display: flex;
Expand Down
40 changes: 22 additions & 18 deletions src/app/components/preference/pages/page-reset/page-reset.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,28 @@ <h3>{{ page | titlecase }}</h3>
{{'LINK.localStorage' | translate}}</mat-card-title>
<mat-card-subtitle>{{'preference.pageReset.localStorageSetting' | translate }}</mat-card-subtitle>
</mat-card-header>
<mat-card-body>
<div class="setting-button-container">
<span style='display: flex;' class='in-widget'>
<button mat-raised-button class="setting-btn"
(click)="onClearLocalData(false)">{{'preference.pageReset.clearUserLocalData' | translate }}
</button>
<button mat-raised-button class="setting-select" (click)='select.open()'>
<mat-select style="position: absolute; top: 0; left: 0; right: 0; bottom: 0;"
#select>
<mat-option style="padding: 2px 0">
<button mat-raised-button class="setting-btn in-select"
(click)="onClearLocalData(true)">{{'preference.pageReset.clearAllLocalData' | translate }}</button>
</mat-option>
</mat-select>
</button>
</span>
</div>
</mat-card-body>
<div class="setting-button-container">
<span style='display: flex;' class='in-widget'>
<button mat-raised-button class="setting-btn"
(click)="onClearLocalData(false)">{{'preference.pageReset.clearUserLocalData' | translate }}
</button>
<button mat-raised-button class="setting-select" color="primary">
<button class="function-menu-trigger" mat-button [matMenuTriggerFor]="reset">
<svg viewBox="0 0 24 24" width="24px" height="24px" focusable="false">
<path d="M7 10l5 5 5-5z"></path>
</svg>
</button>
<mat-menu #reset="matMenu">
<div class="function-menu-wrapper" style="padding: 0;">
<button mat-raised-button class="setting-btn in-select"
(click)="onClearLocalData(true)">{{'preference.pageReset.clearAllLocalData' | translate
}}</button>
</div>
</mat-menu>

</button>
</span>
</div>
</mat-card>
<mat-card appearance="outlined" class="reset-card" *ngIf="isResetDashboard">
<mat-card-header class="flex-between">
Expand Down
23 changes: 9 additions & 14 deletions src/app/components/preference/pages/page-reset/page-reset.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
margin-bottom: 21px;

& .setting-btn {
height: 35px;
background: #009cbf !important;
color: white;
margin-right: 7px;
Expand All @@ -54,11 +53,12 @@
border-top-right-radius: 0px !important;
border-bottom-right-radius: 0px !important;
box-shadow: none !important;
width: 80%;
width: 85%;
margin-right: 0px;
}

.setting-select {
overflow: hidden;
position: relative;
width: 10px;
min-width: unset;
Expand All @@ -68,21 +68,13 @@
border-left: 2px #6687bd solid;
box-shadow: none !important;
background-color: #009cbf;
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
::ng-deep.mat-select-value {
position: absolute;
}
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
::ng-deep.mat-select-arrow-wrapper {
::ng-deep.mat-mdc-select-arrow-wrapper {
display: block;
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
/* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
.mat-select-arrow {
color:white;
.mat-mdc-select-arrow {
color: white;
margin: 0px !important;
margin-left: -5px !important;
}
Expand All @@ -92,9 +84,12 @@

.in-select {
width: 100%;
margin: unset;
margin-bottom: 5px;
background-color: #009cbf22;
color: #009cbf;
&:last-of-type {
margin-bottom: unset;
}
}

.page-reset {
Expand Down
5 changes: 2 additions & 3 deletions src/app/components/preference/service-dialogs/dialog-import/dialog-import.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
</div>
</div>

<div mat-dialog-actions style="float: right; margin-bottom: 0rem;">
<button mat-raised-button (click)="onNoClick()"></button>
<div mat-dialog-actions style="float: right; margin-bottom: 0rem;">
<button mat-raised-button class="setting-btn-ok" cdkFocusInitial
(click)="onNoClick()">{{'LINK.buttons.close' | translate}}</button>
</div>
</div>
1 change: 0 additions & 1 deletion src/app/components/search-grid-call/export-dialog/export-dialog.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}

.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
}

.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/search-grid-call/search-grid-call.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
.regex-container {
font-size: 13px;
position: fixed;
top: 2px;
top: 8px;
right: 46px;
max-width: 275px;
display: flex;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/widgets/ace-editor-widget/settings-ace-editor-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/widgets/alert-widget/setting-alert-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/widgets/clock-widget/setting-clock-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
9 changes: 8 additions & 1 deletion src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,20 @@
z-index: 2;
}
}
.search-menu-trigger {
min-width: 0 !important;
width: 0;
padding-right: 17px !important;

svg {
fill: rgba(0, 0, 0, 0.54);
}
}
.chack-list {
margin-right: 1.3rem;
}

.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
3 changes: 1 addition & 2 deletions src/app/components/widgets/protosearch-widget/setting-protosearch-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
}

.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand All @@ -28,7 +27,7 @@
padding: 5px;
position: relative;
padding-top: 8px;
bottom: 0px;
bottom: 1px;
right: 0px;
display: flex;
justify-content: flex-end;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/widgets/result-chart-widget/setting-result-chart-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
1 change: 0 additions & 1 deletion src/app/components/widgets/result-widget/setting-result-widget.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.title {
margin: -1.5rem -1.5rem 2rem -1.5rem;
width: initial !important;
display: flex;
justify-content: space-between;
Expand Down
14 changes: 9 additions & 5 deletions src/app/helpers/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,14 @@ export class TransactionServiceProcessor {
const codecString = `${name || '--'}/${!isNaN(rate) ? rate : '--'}/PT:${
!isNaN(pt) ? pt : '--'
}`;
const outDataItem = {
const fallbackDescription = `${sIP}:${sPORT} -> ${dIP}:${dPORT}`;
const isRuriFromMessage = i.raw_source.includes(i.ruri_user);
const ruriDescription = isRuriFromMessage ? i.raw_source : i.ruri_user;
const isCodecValid = pt || name || rate;
const RTPDescription = isRTP && isCodecValid ? codecString : fallbackDescription
const description = ruriDescription || RTPDescription;

const outDataItem = {
id: i.id,
codecData,
callid: i.callid,
Expand All @@ -740,10 +747,7 @@ export class TransactionServiceProcessor {
: eventName),
method: eventName,
description:
i.ruri_user ||
(isRTP && (pt || name || rate)
? codecString
: `${sIP}:${sPORT} -> ${dIP}:${dPORT}`),
description,
info_date: `[${i.id || '#' + (pid + 1)}] [${protoName}] ${moment(
i.micro_ts
).format(dateFormat)}`,
Expand Down
Loading
Loading