diff --git a/app/angulartics.matomo/analytics-services.ts b/app/angulartics.matomo/analytics-services.ts index a1f335ce2..6141a4da6 100644 --- a/app/angulartics.matomo/analytics-services.ts +++ b/app/angulartics.matomo/analytics-services.ts @@ -1,4 +1,4 @@ -import _ from 'lodash-es'; +import _ from 'lodash'; const categories = [ 'docker', diff --git a/app/azure/models/provider.ts b/app/azure/models/provider.ts index c0baa353b..37524eb09 100644 --- a/app/azure/models/provider.ts +++ b/app/azure/models/provider.ts @@ -1,4 +1,4 @@ -import _ from 'lodash-es'; +import _ from 'lodash'; import { ProviderResponse } from '../types'; diff --git a/app/docker/containers/components/ContainersDatatable/columns/name.tsx b/app/docker/containers/components/ContainersDatatable/columns/name.tsx index 21d1b68a2..380624ff8 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/name.tsx +++ b/app/docker/containers/components/ContainersDatatable/columns/name.tsx @@ -1,5 +1,5 @@ import { CellProps, Column, TableInstance } from 'react-table'; -import _ from 'lodash-es'; +import _ from 'lodash'; import { useSref } from '@uirouter/react'; import { useEnvironment } from '@/portainer/environments/useEnvironment'; diff --git a/app/docker/containers/components/ContainersDatatable/columns/ports.tsx b/app/docker/containers/components/ContainersDatatable/columns/ports.tsx index 370528559..81de649e9 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/ports.tsx +++ b/app/docker/containers/components/ContainersDatatable/columns/ports.tsx @@ -1,5 +1,5 @@ import { Column } from 'react-table'; -import _ from 'lodash-es'; +import _ from 'lodash'; import { useEnvironment } from '@/portainer/environments/useEnvironment'; import type { DockerContainer, Port } from '@/docker/containers/types'; diff --git a/app/docker/containers/components/ContainersDatatable/columns/state.tsx b/app/docker/containers/components/ContainersDatatable/columns/state.tsx index 75421dafe..cadd67832 100644 --- a/app/docker/containers/components/ContainersDatatable/columns/state.tsx +++ b/app/docker/containers/components/ContainersDatatable/columns/state.tsx @@ -1,6 +1,6 @@ import { Column } from 'react-table'; import clsx from 'clsx'; -import _ from 'lodash-es'; +import _ from 'lodash'; import { DefaultFilter } from '@/portainer/components/datatables/components/Filter'; import type { diff --git a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html index f78a15fe3..7c9037195 100644 --- a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html +++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html @@ -44,8 +44,8 @@ ng-if="ctrl.availableUsersAndTeams.length > 0" input-model="ctrl.availableUsersAndTeams" output-model="ctrl.formValues.multiselectOutput" - button-label="icon '-' Name" - item-label="icon '-' Name" + button-label="icon Name" + item-label="icon Name" tick-property="ticked" helper-elements="filter" search-property="Name" diff --git a/app/portainer/feature-flags/limited-feature.directive.ts b/app/portainer/feature-flags/limited-feature.directive.ts index 0a4542e59..df823fb89 100644 --- a/app/portainer/feature-flags/limited-feature.directive.ts +++ b/app/portainer/feature-flags/limited-feature.directive.ts @@ -1,4 +1,4 @@ -import _ from 'lodash-es'; +import _ from 'lodash'; import { IAttributes, IDirective, IScope } from 'angular'; import { FeatureState } from '@/portainer/feature-flags/enums'; diff --git a/app/portainer/home/MotdPanel.tsx b/app/portainer/home/MotdPanel.tsx index e91a741b2..55eed8b6b 100644 --- a/app/portainer/home/MotdPanel.tsx +++ b/app/portainer/home/MotdPanel.tsx @@ -1,5 +1,5 @@ import { useQuery } from 'react-query'; -import _ from 'lodash-es'; +import _ from 'lodash'; import { useUIState } from '@/portainer/hooks/UIStateProvider'; diff --git a/app/portainer/license-management/license.service.ts b/app/portainer/license-management/license.service.ts index e00a592fc..55f93ea76 100644 --- a/app/portainer/license-management/license.service.ts +++ b/app/portainer/license-management/license.service.ts @@ -1,4 +1,4 @@ -import _ from 'lodash-es'; +import _ from 'lodash'; import { AxiosError } from 'axios'; import axios from '@/portainer/services/axios'; diff --git a/app/portainer/services/notifications.ts b/app/portainer/services/notifications.ts index 89156b6d8..f8241b9cb 100644 --- a/app/portainer/services/notifications.ts +++ b/app/portainer/services/notifications.ts @@ -1,4 +1,4 @@ -import _ from 'lodash-es'; +import _ from 'lodash'; import toastr from 'toastr'; import sanitize from 'sanitize-html'; diff --git a/package.json b/package.json index 62f724265..70c3a050a 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "angular-messages": "1.8.2", "angular-mocks": "1.8.2", "angular-moment-picker": "^0.10.2", - "angular-multiselect": "github:portainer/angular-multi-select#semver:~v4.0.1", + "angular-multiselect": "https://github.com/portainer/angular-multi-select.git#5f6cb6f966b0bd89f211338fc41dcf70ecacbde7", "angular-resource": "1.8.2", "angular-sanitize": "1.8.2", "angular-ui-bootstrap": "~2.5.0", @@ -116,7 +116,6 @@ "js-yaml": "^3.14.0", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", - "lodash-es": "^4.17.21", "moment": "^2.29.1", "msw": "^0.36.3", "ng-file-upload": "~12.2.13", @@ -165,7 +164,6 @@ "@types/file-saver": "^2.0.4", "@types/jest": "^27.0.3", "@types/jquery": "^3.5.10", - "@types/lodash-es": "^4.17.5", "@types/nprogress": "^0.2.0", "@types/react": "^17.0.37", "@types/react-dom": "^17.0.11", @@ -260,4 +258,4 @@ } }, "browserslist": "last 2 versions" -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 4378296e1..ff2d481fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3324,17 +3324,10 @@ "@types/interpret" "*" "@types/node" "*" -"@types/lodash-es@^4.17.5": - version "4.17.6" - resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.6.tgz#c2ed4c8320ffa6f11b43eb89e9eaeec65966a0a0" - integrity sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg== - dependencies: - "@types/lodash" "*" - -"@types/lodash@*", "@types/lodash@^4.14.175": - version "4.14.178" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8" - integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw== +"@types/lodash@^4.14.175": + version "4.14.177" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.177.tgz#f70c0d19c30fab101cad46b52be60363c43c4578" + integrity sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw== "@types/mdast@^3.0.0": version "3.0.10" @@ -4271,11 +4264,6 @@ angular-messages@1.8.2: resolved "https://registry.yarnpkg.com/angular-messages/-/angular-messages-1.8.2.tgz#47f0cf913030bc2231423ab9388acc14dd931837" integrity sha512-M1qNh/30cLJi4yJJ+3YB8saPonRcavz5Dquqz0T/aUySKJhIkUoeCkmF+BcLH4SJ5PBp04yy4CZUUeNRVi7jZA== -angular-mocks@1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.1.tgz#2f44a1b3ac608e93751305bce176c274221d8abd" - integrity sha1-L0Shs6xgjpN1EwW84XbCdCIdir0= - angular-mocks@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.8.2.tgz#dc022420b86978cf317a8447c116c0be73a853bf" @@ -4289,23 +4277,15 @@ angular-moment-picker@^0.10.2: angular "^1.3" moment "^2.16.0" -"angular-multiselect@github:portainer/angular-multi-select#semver:~v4.0.1": +"angular-multiselect@https://github.com/portainer/angular-multi-select.git#5f6cb6f966b0bd89f211338fc41dcf70ecacbde7": version "4.0.0" - resolved "https://codeload.github.com/portainer/angular-multi-select/tar.gz/52e8ab9f2ece53db660893172f716346926c9ae8" - dependencies: - angular-mocks "1.6.1" - angular-sanitize "1.6.1" + resolved "https://github.com/portainer/angular-multi-select.git#5f6cb6f966b0bd89f211338fc41dcf70ecacbde7" angular-resource@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.8.2.tgz#fc1f1adb93dfb83e295d1cfff2a48cec4296e20a" integrity sha512-CbTu8ypkVZMBLm+Wd+jI9xR7QEVCeUgN8WXsr9Yi9l0s/8ZQa5kEIuYX3F/75Ej8Xs1Jp9DoKjAyvACI6Q8IJA== -angular-sanitize@1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.1.tgz#cacffec3199ed66297afbb1ef366ec66616b3b3f" - integrity sha1-ys/+wxme1mKXr7se82bsZmFrOz8= - angular-sanitize@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.8.2.tgz#ae78040f00c5e2ce1c63780bcc47fa14a1698296"