From 2c946632ee07c9958f6f534eb677f7b07162d7c7 Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Mon, 22 Apr 2024 20:31:39 +0300 Subject: [PATCH 1/7] upgrade app to Angular 16.x --- .browserslistrc | 1 + .gitignore | 2 + .gitlab-ci.yml | 71 + Dockerfile | 7 + LICENSE | 661 ------- README.md | 58 +- angular.json | 377 ++-- custom-widgets.json | 248 +++ e2e/protractor.conf.js | 28 - e2e/src/app.e2e-spec.ts | 14 - e2e/src/app.e2e-spec.ts~ | 14 - e2e/src/app.po.ts | 11 - e2e/tsconfig.e2e.json | 13 - karma.conf.js | 2 +- package.json | 114 +- src/app/app-routing.module.ts | 5 +- src/app/app.component.html | 2 +- src/app/app.component.ts | 4 +- src/app/app.module.ts | 706 +++---- .../codejar-wrapper.component.html | 12 + .../codejar-wrapper.component.scss | 23 + .../codejar-wrapper.component.ts | 109 ++ .../custom-ag-grid.component.ts | 270 +-- .../custom-ag-grid/custom-ag-grid.module.ts | 10 +- .../custom-ag-grid/setting-button.html | 2 +- .../custom-ag-grid/setting-button.scss | 2 +- .../controls/custom-ag-grid/setting-button.ts | 6 +- .../custom-table/custom-table.component.css | 4 +- .../daterangepicker.component.html | 12 +- .../daterangepicker.component.scss | 283 +-- .../daterangepicker.component.ts | 47 +- .../daterangepicker/daterangepicker.config.ts | 2 +- .../daterangepicker.directive.ts | 3 +- .../daterangepicker/daterangepicker.module.ts | 62 +- .../controls/daterangepicker/timezone.pipe.ts | 5 +- .../full-screen/full-screen.component.html | 59 +- .../full-screen/full-screen.component.scss | 27 +- .../full-screen/full-screen.component.ts | 20 +- .../controls/loki-results/moment.pipe.ts | 2 +- .../modal-resizable.component.html | 140 +- .../modal-resizable.component.scss | 424 +++-- .../modal-resizable.component.ts | 389 +++- .../modal-resizable/modal-resizable.model.ts | 29 + .../modal-resizable/modal-resizable.module.ts | 9 +- .../controls/modal-resizable/modal.service.ts | 77 + .../window/window.component.ts | 345 ++-- .../transaction-graph-settings.component.html | 8 +- .../transaction-graph-settings.component.scss | 2 + .../transaction-graph-settings.component.ts | 8 +- .../transaction-info.component.ts | 2 +- .../controls/webshark/webshark.component.scss | 6 +- .../controls/webshark/webshark.component.ts | 2 +- .../add-dashboard-dialog.component.html | 22 +- .../add-dashboard-dialog.component.scss | 2 +- .../dashboard/dashboard.component.html | 5 + .../edit-dialog/edit-dialog.component.html | 14 +- .../edit-dialog/edit-dialog.component.scss | 2 +- .../edit-dialog/edit-dialog.component.ts | 4 +- src/app/components/login/login.component.html | 2 +- src/app/components/login/login.component.scss | 56 +- src/app/components/login/login.component.ts | 8 +- src/app/components/menu/menu.component.ts | 6 +- .../active-cell/active-cell.component.scss | 2 +- .../data-cell/data-cell.component.scss | 2 +- .../expire-cell/expire-cell.component.ts | 4 +- .../generic-cell/generic-cell.component.scss | 2 +- .../last-error-cell.component.scss | 2 +- .../tool-cell/tool-cell.component.scss | 2 +- .../dialog-advanced.component.html | 31 +- .../dialog-advanced.component.scss | 4 +- .../dialog-agentsub.component.html | 8 +- .../dialog-alias/dialog-alias.component.html | 438 +++-- .../dialog-alias/dialog-alias.component.scss | 10 +- .../dialog-authkey.component.html | 12 +- .../dialog-hepsub.component.html | 44 +- .../dialog-hepsub.component.scss | 4 +- .../dialog-mapping.component.html | 386 ++-- .../dialog-mapping.component.ts | 8 +- .../dialog-scripts.component.html | 46 +- .../dialog-scripts.component.ts | 8 +- .../dialog-user-settings.component.html | 80 +- .../dialog-user-settings.component.scss | 4 +- .../dialog-users/dialog-users.component.html | 95 +- .../dialog-users/dialog-users.component.ts | 6 +- .../page-admin/page-admin.component.html | 8 +- .../page-admin/page-admin.component.scss | 10 +- .../page-advanced-settings.component.scss | 4 +- .../page-agent-subscriptions.component.scss | 4 +- .../page-alias/page-alias.component.scss | 4 +- .../pages/page-alias/page-alias.component.ts | 4 +- .../page-api-auth.component.scss | 4 +- .../page-hepsub/page-hepsub.component.scss | 4 +- .../page-mapping/page-mapping.component.scss | 4 +- .../page-profile/page-profile.component.html | 104 +- .../page-reset/page-reset.component.html | 6 +- .../page-reset/page-reset.component.scss | 10 +- .../page-scripts/page-scripts.component.scss | 4 +- .../page-system-overview.component.scss | 4 +- .../page-user-settings.component.scss | 4 +- .../page-users/page-users.component.scss | 4 +- .../pages/page-users/page-users.component.ts | 6 +- .../preference/preference.component.scss | 14 +- .../preference/preference.component.ts | 2 +- .../dialog-import.component.html | 2 +- .../detail-dialog.component.scss | 9 +- .../detail-dialog/detail-dialog.component.ts | 2 +- .../tab-callinfo/tab-callinfo.component.ts | 2 +- .../tab-callinfo/tab-callinfo.module.ts | 2 +- .../tab-export/tab-export.component.scss | 8 +- .../detail-dialog/tab-hepsub/moment.pipe.ts | 2 +- .../tab-messages/tab-messages.component.scss | 9 +- .../tab-qos/tab-qos.component.html | 4 +- .../tab-qos/tab-qos.component.scss | 14 +- .../tab-qos/tab-qos.component.ts | 4 +- .../detail-dialog/tab-qos/tab-qos.module.ts | 2 +- .../export-dialog/export-dialog.component.ts | 8 +- .../status-filter/status-filter.component.ts | 13 +- .../grid-chart-dialog.component.scss | 8 +- .../grid-chart-dialog.component.ts | 2 +- .../grid-settings-dialog.ts | 2 +- .../message-content.component.scss | 4 +- .../message-content.component.ts | 4 +- .../column-uuid-renderer.component.ts | 58 +- .../search-grid-call.component.html | 316 +++- .../search-grid-call.component.scss | 10 +- .../search-grid-call.component.ts | 39 +- .../clickhousechart-widget.component.scss | 9 +- .../clickhousechart-widget.component.ts | 2 +- ...ting-clickhousechart-widget.component.html | 8 +- ...ting-clickhousechart-widget.component.scss | 4 +- .../clock-widget/clock-widget.component.ts | 2 +- .../setting-clock-widget.component.ts | 4 +- .../influxdbchart-widget.component.ts | 4 +- ...etting-influxdbchart-widget.component.html | 24 +- ...etting-influxdbchart-widget.component.scss | 4 +- .../prometheus-widget.component.ts | 4 +- .../setting-prometheus-widget.component.html | 8 +- .../setting-prometheus-widget.component.scss | 4 +- .../chips-input/chips-input.component.html | 10 +- .../protosearch-widget.component.html | 1042 +++++++---- .../protosearch-widget.component.scss | 69 +- .../multi-select-field.component.html | 3 +- .../result-chart-widget.component.scss | 2 +- ...ode-style-smart-input-field.component.scss | 2 +- src/app/helpers/functions.ts | 16 +- src/app/helpers/ng-multiselect.directive.ts | 6 +- src/app/helpers/parser.ts | 2 +- src/app/helpers/windowFunctions.ts | 128 ++ src/app/pipes/moment.pipe.ts | 2 +- src/app/services/authentication.service.ts | 6 +- .../services/call/full-transaction.service.ts | 14 +- src/app/services/data-time-range.service.ts | 4 +- src/app/services/session-storage.service.ts | 2 +- src/app/services/time-formatting.service.ts | 8 +- src/app/services/tooltip.service.ts | 2 +- src/app/workers/clickhouse.worker.ts | 4 +- src/app/workers/qos.worker.ts | 2 +- src/assets/css/mapbox-gl.css | 1 + src/assets/css/vis.min.scss | 1355 ++++++++++++++ src/assets/images/vis/addNodeIcon.png | Bin 0 -> 4072 bytes src/assets/images/vis/backIcon.png | Bin 0 -> 3641 bytes src/assets/images/vis/connectIcon.png | Bin 0 -> 3715 bytes src/assets/images/vis/cross.png | Bin 0 -> 2821 bytes src/assets/images/vis/deleteIcon.png | Bin 0 -> 3851 bytes src/assets/images/vis/downArrow.png | Bin 0 -> 4208 bytes src/assets/images/vis/editIcon.png | Bin 0 -> 3993 bytes src/assets/images/vis/leftArrow.png | Bin 0 -> 4154 bytes src/assets/images/vis/minus.png | Bin 0 -> 3872 bytes src/assets/images/vis/plus.png | Bin 0 -> 4026 bytes src/assets/images/vis/rightArrow.png | Bin 0 -> 4179 bytes src/assets/images/vis/upArrow.png | Bin 0 -> 4206 bytes src/assets/images/vis/zoomExtends.png | Bin 0 -> 4014 bytes src/environments/environment.dev.ts | 2 +- src/favicon.ico | Bin 1150 -> 948 bytes src/index.html | 135 +- src/karma.conf.js | 31 - src/main.ts | 12 +- src/polyfills.ts | 6 +- src/styles.scss | 1652 ++++++++++------- src/tsconfig.app.json | 74 +- src/tslint.json | 13 +- src/upgrade.html | 23 + swagger-styles.scss | 35 +- tsconfig.app.json | 23 + tsconfig.json | 92 +- 185 files changed, 7325 insertions(+), 4316 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile delete mode 100644 LICENSE create mode 100644 custom-widgets.json delete mode 100644 e2e/protractor.conf.js delete mode 100644 e2e/src/app.e2e-spec.ts delete mode 100644 e2e/src/app.e2e-spec.ts~ delete mode 100644 e2e/src/app.po.ts delete mode 100644 e2e/tsconfig.e2e.json create mode 100644 src/app/components/controls/codejar-wrapper/codejar-wrapper.component.html create mode 100644 src/app/components/controls/codejar-wrapper/codejar-wrapper.component.scss create mode 100644 src/app/components/controls/codejar-wrapper/codejar-wrapper.component.ts create mode 100644 src/app/components/controls/modal-resizable/modal-resizable.model.ts create mode 100644 src/app/components/controls/modal-resizable/modal.service.ts create mode 100644 src/app/helpers/windowFunctions.ts create mode 100644 src/assets/css/mapbox-gl.css create mode 100644 src/assets/css/vis.min.scss create mode 100644 src/assets/images/vis/addNodeIcon.png create mode 100644 src/assets/images/vis/backIcon.png create mode 100644 src/assets/images/vis/connectIcon.png create mode 100644 src/assets/images/vis/cross.png create mode 100644 src/assets/images/vis/deleteIcon.png create mode 100644 src/assets/images/vis/downArrow.png create mode 100644 src/assets/images/vis/editIcon.png create mode 100644 src/assets/images/vis/leftArrow.png create mode 100644 src/assets/images/vis/minus.png create mode 100644 src/assets/images/vis/plus.png create mode 100644 src/assets/images/vis/rightArrow.png create mode 100644 src/assets/images/vis/upArrow.png create mode 100644 src/assets/images/vis/zoomExtends.png delete mode 100644 src/karma.conf.js create mode 100644 src/upgrade.html create mode 100644 tsconfig.app.json diff --git a/.browserslistrc b/.browserslistrc index 8651e3c1..664d601b 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -14,6 +14,7 @@ last 2 Edge major versions last 2 Safari major versions last 2 iOS major versions Firefox ESR +not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line. not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. not ios_saf 15.2-15.3 not safari 15.2-15.3 diff --git a/.gitignore b/.gitignore index 4e261d31..8b2e0176 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,8 @@ testem.log Thumbs.db package-lock.json +# Angular cache +.angular #Env src/environments/environment.dev.ts diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..b3030991 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,71 @@ +image: node:lts-alpine +cache: + paths: + - node_modules/ +stages: + - test + # - selenium +test_build: + cache: {} + stage: test + rules: + - if: '$CI_COMMIT_MESSAGE == "Update .gitlab-ci.yml file" && $CI_PIPELINE_SOURCE != "web"' + when: never + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"' + when: always + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' + when: always + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"' + when: never + script: + - npm --version + - npm install --legacy-peer-deps + - npm install -g @angular/cli + - npm run build:all-prod + - cat ./dist/homer-ui/version.txt +# selenium-test-job: +# stage: selenium +# services: +# - name: selenium/standalone-chrome +# alias: selstand +# variables: +# GITLAB_INSTANCE: "gitlab.com" +# rules: +# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"' +# when: never +# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' +# when: on_success +# - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' +# when: always +# allow_failure: true +# script: +# - apk update && apk upgrade && apk add --no-cache bash git openssh +# - 'git clone http://gitlab-ci-token:$CI_JOB_TOKEN@$GITLAB_INSTANCE/qxip/hepic-tests.git' +# - npm install -g selenium-side-runner +# - npm install -g chromedriver +# - selenium-side-runner ./hepic-tests/Hepic-preference.side --server http://selstand:4444/wd/hub --filter Fulltest --base-url http://de9.sipcapture.io:8002/ "goog:chromeOptions.args=[no-sandbox]" +# # - selenium-side-runner ./hepic-tests/Hepic-preference-user.side --server http://selstand:4444/wd/hub --filter Default --base-url http://de9.sipcapture.io:8002/ + +# selenium-transaction-test-job: +# stage: selenium +# services: +# - name: selenium/standalone-chrome +# alias: selstand +# variables: +# GITLAB_INSTANCE: "gitlab.com" +# rules: +# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"' +# when: never +# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' +# when: on_success +# - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' +# when: always +# allow_failure: true +# script: +# - apk update && apk upgrade && apk add --no-cache bash git openssh +# - 'git clone http://gitlab-ci-token:$CI_JOB_TOKEN@$GITLAB_INSTANCE/qxip/hepic-tests.git' +# - npm install -g hepgen.js +# - npm install -g selenium-side-runner +# - npm install -g chromedriver +# - hepgen.js -p 9063 -s de3.null.qxip.net -c "/builds/qxip/hepic-interface/hepic-tests/Hepgen/RTP-test.js" +# - selenium-side-runner ./hepic-tests/Hepic-main.side --server http://selstand:4444/wd/hub --filter Default --base-url http://de9.sipcapture.io:8002/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..53fbf9f7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM node:12-alpine + +RUN apk add git && git clone https://github.com/sipcapture/homer-ui /app +WORKDIR /app +RUN npm install && npm install -g @angular/cli +CMD ["ng","build"] + diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0ad25db4..00000000 --- a/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/README.md b/README.md index 4a32eecb..a88c3470 100644 --- a/README.md +++ b/README.md @@ -1,67 +1,17 @@ -# HOMER User-Interface + -This project provides the Front-End components of [HOMER 7.x](https://github.com/sipcapture) and higher, featuring native integration with all -supported backend components for search and analytics including `pgsql`, `influxdb`, `prometheus`, `loki` and more. - -HOMER-UI is designed to be bundled and served with the [homer-app](https://github.com/sipcapture/homer-app) project - - - - -## Status -This project is still in Development. Please open well documented issues to report bugs or inconsistencies. +# HEPIC User-Interface -## Developers Guide -### Installation -``` -npm install -npm install -g @angular/cli -npm run build -``` - -### Usage -#### PM2 -``` -pm2 start -``` - -#### Stand-Alone -``` -ng serve --open --host 0.0.0.0 --port 8080 --source-map=false --vendorChunk=false --aot=true --disableHostCheck -``` +This project provides the Front-End components of [HEPIC 3.x](http://qxip.net) featuring native integration with all +supported backend components for search and analytics including `pgsql`, `influxdb`, `prometheus`, `loki` and more. ----------------- ### Support -For professional support, remote installations, customizations or commercial requests please contact: support@sipcapture.org - -For community support, updates, user discussion and experience exchange please join our users [Mailing-List](https://groups.google.com/forum/#!forum/homer-discuss) - For commercial licensing and support, please contact the [QXIP Team](http://qxip.net) - - - - -### Developers -Contributors and Contributions to our project are always welcome! If you intend to participate and help us improve HOMER by sending patches, we kindly ask you to sign a standard [CLA (Contributor License Agreement)](http://cla.qxip.net) which enables us to distribute your code alongside the project without restrictions present or future. It doesn’t require you to assign to us any copyright you have, the ownership of which remains in full with you. Developers can coordinate with the existing team via the [homer-dev](http://groups.google.com/group/homer-dev) mailing list. If you'd like to join our internal team and volunteer to help with the project's many needs, feel free to contact us anytime! - ### License & Copyright - -![H5](https://img.shields.io/badge/license-GNU_AGPL_v3-blue.svg) - -Homer components are released under the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - *(C) 2008-2020 [QXIP BV](http://qxip.net)* ----------- - -#### Made by Humans -This Open-Source project is made possible by actual Humans without corporate sponsors, angels or patreons.
-If you use this software in production, please consider supporting its development with contributions or [donations](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donation%40sipcapture%2eorg&lc=US&item_name=SIPCAPTURE&no_note=0¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest) - -[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=donation%40sipcapture%2eorg&lc=US&item_name=SIPCAPTURE&no_note=0¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest) - diff --git a/angular.json b/angular.json index 387438ff..2ad5fde2 100644 --- a/angular.json +++ b/angular.json @@ -1,162 +1,227 @@ { - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "homer-ui": { - "projectType": "application", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - }, - "@schematics/angular:application": { - "strict": true - } - }, - "root": "", - "sourceRoot": "src", - "prefix": "app", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist/homer-ui", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", - "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets", - { - "glob": "theme-monokai.js", - "input": "./node_modules/ace-builds/src-min/", - "output": "/" - }, - { - "glob": "mode-javascript.js", - "input": "./d /ace-builds/src-min/", - "output": "/" - }, - { - "glob": "mode-json.js", - "input": "./node_modules/ace-builds/src-min/", - "output": "/" - }, - { - "glob": "worker-javascript.js", - "input": "./node_modules/ace-builds/src-min/", - "output": "/" - }, - { - "glob": "worker-json.js", - "input": "./node_modules/ace-builds/src-min/", - "output": "/" - }, - { - "glob": "ext-searchbox.js", - "input": "./node_modules/ace-builds/src-min/", - "output": "/" - } - ], - "styles": [ - "node_modules/swagger-ui-dist/swagger-ui.css", - "src/styles.scss" - - ], - "scripts": [ - "node_modules/ace-builds/src-min/ace.js", - "node_modules/ace-builds/src-min/theme-monokai.js", - "node_modules/ace-builds/src-min/mode-javascript.js", - "node_modules/ace-builds/src-min/mode-json.js", - "node_modules/ace-builds/src-min/worker-javascript.js", - "node_modules/ace-builds/src-min/worker-json.js" - ], - "webWorkerTsConfig": "tsconfig.worker.json" - }, - "configurations": { - "development": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.dev.ts" - } - ], - "optimization": false, - "sourceMap": true, - "namedChunks": true, - "aot": true, - "extractLicenses": false, - "vendorChunk": false, - "buildOptimizer": false, - "budgets": [ - { - "type": "initial", - "maximumWarning": "12mb", - "maximumError": "15mb" - } - ] - }, - "production": { - "budgets": [ - { - "type": "initial", - "maximumWarning": "12mb", - "maximumError": "15mb" + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "homer-ui": { + "projectType": "application", + "schematics": {}, + "root": "", + "sourceRoot": "src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/homer-ui", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.app.json", + "allowedCommonJsDependencies": [ + "lodash", + "xlsx", + "parsip", + "xml2js", + "qrcode", + "html2canvas", + "wavesurfer.js", + "vis", + "chart.js", + "fp-ts/lib/Either", + "bogon", + "moment-timezone", + "moment", + "diff-match-patch", + "maplibre-gl", + "is-in-subnet", + "ts-md5/dist/md5" + ], + + "assets": ["src/favicon.ico", "src/assets"], + "styles": [ + "src/styles.scss", + "node_modules/highlight.js/styles/atom-one-dark.css" + ], + "scripts": [], + "webWorkerTsConfig": "tsconfig.worker.json" + }, + "configurations": { + "development": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.dev.ts" + } + ], + "optimization": false, + "outputHashing": "all", + "sourceMap": true, + "namedChunks": false, + "aot": false, + "extractLicenses": false, + "vendorChunk": false, + "buildOptimizer": false, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "35mb" + } + ] + }, + "preprod": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": false, + "outputHashing": "all", + "sourceMap": true, + "namedChunks": false, + "aot": false, + "extractLicenses": false, + "vendorChunk": false, + "buildOptimizer": false, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "35mb" + } + ] + }, + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": true, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "25mb", + "maximumError": "30mb" + } + ] + }, + "webapp": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.webapp.ts" + } + ], + "optimization": false, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": false, + "extractLicenses": false, + "vendorChunk": false, + "buildOptimizer": false, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "15mb" + } + ] + }, + "server": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.server.ts" + } + ], + "optimization": false, + "outputHashing": "all", + "sourceMap": false, + "namedChunks": false, + "aot": false, + "extractLicenses": false, + "vendorChunk": false, + "buildOptimizer": false, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "35mb" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "homer-ui:build" + }, + "configurations": { + "production": { + "browserTarget": "homer-ui:build:production" + }, + "development": { + "browserTarget": "homer-ui:build:development" + }, + "webapp": { + "browserTarget": "homer-ui:build:webapp" + }, + "server": { + "browserTarget": "homer-ui:build:server" + } + }, + "defaultConfiguration": "development" + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "homer-ui:build" + } + }, + "test": { + "builder": "ngx-build-plus:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "karmaConfig": "src/karma.conf.js", + "styles": [ + "node_modules/swagger-ui-dist/swagger-ui.css", + "src/styles.scss" + ], + "scripts": [], + "assets": ["src/favicon.ico", "src/assets"], + "webWorkerTsConfig": "tsconfig.worker.json" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json", + "tsconfig.worker.json" + ], + "exclude": ["**/node_modules/**"] + } } - ], - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "outputHashing": "all" - } - }, - "defaultConfiguration": "production" - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "configurations": { - "production": { - "browserTarget": "homer-ui:build:production" - }, - "development": { - "browserTarget": "homer-ui:build:development" } - }, - "defaultConfiguration": "development" - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "homer-ui:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets" - ], - "styles": [ - "node_modules/swagger-ui-dist/swagger-ui.css", - "src/styles.scss" - ], - "scripts": [], - "webWorkerTsConfig": "tsconfig.worker.json" - } } - } + }, + "cli": { + "analytics": false } - }, - "defaultProject": "homer-ui" } diff --git a/custom-widgets.json b/custom-widgets.json new file mode 100644 index 00000000..e56ebfb6 --- /dev/null +++ b/custom-widgets.json @@ -0,0 +1,248 @@ +{ + "call_h20": { + "active": true, + "category": "Search Types", + "data": { + "config": { + "profile": "call_h20", + "protocol_id": { + "name": "TDR", + "value": 60 + }, + "protocol_profile": { + "name": "call_h20", + "value": "call_h20" + }, + "searchbutton": true, + "title": "TDR Call Search", + "type": "TDR" + }, + "fields": [ + { + "field_name": "callid", + "form_default": null, + "form_type": "input", + "hepid": 60, + "name": "60:call_h20:callid", + "selection": "Call-ID", + "type": "string", + "value": "" + }, + { + "field_name": "targetResultsContainer", + "form_default": null, + "hepid": 60, + "name": "60:call_h20:targetResultsContainer", + "selection": "Results Container", + "type": "string" + } + ], + "title": "TDR Call Search" + }, + "description": "Custom TDR Call Search", + "indexName": "display-results", + "minHeight": 300, + "minWidth": 300, + "profile": "call_h20", + "strongIndex": "ProtosearchWidgetComponent", + "title": "TDR Call Search" + }, + "call_sip": { + "active": true, + "category": "Search Types", + "data": { + "config": { + "profile": "call_h20", + "protocol_id": { + "name": "SIP", + "value": 1 + }, + "protocol_profile": { + "name": "call_h20", + "value": "call_h20" + }, + "searchbutton": true, + "title": "SIP Call Search", + "type": "SIP" + }, + "fields": [ + { + "field_name": "callid", + "form_default": null, + "form_type": "input", + "hepid": 1, + "name": "1:call:callid", + "selection": "Call-ID", + "type": "string", + "value": "" + }, + { + "field_name": "targetResultsContainer", + "form_default": null, + "hepid": 1, + "name": "1:call:targetResultsContainer", + "selection": "Results Container", + "type": "string" + } + ], + "title": "SIP Call Search" + }, + "description": "Custom SIP Call Search", + "indexName": "display-results", + "minHeight": 300, + "minWidth": 300, + "profile": "call", + "strongIndex": "ProtosearchWidgetComponent", + "title": "SIP Call Search" + }, + "registration_h20": { + "active": true, + "category": "Search Types", + "data": { + "config": { + "profile": "registration_h20", + "protocol_id": { + "name": "TDR", + "value": 60 + }, + "protocol_profile": { + "name": "registration_h20", + "value": "registration_h20" + }, + "searchbutton": true, + "title": "TDR Registration Search", + "type": "TDR" + }, + "fields": [ + { + "field_name": "callid", + "form_default": null, + "form_type": "input", + "hepid": 60, + "name": "60:registration_h20:callid", + "selection": "Call-ID", + "type": "string", + "value": "" + }, + { + "field_name": "targetResultsContainer", + "form_default": null, + "hepid": 60, + "name": "60:registration_h20:targetResultsContainer", + "selection": "Results Container", + "type": "string" + } + ], + "title": "TDR Registration Search" + }, + "description": "Custom TDR Registration Search", + "indexName": "display-results", + "minHeight": 300, + "minWidth": 300, + "profile": "registration_h20", + "strongIndex": "ProtosearchWidgetComponent", + "title": "TDR Registration Search" + }, + "registration_sip": { + "active": true, + "category": "Search Types", + "data": { + "config": { + "profile": "registration_h20", + "protocol_id": { + "name": "SIP", + "value": 1 + }, + "protocol_profile": { + "name": "registration_h20", + "value": "registration_h20" + }, + "searchbutton": true, + "title": "Registration SIP Search", + "type": "SIP" + }, + "fields": [ + { + "field_name": "callid", + "form_default": null, + "form_type": "input", + "hepid": 1, + "name": "1:registration:callid", + "selection": "Call-ID", + "type": "string", + "value": "" + }, + { + "field_name": "targetResultsContainer", + "form_default": null, + "hepid": 1, + "name": "1:registration:targetResultsContainer", + "selection": "Results Container", + "type": "string" + } + ], + "title": "Registration SIP Search" + }, + "description": "Custom SIP Registration Search", + "indexName": "display-results", + "minHeight": 300, + "minWidth": 300, + "profile": "registration", + "strongIndex": "ProtosearchWidgetComponent", + "title": "SIP Registration Search" + }, + "loki_search": { + "active": true, + "category": "Search Types", + "data": { + "config": { + "profile": "registration_h20", + "protocol_id": { + "name": "LOKI", + "value": 2000 + }, + "protocol_profile": { + "name": "default", + "value": "default" + }, + "searchbutton": true, + "title": "Loki Search", + "type": "Loki" + }, + "fields": [ + { + "field_name": "loki", + "hepid": 1, + "name": "2000:default:loki", + "selection": "LogQL", + "type": "string", + "selector": [] + }, + { + "field_name": "targetResultsContainer", + "form_default": null, + "hepid": 2000, + "name": "2000:default:targetResultsContainer", + "selection": "Results Container", + "type": "string" + }, + { + "field_name": "limit", + "hepid": 2000, + "name": "2000:default:limit", + "selection": "Query Limit", + "selector": [], + "type": "integer" + } + ], + "title": "Loki Search" + }, + "description": "Custom Loki Search", + "indexName": "display-results", + "minHeight": 300, + "minWidth": 300, + "profile": "default", + "strongIndex": "ProtosearchWidgetComponent", + "title": "Loki Search" + } +} \ No newline at end of file diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js deleted file mode 100644 index 86776a39..00000000 --- a/e2e/protractor.conf.js +++ /dev/null @@ -1,28 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const { SpecReporter } = require('jasmine-spec-reporter'); - -exports.config = { - allScriptsTimeout: 11000, - specs: [ - './src/**/*.e2e-spec.ts' - ], - capabilities: { - 'browserName': 'chrome' - }, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function() {} - }, - onPrepare() { - require('ts-node').register({ - project: require('path').join(__dirname, './tsconfig.e2e.json') - }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); - } -}; \ No newline at end of file diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts deleted file mode 100644 index 90362f35..00000000 --- a/e2e/src/app.e2e-spec.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { AppPage } from './app.po'; - -describe('workspace-project App', () => { - let page: AppPage; - - beforeEach(() => { - page = new AppPage(); - }); - - it('should display welcome message', () => { - page.navigateTo(); - expect(page.getParagraphText()).toEqual('Welcome to homer-ui!'); - }); -}); diff --git a/e2e/src/app.e2e-spec.ts~ b/e2e/src/app.e2e-spec.ts~ deleted file mode 100644 index 3a2018f5..00000000 --- a/e2e/src/app.e2e-spec.ts~ +++ /dev/null @@ -1,14 +0,0 @@ -import { AppPage } from './app.po'; - -describe('workspace-project App', () => { - let page: AppPage; - - beforeEach(() => { - page = new AppPage(); - }); - - it('should display welcome message', () => { - page.navigateTo(); - expect(page.getParagraphText()).toEqual('Welcome to angular-registration-login-example!'); - }); -}); diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts deleted file mode 100644 index 82ea75ba..00000000 --- a/e2e/src/app.po.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { browser, by, element } from 'protractor'; - -export class AppPage { - navigateTo() { - return browser.get('/'); - } - - getParagraphText() { - return element(by.css('app-root h1')).getText(); - } -} diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json deleted file mode 100644 index a6dd6220..00000000 --- a/e2e/tsconfig.e2e.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "module": "commonjs", - "target": "es5", - "types": [ - "jasmine", - "jasminewd2", - "node" - ] - } -} \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js index ff594e6f..d107def7 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -25,7 +25,7 @@ module.exports = function (config) { suppressAll: true // removes the duplicated traces }, coverageReporter: { - dir: require('path').join(__dirname, './coverage/homer-ui'), + dir: require('path').join(__dirname, './coverage/hepic-interface'), subdir: '.', reporters: [ { type: 'html' }, diff --git a/package.json b/package.json index 45cb94fc..2460d483 100644 --- a/package.json +++ b/package.json @@ -3,86 +3,104 @@ "version": "7.8.1", "scripts": { "ng": "ng", + "inst_dev": "npm install && npm run dev", "start": "ng serve --port 80", - "dev": "ng serve --configuration=development --port=80 --disable-host-check", - "webapp": "ng serve --host 0.0.0.0 --configuration=development --port=8099 --disable-host-check", - "build": "ng build --configuration=production && gzip -9 ./dist/homer-ui/*.js", - "build-noenv": "ng build --configuration=production-noenv", + "dev": "ng serve --configuration=development --port=80 --disable-host-check --host=0.0.0.0 --open", + "de9": "ng serve --configuration=development --port=8002 --host=0.0.0.0 --disable-host-check", + "de9-alpha": "ng serve --configuration=development --port=8003 --host=0.0.0.0 --disable-host-check", + "webapp": "ng serve --configuration=webapp --port=8099", + "build": "ng build --configuration=production && gzip -9 ./dist/homer-ui/*.js && npm run extract-version", + "extract-version": "egrep -o '[0-9]+.[0-9]+.[0-9]+' ./src/VERSION.ts > ./dist/homer-ui/version.txt", "build-keep-js": "ng build --configuration=production && gzip -9 -k ./dist/homer-ui/*.js", + "build-dev": "ng build --configuration=preprod && gzip -9 ./dist/homer-ui/*.js && npm run extract-version", + "serve:all": "concurrently --kill-others \"npm run serve:hepic-view\" \"npm run dev\" \"npm run serve:hepic-export\"", + "serve:hepic-view": "concurrently --kill-others \"ng serve hepic-view --configuration=development --port=83 --open --proxy-config .\\projects\\hepic-view\\proxy.conf.json\" \"node .\\projects\\hepic-view\\proxy\\index.js\"", + "serve:dev": "concurrently --kill-others \"npm run dev\" \"ng serve hepic-view --port=83 --host=0.0.0.0 --disable-host-check\"", + "serve:dev:de9": "concurrently --kill-others \"npm run de9\" \"ng serve hepic-view --port=9987 --host=0.0.0.0 --disable-host-check\"", + "serve:hepic-export": "ng serve hepic-export --configuration=development --open --port=84 --disable-host-check", + "build:hepic-view": "ng build hepic-view --configuration=production", + "build:hepic-export": "ng build hepic-export --configuration=production", + "build-prod:hepic-export": "ng build hepic-export --configuration=production --output-hashing=none --single-bundle true", + "build:all-prod": "npm run build:hepic-view && npm run build", + "build:hepic-admin": "cd projects/hepic-admin/ && npm install && npm run build && cd ./../.. && gzip -9 -k ./dist/hepic-admin/*.js", + "serve:hepic-admin": "cd projects/hepic-admin/ && npm install && ng serve --port=8003 --disable-host-check --host=0.0.0.0 --open", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" }, "private": true, "dependencies": { - "@ag-grid-community/all-modules": "^25.3.0", - "@ag-grid-community/angular": "^25.3.0", - "@angular-material-components/color-picker": "^6.0.0", - "@angular-material-components/datetime-picker": "^6.0.3", - "@angular-material-components/moment-adapter": "^6.0.0", - "@angular/animations": "^12.1.4", - "@angular/cdk": "^12.1.4", - "@angular/common": "^12.1.4", - "@angular/compiler": "^12.1.4", - "@angular/core": "^12.1.4", - "@angular/forms": "^12.1.4", - "@angular/material": "^12.1.4", - "@angular/platform-browser": "^12.1.4", - "@angular/platform-browser-dynamic": "^12.1.4", - "@angular/router": "^12.1.4", - "@fortawesome/angular-fontawesome": "^0.9.0", - "@fortawesome/fontawesome-svg-core": "^1.2.35", + "@angular-material-components/color-picker": "^9.0.0", + "@angular-material-components/datetime-picker": "^9.0.0", + "@angular-material-components/moment-adapter": "^9.0.0", + "@angular/animations": "^15.1.4", + "@angular/cdk": "^15.1.4", + "@angular/common": "^15.1.4", + "@angular/compiler": "^15.1.4", + "@angular/core": "^15.1.4", + "@angular/forms": "^15.1.4", + "@angular/material": "^15.1.4", + "@angular/platform-browser": "^15.1.4", + "@angular/platform-browser-dynamic": "^15.1.4", + "@angular/router": "^15.1.4", + "@fortawesome/angular-fontawesome": "^0.12.0", + "@fortawesome/fontawesome-svg-core": "^1.3.0", "@fortawesome/free-brands-svg-icons": "^5.15.3", "@fortawesome/free-regular-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.3", - "@ng-select/ng-select": "^7.2.0", + "@ng-select/ng-select": "^10.0.0", + "@ngneat/until-destroy": "^10.0.0", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", + "@stelmukhov/ngx-text-diff": "^0.6.4", "@techiediaries/ngx-qrcode": "^9.1.0", - "ace-builds": "^1.4.12", - "ag-charts-angular": "^3.3.0", - "ag-charts-community": "^3.3.0", - "ag-grid-angular": "^25.3.0", - "ag-grid-community": "^25.3.0", - "angular-gridster2": "^12.1.0", + "@xirenec/ng2-charts": "^2.0.0", + "ag-charts-angular": "^7.0.0", + "ag-charts-community": "^7.0.0", + "ag-grid-angular": "^29.0.0", + "ag-grid-community": "^29.0.0", + "angular-gridster2": "^15.0.0", + "autoprefixer": "10.4.5", "bogon": "^1.0.0", - "bootstrap": "^5.0.2", - "chartjs-plugin-gantt": "^0.9.0", + "bootstrap": "^5.3.2", + "chart.js": "^2.0.0", + "codejar": "3.7.0", + "fp-ts": "~2.12.1", + "highlight.js": "^11.7.0", "html2canvas": "^1.1.4", + "io-ts": "^2.2.20", + "is-in-subnet": "^4.0.1", "jwt-decode": "^3.1.2", + "maplibre-gl": "1.13.0-rc.1", "moment": "^2.29.1", - "moment-timezone": "^0.5.33", - "ng-dynamic-component": "^8.0.1", + "moment-timezone": "^0.5.40", + "ng-dynamic-component": "^10.3.0", "ng-table-virtual-scroll": "^1.3.7", - "ng2-ace-editor": "^0.3.9", - "ng2-charts": "^2.4.3", "ng2-search-filter": "^0.5.1", - "ngx-ace-wrapper": "^11.0.0", "ngx-build-plus": "^12.2.0", - "ngx-color": "^7.2.0", + "ngx-codejar": "5.1.3", "ngx-json-viewer": "~3.0.2", - "ngx-markdown": "^12.0.1", - "ngx-take-until-destroy": "^5.4.0", - "ngx-virtual-scroller": "^4.0.3", - "npm": "^7.20.3", + "ngx-markdown": "^15.0.1", "parsip": "^1.0.6", "path-browserify": "^1.0.1", "postcss": "^8.3.6", "process": "^0.11.10", "rxjs": "^7.3.0", - "swagger-ui-dist": "3.45.1", - "swagger-ui-themes": "3.0.1", + "stream-browserify": "^3.0.0", + "swagger-ui-dist": "^4.15.5", + "swagger-ui-themes": "^3.0.1", + "timers-browserify": "^2.0.12", "ts-md5": "^1.2.9", - "tslib": "^2.3.0", - "vm": "^0.1.0", + "vis": "^4.21.0-EOL", "wavesurfer.js": "^5.1.0", "xlsx": "^0.17.0", "zone.js": "^0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^12.1.4", - "@angular/cli": "^12.1.4", - "@angular/compiler-cli": "^12.1.4", + "@angular-devkit/build-angular": "^15.1.5", + "@angular/cli": "^15.1.5", + "@angular/compiler-cli": "^15.1.4", + "@types/highlight.js": "^10.1.0", "@types/jasmine": "^3.8.2", "@types/node": "^16.4.7", "codelyzer": "^6.0.2", @@ -97,6 +115,6 @@ "protractor": "^7.0.0", "ts-node": "^10.1.0", "tslint": "^6.1.3", - "typescript": "4.3.5" + "typescript": "4.9.5" } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index aed2d43c..02972627 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; - -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; const routes: Routes = []; @NgModule({ imports: [RouterModule.forRoot(routes)], - exports: [RouterModule], + exports: [RouterModule] }) export class AppRoutingModule { } diff --git a/src/app/app.component.html b/src/app/app.component.html index 0cc9f93e..bb79e251 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@
- + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index aaea1812..c66fbd47 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -21,9 +21,9 @@ export class AppComponent { this.authenticationService.logout(); } this.authenticationService.currentUser.subscribe(x => { - + this.currentUser = x; - + }); window['console2file'] = Functions.console2file; // this language will be used as a fallback when a translation isn't found in the current language diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 990c560f..2f0796f3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ import { CodeStyleSmartInputFieldComponent } from './components/widgets/smart-input-widget/code-style-smart-input-field/code-style-smart-input-field.component'; import { AlertWidgetComponent } from './components/widgets/alert-widget/alert-widget.component'; -import { ColorChromeModule } from 'ngx-color/chrome'; // +// import { ColorChromeModule } from 'ngx-color/chrome'; // import { SettingAlertWidgetComponent } from './components/widgets/alert-widget/setting-alert-widget.component'; import { TabQosModule } from './components/search-grid-call/detail-dialog/tab-qos/tab-qos.module'; import { CustomAgGridModule } from './components/controls/custom-ag-grid/custom-ag-grid.module'; @@ -21,7 +21,7 @@ import { CustomTableModule } from './components/controls/custom-table/custom-tab import { AlertModule } from '@app/components/controls/alert/alert.module'; import { TabCallinfoModule } from './components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.module'; import { TabEventsModule } from './components/search-grid-call/detail-dialog/tab-events/tab-events.module'; -import { VirtualScrollerModule } from 'ngx-virtual-scroller'; +// import { VirtualScrollerModule } from 'ngx-virtual-scroller'; /* @angular */ import { HttpClientModule, HTTP_INTERCEPTORS, HttpClientJsonpModule, HttpClient } from '@angular/common/http'; import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; @@ -50,104 +50,104 @@ import { far } from '@fortawesome/free-regular-svg-icons'; import { AgChartsAngularModule } from 'ag-charts-angular'; import { NgSelectModule } from '@ng-select/ng-select'; import { NgSelectFormFieldControlDirective } from './helpers/ng-multiselect.directive'; - +import { CodeJarWrapperComponent } from './components/controls/codejar-wrapper/codejar-wrapper.component'; import { - DashboardComponent, - LoginComponent, - PreferenceComponent, - SearchGridCallComponent + DashboardComponent, + LoginComponent, + PreferenceComponent, + SearchGridCallComponent } from '@app/components'; import { - AceEditorWidgetComponent, - ClockWidgetComponent, - CodeStylePrometheusFieldComponent, - DialogAlarmComponent, - DragDropListComponent, - ChipsInputComponent, - GeneralIframeWidgetComponent, - IframeWidgetComponent, - InfluxdbchartWidgetComponent, - ClickhouseChartWidgetComponent, - PrometheusWidgetComponent, - ProtosearchWidgetComponent, - ResultChartWidgetComponent, - ResultWidgetComponent, - RsearchWidgetComponent, - SmartInputWidgetComponent, - PcapUploaderWidgetComponent, + AceEditorWidgetComponent, + ClockWidgetComponent, + CodeStylePrometheusFieldComponent, + DialogAlarmComponent, + DragDropListComponent, + ChipsInputComponent, + GeneralIframeWidgetComponent, + IframeWidgetComponent, + InfluxdbchartWidgetComponent, + ClickhouseChartWidgetComponent, + PrometheusWidgetComponent, + ProtosearchWidgetComponent, + ResultChartWidgetComponent, + ResultWidgetComponent, + RsearchWidgetComponent, + SmartInputWidgetComponent, + PcapUploaderWidgetComponent, - SettingClockWidgetComponent, - SettingGeneralIframeWidgetComponent, - SettingIframeWidgetComponent, - SettingInfluxdbchartWidgetComponent, - SettingClickhouseChartWidgetComponent, - SettingPrometheusWidgetComponent, - SettingProtosearchWidgetComponent, - SettingResultChartWidgetComponent, - SettingResultWidgetComponent, - SettingsAceEditorWidgetComponent, - SettingSmartInputWidgetComponent + SettingClockWidgetComponent, + SettingGeneralIframeWidgetComponent, + SettingIframeWidgetComponent, + SettingInfluxdbchartWidgetComponent, + SettingClickhouseChartWidgetComponent, + SettingPrometheusWidgetComponent, + SettingProtosearchWidgetComponent, + SettingResultChartWidgetComponent, + SettingResultWidgetComponent, + SettingsAceEditorWidgetComponent, + SettingSmartInputWidgetComponent } from '@app/components/widgets'; import { - DialogAdvancedComponent, - DialogAgentsubComponent, - DialogAliasComponent, - DialogAuthKeyComponent, - DialogAuthTokenDisplayComponent, - DialogDeleteAlertComponent, - DialogHepsubComponent, - DialogMappingComponent, - DialogUserSettingsComponent, - DialogUsersComponent, - DialogScriptsComponent, - DialogDBSelectorComponent + DialogAdvancedComponent, + DialogAgentsubComponent, + DialogAliasComponent, + DialogAuthKeyComponent, + DialogAuthTokenDisplayComponent, + DialogDeleteAlertComponent, + DialogHepsubComponent, + DialogMappingComponent, + DialogUserSettingsComponent, + DialogUsersComponent, + DialogScriptsComponent, + DialogDBSelectorComponent } from '@app/components/preference/dialogs'; import { - PageAboutComponent, - PageAdvancedSettingsComponent, - PageAgentSubscriptionsComponent, - PageApiAuthComponent, - PageHepsubComponent, - PageMappingComponent, - PageResetComponent, - PageScriptsComponent, - PageSystemOverviewComponent, - PageUserSettingsComponent, - PageUsersComponent, - PageAdminComponent, - PageAliasComponent, - PageApiDocComponent + PageAboutComponent, + PageAdvancedSettingsComponent, + PageAgentSubscriptionsComponent, + PageApiAuthComponent, + PageHepsubComponent, + PageMappingComponent, + PageResetComponent, + PageScriptsComponent, + PageSystemOverviewComponent, + PageUserSettingsComponent, + PageUsersComponent, + PageAdminComponent, + PageAliasComponent, + PageApiDocComponent } from '@app/components/preference/pages'; import { - AddDashboardDialogComponent, - AddDialogComponent, - DeleteDialogComponent, - EditDialogComponent, - ShareQrDialogComponent, - UrlWarningDialog + AddDashboardDialogComponent, + AddDialogComponent, + DeleteDialogComponent, + EditDialogComponent, + ShareQrDialogComponent, + UrlWarningDialog } from '@app/components/dashboard'; import { - DialogSettingsGridDialog, - ExportDialogComponent, - DialogChartGridDialogComponent, - LokiHighlightRenderer, - ColumnActionRenderer, - ColumnAliasRenderer, - ColumnCallidRenderer, - ColumnUuidRenderer, - ColumnMethodRenderer, - ColumnMOSRenderer, - ColumnCountryRenderer, - DetailDialogComponent, - HeaderActionRenderer, - GenericCellRenderer, - TabExportComponent + DialogSettingsGridDialog, + ExportDialogComponent, + DialogChartGridDialogComponent, + LokiHighlightRenderer, + ColumnActionRenderer, + ColumnAliasRenderer, + ColumnCallidRenderer, + ColumnUuidRenderer, + ColumnMethodRenderer, + ColumnMOSRenderer, + ColumnCountryRenderer, + DetailDialogComponent, + HeaderActionRenderer, + GenericCellRenderer, + TabExportComponent } from '@app/components/search-grid-call'; import { - StatusFilterComponent + StatusFilterComponent } from '@app/components/search-grid-call/filters'; import { MenuComponent } from '@app/components/menu/menu.component'; @@ -155,42 +155,42 @@ import { MenuComponent } from '@app/components/menu/menu.component'; /* other modules */ import { AgGridModule } from 'ag-grid-angular'; import { NgxJsonViewerModule } from 'ngx-json-viewer'; -import { AceModule, ACE_CONFIG, AceConfigInterface } from 'ngx-ace-wrapper'; +// import { AceModule, ACE_CONFIG, AceConfigInterface } from 'ngx-ace-wrapper'; import { MatColorFormats, MAT_COLOR_FORMATS, NgxMatColorPickerModule } from '@angular-material-components/color-picker'; -import { AceEditorModule } from 'ng2-ace-editor'; +// import { AceEditorModule } from 'ng2-ace-editor'; import { GridsterModule } from 'angular-gridster2'; import { NgxQRCodeModule } from '@techiediaries/ngx-qrcode'; import { DynamicModule } from 'ng-dynamic-component'; -import { ChartsModule } from 'ng2-charts'; +import { ChartsModule } from '@xirenec/ng2-charts'; import { MarkdownModule } from 'ngx-markdown'; import { NgxDaterangepickerMd } from './components/controls/daterangepicker'; import { UpdateAlertComponent } from './components/controls/update-alert/update-alert.component'; -import {APP_BASE_HREF} from '@angular/common'; +import { APP_BASE_HREF } from '@angular/common'; import { - NgxMatDatetimePickerModule, - NgxMatNativeDateModule, - NgxMatTimepickerModule, + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule, } from '@angular-material-components/datetime-picker'; import { - DialogExportComponent, - DialogImportComponent + DialogExportComponent, + DialogImportComponent } from './components/preference/service-dialogs'; import { TabFlowModule } from './components/search-grid-call/detail-dialog/tab-flow/tab-flow.module'; import { HepTooltipModule } from './hep-tooltip/hep-tooltip.module'; import { PreferencesPipe } from './pipes/preferences.pipe'; -const DEFAULT_ACE_CONFIG: AceConfigInterface = { -}; +// const DEFAULT_ACE_CONFIG: AceConfigInterface = { +// }; import { PreferencesContentMapping } from './models/preferences-kw-mapping'; import { - GenericCellComponent, - ToolCellComponent, - ActiveCellComponent, - DataCellComponent, - LastErrorCellComponent, - DbStatsCellComponent + GenericCellComponent, + ToolCellComponent, + ActiveCellComponent, + DataCellComponent, + LastErrorCellComponent, + DbStatsCellComponent } from './components/preference/cell-types'; import { SettingButtonComponent } from './components/preference/setting-button/setting-button.component'; import { LoadingCircleComponent } from './components/controls/loading-circle/loading-circle.component'; @@ -203,273 +203,275 @@ import { CopyModule } from './components/controls/copy/copy.module'; import { CodeProtoSelectorComponent } from './components/widgets/smart-input-widget/code-proto-selector/code-proto-selector.component'; import { PageProfileComponent } from './components/preference/pages/page-profile/page-profile.component'; import { ExpireCellComponent } from './components/preference/cell-types/expire-cell/expire-cell.component'; +import { NgxCodejarModule } from 'ngx-codejar'; export function HttpLoaderFactory(http: HttpClient) { - return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); + return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); } export const CUSTOM_MAT_COLOR_FORMATS: MatColorFormats = { - display: { - colorInput: 'hex' - } + display: { + colorInput: 'hex' + } }; @NgModule({ - declarations: [ - AppComponent, - MenuComponent, - FilterPipe, - SafePipe, - HtmlPipe, - PreferencesPipe, - NgSelectFormFieldControlDirective, + declarations: [ + AppComponent, + MenuComponent, + FilterPipe, + SafePipe, + HtmlPipe, + PreferencesPipe, + NgSelectFormFieldControlDirective, + CodeJarWrapperComponent, + /** components */ + DashboardComponent, + LoginComponent, + PreferenceComponent, + SearchGridCallComponent, - /** components */ - DashboardComponent, - LoginComponent, - PreferenceComponent, - SearchGridCallComponent, + /** dashboard */ + AddDashboardDialogComponent, + AddDialogComponent, + DeleteDialogComponent, + EditDialogComponent, + ShareQrDialogComponent, + UrlWarningDialog, - /** dashboard */ - AddDashboardDialogComponent, - AddDialogComponent, - DeleteDialogComponent, - EditDialogComponent, - ShareQrDialogComponent, - UrlWarningDialog, + /** searchGridCall */ + DialogSettingsGridDialog, + ExportDialogComponent, + DialogChartGridDialogComponent, + LokiHighlightRenderer, + ColumnActionRenderer, + ColumnAliasRenderer, + ColumnCallidRenderer, + ColumnUuidRenderer, + ColumnMethodRenderer, + ColumnMOSRenderer, + ColumnCountryRenderer, + DetailDialogComponent, + HeaderActionRenderer, + GenericCellRenderer, + TabExportComponent, + StatusFilterComponent, - /** searchGridCall */ - DialogSettingsGridDialog, - ExportDialogComponent, - DialogChartGridDialogComponent, - LokiHighlightRenderer, - ColumnActionRenderer, - ColumnAliasRenderer, - ColumnCallidRenderer, - ColumnUuidRenderer, - ColumnMethodRenderer, - ColumnMOSRenderer, - ColumnCountryRenderer, - DetailDialogComponent, - HeaderActionRenderer, - GenericCellRenderer, - TabExportComponent, - StatusFilterComponent, + /** widgets */ + AceEditorWidgetComponent, + ClockWidgetComponent, + CodeStylePrometheusFieldComponent, + CodeStyleSmartInputFieldComponent, + CodeProtoSelectorComponent, + DialogAlarmComponent, + DragDropListComponent, + ChipsInputComponent, + GeneralIframeWidgetComponent, + IframeWidgetComponent, + InfluxdbchartWidgetComponent, + ClickhouseChartWidgetComponent, + PrometheusWidgetComponent, + ProtosearchWidgetComponent, + ResultChartWidgetComponent, + ResultWidgetComponent, + RsearchWidgetComponent, + SmartInputWidgetComponent, + PcapUploaderWidgetComponent, + SettingClockWidgetComponent, + SettingGeneralIframeWidgetComponent, + SettingIframeWidgetComponent, + SettingInfluxdbchartWidgetComponent, + SettingClickhouseChartWidgetComponent, + SettingPrometheusWidgetComponent, + SettingProtosearchWidgetComponent, + SettingResultChartWidgetComponent, + SettingResultWidgetComponent, + SettingsAceEditorWidgetComponent, + SettingSmartInputWidgetComponent, - /** widgets */ - AceEditorWidgetComponent, - ClockWidgetComponent, - CodeStylePrometheusFieldComponent, - CodeStyleSmartInputFieldComponent, - CodeProtoSelectorComponent, - DialogAlarmComponent, - DragDropListComponent, - ChipsInputComponent, - GeneralIframeWidgetComponent, - IframeWidgetComponent, - InfluxdbchartWidgetComponent, - ClickhouseChartWidgetComponent, - PrometheusWidgetComponent, - ProtosearchWidgetComponent, - ResultChartWidgetComponent, - ResultWidgetComponent, - RsearchWidgetComponent, - SmartInputWidgetComponent, - PcapUploaderWidgetComponent, - SettingClockWidgetComponent, - SettingGeneralIframeWidgetComponent, - SettingIframeWidgetComponent, - SettingInfluxdbchartWidgetComponent, - SettingClickhouseChartWidgetComponent, - SettingPrometheusWidgetComponent, - SettingProtosearchWidgetComponent, - SettingResultChartWidgetComponent, - SettingResultWidgetComponent, - SettingsAceEditorWidgetComponent, - SettingSmartInputWidgetComponent, + /** dialogs */ + DialogAdvancedComponent, + DialogAgentsubComponent, + DialogAliasComponent, + DialogAuthKeyComponent, + DialogAuthTokenDisplayComponent, + DialogDeleteAlertComponent, + DialogHepsubComponent, + DialogMappingComponent, + DialogUserSettingsComponent, + DialogUsersComponent, + DialogScriptsComponent, + DialogDBSelectorComponent, + UpdateAlertComponent, + DialogExportComponent, + DialogImportComponent, + FullScreenComponent, + SettingAlertWidgetComponent, - /** dialogs */ - DialogAdvancedComponent, - DialogAgentsubComponent, - DialogAliasComponent, - DialogAuthKeyComponent, - DialogAuthTokenDisplayComponent, - DialogDeleteAlertComponent, - DialogHepsubComponent, - DialogMappingComponent, - DialogUserSettingsComponent, - DialogUsersComponent, - DialogScriptsComponent, - DialogDBSelectorComponent, - UpdateAlertComponent, - DialogExportComponent, - DialogImportComponent, - FullScreenComponent, - SettingAlertWidgetComponent, + /**Cell types */ + GenericCellComponent, + ToolCellComponent, + ActiveCellComponent, + DataCellComponent, + LastErrorCellComponent, + DbStatsCellComponent, + ExpireCellComponent, + SettingButtonComponent, + PageUsersComponent, + PageUserSettingsComponent, + PageAdvancedSettingsComponent, + PageMappingComponent, + PageScriptsComponent, + PageAgentSubscriptionsComponent, + PageApiAuthComponent, + PageHepsubComponent, + PageResetComponent, + PageAboutComponent, + PageAdminComponent, + PageAliasComponent, + PageApiDocComponent, + LoadingCircleComponent, + PageSystemOverviewComponent, + TransactionGraphSettingsComponent, + AlertWidgetComponent, + PageProfileComponent + ], - /**Cell types */ - GenericCellComponent, - ToolCellComponent, - ActiveCellComponent, - DataCellComponent, - LastErrorCellComponent, - DbStatsCellComponent, - ExpireCellComponent, - SettingButtonComponent, - PageUsersComponent, - PageUserSettingsComponent, - PageAdvancedSettingsComponent, - PageMappingComponent, - PageScriptsComponent, - PageAgentSubscriptionsComponent, - PageApiAuthComponent, - PageHepsubComponent, - PageResetComponent, - PageAboutComponent, - PageAdminComponent, - PageAliasComponent, - PageApiDocComponent, - LoadingCircleComponent, - PageSystemOverviewComponent, - TransactionGraphSettingsComponent, - AlertWidgetComponent, - PageProfileComponent - ], + imports: [ + CommonModule, + BrowserModule, + BrowserAnimationsModule, + FormsModule, + HttpClientModule, + ReactiveFormsModule, + HttpClientJsonpModule, + GridsterModule, + ChartsModule, + DynamicModule, + routing, + AppRoutingModule, + HomerMaterialModule, + Ng2SearchPipeModule, + NgSelectModule, + OverlayModule, + NoopAnimationsModule, + AgGridModule, + NgxJsonViewerModule, + NgxQRCodeModule, + // AceModule, + // AceEditorModule, + FontAwesomeModule, + MarkdownModule.forRoot(), + NgxDaterangepickerMd.forRoot(), + NgxMatColorPickerModule, + AgChartsAngularModule, + // VirtualScrollerModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + HepTooltipModule, + TabFlowModule, + TabEventsModule, + TabCallinfoModule, + AlertModule, + CustomTableModule, + FlowTooltipModule, + TransactionFilterModule, + TransactionInfoModule, + ModalResizableModule, + TabHepsubModule, + CodeStyleFieldModule, + TabMessagesModule, + TabSubModule, + MessageContentModule, + LokiResultsModule, + WebsharkModule, + CopyModule, + CustomAgGridModule, + ColorOffsetModule, + TabQosModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: HttpLoaderFactory, + deps: [HttpClient] + }, + compiler: { + useClass: TranslateLinkCompiler, + provide: TranslateCompiler + } + }), + // ColorChromeModule + NgxCodejarModule + ], + entryComponents: [ + MenuComponent, - imports: [ - CommonModule, - BrowserModule, - BrowserAnimationsModule, - FormsModule, - HttpClientModule, - ReactiveFormsModule, - HttpClientJsonpModule, - GridsterModule, - ChartsModule, - DynamicModule, - routing, - AppRoutingModule, - HomerMaterialModule, - Ng2SearchPipeModule, - NgSelectModule, - OverlayModule, - NoopAnimationsModule, - AgGridModule.withComponents([]), - NgxJsonViewerModule, - NgxQRCodeModule, - AceModule, - AceEditorModule, - FontAwesomeModule, - MarkdownModule.forRoot(), - NgxDaterangepickerMd.forRoot(), - NgxMatColorPickerModule, - AgChartsAngularModule, - VirtualScrollerModule, - NgxMatDatetimePickerModule, - NgxMatTimepickerModule, - NgxMatNativeDateModule, - HepTooltipModule, - TabFlowModule, - TabEventsModule, - TabCallinfoModule, - AlertModule, - CustomTableModule, - FlowTooltipModule, - TransactionFilterModule, - TransactionInfoModule, - ModalResizableModule, - TabHepsubModule, - CodeStyleFieldModule, - TabMessagesModule, - TabSubModule, - MessageContentModule, - LokiResultsModule, - WebsharkModule, - CopyModule, - CustomAgGridModule, - ColorOffsetModule, - TabQosModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useFactory: HttpLoaderFactory, - deps: [HttpClient] - }, - compiler: { - useClass: TranslateLinkCompiler, - provide: TranslateCompiler - } - }), - ColorChromeModule - ], - entryComponents: [ - MenuComponent, - - /** dialogs */ - DialogAdvancedComponent, - DialogAgentsubComponent, - DialogAliasComponent, - DialogAuthKeyComponent, - DialogAuthTokenDisplayComponent, - DialogDeleteAlertComponent, - DialogHepsubComponent, - DialogMappingComponent, - DialogUserSettingsComponent, - DialogUsersComponent, - DialogScriptsComponent, - DialogDBSelectorComponent, + /** dialogs */ + DialogAdvancedComponent, + DialogAgentsubComponent, + DialogAliasComponent, + DialogAuthKeyComponent, + DialogAuthTokenDisplayComponent, + DialogDeleteAlertComponent, + DialogHepsubComponent, + DialogMappingComponent, + DialogUserSettingsComponent, + DialogUsersComponent, + DialogScriptsComponent, + DialogDBSelectorComponent, - /** widgets */ - AceEditorWidgetComponent, - ClockWidgetComponent, - CodeStylePrometheusFieldComponent, - CodeStyleSmartInputFieldComponent, - CodeProtoSelectorComponent, - DialogAlarmComponent, - DragDropListComponent, - GeneralIframeWidgetComponent, - IframeWidgetComponent, - InfluxdbchartWidgetComponent, - ClickhouseChartWidgetComponent, - PrometheusWidgetComponent, - ProtosearchWidgetComponent, - ResultChartWidgetComponent, - ResultWidgetComponent, - RsearchWidgetComponent, - SmartInputWidgetComponent, - PcapUploaderWidgetComponent, - SettingClockWidgetComponent, - SettingGeneralIframeWidgetComponent, - SettingIframeWidgetComponent, - SettingInfluxdbchartWidgetComponent, - SettingClickhouseChartWidgetComponent, - SettingPrometheusWidgetComponent, - SettingProtosearchWidgetComponent, - SettingResultChartWidgetComponent, - SettingResultWidgetComponent, - SettingsAceEditorWidgetComponent, - SettingSmartInputWidgetComponent, - AlertWidgetComponent, - /** dashboard */ - AddDashboardDialogComponent, - AddDialogComponent, - DeleteDialogComponent, - EditDialogComponent - // SettingAlertWidgetComponent - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - providers: [ - { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true }, - { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true }, - { provide: ACE_CONFIG, useValue: DEFAULT_ACE_CONFIG }, - { provide: MAT_COLOR_FORMATS, useValue: CUSTOM_MAT_COLOR_FORMATS }, - { provide: PreferencesContentMapping, useClass: PreferencesContentMapping }, - { provide: APP_BASE_HREF, useValue: window['base-href'] }, - TransactionFilterService - ], - bootstrap: [AppComponent] + /** widgets */ + AceEditorWidgetComponent, + ClockWidgetComponent, + CodeStylePrometheusFieldComponent, + CodeStyleSmartInputFieldComponent, + CodeProtoSelectorComponent, + DialogAlarmComponent, + DragDropListComponent, + GeneralIframeWidgetComponent, + IframeWidgetComponent, + InfluxdbchartWidgetComponent, + ClickhouseChartWidgetComponent, + PrometheusWidgetComponent, + ProtosearchWidgetComponent, + ResultChartWidgetComponent, + ResultWidgetComponent, + RsearchWidgetComponent, + SmartInputWidgetComponent, + PcapUploaderWidgetComponent, + SettingClockWidgetComponent, + SettingGeneralIframeWidgetComponent, + SettingIframeWidgetComponent, + SettingInfluxdbchartWidgetComponent, + SettingClickhouseChartWidgetComponent, + SettingPrometheusWidgetComponent, + SettingProtosearchWidgetComponent, + SettingResultChartWidgetComponent, + SettingResultWidgetComponent, + SettingsAceEditorWidgetComponent, + SettingSmartInputWidgetComponent, + AlertWidgetComponent, + /** dashboard */ + AddDashboardDialogComponent, + AddDialogComponent, + DeleteDialogComponent, + EditDialogComponent + // SettingAlertWidgetComponent + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + providers: [ + { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true }, + { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true }, + // { provide: ACE_CONFIG, useValue: DEFAULT_ACE_CONFIG }, + { provide: MAT_COLOR_FORMATS, useValue: CUSTOM_MAT_COLOR_FORMATS }, + { provide: PreferencesContentMapping, useClass: PreferencesContentMapping }, + { provide: APP_BASE_HREF, useValue: window['base-href'] }, + TransactionFilterService + ], + bootstrap: [AppComponent] }) export class AppModule { - constructor(library: FaIconLibrary) { - library.addIconPacks(fas as any, fab as any, far as any); - } + constructor(library: FaIconLibrary) { + library.addIconPacks(fas as any, fab as any, far as any); + } } diff --git a/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.html b/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.html new file mode 100644 index 00000000..32fd80cb --- /dev/null +++ b/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.html @@ -0,0 +1,12 @@ +
+
+ {{ errorMessage }} +
+ +
diff --git a/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.scss b/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.scss new file mode 100644 index 00000000..be647710 --- /dev/null +++ b/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.scss @@ -0,0 +1,23 @@ +:host { + display: block; + height: 100%; +} +.btn-send { + float: right; + position: absolute; + right: 1rem; + bottom: 1rem; + z-index: 3; +} +.error { + margin: 10px; + position: absolute; + bottom: 0rem; + display: block; + border-radius: 4px; + width: calc(100% - 20px); + padding: 0.5rem; + color: #FF0; + background-color: #900; + box-sizing: border-box; +} diff --git a/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.ts b/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.ts new file mode 100644 index 00000000..0af521a8 --- /dev/null +++ b/src/app/components/controls/codejar-wrapper/codejar-wrapper.component.ts @@ -0,0 +1,109 @@ +import hljs from 'highlight.js'; +import { + Component, EventEmitter, Input, OnInit, Output, AfterViewInit, + ChangeDetectionStrategy, ChangeDetectorRef, ViewChild, HostListener +} from '@angular/core'; +import { CodeJarContainer } from 'ngx-codejar'; + +@Component({ + selector: 'app-codejar-wrapper', + templateUrl: './codejar-wrapper.component.html', + styleUrls: ['./codejar-wrapper.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class CodeJarWrapperComponent implements OnInit, AfterViewInit { + @Input() + set text(value: string) { + this.code = value; + requestAnimationFrame(() => this.cdr.detectChanges()); + } + get text(): string { + return this.code; + } + @Output() textChange = new EventEmitter(); + @Input() mode: string; + @Input() jsonValidator: boolean = false; + @Input() theme = 'monokai'; + _readOnly = false; + @Input() + set readOnly(value: boolean) { + console.log('set readOnly', value, this.editor); + this._readOnly = value; + // if (this.editor) { + // this.editor.updateOptions({ readOnly: value }); + // } + if (this.codejar) { + console.log('set readOnly', this._readOnly, this.codejar); + this.codejar.nativeElement.querySelector('pre').attributes.contenteditable.value = !this._readOnly; + } + }; + get readOnly(): boolean { + return this._readOnly; + } + @Input() durationBeforeCallback = 0; + @Input() disabled = false; + + @Output() ready: any = new EventEmitter(); + editor: any; + code: string = ''; + errorMessage = ''; + isReadyToShow = false; + + @ViewChild('codejar') codejar: any; + + constructor(private cdr: ChangeDetectorRef) { + } + @HostListener('document:keydown', ['$event']) + handleReadOnly(event: KeyboardEvent) { + return; + const buttonList = ['Enter', 'Backspace', 'Delete', 'Insert'] + if (this.readOnly && event.key && (event.key.length === 1 || event.ctrlKey || event.shiftKey || buttonList.includes(event.key) )) { + event.preventDefault(); + event.stopPropagation(); + } + } + highlightMethodJSON(editor: CodeJarContainer) { + if (editor.textContent !== null && editor.textContent !== undefined) { + editor.innerHTML = hljs.highlight(editor.textContent, { language: 'json' }).value; + } + } + highlightMethod(editor: CodeJarContainer) { + if (editor.textContent !== null && editor.textContent !== undefined) { + editor.innerHTML = hljs.highlight(editor.textContent, { language: 'javascript' }).value; + } + } + + ngAfterViewInit(): void { + + this.editor?.updateOptions({ readOnly: this._readOnly }); + requestAnimationFrame(() => { + console.log('ngAfterViewInit'); + if (this.codejar) { + console.log('set readOnly:requestAnimationFrame', this._readOnly, this.codejar); + this.codejar.nativeElement.querySelector('pre').attributes.contenteditable.value = !this._readOnly; + } + }) + } + ngOnInit(): void { + } + + onInit(editor: any) { + let line = editor.getPosition(); + this.editor = editor; + this.editor?.updateOptions({ readOnly: this._readOnly }); + console.log(line); + } + onChangeCode(event: any) { + this.code = event; + if (this.jsonValidator) { + try { + JSON.parse(this.code); + this.errorMessage = ''; + } catch (e) { + this.errorMessage = e.message; + } + } + requestAnimationFrame(() => this.cdr.detectChanges()); + this.textChange.emit(this.code); + } +} diff --git a/src/app/components/controls/custom-ag-grid/custom-ag-grid.component.ts b/src/app/components/controls/custom-ag-grid/custom-ag-grid.component.ts index 6b3c0074..958ec076 100644 --- a/src/app/components/controls/custom-ag-grid/custom-ag-grid.component.ts +++ b/src/app/components/controls/custom-ag-grid/custom-ag-grid.component.ts @@ -1,144 +1,164 @@ +import { ChangeDetectorRef, Component, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core'; import { Functions } from '@app/helpers/functions'; -import { SettingButtonComponent } from './setting-button'; +import { DateFormat } from '@app/services/time-formatting.service'; import { GridOptions } from 'ag-grid-community'; -import { Component, OnInit, ChangeDetectorRef, EventEmitter, Output, Input, HostListener } from '@angular/core'; +import { SettingButtonComponent } from './setting-button'; @Component({ - selector: 'custom-ag-grid', - templateUrl: './custom-ag-grid.component.html', - styleUrls: ['./custom-ag-grid.component.scss'] + selector: 'custom-ag-grid', + templateUrl: './custom-ag-grid.component.html', + styleUrls: ['./custom-ag-grid.component.scss'] }) export class CustomAgGridComponent implements OnInit { - agGridSizeControl = { - selectedType: 'sizeToFit', - // pageSize: 100 - }; - agColumnDefs: any[] = []; - _details = []; - frameworkComponents: any; - gridOptions: GridOptions = { - defaultColDef: { - sortable: true, - resizable: true, - }, - rowHeight: 38, - rowSelection: 'multiple', - suppressRowClickSelection: true, - suppressCellSelection: true, - suppressPaginationPanel: true - }; - _columns: any[] = []; - gridApi: any; - @Input() set details(val) { - this._details = Functions.cloneObject(val); - this.re_new(); - } - get details() { - return this._details; - } - @Input() set columns(val: string[]) { - if (!val) { - return; + agGridSizeControl = { + selectedType: 'sizeToFit', + // pageSize: 100 + }; + agColumnDefs: any[] = []; + _details = []; + frameworkComponents: any; + gridOptions: GridOptions = { + defaultColDef: { + sortable: true, + resizable: true, + }, + rowHeight: 38, + rowSelection: 'multiple', + suppressRowClickSelection: true, + suppressCellSelection: true, + suppressPaginationPanel: true + }; + _columns: any[] = []; + gridApi: any; + @Input() dateFormat: DateFormat; + @Input() customTimeParser: (columnType: string, value: string) => string; + @Input() set details(val) { + this._details = Functions.cloneObject(val); + this.re_new(); + } + get details() { + return this._details; } - const isDetailsReady = () => { - if (this.details?.length) { - const [firstItemOfDetails] = this.details; + @Input() set columns(val: string[]) { + if (!val) { + return; + } + const isDetailsReady = () => { + if (this.details?.length) { + const [firstItemOfDetails] = this.details; + + this._columns = Object.entries(firstItemOfDetails) + .filter(([key, value]: any) => typeof value !== 'object' || value instanceof Array) + .map(([column]: any) => { + + const aliasFromKey = { + 'srcAlias_srcPort': 'SRC IP with Port', + 'dstAlias_dstPort': 'DST IP with Port', + 'diff': 'Delta', + 'id': 'ID', + 'create_date': 'Date', + 'timeSeconds': 'Timestamp', + 'ip_tos': 'IP TOS', + 'Msg_Size': 'Msg. Size', + } + const dateTimeField = { + create_date: 'date', + timeSeconds: 'time' + } + //({ value }) => + // value && moment(value).format(this.dateFormat.dateTimeResults) + return { + field: column, + headerName: aliasFromKey[column] || column, + hide: !val.includes(column), + valueFormatter: !!dateTimeField[column] && this.customTimeParser ? ({value}) => this.customTimeParser(dateTimeField[column], value) : null + } + }); - this._columns = Object.entries(firstItemOfDetails) - .filter(([key, value]: any) => typeof value !== 'object' || value instanceof Array) - .map(([key]: any) => { - if (key.includes('Alias_src')) { - return { field: key, headerName: 'SRC IP with port', hide: !val.includes(key) } - } else if (key.includes('Alias_dst')) { - return { field: key, headerName: 'DST IP with port', hide: !val.includes(key) } + this._columns.push({ + field: '', + headerName: '', + headerComponent: 'settings', + hide: false, + pinned: 'left', + lockPinned: true, + resizable: false, + minWidth: 40, + maxWidth: 40 + }); + this.re_new(); + } else { + setTimeout(() => { + isDetailsReady(); + }); } - return { field: key, hide: !val.includes(key) } - }); - this._columns.push({ - field: '', - headerName: '', - headerComponent: 'settings', - hide: false, - pinned: 'left', - lockPinned: true, - resizable: false, - minWidth: 40, - maxWidth: 40 - }); - this.re_new(); - } else { - setTimeout(() => { - isDetailsReady(); + }; + isDetailsReady(); + } + get columns() { + return this._columns; + } + @Output() rowClick: EventEmitter = new EventEmitter(); + + @HostListener('dblclick') + onDblClick() { + requestAnimationFrame(() => { + this.gridApi?.sizeColumnsToFit(); }); - } - }; - isDetailsReady(); - } - get columns() { - return this._columns; - } - @Output() rowClick: EventEmitter = new EventEmitter(); + } - @HostListener('click') - onClick() { - setTimeout(() => { - this.gridApi.sizeColumnsToFit(); - }, 300); - } + // @HostListener('window:resize') + onResize() { + if (!this.gridApi || this.agGridSizeControl.selectedType !== 'sizeToFit') { + return; + } - // @HostListener('window:resize') - onResize() { - if (!this.gridApi || this.agGridSizeControl.selectedType !== 'sizeToFit') { - return; + requestAnimationFrame(() => { + if (this.agGridSizeControl.selectedType === 'sizeToFit') { + this.gridApi?.sizeColumnsToFit(); + } + }); + } + onGridReady(params: any) { + this.gridApi = params.api; + } + constructor(private cdr: ChangeDetectorRef) { + this.frameworkComponents = { + settings: SettingButtonComponent + }; } - setTimeout(() => { - if (this.agGridSizeControl.selectedType === 'sizeToFit') { - this.gridApi.sizeColumnsToFit(); - } - }, 300); - } - onGridReady(params: any) { - this.gridApi = params.api; - } - constructor(private cdr: ChangeDetectorRef) { - this.frameworkComponents = { - settings: SettingButtonComponent - }; - } - - ngOnInit() { - this.re_new(); - } - private re_new() { - this.sizeToFit(); - this.cdr.detectChanges(); - } - private sizeToFit() { - setTimeout(() => { - this.gridOptions.api?.sizeColumnsToFit(); - this.cdr.detectChanges(); - }, 100); - } + ngOnInit() { + this.re_new(); + } + private re_new() { + this.sizeToFit(); + this.cdr.detectChanges(); + } + private sizeToFit() { + setTimeout(() => { + this.gridOptions.api?.sizeColumnsToFit(); + this.cdr.detectChanges(); + }, 100); + } - public getRowStyle(params) { - // console.log('getRowStyle(params)', params) - const _style: any = { - 'border-bottom': '1px solid rgba(0,0,0,0.1)', - 'cursor': 'pointer' + public getRowStyle(params) { + const _style: any = { + 'border-bottom': '1px solid rgba(0,0,0,0.1)', + 'cursor': 'pointer' + } + if (params.node.rowIndex % 2 === 0) { + _style.background = '#e4f0ec'; + } + return _style; + } + sortChanged(event) { + this.cdr.detectChanges(); } - if (params.node.rowIndex % 2 === 0) { - _style.background = '#e4f0ec'; + cellClicked(event) { + this.rowClick.emit(event); } - return _style; - } - sortChanged(event) { - this.cdr.detectChanges(); - } - cellClicked(event) { - this.rowClick.emit(event); - } - doOpenFilter() { + doOpenFilter() { - } + } } diff --git a/src/app/components/controls/custom-ag-grid/custom-ag-grid.module.ts b/src/app/components/controls/custom-ag-grid/custom-ag-grid.module.ts index 0975ba8b..733d1440 100644 --- a/src/app/components/controls/custom-ag-grid/custom-ag-grid.module.ts +++ b/src/app/components/controls/custom-ag-grid/custom-ag-grid.module.ts @@ -1,10 +1,6 @@ import { DragDropListComponent } from './drag-drop-list/drag-drop-list.component'; -import { MatCardModule } from '@angular/material/card'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatMenuModule } from '@angular/material/menu'; import { SettingButtonComponent } from './setting-button'; import { FormsModule } from '@angular/forms'; -import { MatButtonModule } from '@angular/material/button'; import { AgGridModule } from 'ag-grid-angular'; import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; @@ -14,13 +10,17 @@ import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontaweso import { fas } from '@fortawesome/free-solid-svg-icons'; import { fab } from '@fortawesome/free-brands-svg-icons'; import { far } from '@fortawesome/free-regular-svg-icons'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatMenuModule } from '@angular/material/menu'; @NgModule({ imports: [ CommonModule, FontAwesomeModule, MatButtonModule, FormsModule, - AgGridModule.withComponents([]), + AgGridModule, MatMenuModule, MatCheckboxModule, MatCardModule, diff --git a/src/app/components/controls/custom-ag-grid/setting-button.html b/src/app/components/controls/custom-ag-grid/setting-button.html index c3f6bf2d..4ba45825 100644 --- a/src/app/components/controls/custom-ag-grid/setting-button.html +++ b/src/app/components/controls/custom-ag-grid/setting-button.html @@ -1,6 +1,6 @@ {{headerName | titlecase}} diff --git a/src/app/components/controls/custom-ag-grid/setting-button.scss b/src/app/components/controls/custom-ag-grid/setting-button.scss index cf4c93ba..2c0a9e64 100644 --- a/src/app/components/controls/custom-ag-grid/setting-button.scss +++ b/src/app/components/controls/custom-ag-grid/setting-button.scss @@ -7,6 +7,6 @@ .button-icon-right-top { width: 30px; } -::ng-deep.mat-menu-panel { +::ng-deep.mat-mdc-menu-panel { max-width: initial !important; } diff --git a/src/app/components/controls/custom-ag-grid/setting-button.ts b/src/app/components/controls/custom-ag-grid/setting-button.ts index b393d1e2..4069eb24 100644 --- a/src/app/components/controls/custom-ag-grid/setting-button.ts +++ b/src/app/components/controls/custom-ag-grid/setting-button.ts @@ -1,5 +1,5 @@ -import { Component, ChangeDetectionStrategy, ChangeDetectorRef, Input } from '@angular/core'; -import { Functions } from '@app/helpers/functions'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; +import { emitWindowResize } from '@app/helpers/windowFunctions'; import { ICellRendererAngularComp } from 'ag-grid-angular'; @Component({ @@ -57,7 +57,7 @@ export class SettingButtonComponent implements ICellRendererAngularComp { setVisible(field, selected); this.apiColumn.moveColumn(field, key + 1); }); - setTimeout(() => Functions.emitWindowResize(), 100); + setTimeout(() => emitWindowResize(), 100); } } doOpenFilter() { diff --git a/src/app/components/controls/custom-table/custom-table.component.css b/src/app/components/controls/custom-table/custom-table.component.css index e26cb9a2..60cdf334 100644 --- a/src/app/components/controls/custom-table/custom-table.component.css +++ b/src/app/components/controls/custom-table/custom-table.component.css @@ -20,11 +20,11 @@ table.this-table td { text-overflow: ellipsis; } -.mat-row:nth-child(2n+1){ +.mat-mdc-row:nth-child(2n+1){ background-color: #e4f0ec; } -.mat-row:not(:nth-child(2n+1)){ +.mat-mdc-row:not(:nth-child(2n+1)){ background-color:#ffffff; } diff --git a/src/app/components/controls/daterangepicker/daterangepicker.component.html b/src/app/components/controls/daterangepicker/daterangepicker.component.html index cb6e3f67..7c81d8c9 100644 --- a/src/app/components/controls/daterangepicker/daterangepicker.component.html +++ b/src/app/components/controls/daterangepicker/daterangepicker.component.html @@ -16,7 +16,7 @@ [class]="'drops-' + drops + '-' + opens"> -
+
+ [label]='region.key'> {{timeZone | timeZone:'location'}} {{timeZone | timeZone:'offset'}} @@ -361,7 +361,7 @@ height: 60px;" *ngIf="!autoApply && ( !rangesArray.length || (showCalInRanges && !singleDatePicker))">
+ style="float: right;" [hidden]="!isShown">
-
+
+
\ No newline at end of file diff --git a/src/app/components/controls/daterangepicker/daterangepicker.component.scss b/src/app/components/controls/daterangepicker/daterangepicker.component.scss index be2633aa..52e9993a 100644 --- a/src/app/components/controls/daterangepicker/daterangepicker.component.scss +++ b/src/app/components/controls/daterangepicker/daterangepicker.component.scss @@ -79,6 +79,7 @@ $input-height: 3rem !default; font-size: 14px; background-color: #ffffff; box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.16), 0 2px 8px 0 rgba(0, 0, 0, 0.12); + min-width: 700px; &.double { width: $md-drppicker-width-double; @@ -207,6 +208,7 @@ $input-height: 3rem !default; .calendar { /* display: none; */ + min-width: $md-drppicker-width - ($md-drppicker-calendar-margin * 2); max-width: $md-drppicker-width - ($md-drppicker-calendar-margin * 2); margin: $md-drppicker-calendar-margin; @@ -451,7 +453,9 @@ $input-height: 3rem !default; .select { display: inline; - + /* +TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. +*/ mat-select { width: 46px; } @@ -510,7 +514,6 @@ $input-height: 3rem !default; height: $md-drppicker-control-line-height; line-height: $md-drppicker-control-height; display: block; - vertical-align: middle; margin: 0 auto 5px auto; padding: 0 0 0 28px; width: 100%; @@ -557,7 +560,7 @@ $input-height: 3rem !default; float: none; text-align: left; margin: 0; - + min-width: 150px; ul { list-style: none; margin: 0 auto; @@ -579,7 +582,7 @@ $input-height: 3rem !default; cursor: pointer; &.active { - background-color: #009cbf; + background-color: #749ad6; color: #fff; } @@ -728,148 +731,148 @@ $input-height: 3rem !default; } } -@media (min-width: 564px) { - .md-drppicker { - width: auto; - - &.single { - .calendar.left { - clear: none; - } - } - - &.ltr { - direction: ltr; - text-align: left; - - .calendar { - &.left { - clear: left; - /*margin-right: 1.5em;*/ - - .calendar-table { - border-right: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - } - - &.right { - margin-left: 0; - - .calendar-table { - border-left: none; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - } - } - - .left .md-drppicker_input { - padding-right: 35px; - } - - .right .md-drppicker_input { - padding-right: 35px; - } - - .calendar.left .calendar-table { - padding-right: 12px; - } - - .ranges, - .calendar { - float: left; - } - } - - &.rtl { - direction: rtl; - text-align: right; - - .calendar { - &.left { - clear: right; - margin-left: 0; - - .calendar-table { - border-left: none; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - } - - &.right { - margin-right: 0; - - .calendar-table { - border-right: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - } - } +// @media (min-width: 564px) { +// .md-drppicker { +// width: auto; - .left .md-drppicker_input { - padding-left: 12px; - } +// &.single { +// .calendar.left { +// clear: none; +// } +// } - .calendar.left .calendar-table { - padding-left: 12px; - } +// &.ltr { +// direction: ltr; +// text-align: left; + +// .calendar { +// &.left { +// clear: left; +// /*margin-right: 1.5em;*/ + +// .calendar-table { +// border-right: none; +// border-top-right-radius: 0; +// border-bottom-right-radius: 0; +// } +// } + +// &.right { +// margin-left: 0; + +// .calendar-table { +// border-left: none; +// border-top-left-radius: 0; +// border-bottom-left-radius: 0; +// } +// } +// } + +// .left .md-drppicker_input { +// padding-right: 35px; +// } + +// .right .md-drppicker_input { +// padding-right: 35px; +// } + +// .calendar.left .calendar-table { +// padding-right: 12px; +// } + +// .ranges, +// .calendar { +// float: left; +// } +// } - .ranges, - .calendar { - text-align: right; - float: right; - } - } - } +// &.rtl { +// direction: rtl; +// text-align: right; + +// .calendar { +// &.left { +// clear: right; +// margin-left: 0; + +// .calendar-table { +// border-left: none; +// border-top-left-radius: 0; +// border-bottom-left-radius: 0; +// } +// } + +// &.right { +// margin-right: 0; + +// .calendar-table { +// border-right: none; +// border-top-right-radius: 0; +// border-bottom-right-radius: 0; +// } +// } +// } + +// .left .md-drppicker_input { +// padding-left: 12px; +// } + +// .calendar.left .calendar-table { +// padding-left: 12px; +// } + +// .ranges, +// .calendar { +// text-align: right; +// float: right; +// } +// } +// } - .drp-animate { - transform: translate(0); - transition: transform .2s ease, - opacity .2s ease; +// .drp-animate { +// transform: translate(0); +// transition: transform .2s ease, +// opacity .2s ease; - &.drp-picker-site-this { - transition-timing-function: linear; - } +// &.drp-picker-site-this { +// transition-timing-function: linear; +// } - &.drp-animate-right { - transform: translateX(10%); - opacity: 0; - } +// &.drp-animate-right { +// transform: translateX(10%); +// opacity: 0; +// } - &.drp-animate-left { - transform: translateX(-10%); - opacity: 0; - } - } -} +// &.drp-animate-left { +// transform: translateX(-10%); +// opacity: 0; +// } +// } +// } -@media (min-width: 730px) { - .md-drppicker { - .ranges { - width: auto; - } +// @media (min-width: 730px) { +// .md-drppicker { +// .ranges { +// width: auto; +// } - &.ltr { - .ranges { - float: left; - } - } +// &.ltr { +// .ranges { +// float: left; +// } +// } - &.rtl { - .ranges { - float: right; - } - } +// &.rtl { +// .ranges { +// float: right; +// } +// } - .calendar.left { - clear: none !important; - } - } -} +// .calendar.left { +// clear: none !important; +// } +// } +// } $fontSizeIcon: 24px; @@ -883,11 +886,11 @@ td { font-weight: bold; } - .mat-input-element { + .mat-mdc-input-element { color: black } - .mat-form-field { + .mat-mdc-form-field { width: 20px; max-width: 20px; text-align: center; @@ -910,7 +913,7 @@ td { // &.active { // border-radius: 3px; -// background-color: #009cbf !important; +// background-color: #749ad6 !important; // color: #000 !important; // } // } @@ -933,7 +936,7 @@ td { // } // .btn { -// background-color: #009cbf !important; +// background-color: #749ad6 !important; // color: #000 !important; // } -// } +// } \ No newline at end of file diff --git a/src/app/components/controls/daterangepicker/daterangepicker.component.ts b/src/app/components/controls/daterangepicker/daterangepicker.component.ts index cca29d92..a93bfce3 100644 --- a/src/app/components/controls/daterangepicker/daterangepicker.component.ts +++ b/src/app/components/controls/daterangepicker/daterangepicker.component.ts @@ -1,28 +1,22 @@ import { ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; -import { FormGroup, FormControl, FormBuilder, Validators, NG_VALUE_ACCESSOR } from '@angular/forms'; -import * as _moment from 'moment'; +import { FormBuilder, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; // import { NgxMatDateAdapter } from './date-adapter'; import { DateAdapter } from '@angular/material/core'; -import { LocaleConfig } from './daterangepicker.config'; -import { LocaleService } from './locale.service'; -// import { DateTimeRangeService } from './data-time-range.service'; -import { DateTimeRangeService } from '@app/services/data-time-range.service'; import { Functions } from '@app/helpers/functions'; -import { TranslateService } from '@ngx-translate/core' import { DashboardService } from '@app/services'; +// import { DateTimeRangeService } from './data-time-range.service'; +import { DateTimeRangeService } from '@app/services/data-time-range.service'; +import { TranslateService } from '@ngx-translate/core'; +import _moment from 'moment'; +import { LocaleConfig } from './daterangepicker.config'; +import { LocaleService } from './locale.service'; const moment = _moment; export enum SideEnum { left = 'left', right = 'right' } -export interface TimeZones { - Africa: Array - Europe: Array - ETC: Array - America: Array - Australia: Array -} + @Component({ selector: 'ngx-daterangepicker-material', styleUrls: ['./daterangepicker.component.scss'], @@ -46,7 +40,7 @@ export class DaterangepickerComponent implements OnInit { timepickerTimezone = moment.tz.guess(true); timepickerListZones = moment.tz.names(); daterangepicker: { start: FormControl, end: FormControl } = { start: new FormControl(), end: new FormControl() }; - parsedTimeZones: TimeZones; + parsedTimeZones: any; public form: FormGroup; @@ -158,7 +152,7 @@ export class DaterangepickerComponent implements OnInit { // some state information isShown: Boolean = false; - inline = true; + inline = false; leftCalendar: any = {}; rightCalendar: any = {}; showCalInRanges: Boolean = false; @@ -229,10 +223,9 @@ export class DaterangepickerComponent implements OnInit { } ngOnInit() { - - var timestamp = this.dateTimeRangeService.getDatesForQuery(true); this.timepickerTimezone = this.dateTimeRangeService.getTimezoneForQuery(); + moment.tz.setDefault(this.timepickerTimezone); this.groupTimeZones(); @@ -350,7 +343,6 @@ export class DaterangepickerComponent implements OnInit { listTimeZones['ETC'].push(timeZone); } }); - console.log(listTimeZones) this.parsedTimeZones = listTimeZones; } @@ -403,7 +395,7 @@ export class DaterangepickerComponent implements OnInit { /** * Format input - * @param input + * @param input */ public formatInput(input: HTMLInputElement) { input.value = input.value.replace(this.NUMERIC_REGEX, ''); @@ -447,7 +439,7 @@ export class DaterangepickerComponent implements OnInit { /** * Get next value by property - * @param prop + * @param prop * @param up */ private _getNextValueByProp(prop: string, elem: string, up?: boolean): number { @@ -863,9 +855,9 @@ export class DaterangepickerComponent implements OnInit { this.chosenRange = this.rangesArray[i]; break; - } else if (this.startDate?.format("HH:mm:ss") != "00:00:00" && - (this.endDate?.valueOf() - this.startDate?.valueOf()) == - (this.ranges?.[range][1]?.valueOf() - this.ranges?.[range][0])?.valueOf()) { + } else if (this.startDate.format("HH:mm:ss") != "00:00:00" && + (this.endDate.valueOf() - this.startDate.valueOf()) == + (this.ranges[range][1].valueOf() - this.ranges[range][0]).valueOf()) { customRange = false; this.chosenRange = this.rangesArray[i]; break; @@ -1014,6 +1006,7 @@ export class DaterangepickerComponent implements OnInit { moment.tz.setDefault(this.timepickerTimezone); DateTimeRangeService.dateTimeRangr.timezone = this.timepickerTimezone; + this.startDate.tz(this.timepickerTimezone); this.endDate.tz(this.timepickerTimezone); @@ -1206,6 +1199,7 @@ export class DaterangepickerComponent implements OnInit { dbClickRange(e, label) { this.chosenRange = label; if (label === this.locale.customRangeLabel) { + this.isShown = true; // show calendars this.showCalInRanges = true; } else { @@ -1266,6 +1260,7 @@ export class DaterangepickerComponent implements OnInit { clickRange(e, label) { this.chosenRange = label; if (label === this.locale.customRangeLabel) { + this.isShown = true; // show calendars this.showCalInRanges = true; } else { @@ -1325,7 +1320,9 @@ export class DaterangepickerComponent implements OnInit { show(e?) { - if (this.isShown) { return; } + if (this.isShown) { + return; + } this._old.start = this.startDate.clone(); this._old.end = this.endDate.clone(); this.isShown = true; diff --git a/src/app/components/controls/daterangepicker/daterangepicker.config.ts b/src/app/components/controls/daterangepicker/daterangepicker.config.ts index 2af08c8c..e3bbe5ef 100644 --- a/src/app/components/controls/daterangepicker/daterangepicker.config.ts +++ b/src/app/components/controls/daterangepicker/daterangepicker.config.ts @@ -1,4 +1,4 @@ -import { InjectionToken, Injector } from '@angular/core'; +import { InjectionToken } from '@angular/core'; import * as _moment from 'moment-timezone'; const moment = _moment; diff --git a/src/app/components/controls/daterangepicker/daterangepicker.directive.ts b/src/app/components/controls/daterangepicker/daterangepicker.directive.ts index 183c63c1..3cb21ea4 100644 --- a/src/app/components/controls/daterangepicker/daterangepicker.directive.ts +++ b/src/app/components/controls/daterangepicker/daterangepicker.directive.ts @@ -19,7 +19,7 @@ import { } from '@angular/core'; import { DaterangepickerComponent } from './daterangepicker.component'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; - import * as _moment from 'moment-timezone'; + import _moment from 'moment-timezone'; import { LocaleConfig } from './daterangepicker.config'; import { LocaleService } from './locale.service'; const moment = _moment; @@ -43,7 +43,6 @@ import { public picker: DaterangepickerComponent; private _onChange = Function.prototype; private _onTouched = Function.prototype; - private _validatorChange = Function.prototype; private _value: any; private localeDiffer: KeyValueDiffer; @Input() diff --git a/src/app/components/controls/daterangepicker/daterangepicker.module.ts b/src/app/components/controls/daterangepicker/daterangepicker.module.ts index cb79e807..718704a9 100644 --- a/src/app/components/controls/daterangepicker/daterangepicker.module.ts +++ b/src/app/components/controls/daterangepicker/daterangepicker.module.ts @@ -1,48 +1,44 @@ import { CommonModule } from '@angular/common'; -import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {MatFormFieldModule} from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; -import { fas } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { DaterangepickerComponent } from './daterangepicker.component'; import { DaterangepickerDirective } from './daterangepicker.directive'; import { LocaleConfig, LOCALE_CONFIG } from './daterangepicker.config'; import { LocaleService } from './locale.service'; import { TimeZonePipe } from './timezone.pipe'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MatTooltipModule } from '@angular/material/tooltip'; import { HomerMaterialModule } from '@app/app.material-module'; import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatSelectModule } from '@angular/material/select'; +import { MatTooltipModule } from '@angular/material/tooltip'; @NgModule({ - declarations: [ - DaterangepickerComponent, - DaterangepickerDirective, - TimeZonePipe - ], - imports: [ - CommonModule, - FormsModule, - MatFormFieldModule, - MatInputModule, - MatSelectModule, - FontAwesomeModule, - ReactiveFormsModule, - BrowserAnimationsModule, - MatTooltipModule, - HomerMaterialModule, - TranslateModule - ], - providers: [], - exports: [ - DaterangepickerComponent, - DaterangepickerDirective - ], - entryComponents: [ - DaterangepickerComponent - ] + declarations: [ + DaterangepickerComponent, + DaterangepickerDirective, + TimeZonePipe + ], + imports: [ + CommonModule, + FormsModule, + MatFormFieldModule, + MatInputModule, + MatSelectModule, + FontAwesomeModule, + ReactiveFormsModule, + BrowserAnimationsModule, + MatTooltipModule, + HomerMaterialModule, + TranslateModule + ], + providers: [], + exports: [ + DaterangepickerComponent, + DaterangepickerDirective + ] }) export class NgxDaterangepickerMd { constructor() {} diff --git a/src/app/components/controls/daterangepicker/timezone.pipe.ts b/src/app/components/controls/daterangepicker/timezone.pipe.ts index 7df3789a..621dc8d1 100644 --- a/src/app/components/controls/daterangepicker/timezone.pipe.ts +++ b/src/app/components/controls/daterangepicker/timezone.pipe.ts @@ -1,13 +1,10 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as _moment from 'moment'; +import * as _moment from 'moment-timezone'; const moment: any = _moment; @Pipe({name: 'timeZone'}) export class TimeZonePipe implements PipeTransform { transform(value, type) { - if (value?.value) { - value = value?.value; - } if (type === 'region') { value = value.substr(0, value.indexOf('/')); } else if (type === 'location'){ diff --git a/src/app/components/controls/full-screen/full-screen.component.html b/src/app/components/controls/full-screen/full-screen.component.html index bd422345..b07a166c 100644 --- a/src/app/components/controls/full-screen/full-screen.component.html +++ b/src/app/components/controls/full-screen/full-screen.component.html @@ -5,35 +5,48 @@ >
- - - - - - - - + + + + -
-
- -
-
- + + + +
+
+ +
+
+ + + +
\ No newline at end of file diff --git a/src/app/components/controls/full-screen/full-screen.component.scss b/src/app/components/controls/full-screen/full-screen.component.scss index bd7c5a38..c203abe5 100644 --- a/src/app/components/controls/full-screen/full-screen.component.scss +++ b/src/app/components/controls/full-screen/full-screen.component.scss @@ -7,14 +7,17 @@ z-index: 1000000; background: white; - .button-inside { - float: right; + .button-wrapper { position: absolute; - background: hsla(0, 0%, 100%, 0.3); right: 10px; - top: 10px; + display: flex; + flex-direction: column; + + } + .button-inside { + background: hsla(0, 0%, 100%, 0.3); z-index: 1; - + margin: 5px 0; } .download { top: 45px; @@ -23,19 +26,21 @@ background: hsla(0, 0%, 100%, 0.3); z-index: 1; margin: 5px 0; - height: 40px; - width: 40px; + height: 48px; + width: 48px; border-radius: 100%; } .menu-button { - position: absolute; - right: 10px; - top: 55px; - width: 40px; + width: 48px; + margin-right: 12px; display: flex; flex-direction: column; background-color: transparent; overflow: visible; + box-shadow: none; + &:hover{ + background: none !important; + } } ::ng-deep .mat-expansion-panel-header { padding: 0; diff --git a/src/app/components/controls/full-screen/full-screen.component.ts b/src/app/components/controls/full-screen/full-screen.component.ts index e138f098..d72b5520 100644 --- a/src/app/components/controls/full-screen/full-screen.component.ts +++ b/src/app/components/controls/full-screen/full-screen.component.ts @@ -1,9 +1,10 @@ -import { Functions } from '@app/helpers/functions'; -import { Component, OnInit, ViewChild, ElementRef, Output, EventEmitter, HostListener, Input, - ChangeDetectionStrategy, - ChangeDetectorRef} from '@angular/core'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, Input, OnInit, Output, ViewChild +} from '@angular/core'; +import { emitWindowResize, saveToFile } from '@app/helpers/windowFunctions'; +import moment from 'moment'; -import * as moment from 'moment'; @Component({ selector: 'full-screen', templateUrl: './full-screen.component.html', @@ -14,6 +15,9 @@ export class FullScreenComponent implements OnInit { @ViewChild('fileSelect', { static: true }) fileSelect; isFullPage = false; isDragOver = false; + @Input() isReadOnly: boolean = false; + @Output() isReadOnlyChange: EventEmitter = new EventEmitter(); + @Input() allowReadOnly: boolean = false; @ViewChild('innerContainer') innerContainer: ElementRef; @ViewChild('content') content: ElementRef; @Output() fullPage: EventEmitter = new EventEmitter(); @@ -49,7 +53,7 @@ export class FullScreenComponent implements OnInit { event.stopPropagation(); this.isFullPage = false; this.innerContainer.nativeElement.appendChild(this.content.nativeElement); - Functions.emitWindowResize(); + emitWindowResize(); this.fullPage.emit(this.isFullPage); } onFullPage() { @@ -62,11 +66,11 @@ export class FullScreenComponent implements OnInit { } else { this.innerContainer.nativeElement.appendChild(ne); } - Functions.emitWindowResize(); + emitWindowResize(); this.fullPage.emit(this.isFullPage); } download() { - Functions.saveToFile(this.data.json, `${this.data.title} ${moment().format('YYYY-MM-DD HH:mm:ss')}.${this.data.type}`); + saveToFile(this.data.json, `${this.data.title} ${moment().format('YYYY-MM-DD HH:mm:ss')}.${this.data.type}`); } async upload(file) { if (!this.data) { diff --git a/src/app/components/controls/loki-results/moment.pipe.ts b/src/app/components/controls/loki-results/moment.pipe.ts index f1b07d2b..64e76474 100644 --- a/src/app/components/controls/loki-results/moment.pipe.ts +++ b/src/app/components/controls/loki-results/moment.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; +import moment from 'moment'; @Pipe({ name: 'moment', diff --git a/src/app/components/controls/modal-resizable/modal-resizable.component.html b/src/app/components/controls/modal-resizable/modal-resizable.component.html index 377e85e3..a4ae219e 100644 --- a/src/app/components/controls/modal-resizable/modal-resizable.component.html +++ b/src/app/components/controls/modal-resizable/modal-resizable.component.html @@ -1,81 +1,137 @@ -
-
+
- + + [ngStyle]="{ 'background': headerColor }" + (touchmove)="onStartMoveTouch($event)" + (mousedown)="onStartMove($event)" + (touchend)="resetTouch()" + > -
- -
-
{{ title }}
-
- + - -
- +
- - -
-
-
+
+ (mouseup)="afterResize()" + >
- - -
- - \ No newline at end of file + (close)="onWindowClose($event); onClose()" + #nativeWindow +> +
+ diff --git a/src/app/components/controls/modal-resizable/modal-resizable.component.scss b/src/app/components/controls/modal-resizable/modal-resizable.component.scss index c891624e..1e95f606 100644 --- a/src/app/components/controls/modal-resizable/modal-resizable.component.scss +++ b/src/app/components/controls/modal-resizable/modal-resizable.component.scss @@ -1,152 +1,316 @@ .on-top { - position: absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; - display: flex; - align-items: center; - justify-content: center; - width: 1px; - height: 1px; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + display: flex; + align-items: center; + justify-content: center; + width: 1px; + height: 1px; margin: auto; + // .active { width: 100vw; height: 100vh; } } + .detail-container { - position: relative; - min-width: 200px; - min-height: 200px; - width: 60vw; - border: solid 1px #ccc; - color: rgba(0, 0, 0, 0.87); - justify-content: center; - padding: 1.5rem; - overflow: hidden; - background: #fff; - border-radius: 8px; - z-index: 1; - opacity: 1; - // transition: all 0.3s; - box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), - 0 2px 2px 0 rgba(0, 0, 0, 0.14), - 0 1px 5px 0 rgba(0, 0, 0, 0.12); - .title { - cursor: move; - display: flex; - .toolbar-title { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - font-size:15px; - font-weight: bold; - } - div:first-child { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - div:last-child { - display: flex; - // min-width: 120px; - } - } - &:active { - box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), - 0 8px 10px 1px rgba(0, 0, 0, 0.14), - 0 3px 14px 2px rgba(0, 0, 0, 0.12); - } - &.full-page { - border: solid 0px #ccc; - border-radius: 0px; - min-width: 100vw !important; - width: 100vw !important; - min-height: 100vh !important; - transform: translate3d(0px, 0px, 0px) !important; - } - table { - width: 100%; - overflow: auto; - tr { - &:hover { - background-color: rgba(0, 0, 0, 0.12); - cursor: pointer; - } - } - } + position: relative; + min-width: 200px; + min-height: 200px; + width: 60vw; + height: 60vw; + border: solid 1px #ccc; + color: rgba(0, 0, 0, 0.87); + justify-content: center; + padding: 1.5rem; + overflow: visible; + background: #fff; + border-radius: 8px; + z-index: 1; + opacity: 1; + // transition: all 0.3s; + box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); + + .title { + cursor: move; + border-top-left-radius: 0.5rem; + border-top-right-radius: 0.5rem; + display: flex; + + .toolbar-title { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 15px; + font-weight: bold; + flex: 1; + + & > div { + display: flex; + justify-content: space-around; + flex-wrap: nowrap; + align-content: center; + align-items: center; + .diff-icon { + height: 25px; + width: 28px; + font-size: 28px; + } + } + } + + div { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } + + &:active { + box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), + 0 3px 14px 2px rgba(0, 0, 0, 0.12); + } + + &.full-page { + .title { + border-radius: 0px; + } + + border: solid 0px #ccc; + border-radius: 0px; + min-width: 100vw !important; + width: 100vw !important; + min-height: 100vh !important; + height: 100vh !important; + transform: translate3d(0px, 0px, 0px) !important; + } + + table { + width: 100%; + overflow: auto; + + tr { + &:hover { + background-color: rgba(0, 0, 0, 0.12); + cursor: pointer; + } + } + } } + .title { - margin: -1.5rem -1.5rem 0 -1.5rem; - width: initial !important; - display: flex; - justify-content: space-between; + margin: -1.5rem -1.5rem 0 -1.5rem; + width: initial !important; + display: flex; + justify-content: space-between; } + .inside-content { - position: absolute; - left: 0; - right: 0; - top: 45px; + position: absolute; + left: 0; + right: 0; + top: 45px; bottom: 0; z-index: -1; + + &.drag-layer { + display: flex; + justify-content: center; + align-items: center; + background-color: rgba(0, 0, 0, 0.2); + z-index: 1; + &.left { + width: 50%; + } + + &.right { + width: 50%; + margin-left: 50%; + } + + h1 { + padding: 2rem; + text-align: center; + color: #333; + } + } } + .animation-off { - transition: none; + transition: none; } + .resize { position: absolute; + // background-color: rgb(144 238 144 / 50%); - &.right { - width: 0.5rem; - right: -6px; - height: 100%; - top: 0; - cursor: ew-resize; - } - &.bottom { - bottom: -0.3rem; - height: 0.5rem; - width: 100%; - left: 0; - cursor: ns-resize; - } - &.left { - width: 0.5rem; - left: 0; - height: 100%; - top: 0; - cursor: ew-resize; - } - &.top { - top: 0; - height: 0.5rem; - width: 100%; - left: 0; - cursor: ns-resize; - } - &.corner { - width: 0.5rem; - height: 0.5rem; - cursor: nwse-resize; - &.tl { - top: 0; - left: 0; - } - &.tr { - top: 0; - right: 0; - cursor: nesw-resize; - } - &.bl { - bottom: 0; - left: 0; - cursor: nesw-resize; - } - &.br { - right: 0; - bottom: 0; - } - } + &.right { + width: 0.5rem; + right: -0.3rem; + height: 100%; + top: 0; + cursor: ew-resize; + } + + &.bottom { + bottom: -0.3rem; + height: 0.5rem; + width: 100%; + left: 0; + cursor: ns-resize; + } + + &.left { + width: 0.5rem; + left: 0; + height: 100%; + top: 0; + cursor: ew-resize; + } + + &.top { + top: 0; + height: 0.5rem; + width: 100%; + left: 0; + cursor: ns-resize; + } + + &.corner { + width: 1rem; + height: 1rem; + cursor: nwse-resize; + + &.tl { + top: 0; + left: 0; + } + + &.tr { + top: 0; + right: 0; + cursor: nesw-resize; + } + + &.bl { + bottom: 0; + left: 0; + cursor: nesw-resize; + } + + &.br { + right: 0; + bottom: 0; + } + } +} + +@media (any-pointer: coarse) { + .resize { + .corner { + --corner-size: 1.5rem; + width: var(--corner-size) !important; + height: var(--corner-size) !important; + background-color: red; + + &.tl { + top: calc(0px - var(--corner-size) / 2) !important; + left: calc(0px - var(--corner-size) / 2) !important; + } + + &.tr { + top: calc(0px - var(--corner-size) / 2) !important; + right: calc(0px - var(--corner-size) / 2) !important; + } + + &.bl { + bottom: calc(0px - var(--corner-size) / 2) !important; + left: calc(0px - var(--corner-size) / 2) !important; + } + + &.br { + right: calc(0px - var(--corner-size) / 2) !important; + bottom: calc(0px - var(--corner-size) / 2) !important; + } + } + + --side-size: 1rem; + + &.right { + width: var(--side-size); + right: -0.3rem; + height: 100%; + top: 0; + cursor: ew-resize; + } + + &.bottom { + bottom: -0.3rem; + height: var(--side-size); + width: 100%; + left: 0; + cursor: ns-resize; + } + + &.left { + width: var(--side-size); + left: 0; + height: 100%; + top: 0; + cursor: ew-resize; + } + + &.top { + top: 0; + height: var(--side-size); + width: 100%; + left: 0; + cursor: ns-resize; + } + } +} +@-webkit-keyframes spin { + /* Safari and Chrome */ + from { + -webkit-transform: rotate(0deg); + -o-transform: rotate(0deg); + transform: rotate(0deg); + } + to { + -webkit-transform: rotate(360deg); + -o-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@keyframes spin { + from { + -ms-transform: rotate(0deg); + -moz-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + -o-transform: rotate(0deg); + transform: rotate(0deg); + } + to { + -ms-transform: rotate(360deg); + -moz-transform: rotate(360deg); + -webkit-transform: rotate(360deg); + -o-transform: rotate(360deg); + transform: rotate(360deg); + } +} + +.loading-anim { + cursor: wait !important; + animation: spin 1.5s linear infinite !important; + &:disabled { + color: unset; + } +} +.transparent { + opacity: 0; } diff --git a/src/app/components/controls/modal-resizable/modal-resizable.component.ts b/src/app/components/controls/modal-resizable/modal-resizable.component.ts index dffd9b76..fbee2780 100644 --- a/src/app/components/controls/modal-resizable/modal-resizable.component.ts +++ b/src/app/components/controls/modal-resizable/modal-resizable.component.ts @@ -1,20 +1,15 @@ -import { Functions } from '@app/helpers/functions'; -import { MessageDetailsService } from '../../../services/message-details.service'; -import { ChangeDetectorRef, SimpleChanges } from '@angular/core'; import { - Component, - OnInit, - ViewChild, - Output, - EventEmitter, - HostListener, - AfterViewInit, - Input, - OnDestroy, - ChangeDetectionStrategy + AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, + HostListener, Input, + OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; +import { emitWindowResize } from '@app/helpers/windowFunctions'; import { WindowService } from '@app/services/window.service'; -import * as moment from 'moment'; +import moment from 'moment'; +import { MessageDetailsService } from '../../../services/message-details.service'; +import { ModalCoordinates, defaultX, defaultY, TouchPosition, WinPositon, WinSize } from './modal-resizable.model'; +import { IS_DIFF, ModalService } from './modal.service'; + @Component({ selector: 'app-modal-resizable', templateUrl: './modal-resizable.component.html', @@ -30,8 +25,8 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy @ViewChild('layerZIndex', { static: false }) layerZIndex; @ViewChild('containerWindow', { static: false }) containerWindow; @ViewChild('inWindow', { static: false }) inWindow; + @ViewChild('nativeWindow', { static: false }) nativeWindow; @ViewChild('outWindow', { static: false }) outWindow; - @Input() set isNonWindow(bool: boolean) { this._isNonWindow = bool; @@ -54,10 +49,31 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy }; get objectData(): any { return this._objectData; + }; + + _title: string; + @Input() set title(val: string) { + this._title = val; + requestAnimationFrame(() => { + this.onFocus(); + }) } - @Input() title: string; + get title(): string { + return this._title; + }; + + _title2: string; + @Input() set title2(val: string) { + this._title2 = val; + requestAnimationFrame(() => { + this.onFocus(); + }) + } + get title2(): string { + return this._title2; + }; @Input() id: string; - @Input() set headerColor (val: string) { + @Input() set headerColor(val: string) { this._headerColor = val; this.cdr.detectChanges(); }; @@ -73,47 +89,165 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy @Input() isBrowserWindow = false; @Input() startZIndex = 0; @Input() isOutsideButton = false; + @Input() isRefreshButton = false; + _isRefreshing = false; + @Input() set isRefreshing(val: boolean) { + this._isRefreshing = val; + this.cdr.detectChanges(); + } + get isRefreshing(): boolean { + return this._isRefreshing; + } + @Input() isLoaded = false; + @Input() isDiffEvent = false; + @Input() isDiffDoubleEvent = false; + @Input() set arrowMetaData(val: any) { this._arrowMetaData = val; } get arrowMetaData(): any { return this._arrowMetaData; } + escTimeout: any; @Output() close: EventEmitter = new EventEmitter(); @Output() browserWindow: EventEmitter = new EventEmitter(); + @Output() refreshButton: EventEmitter = new EventEmitter(); + @Output() diff: EventEmitter = new EventEmitter(); + _coordinates: ModalCoordinates = { + x: defaultX, + y: defaultY, + width: 0, + height: 0, + isFullPage: false + } + @Input() set coordinates(val: ModalCoordinates) { + if (typeof this._coordinates === 'undefined' || (this._coordinates.x === defaultX && this._coordinates.y === defaultY)) { + this.setModalPosition(val.x, val.y); + this.mouseEventData = undefined; + } else { + this.coordinatesChange.emit(val) + } + this._coordinates = val; + } + get coordinates(): ModalCoordinates { + return this._coordinates; + } + @Output() coordinatesChange: EventEmitter = new EventEmitter() __isBrowserWindow = false; - isFullPage = false; - + @Input() isFullPage = false; + isDropLayer = false; + isDropRight = false; + isDropLeft = false; + touchPosition: TouchPosition = null; + winPosition: WinPositon = null; + winSize: WinSize = null; + isOpacity = false; + coordinatesTimeout: any; constructor( private messageDetailsService: MessageDetailsService, private cdr: ChangeDetectorRef, - private windowService: WindowService + private windowService: WindowService, + private modalService: ModalService ) { this.cdr.detach(); } - ngOnInit() { + if (this.isDiffDoubleEvent) { + this.id = IS_DIFF; + } this.windowService.windowList.set(this.id, moment().unix()) this.cdr.detectChanges(); } - ngOnChanges(change: SimpleChanges) { - // console.log(change) - } - onFullPage() { - this.isFullPage = !this.isFullPage; + onFullPage(fullPage?: boolean) { + this.isFullPage = typeof fullPage === 'boolean' ? fullPage : !this.isFullPage; + this.coordinates.isFullPage = this.isFullPage; + this.coordinatesChange.emit(this.coordinates); setTimeout(() => { - Functions.emitWindowResize(); + emitWindowResize(); this.cdr.detectChanges(); }, 35); } - @HostListener('document:keydown.escape', ['$event']) onKeydownHandler(event: KeyboardEvent) { + @HostListener('document:keydown.escape', ['$event']) + onKeydownHandler(event: KeyboardEvent) { event.preventDefault(); event.stopPropagation(); this.onClose(); } + + diffLayerOff() { + this.isDropRight = false; + this.isDropLeft = false; + } + + @HostListener("document:mousemove", ["$event"]) + async onDragOver(evt) { + const m = this.modalService; + + if (this.isDragging && this.isOpacity !== m.getOpacity) { + this.isOpacity = m.getOpacity; + this.cdr.detectChanges(); + } + + if (this.isDragging || evt.buttons === 0) { + if (this.isDropLayer !== false) { + this.isDropLayer = false; + this.diffLayerOff(); + m.setDropLayer(false, this.id, null, this.isDropLeft, this.isDropRight); + evt.preventDefault(); + this.cdr.detectChanges(); + } + return; + } + if (!m.isDragging()) { + return; + } + if (!(this.isDiffEvent || this.isDiffDoubleEvent)) { + return; + } + evt.preventDefault(); + const { x, y, w, h } = this.getTranslatePosition(this.containerWindow.nativeElement, false); + const { pageX: X, pageY: Y } = evt; + + // console.log('onDragOver::ID', this.id); + if ( + x <= X && x + w >= X && + y <= Y && y + h >= Y + ) { + if (this.isDiffDoubleEvent) { + const ll = X - x; + const rr = (x + w) - X; + this.isDropRight = rr < ll; + this.isDropLeft = rr > ll; + // console.log({ rr, ll }); + } + if (this.isDiffDoubleEvent || this.isDropLayer !== true) { + m.setDropLayer(true, this.id, this._zindex, this.isDropLeft, this.isDropRight); + this.isDropLayer = m.checkZIndex(this.id); + if (!this.isDropLayer) { + m.setDropLayer(false, this.id, null, this.isDropLeft, this.isDropRight); + this.diffLayerOff(); + } + + } else if (this.isDropLayer && !m.checkZIndex(this.id)) { + this.isDropLayer = false; + m.setDropLayer(false, this.id, null, this.isDropLeft, this.isDropRight); + m.checkZIndex(this.id); + this.diffLayerOff(); + } + } else { + if (this.isDropLayer !== false) { + m.setDropLayer(false, this.id, null, this.isDropLeft, this.isDropRight); + this.isDropLayer = m.checkZIndex(this.id); + } + this.diffLayerOff(); + m.removeActive(this.id); + } + this.cdr.detectChanges(); + } + ngAfterViewInit() { /* attache window to native document.body */ document.body.appendChild(this.layerZIndex.nativeElement); @@ -126,8 +260,8 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy (s => { s.minWidth = ceil(min(maxWidth, max(this.minWidth, this.width))) + 'px'; s.minHeight = ceil(min(maxHeight, max(this.minHeight, this.height))) + 'px'; - // s.width = ceil(min(this.width, maxWidth)) + 'px'; - // s.height = ceil(min(this.height, maxHeight)) + 'px'; + s.width = ceil(min(this.width, maxWidth)) + 'px'; + s.height = ceil(min(this.height, maxHeight)) + 'px'; })(this.containerWindow.nativeElement.style); if (this.mouseEventData) { @@ -138,7 +272,7 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy }); this.mouseEventData.focus = () => this.onFocus(); } - this.onFocus(); + this.onFocus(true); if (this.isBrowserWindow) { this.newWindow(); } @@ -154,8 +288,7 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy positionLocal.y -= positionGlobal.top; positionLocal.x = ceil(positionLocal.x + x); positionLocal.y = ceil(positionLocal.y + y); - - el.style.transform = `translate3d(${positionLocal.x}px, ${positionLocal.y}px, 0px)`; + this.setModalPosition(positionLocal.x, positionLocal.y) } onClose() { if (this.id === this.windowService.currentWindow) { @@ -164,20 +297,18 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy this.cdr.detectChanges(); } } - - onFocus() { - if(this.windowService.currentWindow !== this.id) { + onFocus(isInit = false) { + if (this.windowService.currentWindow !== this.id || isInit) { this.windowService.currentWindow = this.id; - this.windowService.windowList.set(this.id,moment().unix()); + this.windowService.windowList.set(this.id, moment().unix()); this.layerZIndex.nativeElement.style.zIndex = '' + ((ModalResizableComponent.ZIndex += 2) + this.startZIndex); - - if (this.outWindow?.onFocus) { - this.outWindow.onFocus(); - this.cdr.detectChanges(); - } + this.nativeWindow.onFocus(); + this.cdr.detectChanges(); } } - + get _zindex() { + return +this.layerZIndex.nativeElement.style.zIndex + } onResize(event: any, controlName: string) { const { min, ceil } = Math; this._noLayout = false; @@ -214,47 +345,126 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy this.containerWindow.nativeElement.style.minWidth = size.w + 'px'; } if (vv !== 0) { - const cY = ceil(Math[(vv > 0) ? 'max' : 'min'](y0 + vv * (this.minHeight - winHeight), evt.clientY)); + const cY = ceil(Math[(vv > 0) ? 'max' : 'min'](y0 + vv * (this.minHeight - winHeight + 200) , evt.clientY)); size.h = ceil(winHeight + vv * (cY - y0)); position.y = ceil(winPosition.y + (cY - y0) / 2); this.containerWindow.nativeElement.style.minHeight = size.h + 'px'; } - this.containerWindow.nativeElement.style.transform = `translate3d(${position.x}px, ${position.y}px, 0px)`; + this.setModalPosition(position.x, position.y) - Functions.emitWindowResize(); + emitWindowResize(); }; window.document.body.onmouseleave = window.document.body.onmouseup = () => { this.containerWindow.nativeElement.classList.remove('animation-off'); this.setMouseLayer(false); - Functions.emitWindowResize(); + emitWindowResize(); + setTimeout(() => { + + const winWidth = ceil(this.containerWindow.nativeElement.offsetWidth); + const winHeight = ceil(this.containerWindow.nativeElement.offsetHeight); + this.coordinates.height = winHeight; + this.coordinates.width = winWidth; + this.coordinates.x = position.x; + this.coordinates.y = position.y; + this.coordinatesChange.emit(this.coordinates); + }, 10); window.document.body.onmouseleave = null; window.document.body.onmousemove = null; window.document.body.onmouseup = null; }; } + onResizeTouch(event: TouchEvent, controlName: string) { + event.preventDefault() + const { min, ceil } = Math; + this._noLayout = false; + this.setMouseLayer(true); + if (this.touchPosition === null) { + this.touchPosition = { + x: ceil(event.targetTouches[0].clientX), + y: ceil(event.targetTouches[0].clientY) + } + } + if (this.winPosition === null) { + this.winPosition = this.getTranslatePosition(this.containerWindow.nativeElement); + this.winPosition.h = ceil(this.containerWindow.nativeElement.offsetHeight); + } + if (this.winSize === null) { + this.winSize = { + width: ceil(this.containerWindow.nativeElement.offsetWidth), + height: ceil(this.containerWindow.nativeElement.offsetHeight) + } + } + this.containerWindow.nativeElement.classList.add('animation-off'); + const vector = { + left: { h: -1, v: 0 }, + right: { h: 1, v: 0 }, + bottom: { h: 0, v: 1 }, + top: { h: 0, v: -1 }, + tl: { h: -1, v: -1 }, + tr: { h: 1, v: -1 }, + bl: { h: -1, v: 1 }, + br: { h: 1, v: 1 }, + }; + + const size = { w: 0, h: 0 }, + vh = vector[controlName].h, + vv = vector[controlName].v, + position = { x: this.winPosition.x, y: this.winPosition.y }; + if (vh !== 0) { + const cX = ceil(Math[(vh > 0) ? 'max' : 'min'](this.touchPosition.x + vh * (this.minWidth - this.winSize.width), event.targetTouches[0].clientX)); + size.w = ceil(this.winSize.width + vh * (cX - this.touchPosition.x)); + position.x = ceil(this.winPosition.x + (cX - this.touchPosition.x) / 2); + this.containerWindow.nativeElement.style.minWidth = size.w + 'px'; + } + if (vv !== 0) { + const cY = ceil(Math[(vv > 0) ? 'max' : 'min'](this.touchPosition.y + vv * (this.minHeight - this.winSize.height), event.targetTouches[0].clientY)); + size.h = ceil(this.winSize.height + vv * (cY - this.touchPosition.y)); + position.y = ceil(this.winPosition.y + (cY - this.touchPosition.y) / 2); + this.containerWindow.nativeElement.style.minHeight = size.h + 'px'; + } + + this.setModalPosition(position.x, position.y) + + emitWindowResize(); + } afterResize() { this._noLayout = true; - Functions.emitWindowResize(); + emitWindowResize(); } - private getTranslatePosition(el): any { + private getTranslatePosition(el, isFromCenterOfScreen = true): any { const { ceil } = Math; const style = window.getComputedStyle(el); const matrix = new WebKitCSSMatrix(style['webkitTransform']); - return { x: ceil(matrix.m41), y: ceil(matrix.m42) }; + const { offsetWidth: winWidth, offsetHeight: winHeight } = el; + const { innerWidth: screenWidth, innerHeight: screenHeight } = window; + if (isFromCenterOfScreen) { + return { + x: ceil(matrix.m41), + y: ceil(matrix.m42), + w: ceil(winWidth), + h: ceil(winHeight) + }; + } else { + return { + x: ceil(matrix.m41 + ((screenWidth - winWidth) / 2)), + y: ceil(matrix.m42 + ((screenHeight - winHeight) / 2)), + w: ceil(winWidth), + h: ceil(winHeight) + }; + } } onStartMove(event) { const { max, ceil } = Math; const x0 = ceil(event.clientX); const y0 = ceil(event.clientY); - const winPosition = this.getTranslatePosition(this.containerWindow.nativeElement); - winPosition.h = ceil(this.containerWindow.nativeElement.offsetHeight); + const winPosition = this.getTranslatePosition(this.containerWindow.nativeElement);; - const documentHeigth = ceil(document.body.offsetHeight); - const top0px = ceil((documentHeigth - winPosition.h) / -2); + const documentHeight = ceil(max(window.innerHeight, document.body.offsetHeight)); + const top0px = ceil((documentHeight - winPosition.h) / -2); this.containerWindow.nativeElement.classList.add('animation-off'); this.layerZIndex.nativeElement.classList.add('active'); @@ -262,8 +472,15 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy window.document.body.onmousemove = evt => { this.setMouseLayer(true); const xMove = ceil(winPosition.x + (evt.clientX - x0)); - const yMove = ceil(Math.max(top0px, winPosition.y + (evt.clientY - y0))); - this.containerWindow.nativeElement.style.transform = `translate3d(${xMove}px, ${yMove}px, 0px)`; + const yMove = ceil(max(top0px, winPosition.y + (evt.clientY - y0))); + this.setModalPosition(xMove, yMove) + if (this.coordinatesTimeout) { + clearTimeout(this.coordinatesTimeout); + } + this.coordinatesTimeout = setTimeout(() => { + this.coordinates.x = xMove; + this.coordinates.y = yMove + }, 20); }; window.document.body.onmouseleave = window.document.body.onmouseup = () => { @@ -275,7 +492,38 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy window.document.body.onmouseup = null; }; } - + setModalPosition(xMove: number, yMove: number) { + this.containerWindow.nativeElement.style.transform = `translate3d(${xMove}px, ${yMove}px, 0px)`; + } + onStartMoveTouch(event: TouchEvent) { + const { max, ceil } = Math; + if (this.touchPosition === null) { + this.touchPosition = { + x: ceil(event.targetTouches[0].clientX), + y: ceil(event.targetTouches[0].clientY) + } + } + if (this.winPosition === null) { + this.winPosition = this.getTranslatePosition(this.containerWindow.nativeElement); + this.winPosition.h = ceil(this.containerWindow.nativeElement.offsetHeight); + } + const documentHeight = ceil(max(window.innerHeight, document.body.offsetHeight)); + const top0px = ceil((documentHeight - this.winPosition.h) / -2); + this.containerWindow.nativeElement.classList.add('animation-off'); + this.layerZIndex.nativeElement.classList.add('active'); + this.setMouseLayer(true); + const xMove = ceil(this.winPosition.x + (event.targetTouches[0].clientX - this.touchPosition.x)); + const yMove = ceil(Math.max(top0px, this.winPosition.y + (event.targetTouches[0].clientY - this.touchPosition.y))); + this.setModalPosition(xMove, yMove) + } + resetTouch() { + this.containerWindow.nativeElement.classList.remove('animation-off'); + this.layerZIndex.nativeElement.classList.remove('active'); + this.setMouseLayer(false); + this.touchPosition = null; + this.winPosition = null; + this.winSize = null; + } onWindowClose(event: any) { this._content.appendChild(this.inWindow.nativeElement); this.browserWindow.emit(false); @@ -284,7 +532,20 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy this.cdr.detectChanges(); }, 5); } + isDragging = false; setMouseLayer(bool: boolean = true) { + this.isDragging = bool; + if (bool) { + this.modalService.setDraggingId(this.id); + } else { + const pairOfDiff: any[] = this.modalService.getPair(); + if (pairOfDiff?.length >= 2 && this.id) { + // console.log('getPair emitted from id', this.id); + this.diff.emit(pairOfDiff) + } + this.modalService.removeDraggingId(); + } + this.cdr.detectChanges(); let _layer: any = document.querySelector('.mouse-layer'); if (!_layer) { _layer = document.createElement('div'); @@ -318,9 +579,21 @@ export class ModalResizableComponent implements OnInit, AfterViewInit, OnDestroy } ngOnDestroy() { document.body.removeChild(this.layerZIndex.nativeElement); - this.windowService.close(this.id) + clearTimeout(this.escTimeout); + clearTimeout(this.coordinatesTimeout); + this.windowService.close(this.id); } onWheel($event) { return; } + refresh(e: MouseEvent) { + e.stopPropagation(); + this.coordinatesChange.emit(this.coordinates); + this.refreshButton.emit(true); + } + setHeight(height){ + this.height = height + 45; // 45 - is header + this.ngAfterViewInit(); + this.cdr.detectChanges(); + } } diff --git a/src/app/components/controls/modal-resizable/modal-resizable.model.ts b/src/app/components/controls/modal-resizable/modal-resizable.model.ts new file mode 100644 index 00000000..17f102f1 --- /dev/null +++ b/src/app/components/controls/modal-resizable/modal-resizable.model.ts @@ -0,0 +1,29 @@ +export interface TouchPosition { + x: number, + y: number +} +export interface WinSize { + height: number, + width: number +} +export interface WinPositon { + x: number, + y: number, + h: number +} + +export interface ModalCoordinates { + x: number; + y: number; + width: number; + height: number; + isFullPage: boolean; +} +export interface DetailDialogStateModel { + modal: ModalCoordinates; + tab: string; +} +export const defaultX = 23; +export const defaultY = 9; +export const defaultWidth = 1400; +export const defaultHeight = 600; \ No newline at end of file diff --git a/src/app/components/controls/modal-resizable/modal-resizable.module.ts b/src/app/components/controls/modal-resizable/modal-resizable.module.ts index cfc5949f..18e4e8e0 100644 --- a/src/app/components/controls/modal-resizable/modal-resizable.module.ts +++ b/src/app/components/controls/modal-resizable/modal-resizable.module.ts @@ -3,14 +3,16 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ModalResizableComponent } from './modal-resizable.component'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import {PortalModule} from '@angular/cdk/portal'; +import { PortalModule } from '@angular/cdk/portal'; import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { fas } from '@fortawesome/free-solid-svg-icons'; import { fab } from '@fortawesome/free-brands-svg-icons'; import { far } from '@fortawesome/free-regular-svg-icons'; +import { MatButtonModule } from '@angular/material/button'; +// import { ModalService } from './modal.service'; + @NgModule({ imports: [ CommonModule, @@ -25,7 +27,8 @@ import { far } from '@fortawesome/free-regular-svg-icons'; WindowComponent ], exports: [ModalResizableComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + schemas: [CUSTOM_ELEMENTS_SCHEMA], + // providers: [ModalService] }) export class ModalResizableModule { constructor(library: FaIconLibrary) { diff --git a/src/app/components/controls/modal-resizable/modal.service.ts b/src/app/components/controls/modal-resizable/modal.service.ts new file mode 100644 index 00000000..44c6ba21 --- /dev/null +++ b/src/app/components/controls/modal-resizable/modal.service.ts @@ -0,0 +1,77 @@ +import { Injectable } from '@angular/core'; + +export const IS_DIFF = 'isDiff'; +export const IS_DIFF_RIGHT = 'isDiff-right'; +export const IS_DIFF_LEFT = 'isDiff-left'; + +// @Injectable() +@Injectable({ providedIn: 'root' }) +export class ModalService { + items: any[] = []; + _activeZIndex: any[] = []; + draggingId: string | number | null; + diffWindowRair: any[] = []; + isDiffWindow: any; + getOpacity: boolean = false; + + setDropLayer(bool: boolean, id: string | number, zIndex = 0, isDropLeft = false, isDropRight = false) { + if (id == IS_DIFF) { + const isDiffPosition = ((isDropLeft && IS_DIFF_LEFT) || (isDropRight && IS_DIFF_RIGHT)); + this.isDiffWindow = bool ? isDiffPosition : null; + } + + if (bool) { + this.items[id] = bool; + this.setActive(id, zIndex) + } else { + delete this.items[id]; + this.removeActive(id) + } + let b; + b = Object.values(this.items) + .reduce((a, b) => a = a || b, false); + + this.getOpacity = this.draggingId !== IS_DIFF && b; + } + checkZIndex(id) { + if (this.draggingId === IS_DIFF) { + return false; + } + const max = Math.max(...Object.values(this._activeZIndex), 0); + return this._activeZIndex[id] >= max; + } + setActive(id, zIndex) { + this._activeZIndex[id] = zIndex; + } + removeActive(id) { + if (id === IS_DIFF) { + this.isDiffWindow = null; + } + delete this._activeZIndex[id]; + + } + setDraggingId(id) { + this.draggingId = id; + } + removeDraggingId() { + this.draggingId = null; + } + isDragging() { + return this.draggingId != null; + } + getPair() { + let firstItem = this.draggingId; + let [secondItem] = [...Object.keys(this._activeZIndex).filter(i => this.checkZIndex(i))]; + + const pair = [firstItem, secondItem]; + + switch (this.isDiffWindow) { + case IS_DIFF_RIGHT: + return [firstItem, null]; + + case IS_DIFF_LEFT: + return [null, firstItem]; + } + return pair.filter(i => !!i); + } +} diff --git a/src/app/components/controls/modal-resizable/window/window.component.ts b/src/app/components/controls/modal-resizable/window/window.component.ts index 39b6c00f..ec387cbc 100644 --- a/src/app/components/controls/modal-resizable/window/window.component.ts +++ b/src/app/components/controls/modal-resizable/window/window.component.ts @@ -1,196 +1,201 @@ import { WindowService } from './window.service'; import { - EventEmitter, - Component, - ViewChild, - OnDestroy, - OnInit, - Output, - Input, - ChangeDetectionStrategy, - ElementRef, - ChangeDetectorRef, - SimpleChanges + EventEmitter, + Component, + ViewChild, + OnDestroy, + OnInit, + Output, + Input, + ChangeDetectionStrategy, + ElementRef, + ChangeDetectorRef, + SimpleChanges } from '@angular/core'; @Component({ - selector: 'app-window', - templateUrl: './window.component.html', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-window', + templateUrl: './window.component.html', + changeDetection: ChangeDetectionStrategy.OnPush }) export class WindowComponent implements OnInit, OnDestroy { - @ViewChild('content', { static: false }) content: ElementRef; - - @Input() width = 700; - @Input() height = 600; - @Input() minWidth = 300; - @Input() minHeight = 300; - @Input() sharedUrl: string; - @Input() objectData: any; - winId: string; - _isWindow = false; - watcherInterval; - get isWindow() { - return this._isWindow; + @ViewChild('content', { static: false }) content: ElementRef; + + @Input() width = 700; + @Input() height = 600; + @Input() minWidth = 300; + @Input() minHeight = 300; + @Input() sharedUrl: string; + @Input() objectData: any; + winId: string; + _isWindow = false; + watcherInterval; + get isWindow() { + return this._isWindow; + } + + @Input() + set isWindow(val: boolean) { + this._isWindow = val; + if (this._isWindow) { + this.setWindow(); } - - @Input() - set isWindow(val: boolean) { - this._isWindow = val; - if (this._isWindow) { - this.setWindow(); - } + } + + @Output() close: EventEmitter = new EventEmitter(); + + private externalWindow = null; + + constructor( + private windowService: WindowService, + private cdr: ChangeDetectorRef + ) { + this.winId = `win-id-${Math.random()}`; + } + ngOnChanges(change: SimpleChanges) { + } + ngOnInit() { + if (this._isWindow) { + this.setWindow(); + this.cdr.detectChanges(); } + } + openWindow() { + const left = (screen.width - this.width) / 2; + const top = (screen.height - this.height) / 4; + return window.open(this.sharedUrl || '', this.winId, + `toolbar=no, + location=no, + directories=no, + status=no, + menubar=no, + scrollbars=no, + resizable=no, + copyhistory=no, + width=${this.width}, + height=${this.height}, + top=${top}, + left=${left}` + ); + } + setWindow() { + + this.externalWindow = this.openWindow(); + try { + this.externalWindow.onbeforeunload = evt => { + evt.preventDefault(); + evt.returnValue = ''; + setTimeout(() => { + + this._isWindow = false; + this.close.emit({}); + this.cdr.detectChanges(); - @Output() close: EventEmitter = new EventEmitter(); + }) + }; + } catch (e) { + this._isWindow = false; + this.close.emit({}); + this.cdr.detectChanges(); + } - private externalWindow = null; + if (this.sharedUrl) { + // (this.objectData) + this.externalWindow['objectData'] = this.objectData; + if (!window['windowCollection']) { + window['windowCollection'] = {}; + } + window['windowCollection'][this.winId] = this.externalWindow; + this.externalWindow.onload = e => { + this.externalWindow.onbeforeunload = evt => { + evt.preventDefault(); + evt.returnValue = ''; + setTimeout(() => { - constructor( - private windowService: WindowService, - private cdr: ChangeDetectorRef - ) { - this.winId = `win-id-${Math.random()}`; - } - ngOnChanges(change: SimpleChanges) { - // console.log(change) - } - ngOnInit() { - if (this._isWindow) { - this.setWindow(); - this.cdr.detectChanges(); - } - } - openWindow() { - const left = (screen.width - this.width) / 2; - const top = (screen.height - this.height) / 4; - console.log(this.sharedUrl) - return window.open(this.sharedUrl || '', this.winId, - `toolbar=no, - location=no, - directories=no, - status=no, - menubar=no, - scrollbars=no, - resizable=no, - copyhistory=no, - width=${this.width}, - height=${this.height}, - top=${top}, - left=${left}` - ); - } - setWindow() { - - this.externalWindow = this.openWindow(); - try { - this.externalWindow.onbeforeunload = evt => { - evt.preventDefault(); - evt.returnValue = ''; - setTimeout(() => { - - this._isWindow = false; - this.close.emit({}); - this.cdr.detectChanges(); - - }) - }; - } catch (e) { this._isWindow = false; this.close.emit({}); this.cdr.detectChanges(); - } - - if (this.sharedUrl) { - console.log(this.objectData) - this.externalWindow['objectData'] = this.objectData; - this.externalWindow.onload = e => { - this.externalWindow.onbeforeunload = evt => { - evt.preventDefault(); - evt.returnValue = ''; - setTimeout(() => { - - this._isWindow = false; - this.close.emit({}); - this.cdr.detectChanges(); - - }) - }; - }; - this.cdr.detectChanges(); - return; - } - const doc = this.externalWindow.document; - doc.head.innerHTML = window.document.head.innerHTML; - doc.body.appendChild(this.content.nativeElement); - doc.body.id = this.winId; // `win-id-${Math.random()}`; + }) + }; + }; + this.cdr.detectChanges(); + return; + } - // add scripts from base project - Array.from(window.document.body.getElementsByTagName('script')).forEach(s => { - doc.body.appendChild(s); - }); + const doc = this.externalWindow.document; + doc.head.innerHTML = window.document.head.innerHTML; + doc.body.appendChild(this.content.nativeElement); + doc.body.id = this.winId; // `win-id-${Math.random()}`; - /** - * add styles - */ + // add scripts from base project + Array.from(window.document.body.getElementsByTagName('script')).forEach(s => { + doc.body.appendChild(s); + }); - doc.head.appendChild(this.getStyleSheetElement()); + /** + * add styles + */ - this.resetStyles(doc); + doc.head.appendChild(this.getStyleSheetElement()); - const getStyleBuffer = () => Array.from(document.querySelectorAll('style')).map(i => i.innerHTML).join(''); - let styleBuffer = getStyleBuffer(); + this.resetStyles(doc); - doc.body.addEventListener('mousemove', evt => { - this.windowService.setMousePosition(evt); - }) - /** - * realtime watcher for styling changes - */ - this.watcherInterval = setInterval(() => { - if (styleBuffer !== getStyleBuffer()) { - this.resetStyles(doc); - styleBuffer = getStyleBuffer(); - } - }, 50); - } - private getStyleSheetElement() { - const styleSheetElement = document.createElement('link'); - document.querySelectorAll('link').forEach(htmlElement => { - if (htmlElement.rel === 'stylesheet') { - const absoluteUrl = new URL(htmlElement.href).href; - styleSheetElement.rel = 'stylesheet'; - styleSheetElement.href = absoluteUrl; - } - }); - return styleSheetElement; - } - public onFocus() { - this.externalWindow?.focus(); - } - private resetStyles(doc) { - // clear old styles - doc.querySelectorAll('style').forEach(el => { - const parent = el.parentElement; - parent.removeChild(el); - }) + const getStyleBuffer = () => Array.from(document.querySelectorAll('style')).map(i => i.innerHTML).join(''); + let styleBuffer = getStyleBuffer(); - // Copy styles from parent window - document.querySelectorAll('style').forEach(htmlElement => { - doc.head.appendChild(htmlElement.cloneNode(true)); - }); + doc.body.addEventListener('mousemove', evt => { + this.windowService.setMousePosition(evt); + }) + /** + * realtime watcher for styling changes + */ + this.watcherInterval = setInterval(() => { + if (styleBuffer !== getStyleBuffer()) { + this.resetStyles(doc); + styleBuffer = getStyleBuffer(); + } + }, 50); + } + private getStyleSheetElement() { + const styleSheetElement = document.createElement('link'); + document.querySelectorAll('link').forEach(htmlElement => { + if (htmlElement.rel === 'stylesheet') { + const absoluteUrl = new URL(htmlElement.href).href; + styleSheetElement.rel = 'stylesheet'; + styleSheetElement.href = absoluteUrl; + } + }); + return styleSheetElement; + } + public onFocus() { + if (this.externalWindow?.focus) { + this.externalWindow?.focus(); + } else { + window.focus(); } - - ngOnDestroy() { - // console.log(this.winId, 'ngOnDestroy()'); - if (this.externalWindow) { - this.externalWindow.close(); - this.close.emit({}); - this.cdr.detectChanges(); - } - if (this.watcherInterval) { - clearInterval(this.watcherInterval); - } + } + private resetStyles(doc) { + // clear old styles + doc.querySelectorAll('style').forEach(el => { + const parent = el.parentElement; + parent.removeChild(el); + }) + + // Copy styles from parent window + document.querySelectorAll('style').forEach(htmlElement => { + doc.head.appendChild(htmlElement.cloneNode(true)); + }); + } + + ngOnDestroy() { + if (this.externalWindow) { + this.externalWindow.close(); + this.close.emit({}); + this.cdr.detectChanges(); + } + if (this.watcherInterval) { + clearInterval(this.watcherInterval); } + } } diff --git a/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.html b/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.html index e7e24ba9..878c627a 100644 --- a/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.html +++ b/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.html @@ -20,17 +20,17 @@ Repulsion + + >
@@ -50,7 +50,7 @@ [min]='0' [(ngModel)]="options?.physics.maxVelocity" (ngModelChange)="changeOptions()" - > + >
@@ -63,7 +63,7 @@ [min]='0' [(ngModel)]="options?.physics.minVelocity" (ngModelChange)="changeOptions()" - > + >
diff --git a/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.scss b/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.scss index a5ef13b8..73b5b9fb 100644 --- a/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.scss +++ b/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.scss @@ -83,6 +83,8 @@ font-size: .8em !important; } } +/* TODO(mdc-migration): The following rule targets internal classes of slider that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of slider that may no longer apply for the MDC version. */ ::ng-deep .mat-slider-min-value.mat-slider-thumb-label-showing .mat-slider-thumb, .mat-slider-min-value.mat-slider-thumb-label-showing .mat-slider-thumb-label { background-color: hsla(0, 0%, 0%, 0.26); } \ No newline at end of file diff --git a/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.ts b/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.ts index 63d529ab..20f38f0f 100644 --- a/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.ts +++ b/src/app/components/controls/transaction-graph-settings/transaction-graph-settings.component.ts @@ -15,7 +15,7 @@ export class TransactionGraphSettingsComponent implements OnInit { isLSSet = false; @Input() set options(value) { this._options = value; - + const ls = Functions.JSON_parse(localStorage.getItem(UserConstValue.GRAPH_SETTINGS)); if (ls !== null && typeof value !== 'undefined' && !this.isLSSet) { setTimeout(() => { @@ -35,7 +35,7 @@ export class TransactionGraphSettingsComponent implements OnInit { get options() { return this._options; } - + @Output() optionsChanged = new EventEmitter(); isInfoOpened = false; constructor( @@ -47,7 +47,7 @@ export class TransactionGraphSettingsComponent implements OnInit { } ngOnInit(): void { - + } openInfo() { @@ -64,7 +64,7 @@ export class TransactionGraphSettingsComponent implements OnInit { this.isInfoOpened = false; this.cdr.detectChanges(); } - formatLabel(value: number) { + formatLabel(value: number): any { const percent = Math.round(Math.abs(value) / Math.abs(-50000) * 100); return percent; } diff --git a/src/app/components/controls/transaction-info/transaction-info.component.ts b/src/app/components/controls/transaction-info/transaction-info.component.ts index 7685004e..17a60e99 100644 --- a/src/app/components/controls/transaction-info/transaction-info.component.ts +++ b/src/app/components/controls/transaction-info/transaction-info.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectorRef, Input, HostListener, ViewChild, ElementRef, OnInit } from '@angular/core'; import { Functions } from '@app/helpers/functions'; -import * as moment from 'moment'; +import moment from 'moment'; import { TranslateService } from '@ngx-translate/core' export interface CallIdData { callid: string; diff --git a/src/app/components/controls/webshark/webshark.component.scss b/src/app/components/controls/webshark/webshark.component.scss index 752a780e..13ad688f 100644 --- a/src/app/components/controls/webshark/webshark.component.scss +++ b/src/app/components/controls/webshark/webshark.component.scss @@ -24,8 +24,8 @@ height: 30px !important; } -:host ::ng-deep table.this-table th.mat-header-cell, -:host ::ng-deep table.this-table td.mat-cell { +:host ::ng-deep table.this-table th.mat-mdc-header-cell, +:host ::ng-deep table.this-table td.mat-mdc-cell { padding: 0 5px !important; } @@ -80,4 +80,4 @@ // } } } -} \ No newline at end of file +} diff --git a/src/app/components/controls/webshark/webshark.component.ts b/src/app/components/controls/webshark/webshark.component.ts index 9bf528a2..2139fe04 100644 --- a/src/app/components/controls/webshark/webshark.component.ts +++ b/src/app/components/controls/webshark/webshark.component.ts @@ -6,7 +6,7 @@ import { Input, ChangeDetectionStrategy, ChangeDetectorRef, AfterViewInit, Outpu import { Component, OnInit } from '@angular/core'; import { FlatTreeControl } from '@angular/cdk/tree'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import * as moment from 'moment'; +import moment from 'moment'; interface TreeNode { name: string; diff --git a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.html b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.html index de6f4649..03e957d9 100644 --- a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.html +++ b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.html @@ -9,17 +9,17 @@ {{ 'dashboard.addDashboardDialog.dashboardName' |translate }} - {{'validators.required' | translate }} - - {{ nameNewPanel?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ nameNewPanel?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ nameNewPanel?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ nameNewPanel?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or space - + {{'validators.dashboardName' | translate }} @@ -41,7 +41,7 @@

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

{{'dashboard.editDialog.grafanaControl.grafanaTimestamp' | translate}} {{'dashboard.editDialog.grafanaControl.grafanaProxy' | translate}}
- {{ 'dashboard.editDialog.grafanaControl.hasVariables' | translate }} @@ -51,16 +51,16 @@

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

- +
{{fn}}
- - +
diff --git a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss index a55cc5b4..5f1117c4 100644 --- a/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss +++ b/src/app/components/dashboard/add-dashboard-dialog/add-dashboard-dialog.component.scss @@ -22,7 +22,7 @@ border-radius: 50rem; } } -::ng-deep .mat-select-panel { +::ng-deep .mat-mdc-select-panel { max-height: unset; } .file-upload-container { diff --git a/src/app/components/dashboard/dashboard.component.html b/src/app/components/dashboard/dashboard.component.html index fb128125..1607baa8 100644 --- a/src/app/components/dashboard/dashboard.component.html +++ b/src/app/components/dashboard/dashboard.component.html @@ -14,6 +14,7 @@
- \ No newline at end of file + diff --git a/src/app/components/preference/dialogs/dialog-advanced/dialog-advanced.component.scss b/src/app/components/preference/dialogs/dialog-advanced/dialog-advanced.component.scss index e1aa37e4..73de6a2d 100644 --- a/src/app/components/preference/dialogs/dialog-advanced/dialog-advanced.component.scss +++ b/src/app/components/preference/dialogs/dialog-advanced/dialog-advanced.component.scss @@ -21,9 +21,11 @@ .hide { display: none !important; } -::ng-deep .mat-input-element:disabled { +::ng-deep .mat-mdc-input-element:disabled { color: black; } +/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ +/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ ::ng-deep .mat-form-field-appearance-legacy.mat-form-field-disabled .mat-form-field-underline { background-image: unset; background-color: rgba(0,0,0,.42); diff --git a/src/app/components/preference/dialogs/dialog-agentsub/dialog-agentsub.component.html b/src/app/components/preference/dialogs/dialog-agentsub/dialog-agentsub.component.html index 88bad782..afb2c675 100644 --- a/src/app/components/preference/dialogs/dialog-agentsub/dialog-agentsub.component.html +++ b/src/app/components/preference/dialogs/dialog-agentsub/dialog-agentsub.component.html @@ -28,8 +28,10 @@

Defines any cross-protocol correlation mechanism

- + + @@ -37,4 +39,4 @@ - \ No newline at end of file + diff --git a/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.html b/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.html index 901effc7..7590e5c8 100644 --- a/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.html +++ b/src/app/components/preference/dialogs/dialog-alias/dialog-alias.component.html @@ -1,8 +1,9 @@ -
{{(isCopy ? ('preference.ipalias.dialog.copy' | translate) : '')}} {{ 'preference.ipalias.dialog.title' | - translate }}
- @@ -10,262 +11,305 @@

- {{ data.data.alias }} -

- - Alias Preview - + {{ data.data.alias }} + + Alias Preview
- -
-

{{ 'preference.ipalias.dialog.description' | translate }}

+
+

{{ "preference.ipalias.dialog.description" | translate }}

-

- - {{ 'preference.ipalias.dialog.updatecopy' | translate }} -

-
- - -
- - - {{ 'preference.ipalias.dialog.cidrip' | translate }} - - {{'validators.required' | translate }} - - {{ ip?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} - - - {{ ip?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} - - - {{'validators.patternIP' | translate }} - - - {{'validators.noWhiteSpace' | translate }} - +

+ + {{ "preference.ipalias.dialog.updatecopy" | translate }} +

+
+
+ + + {{ + "preference.ipalias.dialog.cidrip" | translate + }} + + {{ + "validators.required" | translate + }} + + {{ ip?.errors?.['minlength']?.requiredLength }} + {{ "validators.minChars" | translate }} + + + {{ ip?.errors?.['maxlength']?.requiredLength }} + {{ "validators.maxChars" | translate }} + + + {{ "validators.patternIP" | translate }} + + + {{ "validators.noWhiteSpace" | translate }} + + +
+
+ + + {{ + "preference.ipalias.dialog.cidrmask" | translate + }} + + /  + {{ + "validators.required" | translate + }} + {{ "validators.minNumber" | translate }} 1 + {{ "validators.maxNumber" | translate }} 32 + {{ + "validators.patternNumber" | translate + }} + +
+
+ + + {{ + "preference.ipalias.dialog.port" | translate + }} + + {{ + "validators.required" | translate + }} + {{ "validators.minNumber" | translate }} 1 + {{ "validators.maxNumber" | translate }} 65353 + {{ + "validators.patternNumber" | translate + }} + +
+
- -
-
- - +
+
+ + + {{ + "preference.ipalias.dialog.aliasName" | translate + }} + + {{ + "validators.required" | translate + }} + + {{ alias?.errors?.['minlength']?.requiredLength }} + {{ "validators.minChars" | translate }} + + + {{ alias?.errors?.['maxlength']?.requiredLength }} + {{ "validators.maxChars" | translate }} + + + {{ "validators.pattern" | translate }} [aA-Zz], [0-9], "-" or "_"] + + +
- {{ 'preference.ipalias.dialog.cidrmask' | translate }} - - /  - {{'validators.required' | translate }} - {{'validators.minNumber' | translate }} 1 - {{'validators.maxNumber' | translate }} 32 - {{'validators.patternNumber' | translate }} - -
-
- - - {{ 'preference.ipalias.dialog.port' | translate }} - - {{'validators.required' | translate }} - {{'validators.minNumber' | translate }} 1 - {{'validators.maxNumber' | translate }} 65353 - {{'validators.patternNumber' | translate }} - -
+
+ + + {{ + "preference.ipalias.dialog.captureID" | translate + }} + + {{ + "validators.required" | translate + }} + + {{ captureID?.errors?.['minlength']?.requiredLength }} + {{ "validators.minChars" | translate }} + + + {{ captureID?.errors?.['maxlength']?.requiredLength }} + {{ "validators.maxChars" | translate }} + + +
+
+
+ {{ + "preference.ipalias.dialog.active" | translate + }}
- -
- -
- - - {{ 'preference.ipalias.dialog.aliasName' | translate }} - - {{'validators.required' | translate }} - - {{ alias?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} - - - {{ alias?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} - - - {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-" or "_"] - - - -
- - - -
- - - {{ 'preference.ipalias.dialog.captureID' | translate }} - - {{'validators.required' | translate }} - - {{ captureID?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} - - - {{ captureID?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} - - - - -
-
- -
- {{ - ('preference.ipalias.dialog.active' | translate) - }} -
-
- -
- - +
+
-
- - +
-

{{ data.data.alias }} -

+

{{ data.data.alias }}

-
+
-

+

- {{ 'preference.ipalias.dialog.updatecopy' | translate }} + {{ "preference.ipalias.dialog.updatecopy" | translate }}

-
- - +
- {{ 'preference.ipalias.dialog.cidrip' | translate }} - {{ + "preference.ipalias.dialog.cidrip" | translate + }} + + [disabled]="true" + />
- - {{ 'preference.ipalias.dialog.cidrmask' | translate }} - {{ + "preference.ipalias.dialog.cidrmask" | translate + }} + + [disabled]="true" + /> / 
- {{ 'preference.ipalias.dialog.port' | translate }} - {{ + "preference.ipalias.dialog.port" | translate + }} + + [disabled]="true" + />
-
-
- {{ 'preference.ipalias.dialog.aliasName' | translate }} - {{ + "preference.ipalias.dialog.aliasName" | translate + }} + + [ngClass]="isCopy && isNotChanged ? 'input-copy-warning' : ''" + (change)="isNotChanged = false" + [(ngModel)]=" + isCopy && isNotChanged + ? data.data.alias + '-COPY' + : data.data.alias + " + [disabled]="true" + />
- {{ data.data.status ? - ('preference.ipalias.dialog.active' | translate) - : 'preference.ipalias.dialog.inactive' | translate + {{ + data.data.status + ? ("preference.ipalias.dialog.active" | translate) + : ("preference.ipalias.dialog.inactive" | translate) }}
-
- - -
- - +
- - -
-
-
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 65d9b7db..eba2770f 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,7 +1,7 @@ -::ng-deep .mat-dialog-container { +::ng-deep .mat-mdc-dialog-container { padding:24px; padding-bottom:12px; - .mat-dialog-actions { + .mat-mdc-dialog-actions { padding:0px; margin-top:3px; } @@ -26,6 +26,8 @@ width: 100%; } } +/*TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version.*/ +/*TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version.*/ ::ng-deep .mat-checkbox-label { min-width: 0 !important; } @@ -130,9 +132,11 @@ font-size: 12px; color:#bfbfbf; } } -::ng-deep .mat-input-element:disabled { +::ng-deep .mat-mdc-input-element:disabled { color: black; } +/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ +/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ ::ng-deep .mat-form-field-appearance-legacy.mat-form-field-disabled .mat-form-field-underline { background-image: unset; background-color: rgba(0,0,0,.42); diff --git a/src/app/components/preference/dialogs/dialog-authkey/dialog-authkey.component.html b/src/app/components/preference/dialogs/dialog-authkey/dialog-authkey.component.html index 193dab5b..d94b546f 100644 --- a/src/app/components/preference/dialogs/dialog-authkey/dialog-authkey.component.html +++ b/src/app/components/preference/dialogs/dialog-authkey/dialog-authkey.component.html @@ -9,14 +9,14 @@ {{ 'preference.authtoken.dialog.name' | translate }} - {{'validators.required' | translate }} - - {{ name?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ name?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ name?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ name?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or space] diff --git a/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.html b/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.html index 0d9e3e45..34902cdc 100644 --- a/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.html +++ b/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.html @@ -15,45 +15,47 @@ {{ 'preference.hepsub.settings.hepAlias' | translate }} - {{'validators.required' | translate }} - - {{ hep_alias?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ hep_alias?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ hep_alias?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ hep_alias?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-" or "_"] {{ 'preference.hepsub.settings.hepId' | translate }} - {{'validators.required' | translate }} - {{'validators.minNumber' | translate }} 1 - {{'validators.maxNumber' | translate }} 10000 - {{'validators.patternNumber' | translate }} + {{'validators.required' | translate }} + {{'validators.minNumber' | translate }} 1 + {{'validators.maxNumber' | translate }} 10000 + {{'validators.patternNumber' | translate }} {{ 'preference.hepsub.settings.profile' | translate }} - {{'validators.required' | translate }} - - {{ profile?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ profile?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - Invalid profile entry + Invalid profile entry
{{ 'preference.hepsub.mapping.title' | translate }}

{{ 'preference.hepsub.mapping.description' | translate }}

- - + + - +
@@ -87,9 +89,9 @@
- +
- \ No newline at end of file + diff --git a/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.scss b/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.scss index a4eda2dd..851ab18e 100644 --- a/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.scss +++ b/src/app/components/preference/dialogs/dialog-hepsub/dialog-hepsub.component.scss @@ -22,9 +22,11 @@ display: none !important; } -::ng-deep .mat-input-element:disabled { +::ng-deep .mat-mdc-input-element:disabled { color: black; } +/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ +/*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ ::ng-deep .mat-form-field-appearance-legacy.mat-form-field-disabled .mat-form-field-underline { background-image: unset; background-color: rgba(0,0,0,.42); diff --git a/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.html b/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.html index b18b5dfd..f36e98ea 100644 --- a/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.html +++ b/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.html @@ -1,104 +1,182 @@ - -
{{ 'preference.mapping.dialog.mappingSettings' | translate }}
- + +
{{ "preference.mapping.dialog.mappingSettings" | translate }}
+
- - -
-

{{ 'preference.mapping.dialog.defines' | translate }}

-
-
- - {{ 'preference.mapping.dialog.hepAlias' | translate }} - - {{'validators.required' | translate }} - - {{ hep_alias?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} - - - {{ hep_alias?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} - - - {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-" or "_"] - - - - {{ 'preference.mapping.dialog.hepId' | translate }} - - {{'validators.required' | translate }} - {{'validators.minNumber' | translate }} 1 - {{'validators.maxNumber' | translate }} 10000 - {{'validators.patternNumber' | translate }} - - - {{ 'preference.mapping.dialog.profile' | translate }} - - {{'validators.required' | translate }} - - {{ hep_alias?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} - - - -
- - -
-

{{ 'preference.mapping.dialog.definesCross' | translate }}

-
- - - - - - - + + +
+

{{ "preference.mapping.dialog.defines" | translate }}

+
+
+ + {{ + "preference.mapping.dialog.hepAlias" | translate + }} + + {{ + "validators.required" | translate + }} + + {{ hep_alias?.errors?.['minlength']?.requiredLength }} + {{ "validators.minChars" | translate }} + + + {{ hep_alias?.errors?.['maxlength']?.requiredLength }} + {{ "validators.maxChars" | translate }} + + + {{ "validators.pattern" | translate }} [aA-Zz], [0-9], + "-" or "_"] + + + + {{ + "preference.mapping.dialog.hepId" | translate + }} + + {{ + "validators.required" | translate + }} + {{ "validators.minNumber" | translate }} 1 + {{ + "validators.maxNumber" | translate + }} + 10000 + {{ + "validators.patternNumber" | translate + }} + + + {{ + "preference.mapping.dialog.profile" | translate + }} + + {{ + "validators.required" | translate + }} + + {{ hep_alias?.errors?.['minlength']?.requiredLength }} + {{ "validators.minChars" | translate }} + + + +
+ +
-

{{ 'preference.mapping.dialog.definesSchema' | translate }}

+

{{ "preference.mapping.dialog.definesCross" | translate }}

- + + + + + + + +
+

+ {{ "preference.mapping.dialog.definesSchema" | translate }} +

+
+ + + + + + + +
+

{{ "preference.mapping.dialog.definesScript" | translate }}

+
+ + + + + + + - - - - - - -
-

{{ 'preference.mapping.dialog.definesScript' | translate }}

-
- - - - - - - -
+
-
- - +
+ +
diff --git a/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.ts b/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.ts index 3cd90ee4..805e9be8 100644 --- a/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.ts +++ b/src/app/components/preference/dialogs/dialog-mapping/dialog-mapping.component.ts @@ -7,9 +7,9 @@ import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; import { MatDialog } from '@angular/material/dialog'; -import 'brace'; -import 'brace/mode/text'; -import 'brace/theme/github'; +// import 'brace'; +// import 'brace/mode/text'; +// import 'brace/theme/github'; @Component({ selector: 'app-dialog-mapping', templateUrl: './dialog-mapping.component.html', @@ -195,7 +195,7 @@ export class DialogMappingComponent { !this.hep_alias?.invalid && !this.hepid?.invalid && !this.profile?.invalid && - !this.partid?.invalid + !this.partid?.invalid ) { (d => { diff --git a/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.html b/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.html index 569d3496..d39e59eb 100644 --- a/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.html +++ b/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.html @@ -22,9 +22,9 @@ [formControl]="profile" autocomplete="off" [disabled]="!isAdmin" /> - {{'validators.required' | translate }} - - {{ profile?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ profile?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }}
@@ -37,14 +37,14 @@ [formControl]="hep_alias" autocomplete="off" [disabled]="!isAdmin" /> - {{'validators.required' | translate }} - - {{ hep_alias?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ hep_alias?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ hep_alias?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ hep_alias?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-" or "_"] @@ -58,10 +58,10 @@ [formControl]="hepid" autocomplete="off" [disabled]="!isAdmin" /> - {{'validators.required' | translate }} - {{'validators.minNumber' | translate }} 1 - {{'validators.maxNumber' | translate }} 10000 - {{'validators.patternNumber' | translate }} + {{'validators.required' | translate }} + {{'validators.minNumber' | translate }} 1 + {{'validators.maxNumber' | translate }} 10000 + {{'validators.patternNumber' | translate }}
@@ -75,14 +75,14 @@ [formControl]="type" autocomplete="off" [disabled]="!isAdmin" /> - {{'validators.required' | translate }} - - {{ type?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ type?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ type?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ type?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-" or "_"] @@ -117,8 +117,8 @@

{{ 'preference.scripts.dialog.jsScriptsDescription' | translate }}
- - +
{{'LINK.buttons.save' | translate}} -
\ No newline at end of file + diff --git a/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.ts b/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.ts index d5b834e8..81ef5b85 100644 --- a/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.ts +++ b/src/app/components/preference/dialogs/dialog-scripts/dialog-scripts.component.ts @@ -1,9 +1,9 @@ import { Component, Inject, ChangeDetectionStrategy, ViewChild, AfterViewInit, ChangeDetectorRef } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import 'brace'; -import 'brace/mode/text'; -import 'brace/theme/github'; +// import 'brace'; +// import 'brace/mode/text'; +// import 'brace/theme/github'; import { TranslateService } from '@ngx-translate/core' @Component({ selector: 'app-dialog-scripts', @@ -88,7 +88,7 @@ export class DialogScriptsComponent implements AfterViewInit { })(data.data); this.isValidForm = true; // const test = this.editor.getEditor().getSession().getAnnotations().filter(annotation => annotation.raw !== `['{a}'] is better written in dot notation.`); - + } ngAfterViewInit() { const options = { diff --git a/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.html b/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.html index 11b9ec58..a936b7f8 100644 --- a/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.html +++ b/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.html @@ -20,32 +20,32 @@ {{user}} - - {{'validators.required' | translate }} - - {{ username?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + + {{'validators.required' | translate }} + + {{ username?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ username?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ username?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-" or "_"] - + Username not available, please select one of list {{ 'preference.userSettings.dialog.category' | translate }} - {{'validators.required' | translate }} - - {{ category?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ category?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ category?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ category?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "." @@ -54,9 +54,9 @@ {{ 'preference.userSettings.dialog.param' | translate }} - {{'validators.required' | translate }} - - {{ param?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ param?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} + - - + +
Setting
- - + + - + - - - + + + @@ -147,7 +151,7 @@
- +
@@ -156,14 +160,14 @@ - - - + + + - - + +
- \ No newline at end of file + diff --git a/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.scss b/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.scss index 7793926b..d20ca6bc 100644 --- a/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.scss +++ b/src/app/components/preference/dialogs/dialog-user-settings/dialog-user-settings.component.scss @@ -14,9 +14,11 @@ } -::ng-deep .mat-input-element:disabled { +::ng-deep .mat-mdc-input-element:disabled { color: black; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ ::ng-deep .mat-form-field-appearance-legacy.mat-form-field-disabled .mat-form-field-underline { background-image: unset; background-color: rgba(0,0,0,.42); 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 e7dda451..94465cd5 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 @@ -22,17 +22,17 @@ (change)="isNotChanged=false" required /> - {{'validators.required' | translate }} - - {{ username?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ username?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ username?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ username?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "." - + Username not available @@ -45,14 +45,14 @@ {{item}} - {{'validators.required' | translate }} - - {{ usergroup?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ usergroup?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ usergroup?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ usergroup?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "."] @@ -78,14 +78,14 @@ [type]="hidePass1 ? 'password' : 'text'" [formControl]="password" required /> - The password {{'validators.required' | translate }} - - {{ password?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + The password {{'validators.required' | translate }} + + {{ password?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ password?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ password?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + The password and its confirmation do not coincide - - {{ password2?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + + {{ password2?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} min - - {{ password2?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ password2?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} @@ -124,16 +124,16 @@ autocomplete="off" [formControl]="firstname" required /> - {{'validators.required' | translate }} - - {{ firstname?.errors?.minlength?.requiredLength }} Characters + {{'validators.required' | translate }} + + {{ firstname?.errors?.['minlength']?.requiredLength }} Characters min - - {{ firstname?.errors?.maxlength?.requiredLength }} Characters + + {{ firstname?.errors?.['maxlength']?.requiredLength }} Characters max - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "."] @@ -143,10 +143,10 @@ autocomplete="off" [formControl]="lastname" /> - - {{ lastname?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ lastname?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "."] @@ -169,36 +169,43 @@ autocomplete="off" [formControl]="department" required /> - {{'validators.required' | translate }} - - {{ department?.errors?.minlength?.requiredLength }} Characters + {{'validators.required' | translate }} + + {{ department?.errors?.['minlength']?.requiredLength }} Characters min - - {{ department?.errors?.maxlength?.requiredLength }} Characters + + {{ department?.errors?.['maxlength']?.requiredLength }} Characters max - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" , "." or empty space] - +
{{ 'preference.users.dialog.setting' | translate }}
- - --> + + > @@ -233,4 +240,4 @@ [disabled]="isCopy && isNotChanged"> {{'LINK.buttons.save' | translate}} - \ No newline at end of file + diff --git a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts index e2788681..bb9ecb50 100644 --- a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts +++ b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts @@ -6,7 +6,7 @@ import { Validators, FormControl, AbstractControl } from '@angular/forms'; import { emailValidator } from '@app/helpers/email-validator.directive'; import { TranslateService } from '@ngx-translate/core' -import * as moment from 'moment'; +import moment from 'moment'; import { lastValueFrom } from 'rxjs'; @Component({ selector: 'app-dialog-users', @@ -57,7 +57,7 @@ export class DialogUsersComponent implements OnInit { Validators.required, Validators.minLength(6), Validators.maxLength(100) - + ]); password2 = new FormControl('', [ Validators.required, @@ -113,7 +113,7 @@ export class DialogUsersComponent implements OnInit { lastname: '', department: '', guid: Functions.newGuid(), - + }; } diff --git a/src/app/components/preference/pages/page-admin/page-admin.component.html b/src/app/components/preference/pages/page-admin/page-admin.component.html index acfcfa1a..28815d0f 100644 --- a/src/app/components/preference/pages/page-admin/page-admin.component.html +++ b/src/app/components/preference/pages/page-admin/page-admin.component.html @@ -7,7 +7,7 @@

{{ page | titlecase }}

- +
@@ -29,7 +29,7 @@

{{ page | titlecase }}

 - +
@@ -53,7 +53,7 @@

{{ page | titlecase }}

- +
@@ -77,7 +77,7 @@

{{ page | titlecase }}

 - +
diff --git a/src/app/components/preference/pages/page-admin/page-admin.component.scss b/src/app/components/preference/pages/page-admin/page-admin.component.scss index 7123421a..451cd9cb 100644 --- a/src/app/components/preference/pages/page-admin/page-admin.component.scss +++ b/src/app/components/preference/pages/page-admin/page-admin.component.scss @@ -62,13 +62,19 @@ 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; diff --git a/src/app/components/preference/pages/page-advanced-settings/page-advanced-settings.component.scss b/src/app/components/preference/pages/page-advanced-settings/page-advanced-settings.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-advanced-settings/page-advanced-settings.component.scss +++ b/src/app/components/preference/pages/page-advanced-settings/page-advanced-settings.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-agent-subscriptions/page-agent-subscriptions.component.scss b/src/app/components/preference/pages/page-agent-subscriptions/page-agent-subscriptions.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-agent-subscriptions/page-agent-subscriptions.component.scss +++ b/src/app/components/preference/pages/page-agent-subscriptions/page-agent-subscriptions.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-alias/page-alias.component.scss b/src/app/components/preference/pages/page-alias/page-alias.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-alias/page-alias.component.scss +++ b/src/app/components/preference/pages/page-alias/page-alias.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-alias/page-alias.component.ts b/src/app/components/preference/pages/page-alias/page-alias.component.ts index 94e58389..88fb5331 100644 --- a/src/app/components/preference/pages/page-alias/page-alias.component.ts +++ b/src/app/components/preference/pages/page-alias/page-alias.component.ts @@ -19,7 +19,7 @@ import { import { DialogAliasComponent, DialogDeleteAlertComponent, - + } from '@app/components/preference/dialogs'; import { PreferenceAlias, @@ -29,7 +29,7 @@ import { AlertService, AuthenticationService } from '@app/services'; import { DialogImportComponent } from '@app/components/preference/service-dialogs'; import { PreferencesComponentMapping } from '@app/models/preferences-component-mapping'; -import * as moment from 'moment'; +import moment from 'moment'; import { Functions } from '@app/helpers/functions'; @Component({ selector: 'app-page-alias', diff --git a/src/app/components/preference/pages/page-api-auth/page-api-auth.component.scss b/src/app/components/preference/pages/page-api-auth/page-api-auth.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-api-auth/page-api-auth.component.scss +++ b/src/app/components/preference/pages/page-api-auth/page-api-auth.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-hepsub/page-hepsub.component.scss b/src/app/components/preference/pages/page-hepsub/page-hepsub.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-hepsub/page-hepsub.component.scss +++ b/src/app/components/preference/pages/page-hepsub/page-hepsub.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-mapping/page-mapping.component.scss b/src/app/components/preference/pages/page-mapping/page-mapping.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-mapping/page-mapping.component.scss +++ b/src/app/components/preference/pages/page-mapping/page-mapping.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-profile/page-profile.component.html b/src/app/components/preference/pages/page-profile/page-profile.component.html index a0d154ff..97451de9 100644 --- a/src/app/components/preference/pages/page-profile/page-profile.component.html +++ b/src/app/components/preference/pages/page-profile/page-profile.component.html @@ -2,14 +2,14 @@

{{page | titlecase}}

-
- @@ -18,24 +18,24 @@

{{page | titlecase}}

- {{userProfile?.displayname}} + {{userProfile?.displayname}} {{userProfile?.username}} - + Group: {{userProfile?.group}} {{email.value}} - {{department.value}} @@ -61,16 +61,16 @@

{{page | titlecase}}

autocomplete="off" [formControl]="firstname" required /> - {{'validators.required' | translate }} - - {{ firstname?.errors?.minlength?.requiredLength }} Characters + {{'validators.required' | translate }} + + {{ firstname?.errors?.['minlength']?.requiredLength }} Characters min - - {{ firstname?.errors?.maxlength?.requiredLength }} Characters + + {{ firstname?.errors?.['maxlength']?.requiredLength }} Characters max - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "."] @@ -81,10 +81,10 @@

{{page | titlecase}}

autocomplete="off" [formControl]="lastname" /> - - {{ lastname?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ lastname?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "."] @@ -109,16 +109,16 @@

{{page | titlecase}}

autocomplete="off" [formControl]="department" required /> - {{'validators.required' | translate }} - - {{ department?.errors?.minlength?.requiredLength }} Characters + {{'validators.required' | translate }} + + {{ department?.errors?.['minlength']?.requiredLength }} Characters min - - {{ department?.errors?.maxlength?.requiredLength }} Characters + + {{ department?.errors?.['maxlength']?.requiredLength }} Characters max - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" , "." or empty space] @@ -135,17 +135,17 @@

{{page | titlecase}}

[disabled]="!isAdmin" required /> - {{'validators.required' | translate }} - - {{ username?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ username?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ username?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ username?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "." - + Username not available @@ -158,14 +158,14 @@

{{page | titlecase}}

{{item}} - {{'validators.required' | translate }} - - {{ usergroup?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + {{'validators.required' | translate }} + + {{ usergroup?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ usergroup?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ usergroup?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{'validators.pattern' | translate }} [aA-Zz], [0-9], "-", "_" or "."] @@ -177,14 +177,14 @@

{{page | titlecase}}

[type]="hidePass1 ? 'password' : 'text'" [formControl]="password" required /> - The password {{'validators.required' | translate }} - - {{ password?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + The password {{'validators.required' | translate }} + + {{ password?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} - - {{ password?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ password?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + {{page | titlecase}} The password and its confirmation do not coincide - - {{ password2?.errors?.minlength?.requiredLength }} {{'validators.minChars' | translate }} + + {{ password2?.errors?.['minlength']?.requiredLength }} {{'validators.minChars' | translate }} min - - {{ password2?.errors?.maxlength?.requiredLength }} {{'validators.maxChars' | translate }} + + {{ password2?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }}
@@ -225,11 +225,11 @@

{{page | titlecase}}

- + - - + +
@@ -246,8 +246,8 @@

{{page | titlecase}}

{{lastPasswordChange}}
- - + + diff --git a/src/app/components/preference/pages/page-reset/page-reset.component.html b/src/app/components/preference/pages/page-reset/page-reset.component.html index 38e5da02..ceaea87d 100644 --- a/src/app/components/preference/pages/page-reset/page-reset.component.html +++ b/src/app/components/preference/pages/page-reset/page-reset.component.html @@ -7,7 +7,7 @@

{{ page | titlecase }}

- + @@ -37,7 +37,7 @@

{{ page | titlecase }}

 - +
@@ -56,7 +56,7 @@

{{ page | titlecase }}

 - + 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 4d4ad415..5b1fcb5f 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 @@ -68,13 +68,19 @@ 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 { 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; margin: 0px !important; diff --git a/src/app/components/preference/pages/page-scripts/page-scripts.component.scss b/src/app/components/preference/pages/page-scripts/page-scripts.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-scripts/page-scripts.component.scss +++ b/src/app/components/preference/pages/page-scripts/page-scripts.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-system-overview/page-system-overview.component.scss b/src/app/components/preference/pages/page-system-overview/page-system-overview.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-system-overview/page-system-overview.component.scss +++ b/src/app/components/preference/pages/page-system-overview/page-system-overview.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-user-settings/page-user-settings.component.scss b/src/app/components/preference/pages/page-user-settings/page-user-settings.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-user-settings/page-user-settings.component.scss +++ b/src/app/components/preference/pages/page-user-settings/page-user-settings.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-users/page-users.component.scss b/src/app/components/preference/pages/page-users/page-users.component.scss index 60cb8895..4d6307c0 100644 --- a/src/app/components/preference/pages/page-users/page-users.component.scss +++ b/src/app/components/preference/pages/page-users/page-users.component.scss @@ -1,5 +1,5 @@ -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -34,7 +34,7 @@ table { } } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } diff --git a/src/app/components/preference/pages/page-users/page-users.component.ts b/src/app/components/preference/pages/page-users/page-users.component.ts index a12a50ed..88660b7a 100644 --- a/src/app/components/preference/pages/page-users/page-users.component.ts +++ b/src/app/components/preference/pages/page-users/page-users.component.ts @@ -29,7 +29,7 @@ import { AlertService, AuthenticationService, UserSecurityService } from '@app/s import { DialogImportComponent } from '@app/components/preference/service-dialogs'; import { PreferencesComponentMapping } from '@app/models/preferences-component-mapping'; -import * as moment from 'moment'; +import moment from 'moment'; import { Functions } from '@app/helpers/functions'; @Component({ selector: 'app-page-users', @@ -195,8 +195,8 @@ export class PageUsersComponent implements OnInit, OnDestroy, AfterViewInit { const newBlob = new Blob([csv], { type: 'text/csv;charset=utf-8;', }); - if (window.navigator && window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveOrOpenBlob(newBlob); + if (window.navigator && window.navigator['msSaveOrOpenBlob']) { + window.navigator['msSaveOrOpenBlob'](newBlob); return; } const data = window.URL.createObjectURL(newBlob); diff --git a/src/app/components/preference/preference.component.scss b/src/app/components/preference/preference.component.scss index a53584be..979d3f1f 100644 --- a/src/app/components/preference/preference.component.scss +++ b/src/app/components/preference/preference.component.scss @@ -20,7 +20,7 @@ table { width: 100%; } -.mat-form-field { +.mat-mdc-form-field { font-size: 14px; width: 100%; } @@ -386,7 +386,7 @@ a:hover { justify-content: space-around; } -td.mat-cell { +td.mat-mdc-cell { padding-left: 5px; text-overflow: ellipsis; overflow: hidden; @@ -415,12 +415,18 @@ td.mat-cell { 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 { + /* 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; diff --git a/src/app/components/preference/preference.component.ts b/src/app/components/preference/preference.component.ts index ac620322..f5e567fc 100644 --- a/src/app/components/preference/preference.component.ts +++ b/src/app/components/preference/preference.component.ts @@ -112,7 +112,7 @@ export class PreferenceComponent implements OnInit, OnDestroy, AfterViewInit { router.events .pipe(filter((e) => e instanceof ActivationEnd)) .subscribe((evt: ActivationEnd) => { - this.pageId = decodeURI(evt.snapshot.params?.id); + this.pageId = decodeURI(evt.snapshot.params?.['id']); this.cdr.detectChanges(); }); } 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 fa5b2bcd..90d5e024 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 @@ -14,7 +14,7 @@
- +
  • diff --git a/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.scss b/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.scss index 0e5d9f0c..543984ad 100644 --- a/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.scss +++ b/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.scss @@ -1,8 +1,13 @@ -.transaction-mat-tab-wrapper ::ng-deep .mat-tab-body.mat-tab-body-active { + +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ +.transaction-mat-tab-wrapper ::ng-deep .mat-mdc-tab-body.mat-tab-body-active { height: 0; display: none; } +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .transaction-mat-tab-wrapper ::ng-deep .mat-tab-label { min-width: inherit; padding: 0 1rem; @@ -71,6 +76,6 @@ overflow: hidden; } } -::ng-deep .mat-tab-header { +::ng-deep .mat-mdc-tab-header { z-index: 1; } diff --git a/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts b/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts index ad20ee60..73cd2212 100644 --- a/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts +++ b/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts @@ -24,7 +24,7 @@ import { } from '@app/services'; import { AgentRequestModel } from '@app/models/agent-request-model'; -import * as moment from 'moment'; +import moment from 'moment'; @Component({ selector: 'app-detail-dialog', diff --git a/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.component.ts b/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.component.ts index 9e03e19f..11173da6 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.component.ts +++ b/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.component.ts @@ -6,7 +6,7 @@ import { AfterViewInit, } from '@angular/core'; import { Functions } from '../../../../helpers/functions'; -import * as moment from 'moment'; +import moment from 'moment'; enum COLOR { green = '#dcf7dc', diff --git a/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.module.ts b/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.module.ts index 2becccd7..c24cbeac 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.module.ts +++ b/src/app/components/search-grid-call/detail-dialog/tab-callinfo/tab-callinfo.module.ts @@ -1,4 +1,4 @@ -import { ChartsModule } from 'ng2-charts'; +import { ChartsModule } from '@xirenec/ng2-charts'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { NgModule } from '@angular/core'; diff --git a/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.scss b/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.scss index 4fb32391..9cf17a0d 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.scss +++ b/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.scss @@ -1,5 +1,5 @@ @import '../../../../../theme.scss'; -@import '~@angular/material/theming'; +@import '@angular/material/theming'; $primary: mat-palette($homerprimary); $accent: mat-palette($homeraccent); ::ng-deep .ipSelect{ @@ -36,14 +36,20 @@ $accent: mat-palette($homeraccent); width: 100% !important; padding: 0; } +/* 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-placeholder{ color:white !important; font-weight: 500; } +/* 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-trigger{ color:white !important; font-weight: 500; } +/* 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{ color:white !important; font-weight: 500; diff --git a/src/app/components/search-grid-call/detail-dialog/tab-hepsub/moment.pipe.ts b/src/app/components/search-grid-call/detail-dialog/tab-hepsub/moment.pipe.ts index f1b07d2b..64e76474 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-hepsub/moment.pipe.ts +++ b/src/app/components/search-grid-call/detail-dialog/tab-hepsub/moment.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; +import moment from 'moment'; @Pipe({ name: 'moment', diff --git a/src/app/components/search-grid-call/detail-dialog/tab-messages/tab-messages.component.scss b/src/app/components/search-grid-call/detail-dialog/tab-messages/tab-messages.component.scss index adee38ee..a4123eb7 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-messages/tab-messages.component.scss +++ b/src/app/components/search-grid-call/detail-dialog/tab-messages/tab-messages.component.scss @@ -38,12 +38,13 @@ } } } - + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version.*/ + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version.*/ .mat-tab-body-content { overflow-x: hidden !important; } - td.mat-cell { + td.mat-mdc-cell { border-bottom-style: unset !important; border-right-style: solid !important; border-right-width: 1px !important; @@ -53,7 +54,7 @@ max-width:125px; overflow:hidden; text-overflow: ellipsis !important; - &:last-child.mat-cell { + &:last-child.mat-mdc-cell { border-right-style: unset !important; } & .ellipsis-text { @@ -67,7 +68,7 @@ padding-left: 5px !important; } - .mat-row { + .mat-mdc-row { &:nth-child(2n+1) { background-color: #DFF1FF; } diff --git a/src/app/components/search-grid-call/detail-dialog/tab-qos/tab-qos.component.html b/src/app/components/search-grid-call/detail-dialog/tab-qos/tab-qos.component.html index 890ff044..85937cf8 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-qos/tab-qos.component.html +++ b/src/app/components/search-grid-call/detail-dialog/tab-qos/tab-qos.component.html @@ -59,7 +59,7 @@

    No Data shown

    {{ item.value }}
- No Data shown - !['', 'id'].includes(column.colDef.field)) .forEach(column => this.allColumnIds.push({ @@ -73,7 +73,7 @@ export class ExportDialogComponent implements OnInit { } } ngOnInit() { - if (typeof this.apiColumn.getAllColumns() !== 'undefined' && this.apiColumn.getAllColumns() !== null) { + if (typeof this.apiColumn?.getAllColumns() !== 'undefined' && this.apiColumn.getAllColumns() !== null) { for (let i = 0; i < this._bufferData.length; i++) { if (this._bufferData[i].selected) { this.exportColumns.push(this._bufferData[i].field); @@ -86,7 +86,7 @@ export class ExportDialogComponent implements OnInit { this.cdr.detectChanges(); } onUpdateProto(event) { - if (typeof this.apiColumn.getAllColumns() !== 'undefined' && this.apiColumn.getAllColumns() !== null) { + if (typeof this.apiColumn?.getAllColumns() !== 'undefined' && this.apiColumn.getAllColumns() !== null) { const objField = event.find(i => { const k = this._bufferData.find(j => i.name === j.name); return i.selected !== k.selected; diff --git a/src/app/components/search-grid-call/filters/status-filter/status-filter.component.ts b/src/app/components/search-grid-call/filters/status-filter/status-filter.component.ts index accf6e30..0ebcc8b9 100644 --- a/src/app/components/search-grid-call/filters/status-filter/status-filter.component.ts +++ b/src/app/components/search-grid-call/filters/status-filter/status-filter.component.ts @@ -3,21 +3,24 @@ import { IAfterGuiAttachedParams, IDoesFilterPassParams, IFilterParams, - RowNode, -} from '@ag-grid-community/all-modules'; -import { IFilterAngularComp } from '@ag-grid-community/angular'; + IRowNode, + ValueGetterParams +} from 'ag-grid-community'; +import { IFilterAngularComp } from 'ag-grid-angular'; import { PreferenceMappingProtocolService } from '@app/services'; import { Functions } from '@app/helpers/functions'; import { ConstValue, UserConstValue } from '@app/models'; +type valueGetter = (rowNode: IRowNode | ValueGetterParams) => any +type FilterParams = Omit & { valueGetter: valueGetter }; @Component({ selector: 'app-status-filter', templateUrl: 'status-filter.component.html', styleUrls: ['status-filter.component.scss'] }) export class StatusFilterComponent implements IFilterAngularComp { - private params: IFilterParams; - private valueGetter: (rowNode: RowNode) => any; + private params: FilterParams; + private valueGetter: valueGetter; public text = ''; private statusMapping; diff --git a/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.scss b/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.scss index 28b6434d..34104ac1 100644 --- a/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.scss +++ b/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.scss @@ -92,7 +92,7 @@ section { background: transparent; } -.chart-button-row .mat-button-base { +.chart-button-row .mat-mdc-button-base { margin: 8px 8px 8px 0; } @@ -124,7 +124,7 @@ section { background: rgb(228, 228, 228); } - .mat-button { + .mat-mdc-button { padding: 2px 8px !important; width: 100px; } @@ -175,11 +175,13 @@ section { transform: rotate(90deg); } -.mat-form-field { +.mat-mdc-form-field { min-width: 46%; margin: 3px; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ ::ng-deep .mat-form-field-infix { width: 100% !important; } diff --git a/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.ts b/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.ts index 539cc8e0..4aba7fc8 100644 --- a/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.ts +++ b/src/app/components/search-grid-call/grid-chart-dialog/grid-chart-dialog.component.ts @@ -239,7 +239,7 @@ export class DialogChartGridDialogComponent this.gridData = []; // this.id = data.idParent; if ( - typeof this.apiColumn.getAllColumns() !== 'undefined' && + typeof this.apiColumn?.getAllColumns() !== 'undefined' && this.apiColumn.getAllColumns() !== null ) { Object.values(this.apiColumn.getAllColumns() as Object) diff --git a/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.ts b/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.ts index 273cdd42..be3d2563 100644 --- a/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.ts +++ b/src/app/components/search-grid-call/grid-settings-dialog/grid-settings-dialog.ts @@ -57,7 +57,7 @@ export class DialogSettingsGridDialog { this.protocol_id = data.protocol_id; this.id = data.idParent; if ( - typeof this.apiColumn.getAllColumns() !== 'undefined' && + typeof this.apiColumn?.getAllColumns() !== 'undefined' && this.apiColumn.getAllColumns() !== null ) { Object.values(this.apiColumn.getAllGridColumns() as Object) diff --git a/src/app/components/search-grid-call/message-content/message-content.component.scss b/src/app/components/search-grid-call/message-content/message-content.component.scss index 798f9cd5..1758bd76 100644 --- a/src/app/components/search-grid-call/message-content/message-content.component.scss +++ b/src/app/components/search-grid-call/message-content/message-content.component.scss @@ -26,6 +26,8 @@ } } +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .message-container ::ng-deep .mat-tab-label { min-width: inherit; padding: 0 1rem; @@ -36,7 +38,7 @@ table { height: 38px; } - .mat-cell { + .mat-mdc-cell { font-size: 13px !important; } } diff --git a/src/app/components/search-grid-call/message-content/message-content.component.ts b/src/app/components/search-grid-call/message-content/message-content.component.ts index d7a5f6da..84d9327e 100644 --- a/src/app/components/search-grid-call/message-content/message-content.component.ts +++ b/src/app/components/search-grid-call/message-content/message-content.component.ts @@ -1,7 +1,7 @@ import { Functions } from '@app/helpers/functions'; import { Component, OnInit, Input, ViewChild, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, AfterViewInit, AfterContentInit } from '@angular/core'; import { MatTabGroup } from '@angular/material/tabs'; -import * as _moment from 'moment'; +import moment from 'moment'; import * as _parsip from 'parsip'; import jwt_decode from 'jwt-decode'; @@ -10,7 +10,7 @@ import { TranslateService } from '@ngx-translate/core'; import { DateFormat, TimeFormattingService } from '@app/services/time-formatting.service'; const parsip = _parsip; -const moment = _moment; +// const moment = _moment; @Component({ selector: 'app-message-content', templateUrl: './message-content.component.html', diff --git a/src/app/components/search-grid-call/renderer/column-uuid-renderer.component.ts b/src/app/components/search-grid-call/renderer/column-uuid-renderer.component.ts index 918ec95a..72f21217 100644 --- a/src/app/components/search-grid-call/renderer/column-uuid-renderer.component.ts +++ b/src/app/components/search-grid-call/renderer/column-uuid-renderer.component.ts @@ -10,35 +10,35 @@ import {ICellRendererAngularComp} from 'ag-grid-angular'; `, styles: ['a { user-select: text; color: inherit; text-decoration: unset; overflow: hidden; }', ` - ::-moz-selection { - background:#20c997; - color:white; - } - ::selection { - background:#20c997; - color:white; - } - .cell-wrapper { - user-select:contain; - display: flex; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - align-items: center; - padding-left: 5px; - padding-right: 5px; - line-height:2; - } - .selected { - transition:.3s all; - background:#20c997; - color:white; - border:1px solid white; - border-radius:3px; - - }`], + ::-moz-selection { + background:#20c997; + color:white; + } + ::selection { + background:#20c997; + color:white; + } + .cell-wrapper { + user-select:contain; + display: flex; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + align-items: center; + padding-left: 5px; + padding-right: 5px; + line-height:2; + } + .selected { + transition:.3s all; + background:#20c997; + color:white; + border:1px solid white; + border-radius:3px; + + }`], changeDetection: ChangeDetectionStrategy.OnPush }) export class ColumnUuidRenderer implements ICellRendererAngularComp { diff --git a/src/app/components/search-grid-call/search-grid-call.component.html b/src/app/components/search-grid-call/search-grid-call.component.html index d11df5cd..397a98e0 100644 --- a/src/app/components/search-grid-call/search-grid-call.component.html +++ b/src/app/components/search-grid-call/search-grid-call.component.html @@ -1,69 +1,137 @@ - + - - -
- -
- - + + - + -
- +
- - -
- - + - - {{'searchGridCall.pressCtrlEnter' | translate}} + + {{ "searchGridCall.pressCtrlEnter" | translate }} -
-
+
-
- - - +

@@ -77,11 +145,21 @@

- + @@ -90,15 +168,33 @@

- - - - - + + + @@ -109,50 +205,94 @@

- - + + -
-
- +
+
- + - - - -
- - - - -
\ No newline at end of file +
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 5df70cf9..ad3741bc 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 @@ -38,7 +38,7 @@ border: 0; padding: 3px 6px; border-radius: 3px 0px 0px 3px; - + outline: none; height: 20px; background: #eeeeee; @@ -63,7 +63,7 @@ top:9px; left: 200px; .regex-filter { - + height: 30px !important; } .regex-button { @@ -73,7 +73,7 @@ font-size: 18px; color: #afafaf; } - + } } @@ -113,7 +113,7 @@ ::ng-deep .mat-icon-button { overflow: hidden; } - + ::ng-deep .mat-icon-button.smart-input { overflow: visible !important; border-radius: 0; @@ -192,4 +192,4 @@ 100% { transform: rotate(360deg); } -} \ No newline at end of file +} diff --git a/src/app/components/search-grid-call/search-grid-call.component.ts b/src/app/components/search-grid-call/search-grid-call.component.ts index deccefff..dbb72d00 100644 --- a/src/app/components/search-grid-call/search-grid-call.component.ts +++ b/src/app/components/search-grid-call/search-grid-call.component.ts @@ -6,7 +6,7 @@ import { FlowItemType } from '@app/models/flow-item-type.model'; import { ColDef, GridOptions } from 'ag-grid-community'; import { Subscription } from 'rxjs'; import { Functions, getStorage, log, setStorage } from '@app/helpers/functions'; -import * as moment from 'moment'; +import moment from 'moment'; import { ConstValue, UserConstValue } from '@app/models'; import { Component, @@ -63,19 +63,19 @@ import { DateFormat, TimeFormattingService } from '@app/services/time-formatting export class SearchGridCallComponent extends GridController implements OnInit, OnDestroy, AfterViewInit { - gridApi; - gridColumnApi; + override gridApi; + override gridColumnApi; columnApi; - _id: string = null; + override _id: string = null; public context; public frameworkComponents; isSearchPanel = false; @Input() source = 'resultPage'; - @Input() inChartContainer = false; - @Input() set id(val: string) { + @Input() override inChartContainer = false; + @Input() override set id(val: string) { this._id = val; } - get id(): string { + override get id(): string { return this._id; } @Input() chartConfig: any; @@ -85,11 +85,11 @@ export class SearchGridCallComponent @ViewChild('searchSlider', { static: false }) searchSlider: any; filterGridValue: string = ''; defaultColDef: ColDef; - _columnDefs: Array; - set columnDefs(value: Array) { + override _columnDefs: Array; + override set columnDefs(value: Array) { this._columnDefs = value; } - get columnDefs(): Array { + override get columnDefs(): Array { return this._columnDefs; } myPredefColumns: Array; @@ -112,12 +112,12 @@ export class SearchGridCallComponent searchSliderFields = []; isLokiQuery = false; lastTimestamp: number; - localData: any; + override localData: any; queryTextLoki: string; showRegex; buttonName; isFirstInit = true; - agGridSizeControl = { + override agGridSizeControl = { selectedType: 'sizeToFit', pageSize: 100 }; @@ -148,7 +148,7 @@ export class SearchGridCallComponent filterRegex: RegExp; filterCleaned: string; - gridOptions: GridOptions = { + override gridOptions: GridOptions = { defaultColDef: { sortable: true, resizable: true, @@ -189,7 +189,7 @@ export class SearchGridCallComponent searchAllNode = false; public isThisSelfQuery = false; - _interval: any; + override _interval: any; private subscriptionRangeUpdateTimeout: Subscription; public subscriptionDashboardEvent: Subscription; private _latestQuery: string; @@ -845,8 +845,13 @@ export class SearchGridCallComponent return bool; } isExternalFilterPresent() { - const filterValue = this.context.componentParent.filterGridValue.toLowerCase().trim(); - return filterValue !== ''; + try { + const filterValue = this.context?.componentParent?.filterGridValue?.toLowerCase()?.trim(); + return filterValue !== ''; + + } catch (error) { + return false; + } } doesExternalFilterPass(node) { const statusFormDefaults = this.context.componentParent.statusFormDefaults; @@ -1629,7 +1634,7 @@ export class SearchGridCallComponent this.dateFormat = await this._tfs.getFormat(); } - onCellDoubleClicked({ data, event }) { + onCellDoubleClicked({ data, event }: any) { if (!this.isLokiQuery) { this.openTransactionDialog({ data }, event); } diff --git a/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.scss b/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.scss index 3f2d236e..eef65afb 100644 --- a/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.scss +++ b/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.scss @@ -1,7 +1,8 @@ -@import '~src/theme.scss'; -@import '~@angular/material/theming'; -$primary: mat-palette($homerprimary); -$accent: mat-palette($homeraccent); +@use '@angular/material' as mat; +@include mat.core(); +@import '../../../../theme.scss'; +$primary: mat.define-palette($homerprimary); +$accent: mat.define-palette($homeraccent); .chart-container { height: 100%; .fold { diff --git a/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.ts b/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.ts index faeda4fb..da724ab3 100644 --- a/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.ts +++ b/src/app/components/widgets/clickhousechart-widget/clickhousechart-widget.component.ts @@ -11,7 +11,7 @@ import { DateTimeRangeService, DateTimeTick, Timestamp } from '@app/services'; import { ClickhouseSerivce } from '@app/services/clickhouse.service'; import { WorkerService } from '@app/services/worker.service'; import { ChartDataSets, ChartType } from 'chart.js'; -import { BaseChartDirective, Label } from 'ng2-charts'; +import { BaseChartDirective, Label } from '@xirenec/ng2-charts'; import { Subscription } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { IWidget } from '../IWidget'; diff --git a/src/app/components/widgets/clickhousechart-widget/setting-clickhousechart-widget.component.html b/src/app/components/widgets/clickhousechart-widget/setting-clickhousechart-widget.component.html index a5e32840..de3e1217 100644 --- a/src/app/components/widgets/clickhousechart-widget/setting-clickhousechart-widget.component.html +++ b/src/app/components/widgets/clickhousechart-widget/setting-clickhousechart-widget.component.html @@ -140,8 +140,8 @@
Query
{{'widgets.clickhouseChart.settings.tag' | translate}} - - + Query

(removed)="remove(item, 'tags')"> {{item}} cancel - - + + div { - & > .mat-form-field { + & > .mat-mdc-form-field { padding-right: 0.5rem; } } @@ -38,6 +38,8 @@ } .chips-container-selector { ::ng-deep { + /* 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-value { opacity: 0; } diff --git a/src/app/components/widgets/clock-widget/clock-widget.component.ts b/src/app/components/widgets/clock-widget/clock-widget.component.ts index 1cdd3c68..ccc54028 100644 --- a/src/app/components/widgets/clock-widget/clock-widget.component.ts +++ b/src/app/components/widgets/clock-widget/clock-widget.component.ts @@ -3,8 +3,8 @@ import { Widget, WidgetArrayInstance } from '@app/helpers/widget'; import { SettingClockWidgetComponent } from './setting-clock-widget.component'; import { MatDialog } from '@angular/material/dialog'; import { IWidget } from '../IWidget'; -import * as _moment from 'moment'; +import * as _moment from 'moment'; const moment: any = _moment; enum ConstTime { diff --git a/src/app/components/widgets/clock-widget/setting-clock-widget.component.ts b/src/app/components/widgets/clock-widget/setting-clock-widget.component.ts index 8513a7bf..b6a662e2 100644 --- a/src/app/components/widgets/clock-widget/setting-clock-widget.component.ts +++ b/src/app/components/widgets/clock-widget/setting-clock-widget.component.ts @@ -1,7 +1,9 @@ import { Component, Inject, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import * as _moment from 'moment'; + import { TranslateService } from '@ngx-translate/core' + +import * as _moment from 'moment'; const moment: any = _moment; @Component({ selector: 'app-setting-clock-widget-component', diff --git a/src/app/components/widgets/influxdbchart-widget/influxdbchart-widget.component.ts b/src/app/components/widgets/influxdbchart-widget/influxdbchart-widget.component.ts index 3a590266..45d125a5 100644 --- a/src/app/components/widgets/influxdbchart-widget/influxdbchart-widget.component.ts +++ b/src/app/components/widgets/influxdbchart-widget/influxdbchart-widget.component.ts @@ -4,11 +4,11 @@ import { IWidget } from '../IWidget'; import { Component, Input, Output, EventEmitter, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { ChartType, ChartDataSets } from 'chart.js'; -import { Label } from 'ng2-charts'; +import { Label } from '@xirenec/ng2-charts'; import { StatisticService } from '../../../services/statistic.service'; import { DateTimeRangeService, DateTimeTick, Timestamp } from '../../../services/data-time-range.service'; import { Subscription } from 'rxjs'; -import * as moment from 'moment'; +import moment from 'moment'; import { Widget, WidgetArrayInstance } from '@app/helpers/widget'; import { Functions } from '@app/helpers/functions'; diff --git a/src/app/components/widgets/influxdbchart-widget/setting-influxdbchart-widget.component.html b/src/app/components/widgets/influxdbchart-widget/setting-influxdbchart-widget.component.html index f2219d13..58a039b0 100644 --- a/src/app/components/widgets/influxdbchart-widget/setting-influxdbchart-widget.component.html +++ b/src/app/components/widgets/influxdbchart-widget/setting-influxdbchart-widget.component.html @@ -124,8 +124,8 @@
{{ 'widgets.influxDBChart.settings.query' | translate }}
{{ 'widgets.influxDBChart.settings.counter' | translate }} - - + {{ 'widgets.influxDBChart.settings.query' | translate }}

(removed)="remove(item, 'counter')"> {{item}} cancel - - + + {{ 'widgets.influxDBChart.settings.query' | translate }}

{{ 'widgets.influxDBChart.settings.tag' | translate }} - - + {{ 'widgets.influxDBChart.settings.query' | translate }}

(removed)="remove(item, 'tags')"> {{item}} cancel - - + + {{ 'widgets.influxDBChart.settings.query' | translate }} {{ 'widgets.influxDBChart.settings.values' | translate }} - - + {{ 'widgets.influxDBChart.settings.query' | translate }} (removed)="remove(item, 'values')"> {{item}} cancel - - + + div { - & > .mat-form-field { + & > .mat-mdc-form-field { padding-right: 0.5rem; } } @@ -38,6 +38,8 @@ } .chips-container-selector { ::ng-deep { + /* 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-value { opacity: 0; } diff --git a/src/app/components/widgets/prometheus-widget/prometheus-widget.component.ts b/src/app/components/widgets/prometheus-widget/prometheus-widget.component.ts index 70ac05e9..64763555 100644 --- a/src/app/components/widgets/prometheus-widget/prometheus-widget.component.ts +++ b/src/app/components/widgets/prometheus-widget/prometheus-widget.component.ts @@ -7,8 +7,8 @@ import { ChartType, ChartDataSets } from 'chart.js'; import { Widget, WidgetArrayInstance } from '@app/helpers/widget'; import { IWidget } from '../IWidget'; import { Subscription } from 'rxjs'; -import { Label } from 'ng2-charts'; -import * as moment from 'moment'; +import { Label } from '@xirenec/ng2-charts'; +import moment from 'moment'; import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-prometheus-widget', diff --git a/src/app/components/widgets/prometheus-widget/setting-prometheus-widget.component.html b/src/app/components/widgets/prometheus-widget/setting-prometheus-widget.component.html index 6fc88f6f..f4fc4fa5 100644 --- a/src/app/components/widgets/prometheus-widget/setting-prometheus-widget.component.html +++ b/src/app/components/widgets/prometheus-widget/setting-prometheus-widget.component.html @@ -82,8 +82,8 @@
{{ 'widgets.prometheusChart.settings.query' | translate }}
{{ 'widgets.prometheusChart.settings.counter' | translate }} - - + {{ 'widgets.prometheusChart.settings.query' | translate }} (removed)="remove(item, 'prometheus')"> {{item}} cancel - - + + div { - & > .mat-form-field { + & > .mat-mdc-form-field { padding-right: 0.5rem; } } @@ -44,6 +44,8 @@ } .chips-container-selector { ::ng-deep { + /* 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-value { opacity: 0; } diff --git a/src/app/components/widgets/protosearch-widget/chips-input/chips-input.component.html b/src/app/components/widgets/protosearch-widget/chips-input/chips-input.component.html index b80a9762..9ff50196 100644 --- a/src/app/components/widgets/protosearch-widget/chips-input/chips-input.component.html +++ b/src/app/components/widgets/protosearch-widget/chips-input/chips-input.component.html @@ -1,14 +1,14 @@ - - + {{item.name}} cancel - + - - \ No newline at end of file + + diff --git a/src/app/components/widgets/protosearch-widget/protosearch-widget.component.html b/src/app/components/widgets/protosearch-widget/protosearch-widget.component.html index 8e12a3d5..18b16412 100644 --- a/src/app/components/widgets/protosearch-widget/protosearch-widget.component.html +++ b/src/app/components/widgets/protosearch-widget/protosearch-widget.component.html @@ -1,97 +1,181 @@ -
-
-
-
- - - - - {{item.selection}} - - - {{listItem.title}} - - - - - - - - - - - - - - {{item.selection}} - - - - - - - - - -
- {{ !item.func ? '' : item.func.name === 'None' ? '' : item.func.name }} -
- - - {{ function.name ? function.name : function.value }} - - - - - - - - - - - {{item.selection}} - - - close {{chip.val}} - - - - - -
- {{ !item.func ? '' : item.func.name === 'None' ? '' : item.func.name }} -
- - - {{ function.name ? function.name : function.value }} - - - - - - - - - - {{item.selection}} - - -
- {{ !item.func ? '' : item.func.name === 'None' ? '' : item.func.name }} -
- - - {{ function.name ? function.name : function.value }} - - - - - - - - - - {{item.selection}} - - -
- {{ !item.func ? '' : item.func.name === 'None' ? '' : item.func.name }} -
- - - {{ function.name ? function.name : function.value }} - - - - - - - - - - {{item.selection}} - - - - {{option.name ? option.name : option}} - - - - - - - {{item.selection}} - - - {{option.name ? option.name : option}} - - - - - - - {{item.selection}} - - - - {{option.name ? option.name : option}} - - - - - - - {{ item | json }} - - -
+ + + {{ item.selection }} + + + close + {{ chip.val }} + + + + +
+ {{ + !item.func + ? "" + : item.func.name === "None" + ? "" + : item.func.name + }} +
+ + + {{ + function.name + ? function.name + : function.value + }} + + + + + + + + + {{ item.selection }} + + +
+ {{ + !item.func + ? "" + : item.func.name === "None" + ? "" + : item.func.name + }} +
+ + + {{ + function.name + ? function.name + : function.value + }} + + + + + + + + + {{ item.selection }} + + +
+ {{ + !item.func + ? "" + : item.func.name === "None" + ? "" + : item.func.name + }} +
+ + + {{ + function.name + ? function.name + : function.value + }} + + + + + + + + + {{ item.selection }} + + + + {{ option.name ? option.name : option }} + + + + + + + {{ item.selection }} + + + {{ option.name ? option.name : option }} + + + + + + + {{ item.selection }} + + + + {{ option.name ? option.name : option }} + + + + + + + {{ item | json }} + + +
+
-
-
- - - + + + + + + + +
+ + + + +
+ + + +
- + 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 09d7a8ca..53582261 100644 --- a/src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss +++ b/src/app/components/widgets/protosearch-widget/protosearch-widget.component.scss @@ -115,7 +115,8 @@ .ng-select.ng-select-single .ng-select-container .ng-value-container { height: 1em; - + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ + /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version.*/ .mat-form-field-infix { position: inherit !important; } @@ -146,7 +147,7 @@ background: #fafafa; color: grey !important; - .mat-option.ng-option-selected:not(.ng-option-marked):not(:hover) { + .mat-mdc-option.ng-option-selected:not(.ng-option-marked):not(:hover) { background: #fbfbfb; &:not(.ng-option-disabled) { @@ -258,6 +259,8 @@ } .result-container-field { + /* 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-wrapper { padding-right: 5px !important; } @@ -268,6 +271,8 @@ font-size: 11px; } +/* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version.*/ +/* TODO(mdc-migration): The following rule targets internal classes of chips that may no longer apply for the MDC version.*/ .mat-chip-item { padding: 0; margin: 0; @@ -283,7 +288,7 @@ } } -.mat-standard-chip { +.mat-mdc-standard-chip { padding: 0; margin: 2px !important; color: grey !important; @@ -295,15 +300,52 @@ .in-widget { margin-left: 0; - + + // .search-btn { + // border-top-right-radius: 0px !important; + // border-bottom-right-radius: 0px !important; + // box-shadow: none !important; + // width: 80%; + // margin-right: 0px; + // } + + // .search-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: -1px 3px 1px -2px rgb(0 0 0 / 20%), 0px 2px 2px -3px rgb(0 0 0 / 14%), 0px 1px 5px -6px rgb(0 0 0 / 12%) !important; + // /* 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-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.*/ + // .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; + // } + // } + // } .search-btn { border-top-right-radius: 0px !important; border-bottom-right-radius: 0px !important; - box-shadow: none !important; width: 80%; + box-shadow: none; + margin-left: 0px; margin-right: 0px; } - + .search-select { position: relative; width: 10px; @@ -311,16 +353,19 @@ margin-left: 0px !important; border-top-left-radius: 0px !important; border-bottom-left-radius: 0px !important; + border-top-right-radius: 4px !important; + border-bottom-right-radius: 4px !important; border-left: 1px black solid; - box-shadow: -1px 3px 1px -2px rgb(0 0 0 / 20%), 0px 2px 2px -3px rgb(0 0 0 / 14%), 0px 1px 5px -6px rgb(0 0 0 / 12%) !important; - + box-shadow: none; + .mat-select-value { position: absolute; } - - .mat-select-arrow-wrapper { + + .mat-mdc-select-arrow-wrapper { display: block; - .mat-select-arrow { + + .mat-mdc-select-arrow { margin: 0px !important; margin-left: -5px !important; } @@ -330,4 +375,4 @@ .in-select { width: 100%; margin:unset; -} \ No newline at end of file +} diff --git a/src/app/components/widgets/protosearch-widget/ps-fields/multi-select-field/multi-select-field.component.html b/src/app/components/widgets/protosearch-widget/ps-fields/multi-select-field/multi-select-field.component.html index d047d633..a9d70dc9 100644 --- a/src/app/components/widgets/protosearch-widget/ps-fields/multi-select-field/multi-select-field.component.html +++ b/src/app/components/widgets/protosearch-widget/ps-fields/multi-select-field/multi-select-field.component.html @@ -1,7 +1,6 @@
- +
diff --git a/src/app/components/widgets/result-chart-widget/result-chart-widget.component.scss b/src/app/components/widgets/result-chart-widget/result-chart-widget.component.scss index 22a16d3c..c8077a73 100644 --- a/src/app/components/widgets/result-chart-widget/result-chart-widget.component.scss +++ b/src/app/components/widgets/result-chart-widget/result-chart-widget.component.scss @@ -81,7 +81,7 @@ section { width: 290px; } -.chart-button-row .mat-button-base { +.chart-button-row .mat-mdc-button-base { margin: 8px 8px 8px 0; } diff --git a/src/app/components/widgets/smart-input-widget/code-style-smart-input-field/code-style-smart-input-field.component.scss b/src/app/components/widgets/smart-input-widget/code-style-smart-input-field/code-style-smart-input-field.component.scss index 28e3502e..ad7491de 100644 --- a/src/app/components/widgets/smart-input-widget/code-style-smart-input-field/code-style-smart-input-field.component.scss +++ b/src/app/components/widgets/smart-input-widget/code-style-smart-input-field/code-style-smart-input-field.component.scss @@ -34,7 +34,7 @@ } } -::ng-deep.mat-menu-panel { +::ng-deep.mat-mdc-menu-panel { max-width: initial !important; } .info-icon { diff --git a/src/app/helpers/functions.ts b/src/app/helpers/functions.ts index 691290bf..5e49deca 100644 --- a/src/app/helpers/functions.ts +++ b/src/app/helpers/functions.ts @@ -1,4 +1,4 @@ -import * as moment from 'moment'; +import moment from 'moment'; import { Md5 } from 'ts-md5/dist/md5'; import { KeyValue } from '@angular/common'; export class Functions { @@ -245,8 +245,8 @@ export class Functions { } static saveToFile(data, filename, type = 'application/octet-stream') { const file = new Blob([data], { type: type }); - if (window.navigator.msSaveOrOpenBlob) {// IE10+ - window.navigator.msSaveOrOpenBlob(file, filename); + if (window.navigator["msSaveOrOpenBlob"]) {// IE10+ + window.navigator['msSaveOrOpenBlob'](file, filename); } else { // Others const a = document.createElement('a'), url = URL.createObjectURL(file); @@ -445,3 +445,13 @@ export function getStorage(key: string): any { // log('getStorage <<<', key, Functions.JSON_parse(localStorage.getItem(key))); return Functions.JSON_parse(localStorage.getItem(key)); } + +export function isSameHost(host1: string, host2: string): boolean { + try { + const host1Obj = new URL(host1); + const host2Obj = new URL(host2); + return host1Obj.origin === host2Obj.origin; + } catch (e) { + return false; + } +} diff --git a/src/app/helpers/ng-multiselect.directive.ts b/src/app/helpers/ng-multiselect.directive.ts index e27a657a..678d4845 100644 --- a/src/app/helpers/ng-multiselect.directive.ts +++ b/src/app/helpers/ng-multiselect.directive.ts @@ -18,7 +18,7 @@ import { } from '@angular/forms'; import { NgSelectComponent } from '@ng-select/ng-select'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; -import { untilDestroyed } from 'ngx-take-until-destroy'; +import { untilDestroyed } from '@ngneat/until-destroy'; import { ErrorStateMatcher } from '@angular/material/core'; export class NgSelectErrorStateMatcher { @@ -56,8 +56,8 @@ export class NgSelectFormFieldControlDirective return ( this._value === undefined || this._value === null || - this._value === [] || - this._value === {} || + this._value instanceof Array || + typeof this._value === 'object' || (this.host.multiple && this._value.length === 0) ); } diff --git a/src/app/helpers/parser.ts b/src/app/helpers/parser.ts index dc814c82..7763361b 100644 --- a/src/app/helpers/parser.ts +++ b/src/app/helpers/parser.ts @@ -2,7 +2,7 @@ import { environment } from '@environments/environment'; import { Md5 } from 'ts-md5/dist/md5'; import 'moment-timezone'; -import * as moment from 'moment'; +import moment from 'moment'; import { FlowItemType } from '@app/models/flow-item-type.model'; import { WorkerCommands } from '@app/models/worker-commands.module'; diff --git a/src/app/helpers/windowFunctions.ts b/src/app/helpers/windowFunctions.ts new file mode 100644 index 00000000..ee4931ae --- /dev/null +++ b/src/app/helpers/windowFunctions.ts @@ -0,0 +1,128 @@ +import { environment } from "@environments/environment"; +import { isSameHost, Functions } from "./functions"; + +export function getUriJson(): any { + if (location.search) { + try { + return JSON.parse( + decodeURIComponent(location.search.slice(1, -1)) + ); + } catch (err) { + const out = location.search + .slice(1) + .split('&') + .reduce((a, i) => { + const [key, value] = i.split('='); + if (key && value) { + a[key] = value; + } + return a; + }, {}); + if (JSON.stringify(out) === '{}') { + return null; + } else { + return out; + } + } + } else { + return null; + } +} +export function getUriParams(): any { + if (!!location.hash) { + return location.hash.replace('#', ''); + } + const lSearch = location.search || ''; + return lSearch + ? lSearch + .split('&') + .map((i) => i.replace('?', '').split('=')) + .reduce((a, b) => ((a[b[0]] = b[1]), a), {}) + : { callid: null, from: null, to: null, uuid: null }; +} +export function shareLinkUUID(): string { + return (location?.hash || '')?.replace('#', '') || ''; +} +export function emitWindowResize(): void { + setTimeout(() => { + try { + window.dispatchEvent(new Event('resize')); + } catch (e) { } + }); +} +export function getJsonFileDataByLink(name: string): Promise { + return new Promise((resolve) => { + resolve(window[`file__json_data_${name}`] || {}); + }); +} +export function saveToFile(data, filename, type = 'application/octet-stream') { + const file = new Blob([data], { type: type }); + const nav: any = window.navigator as any; + if (nav.msSaveOrOpenBlob) { + // IE10+ + nav.msSaveOrOpenBlob(file, filename); + } else { + // Others + const a = document.createElement('a'), + url = URL.createObjectURL(file); + a.href = url; + a.target = '(file)'; + a.download = filename; + document.body.appendChild(a); + a.click(); + setTimeout(function () { + document.body.removeChild(a); + window.URL.revokeObjectURL(url); + }, 0); + } +} +export function console2file(data, filename) { + if (!data) { + console.error('Console.save: No data'); + return; + } + + if (!filename) { + filename = 'console.json'; + } + + if (typeof data === 'object') { + data = JSON.stringify(data, undefined, 4); + } + + saveToFile(data, filename, 'txt/json'); +} +export function setStorage(key: string, value: any): void { + // saving JSON from object data + // log('setStorage >>>', key, value); + return localStorage.setItem(key, JSON.stringify(value)); +} +export function getStorage(key: string): any { + // log('getStorage <<<', key, Functions.JSON_parse(localStorage.getItem(key))); + return Functions.JSON_parse(localStorage.getItem(key)); +} + +export function getSelectedText() { + let selectedText: any = ''; + + // window.getSelection + if (window.getSelection) { + selectedText = window.getSelection(); + } + // document.getSelection + else if (document.getSelection) { + selectedText = document.getSelection(); + } + // document.selection + else if (document['selection']) { + selectedText = document['selection']?.createRange()?.text; + } else { + return ''; + } + // To write the selected text into the textarea + return selectedText + ''; +} + +export function isCurrentHost(host: string): boolean { + return isSameHost(window?.location.href, host) || isSameHost(environment.apiUrl, host) +} diff --git a/src/app/pipes/moment.pipe.ts b/src/app/pipes/moment.pipe.ts index f1b07d2b..64e76474 100644 --- a/src/app/pipes/moment.pipe.ts +++ b/src/app/pipes/moment.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; +import moment from 'moment'; @Pipe({ name: 'moment', diff --git a/src/app/services/authentication.service.ts b/src/app/services/authentication.service.ts index 53d5ecf6..098da3ab 100644 --- a/src/app/services/authentication.service.ts +++ b/src/app/services/authentication.service.ts @@ -6,14 +6,14 @@ import { map } from 'rxjs/operators'; import { environment } from '@environments/environment'; import { User, UserJWT } from '@app/models'; import { PreferenceUserSettingsService } from './preferences/user-settings.service'; -import * as _moment from 'moment'; +import moment from 'moment'; import { ConstValue } from '../models/const-value.model'; import { AlertService } from './alert.service'; import { Functions, setStorage } from '@app/helpers/functions'; import { TranslateService } from '@ngx-translate/core'; import jwt_decode from 'jwt-decode'; -const moment: any = _moment; +// // const moment: any = _moment; @Injectable({ providedIn: 'root' }) export class AuthenticationService { @@ -38,7 +38,7 @@ export class AuthenticationService { } catch (err) { console.error(err); setTimeout(() => { - this.translateService.get('notifications.error.invalidJWT').subscribe(res => { + this.translateService.get('notifications.error.invalidJWT').subscribe(res => { this.alertService.error(res); }) }, 100); diff --git a/src/app/services/call/full-transaction.service.ts b/src/app/services/call/full-transaction.service.ts index 41ec2d03..13982521 100644 --- a/src/app/services/call/full-transaction.service.ts +++ b/src/app/services/call/full-transaction.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { CallReportService } from '@app/services'; import { CallTransactionService } from '@app/services'; import { Observable } from 'rxjs'; -import { HepLogService } from '@app/services'; +// import { HepLogService } from '@app/services'; import { WorkerService } from '../worker.service'; import { WorkerCommands } from '@app/models/worker-commands.module'; import { Functions, log } from '@app/helpers/functions'; @@ -19,7 +19,7 @@ export class FullTransactionService { constructor( private callReportService: CallReportService, private callTransactionService: CallTransactionService, - private hepLogService: HepLogService, + // private hepLogService: HepLogService, private agentsubService: AgentsubService, private preferenceHepsubService: PreferenceHepsubService, private _pass: PreferenceAgentsubService, @@ -115,11 +115,11 @@ export class FullTransactionService { } } catch (err) { onError('agentCdr'); } - try { - const hepLogRes: any = await this.hepLogService.getLog(rt).toPromise(); - tData = await _worker({ tData, logsData: hepLogRes.data, type: 'logs' }); - tData.heplogs = hepLogRes.data; - } catch (err) { onError('heplogs'); } + // try { + // const hepLogRes: any = await this.hepLogService.getLog(rt).toPromise(); + // tData = await _worker({ tData, logsData: hepLogRes.data, type: 'logs' }); + // tData.heplogs = hepLogRes.data; + // } catch (err) { onError('heplogs'); } try { const callIdArr = tData?.data?.calldata.map(i => i.sid).sort().filter((i, k, a) => i !== a[k - 1]) || []; diff --git a/src/app/services/data-time-range.service.ts b/src/app/services/data-time-range.service.ts index 9d78861a..5fc0a279 100644 --- a/src/app/services/data-time-range.service.ts +++ b/src/app/services/data-time-range.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { SessionStorageService, UserSettings } from './session-storage.service'; -import * as _moment from 'moment-timezone'; -const moment: any = _moment; +import moment from 'moment-timezone'; +// const moment: any = _moment; export interface DateTimeTick { diff --git a/src/app/services/session-storage.service.ts b/src/app/services/session-storage.service.ts index da5524b2..6a772087 100644 --- a/src/app/services/session-storage.service.ts +++ b/src/app/services/session-storage.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { AuthenticationService } from './authentication.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import * as moment from 'moment'; +import moment from 'moment'; import { ConstValue, UserConstValue } from '@app/models'; import { Functions, log, setStorage } from '@app/helpers/functions'; diff --git a/src/app/services/time-formatting.service.ts b/src/app/services/time-formatting.service.ts index cd4139eb..22225051 100644 --- a/src/app/services/time-formatting.service.ts +++ b/src/app/services/time-formatting.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import * as moment from 'moment'; +import moment from 'moment'; import { PreferenceAdvancedService } from './preferences/advanced.service'; export interface DateFormat { @@ -25,7 +25,7 @@ export class TimeFormattingService { this.getFormat(); } - + async getFormat() { let advancedFormat; try { @@ -45,7 +45,7 @@ export class TimeFormattingService { dateTimeMs: `${dateFormat} ${timeFormat}.SSS`, dateTimeMsZ: `${dateFormat} ${timeFormat}.SSS Z`, } - + } else { // this.dateFormat = advancedFormat; const timeRegex = /[H|h]{2}.mm.ss/; @@ -66,5 +66,5 @@ export class TimeFormattingService { } return this.dateFormat; } - + } diff --git a/src/app/services/tooltip.service.ts b/src/app/services/tooltip.service.ts index d472cdf7..7d6e14ed 100644 --- a/src/app/services/tooltip.service.ts +++ b/src/app/services/tooltip.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import * as moment from 'moment'; +import moment from 'moment'; import { Functions } from '@app/helpers/functions'; export const MetricsMap = { diff --git a/src/app/workers/clickhouse.worker.ts b/src/app/workers/clickhouse.worker.ts index e1011944..8e3e50a6 100644 --- a/src/app/workers/clickhouse.worker.ts +++ b/src/app/workers/clickhouse.worker.ts @@ -1,7 +1,7 @@ /// -import { Md5 } from 'ts-md5/dist/md5'; +import { Md5 } from 'ts-md5'; -import * as moment from 'moment'; +import moment from 'moment'; import { WorkerCommands } from '@app/models/worker-commands.module'; class Functions { static getColorByString(str: string, saturation?: number, lightness?: number, alpha?: number, offset?: number) { diff --git a/src/app/workers/qos.worker.ts b/src/app/workers/qos.worker.ts index 10c4b38a..ceb4eb72 100644 --- a/src/app/workers/qos.worker.ts +++ b/src/app/workers/qos.worker.ts @@ -1,6 +1,6 @@ /// -import * as moment from 'moment'; +import moment from 'moment'; class QosProcessor { diff --git a/src/assets/css/mapbox-gl.css b/src/assets/css/mapbox-gl.css new file mode 100644 index 00000000..0221a0da --- /dev/null +++ b/src/assets/css/mapbox-gl.css @@ -0,0 +1 @@ +.mapboxgl-map{font:12px/20px Helvetica Neue,Arial,Helvetica,sans-serif;overflow:hidden;position:relative;-webkit-tap-highlight-color:rgba(0,0,0,0)}.mapboxgl-canvas{position:absolute;left:0;top:0}.mapboxgl-map:-webkit-full-screen{width:100%;height:100%}.mapboxgl-canary{background-color:salmon}.mapboxgl-canvas-container.mapboxgl-interactive,.mapboxgl-ctrl-group button.mapboxgl-ctrl-compass{cursor:-webkit-grab;cursor:-moz-grab;cursor:grab;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer{cursor:pointer}.mapboxgl-canvas-container.mapboxgl-interactive:active,.mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,.mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas{touch-action:pan-x pan-y}.mapboxgl-canvas-container.mapboxgl-touch-drag-pan,.mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas{touch-action:pinch-zoom}.mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,.mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas{touch-action:none}.mapboxgl-ctrl-bottom-left,.mapboxgl-ctrl-bottom-right,.mapboxgl-ctrl-top-left,.mapboxgl-ctrl-top-right{position:absolute;pointer-events:none;z-index:2}.mapboxgl-ctrl-top-left{top:0;left:0}.mapboxgl-ctrl-top-right{top:0;right:0}.mapboxgl-ctrl-bottom-left{bottom:0;left:0}.mapboxgl-ctrl-bottom-right{right:0;bottom:0}.mapboxgl-ctrl{clear:both;pointer-events:auto;transform:translate(0)}.mapboxgl-ctrl-top-left .mapboxgl-ctrl{margin:10px 0 0 10px;float:left}.mapboxgl-ctrl-top-right .mapboxgl-ctrl{margin:10px 10px 0 0;float:right}.mapboxgl-ctrl-bottom-left .mapboxgl-ctrl{margin:0 0 10px 10px;float:left}.mapboxgl-ctrl-bottom-right .mapboxgl-ctrl{margin:0 10px 10px 0;float:right}.mapboxgl-ctrl-group{border-radius:4px;background:#fff}.mapboxgl-ctrl-group:not(:empty){-moz-box-shadow:0 0 2px rgba(0,0,0,.1);-webkit-box-shadow:0 0 2px rgba(0,0,0,.1);box-shadow:0 0 0 2px rgba(0,0,0,.1)}@media (-ms-high-contrast:active){.mapboxgl-ctrl-group:not(:empty){box-shadow:0 0 0 2px ButtonText}}.mapboxgl-ctrl-group button{width:29px;height:29px;display:block;padding:0;outline:none;border:0;box-sizing:border-box;background-color:transparent;cursor:pointer}.mapboxgl-ctrl-group button+button{border-top:1px solid #ddd}.mapboxgl-ctrl button .mapboxgl-ctrl-icon{display:block;width:100%;height:100%;background-repeat:no-repeat;background-position:50%}@media (-ms-high-contrast:active){.mapboxgl-ctrl-icon{background-color:transparent}.mapboxgl-ctrl-group button+button{border-top:1px solid ButtonText}}.mapboxgl-ctrl button::-moz-focus-inner{border:0;padding:0}.mapboxgl-ctrl-group button:focus{box-shadow:0 0 2px 2px #0096ff}.mapboxgl-ctrl button:disabled{cursor:not-allowed}.mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon{opacity:.25}.mapboxgl-ctrl button:not(:disabled):hover{background-color:rgba(0,0,0,.05)}.mapboxgl-ctrl-group button:focus:focus-visible{box-shadow:0 0 2px 2px #0096ff}.mapboxgl-ctrl-group button:focus:not(:focus-visible){box-shadow:none}.mapboxgl-ctrl-group button:focus:first-child{border-radius:4px 4px 0 0}.mapboxgl-ctrl-group button:focus:last-child{border-radius:0 0 4px 4px}.mapboxgl-ctrl-group button:focus:only-child{border-radius:inherit}.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M10 13c-.75 0-1.5.75-1.5 1.5S9.25 16 10 16h9c.75 0 1.5-.75 1.5-1.5S19.75 13 19 13h-9z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M14.5 8.5c-.75 0-1.5.75-1.5 1.5v3h-3c-.75 0-1.5.75-1.5 1.5S9.25 16 10 16h3v3c0 .75.75 1.5 1.5 1.5S16 19.75 16 19v-3h3c.75 0 1.5-.75 1.5-1.5S19.75 13 19 13h-3v-3c0-.75-.75-1.5-1.5-1.5z'/%3E%3C/svg%3E")}@media (-ms-high-contrast:active){.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23fff'%3E%3Cpath d='M10 13c-.75 0-1.5.75-1.5 1.5S9.25 16 10 16h9c.75 0 1.5-.75 1.5-1.5S19.75 13 19 13h-9z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23fff'%3E%3Cpath d='M14.5 8.5c-.75 0-1.5.75-1.5 1.5v3h-3c-.75 0-1.5.75-1.5 1.5S9.25 16 10 16h3v3c0 .75.75 1.5 1.5 1.5S16 19.75 16 19v-3h3c.75 0 1.5-.75 1.5-1.5S19.75 13 19 13h-3v-3c0-.75-.75-1.5-1.5-1.5z'/%3E%3C/svg%3E")}}@media (-ms-high-contrast:black-on-white){.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-out .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10 13c-.75 0-1.5.75-1.5 1.5S9.25 16 10 16h9c.75 0 1.5-.75 1.5-1.5S19.75 13 19 13h-9z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-zoom-in .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M14.5 8.5c-.75 0-1.5.75-1.5 1.5v3h-3c-.75 0-1.5.75-1.5 1.5S9.25 16 10 16h3v3c0 .75.75 1.5 1.5 1.5S16 19.75 16 19v-3h3c.75 0 1.5-.75 1.5-1.5S19.75 13 19 13h-3v-3c0-.75-.75-1.5-1.5-1.5z'/%3E%3C/svg%3E")}}.mapboxgl-ctrl button.mapboxgl-ctrl-fullscreen .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M24 16v5.5c0 1.75-.75 2.5-2.5 2.5H16v-1l3-1.5-4-5.5 1-1 5.5 4 1.5-3h1zM6 16l1.5 3 5.5-4 1 1-4 5.5 3 1.5v1H7.5C5.75 24 5 23.25 5 21.5V16h1zm7-11v1l-3 1.5 4 5.5-1 1-5.5-4L6 13H5V7.5C5 5.75 5.75 5 7.5 5H13zm11 2.5c0-1.75-.75-2.5-2.5-2.5H16v1l3 1.5-4 5.5 1 1 5.5-4 1.5 3h1V7.5z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-shrink .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M18.5 16c-1.75 0-2.5.75-2.5 2.5V24h1l1.5-3 5.5 4 1-1-4-5.5 3-1.5v-1h-5.5zM13 18.5c0-1.75-.75-2.5-2.5-2.5H5v1l3 1.5L4 24l1 1 5.5-4 1.5 3h1v-5.5zm3-8c0 1.75.75 2.5 2.5 2.5H24v-1l-3-1.5L25 5l-1-1-5.5 4L17 5h-1v5.5zM10.5 13c1.75 0 2.5-.75 2.5-2.5V5h-1l-1.5 3L5 4 4 5l4 5.5L5 12v1h5.5z'/%3E%3C/svg%3E")}@media (-ms-high-contrast:active){.mapboxgl-ctrl button.mapboxgl-ctrl-fullscreen .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23fff'%3E%3Cpath d='M24 16v5.5c0 1.75-.75 2.5-2.5 2.5H16v-1l3-1.5-4-5.5 1-1 5.5 4 1.5-3h1zM6 16l1.5 3 5.5-4 1 1-4 5.5 3 1.5v1H7.5C5.75 24 5 23.25 5 21.5V16h1zm7-11v1l-3 1.5 4 5.5-1 1-5.5-4L6 13H5V7.5C5 5.75 5.75 5 7.5 5H13zm11 2.5c0-1.75-.75-2.5-2.5-2.5H16v1l3 1.5-4 5.5 1 1 5.5-4 1.5 3h1V7.5z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-shrink .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23fff'%3E%3Cpath d='M18.5 16c-1.75 0-2.5.75-2.5 2.5V24h1l1.5-3 5.5 4 1-1-4-5.5 3-1.5v-1h-5.5zM13 18.5c0-1.75-.75-2.5-2.5-2.5H5v1l3 1.5L4 24l1 1 5.5-4 1.5 3h1v-5.5zm3-8c0 1.75.75 2.5 2.5 2.5H24v-1l-3-1.5L25 5l-1-1-5.5 4L17 5h-1v5.5zM10.5 13c1.75 0 2.5-.75 2.5-2.5V5h-1l-1.5 3L5 4 4 5l4 5.5L5 12v1h5.5z'/%3E%3C/svg%3E")}}@media (-ms-high-contrast:black-on-white){.mapboxgl-ctrl button.mapboxgl-ctrl-fullscreen .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M24 16v5.5c0 1.75-.75 2.5-2.5 2.5H16v-1l3-1.5-4-5.5 1-1 5.5 4 1.5-3h1zM6 16l1.5 3 5.5-4 1 1-4 5.5 3 1.5v1H7.5C5.75 24 5 23.25 5 21.5V16h1zm7-11v1l-3 1.5 4 5.5-1 1-5.5-4L6 13H5V7.5C5 5.75 5.75 5 7.5 5H13zm11 2.5c0-1.75-.75-2.5-2.5-2.5H16v1l3 1.5-4 5.5 1 1 5.5-4 1.5 3h1V7.5z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-shrink .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M18.5 16c-1.75 0-2.5.75-2.5 2.5V24h1l1.5-3 5.5 4 1-1-4-5.5 3-1.5v-1h-5.5zM13 18.5c0-1.75-.75-2.5-2.5-2.5H5v1l3 1.5L4 24l1 1 5.5-4 1.5 3h1v-5.5zm3-8c0 1.75.75 2.5 2.5 2.5H24v-1l-3-1.5L25 5l-1-1-5.5 4L17 5h-1v5.5zM10.5 13c1.75 0 2.5-.75 2.5-2.5V5h-1l-1.5 3L5 4 4 5l4 5.5L5 12v1h5.5z'/%3E%3C/svg%3E")}}.mapboxgl-ctrl button.mapboxgl-ctrl-compass .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M10.5 14l4-8 4 8h-8z'/%3E%3Cpath d='M10.5 16l4 8 4-8h-8z' fill='%23ccc'/%3E%3C/svg%3E")}@media (-ms-high-contrast:active){.mapboxgl-ctrl button.mapboxgl-ctrl-compass .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg' fill='%23fff'%3E%3Cpath d='M10.5 14l4-8 4 8h-8z'/%3E%3Cpath d='M10.5 16l4 8 4-8h-8z' fill='%23999'/%3E%3C/svg%3E")}}@media (-ms-high-contrast:black-on-white){.mapboxgl-ctrl button.mapboxgl-ctrl-compass .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 29 29' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 14l4-8 4 8h-8z'/%3E%3Cpath d='M10.5 16l4 8 4-8h-8z' fill='%23ccc'/%3E%3C/svg%3E")}}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23333'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate:disabled .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23aaa'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3Cpath d='M14 5l1 1-9 9-1-1 9-9z' fill='red'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-active .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%2333b5e5'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-active-error .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23e58978'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%2333b5e5'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background-error .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23e54e33'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-waiting .mapboxgl-ctrl-icon{-webkit-animation:mapboxgl-spin 2s linear infinite;-moz-animation:mapboxgl-spin 2s infinite linear;-o-animation:mapboxgl-spin 2s infinite linear;-ms-animation:mapboxgl-spin 2s infinite linear;animation:mapboxgl-spin 2s linear infinite}@media (-ms-high-contrast:active){.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23fff'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate:disabled .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23999'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3Cpath d='M14 5l1 1-9 9-1-1 9-9z' fill='red'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-active .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%2333b5e5'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-active-error .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23e58978'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%2333b5e5'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background-error .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23e54e33'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3C/svg%3E")}}@media (-ms-high-contrast:black-on-white){.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3C/svg%3E")}.mapboxgl-ctrl button.mapboxgl-ctrl-geolocate:disabled .mapboxgl-ctrl-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='29' height='29' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill='%23666'%3E%3Cpath d='M10 4C9 4 9 5 9 5v.1A5 5 0 005.1 9H5s-1 0-1 1 1 1 1 1h.1A5 5 0 009 14.9v.1s0 1 1 1 1-1 1-1v-.1a5 5 0 003.9-3.9h.1s1 0 1-1-1-1-1-1h-.1A5 5 0 0011 5.1V5s0-1-1-1zm0 2.5a3.5 3.5 0 110 7 3.5 3.5 0 110-7z'/%3E%3Ccircle cx='10' cy='10' r='2'/%3E%3Cpath d='M14 5l1 1-9 9-1-1 9-9z' fill='red'/%3E%3C/svg%3E")}}@-webkit-keyframes mapboxgl-spin{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}@-moz-keyframes mapboxgl-spin{0%{-moz-transform:rotate(0deg)}to{-moz-transform:rotate(1turn)}}@-o-keyframes mapboxgl-spin{0%{-o-transform:rotate(0deg)}to{-o-transform:rotate(1turn)}}@-ms-keyframes mapboxgl-spin{0%{-ms-transform:rotate(0deg)}to{-ms-transform:rotate(1turn)}}@keyframes mapboxgl-spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}a.mapboxgl-ctrl-logo{width:88px;height:23px;margin:0 0 -4px -4px;display:block;background-repeat:no-repeat;cursor:pointer;overflow:hidden;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E%3Cdefs%3E%3Cpath id='a' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E%3Cpath id='b' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E%3C/defs%3E%3Cmask id='c'%3E%3Crect width='100%25' height='100%25' fill='%23fff'/%3E%3Cuse xlink:href='%23a'/%3E%3Cuse xlink:href='%23b'/%3E%3C/mask%3E%3Cg opacity='.3' stroke='%23000' stroke-width='3'%3E%3Ccircle mask='url(%23c)' cx='11.5' cy='11.5' r='9.25'/%3E%3Cuse xlink:href='%23b' mask='url(%23c)'/%3E%3C/g%3E%3Cg opacity='.9' fill='%23fff'%3E%3Cuse xlink:href='%23a'/%3E%3Cuse xlink:href='%23b'/%3E%3C/g%3E%3C/svg%3E")}a.mapboxgl-ctrl-logo.mapboxgl-compact{width:23px}@media (-ms-high-contrast:active){a.mapboxgl-ctrl-logo{background-color:transparent;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E%3Cdefs%3E%3Cpath id='a' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E%3Cpath id='b' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E%3C/defs%3E%3Cmask id='c'%3E%3Crect width='100%25' height='100%25' fill='%23fff'/%3E%3Cuse xlink:href='%23a'/%3E%3Cuse xlink:href='%23b'/%3E%3C/mask%3E%3Cg stroke='%23000' stroke-width='3'%3E%3Ccircle mask='url(%23c)' cx='11.5' cy='11.5' r='9.25'/%3E%3Cuse xlink:href='%23b' mask='url(%23c)'/%3E%3C/g%3E%3Cg fill='%23fff'%3E%3Cuse xlink:href='%23a'/%3E%3Cuse xlink:href='%23b'/%3E%3C/g%3E%3C/svg%3E")}}@media (-ms-high-contrast:black-on-white){a.mapboxgl-ctrl-logo{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E%3Cdefs%3E%3Cpath id='a' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E%3Cpath id='b' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E%3C/defs%3E%3Cmask id='c'%3E%3Crect width='100%25' height='100%25' fill='%23fff'/%3E%3Cuse xlink:href='%23a'/%3E%3Cuse xlink:href='%23b'/%3E%3C/mask%3E%3Cg stroke='%23fff' stroke-width='3' fill='%23fff'%3E%3Ccircle mask='url(%23c)' cx='11.5' cy='11.5' r='9.25'/%3E%3Cuse xlink:href='%23b' mask='url(%23c)'/%3E%3C/g%3E%3Cuse xlink:href='%23a'/%3E%3Cuse xlink:href='%23b'/%3E%3C/svg%3E")}}.mapboxgl-ctrl.mapboxgl-ctrl-attrib{padding:0 5px;background-color:hsla(0,0%,100%,.5);margin:0}@media screen{.mapboxgl-ctrl-attrib.mapboxgl-compact{min-height:20px;padding:0;margin:10px;position:relative;background-color:#fff;border-radius:3px 12px 12px 3px}.mapboxgl-ctrl-attrib.mapboxgl-compact:hover{padding:2px 24px 2px 4px;visibility:visible;margin-top:6px}.mapboxgl-ctrl-bottom-left>.mapboxgl-ctrl-attrib.mapboxgl-compact:hover,.mapboxgl-ctrl-top-left>.mapboxgl-ctrl-attrib.mapboxgl-compact:hover{padding:2px 4px 2px 24px;border-radius:12px 3px 3px 12px}.mapboxgl-ctrl-attrib.mapboxgl-compact .mapboxgl-ctrl-attrib-inner{display:none}.mapboxgl-ctrl-attrib.mapboxgl-compact:hover .mapboxgl-ctrl-attrib-inner{display:block}.mapboxgl-ctrl-attrib.mapboxgl-compact:after{content:"";cursor:pointer;position:absolute;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='24' height='24' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill-rule='evenodd'%3E%3Cpath d='M4 10a6 6 0 1012 0 6 6 0 10-12 0m5-3a1 1 0 102 0 1 1 0 10-2 0m0 3a1 1 0 112 0v3a1 1 0 11-2 0'/%3E%3C/svg%3E");background-color:hsla(0,0%,100%,.5);width:24px;height:24px;box-sizing:border-box;border-radius:12px}.mapboxgl-ctrl-bottom-right>.mapboxgl-ctrl-attrib.mapboxgl-compact:after{bottom:0;right:0}.mapboxgl-ctrl-top-right>.mapboxgl-ctrl-attrib.mapboxgl-compact:after{top:0;right:0}.mapboxgl-ctrl-top-left>.mapboxgl-ctrl-attrib.mapboxgl-compact:after{top:0;left:0}.mapboxgl-ctrl-bottom-left>.mapboxgl-ctrl-attrib.mapboxgl-compact:after{bottom:0;left:0}}@media screen and (-ms-high-contrast:active){.mapboxgl-ctrl-attrib.mapboxgl-compact:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='24' height='24' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill-rule='evenodd' fill='%23fff'%3E%3Cpath d='M4 10a6 6 0 1012 0 6 6 0 10-12 0m5-3a1 1 0 102 0 1 1 0 10-2 0m0 3a1 1 0 112 0v3a1 1 0 11-2 0'/%3E%3C/svg%3E")}}@media screen and (-ms-high-contrast:black-on-white){.mapboxgl-ctrl-attrib.mapboxgl-compact:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg width='24' height='24' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg' fill-rule='evenodd'%3E%3Cpath d='M4 10a6 6 0 1012 0 6 6 0 10-12 0m5-3a1 1 0 102 0 1 1 0 10-2 0m0 3a1 1 0 112 0v3a1 1 0 11-2 0'/%3E%3C/svg%3E")}}.mapboxgl-ctrl-attrib a{color:rgba(0,0,0,.75);text-decoration:none}.mapboxgl-ctrl-attrib a:hover{color:inherit;text-decoration:underline}.mapboxgl-ctrl-attrib .mapbox-improve-map{font-weight:700;margin-left:2px}.mapboxgl-attrib-empty{display:none}.mapboxgl-ctrl-scale{background-color:hsla(0,0%,100%,.75);font-size:10px;border:2px solid #333;border-top:#333;padding:0 5px;color:#333;box-sizing:border-box}.mapboxgl-popup{position:absolute;top:0;left:0;display:-webkit-flex;display:flex;will-change:transform;pointer-events:none}.mapboxgl-popup-anchor-top,.mapboxgl-popup-anchor-top-left,.mapboxgl-popup-anchor-top-right{-webkit-flex-direction:column;flex-direction:column}.mapboxgl-popup-anchor-bottom,.mapboxgl-popup-anchor-bottom-left,.mapboxgl-popup-anchor-bottom-right{-webkit-flex-direction:column-reverse;flex-direction:column-reverse}.mapboxgl-popup-anchor-left{-webkit-flex-direction:row;flex-direction:row}.mapboxgl-popup-anchor-right{-webkit-flex-direction:row-reverse;flex-direction:row-reverse}.mapboxgl-popup-tip{width:0;height:0;border:10px solid transparent;z-index:1}.mapboxgl-popup-anchor-top .mapboxgl-popup-tip{-webkit-align-self:center;align-self:center;border-top:none;border-bottom-color:#fff}.mapboxgl-popup-anchor-top-left .mapboxgl-popup-tip{-webkit-align-self:flex-start;align-self:flex-start;border-top:none;border-left:none;border-bottom-color:#fff}.mapboxgl-popup-anchor-top-right .mapboxgl-popup-tip{-webkit-align-self:flex-end;align-self:flex-end;border-top:none;border-right:none;border-bottom-color:#fff}.mapboxgl-popup-anchor-bottom .mapboxgl-popup-tip{-webkit-align-self:center;align-self:center;border-bottom:none;border-top-color:#fff}.mapboxgl-popup-anchor-bottom-left .mapboxgl-popup-tip{-webkit-align-self:flex-start;align-self:flex-start;border-bottom:none;border-left:none;border-top-color:#fff}.mapboxgl-popup-anchor-bottom-right .mapboxgl-popup-tip{-webkit-align-self:flex-end;align-self:flex-end;border-bottom:none;border-right:none;border-top-color:#fff}.mapboxgl-popup-anchor-left .mapboxgl-popup-tip{-webkit-align-self:center;align-self:center;border-left:none;border-right-color:#fff}.mapboxgl-popup-anchor-right .mapboxgl-popup-tip{-webkit-align-self:center;align-self:center;border-right:none;border-left-color:#fff}.mapboxgl-popup-close-button{position:absolute;right:0;top:0;border:0;border-radius:0 3px 0 0;cursor:pointer;background-color:transparent}.mapboxgl-popup-close-button:hover{background-color:rgba(0,0,0,.05)}.mapboxgl-popup-content{position:relative;background:#fff;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.1);padding:10px 10px 15px;pointer-events:auto}.mapboxgl-popup-anchor-top-left .mapboxgl-popup-content{border-top-left-radius:0}.mapboxgl-popup-anchor-top-right .mapboxgl-popup-content{border-top-right-radius:0}.mapboxgl-popup-anchor-bottom-left .mapboxgl-popup-content{border-bottom-left-radius:0}.mapboxgl-popup-anchor-bottom-right .mapboxgl-popup-content{border-bottom-right-radius:0}.mapboxgl-popup-track-pointer{display:none}.mapboxgl-popup-track-pointer *{pointer-events:none;user-select:none}.mapboxgl-map:hover .mapboxgl-popup-track-pointer{display:flex}.mapboxgl-map:active .mapboxgl-popup-track-pointer{display:none}.mapboxgl-marker{position:absolute;top:0;left:0;will-change:transform}.mapboxgl-user-location-dot,.mapboxgl-user-location-dot:before{background-color:#1da1f2;width:15px;height:15px;border-radius:50%}.mapboxgl-user-location-dot:before{content:"";position:absolute;-webkit-animation:mapboxgl-user-location-dot-pulse 2s infinite;-moz-animation:mapboxgl-user-location-dot-pulse 2s infinite;-ms-animation:mapboxgl-user-location-dot-pulse 2s infinite;animation:mapboxgl-user-location-dot-pulse 2s infinite}.mapboxgl-user-location-dot:after{border-radius:50%;border:2px solid #fff;content:"";height:19px;left:-2px;position:absolute;top:-2px;width:19px;box-sizing:border-box;box-shadow:0 0 3px rgba(0,0,0,.35)}@-webkit-keyframes mapboxgl-user-location-dot-pulse{0%{-webkit-transform:scale(1);opacity:1}70%{-webkit-transform:scale(3);opacity:0}to{-webkit-transform:scale(1);opacity:0}}@-ms-keyframes mapboxgl-user-location-dot-pulse{0%{-ms-transform:scale(1);opacity:1}70%{-ms-transform:scale(3);opacity:0}to{-ms-transform:scale(1);opacity:0}}@keyframes mapboxgl-user-location-dot-pulse{0%{transform:scale(1);opacity:1}70%{transform:scale(3);opacity:0}to{transform:scale(1);opacity:0}}.mapboxgl-user-location-dot-stale{background-color:#aaa}.mapboxgl-user-location-dot-stale:after{display:none}.mapboxgl-user-location-accuracy-circle{background-color:rgba(29,161,242,.2);width:1px;height:1px;border-radius:100%}.mapboxgl-crosshair,.mapboxgl-crosshair .mapboxgl-interactive,.mapboxgl-crosshair .mapboxgl-interactive:active{cursor:crosshair}.mapboxgl-boxzoom{position:absolute;top:0;left:0;width:0;height:0;background:#fff;border:2px dotted #202020;opacity:.5}@media print{.mapbox-improve-map{display:none}} \ No newline at end of file diff --git a/src/assets/css/vis.min.scss b/src/assets/css/vis.min.scss new file mode 100644 index 00000000..c96c12c3 --- /dev/null +++ b/src/assets/css/vis.min.scss @@ -0,0 +1,1355 @@ +.vis .overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 10 +} + +.vis-active { + box-shadow: 0 0 10px #86d5f8 +} + +.vis [class*=span] { + min-height: 0; + width: auto +} + +div.vis-configuration { + position: relative; + display: block; + float: left; + font-size: 12px +} + +div.vis-configuration-wrapper { + display: block; + width: 700px +} + +div.vis-configuration-wrapper::after { + clear: both; + content: ""; + display: block +} + +div.vis-configuration.vis-config-option-container { + display: block; + width: 495px; + background-color: #fff; + border: 2px solid #f7f8fa; + border-radius: 4px; + margin-top: 20px; + left: 10px; + padding-left: 5px +} + +div.vis-configuration.vis-config-button { + display: block; + width: 495px; + height: 25px; + vertical-align: middle; + line-height: 25px; + background-color: #f7f8fa; + border: 2px solid #ceced0; + border-radius: 4px; + margin-top: 20px; + left: 10px; + padding-left: 5px; + cursor: pointer; + margin-bottom: 30px +} + +div.vis-configuration.vis-config-button.hover { + background-color: #4588e6; + border: 2px solid #214373; + color: #fff +} + +div.vis-configuration.vis-config-item { + display: block; + float: left; + width: 495px; + height: 25px; + vertical-align: middle; + line-height: 25px +} + +div.vis-configuration.vis-config-item.vis-config-s2 { + left: 10px; + background-color: #f7f8fa; + padding-left: 5px; + border-radius: 3px +} + +div.vis-configuration.vis-config-item.vis-config-s3 { + left: 20px; + background-color: #e4e9f0; + padding-left: 5px; + border-radius: 3px +} + +div.vis-configuration.vis-config-item.vis-config-s4 { + left: 30px; + background-color: #cfd8e6; + padding-left: 5px; + border-radius: 3px +} + +div.vis-configuration.vis-config-header { + font-size: 18px; + font-weight: 700 +} + +div.vis-configuration.vis-config-label { + width: 120px; + height: 25px; + line-height: 25px +} + +div.vis-configuration.vis-config-label.vis-config-s3 { + width: 110px +} + +div.vis-configuration.vis-config-label.vis-config-s4 { + width: 100px +} + +div.vis-configuration.vis-config-colorBlock { + top: 1px; + width: 30px; + height: 19px; + border: 1px solid #444; + border-radius: 2px; + padding: 0; + margin: 0; + cursor: pointer +} + +input.vis-configuration.vis-config-checkbox { + left: -5px +} + +input.vis-configuration.vis-config-rangeinput { + position: relative; + top: -5px; + width: 60px; + padding: 1px; + margin: 0; + pointer-events: none +} + +input.vis-configuration.vis-config-range { + -webkit-appearance: none; + border: 0 solid #fff; + background-color: rgba(0, 0, 0, 0); + width: 300px; + height: 20px +} + +input.vis-configuration.vis-config-range::-webkit-slider-runnable-track { + width: 300px; + height: 5px; + background: #dedede; + background: -moz-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dedede), color-stop(99%, #c8c8c8)); + background: -webkit-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: -o-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: -ms-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: linear-gradient(to bottom, #dedede 0, #c8c8c8 99%); + border: 1px solid #999; + box-shadow: #aaa 0 0 3px 0; + border-radius: 3px +} + +input.vis-configuration.vis-config-range::-webkit-slider-thumb { + -webkit-appearance: none; + border: 1px solid #14334b; + height: 17px; + width: 17px; + border-radius: 50%; + background: #3876c2; + background: -moz-linear-gradient(top, #3876c2 0, #385380 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3876c2), color-stop(100%, #385380)); + background: -webkit-linear-gradient(top, #3876c2 0, #385380 100%); + background: -o-linear-gradient(top, #3876c2 0, #385380 100%); + background: -ms-linear-gradient(top, #3876c2 0, #385380 100%); + background: linear-gradient(to bottom, #3876c2 0, #385380 100%); + box-shadow: #111927 0 0 1px 0; + margin-top: -7px +} + +input.vis-configuration.vis-config-range:focus { + outline: 0 +} + +input.vis-configuration.vis-config-range:focus::-webkit-slider-runnable-track { + background: #9d9d9d; + background: -moz-linear-gradient(top, #9d9d9d 0, #c8c8c8 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #9d9d9d), color-stop(99%, #c8c8c8)); + background: -webkit-linear-gradient(top, #9d9d9d 0, #c8c8c8 99%); + background: -o-linear-gradient(top, #9d9d9d 0, #c8c8c8 99%); + background: -ms-linear-gradient(top, #9d9d9d 0, #c8c8c8 99%); + background: linear-gradient(to bottom, #9d9d9d 0, #c8c8c8 99%) +} + +input.vis-configuration.vis-config-range::-moz-range-track { + width: 300px; + height: 10px; + background: #dedede; + background: -moz-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dedede), color-stop(99%, #c8c8c8)); + background: -webkit-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: -o-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: -ms-linear-gradient(top, #dedede 0, #c8c8c8 99%); + background: linear-gradient(to bottom, #dedede 0, #c8c8c8 99%); + border: 1px solid #999; + box-shadow: #aaa 0 0 3px 0; + border-radius: 3px +} + +input.vis-configuration.vis-config-range::-moz-range-thumb { + border: none; + height: 16px; + width: 16px; + border-radius: 50%; + background: #385380 +} + +input.vis-configuration.vis-config-range:-moz-focusring { + outline: 1px solid #fff; + outline-offset: -1px +} + +input.vis-configuration.vis-config-range::-ms-track { + width: 300px; + height: 5px; + background: 0 0; + border-color: transparent; + border-width: 6px 0; + color: transparent +} + +input.vis-configuration.vis-config-range::-ms-fill-lower { + background: #777; + border-radius: 10px +} + +input.vis-configuration.vis-config-range::-ms-fill-upper { + background: #ddd; + border-radius: 10px +} + +input.vis-configuration.vis-config-range::-ms-thumb { + border: none; + height: 16px; + width: 16px; + border-radius: 50%; + background: #385380 +} + +input.vis-configuration.vis-config-range:focus::-ms-fill-lower { + background: #888 +} + +input.vis-configuration.vis-config-range:focus::-ms-fill-upper { + background: #ccc +} + +.vis-configuration-popup { + position: absolute; + background: rgba(57, 76, 89, .85); + border: 2px solid #f2faff; + line-height: 30px; + height: 30px; + width: 150px; + text-align: center; + color: #fff; + font-size: 14px; + border-radius: 4px; + -webkit-transition: opacity .3s ease-in-out; + -moz-transition: opacity .3s ease-in-out; + transition: opacity .3s ease-in-out +} + +.vis-configuration-popup:after, +.vis-configuration-popup:before { + left: 100%; + top: 50%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none +} + +.vis-configuration-popup:after { + border-color: rgba(136, 183, 213, 0); + border-left-color: rgba(57, 76, 89, .85); + border-width: 8px; + margin-top: -8px +} + +.vis-configuration-popup:before { + border-color: rgba(194, 225, 245, 0); + border-left-color: #f2faff; + border-width: 12px; + margin-top: -12px +} + +div.vis-tooltip { + position: absolute; + visibility: hidden; + padding: 5px; + white-space: nowrap; + font-family: verdana; + font-size: 14px; + color: #000; + background-color: #f5f4ed; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + border: 1px solid #808074; + box-shadow: 3px 3px 10px rgba(0, 0, 0, .2); + pointer-events: none; + z-index: 5 +} + +div.vis-color-picker { + position: absolute; + top: 0; + left: 30px; + margin-top: -140px; + margin-left: 30px; + width: 310px; + height: 444px; + z-index: 1; + padding: 10px; + border-radius: 15px; + background-color: #fff; + display: none; + box-shadow: rgba(0, 0, 0, .5) 0 0 10px 0 +} + +div.vis-color-picker div.vis-arrow { + position: absolute; + top: 147px; + left: 5px +} + +div.vis-color-picker div.vis-arrow::after, +div.vis-color-picker div.vis-arrow::before { + right: 100%; + top: 50%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none +} + +div.vis-color-picker div.vis-arrow:after { + border-color: rgba(255, 255, 255, 0); + border-right-color: #fff; + border-width: 30px; + margin-top: -30px +} + +div.vis-color-picker div.vis-color { + position: absolute; + width: 289px; + height: 289px; + cursor: pointer +} + +div.vis-color-picker div.vis-brightness { + position: absolute; + top: 313px +} + +div.vis-color-picker div.vis-opacity { + position: absolute; + top: 350px +} + +div.vis-color-picker div.vis-selector { + position: absolute; + top: 137px; + left: 137px; + width: 15px; + height: 15px; + border-radius: 15px; + border: 1px solid #fff; + background: #4c4c4c; + background: -moz-linear-gradient(top, #4c4c4c 0, #595959 12%, #666 25%, #474747 39%, #2c2c2c 50%, #000 51%, #111 60%, #2b2b2b 76%, #1c1c1c 91%, #131313 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #4c4c4c), color-stop(12%, #595959), color-stop(25%, #666), color-stop(39%, #474747), color-stop(50%, #2c2c2c), color-stop(51%, #000), color-stop(60%, #111), color-stop(76%, #2b2b2b), color-stop(91%, #1c1c1c), color-stop(100%, #131313)); + background: -webkit-linear-gradient(top, #4c4c4c 0, #595959 12%, #666 25%, #474747 39%, #2c2c2c 50%, #000 51%, #111 60%, #2b2b2b 76%, #1c1c1c 91%, #131313 100%); + background: -o-linear-gradient(top, #4c4c4c 0, #595959 12%, #666 25%, #474747 39%, #2c2c2c 50%, #000 51%, #111 60%, #2b2b2b 76%, #1c1c1c 91%, #131313 100%); + background: -ms-linear-gradient(top, #4c4c4c 0, #595959 12%, #666 25%, #474747 39%, #2c2c2c 50%, #000 51%, #111 60%, #2b2b2b 76%, #1c1c1c 91%, #131313 100%); + background: linear-gradient(to bottom, #4c4c4c 0, #595959 12%, #666 25%, #474747 39%, #2c2c2c 50%, #000 51%, #111 60%, #2b2b2b 76%, #1c1c1c 91%, #131313 100%) +} + +div.vis-color-picker div.vis-new-color { + position: absolute; + width: 140px; + height: 20px; + border: 1px solid rgba(0, 0, 0, .1); + border-radius: 5px; + top: 380px; + left: 159px; + text-align: right; + padding-right: 2px; + font-size: 10px; + color: rgba(0, 0, 0, .4); + vertical-align: middle; + line-height: 20px +} + +div.vis-color-picker div.vis-initial-color { + position: absolute; + width: 140px; + height: 20px; + border: 1px solid rgba(0, 0, 0, .1); + border-radius: 5px; + top: 380px; + left: 10px; + text-align: left; + padding-left: 2px; + font-size: 10px; + color: rgba(0, 0, 0, .4); + vertical-align: middle; + line-height: 20px +} + +div.vis-color-picker div.vis-label { + position: absolute; + width: 300px; + left: 10px +} + +div.vis-color-picker div.vis-label.vis-brightness { + top: 300px +} + +div.vis-color-picker div.vis-label.vis-opacity { + top: 338px +} + +div.vis-color-picker div.vis-button { + position: absolute; + width: 68px; + height: 25px; + border-radius: 10px; + vertical-align: middle; + text-align: center; + line-height: 25px; + top: 410px; + border: 2px solid #d9d9d9; + background-color: #f7f7f7; + cursor: pointer +} + +div.vis-color-picker div.vis-button.vis-cancel { + left: 5px +} + +div.vis-color-picker div.vis-button.vis-load { + left: 82px +} + +div.vis-color-picker div.vis-button.vis-apply { + left: 159px +} + +div.vis-color-picker div.vis-button.vis-save { + left: 236px +} + +div.vis-color-picker input.vis-range { + width: 290px; + height: 20px +} + +div.vis-network div.vis-manipulation { + box-sizing: content-box; + border-width: 0; + border-bottom: 1px; + border-style: solid; + border-color: #d6d9d8; + background: #fff; + background: -moz-linear-gradient(top, #fff 0, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(48%, #fcfcfc), color-stop(50%, #fafafa), color-stop(100%, #fcfcfc)); + background: -webkit-linear-gradient(top, #fff 0, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); + background: -o-linear-gradient(top, #fff 0, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); + background: -ms-linear-gradient(top, #fff 0, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); + background: linear-gradient(to bottom, #fff 0, #fcfcfc 48%, #fafafa 50%, #fcfcfc 100%); + padding-top: 4px; + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 28px +} + +div.vis-network div.vis-edit-mode { + position: absolute; + left: 0; + top: 5px; + height: 30px +} + +div.vis-network div.vis-close { + position: absolute; + right: 0; + top: 0; + width: 30px; + height: 30px; + background-position: 20px 3px; + background-repeat: no-repeat; + background-image: url(./../images/vis/cross.png); + cursor: pointer; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none +} + +div.vis-network div.vis-close:hover { + opacity: .6 +} + +div.vis-network div.vis-edit-mode div.vis-button, +div.vis-network div.vis-manipulation div.vis-button { + float: left; + font-family: verdana; + font-size: 12px; + -moz-border-radius: 15px; + border-radius: 15px; + display: inline-block; + background-position: 0 0; + background-repeat: no-repeat; + height: 24px; + margin-left: 10px; + cursor: pointer; + padding: 0 8px 0 8px; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none +} + +div.vis-network div.vis-manipulation div.vis-button:hover { + box-shadow: 1px 1px 8px rgba(0, 0, 0, .2) +} + +div.vis-network div.vis-manipulation div.vis-button:active { + box-shadow: 1px 1px 8px rgba(0, 0, 0, .5) +} + +div.vis-network div.vis-manipulation div.vis-button.vis-back { + background-image: url(./../images/vis/backIcon.png) +} + +div.vis-network div.vis-manipulation div.vis-button.vis-none:hover { + box-shadow: 1px 1px 8px transparent; + cursor: default +} + +div.vis-network div.vis-manipulation div.vis-button.vis-none:active { + box-shadow: 1px 1px 8px transparent +} + +div.vis-network div.vis-manipulation div.vis-button.vis-none { + padding: 0 +} + +div.vis-network div.vis-manipulation div.notification { + margin: 2px; + font-weight: 700 +} + +div.vis-network div.vis-manipulation div.vis-button.vis-add { + background-image: url(./../images/vis/addNodeIcon.png) +} + +div.vis-network div.vis-edit-mode div.vis-button.vis-edit, +div.vis-network div.vis-manipulation div.vis-button.vis-edit { + background-image: url(./../images/vis/editIcon.png) +} + +div.vis-network div.vis-edit-mode div.vis-button.vis-edit.vis-edit-mode { + background-color: #fcfcfc; + border: 1px solid #ccc +} + +div.vis-network div.vis-manipulation div.vis-button.vis-connect { + background-image: url(./../images/vis/connectIcon.png) +} + +div.vis-network div.vis-manipulation div.vis-button.vis-delete { + background-image: url(./../images/vis/deleteIcon.png) +} + +div.vis-network div.vis-edit-mode div.vis-label, +div.vis-network div.vis-manipulation div.vis-label { + margin: 0 0 0 23px; + line-height: 25px +} + +div.vis-network div.vis-manipulation div.vis-separator-line { + float: left; + display: inline-block; + width: 1px; + height: 21px; + background-color: #bdbdbd; + margin: 0 7px 0 15px +} + +div.vis-network div.vis-navigation div.vis-button { + width: 34px; + height: 34px; + -moz-border-radius: 17px; + border-radius: 17px; + position: absolute; + display: inline-block; + background-position: 2px 2px; + background-repeat: no-repeat; + cursor: pointer; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none +} + +div.vis-network div.vis-navigation div.vis-button:hover { + box-shadow: 0 0 3px 3px rgba(56, 207, 21, .3) +} + +div.vis-network div.vis-navigation div.vis-button:active { + box-shadow: 0 0 1px 3px rgba(56, 207, 21, .95) +} + +div.vis-network div.vis-navigation div.vis-button.vis-up { + background-image: url(./../images/vis/upArrow.png); + bottom: 50px; + left: 55px +} + +div.vis-network div.vis-navigation div.vis-button.vis-down { + background-image: url(./../images/vis/downArrow.png); + bottom: 10px; + left: 55px +} + +div.vis-network div.vis-navigation div.vis-button.vis-left { + background-image: url(./../images/vis/leftArrow.png); + bottom: 10px; + left: 15px +} + +div.vis-network div.vis-navigation div.vis-button.vis-right { + background-image: url(./../images/vis/rightArrow.png); + bottom: 10px; + left: 95px +} + +div.vis-network div.vis-navigation div.vis-button.vis-zoomIn { + background-image: url(./../images/vis/plus.png); + bottom: 10px; + right: 15px +} + +div.vis-network div.vis-navigation div.vis-button.vis-zoomOut { + background-image: url(./../images/vis/minus.png); + bottom: 10px; + right: 55px +} + +div.vis-network div.vis-navigation div.vis-button.vis-zoomExtends { + background-image: url(./../images/vis/zoomExtends.png); + bottom: 50px; + right: 15px +} + +.vis-current-time { + background-color: #ff7f6e; + width: 2px; + z-index: 1; + pointer-events: none +} + +.vis-rolling-mode-btn { + height: 40px; + width: 40px; + position: absolute; + top: 7px; + right: 20px; + border-radius: 50%; + font-size: 28px; + cursor: pointer; + opacity: .8; + color: #fff; + font-weight: 700; + text-align: center; + background: #3876c2 +} + +.vis-rolling-mode-btn:before { + content: "\26F6" +} + +.vis-rolling-mode-btn:hover { + opacity: 1 +} + +.vis-custom-time { + background-color: #6e94ff; + width: 2px; + cursor: move; + z-index: 1 +} + +.vis-panel.vis-background.vis-horizontal .vis-grid.vis-horizontal { + position: absolute; + width: 100%; + height: 0; + border-bottom: 1px solid +} + +.vis-panel.vis-background.vis-horizontal .vis-grid.vis-minor { + border-color: #e5e5e5 +} + +.vis-panel.vis-background.vis-horizontal .vis-grid.vis-major { + border-color: #bfbfbf +} + +.vis-data-axis .vis-y-axis.vis-major { + width: 100%; + position: absolute; + color: #4d4d4d; + white-space: nowrap +} + +.vis-data-axis .vis-y-axis.vis-major.vis-measure { + padding: 0; + margin: 0; + border: 0; + visibility: hidden; + width: auto +} + +.vis-data-axis .vis-y-axis.vis-minor { + position: absolute; + width: 100%; + color: #bebebe; + white-space: nowrap +} + +.vis-data-axis .vis-y-axis.vis-minor.vis-measure { + padding: 0; + margin: 0; + border: 0; + visibility: hidden; + width: auto +} + +.vis-data-axis .vis-y-axis.vis-title { + position: absolute; + color: #4d4d4d; + white-space: nowrap; + bottom: 20px; + text-align: center +} + +.vis-data-axis .vis-y-axis.vis-title.vis-measure { + padding: 0; + margin: 0; + visibility: hidden; + width: auto +} + +.vis-data-axis .vis-y-axis.vis-title.vis-left { + bottom: 0; + -webkit-transform-origin: left top; + -moz-transform-origin: left top; + -ms-transform-origin: left top; + -o-transform-origin: left top; + transform-origin: left bottom; + -webkit-transform: rotate(-90deg); + -moz-transform: rotate(-90deg); + -ms-transform: rotate(-90deg); + -o-transform: rotate(-90deg); + transform: rotate(-90deg) +} + +.vis-data-axis .vis-y-axis.vis-title.vis-right { + bottom: 0; + -webkit-transform-origin: right bottom; + -moz-transform-origin: right bottom; + -ms-transform-origin: right bottom; + -o-transform-origin: right bottom; + transform-origin: right bottom; + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg) +} + +.vis-legend { + background-color: rgba(247, 252, 255, .65); + padding: 5px; + border: 1px solid #b3b3b3; + box-shadow: 2px 2px 10px rgba(154, 154, 154, .55) +} + +.vis-legend-text { + white-space: nowrap; + display: inline-block +} + +.vis-item { + position: absolute; + color: #1a1a1a; + border-color: #97b0f8; + border-width: 1px; + background-color: #d5ddf6; + display: inline-block; + z-index: 1 +} + +.vis-item.vis-selected { + border-color: #ffc200; + background-color: #fff785; + z-index: 2 +} + +.vis-editable.vis-selected { + cursor: move +} + +.vis-item.vis-point.vis-selected { + background-color: #fff785 +} + +.vis-item.vis-box { + text-align: center; + border-style: solid; + border-radius: 2px +} + +.vis-item.vis-point { + background: 0 0 +} + +.vis-item.vis-dot { + position: absolute; + padding: 0; + border-width: 4px; + border-style: solid; + border-radius: 4px +} + +.vis-item.vis-range { + border-style: solid; + border-radius: 2px; + box-sizing: border-box +} + +.vis-item.vis-background { + border: none; + background-color: rgba(213, 221, 246, .4); + box-sizing: border-box; + padding: 0; + margin: 0 +} + +.vis-item .vis-item-overflow { + position: relative; + width: 100%; + height: 100%; + padding: 0; + margin: 0; + overflow: hidden +} + +.vis-item-visible-frame { + white-space: nowrap +} + +.vis-item.vis-range .vis-item-content { + position: relative; + display: inline-block +} + +.vis-item.vis-background .vis-item-content { + position: absolute; + display: inline-block +} + +.vis-item.vis-line { + padding: 0; + position: absolute; + width: 0; + border-left-width: 1px; + border-left-style: solid +} + +.vis-item .vis-item-content { + white-space: nowrap; + box-sizing: border-box; + padding: 5px +} + +.vis-item .vis-onUpdateTime-tooltip { + position: absolute; + background: #4f81bd; + color: #fff; + width: 200px; + text-align: center; + white-space: nowrap; + padding: 5px; + border-radius: 1px; + transition: .4s; + -o-transition: .4s; + -moz-transition: .4s; + -webkit-transition: .4s +} + +.vis-item .vis-delete, +.vis-item .vis-delete-rtl { + position: absolute; + top: 0; + width: 24px; + height: 24px; + box-sizing: border-box; + padding: 0 5px; + cursor: pointer; + -webkit-transition: background .2s linear; + -moz-transition: background .2s linear; + -ms-transition: background .2s linear; + -o-transition: background .2s linear; + transition: background .2s linear +} + +.vis-item .vis-delete { + right: -24px +} + +.vis-item .vis-delete-rtl { + left: -24px +} + +.vis-item .vis-delete-rtl:after, +.vis-item .vis-delete:after { + content: "\00D7"; + color: red; + font-family: arial, sans-serif; + font-size: 22px; + font-weight: 700; + -webkit-transition: color .2s linear; + -moz-transition: color .2s linear; + -ms-transition: color .2s linear; + -o-transition: color .2s linear; + transition: color .2s linear +} + +.vis-item .vis-delete-rtl:hover, +.vis-item .vis-delete:hover { + background: red +} + +.vis-item .vis-delete-rtl:hover:after, +.vis-item .vis-delete:hover:after { + color: #fff +} + +.vis-item .vis-drag-center { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + cursor: move +} + +.vis-item.vis-range .vis-drag-left { + position: absolute; + width: 24px; + max-width: 20%; + min-width: 2px; + height: 100%; + top: 0; + left: -4px; + cursor: w-resize +} + +.vis-item.vis-range .vis-drag-right { + position: absolute; + width: 24px; + max-width: 20%; + min-width: 2px; + height: 100%; + top: 0; + right: -4px; + cursor: e-resize +} + +.vis-range.vis-item.vis-readonly .vis-drag-left, +.vis-range.vis-item.vis-readonly .vis-drag-right { + cursor: auto +} + +.vis-itemset { + position: relative; + padding: 0; + margin: 0; + box-sizing: border-box +} + +.vis-itemset .vis-background, +.vis-itemset .vis-foreground { + position: absolute; + width: 100%; + height: 100%; + overflow: visible +} + +.vis-axis { + position: absolute; + width: 100%; + height: 0; + left: 0; + z-index: 1 +} + +.vis-foreground .vis-group { + position: relative; + box-sizing: border-box; + border-bottom: 1px solid #bfbfbf +} + +.vis-foreground .vis-group:last-child { + border-bottom: none +} + +.vis-nesting-group { + cursor: pointer +} + +.vis-nested-group { + background: #f5f5f5 +} + +.vis-label.vis-nesting-group.expanded:before { + content: "\25BC" +} + +.vis-label.vis-nesting-group.collapsed-rtl:before { + content: "\25C0" +} + +.vis-label.vis-nesting-group.collapsed:before { + content: "\25B6" +} + +.vis-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 10 +} + +.vis-labelset { + position: relative; + overflow: hidden; + box-sizing: border-box +} + +.vis-labelset .vis-label { + position: relative; + left: 0; + top: 0; + width: 100%; + color: #4d4d4d; + box-sizing: border-box +} + +.vis-labelset .vis-label { + border-bottom: 1px solid #bfbfbf +} + +.vis-labelset .vis-label.draggable { + cursor: pointer +} + +.vis-labelset .vis-label:last-child { + border-bottom: none +} + +.vis-labelset .vis-label .vis-inner { + display: inline-block; + padding: 5px +} + +.vis-labelset .vis-label .vis-inner.vis-hidden { + padding: 0 +} + +.vis-panel { + position: absolute; + padding: 0; + margin: 0; + box-sizing: border-box +} + +.vis-panel.vis-bottom, +.vis-panel.vis-center, +.vis-panel.vis-left, +.vis-panel.vis-right, +.vis-panel.vis-top { + border: 1px #bfbfbf +} + +.vis-panel.vis-center, +.vis-panel.vis-left, +.vis-panel.vis-right { + border-top-style: solid; + border-bottom-style: solid; + overflow: hidden +} + +.vis-left.vis-panel.vis-vertical-scroll, +.vis-right.vis-panel.vis-vertical-scroll { + height: 100%; + overflow-x: hidden; + overflow-y: scroll +} + +.vis-left.vis-panel.vis-vertical-scroll { + direction: rtl +} + +.vis-left.vis-panel.vis-vertical-scroll .vis-content { + direction: ltr +} + +.vis-right.vis-panel.vis-vertical-scroll { + direction: ltr +} + +.vis-right.vis-panel.vis-vertical-scroll .vis-content { + direction: rtl +} + +.vis-panel.vis-bottom, +.vis-panel.vis-center, +.vis-panel.vis-top { + border-left-style: solid; + border-right-style: solid +} + +.vis-background { + overflow: hidden +} + +.vis-panel>.vis-content { + position: relative +} + +.vis-panel .vis-shadow { + position: absolute; + width: 100%; + height: 1px; + box-shadow: 0 0 10px rgba(0, 0, 0, .8) +} + +.vis-panel .vis-shadow.vis-top { + top: -1px; + left: 0 +} + +.vis-panel .vis-shadow.vis-bottom { + bottom: -1px; + left: 0 +} + +.vis-graph-group0 { + fill: #4f81bd; + fill-opacity: 0; + stroke-width: 2px; + stroke: #4f81bd +} + +.vis-graph-group1 { + fill: #f79646; + fill-opacity: 0; + stroke-width: 2px; + stroke: #f79646 +} + +.vis-graph-group2 { + fill: #8c51cf; + fill-opacity: 0; + stroke-width: 2px; + stroke: #8c51cf +} + +.vis-graph-group3 { + fill: #75c841; + fill-opacity: 0; + stroke-width: 2px; + stroke: #75c841 +} + +.vis-graph-group4 { + fill: #ff0100; + fill-opacity: 0; + stroke-width: 2px; + stroke: #ff0100 +} + +.vis-graph-group5 { + fill: #37d8e6; + fill-opacity: 0; + stroke-width: 2px; + stroke: #37d8e6 +} + +.vis-graph-group6 { + fill: #042662; + fill-opacity: 0; + stroke-width: 2px; + stroke: #042662 +} + +.vis-graph-group7 { + fill: #00ff26; + fill-opacity: 0; + stroke-width: 2px; + stroke: #00ff26 +} + +.vis-graph-group8 { + fill: #f0f; + fill-opacity: 0; + stroke-width: 2px; + stroke: #f0f +} + +.vis-graph-group9 { + fill: #8f3938; + fill-opacity: 0; + stroke-width: 2px; + stroke: #8f3938 +} + +.vis-timeline .vis-fill { + fill-opacity: .1; + stroke: none +} + +.vis-timeline .vis-bar { + fill-opacity: .5; + stroke-width: 1px +} + +.vis-timeline .vis-point { + stroke-width: 2px; + fill-opacity: 1 +} + +.vis-timeline .vis-legend-background { + stroke-width: 1px; + fill-opacity: .9; + fill: #fff; + stroke: #c2c2c2 +} + +.vis-timeline .vis-outline { + stroke-width: 1px; + fill-opacity: 1; + fill: #fff; + stroke: #e5e5e5 +} + +.vis-timeline .vis-icon-fill { + fill-opacity: .3; + stroke: none +} + +.vis-time-axis { + position: relative; + overflow: hidden +} + +.vis-time-axis.vis-foreground { + top: 0; + left: 0; + width: 100% +} + +.vis-time-axis.vis-background { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100% +} + +.vis-time-axis .vis-text { + position: absolute; + color: #4d4d4d; + padding: 3px; + overflow: hidden; + box-sizing: border-box; + white-space: nowrap +} + +.vis-time-axis .vis-text.vis-measure { + position: absolute; + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; + visibility: hidden +} + +.vis-time-axis .vis-grid.vis-vertical { + position: absolute; + border-left: 1px solid +} + +.vis-time-axis .vis-grid.vis-vertical-rtl { + position: absolute; + border-right: 1px solid +} + +.vis-time-axis .vis-grid.vis-minor { + border-color: #e5e5e5 +} + +.vis-time-axis .vis-grid.vis-major { + border-color: #bfbfbf +} + +.vis-timeline { + position: relative; + border: 1px solid #bfbfbf; + overflow: hidden; + padding: 0; + margin: 0; + box-sizing: border-box +} \ No newline at end of file diff --git a/src/assets/images/vis/addNodeIcon.png b/src/assets/images/vis/addNodeIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..2412e3a207c9f8f80c2c46dce63991a6ce55dea9 GIT binary patch literal 4072 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/vis/cross.png b/src/assets/images/vis/cross.png new file mode 100644 index 0000000000000000000000000000000000000000..5712d97a5d22e6f1e41bf18499e9587be059d129 GIT binary patch literal 2821 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 XaX%s1B`OYQ00000NkvXXu0mjf?I=nX literal 0 HcmV?d00001 diff --git a/src/assets/images/vis/deleteIcon.png b/src/assets/images/vis/deleteIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c662e87a5db4ff00758513559903ad8157a4af GIT binary patch literal 3851 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/vis/leftArrow.png b/src/assets/images/vis/leftArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..61b9a56b4927efb6747f2cfb225173feb0db814f GIT binary patch literal 4154 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/vis/rightArrow.png b/src/assets/images/vis/rightArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..a262600f7ff77149913ae1852e5924aef8faa84f GIT binary patch literal 4179 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/vis/upArrow.png b/src/assets/images/vis/upArrow.png new file mode 100644 index 0000000000000000000000000000000000000000..5f35d732682ce00e500aee484e213ef0241040ec GIT binary patch literal 4206 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 Ef{qdhGXMYp literal 0 HcmV?d00001 diff --git a/src/assets/images/vis/zoomExtends.png b/src/assets/images/vis/zoomExtends.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1d84ae1bde3bd30795c8cea9f1150019ae83a3 GIT binary patch literal 4014 zcmV;f4^i-mP)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy00kOJL_t(|0j-q< za3ePqhGnPB%v?Li%*@XA)mtNo7i;g!~&wN^s zR?;`pO21fjews*?3hAneR_Txw?GaTj;`sC!b2uMU=W33rQ=E@E3C_nK>xxem!m6Uu zm)e6WwKh^U4rSmRqXLwHGlDYEBG^Wz{_)45f&NLEhPN4q|J4XnLg@v~vM)+Oi$V>` zT;m(sXP+1*>Foz%uKs>;`yYS*zM%}chW`yY2V>@+8ZG%Gx3o7lJPS>Y&jUT17@zNp zut)KzN|Mgwv+OImo{h^r5(xn7szYMFK5}S=|JkO-7ooZ7WoTh~c^<+Zj+sg9PGq#G^@=Gsa*+pey#w6VMi6$l99 z-1(!$Z%Q+z4YcjbGGkq(oc-4~8QWRjg7&fR5`7UyP(d?wl4pw21*gV{)M4`E$uMQg z6qq(`8c334sIDkIJ>4*W{(Rt2-O}@O#Ex+vKqsU_?0ZfKV^rWw$I(n_Bk=)hBjsdd zWEd7MTnGfO8~@YSXFA7!1jsmqkyJ%9CF1jr-r2oVr%sinGiJ;Ho6TmZiFDDTMUa`9 zX;`vk$sMt^F#b^Y1Pu_~5;Q7?XS5qhJrkSQ?;U{8l%%s~&&K!7i|Jc+u)G5uW8agP zjp!WrA#{!ZL>@5M+PRoyB&ELm$?2EwY44R-AKPlXFLm6!(gNoifVSZo8{VjEeU zOE<~&-!CaHHA!jnR3-MoL4CxwitX%WH@5qwwg)7aHP%0!OxKtxH%f7H(axn~P?eYl z^+%N6rxaRZ0#Z8ylEj)Ao)wzm6-Kv-QU^MpbX0odj^!JOz9%iKFV4^hA?b=0D_~%z zpW<;^f8{$V(ApUStetfXXWOlX@g)cnJJ=sgARYoF4VQWp-z%kMun*RF+= zCr`>xUY}JW9SXPg0wT=TQ_ZkocwvugV}1ihW`&;N4JmJHD&>%L-MV!^@H*YOX=gr9 za{*)=!Wb1Ob|NuF;z<_ZM*oVZw~ zt>vwLB&Ohxyt$o=>Wn4th~cYrclbKp6Y$v|VFVQ%x|;CBYU7IjCFmI-B}4sMJt3^s9NVg!P0 z6hDQy(L`XWMkB@zOLgN$4KYz;j0zZxq9KKdpZE#5@k0crP^5f9KO};h)ZDQ%ybhht z%t9#h|nu0K(bJ ztIkhEr!*UyrZWQ1k2+YkGqDi8Z<|mIN&$kzpKl{cNP=OQzXHz>vn+c)F)zO|Bou>E z2|-d_=qY#Y+yOu1a}XI?cU}%04)zz%anD(XZC{#~WreV!a$7k2Ug`?&CUEc0EtrkZ zL49MB)h!_K{H(*l_93D5tO0;BUnvYlo+;yss%n^&qjt6fZOa+}+FDO(~2>G z2dx@=JZ?DHP^;b7*Y1as5^uphBsh*s*z&MBd?e@I>-9kU>63PjP&^#5YTOb&x^6Cf z?674rmSHB5Fk!{Gv7rv!?qX#ei_L(XtwVqLX3L}$MI|kJ*w(rhx~tc&L&xP#?cQow zX_|gx$wMr3pRZIIr_;;O|8fAjd;1`nOeu5K(pCu7>^3E&D2OBBq?sYa(%S?GwG&_0-s%_v$L@R!5H_fc)lOb9ZoOO#p`Nn`KU z3LTTBtjwo`7(HA6 z7gmO$yTR!5L>Bsg!X8616{JUngg_@&85%>W=mChTR;x4`P=?PJ~oPuy5 zU-L`C@_!34D21{fD~Y8NVnR3t;aqZI3fIhmgmx}$oc-dKDC6Ap$Gy>a!`A*x2L1v0 WcZ@i?LyX}70000@GKT4JV$vdVI7dwkR$!a`&pg~#L6WqVojP#Qi zarx2>uf<}P5I2l$?a65)+;yG5!^4QQ**l z7Mw_{qPYAsag)fnhDejiP_0zR;dD9h_Kg!~PS22@DLO+ljvSUE^ZW-CUlY;M-bY-~ zN%xgUyb#X!dcD4L^!E0uJ3CdFoN(b~lLOCc9C-XlgvIg&9UTfZzNmwo1lnxFg~SWx zTt4{fbUJz8?pJqr8#S7D@Ol^FaxKuEDd;^GeecmC2p;MWe(vx9H_!;&*XwkQdL&(` zP)rz&M$FC5g6o-{o`#J2(QN)yL3t5>a(}Nuu^{TbY*8+EX|??jMG@2&Fc=Iq6!X1V zAb+)$*Cq?2H<46GrQXugo5cOtMA%0Ef4LfM1?I02t=H??wOTFjxA;K6tw - + + - - - HOMER - - - - + + HomerUi + + + + + + - - -
- -
- - - -
-
- + + - - - diff --git a/src/karma.conf.js b/src/karma.conf.js deleted file mode 100644 index b6e00421..00000000 --- a/src/karma.conf.js +++ /dev/null @@ -1,31 +0,0 @@ -// Karma configuration file, see link for more information -// https://karma-runner.github.io/1.0/config/configuration-file.html - -module.exports = function (config) { - config.set({ - basePath: '', - frameworks: ['jasmine', '@angular-devkit/build-angular'], - plugins: [ - require('karma-jasmine'), - require('karma-chrome-launcher'), - require('karma-jasmine-html-reporter'), - require('karma-coverage-istanbul-reporter'), - require('@angular-devkit/build-angular/plugins/karma') - ], - client: { - clearContext: false // leave Jasmine Spec Runner output visible in browser - }, - coverageIstanbulReporter: { - dir: require('path').join(__dirname, '../coverage'), - reports: ['html', 'lcovonly'], - fixWebpackSourcePaths: true - }, - reporters: ['progress', 'kjhtml'], - port: 9876, - colors: true, - logLevel: config.LOG_INFO, - autoWatch: true, - browsers: ['Chrome'], - singleRun: false - }); -}; \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index ddb1e118..c58dc05c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,13 +1,7 @@ -import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import * as module from './app/app.module'; -import { environment } from './environments/environment'; -if (environment.production) { - enableProdMode(); -} -const b: any = document.head.querySelector('base'); -b.href = b.href + ''; +import { AppModule } from './app/app.module'; -platformBrowserDynamic().bootstrapModule(module.AppModule) + +platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err)); diff --git a/src/polyfills.ts b/src/polyfills.ts index 6c2308db..a4b70b3d 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -60,9 +60,9 @@ */ // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame - // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick - // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames -(window as any).global = window; +// (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick +// (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames + /* * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js * with the following flag, it will bypass `zone.js` patch for IE/Edge diff --git a/src/styles.scss b/src/styles.scss index 3e67ecb7..9340c006 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,30 +1,41 @@ +@use "@angular/material" as mat; + /* You can add global styles to this file, and also import other style files */ @import "~@angular/material/prebuilt-themes/deeppurple-amber.css"; @import "~bootstrap/dist/css/bootstrap.min.css"; -@import "~@angular/material/theming"; +@import "@angular/material/theming"; @import "theme.scss"; -@import "swagger-styles.scss"; +@include mat.all-component-densities(-1); + @include mat-core(); +@import "swagger-styles.scss"; +// @import "https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.min.css"; +@import "./assets/css/vis.min.scss"; +// @import "https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css"; +@import "./assets/css/mapbox-gl.css"; @import "./assets/roboto/roboto.scss"; - +@import "~highlight.js/styles/github.css"; // mat icons font @font-face { - font-family: "Material Icons"; - font-style: normal; - //font-weight: 400; - src: url(./assets/fonts/MaterialIcons-Regular.eot); - /* For IE6-8 */ - src: local("Material Icons"), local("MaterialIcons-Regular"), - url(./assets/fonts/MaterialIcons-Regular.woff2) format("woff2"), - url(./assets/fonts/MaterialIcons-Regular.woff) format("woff"), - url(./assets/fonts/MaterialIcons-Regular.ttf) format("truetype"); + font-family: "Material Icons"; + font-style: normal; + //font-weight: 400; + src: url(./assets/fonts/MaterialIcons-Regular.eot); + /* For IE6-8 */ + src: local("Material Icons"), local("MaterialIcons-Regular"), + url(./assets/fonts/MaterialIcons-Regular.woff2) format("woff2"), + url(./assets/fonts/MaterialIcons-Regular.woff) format("woff"), + url(./assets/fonts/MaterialIcons-Regular.ttf) format("truetype"); +} + +.cdk-global-scrollblock { + overflow: hidden !important; + top: 0px !important; + left: 0px !important; } - - * { - - /** SAFARY SCROLL FIX */ + /** SAFARY SCROLL FIX */ ::-webkit-scrollbar { -webkit-appearance: none; width: 7px; @@ -33,12 +44,13 @@ ::-webkit-scrollbar-thumb { border-radius: 4px; - background-color: rgba(199, 199, 199, 0.748); - box-shadow: 0 0 1px rgba(255, 255, 255, .5); + background-color: rgba(143, 141, 141, 0.748); + box-shadow: 0 0 1px rgba(255, 255, 255, 0.5); } ::-webkit-scrollbar-corner { - background: rgba(0,0,0,0); + background: rgba(0, 0, 0, 0); } + letter-spacing: normal !important; } * { scrollbar-width: thin; @@ -56,16 +68,19 @@ strong, em, b, mat-label, -.mat-list-base .mat-list-item .mat-list-item-content, +.mat-mdc-list-item .mdc-list-item__primary-text, +.mat-mdc-list-base .mat-mdc-list-item .mat-list-item-content, +.mat-list-base .mat-list-item .mdc-list-item__content, .mat-list-base .mat-list-option .mat-list-item-content, .mat-table, -.mat-button, +.mat-mdc-button, .mat-raised-button, +.mat-mdc-raised-button, .mat-icon-button, -.mat-stroked-button, -.mat-flat-button, -.mat-fab, -.mat-mini-fab, +.mat-mdc-outlined-button, +.mat-mdc-unelevated-button, +.mat-mdc-fab, +.mat-mdc-mini-fab, .ag-theme-material, .ag-header-cell, .ag-cell-wrapper, @@ -78,62 +93,78 @@ button, .month, .ag-paging-panel, .cdk-drag { - font-family: Roboto, Helvetica, Arial, sans-serif; + font-family: Roboto, Helvetica, Arial, sans-serif !important; +} +.mat-mdc-list-item .mdc-list-item__primary-text { + font-weight: 700; + font-size: 10pt; + color: #999; } .cdk-overlay-container { z-index: 1000000; } button:focus { - outline: none !important; -} -.mat-flat-button.mat-primary, .mat-raised-button.mat-primary, .mat-fab.mat-primary, .mat-mini-fab.mat-primary { - background:#009cbf; - color:white; + outline: none !important; } + .material-icons { - font-family: "Material Icons"; - font-weight: normal; - font-style: normal; - font-size: 24px; - /* Preferred icon size */ - display: inline-block; - line-height: 1; - text-transform: none; - letter-spacing: normal; - word-wrap: normal; - white-space: nowrap; - direction: ltr; - - /* Support for all WebKit browsers. */ - -webkit-font-smoothing: antialiased; - /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; - - /* Support for Firefox. */ - -moz-osx-font-smoothing: grayscale; - - /* Support for IE. */ - font-feature-settings: "liga"; + font-family: "Material Icons"; + font-weight: normal; + font-style: normal; + font-size: 24px; + /* Preferred icon size */ + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: "liga"; } // using deeppurple-amber color combo: https://github.com/angular/material2/blob/master/src/lib/core/theming/prebuilt/deeppurple-amber.scss -$primary: mat-palette($homerprimary); -$accent: mat-palette($homeraccent); -$checkboxprimary: mat-palette($checkbox-color); - -$theme: mat-light-theme($primary, $accent, $checkboxprimary); +$primary: mat.define-palette($homerprimary); +$accent: mat.define-palette($homeraccent); +$checkboxprimary: mat.define-palette($checkbox-color); + +// $theme: mat.define-light-theme($primary, $accent, $checkboxprimary); +$theme: mat.define-light-theme( + ( + color: ( + primary: $primary, + accent: $accent, + checkboxprimary: $checkboxprimary, + ), + ) +); // Include all theme styles for the components. @include angular-material-theme($theme); // adjust the icons path -$ag-mat-icons-path: "~ag-grid-community/src/styles/ag-theme-material/icons/"; -$ag-icons-path: "~ag-grid-community/src/styles/ag-theme-base/icons/"; +$ag-mat-icons-path: "ag-grid-community/src/styles/ag-theme-material/icons/"; +$ag-icons-path: "ag-grid-community/src/styles/ag-theme-base/icons/"; /* ag-grid */ // changes the default icon color -$ag-icon-color: #0077f9; -$ag-icon-checkbox-checked-color: #0077f9; +* { + --ag-checkbox-background-color: transparent; + --ag-checkbox-checked-color: #0077f9; + --ag-checkbox-unchecked-color: #0077f9; + --ag-checkbox-indeterminate-color: #0077f9; + --mdc-checkbox-selected-checkmark-color: white; +} // changes the selected checkbox check mark color $ag-accent-color: #0077f9; $header-height: 50px; @@ -152,847 +183,1168 @@ $greybackground: #eceff1; } */ .ag-cell { - padding-right: 5px !important; - padding-left: 5px !important; - border: none !important; - border-right: 1px solid lightgray !important; + padding-right: 5px !important; + padding-left: 5px !important; + border: none !important; + border-right: 1px solid lightgray !important; } .ag-row { - border: none !important; + border: none !important; } .ag-header-cell { - padding-right: 5px !important; - padding-left: 5px !important; + padding-right: 5px !important; + padding-left: 5px !important; } a:not([href]) { - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; } .ag-row-selected { - background-color: #eee !important; + background-color: #eee !important; } .ag-theme-material .ag-ltr .ag-cell { - border-right: 1px solid lightgray; + border-right: 1px solid lightgray; } .ag-theme-material.custom .ag-ltr .ag-cell { - line-height: 3; + line-height: 3; } +/* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */ +span.mat-option-text { + //text-transform: capitalize !important; +} -@import "~ag-grid-community/dist/styles/ag-grid.css"; +@import "~ag-grid-community/styles/ag-grid.css"; $ag-mat-primary: mat-color($homerprimary); $ag-mat-accent: mat-color($homeraccent); -//@import "~ag-grid-community/dist/styles/ag-theme-balham.css"; -@import "~ag-grid-community/src/styles/ag-theme-material/sass/ag-theme-material"; - -.ag-theme-material .ag-checkbox-input-wrapper.ag-checked::after { - color: #009cbf !important; -} -.ag-theme-material .ag-checkbox-input-wrapper::after { - color: #009cbf !important; -} -.mat-checkbox-checked:not(.mat-checkbox-disabled).mat-accent .mat-ripple-element, .mat-checkbox:active:not(.mat-checkbox-disabled).mat-accent .mat-ripple-element { - background:#009cbf !important; - color:#009cbf !important; -} - -.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, .mat-checkbox-checked.mat-accent .mat-checkbox-background { - background:#009cbf !important; -} +// @import "~ag-grid-community/dist/styles/ag-theme-balham.css"; +@import "~ag-grid-community/styles/ag-theme-material.css"; $flow-checkbox-color: mat-color($checkbox-color); .material-icons.md-18 { - font-size: 18px; + font-size: 18px; } #grid-container { - width: 80%; - margin: 24px; + width: 80%; + margin: 24px; } * { - box-sizing: border-box; + box-sizing: border-box; } .main-container { - height: 100vh; - width: 100vw; - background-color: #eceff1; + height: 100vh; + width: 100vw; + background-color: #eceff1; } body { - margin: 0; - padding: 0; - display: flex; - overflow: hidden; - flex-direction: column; + margin: 0; + padding: 0; + display: flex; + overflow: hidden; + flex-direction: column; } .content-container { - height: 100vh; + height: 100vh; } .noselect-text { - user-select: none !important; + user-select: none !important; } gridster { - background: #eceff1 !important; + background: #eceff1 !important; } gridster-item { - box-sizing: border-box; - background: #fff; - border-top-left-radius: 0.3rem; - border-top-right-radius: 0.3rem; - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; + box-sizing: border-box; + background: #fff; + border-top-left-radius: 0.3rem; + border-top-right-radius: 0.3rem; + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; } .no-selected-text { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } +.search-popup-dropdown { + max-height: 400px !important; +} .box-header { - border-bottom: 1px solid #fff; - padding: 0 0.5rem; - cursor: move; - position: relative; - - h3 { - margin-top: 8px; - display: inline-block; - color: #909090; - font-size: 12px; - font-weight: bold; - } + border-bottom: 1px solid #fff; + padding: 0 0.5rem; + cursor: move; + position: relative; + + h3 { + margin-top: 8px; + display: inline-block; + color: #909090; + font-size: 12px; + font-weight: bold; + } - fa-icon { - &:hover { - color: #24465f; + fa-icon { + &:hover { + color: #24465f; + } } - } } .box-header-btns { - top: 4px; - right: 10px; - cursor: pointer; - position: absolute; + top: 4px; + right: 10px; + cursor: pointer; + position: absolute; } .box-icon-header { - font-size: 12px; - color: #c9c9c9; - display: flex; - align-self: center; + font-size: 12px; + color: #c9c9c9; + display: flex; + align-self: center; - &>* { - margin-left: 10px; - } + & > * { + margin-left: 10px; + } } .pull-right { - font-size: 16px; - color: #333; - text-decoration: none; + font-size: 16px; + color: #333; + text-decoration: none; } [draggable] { - user-select: none; - cursor: pointer; + user-select: none; + cursor: pointer; } .header { - .ng-star-inserted { - .md-drppicker { - .buttons { - position: absolute; - right: 1rem; - bottom: 1rem; - } + .ng-star-inserted { + .md-drppicker { + .buttons { + position: absolute; + right: 1rem; + bottom: 1rem; + } + } } - } } - .detail-container { - border-radius: 8px !important; - - .mat-tab-body-wrapper { - height: 100%; - } + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ + .mat-tab-body-wrapper { + height: 100%; + } } .out-window { - .mat-tab-body-content { - &.ng-trigger { - &.ng-trigger-translateTab { - height: calc(100vh - 3.05rem) !important; - } + /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ + .mat-tab-body-content { + &.ng-trigger { + &.ng-trigger-translateTab { + height: calc(100vh - 3.05rem) !important; + } + } } - } - .ngx-json-viewer { - height: initial !important; - } + .ngx-json-viewer { + height: initial !important; + } } ngx-json-viewer { - .ngx-json-viewer { - font-family: "Roboto Mono", monospace !important; - font-size: 12px !important; - } + .ngx-json-viewer { + font-family: "Roboto Mono", monospace !important; + font-size: 12px !important; + } } ace-editor { - box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.4); + box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.4); } - - - -.mat-dialog-content { - max-height: 100vh; +.mat-mdc-dialog-container, +.mat-mdc-dialog-content { + max-height: 100vh; } .mat-toolbar-row, .mat-toolbar-single-row { - height: 45px !important; - padding: 0px !important; - padding-left: 6px !important; - padding-right: 6px !important; + height: 45px !important; + padding: 0px !important; + padding-left: 16px !important; + padding-right: 6px !important; } .message-container { - .ngx-json-viewer { - height: initial !important; - } + .ngx-json-viewer { + height: initial !important; + } } .mat-toolbar { - &.mat-primary { - background: #000000; - color: white !important; - } + &.mat-primary { + background: #24465f; + color: white !important; + } } .calendar-table { - color: black !important; + color: black !important; } h3 { - font-size: 1rem; + font-size: 1rem; } .red-container { - padding: 0.3rem; - background-color: rgb(243, 243, 243) !important; + padding: 0.3rem; + background-color: rgb(243, 243, 243) !important; } .mat-figure { - .mat-raised-button { - &:not([class*="mat-elevation-z"]) { - width: 80%; - height: 80%; + .mat-mdc-raised-button, + .mat-raised-button { + &:not([class*="mat-elevation-z"]) { + width: 80%; + height: 80%; + } } - } } .label-callid { - background: #ffffff; + background: #ffffff; } +/* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ +/* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ .mat-checkbox-layout { - .mat-checkbox-label { - line-height: 24px; - min-width: 95px; - } + /* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version. */ + .mat-checkbox-label { + line-height: 24px; + min-width: 95px; + } } .modal-resizable { - .mat-dialog-content { - max-height: initial !important; - } + .mat-mdc-dialog-content { + max-height: initial !important; + } } -.dialog-title { - - margin: -1.5rem -1.5rem 2rem -1.5rem; - width: initial !important; - font-size: 14px; - display: flex; - justify-content: space-between; - - font-weight: bold; - & div { - padding-left:15px; - } - -} .div-field { - &>span { - &.Pwhite { - color: black; - } + & > span { + &.Pwhite { + color: black; + } - &.Pbracket { - color: rgb(61, 168, 182); - margin-left:1px; - margin-right:1px; - } + &.Pbracket { + color: rgb(61, 168, 182); + margin-left: 1px; + margin-right: 1px; + } - &.Pequally { - color: darkgrey; - } + &.Pequally { + color: darkgrey; + } - &.Pquotes { - color: rgb(83, 124, 25); - } + &.Pquotes { + color: rgb(83, 124, 25); + } - &.Plabel { - color: rgb(62, 62, 174); - } + &.Plabel { + color: rgb(62, 62, 174); + } - &.Pcomm { - color: #1dc27c; - } + &.Pcomm { + color: #1dc27c; + } - &.SIwhite { - color: black; - } + &.SIwhite { + color: black; + } - &.SIbracket { - color: rgb(61, 168, 182); - } + &.SIbracket { + color: rgb(61, 168, 182); + } - &.SInumber { - color: #c300da; - } + &.SInumber { + color: #c300da; + } - &.SIequally { - color: brown; - } + &.SIequally { + color: brown; + } - &.SIquotes { - color: rgb(83, 124, 25); - font-style: italic; - font-weight: bold; - } + &.SIquotes { + color: rgb(83, 124, 25); + font-style: italic; + font-weight: bold; + } - &.SIlabel { - color: blue; - font-weight: bold; + &.SIlabel { + color: blue; + font-weight: bold; + } } - } } .add-widget-button { - width: 200px !important; - background: #009cbf !important ; - padding: 3px 6px !important; - border-radius: 3px ; - margin: 10px; - color: white !important; - cursor: pointer; - line-height: 14px; + width: 200px !important; + color: white !important; } // widget buttons .search-btn { - background: #009cbf; - color: white; + background: #749ad6; + color: white; } .clear-btn { - background-color: #fafafa; - color: #8a8a8a; - border: 1px solid #d6d6d6; + background-color: #fafafa; + color: #8a8a8a; + border: 1px solid #d6d6d6; } .show { - display: flex; - justify-content: flex-end; - position: absolute; - bottom: 10px; - right: 20px; - padding-top: 5px; - padding-bottom: 5px; - background: white; + display: flex; + justify-content: flex-end; + position: absolute; + bottom: 10px; + right: 20px; + padding-top: 5px; + padding-bottom: 5px; + background: white; } -.show>* { - margin-left: 10px; +.show > * { + margin-left: 10px; } .show button { - font-size: 13px; - line-height: 32px; - box-shadow: none; - margin-left: 10px; + font-size: 13px; + line-height: 32px; + box-shadow: none; + margin-left: 10px; } // .md-drppicker td.active, .md-drppicker td.active:hover { - background-color: #009cbf !important; - color: #000 !important; + background-color: #749ad6 !important; + color: #fff !important; } .loki-highlight { - word-break: break-all; + word-break: break-all; - span { - color: #4d6892; + span { + color: #4d6892; - background: #f3ffbd; - //text-decoration-color:#1dc27c; - padding: 3px 0; - - } + background: #f3ffbd; + //text-decoration-color:#1dc27c; + padding: 3px 0; + } } .action-buttons { - padding: 5px; - position: absolute; - padding-top: 8px; - bottom: 0px; - right: 0px; - display: flex; - justify-content: flex-end; - background: rgba(255, 255, 255, 0); - background: -moz-linear-gradient(top, - rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 1) 38%, - rgba(255, 255, 255, 1) 72%); - background: -webkit-gradient(left top, - left bottom, - color-stop(0%, rgba(255, 255, 255, 0)), - color-stop(38%, rgba(255, 255, 255, 1)), - color-stop(72%, rgba(255, 255, 255, 1))); - background: -webkit-linear-gradient(top, - rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 1) 38%, - rgba(255, 255, 255, 1) 72%); - background: -o-linear-gradient(top, - rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 1) 38%, - rgba(255, 255, 255, 1) 72%); - background: -ms-linear-gradient(top, - rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 1) 38%, - rgba(255, 255, 255, 1) 72%); - background: linear-gradient(to bottom, - rgba(255, 255, 255, 0) 0%, - rgba(255, 255, 255, 1) 38%, - rgba(255, 255, 255, 1) 72%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ffffff', GradientType=0); - width: 100%; - - &>button { - margin: 7px; - font-size: 0.65em; - text-transform: uppercase; - letter-spacing: 1px; - color: #3f3f3f; - } + padding: 5px; + position: absolute; + padding-top: 8px; + bottom: 0px; + right: 0px; + display: flex; + justify-content: flex-end; + background: rgba(255, 255, 255, 0); + background: -moz-linear-gradient( + top, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 1) 38%, + rgba(255, 255, 255, 1) 72% + ); + background: -webkit-gradient( + left top, + left bottom, + color-stop(0%, rgba(255, 255, 255, 0)), + color-stop(38%, rgba(255, 255, 255, 1)), + color-stop(72%, rgba(255, 255, 255, 1)) + ); + background: -webkit-linear-gradient( + top, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 1) 38%, + rgba(255, 255, 255, 1) 72% + ); + background: -o-linear-gradient( + top, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 1) 38%, + rgba(255, 255, 255, 1) 72% + ); + background: -ms-linear-gradient( + top, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 1) 38%, + rgba(255, 255, 255, 1) 72% + ); + background: linear-gradient( + to bottom, + rgba(255, 255, 255, 0) 0%, + rgba(255, 255, 255, 1) 38%, + rgba(255, 255, 255, 1) 72% + ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ffffff', GradientType=0); + width: 100%; + + & > button { + margin: 7px; + font-size: 0.65em; + text-transform: uppercase; + letter-spacing: 1px; + color: #3f3f3f; + } } .search-btn { - background: #009cbf; - color: white; + background: #749ad6; + color: white; } .clear-btn { - background-color: #fafafa; - color: #8a8a8a; + background-color: #fafafa; + color: #8a8a8a; } -.custom-tooltip { - background: #fafafa; - color: grey; - border-radius: 3px; - padding: 10px; - - display: grid; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07), - 0 2px 4px rgba(0, 0, 0, 0.07), - 0 4px 8px rgba(0, 0, 0, 0.07), - 0 8px 16px rgba(0, 0, 0, 0.07), - 0 16px 32px rgba(0, 0, 0, 0.07), - 0 32px 64px rgba(0, 0, 0, 0.07); - - - - & .stat { - width: 100%; - display: flex; - justify-content: space-between; - border-bottom: 1px solid lightgray; - margin-bottom: 15px; - - & p { - margin: 0; - padding: 0; - - &.num { - margin-left: 10px; - padding-left: 10px; - - } +.mapboxgl-popup-content { + p { + margin: 0 auto; + text-align: center; } - } } +.custom-tooltip { + background: #fafafa; + color: grey; + border-radius: 3px; + padding: 10px; + + display: grid; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07), 0 2px 4px rgba(0, 0, 0, 0.07), + 0 4px 8px rgba(0, 0, 0, 0.07), 0 8px 16px rgba(0, 0, 0, 0.07), + 0 16px 32px rgba(0, 0, 0, 0.07), 0 32px 64px rgba(0, 0, 0, 0.07); + + & .stat { + width: 100%; + display: flex; + justify-content: space-between; + border-bottom: 1px solid lightgray; + margin-bottom: 15px; + + & p { + margin: 0; + padding: 0; + + &.num { + margin-left: 10px; + padding-left: 10px; + } + } + } +} +.search-btn, .setting-btn-ok { - background: #009cbf; - padding: 3px 6px; - border-radius: 3px; - margin: 10px; - color: white; - cursor: pointer; - line-height: 14px; + background: #749ad6 !important; + padding: 3px 6px; + border-radius: 3px; + margin: 10px; + color: white !important; + cursor: pointer; + line-height: 14px; } .mouse-layer { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - background-color: transparent; - z-index: 9999999; + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + background-color: transparent; + z-index: 9999999; } .ag-body-viewport { - overflow-x: auto !important; + overflow-x: auto !important; } /* JSON viewer syles */ .ngx-json-viewer { - width: 100%; - height: 100%; - overflow: hidden; - position: relative; - - .segment { - padding: 4px !important; - margin: 1px 1px 1px 12px; - background: #dbdbdb55; - - .segment-main { - word-wrap: break-word; - - .toggler { - position: absolute; - margin-left: -14px; - margin-top: 3px; - font-size: .8em; - line-height: 1.2em; - vertical-align: middle; - color: #787878; - - &::after { - display: inline-block; - content: "â–ş"; - -webkit-transition: -webkit-transform 0.1s ease-in; - transition: -webkit-transform 0.1s ease-in; - transition: transform 0.1s ease-in; - transition: transform 0.1s ease-in, -webkit-transform 0.1s ease-in; - } - } - - .segment-key { - color: #3f3f3f !important; - font-weight: bold; - padding: 6px; - - } - - .segment-separator { - color: #999; - } - - .segment-value { - color: #000; - } - } + width: 100%; + height: 100%; + overflow: hidden; + position: relative; + + .segment { + padding: 4px !important; + margin: 1px 1px 1px 12px; + background: #dbdbdb55; + + .segment-main { + word-wrap: break-word; + + .toggler { + position: absolute; + margin-left: -14px; + margin-top: 3px; + font-size: 0.8em; + line-height: 1.2em; + vertical-align: middle; + color: #787878; + + &::after { + display: inline-block; + content: "â–ş"; + -webkit-transition: -webkit-transform 0.1s ease-in; + transition: -webkit-transform 0.1s ease-in; + transition: transform 0.1s ease-in; + transition: transform 0.1s ease-in, + -webkit-transform 0.1s ease-in; + } + } + + .segment-key { + color: #3f3f3f !important; + font-weight: bold; + padding: 6px; + } + + .segment-separator { + color: #999; + } + + .segment-value { + color: #000; + } + } - .children { - margin-left: 12px; + .children { + margin-left: 12px; + } } - } - .segment-type-string { - >.segment-main { - >.segment-value { - color: #606060 !important; - } + .segment-type-string { + > .segment-main { + > .segment-value { + color: #606060 !important; + } + } } - } - .segment-type-number { - >.segment-main { - >.segment-value { - color: #4f4f4f !important; - } + .segment-type-number { + > .segment-main { + > .segment-value { + color: #6f6f6f !important; + } + } } - } - .segment-type-boolean { - >.segment-main { - >.segment-value { - color: #6d6d6d; - } + .segment-type-boolean { + > .segment-main { + > .segment-value { + color: #6d6d6d; + } + } } - } - .segment-type-date { - >.segment-main { - >.segment-value { - color: #4f4f4f; - } + .segment-type-date { + > .segment-main { + > .segment-value { + color: #4f4f4f; + } + } } - } - .segment-type-array { - >.segment-main { - >.segment-value { - color: rgb(128, 128, 128); - } + .segment-type-array { + > .segment-main { + > .segment-value { + color: rgb(128, 128, 128); + } - white-space: nowrap; + white-space: nowrap; + } } - } - .segment-type-object { - >.segment-main { - >.segment-value { - color: #999; - } + .segment-type-object { + > .segment-main { + > .segment-value { + color: #999; + } - white-space: nowrap; + white-space: nowrap; + } } - } - .segment-type-function { - >.segment-main { - >.segment-value { - color: #999; - } + .segment-type-function { + > .segment-main { + > .segment-value { + color: #999; + } + } } - } - - .segment-type-null { - >.segment-main { - >.segment-value { - color: #999 !important; - background: none !important; - } + .segment-type-null { + > .segment-main { + > .segment-value { + color: #999 !important; + background: none !important; + } + } } - } - .segment-type-undefined { - >.segment-main { - >.segment-value { - color: #fff; - background-color: #999; - } + .segment-type-undefined { + > .segment-main { + > .segment-value { + color: #fff; + background-color: #999; + } - >.segment-key { - color: #999; - } + > .segment-key { + color: #999; + } + } } - } - .expanded { - >.toggler { - &::after { - -webkit-transform: rotate(90deg); - transform: rotate(90deg); - } + .expanded { + > .toggler { + &::after { + -webkit-transform: rotate(90deg); + transform: rotate(90deg); + } + } } - } - .expandable { - cursor: pointer; + .expandable { + cursor: pointer; - >.toggler { - cursor: pointer; + > .toggler { + cursor: pointer; + } } - } } /* JSON viewer syles */ .ngx-json-viewer { - width: 100%; - height: 100%; - overflow: hidden; - position: relative; - - .segment { - padding: 4px !important; - margin: 1px 1px 1px 12px; - background: #dbdbdb55; - - .segment-main { - word-wrap: break-word; - - .toggler { - position: absolute; - margin-left: -14px; - margin-top: 3px; - font-size: .8em; - line-height: 1.2em; - vertical-align: middle; - color: #787878; - - &::after { - display: inline-block; - content: "â–ş"; - -webkit-transition: -webkit-transform 0.1s ease-in; - transition: -webkit-transform 0.1s ease-in; - transition: transform 0.1s ease-in; - transition: transform 0.1s ease-in, -webkit-transform 0.1s ease-in; - } - } - - .segment-key { - color: #3f3f3f !important; - font-weight: bold; - padding: 6px; - - } + width: 100%; + height: 100%; + overflow: hidden; + position: relative; + + .segment { + padding: 4px !important; + margin: 1px 1px 1px 12px; + background: #dbdbdb55; + + .segment-main { + word-wrap: break-word; + + .toggler { + position: absolute; + margin-left: -14px; + margin-top: 3px; + font-size: 0.8em; + line-height: 1.2em; + vertical-align: middle; + color: #787878; + + &::after { + display: inline-block; + content: "â–ş"; + -webkit-transition: -webkit-transform 0.1s ease-in; + transition: -webkit-transform 0.1s ease-in; + transition: transform 0.1s ease-in; + transition: transform 0.1s ease-in, + -webkit-transform 0.1s ease-in; + } + } + + .segment-key { + color: #3f3f3f !important; + font-weight: bold; + padding: 6px; + } + + .segment-separator { + color: #999; + } + + .segment-value { + color: #000; + } + } - .segment-separator { - color: #999; - } + .children { + margin-left: 12px; + } + } - .segment-value { - color: #000; - } + .segment-type-string { + > .segment-main { + > .segment-value { + color: #606060 !important; + } + } } - .children { - margin-left: 12px; + .segment-type-number { + > .segment-main { + > .segment-value { + color: #6f6f6f !important; + } + } } - } - .segment-type-string { - >.segment-main { - >.segment-value { - color: #606060 !important; - } + .segment-type-boolean { + > .segment-main { + > .segment-value { + color: #6d6d6d; + } + } } - } - .segment-type-number { - >.segment-main { - >.segment-value { - color: #009cbf !important; - } + .segment-type-date { + > .segment-main { + > .segment-value { + color: #4f4f4f; + } + } } - } - .segment-type-boolean { - >.segment-main { - >.segment-value { - color: #6d6d6d; - } + .segment-type-array { + > .segment-main { + > .segment-value { + color: rgb(128, 128, 128); + } + + white-space: nowrap; + } } - } - .segment-type-date { - >.segment-main { - >.segment-value { - color: #4f4f4f; - } + .segment-type-object { + > .segment-main { + > .segment-value { + color: #999; + } + + white-space: nowrap; + } } - } - .segment-type-array { - >.segment-main { - >.segment-value { - color: rgb(128, 128, 128); - } + .segment-type-function { + > .segment-main { + > .segment-value { + color: #999; + } + } + } - white-space: nowrap; + .segment-type-null { + > .segment-main { + > .segment-value { + color: #999 !important; + background: none !important; + } + } } - } - .segment-type-object { - >.segment-main { - >.segment-value { - color: #999; - } + .segment-type-undefined { + > .segment-main { + > .segment-value { + color: #fff; + background-color: #999; + } - white-space: nowrap; + > .segment-key { + color: #999; + } + } } - } - .segment-type-function { - >.segment-main { - >.segment-value { - color: #999; - } + .expanded { + > .toggler { + &::after { + -webkit-transform: rotate(90deg); + transform: rotate(90deg); + } + } } - } - .segment-type-null { - >.segment-main { - >.segment-value { - color: #999 !important; - background: none !important; + .expandable { + cursor: pointer; - } + > .toggler { + cursor: pointer; + } + } +} +.color-homeraccent { + color: #f15245; +} + +.hotkeysDialog .mat-mdc-dialog-container { + padding: 0; +} +div { + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle-group.orLogicToggleGroup { + display: flex !important; + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle-button { + height: 30px !important; + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + .mat-button-toggle-label-content { + line-height: 30px !important; + font-size: 0.85em; + color: #666; + } + } + } +} +app-root { + app-menu { + app-dashboard { + div { + gridster { + gridster-item { + div { + app-protosearch-widget { + .mat-mdc-select-arrow-wrapper { + display: block; + + .mat-mdc-select-arrow { + margin-top: 20px !important; + } + } + .result-container-field { + .mat-mdc-select-arrow-wrapper { + padding-right: 13px !important; + } + } + .in-widget { + margin-left: 10px; + border-radius: 4px; + box-shadow: 0px 3px 1px -2px rgb(0 0 0 / 20%), + 0px 2px 2px 0px rgb(0 0 0 / 14%), + 0px 1px 5px 0px rgb(0 0 0 / 12%) !important; + .search-select { + /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ + .mat-select-value { + position: absolute; + } + + .mat-mdc-select-arrow-wrapper { + display: block; + + .mat-mdc-select-arrow { + margin: 0px !important; + margin-left: -5px !important; + margin-top: -2px !important; + } + } + } + } + } + } + } + } + } + } } - } +} +// .raw-json > span[data-type]:hover { +// background-color: rgba(0,0,0,0.3); +// cursor: pointer; +// border-radius: 4px; +// } - .segment-type-undefined { - >.segment-main { - >.segment-value { - color: #fff; - background-color: #999; - } +// .mat-mdc-form-field { +// width: 100%; +// } - >.segment-key { - color: #999; - } +.my-code-editor { + .editor-container { + height: 100% !important; + overflow: hidden; } - } - - .expanded { - >.toggler { - &::after { - -webkit-transform: rotate(90deg); - transform: rotate(90deg); - } +} +.mat-mdc-card-content { + padding: 0 !important; +} +.mdc-button { + letter-spacing: normal; +} +.mat-mdc-text-field-wrapper { + min-height: 37px !important; + font-size: 13px !important; + padding: 0 !important; + background: none !important; + overflow: visible !important; + &:hover { + background: none !important; + } + .mat-mdc-form-field-flex { + min-height: 37px; + .mat-mdc-form-field-infix { + min-height: 24px !important; + padding: 0 !important; + padding-top: 12px !important; + .mat-mdc-input-element { + // padding-top: 24px !important; + } + } + } + .mdc-floating-label--float-above { + transform: translateY(-175%) scale(0.75) !important; + } + .mdc-floating-label { + font-size: 13px !important; } - } + .mat-mdc-form-field-focus-overlay { + background-color: unset !important; + } +} +.search-btn { + color: white !important; +} +.clear-btn { + background-color: #fafafa !important; + color: rgb(129, 129, 129) !important; + border: 1px solid #d6d6d6 !important; + font-size: 13px; + line-height: 32px; + box-shadow: 0px 3px 1px -2px rgb(0 0 0 / 20%), + 0px 2px 2px 0px rgb(0 0 0 / 14%), 0px 1px 5px 0px rgb(0 0 0 / 12%); + margin-left: 10px; +} +.fa-icon-custom { + width: 40px !important; + height: 40px !important; + padding: 6px 12px 18px 12px !important; + svg { + width: 14px !important; + } +} +.mat-mdc-select-min-line { + font-size: 13px !important; +} +.mat-mdc-tab-labels { + border-bottom: 1px solid #0000001f; +} +.mat-mdc-button > .mat-icon { + font-size: 24px !important; + width: 24px !important; + height: 24px !important; +} +.mdc-menu-surface.mat-mdc-select-panel { + // min-width: 150px !important; + width: auto !important; + overflow-x: visible; +} +.cdk-overlay-pane { + overflow-x: visible; +} +.mdc-form-field > label { + margin: 0 !important; +} +.mat-mdc-checkbox { + margin: -11px; +} +.filter-container { + .mat-mdc-checkbox { + margin: 0; + } +} +.tab-group-metric-chart { + .mat-mdc-tab-body-wrapper { + height: 100% !important; + } +} +.mat-mdc-paginator-page-size { + padding-bottom: 13px; + .mat-mdc-paginator-page-size-select { + width: 70px; + } + .mat-mdc-select { + border-bottom: 1px solid hsla(0, 0%, 0%, 0.42); + } + .mdc-notched-outline { + display: none !important; + } +} +.mat-mdc-menu-panel.mat-mdc-menu-panel { + max-width: unset !important; +} +.menu-button { + .mat-expansion-panel-header { + &:hover { + background: none !important; + } + } + .mat-content.mat-content-hide-toggle { + margin-right: unset !important; + } +} - .expandable { - cursor: pointer; +.editor { + border-radius: 6px; + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), + 0 3px 1px -2px rgba(0, 0, 0, 0.2); + font-family: "Source Code Pro", monospace; + font-size: 12px; + font-weight: 400; + height: 100%; + letter-spacing: normal; + line-height: 14px; + // padding: 10px; + tab-size: 4; - >.toggler { - cursor: pointer; + pre { + height: 100%; } - } } -.color-homeraccent { - color: #f15245; + +.ngx-codejar-editor { + font-size: 12px !important; + line-height: 14px !important; +} + + +.menu-container { + overflow: unset !important; + padding: 0 1rem 0 0 !important; + margin-left: 0rem !important; +} + +.mat-pseudo-checkbox { + display: none !important; +} +:root { + --webkit-scrollbar-width: 7px; +} +.mat-toolbar.mat-primary { + background: #000; + color: #fff!important +} +.dialog-title { + // margin: -1.5rem -1.5rem 2rem; + // width: auto!important; + font-size: 14px; + display: flex; + justify-content: space-between; + font-weight: 700 +} + + +.mat-mdc-tab-group.mat-mdc-tab-group-stretch-tabs>.mat-mdc-tab-header .mat-mdc-tab { + flex-grow: initial !important; +} +.mat-button, .mat-fab, .mat-flat-button, .mat-icon-button, .mat-mini-fab, +.mat-mdc-raised-button, +.mat-raised-button, .mat-stroked-button { + font-family: Roboto, Helvetica, Arial, sans-serif !important; + font-size: 14px; + font-weight: 500; +} +.ag-cell-wrapper, .ag-filter .ag-filter-filter, .ag-filter-select, .ag-header-cell, .ag-paging-panel, .ag-theme-material, .cdk-drag, .label-callid, .mat-button, .mat-fab, .mat-flat-button, .mat-icon-button, .mat-list-base .mat-list-item .mat-list-item-content, .mat-list-base .mat-list-option .mat-list-item-content, .mat-mini-fab, +.mat-raised-button, +.mat-mdc-raised-button, +.mat-stroked-button, .mat-table, .md-drppicker, .month, .title, b, button, em, h1, h2, h3, h4, mat-label, p, strong { + font-family: Roboto, Helvetica, Arial, sans-serif !important; +} +.mat-button, .mat-icon-button, .mat-stroked-button { + color: inherit; + background: #0000; +} +.mat-button, .mat-icon-button, .mat-stroked-button, .mat-flat-button { + box-sizing: border-box; + position: relative; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: pointer; + outline: none; + border: none; + -webkit-tap-highlight-color: transparent; + display: inline-block; + white-space: nowrap; + text-decoration: none; + vertical-align: baseline; + text-align: center; + margin: 0; + min-width: 64px; + line-height: 36px; + padding: 0 16px; + border-radius: 4px; + overflow: visible; +} + +.mat-mdc-raised-button, +.mat-raised-button { + box-sizing: border-box; + position: relative; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: pointer; + outline: none; + border: none; + -webkit-tap-highlight-color: transparent; + display: inline-block; + white-space: nowrap; + text-decoration: none; + vertical-align: baseline; + text-align: center; + margin: 0; + min-width: 64px; + line-height: 36px; + padding: 0 16px; + border-radius: 4px; + overflow: visible; + transform: translate3d(0, 0, 0); + transition: background 400ms cubic-bezier(0.25, 0.8, 0.25, 1), box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1); +} +.add-widget-button { + width: 200px !important; + background: #009cbf !important; + padding: 3px 6px !important; + border-radius: 3px; + margin: 10px; + color: #fff !important; + cursor: pointer; + line-height: 14px; } diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index c3dfb82b..1c14176e 100644 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -1,34 +1,44 @@ { - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "experimentalDecorators": true, - "allowJs": true, - "types": [], - "paths": { - "@app/*": [ - "src/app/*" - ], - "@it-app/*": [ - "src/app/*" - ], - "@environments/*": [ - "src/environments/*" - ], - "@services": [ - "src/app/services/index.ts" - ], - "@services/*": [ - "src/app/services/*" - ], - "@widgets/*": [ - "src/app/components/widgets/*" - ] - } - }, - "exclude": [ - "test.ts", - "**/*.spec.ts", - "**/*.worker.ts" - ] + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "experimentalDecorators": true, + "allowJs": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "types": [], + "paths": { + "@app/*": [ + "src/app/*" + ], + "@it-app/*": [ + "src/app/*" + ], + "@environments/*": [ + "src/environments/*" + ], + "@services": [ + "src/app/services/index.ts" + ], + "@services/*": [ + "src/app/services/*" + ], + "@widgets/*": [ + "src/app/components/widgets/*" + ], + "@models": ["src/app/models/index.ts"], + "@models/*": ["src/app/models/*"], + "@defaults": ["src/app/models/defaults/index.ts"], + "@defaults/*": ["src/app/models/defaults/*"], + } + }, + "exclude": [ + "test.ts", + "**/*.spec.ts", + "**/*.worker.ts", + "app/helpers/ErrorCodes.ts", + "environments/environment.prod.ts", + "environments/environment.dev.ts", + "environments/environment.webapp.ts", + ] } diff --git a/src/tslint.json b/src/tslint.json index 52e2c1a5..1f7006ca 100644 --- a/src/tslint.json +++ b/src/tslint.json @@ -1,17 +1,26 @@ { - "extends": "../tslint.json", "rules": { + "no-bitwise": false, "directive-selector": [ true, "attribute", "app", "camelCase" ], + "quotemark": [ + true, + "single" + ], "component-selector": [ true, "element", "app", "kebab-case" - ] + ],"deprecation": { + "severity": "error" + }, + "no-unused-variable": { + "severity": "error" + } } } diff --git a/src/upgrade.html b/src/upgrade.html new file mode 100644 index 00000000..64f104f9 --- /dev/null +++ b/src/upgrade.html @@ -0,0 +1,23 @@ + + + + + Upgrade... + + + + + + + + + + + \ No newline at end of file diff --git a/swagger-styles.scss b/swagger-styles.scss index 2d7b6bdc..aed0c872 100644 --- a/swagger-styles.scss +++ b/swagger-styles.scss @@ -589,11 +589,10 @@ -webkit-transition: all .3s; transition: all .3s; border-radius: 4px; - background:white; - box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12); + background: white; + box-shadow: 0px 3px 1px -2px rgb(0 0 0 / 20%), 0px 2px 2px 0px rgb(0 0 0 / 14%), 0px 1px 5px 0px rgb(0 0 0 / 12%); font-family: Roboto, sans-serif; - color: #3b4151; - border:none !important; + color: #3b4151 } .swagger-ui .btn[disabled] { @@ -614,6 +613,7 @@ .swagger-ui .btn.authorize { line-height: 1; display: inline; + } .swagger-ui .btn.authorize span { @@ -937,7 +937,7 @@ max-width: 650px; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); - border:none; + border: none; border-radius: 4px; background: #fff; box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .2) @@ -972,7 +972,7 @@ display: flex; padding: 12px 0; color:white; - background:black; + background:#24465f; -webkit-box-align: center; -ms-flex-align: center; align-items: center @@ -997,7 +997,7 @@ -ms-flex: 1; flex: 1; font-family: Roboto, sans-serif; - color: white; + color:white; } .swagger-ui .model { @@ -1567,8 +1567,6 @@ width: 100%; display: none } -/*# sourceMappingURL=swagger-ui.css.map*/ - /** * Swagger UI Theme Overrides * @@ -1736,15 +1734,16 @@ width: 100%; } .swagger-ui .btn.authorize { - background: #009cbf; - padding: 3px 6px; - height:35px; - border-radius: 3px; - border:none !important; - margin-right:10px; - color: white; - cursor: pointer; - line-height: 14px; + + background: #749ad6; + padding: 3px 6px; + height:35px; + border-radius: 3px; + margin-right:10px; + color: white; + cursor: pointer; + line-height: 14px; + } .swagger-ui .btn.authorize svg { diff --git a/tsconfig.app.json b/tsconfig.app.json new file mode 100644 index 00000000..6fb81b2a --- /dev/null +++ b/tsconfig.app.json @@ -0,0 +1,23 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": [ + "src/main.ts", + "src/polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" + ], + "exclude": [ + "src/**/*.spec.ts", + "src/test.ts", + "src/app/helpers/ErrorCodes.ts", + "src/environments/environment.prod.ts", + "src/environments/environment.dev.ts", + "src/environments/environment.webapp.ts", + ] +} diff --git a/tsconfig.json b/tsconfig.json index 52c1c825..4fbc1591 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,58 +1,40 @@ -/* To learn more about this file see: https://angular.io/config/tsconfig. */ { - "compileOnSave": false, - "compilerOptions": { - "baseUrl": "./", - "outDir": "./dist/out-tsc", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "downlevelIteration": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "importHelpers": true, - "typeRoots": [ - "node_modules/@types", - "../src/typings.d.ts" - ], - "forceConsistentCasingInFileNames": true, - "strict": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "target": "es2017", - "module": "es2020", - "lib": [ - "es2018", - "dom" - ], - "paths": { - "path":[ - "./node_modules/path-browserify" - ], - "@app/*": [ - "src/app/*" - ], - "@it-app/*": [ - "src/app/*" - ], - "@environments/*": [ - "src/environments/*" - ], - "@services": [ - "src/app/services/index.ts" - ], - "@services/*": [ - "src/app/services/*" - ], - "@widgets/*": [ - "src/app/components/widgets/*" - ] + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "downlevelIteration": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "importHelpers": true, + "typeRoots": ["node_modules/@types", "../src/typings.d.ts"], + "forceConsistentCasingInFileNames": true, + "strict": false, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "target": "ES2022", + "module": "es2020", + "lib": ["es2018", "dom"], + "paths": { + "path": ["./node_modules/path-browserify"], + "@app/*": ["src/app/*"], + "@it-app/*": ["src/app/*"], + "@environments/*": ["src/environments/*"], + "@services": ["src/app/services/index.ts"], + "@services/*": ["src/app/services/*"], + "@models": ["src/app/models/index.ts"], + "@models/*": ["src/app/models/*"], + "@defaults": ["src/app/models/defaults/index.ts"], + "@defaults/*": ["src/app/models/defaults/*"], + "@widgets/*": ["src/app/components/widgets/*"], + "timers": ["node_modules/timers-browserify"], + "stream": ["node_modules/stream-browserify"] + }, + "useDefineForClassFields": false } - }, - "angularCompilerOptions": { - "enableI18nLegacyMessageIdFormat": false, - "strictInjectionParameters": true, - "strictInputAccessModifiers": true, - "strictTemplates": true - } } From beddc908def4cca2a1c0491d7c717d19874bc8b9 Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Mon, 22 Apr 2024 20:40:37 +0300 Subject: [PATCH 2/7] fix dev env --- src/environments/environment.dev.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 8ca576b5..bf6b0006 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -4,6 +4,5 @@ export const environment = { production: false, environment: VERSION + '(dev)', isHomerAPI: true, - // apiUrl: window.location.protocol + '//' + (window.location.host) + '/api/v3' - apiUrl: 'http://localhost:9080/api/v3' + apiUrl: location.protocol + '//' + (location.host) + '/api/v3' }; From e90cc339cbdc0bcdcf8f9c4e3898f030f6d42f3f Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Wed, 24 Apr 2024 13:52:33 +0300 Subject: [PATCH 3/7] main.yml --- .github/workflows/main.yml | 4 ++-- package.json | 23 ++++------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6633b1ad..c3ecb306 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,11 +19,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [12.x] + node-version: [16.x] steps: - uses: actions/checkout@v3 - name: NPM install - run: npm i --force + run: npm i - name: Build using Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: diff --git a/package.json b/package.json index 2460d483..981f2e30 100644 --- a/package.json +++ b/package.json @@ -3,27 +3,12 @@ "version": "7.8.1", "scripts": { "ng": "ng", - "inst_dev": "npm install && npm run dev", "start": "ng serve --port 80", - "dev": "ng serve --configuration=development --port=80 --disable-host-check --host=0.0.0.0 --open", - "de9": "ng serve --configuration=development --port=8002 --host=0.0.0.0 --disable-host-check", - "de9-alpha": "ng serve --configuration=development --port=8003 --host=0.0.0.0 --disable-host-check", - "webapp": "ng serve --configuration=webapp --port=8099", - "build": "ng build --configuration=production && gzip -9 ./dist/homer-ui/*.js && npm run extract-version", - "extract-version": "egrep -o '[0-9]+.[0-9]+.[0-9]+' ./src/VERSION.ts > ./dist/homer-ui/version.txt", + "dev": "ng serve --configuration=development --port=80 --disable-host-check", + "webapp": "ng serve --host 0.0.0.0 --configuration=development --port=8099 --disable-host-check", + "build": "ng build --configuration=production && gzip -9 ./dist/homer-ui/*.js", + "build-noenv": "ng build --configuration=production-noenv", "build-keep-js": "ng build --configuration=production && gzip -9 -k ./dist/homer-ui/*.js", - "build-dev": "ng build --configuration=preprod && gzip -9 ./dist/homer-ui/*.js && npm run extract-version", - "serve:all": "concurrently --kill-others \"npm run serve:hepic-view\" \"npm run dev\" \"npm run serve:hepic-export\"", - "serve:hepic-view": "concurrently --kill-others \"ng serve hepic-view --configuration=development --port=83 --open --proxy-config .\\projects\\hepic-view\\proxy.conf.json\" \"node .\\projects\\hepic-view\\proxy\\index.js\"", - "serve:dev": "concurrently --kill-others \"npm run dev\" \"ng serve hepic-view --port=83 --host=0.0.0.0 --disable-host-check\"", - "serve:dev:de9": "concurrently --kill-others \"npm run de9\" \"ng serve hepic-view --port=9987 --host=0.0.0.0 --disable-host-check\"", - "serve:hepic-export": "ng serve hepic-export --configuration=development --open --port=84 --disable-host-check", - "build:hepic-view": "ng build hepic-view --configuration=production", - "build:hepic-export": "ng build hepic-export --configuration=production", - "build-prod:hepic-export": "ng build hepic-export --configuration=production --output-hashing=none --single-bundle true", - "build:all-prod": "npm run build:hepic-view && npm run build", - "build:hepic-admin": "cd projects/hepic-admin/ && npm install && npm run build && cd ./../.. && gzip -9 -k ./dist/hepic-admin/*.js", - "serve:hepic-admin": "cd projects/hepic-admin/ && npm install && ng serve --port=8003 --disable-host-check --host=0.0.0.0 --open", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" From 8f685058a63126f8e811808a5cebf6a6bcb435d3 Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Thu, 2 May 2024 19:56:48 +0300 Subject: [PATCH 4/7] fix: shared link --- .../tab-export/tab-export.component.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.ts b/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.ts index 3a0c09b7..a1265d88 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.ts +++ b/src/app/components/search-grid-call/detail-dialog/tab-export/tab-export.component.ts @@ -335,7 +335,11 @@ export class TabExportComponent implements OnInit, AfterViewInit { // window.open(this.url, '_blank'); // } getOrigin() { - return (window.location.origin + window["base-href"]).replace(/\/$/, '') + console.log([window.location.origin, window["base-href"]]); + if (typeof window["base-href"] === 'string') { + return (window.location.origin + window["base-href"]).replace(/\/$/, '') + } + return (window.location.origin).replace(/\/$/, '') } onShareLink() { // const param = Functions.getUriJson(); @@ -348,15 +352,15 @@ export class TabExportComponent implements OnInit, AfterViewInit { async onCopyLink() { if (this.url === '') { const data = await this._ecs.postShareLink(this.getQuery()).toPromise(); - if (data.data.url === '/share/#') { - this.url = this.getOrigin() + data.data.url + data.data.uuid; - } else { - this.url = data.data.url + data.data.uuid; - } + if (data.data.url === '/share/#') { + this.url = this.getOrigin() + data.data.url + data.data.uuid; + } else { + this.url = data.data.url + data.data.uuid; + } } this.copyService.copy(this.url, { - message: 'notifications.success.shareLinkCopy', - isTranslation: true, + message: 'notifications.success.shareLinkCopy', + isTranslation: true, }); } onExportFlowAsPNG() { From b1ecd62cccbed9355fb0fae93f6fcc3b1d73b75d Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Fri, 3 May 2024 19:48:50 +0300 Subject: [PATCH 5/7] fix: transactions - HEP Logs --- .../detail-dialog/detail-dialog.component.ts | 1 + .../tab-hepsub/tab-hepsub.component.ts | 178 +++++++++--------- .../services/call/full-transaction.service.ts | 13 +- src/app/services/call/hep-log.service.ts | 24 +-- src/app/services/hepsub.service.ts | 9 +- src/app/services/index.ts | 4 +- 6 files changed, 116 insertions(+), 113 deletions(-) diff --git a/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts b/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts index 73cd2212..6e789b52 100644 --- a/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts +++ b/src/app/components/search-grid-call/detail-dialog/detail-dialog.component.ts @@ -99,6 +99,7 @@ export class DetailDialogComponent implements OnInit, OnDestroy { _showLoader = false; set showLoader(val: boolean) { this._showLoader = val; + console.log({ val }); setInterval(() => { this.cdr.detectChanges(); }, 5); diff --git a/src/app/components/search-grid-call/detail-dialog/tab-hepsub/tab-hepsub.component.ts b/src/app/components/search-grid-call/detail-dialog/tab-hepsub/tab-hepsub.component.ts index d66717c7..f6425b1a 100644 --- a/src/app/components/search-grid-call/detail-dialog/tab-hepsub/tab-hepsub.component.ts +++ b/src/app/components/search-grid-call/detail-dialog/tab-hepsub/tab-hepsub.component.ts @@ -15,88 +15,88 @@ import { Functions } from '@app/helpers/functions'; import { MatTabGroup } from '@angular/material/tabs'; @Component({ - selector: 'app-tab-hepsub', - templateUrl: './tab-hepsub.component.html', - styleUrls: ['./tab-hepsub.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-tab-hepsub', + templateUrl: './tab-hepsub.component.html', + styleUrls: ['./tab-hepsub.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class TabHepsubComponent implements OnInit, OnDestroy, AfterViewInit { - _dataItem: any; + _dataItem: any; - @Input() id: any; - @Input() callid: any; - @Input() set dataItem(value: any) { - this._dataItem = value; + @Input() id: any; + @Input() callid: any; + @Input() set dataItem(value: any) { + this._dataItem = value; - if (this.dataItem.data.heplogs) { - this.dataLogs = this.dataItem.data.heplogs; - } - this.isLogs = this.dataLogs?.length > 0; - - const { agentCdr } = this._dataItem.data; - - if (agentCdr) { - this.subTabList.push({ - title: agentCdr.node - }); + if (this.dataItem.data.heplogs) { + this.dataLogs = this.dataItem.data.heplogs; + } + this.isLogs = this.dataLogs?.length > 0; - agentCdr.data.data = Functions.JSON_parse(agentCdr.data) || agentCdr.data; + const { agentCdr } = this._dataItem.data; + console.log({ value }); + if (agentCdr) { + this.subTabList.push({ + title: agentCdr.node + }); - this.jsonData = agentCdr.data; + agentCdr.data.data = Functions.JSON_parse(agentCdr.data) || agentCdr.data; - // extract agent node information - this.agentNode = agentCdr.node; - this.agentUuid = agentCdr.uuid; - } + this.jsonData = agentCdr.data; - this.cdr.detectChanges(); - } - get dataItem(): any { - return this._dataItem; - } - @Input() dataLogs: Array; - @Input() snapShotTimeRange: any; - @Output() haveData = new EventEmitter(); - @Output() ready: EventEmitter = new EventEmitter(); - @ViewChild('matTabGroup', { static: false }) matTabGroup: MatTabGroup; - indexTabPosition = 0; - - isLogs = true; - subTabList = []; - jsonData: any; - timestamp: any; // PCAP timestamp (unix time) - timestampString: string; // PCAP timestamp (UTC string) - agentPathPcap: string; - agentNode: string; - agentUuid: string; - _interval: any; - constructor( - private cdr: ChangeDetectorRef, - private _ass: AgentsubService - ) { } - - ngAfterViewInit() { - setTimeout(() => { - this.ready.emit({}); - }, 35) + // extract agent node information + this.agentNode = agentCdr.node; + this.agentUuid = agentCdr.uuid; } - ngOnInit() { - this._interval = setInterval(() => { - this.matTabGroup.realignInkBar(); - this.cdr.detectChanges(); - }, 2000); + this.cdr.detectChanges(); + } + get dataItem(): any { + return this._dataItem; + } + @Input() dataLogs: Array; + @Input() snapShotTimeRange: any; + @Output() haveData = new EventEmitter(); + @Output() ready: EventEmitter = new EventEmitter(); + @ViewChild('matTabGroup', { static: false }) matTabGroup: MatTabGroup; + indexTabPosition = 0; + + isLogs = true; + subTabList = []; + jsonData: any; + timestamp: any; // PCAP timestamp (unix time) + timestampString: string; // PCAP timestamp (UTC string) + agentPathPcap: string; + agentNode: string; + agentUuid: string; + _interval: any; + constructor( + private cdr: ChangeDetectorRef, + private _ass: AgentsubService + ) { } + + ngAfterViewInit() { + setTimeout(() => { + this.ready.emit({}); + }, 35) + } - this.agentPathPcap = this.jsonData[this.callid].pcap || 'not_set'; - this.timestamp = this.jsonData[this.callid].t_sec * 1000 || 0; - this.timestampString = new Date(this.timestamp ).toUTCString(); - } + ngOnInit() { + this._interval = setInterval(() => { + this.matTabGroup.realignInkBar(); + this.cdr.detectChanges(); + }, 2000); - ngOnDestroy() { - if (this._interval) { - clearInterval(this._interval); - } + this.agentPathPcap = this.jsonData[this.callid].pcap || 'not_set'; + this.timestamp = this.jsonData[this.callid].t_sec * 1000 || 0; + this.timestampString = new Date(this.timestamp).toUTCString(); + } + + ngOnDestroy() { + if (this._interval) { + clearInterval(this._interval); } + } async getPcap() { const request = this.getRequest() @@ -124,28 +124,28 @@ export class TabHepsubComponent implements OnInit, OnDestroy, AfterViewInit { // generate request as expected by AgentsubService private getRequest() { return { - param: { - location: {node: ["local"]}, - search: { - ['1_call']: { - id: 0, - ['callid']: [this.callid], - ['sid']: [this.callid], - ['source_ip']: [], - ['pcap']: [this.agentPathPcap], - ['__hep__']: [this.jsonData[this.callid].__hep__], - } - }, - transaction: { - call: true, - registration: false, - rest: false, + param: { + location: { node: ["local"] }, + search: { + ['1_call']: { + id: 0, + ['callid']: [this.callid], + ['sid']: [this.callid], + ['source_ip']: [], + ['pcap']: [this.agentPathPcap], + ['__hep__']: [this.jsonData[this.callid].__hep__], } }, - timestamp: { - from: this.timestamp, - to: this.timestamp, + transaction: { + call: true, + registration: false, + rest: false, } - }; + }, + timestamp: { + from: this.timestamp, + to: this.timestamp, + } + }; } } diff --git a/src/app/services/call/full-transaction.service.ts b/src/app/services/call/full-transaction.service.ts index 13982521..e0845bdd 100644 --- a/src/app/services/call/full-transaction.service.ts +++ b/src/app/services/call/full-transaction.service.ts @@ -1,3 +1,4 @@ +import { HepLogService } from './hep-log.service'; import { AgentsubService } from '@app/services/agentsub.service'; import { Injectable } from '@angular/core'; import { CallReportService } from '@app/services'; @@ -19,7 +20,7 @@ export class FullTransactionService { constructor( private callReportService: CallReportService, private callTransactionService: CallTransactionService, - // private hepLogService: HepLogService, + private hepLogService: HepLogService, private agentsubService: AgentsubService, private preferenceHepsubService: PreferenceHepsubService, private _pass: PreferenceAgentsubService, @@ -115,11 +116,11 @@ export class FullTransactionService { } } catch (err) { onError('agentCdr'); } - // try { - // const hepLogRes: any = await this.hepLogService.getLog(rt).toPromise(); - // tData = await _worker({ tData, logsData: hepLogRes.data, type: 'logs' }); - // tData.heplogs = hepLogRes.data; - // } catch (err) { onError('heplogs'); } + try { + const hepLogRes: any = await this.hepLogService.getLog(rt).toPromise(); + tData = await _worker({ tData, logsData: hepLogRes.data, type: 'logs' }); + tData.heplogs = hepLogRes.data; + } catch (err) { onError('heplogs'); } try { const callIdArr = tData?.data?.calldata.map(i => i.sid).sort().filter((i, k, a) => i !== a[k - 1]) || []; diff --git a/src/app/services/call/hep-log.service.ts b/src/app/services/call/hep-log.service.ts index 871fd2f6..f1946cd0 100644 --- a/src/app/services/call/hep-log.service.ts +++ b/src/app/services/call/hep-log.service.ts @@ -3,22 +3,22 @@ import { HttpClient } from '@angular/common/http'; import { environment } from '@environments/environment'; @Injectable({ - providedIn: 'root' + providedIn: 'root' }) export class HepLogService { - private url = `${environment.apiUrl}/call/report/log`; + private url = `${environment.apiUrl}/call/report/log`; - constructor(private http: HttpClient) { } + constructor(private http: HttpClient) { } - getLog(data: any) { - return this.http.post(`${this.url}`, data); - } + getLog(data: any) { + return this.http.post(`${this.url}`, data); + } } -/** - * TODO: - * transaction dialog / logs / HEPSUB:"test-endpoint"/ cdr - * as on HOMER [domain:port-1]/dashboard/home - * [domain:port-2]/api/v3/agent/type/cdr - */ \ No newline at end of file +// /** +// * TODO: +// * transaction dialog / logs / HEPSUB:"test-endpoint"/ cdr +// * as on HOMER [domain:port-1]/dashboard/home +// * [domain:port-2]/api/v3/agent/type/cdr +// */ diff --git a/src/app/services/hepsub.service.ts b/src/app/services/hepsub.service.ts index 0ee2091e..eda0036f 100644 --- a/src/app/services/hepsub.service.ts +++ b/src/app/services/hepsub.service.ts @@ -11,16 +11,17 @@ export class HepsubService { private url = `${environment.apiUrl}/hepsub`; - constructor(private http: HttpClient) { } + constructor(private http: HttpClient) { + console.log("HepsubService:super()"); + } // Hepsub protokols getProtokols(): Observable { - return this.http.get(`${this.url}/protocols`); + return this.http.get(`${this.url}/protocols`); } // Hepsub fields getFields(): Observable { - return this.http.get(`${this.url}/fields`); + return this.http.get(`${this.url}/fields`); } - } diff --git a/src/app/services/index.ts b/src/app/services/index.ts index f0120e07..4b2a1a61 100644 --- a/src/app/services/index.ts +++ b/src/app/services/index.ts @@ -19,7 +19,6 @@ export * from './message-details.service'; export * from './call/report.service'; export * from './call/transaction.service'; export * from './call/full-transaction.service'; -export * from './call/hep-log.service'; export * from './user-security.service'; export * from './export/call.service'; export * from './search/call.service'; @@ -32,4 +31,5 @@ export * from './search.service'; export * from './tooltip.service'; export * from './statistic.service'; export * from './time-formatting.service'; -export * from './copy.service'; \ No newline at end of file +export * from './copy.service'; +export * from './call/hep-log.service'; From ac0634939e40da2d8e08cfe9a6265f974f525632 Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Fri, 3 May 2024 19:53:37 +0300 Subject: [PATCH 6/7] update version --- src/VERSION.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VERSION.ts b/src/VERSION.ts index 722b9ebe..28dec233 100644 --- a/src/VERSION.ts +++ b/src/VERSION.ts @@ -1 +1 @@ -export const VERSION = '7.10.34' +export const VERSION = '7.11.01' From 8e56a9b2f858457349643563add39df96b8943ff Mon Sep 17 00:00:00 2001 From: Eduard Klimenko Date: Mon, 6 May 2024 18:18:57 +0300 Subject: [PATCH 7/7] fix: added new user dialog password validator --- .../dialog-users/dialog-users.component.html | 10 +- .../dialog-users/dialog-users.component.ts | 513 ++++++++++-------- 2 files changed, 301 insertions(+), 222 deletions(-) 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 94465cd5..1cddf272 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 @@ -77,6 +77,7 @@ [placeholder]="'preference.users.dialog.password' | translate" [type]="hidePass1 ? 'password' : 'text'" [formControl]="password" + (change)="validate()" (blur)="validate()" (keyup)="validate()" required /> The password {{'validators.required' | translate }} @@ -85,7 +86,9 @@ {{ password?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} - + + {{'validators.pattern' | translate }} [aA-Zz], [0-9] and "~!@#$%^&*()_"] + {{ password2?.errors?.['maxlength']?.requiredLength }} {{'validators.maxChars' | translate }} + + {{'validators.pattern' | translate }} [aA-Zz], [0-9] and "~!@#$%^&*()_"] +
{{ 'preference.users.dialog.personalInfo' | translate }} @@ -237,7 +243,7 @@ class="setting-btn-ok" (click)="onSubmit()" cdkFocusInitial - [disabled]="isCopy && isNotChanged"> + [disabled]="(isCopy && isNotChanged) || isDisabled"> {{'LINK.buttons.save' | translate}}
diff --git a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts index bb9ecb50..5b030a04 100644 --- a/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts +++ b/src/app/components/preference/dialogs/dialog-users/dialog-users.component.ts @@ -2,244 +2,317 @@ import { Component, Inject, ViewChild, ChangeDetectionStrategy, OnInit, ChangeDe import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Functions } from '@app/helpers/functions'; import { AuthenticationService, AlertService, PreferenceUserService, PreferenceAdvancedService } from '@app/services'; -import { Validators, FormControl, AbstractControl } from '@angular/forms'; +import { Validators, FormControl, AbstractControl, ValidatorFn, ValidationErrors } from '@angular/forms'; import { emailValidator } from '@app/helpers/email-validator.directive'; import { TranslateService } from '@ngx-translate/core' -import moment from 'moment'; +import moment from 'moment'; import { lastValueFrom } from 'rxjs'; @Component({ - selector: 'app-dialog-users', - templateUrl: './dialog-users.component.html', - styleUrls: ['./dialog-users.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-dialog-users', + templateUrl: './dialog-users.component.html', + styleUrls: ['./dialog-users.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class DialogUsersComponent implements OnInit { - isValidForm = false; - isAdmin = false; - pass2: string; - hidePass1 = true; - regString = /^[a-zA-Z0-9\-\_\.]+$/; - regNum = /^[0-9]+$/; - regDept = /^[a-zA-Z0-9\-\_\.\s]+$/; - originalUser = ''; - isCopy = false; - isNotChanged = true; - bufferName: string; - timeout: any; - lastPasswordChange: string; - lastLogin: string; - username = new FormControl( - {value:'', disabled: true},[ - Validators.required, - Validators.minLength(3), - Validators.maxLength(100), - Validators.pattern(this.regString)], - this.usernameValidator.bind(this) - ); - /* usergroup = new FormControl('', [ - Validators.required, - Validators.minLength(3), - Validators.maxLength(100), - Validators.pattern(this.regString) - ]); */ - usergroup = new FormControl(''); - partid = new FormControl( - {value:'', disabled: true}, [ - Validators.required, - Validators.minLength(1), - Validators.maxLength(100), - Validators.min(1), - Validators.max(99), - Validators.pattern(this.regNum) - ]); - password = new FormControl('', [ - Validators.required, - Validators.minLength(6), - Validators.maxLength(100) - - ]); - password2 = new FormControl('', [ - Validators.required, - Validators.minLength(6), - Validators.maxLength(100) - - ]); - - firstname = new FormControl('', [ - Validators.required, - Validators.minLength(1), - Validators.maxLength(100), - Validators.pattern(this.regString) - ]); - - email = new FormControl('', [ - Validators.required, - emailValidator()]); - lastname = new FormControl('', [ - Validators.maxLength(100), - Validators.pattern(this.regString) - ]); - - department = new FormControl('', [ - Validators.minLength(1), - Validators.maxLength(100), - Validators.pattern(this.regDept) - ]); - - groupList: Array; - bufferGroupList: any; - dateFormat: string; - hasStatistics = false; - constructor( - private authenticationService: AuthenticationService, - public dialogRef: MatDialogRef, - private alertService: AlertService, - private userService: PreferenceUserService, - public translateService: TranslateService, - private _pas: PreferenceAdvancedService, - private cdr: ChangeDetectorRef, - @Inject(MAT_DIALOG_DATA) public data: any) { - translateService.addLangs(['en']) - translateService.setDefaultLang('en') - if (data.isnew) { - data.data = { - username: '', - usergroup: 'user', - partid: 10, - password: '', - firstname: '', - email: '', - lastname: '', - department: '', - guid: Functions.newGuid(), - - }; - - } - - const userData = this.authenticationService.currentUserValue; - this.isAdmin = userData?.user?.admin === true; - if (this.isAdmin) { - this.username.enable(); - this.partid.enable(); - } - this.isCopy = data.isCopy; - if (this.isCopy) { - this.bufferName = data.data.username; - this.isNotChanged = false; - } - /* be sure that this is string */ - data.data.password = String(data.data.password); - (d => { - this.originalUser = d.username; - this.username.setValue(this.isCopy ? d.username + 'COPY' : d.username); - this.usergroup.setValue(d.usergroup.toLowerCase()); - this.partid.setValue(d.partid); - this.firstname.setValue(d.firstname); - this.email.setValue(d.email); - this.lastname.setValue(d.lastname); - this.department.setValue(d.department); - this.lastPasswordChange = d.params?.timestamp_change_password; - this.lastLogin = d.params?.last_loogin; - })(data.data); - if (data.data.params?.last_login || data.data.params?.timestamp_change_password) { - this.hasStatistics = true; - } - this.isValidForm = true; + isValidForm = false; + isAdmin = false; + pass2: string; + hidePass1 = true; + regString = /^[a-zA-Z0-9\-\_\.]+$/; + regNum = /^[0-9]+$/; + regDept = /^[a-zA-Z0-9\-\_\.\s]+$/; + originalUser = ''; + isCopy = false; + isNotChanged = true; + bufferName: string; + timeout: any; + lastPasswordChange: string; + lastLogin: string; + isDisabled: boolean = true; + regPassword: RegExp; + characterRequirements: CharacterRequirements = { + numbers: true, + lowercase: true, + uppercase: true, + special: false, + }; + username = new FormControl( + { value: '', disabled: true }, [ + Validators.required, + Validators.minLength(3), + Validators.maxLength(100), + Validators.pattern(this.regString)], + this.usernameValidator.bind(this) + ); + /* usergroup = new FormControl('', [ + Validators.required, + Validators.minLength(3), + Validators.maxLength(100), + Validators.pattern(this.regString) + ]); */ + usergroup = new FormControl(''); + partid = new FormControl( + { value: '', disabled: true }, [ + Validators.required, + Validators.minLength(1), + Validators.maxLength(100), + Validators.min(1), + Validators.max(99), + Validators.pattern(this.regNum) + ]); + password = new FormControl('', [ + Validators.required, + Validators.minLength(6), + Validators.maxLength(100) + ]); + password2 = new FormControl('', [ + Validators.required, + Validators.minLength(6), + Validators.maxLength(100) + + ]); + + firstname = new FormControl('', [ + Validators.required, + Validators.minLength(1), + Validators.maxLength(100), + Validators.pattern(this.regString) + ]); + + email = new FormControl('', [ + Validators.required, + emailValidator()]); + lastname = new FormControl('', [ + Validators.maxLength(100), + Validators.pattern(this.regString) + ]); + + department = new FormControl('', [ + Validators.minLength(1), + Validators.maxLength(100), + Validators.pattern(this.regDept) + ]); + + groupList: Array; + bufferGroupList: any; + dateFormat: string; + hasStatistics = false; + constructor( + private authenticationService: AuthenticationService, + public dialogRef: MatDialogRef, + private alertService: AlertService, + private userService: PreferenceUserService, + public translateService: TranslateService, + private _pas: PreferenceAdvancedService, + private cdr: ChangeDetectorRef, + @Inject(MAT_DIALOG_DATA) public data: any) { + translateService.addLangs(['en']) + translateService.setDefaultLang('en') + if (data.isnew) { + data.data = { + username: '', + usergroup: 'user', + partid: 10, + password: '', + firstname: '', + email: '', + lastname: '', + department: '', + guid: Functions.newGuid(), + + }; } - async ngOnInit() { - await lastValueFrom(this.userService - .getAllGroups()) - .then((groups: any) => { - this.groupList = groups.data; - }); - await this.getFormat(); - } - onNoClick(): void { - this.dialogRef.close(); + + const userData = this.authenticationService.currentUserValue; + this.isAdmin = userData?.user?.admin === true; + if (this.isAdmin) { + this.username.enable(); + this.partid.enable(); } - onSubmit() { - if (!this.username?.invalid && - !this.usergroup?.invalid && - !this.partid?.invalid && - (this.data?.isNew || this.isCopy ? !this.password?.invalid : true) && - !this.firstname?.invalid && - !this.email?.invalid && - !this.lastname?.invalid && - !this.department?.invalid - ) { - (d => { - d.username = this.username?.value; - d.usergroup = this.usergroup?.value; - d.partid = this.partid?.value; - d.password = this.password?.value; - d.firstname = this.firstname?.value; - d.email = this.email?.value; - d.lastname = this.lastname?.value; - d.department = this.department?.value; - })(this.data.data); - - this.dialogRef.close(this.data); - } else { - this.username.markAsTouched(); - this.usergroup.markAsTouched(); - this.partid.markAsTouched(); - this.password.markAsTouched(); - this.password2.markAsTouched(); - this.firstname.markAsTouched(); - this.email.markAsTouched(); - this.lastname.markAsTouched(); - this.department.markAsTouched(); - } + this.isCopy = data.isCopy; + if (this.isCopy) { + this.bufferName = data.data.username; + this.isNotChanged = false; } - getErrorMessage() { - return this.email.hasError('required') ? 'You must enter a value' : 'Not a valid email'; + /* be sure that this is string */ + data.data.password = String(data.data.password); + (d => { + this.originalUser = d.username; + this.username.setValue(this.isCopy ? d.username + 'COPY' : d.username); + this.usergroup.setValue(d.usergroup.toLowerCase()); + this.partid.setValue(d.partid); + this.firstname.setValue(d.firstname); + this.email.setValue(d.email); + this.lastname.setValue(d.lastname); + this.department.setValue(d.department); + this.lastPasswordChange = d.params?.timestamp_change_password; + this.lastLogin = d.params?.last_loogin; + })(data.data); + if (data.data.params?.last_login || data.data.params?.timestamp_change_password) { + this.hasStatistics = true; } - async getFormat() { - let advancedFormat; - - await this._pas.getSetting('dateTimeFormat', 'system').then((data) => advancedFormat = data[0]?.format); - - if (typeof advancedFormat === 'undefined' || advancedFormat.replace(/\s/, '') === '') { - const locale = navigator.languages[0]; - const localeData = moment.localeData(locale); - const dateFormat = localeData.longDateFormat('L'); - const timeFormat = 'HH:mm:ss'; - this.dateFormat = `${dateFormat} ${timeFormat}`; - } else { - this.dateFormat = advancedFormat; - } - this.lastLogin = moment(this.lastLogin).format(advancedFormat); - this.lastPasswordChange = moment(this.lastPasswordChange).format(advancedFormat); - this.cdr.detectChanges(); + this.isValidForm = true; + + + } + async ngOnInit() { + await lastValueFrom(this.userService + .getAllGroups()) + .then((groups: any) => { + this.groupList = groups.data; + }); + await this.getFormat(); + await this.getPasswordPolicy(); + } + async getPasswordPolicy() { + + this.password.addValidators(passwordValidator(this.characterRequirements)); + this.password2.addValidators(passwordValidator(this.characterRequirements)); + this.password.updateValueAndValidity(); + this.password2.updateValueAndValidity(); + this.cdr.detectChanges(); + } + onNoClick(): void { + this.dialogRef.close(); + } + onSubmit() { + if (!this.username?.invalid && + !this.usergroup?.invalid && + !this.partid?.invalid && + (this.data?.isNew || this.isCopy ? !this.password?.invalid : true) && + !this.firstname?.invalid && + !this.email?.invalid && + !this.lastname?.invalid && + !this.department?.invalid + ) { + (d => { + d.username = this.username?.value; + d.usergroup = this.usergroup?.value; + d.partid = this.partid?.value; + d.password = this.password?.value; + d.firstname = this.firstname?.value; + d.email = this.email?.value; + d.lastname = this.lastname?.value; + d.department = this.department?.value; + })(this.data.data); + + this.dialogRef.close(this.data); + } else { + this.username.markAsTouched(); + this.usergroup.markAsTouched(); + this.partid.markAsTouched(); + this.password.markAsTouched(); + this.password2.markAsTouched(); + this.firstname.markAsTouched(); + this.email.markAsTouched(); + this.lastname.markAsTouched(); + this.department.markAsTouched(); } + } + getErrorMessage() { + return this.email.hasError('required') ? 'You must enter a value' : 'Not a valid email'; + } + async getFormat() { + let advancedFormat; - usernameValidator(userControl: AbstractControl) { - return new Promise(resolve => { - if (typeof this.timeout !== 'undefined') { - clearTimeout(this.timeout); - } - this.timeout = setTimeout(() => { - let validated = false; - this.isTaken(userControl.value).then(data => { - validated = data; - resolve(validated ? { userNameNotAvailable: true } : null); - }); - }, 500); - }); + await this._pas.getSetting('dateTimeFormat', 'system').then((data) => advancedFormat = data[0]?.format); + + if (typeof advancedFormat === 'undefined' || advancedFormat.replace(/\s/, '') === '') { + const locale = navigator.languages[0]; + const localeData = moment.localeData(locale); + const dateFormat = localeData.longDateFormat('L'); + const timeFormat = 'HH:mm:ss'; + this.dateFormat = `${dateFormat} ${timeFormat}`; + } else { + this.dateFormat = advancedFormat; + } + this.lastLogin = moment(this.lastLogin).format(advancedFormat); + this.lastPasswordChange = moment(this.lastPasswordChange).format(advancedFormat); + this.cdr.detectChanges(); + } + validate() { + if ( + this.username?.invalid || + this.usergroup?.invalid || + this.partid?.invalid || + this.firstname?.invalid || + this.email?.invalid || + this.lastname?.invalid || + (this.data?.isNew || this.isCopy || this.password.value !== '' + ? this.password?.invalid + : false) || + this.department?.invalid + ) { + this.isDisabled = true; + } else { + this.isDisabled = false; } - async isTaken(user) { - return this.userService.getAll().toPromise().then((users: any) => { - return ([].concat(users?.data?.map?.(m => m?.username) || [])).includes(user) && user !== this.originalUser; + this.cdr.detectChanges(); + } + usernameValidator(userControl: AbstractControl) { + return new Promise(resolve => { + if (typeof this.timeout !== 'undefined') { + clearTimeout(this.timeout); + } + this.timeout = setTimeout(() => { + let validated = false; + this.isTaken(userControl.value).then(data => { + validated = data; + resolve(validated ? { userNameNotAvailable: true } : null); }); + }, 500); + }); + } + async isTaken(user) { + return this.userService.getAll().toPromise().then((users: any) => { + return ([].concat(users?.data?.map?.(m => m?.username) || [])).includes(user) && user !== this.originalUser; + }); + } + disableClose(e) { + this.dialogRef.disableClose = e; + } + import(text) { + this.data.data.setting = text; + } +} +export interface CharacterRequirements { + special: boolean; + lowercase: boolean; + uppercase: boolean; + numbers: boolean; +} + +export function passwordValidator( + characterRequirements: CharacterRequirements +): ValidatorFn { + return (control: AbstractControl): ValidationErrors | null => { + const specialCharaterRegex = /[\*\.!@#$%^&(){}[\]:;<>,.?\/~_+-=|\\]/; + const hasSpecial = !characterRequirements.special || specialCharaterRegex.test(control.value); + const lowercaseRegex = /[a-z]/; + const hasLowercase = !characterRequirements.lowercase || lowercaseRegex.test(control.value); + const uppercaseRegex = /[A-Z]/; + const hasUppercase = !characterRequirements.uppercase || uppercaseRegex.test(control.value); + const numberRegex = /\d/; + const hasNumbers = !characterRequirements.numbers || numberRegex.test(control.value); + const forbidden = + hasNumbers && hasUppercase && hasLowercase && hasSpecial; + const missing = []; + if (!hasNumbers) { + missing.push('numbers'); + } + if (!hasLowercase) { + missing.push('lowercase letters'); } - disableClose(e) { - this.dialogRef.disableClose = e; + if (!hasUppercase) { + missing.push('uppercase letters'); } - import(text) { - this.data.data.setting = text; + if (!hasSpecial) { + missing.push('special characters'); } + const textMissing = missing.join(', ') + return !forbidden ? { missingCharacters: { value: textMissing } } : null; + }; }