diff --git a/src/app/components/controls/transaction-filter/transaction-filter.component.html b/src/app/components/controls/transaction-filter/transaction-filter.component.html index 9e52d4cd..f1bccb5f 100644 --- a/src/app/components/controls/transaction-filter/transaction-filter.component.html +++ b/src/app/components/controls/transaction-filter/transaction-filter.component.html @@ -1,5 +1,5 @@ diff --git a/src/app/components/dashboard/edit-dialog/edit-dialog.component.html b/src/app/components/dashboard/edit-dialog/edit-dialog.component.html index dd1dea2a..f695bbe3 100644 --- a/src/app/components/dashboard/edit-dialog/edit-dialog.component.html +++ b/src/app/components/dashboard/edit-dialog/edit-dialog.component.html @@ -66,7 +66,8 @@

{{'dashboard.editDialog.dashboardGridConfigurations.title' | translate}}

{{'dashboard.editDialog.dashboardGridConfigurations.gridTypes.horizontalFixed' | translate}} - {{'dashboard.editDialog.dashboardGridConfigurations.pushing' | translate}} + {{'dashboard.editDialog.dashboardGridConfigurations.pushing' | + translate}}

@@ -79,8 +80,10 @@

{{'dashboard.editDialog.widgetControl.title' | translate}}


{{'dashboard.editDialog.grafanaControl.title' | translate}}

- {{'dashboard.editDialog.grafanaControl.grafanaTimestamp' | translate}} - {{'dashboard.editDialog.grafanaControl.grafanaProxy' | translate}} + {{'dashboard.editDialog.grafanaControl.grafanaTimestamp' | + translate}} + {{'dashboard.editDialog.grafanaControl.grafanaProxy' | + translate}}
{{'dashboard.editDialog.grafanaControl.title' | translate}}
-
-
+
diff --git a/src/app/components/dashboard/edit-dialog/edit-dialog.component.scss b/src/app/components/dashboard/edit-dialog/edit-dialog.component.scss index d1c9eae6..de32bf3c 100644 --- a/src/app/components/dashboard/edit-dialog/edit-dialog.component.scss +++ b/src/app/components/dashboard/edit-dialog/edit-dialog.component.scss @@ -1,5 +1,4 @@ .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/menu/menu.component.scss b/src/app/components/menu/menu.component.scss index 0279116d..2d58acf0 100644 --- a/src/app/components/menu/menu.component.scss +++ b/src/app/components/menu/menu.component.scss @@ -284,7 +284,6 @@ button { margin-bottom: -11px; margin-left: 40px; } - .tab-menu-title { justify-content: flex-end; } diff --git a/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.scss b/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.scss index eba2770f..2579d027 100644 --- a/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.scss +++ b/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.scss @@ -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; diff --git a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.html b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.html index 1cddf272..af5a3d28 100644 --- a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.html +++ b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.html @@ -12,7 +12,7 @@

{{ 'preference.users.dialog.userCopy' | translate }}

-
+
{{ 'preference.users.dialog.username' | translate }} -->
-
+
{{ 'preference.users.dialog.personalInfo' | translate }}
-
+
{{ 'preference.users.dialog.firstName' | translate }}
-
+
{{ 'preference.users.dialog.email' | translate }} {{ page | titlecase }} {{'LINK.localStorage' | translate}} {{'preference.pageReset.localStorageSetting' | translate }} - -
- - - - - - - -
-
+
+ + + + +
+ +
+
+ + +
+
diff --git a/src/app/components/preference/pages/page-reset/page-reset.component.scss b/src/app/components/preference/pages/page-reset/page-reset.component.scss index 5b1fcb5f..1df6eb33 100644 --- a/src/app/components/preference/pages/page-reset/page-reset.component.scss +++ b/src/app/components/preference/pages/page-reset/page-reset.component.scss @@ -35,7 +35,6 @@ margin-bottom: 21px; & .setting-btn { - height: 35px; background: #009cbf !important; color: white; margin-right: 7px; @@ -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; @@ -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; } @@ -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 { diff --git a/src/app/components/preference/service-dialogs/dialog-import/dialog-import.component.html b/src/app/components/preference/service-dialogs/dialog-import/dialog-import.component.html index 90d5e024..ce2e7697 100644 --- a/src/app/components/preference/service-dialogs/dialog-import/dialog-import.component.html +++ b/src/app/components/preference/service-dialogs/dialog-import/dialog-import.component.html @@ -33,8 +33,7 @@
-
- +
-
+
diff --git a/src/app/components/search-grid-call/export-dialog/export-dialog.component.scss b/src/app/components/search-grid-call/export-dialog/export-dialog.component.scss index 3cc4caa1..1ee1e093 100644 --- a/src/app/components/search-grid-call/export-dialog/export-dialog.component.scss +++ b/src/app/components/search-grid-call/export-dialog/export-dialog.component.scss @@ -8,7 +8,6 @@ } .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.scss b/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.scss index f4eb3898..a4271e0f 100644 --- a/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.scss +++ b/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.scss @@ -3,7 +3,6 @@ } .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/search-grid-call/search-grid-call.component.scss b/src/app/components/search-grid-call/search-grid-call.component.scss index ad3741bc..effdc7c5 100644 --- a/src/app/components/search-grid-call/search-grid-call.component.scss +++ b/src/app/components/search-grid-call/search-grid-call.component.scss @@ -23,7 +23,7 @@ .regex-container { font-size: 13px; position: fixed; - top: 2px; + top: 8px; right: 46px; max-width: 275px; display: flex; diff --git a/src/app/components/widgets/ace-editor-widget/settings-ace-editor-widget.component.scss b/src/app/components/widgets/ace-editor-widget/settings-ace-editor-widget.component.scss index 4bc8dfe4..d55bd829 100644 --- a/src/app/components/widgets/ace-editor-widget/settings-ace-editor-widget.component.scss +++ b/src/app/components/widgets/ace-editor-widget/settings-ace-editor-widget.component.scss @@ -1,5 +1,4 @@ .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/widgets/alert-widget/setting-alert-widget.component.scss b/src/app/components/widgets/alert-widget/setting-alert-widget.component.scss index 3cbb9653..08215468 100644 --- a/src/app/components/widgets/alert-widget/setting-alert-widget.component.scss +++ b/src/app/components/widgets/alert-widget/setting-alert-widget.component.scss @@ -1,5 +1,4 @@ .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/widgets/clock-widget/setting-clock-widget.component.scss b/src/app/components/widgets/clock-widget/setting-clock-widget.component.scss index 4bc8dfe4..d55bd829 100644 --- a/src/app/components/widgets/clock-widget/setting-clock-widget.component.scss +++ b/src/app/components/widgets/clock-widget/setting-clock-widget.component.scss @@ -1,5 +1,4 @@ .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss b/src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss index 53582261..e37a305d 100644 --- a/src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss +++ b/src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss @@ -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; diff --git a/src/app/components/widgets/protosearch-widget/setting-protosearch-widget.component.scss b/src/app/components/widgets/protosearch-widget/setting-protosearch-widget.component.scss index b3d77cd9..bf9283eb 100644 --- a/src/app/components/widgets/protosearch-widget/setting-protosearch-widget.component.scss +++ b/src/app/components/widgets/protosearch-widget/setting-protosearch-widget.component.scss @@ -3,7 +3,6 @@ } .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; @@ -28,7 +27,7 @@ padding: 5px; position: relative; padding-top: 8px; - bottom: 0px; + bottom: 1px; right: 0px; display: flex; justify-content: flex-end; diff --git a/src/app/components/widgets/result-chart-widget/setting-result-chart-widget.component.scss b/src/app/components/widgets/result-chart-widget/setting-result-chart-widget.component.scss index 4bc8dfe4..d55bd829 100644 --- a/src/app/components/widgets/result-chart-widget/setting-result-chart-widget.component.scss +++ b/src/app/components/widgets/result-chart-widget/setting-result-chart-widget.component.scss @@ -1,5 +1,4 @@ .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/components/widgets/result-widget/setting-result-widget.component.scss b/src/app/components/widgets/result-widget/setting-result-widget.component.scss index 33c2f15e..a44c9920 100644 --- a/src/app/components/widgets/result-widget/setting-result-widget.component.scss +++ b/src/app/components/widgets/result-widget/setting-result-widget.component.scss @@ -1,5 +1,4 @@ .title { - margin: -1.5rem -1.5rem 2rem -1.5rem; width: initial !important; display: flex; justify-content: space-between; diff --git a/src/app/helpers/parser.ts b/src/app/helpers/parser.ts index 7763361b..01281d30 100644 --- a/src/app/helpers/parser.ts +++ b/src/app/helpers/parser.ts @@ -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, @@ -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)}`, diff --git a/src/styles.scss b/src/styles.scss index 9340c006..70db2b3c 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -52,10 +52,7 @@ } letter-spacing: normal !important; } -* { - scrollbar-width: thin; - scrollbar-color: rgba(199, 199, 199, 0.748) transparent; -} + // using Roboto bold. light, normal /// fonts settings : @@ -1348,3 +1345,12 @@ app-root { cursor: pointer; line-height: 14px; } +.fa-icon-custom { + width: 40px !important; + height: 40px !important; + padding: 6px 12px 18px 12px !important; + + svg { + width: 14px !important; + } +} \ No newline at end of file