NAS-123603: Remove leftovers ngx-datatable (#8632)

truenas · Aug 22, 2023 · 1b048e2 · 1b048e2
1 parent 82f2407
commit 1b048e2
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 150 deletions.
diff --git a/angular.json b/angular.json
@@ -31,7 +31,6 @@
               ]
             },
             "styles": [
-              "node_modules/@siemens/ngx-datatable/assets/icons.css",
               "node_modules/@bugsplat/angular-tree-component/css/angular-tree-component.css",
               "src/assets/styles/index.scss"
             ],

diff --git a/package.json b/package.json
@@ -78,7 +78,6 @@
     "@sentry/angular": "5.30.0",
     "@sentry/utils": "~7.42.0",
     "@shopify/eslint-plugin": "~42.0.1",
-    "@siemens/ngx-datatable": "~21.4.1",
     "@types/dygraphs": "^2.1.2",
     "@types/fontfaceobserver": "^0.0.6",
     "@types/jest": "~28.1.3",

diff --git a/src/app/modules/entity/entity.module.ts b/src/app/modules/entity/entity.module.ts
@@ -39,7 +39,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { TreeModule } from '@bugsplat/angular-tree-component';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
 import { NgxFilesizeModule } from 'ngx-filesize';
 import { CommonDirectivesModule } from 'app/directives/common/common-directives.module';
 import { CastModule } from 'app/modules/cast/cast.module';
@@ -71,7 +70,6 @@ import { TooltipModule } from 'app/modules/tooltip/tooltip.module';
     ReactiveFormsModule,
     DragDropModule,
     RouterModule,
-    NgxDatatableModule,
     CdkTableModule,
     TreeModule,
     MatListModule,

diff --git a/src/app/pages/storage/storage.module.ts b/src/app/pages/storage/storage.module.ts
@@ -19,7 +19,6 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgxDatatableModule } from '@siemens/ngx-datatable';
 import { NgChartsModule } from 'ng2-charts';
 import { NgxFilesizeModule } from 'ngx-filesize';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -77,7 +76,6 @@ import { ZfsHealthCardComponent } from './components/dashboard-pool/zfs-health-c
     FlexLayoutModule,
     ReactiveFormsModule,
     LayoutModule,
-    NgxDatatableModule,
     MatFormFieldModule,
     MatOptionModule,
     TooltipModule,

diff --git a/src/assets/styles/other/_egret_overrides.scss b/src/assets/styles/other/_egret_overrides.scss
@@ -53,14 +53,6 @@ div.mat-toolbar {
   padding: 0 !important;
 }
 
-.mat-mdc-card-table .ngx-datatable {
-  margin: 0 !important;
-}
-
-ngx-datatable .mat-box-shadow {
-  box-shadow: none;
-}
-
 .mat-card-title-text {
   font-size: 24px;
   margin: 16px;

diff --git a/src/assets/styles/other/_fn-styles.scss b/src/assets/styles/other/_fn-styles.scss
@@ -359,97 +359,6 @@ body .mat-mdc-select-trigger {
   padding: 1rem;
 }
 
-.ngx-datatable.material .datatable-header .datatable-header-cell {
-  font-weight: 330;
-  padding: 0.5rem;
-}
-
-.ngx-datatable.fullscreen {
-  height: calc(100vh - 90px);
-}
-
-.ngx-datatable.fullscreen .datatable-header {
-  background: blue;
-  overflow: hidden;
-  position: fixed;
-  z-index: 999;
-}
-
-.ngx-datatable.material {
-  background: rgba(255, 255, 255, 0.42);
-}
-
-.ngx-datatable.material .datatable-header {
-  background: rgba(255, 255, 255, 0.66);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-}
-
-.ngx-datatable.material .datatable-header .datatable-header-cell {
-  font-weight: 500;
-  padding: 0.5rem;
-}
-
-.ngx-datatable.material .datatable-header .datatable-header-cell:hover {
-  border-right: 1px solid rgba(0, 0, 0, 0.12);
-}
-
-.ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover,
-.ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover .datatable-row-group {
-  background: rgba(0, 0, 0, 0.04);
-}
-
-.ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover,
-.ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover .datatable-row-group {
-  transition-duration: 0.3s;
-  transition-property: background;
-  transition-timing-function: linear;
-}
-
-.ngx-datatable.material .datatable-body .datatable-body-row .datatable-body-cell {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
-  line-height: 2.2rem;
-  overflow: hidden;
-  /*padding: .9rem .6rem;
-    line-height: 0rem;*/
-  padding: 0 16px;
-}
-
-.ngx-datatable.material .datatable-body .datatable-body-row:last-child {
-  border-bottom: 0 solid black;
-}
-
-.ngx-datatable.material .datatable-footer {
-  border-top: 1px solid rgba(255, 255, 255, 0);
-}
-
-.ngx-datatable.material .datatable-footer .page-count {
-  height: 50px;
-  line-height: 50px;
-  padding: 0 1.2rem;
-}
-
-.ngx-datatable .datatable-footer .datatable-pager .pager {
-  padding: 0 1.2rem !important;
-}
-
-.ngx-datatable .datatable-footer .datatable-pager .pager .pages {
-  margin: 0 0.5rem;
-}
-
-.ngx-datatable .datatable-footer .datatable-pager .pager .pages a {
-  border-radius: 3px;
-  height: 22px;
-  line-height: 22px;
-  min-width: 24px;
-  padding: 0 6px;
-  text-align: center;
-  text-decoration: none;
-}
-
-.ngx-datatable .datatable-footer .datatable-pager .pager .pages.active a {
-  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);
-}
-
 /*-------- Scrollbar ---------*/
 body * {
   scrollbar-color: rgba(0, 0, 0, 28%) var(--contrast-lightest);

diff --git a/src/assets/styles/other/_tn-styles.scss b/src/assets/styles/other/_tn-styles.scss
@@ -24,7 +24,6 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
   .mat-bg-primary,
   .sidebar-panel.mat-sidenav .sidebar-list-item.open md-icon:not(.menu-caret),
   .chats-wrap .conversations-hold .single-conversation.me .conversation-msg,
-  .ngx-datatable .datatable-footer .datatable-pager .pager .pages.active a,
   .fileupload-drop-zone.dz-file-over,
   .toolbar-avatar.online > .status-dot {
     background: map-get($md-primary, 500) !important;
@@ -110,18 +109,13 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
   .mat-mini-fab.mat-primary,
   .sidebar-panel.mat-sidenav .sidebar-list-item.open md-icon:not(.menu-caret),
   .chats-wrap .conversations-hold .single-conversation.me .conversation-msg,
-  .ngx-datatable .datatable-footer .datatable-pager .pager .pages.active a,
   .fileupload-drop-zone.dz-file-over,
   .toolbar-avatar.online > .status-dot,
   .mat-step-header .mat-step-icon:not(.mat-step-icon-state-error):not(.mat-step-icon-state-number):not(.mat-step-icon-state-edit) {
     @include variable(background, --primary, $primary, !important);
     @include variable(color, --primary-txt, $primary-txt, !important);
   }
 
-  .ngx-datatable.material {
-    background: none;
-  }
-
   .datatable-header,
   .datatable-footer {
     @include variable(border-top-color, --bg1, $bg1, !important);
@@ -139,8 +133,7 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
   .mat-bg-accent,
   .mat-raised-button.mat-accent,
   .mat-fab.mat-accent,
-  .mat-mini-fab.mat-accent,
-  .ngx-datatable .datatable-footer .datatable-pager .pager .pages.active a {
+  .mat-mini-fab.mat-accent {
     @include variable(background, --accent, $accent, !important);
     @include variable(color, #000, #000, !important);
     background-color: map-get($md-accent, 500);
@@ -346,19 +339,11 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
   .mat-mdc-select-panel .mat-mdc-option:hover,
   .mat-mdc-menu-content button.mat-mdc-menu-item:hover,
   .mat-mdc-menu-content button.mat-mdc-menu-item:hover .mat-icon:not(.theme-picker-swatch-icon),
-  .ngx-datatable .datatable-body .datatable-row-wrapper:hover,
-  .ngx-datatable .datatable-body .datatable-row-wrapper:hover .plugin-buttons,
-  .ngx-datatable .datatable-body .datatable-row-wrapper:hover .plugin-icons,
   .mat-mdc-menu-content button.mat-mdc-menu-item:focus,
-  .mat-mdc-menu-content button.mat-mdc-menu-item:focus .mat-icon:not(.theme-picker-swatch-icon),
-  .ngx-datatable .datatable-body .datatable-row-wrapper:focus {
+  .mat-mdc-menu-content button.mat-mdc-menu-item:focus .mat-icon:not(.theme-picker-swatch-icon) {
     background-color: var(--hover-bg);
   }
 
-  .ngx-datatable .datatable-body .datatable-row-wrapper:hover .mat-mdc-slide-toggle:not(.mat-checked) .mat-mdc-slide-toggle-bar {
-    @include variable(background, --bg1, $bg1, !important);
-  }
-
   // Treelists in storage/volumes
   .mat-expansion-panel-body {
     position: relative;
@@ -550,11 +535,6 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
     top: 7px;
   }
 
-  // Fix bug where ngx-datatable rows get stuck at original window width
-  .datatable-scroll {
-    min-width: 100%;
-  }
-
   // Style the ix logo with the primary theme color
   .ix-logo {
     @include variable(fill, --primary, $primary);
@@ -666,11 +646,6 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
     opacity: 0;
   }
 
-  // Adjustment of highlight over page number on pager in footer
-  .ngx-datatable .datatable-footer .datatable-pager .pager .pages.active a {
-    padding-top: 1px;
-  }
-
   // Helper styles for red,blue,green,cyan,orange,magenta,violet,yellow
   // The --color-txt css vars are generated by theme service
   .fn-theme-primary {
@@ -864,10 +839,6 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
     margin-left: 5px;
   }
 
-  .ngx-datatable .datatable-header .datatable-header-cell .sort-btn {
-    vertical-align: -8px;
-  }
-
   .mat-mdc-progress-bar-fill::after {
     @include variable(background-color, --primary, $primary);
   }
@@ -927,13 +898,6 @@ $primary-dark: darken(map-get($md-primary, 500), 8%);
     white-space: nowrap;
   }
 
-  .ngx-datatable .datatable-header .datatable-header-cell .resize-handle {
-    @include variable(border-color, --primary-txt, $primary-txt);
-    border-right: 1px solid !important;
-    opacity: 0.25;
-    visibility: visible !important;
-  }
-
   .datatable-header-inner {
     height: 52px;
   }

diff --git a/yarn.lock b/yarn.lock
@@ -3895,13 +3895,6 @@
     pkg-dir "^5.0.0"
     pluralize "^8.0.0"
 
-"@siemens/ngx-datatable@~21.4.1":
-  version "21.4.1"
-  resolved "https://registry.yarnpkg.com/@siemens/ngx-datatable/-/ngx-datatable-21.4.1.tgz#e0d3fe6b82633080f3d13a9f3c8ec353fcce78fc"
-  integrity sha512-aOC1OBK9YaT7VqhKjintZ5978ax+eEx0J9SLObwEjYonW8wWeECMhAe3DRtgzimUshCJo54hiXPdcTlFTJijuQ==
-  dependencies:
-    tslib "^2.0.0"
-
 "@sigstore/protobuf-specs@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4"