github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(swarm): auto multi-select volume with same name [EE-7240] (#11955)

pull/12071/head
Oscar Zhou 2024-07-31 12:12:26 +12:00 committed by GitHub
parent 4d586f7a85
commit bedb7fb255
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/docker/models/volume.ts
View File

@ -5,7 +5,9 @@ import { IResource } from '@/react/docker/components/datatable/createOwnershipCo
import { PortainerResponse } from '@/react/docker/types'; import { PortainerResponse } from '@/react/docker/types';
export class VolumeViewModel implements IResource { export class VolumeViewModel implements IResource {
Id: Volume['Name']; Id: string;
Name: Volume['Name'];
CreatedAt?: Volume['CreatedAt']; CreatedAt?: Volume['CreatedAt'];
@ -28,7 +30,7 @@ export class VolumeViewModel implements IResource {
ResourceControl?: ResourceControlViewModel; ResourceControl?: ResourceControlViewModel;
constructor(data: PortainerResponse<Volume> & { ResourceID?: string }) { constructor(data: PortainerResponse<Volume> & { ResourceID?: string }) {
this.Id = data.Name; this.Name = data.Name;
this.CreatedAt = data.CreatedAt; this.CreatedAt = data.CreatedAt;
this.Driver = data.Driver; this.Driver = data.Driver;
this.Options = data.Options; this.Options = data.Options;
@ -52,5 +54,10 @@ export class VolumeViewModel implements IResource {
this.NodeName = data.Portainer.Agent.NodeName; this.NodeName = data.Portainer.Agent.NodeName;
} }
} }
this.Id = data.Name;
if (this.NodeName) {
this.Id = `${data.Name}-${this.NodeName}`;
}
} }
} }

4
app/docker/views/volumes/volumesController.js
View File

@ -13,9 +13,9 @@ angular.module('portainer.docker').controller('VolumesController', [
function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notifications, Authentication, endpoint) { function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notifications, Authentication, endpoint) {
$scope.removeAction = async function (selectedItems) { $scope.removeAction = async function (selectedItems) {
async function doRemove(volume) { async function doRemove(volume) {
return VolumeService.remove(volume.Id, volume.NodeName) return VolumeService.remove(volume.Name, volume.NodeName)
.then(function success() { .then(function success() {
Notifications.success('Volume successfully removed', volume.Id); Notifications.success('Volume successfully removed', volume.Name);
var index = $scope.volumes.indexOf(volume); var index = $scope.volumes.indexOf(volume);
$scope.volumes.splice(index, 1); $scope.volumes.splice(index, 1);
}) })

2
app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
View File

@ -15,7 +15,7 @@ import { getTableMeta } from '../tableMeta';
import { columnHelper } from './helper'; import { columnHelper } from './helper';
export const name = columnHelper.accessor('Id', { export const name = columnHelper.accessor('Name', {
id: 'name', id: 'name',
header: 'Name', header: 'Name',
cell: Cell, cell: Cell,