chore(deps): remove unused client dependencies [BE-12749] (#2172)

This commit is contained in:
Chaim Lev-Ari
2026-03-30 14:54:50 +03:00
committed by GitHub
parent d93508a272
commit b53684a89e
9 changed files with 28 additions and 343 deletions
+1 -2
View File
@@ -2,8 +2,7 @@ import 'bootstrap/dist/css/bootstrap.css';
import 'toastr/build/toastr.css';
import 'angularjs-slider/dist/rzslider.css';
import 'angular-loading-bar/build/loading-bar.css';
import 'angular-moment-picker/dist/angular-moment-picker.min.css';
import 'spinkit/spinkit.min.css';
import 'spinkit/spinkit.min.css'; // ViewLoading, index.html, internal-auth. auth,
import '@reach/menu-button/styles.css';
import './colors';
-2
View File
@@ -41,7 +41,6 @@ angular
'ngFileUpload',
'ngMessages',
'ngResource',
'angularUtils.directives.dirPagination',
'LocalStorageModule',
'angular-loading-bar',
'angular-clipboard',
@@ -54,7 +53,6 @@ angular
'portainer.kubernetes',
'portainer.edge',
'rzModule',
'moment-picker',
constantsModule,
])
.run(onStartupAngular)
@@ -1,200 +0,0 @@
<div class="datatable">
<rd-widget>
<rd-widget-body classes="no-padding">
<!-- table title and action menu -->
<div class="toolBar !flex-col gap-1">
<div class="toolBar vertical-center w-full flex-wrap !gap-x-5 !gap-y-1 !px-0 !py-1">
<div class="toolBarTitle">
<div class="widget-icon space-right">
<pr-icon icon="'lock'"></pr-icon>
</div>
ConfigMaps & Secrets
</div>
<div class="searchBar vertical-center !mr-0 w-72">
<pr-icon icon="'search'" class-name="'icon !h-3'"></pr-icon>
<input
type="text"
class="searchInput"
ng-model="$ctrl.state.textFilter"
ng-change="$ctrl.onTextFilterChange()"
placeholder="Search for configmaps & secrets..."
auto-focus
ng-model-options="{ debounce: 300 }"
data-cy="k8sConfig-searchInput"
/>
</div>
<!-- actions -->
<div class="actionBar !mr-0 !gap-3">
<button
type="button"
class="btn btn-sm btn-dangerlight vertical-center !ml-0"
ng-disabled="$ctrl.state.selectedItemCount === 0"
ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
data-cy="k8sConfig-removeConfigButton"
>
<pr-icon icon="'trash-2'"></pr-icon>Remove
</button>
<button type="button" class="btn btn-sm btn-secondary vertical-center !ml-0" ui-sref="kubernetes.configurations.new" data-cy="k8sConfig-addConfigWithFormButton">
<pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Add with form
</button>
<button
type="button"
class="btn btn-sm btn-primary vertical-center !ml-0"
ui-sref="kubernetes.deploy({ referrer: 'kubernetes.configurations' })"
data-cy="k8sConfig-deployFromManifestButton"
>
<pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Create from file
</button>
</div>
<div class="settings">
<span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
<span uib-dropdown-toggle aria-label="Settings">
<pr-icon icon="'more-vertical'" class-name="'icon !mr-0 !h-4'"></pr-icon>
</span>
<div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
<div class="tableMenu">
<div class="menuHeader"> Table settings </div>
<div class="menuContent">
<div>
<div class="md-checkbox" ng-if="$ctrl.isAdmin">
<input
id="setting_show_system"
type="checkbox"
ng-model="$ctrl.settings.showSystem"
ng-change="$ctrl.onSettingsShowSystemChange()"
data-cy="k8sConfig-systemResourceCheckbox"
/>
<label for="setting_show_system">Show system resources</label>
</div>
<div class="md-checkbox">
<input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
<label for="setting_auto_refresh">Auto refresh</label>
</div>
<div ng-if="$ctrl.settings.repeater.autoRefresh">
<label for="settings_refresh_rate"> Refresh rate </label>
<select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
<option value="10">10s</option>
<option value="30">30s</option>
<option value="60">1min</option>
<option value="120">2min</option>
<option value="300">5min</option>
</select>
<span>
<pr-icon id="refreshRateChange" icon="'check'" mode="'success'" style="display: none"></pr-icon>
</span>
</div>
</div>
</div>
<div>
<a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8sConfig-closeSettingsButton">Close</a>
</div>
</div>
</div>
</span>
</div>
</div>
<div ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem" class="flex w-full flex-row">
<span class="small text-muted vertical-center mt-1">
<pr-icon icon="'info'" mode="'primary'" class="vertical-center"></pr-icon>
<div> System resources are hidden, this can be changed in the table settings. </div>
</span>
</div>
</div>
<div class="table-responsive">
<table class="table-hover nowrap-cells table" data-cy="k8sConfig-tableSettingsButtonconfigsTable">
<thead>
<tr>
<th>
<div class="flex flex-nowrap items-center">
<span class="md-checkbox vertical-center">
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
<label for="select_all"></label>
</span>
<table-column-header
col-title="'Name'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Name'"
is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Name')"
></table-column-header>
</div>
</th>
<th>
<table-column-header
col-title="'Namespace'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Namespace'"
is-sorted-desc="$ctrl.state.orderBy === 'Namespace' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Namespace')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Kind'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Kind'"
is-sorted-desc="$ctrl.state.orderBy === 'Kind' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Kind')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Created'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'CreationDate'"
is-sorted-desc="$ctrl.state.orderBy === 'CreationDate' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('CreationDate')"
></table-column-header>
</th>
</tr>
</thead>
<tbody>
<tr
dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | filter:$ctrl.isDisplayed | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
>
<td>
<span class="md-checkbox">
<input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" ng-disabled="!$ctrl.allowSelection(item)" />
<label for="select_{{ $index }}"></label>
</span>
<a ui-sref="kubernetes.configurations.configuration({ name: item.Name, namespace: item.Namespace })">{{ item.Name }}</a>
<span class="label label-primary image-tag label-margins" ng-if="!$ctrl.isSystemConfig(item) && $ctrl.isExternalConfiguration(item)">external</span>
<span class="label label-warning image-tag label-margins" ng-if="!item.Used && !$ctrl.isSystemNamespace(item) && !$ctrl.isSystemConfig(item)">unused</span>
<span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemConfig(item)">system</span>
</td>
<td>
<a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.Namespace })">{{ item.Namespace }}</a>
</td>
<td>{{ item.Kind | kubernetesConfigurationKindText }}</td>
<td>{{ item.CreationDate | getisodate }} {{ item.ConfigurationOwner ? 'by ' + item.ConfigurationOwner : '' }}</td>
</tr>
<tr ng-if="!$ctrl.dataset">
<td colspan="4" class="text-muted text-center">Loading...</td>
</tr>
<tr ng-if="$ctrl.state.filteredDataSet.length === 0">
<td colspan="4" class="text-muted text-center">No ConfigMaps or Secrets available.</td>
</tr>
</tbody>
</table>
</div>
<div class="footer pl-5" ng-if="$ctrl.dataset">
<div class="infoBar !ml-0" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
<div class="paginationControls">
<form class="form-inline">
<span class="limitSelector">
<span style="margin-right: 5px"> Items per page </span>
<select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="k8sConfig-paginationDropdown">
<option value="0">All</option>
<option value="10">10</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</span>
<dir-pagination-controls max-size="5"></dir-pagination-controls>
</form>
</div>
</div>
</rd-widget-body>
</rd-widget>
</div>
@@ -1,83 +0,0 @@
import KubernetesConfigurationHelper from '@/kubernetes/helpers/configurationHelper';
import KubernetesNamespaceHelper from '@/kubernetes/helpers/namespaceHelper';
angular.module('portainer.docker').controller('KubernetesConfigurationsDatatableController', [
'$scope',
'$controller',
'DatatableService',
'Authentication',
function ($scope, $controller, DatatableService, Authentication) {
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
const ctrl = this;
this.settings = Object.assign(this.settings, {
showSystem: false,
});
this.onSettingsShowSystemChange = function () {
DatatableService.setDataTableSettings(this.tableKey, this.settings);
};
this.isSystemNamespace = function (item) {
return KubernetesNamespaceHelper.isSystemNamespace(item.Namespace);
};
this.isSystemToken = function (item) {
return KubernetesConfigurationHelper.isSystemToken(item);
};
this.isSystemConfig = function (item) {
return ctrl.isSystemNamespace(item) || ctrl.isSystemToken(item) || item.IsRegistrySecret;
};
this.isExternalConfiguration = function (item) {
return KubernetesConfigurationHelper.isExternalConfiguration(item);
};
this.isDisplayed = function (item) {
return !ctrl.isSystemConfig(item) || (ctrl.settings.showSystem && ctrl.isAdmin);
};
/**
* Do not allow configurations in system namespaces to be selected
*/
this.allowSelection = function (item) {
return !this.isSystemConfig(item) && !item.Used;
};
this.$onInit = function () {
this.isAdmin = Authentication.isAdmin();
this.setDefaults();
this.prepareTableFromDataset();
this.state.orderBy = this.orderBy;
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
if (storedOrder !== null) {
this.state.reverseOrder = storedOrder.reverse;
this.state.orderBy = storedOrder.orderBy;
}
var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
if (textFilter !== null) {
this.state.textFilter = textFilter;
this.onTextFilterChange();
}
var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
if (storedFilters !== null) {
this.filters = storedFilters;
}
if (this.filters && this.filters.state) {
this.filters.state.open = false;
}
var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
if (storedSettings !== null) {
this.settings = storedSettings;
this.settings.open = false;
}
this.onSettingsRepeaterChange();
};
},
]);
+9 -13
View File
@@ -1,19 +1,15 @@
import angular from 'angular';
import 'moment';
import 'angular-sanitize';
import 'ng-file-upload';
import 'angular-messages';
import 'angular-resource';
import 'angular-utils-pagination';
import 'angular-local-storage';
import 'angular-loading-bar';
import 'angular-clipboard';
import 'angular-file-saver';
import 'angularjs-scroll-glue';
import 'angularjs-slider';
import 'ng-file-upload'; // build-image, import-image, kubernetes configuration data, endpoint security, init admin
import 'angular-messages'; // used for form helpers - ng-message
import 'angular-resource'; // used for http services
import 'angular-local-storage'; // used by localStorage service which is used every where
import 'angular-loading-bar'; // used in app/config.js and HeaderContainer - can be removed once we're not using the $http and $resource modules
import 'angular-clipboard'; // log-viewer, service edit, kube configmap edit, kube secret edit
import 'angular-file-saver'; // used in host-browser, volume-browser, logViewer, images edit, kube app logs, kube stacks logs, user-activity
import 'angularjs-scroll-glue'; // used in logViewer
import 'angularjs-slider'; // used in services create and edit
import 'bootstrap/dist/js/bootstrap.js';
import 'js-yaml/dist/js-yaml.js';
import 'angular-ui-bootstrap';
import 'angular-moment-picker';
window.angular = angular;
-4
View File
@@ -70,11 +70,9 @@
"angular-local-storage": "~0.5.2",
"angular-messages": "1.8.2",
"angular-mocks": "1.8.2",
"angular-moment-picker": "^0.10.2",
"angular-resource": "1.8.2",
"angular-sanitize": "1.8.2",
"angular-ui-bootstrap": "~2.5.0",
"angular-utils-pagination": "~0.11.1",
"angularjs-scroll-glue": "^2.2.0",
"angularjs-slider": "^6.4.0",
"axios": "^1.13.5",
@@ -103,7 +101,6 @@
"i18next-http-backend": "^1.3.1",
"jquery": "^3.6.0",
"js-base64": "^3.7.2",
"js-yaml": "^3.14.2",
"jsdom": "^24",
"json-schema": "^0.4.0",
"lodash": "^4.17.21",
@@ -247,7 +244,6 @@
"jquery": "^3.6.0",
"decompress": "^4.2.1",
"lodash": "^4.17.21",
"js-yaml": "^3.14.0",
"minimist": "^1.2.6",
"http-proxy": "^1.18.1",
"daterangepicker>jquery": "^3.5.1",
+12 -27
View File
@@ -8,7 +8,6 @@ overrides:
jquery: ^3.6.0
decompress: ^4.2.1
lodash: ^4.17.21
js-yaml: ^3.14.0
minimist: ^1.2.6
http-proxy: ^1.18.1
daterangepicker>jquery: ^3.5.1
@@ -141,9 +140,6 @@ importers:
angular-mocks:
specifier: 1.8.2
version: 1.8.2
angular-moment-picker:
specifier: ^0.10.2
version: 0.10.2
angular-resource:
specifier: 1.8.2
version: 1.8.2
@@ -153,9 +149,6 @@ importers:
angular-ui-bootstrap:
specifier: ~2.5.0
version: 2.5.6
angular-utils-pagination:
specifier: ~0.11.1
version: 0.11.1
angularjs-scroll-glue:
specifier: ^2.2.0
version: 2.2.0
@@ -240,9 +233,6 @@ importers:
js-base64:
specifier: ^3.7.2
version: 3.7.2
js-yaml:
specifier: ^3.14.0
version: 3.14.2
jsdom:
specifier: ^24
version: 24.1.3
@@ -3650,9 +3640,6 @@ packages:
angular-mocks@1.8.2:
resolution: {integrity: sha512-I5L3P0l21HPdVsP4A4qWmENt4ePjjbkDFdAzOaM7QiibFySbt14DptPbt2IjeG4vFBr4vSLbhIz8Fk03DISl8Q==}
angular-moment-picker@0.10.2:
resolution: {integrity: sha512-WvmrQM0zEcFqi50yDELaF34Ilrx4PtL7mWLcpTZCJGQDvMlIsxJrB30LxOkoJv8yrrLxD2s6nnR3t1/SqioWWw==}
angular-resource@1.8.2:
resolution: {integrity: sha512-CbTu8ypkVZMBLm+Wd+jI9xR7QEVCeUgN8WXsr9Yi9l0s/8ZQa5kEIuYX3F/75Ej8Xs1Jp9DoKjAyvACI6Q8IJA==}
deprecated: For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward.
@@ -3664,9 +3651,6 @@ packages:
angular-ui-bootstrap@2.5.6:
resolution: {integrity: sha512-yzcHpPMLQl0232nDzm5P4iAFTFQ9dMw0QgFLuKYbDj9M0xJ62z0oudYD/Lvh1pWfRsukiytP4Xj6BHOSrSXP8A==}
angular-utils-pagination@0.11.1:
resolution: {integrity: sha512-0ZTwRASUfl9hNGreC5EiJj82mqRfEeoiu6ufnIne3kzDxt28mDqc0c66ZUoTxhosecTJLZVeUOBbfrpeSOUQrA==}
angular@1.8.2:
resolution: {integrity: sha512-IauMOej2xEe7/7Ennahkbb5qd/HFADiNuLSESz9Q27inmi32zB0lnAsFeLEWcox3Gd1F6YhNd1CP7/9IukJ0Gw==}
deprecated: For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward.
@@ -5750,6 +5734,10 @@ packages:
resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
hasBin: true
js-yaml@4.1.1:
resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
hasBin: true
jsdoc-type-pratt-parser@4.8.0:
resolution: {integrity: sha512-iZ8Bdb84lWRuGHamRXFyML07r21pcwBrLkHEuHgEY5UbCouBwv7ECknDRKzsQIXMiqpPymqtIf8TC/shYKB5rw==}
engines: {node: '>=12.0.0'}
@@ -8595,7 +8583,7 @@ snapshots:
'@jsdevtools/ono': 7.1.3
'@types/json-schema': 7.0.15
call-me-maybe: 1.0.2
js-yaml: 3.14.2
js-yaml: 4.1.1
'@apidevtools/openapi-schemas@2.1.0': {}
@@ -9785,7 +9773,7 @@ snapshots:
globals: 13.20.0
ignore: 5.2.4
import-fresh: 3.3.0
js-yaml: 3.14.2
js-yaml: 4.1.1
minimatch: 3.1.2
strip-json-comments: 3.1.1
transitivePeerDependencies:
@@ -11906,19 +11894,12 @@ snapshots:
angular-mocks@1.8.2: {}
angular-moment-picker@0.10.2:
dependencies:
angular: 1.8.2
moment: 2.29.4
angular-resource@1.8.2: {}
angular-sanitize@1.8.2: {}
angular-ui-bootstrap@2.5.6: {}
angular-utils-pagination@0.11.1: {}
angular@1.8.2: {}
angularjs-scroll-glue@2.2.0: {}
@@ -12627,7 +12608,7 @@ snapshots:
cosmiconfig@8.2.0:
dependencies:
import-fresh: 3.3.0
js-yaml: 3.14.2
js-yaml: 4.1.1
parse-json: 5.2.0
path-type: 4.0.0
@@ -13409,7 +13390,7 @@ snapshots:
imurmurhash: 0.1.4
is-glob: 4.0.3
is-path-inside: 3.0.3
js-yaml: 3.14.2
js-yaml: 4.1.1
json-stable-stringify-without-jsonify: 1.0.1
levn: 0.4.1
lodash.merge: 4.6.2
@@ -14313,6 +14294,10 @@ snapshots:
argparse: 1.0.10
esprima: 4.0.1
js-yaml@4.1.1:
dependencies:
argparse: 2.0.1
jsdoc-type-pratt-parser@4.8.0: {}
jsdom@24.1.3:
+6 -10
View File
@@ -1,12 +1,8 @@
const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
const smp = new SpeedMeasurePlugin();
const merge = require('webpack-merge');
const webpackConfig = require('./webpack.production.js');
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import { merge } from 'webpack-merge';
import webpackConfig from './webpack.production.js';
// const webpackConfig = require('./webpack.develop.js');
module.exports = smp.wrap(
merge(webpackConfig, {
plugins: [new BundleAnalyzerPlugin()],
})
);
export default merge(webpackConfig, {
plugins: [new BundleAnalyzerPlugin()],
});
-2
View File
@@ -149,8 +149,6 @@ module.exports = {
'window.jQuery': 'jquery',
'window.moment': 'moment',
moment: 'moment',
'window.jsyaml': 'js-yaml',
jsyaml: 'js-yaml',
}),
new MiniCssExtractPlugin({
filename: '[name].[contenthash].css',