diff --git a/api/http/handler/stacks/create_compose_stack.go b/api/http/handler/stacks/create_compose_stack.go index 6ceab991c..d81a55798 100644 --- a/api/http/handler/stacks/create_compose_stack.go +++ b/api/http/handler/stacks/create_compose_stack.go @@ -7,11 +7,12 @@ import ( "regexp" "strconv" "strings" + "time" "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/filesystem" "github.com/portainer/portainer/api/http/security" ) @@ -60,13 +61,14 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter, stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerComposeStack, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerComposeStack, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -89,6 +91,8 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter, return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -146,13 +150,14 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerComposeStack, - EndpointID: endpoint.ID, - EntryPoint: payload.ComposeFilePathInRepository, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerComposeStack, + EndpointID: endpoint.ID, + EntryPoint: payload.ComposeFilePathInRepository, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } projectPath := handler.FileService.GetStackProjectPath(strconv.Itoa(int(stack.ID))) @@ -185,6 +190,8 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -242,13 +249,14 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter, stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerComposeStack, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerComposeStack, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -271,6 +279,8 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter, return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} diff --git a/api/http/handler/stacks/create_swarm_stack.go b/api/http/handler/stacks/create_swarm_stack.go index 0113e8a41..f7afbdeb5 100644 --- a/api/http/handler/stacks/create_swarm_stack.go +++ b/api/http/handler/stacks/create_swarm_stack.go @@ -6,11 +6,12 @@ import ( "path" "strconv" "strings" + "time" "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/filesystem" "github.com/portainer/portainer/api/http/security" ) @@ -55,14 +56,15 @@ func (handler *Handler) createSwarmStackFromFileContent(w http.ResponseWriter, r stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerSwarmStack, - SwarmID: payload.SwarmID, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerSwarmStack, + SwarmID: payload.SwarmID, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -85,6 +87,8 @@ func (handler *Handler) createSwarmStackFromFileContent(w http.ResponseWriter, r return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -145,14 +149,15 @@ func (handler *Handler) createSwarmStackFromGitRepository(w http.ResponseWriter, stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerSwarmStack, - SwarmID: payload.SwarmID, - EndpointID: endpoint.ID, - EntryPoint: payload.ComposeFilePathInRepository, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerSwarmStack, + SwarmID: payload.SwarmID, + EndpointID: endpoint.ID, + EntryPoint: payload.ComposeFilePathInRepository, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } projectPath := handler.FileService.GetStackProjectPath(strconv.Itoa(int(stack.ID))) @@ -185,6 +190,8 @@ func (handler *Handler) createSwarmStackFromGitRepository(w http.ResponseWriter, return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -249,14 +256,15 @@ func (handler *Handler) createSwarmStackFromFileUpload(w http.ResponseWriter, r stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerSwarmStack, - SwarmID: payload.SwarmID, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerSwarmStack, + SwarmID: payload.SwarmID, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -279,6 +287,8 @@ func (handler *Handler) createSwarmStackFromFileUpload(w http.ResponseWriter, r return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} diff --git a/api/http/handler/stacks/stack_update.go b/api/http/handler/stacks/stack_update.go index df4178f8f..adc1ca792 100644 --- a/api/http/handler/stacks/stack_update.go +++ b/api/http/handler/stacks/stack_update.go @@ -4,12 +4,13 @@ import ( "errors" "net/http" "strconv" + "time" "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" bolterrors "github.com/portainer/portainer/api/bolt/errors" httperrors "github.com/portainer/portainer/api/http/errors" "github.com/portainer/portainer/api/http/security" @@ -135,6 +136,9 @@ func (handler *Handler) updateComposeStack(r *http.Request, stack *portainer.Sta return configErr } + stack.UpdateDate = time.Now().Unix() + stack.UpdatedBy = config.user.Username + err = handler.deployComposeStack(config) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} @@ -163,6 +167,9 @@ func (handler *Handler) updateSwarmStack(r *http.Request, stack *portainer.Stack return configErr } + stack.UpdateDate = time.Now().Unix() + stack.UpdatedBy = config.user.Username + err = handler.deploySwarmStack(config) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} diff --git a/api/portainer.go b/api/portainer.go index 64197edef..62e872918 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -554,6 +554,10 @@ type ( Env []Pair `json:"Env"` ResourceControl *ResourceControl `json:"ResourceControl"` Status StackStatus `json:"Status"` + CreationDate int64 + CreatedBy string + UpdateDate int64 + UpdatedBy string ProjectPath string } diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html index 9ba136c4c..36835997d 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.html +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html @@ -4,100 +4,8 @@
{{ $ctrl.titleText }}
- - Columns -
-
-
- Show / Hide Columns -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- Close -
-
-
- + + Settings
diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index cc02ab678..bbaf52b8c 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -36,9 +36,6 @@ angular.module('portainer.docker').controller('ContainersDatatableController', [ }; this.columnVisibility = { - state: { - open: false, - }, columns: { state: { label: 'State', @@ -75,9 +72,11 @@ angular.module('portainer.docker').controller('ContainersDatatableController', [ }, }; - this.onColumnVisibilityChange = function (columnVisibility) { - DatatableService.setColumnVisibilitySettings(this.tableKey, columnVisibility); - }; + this.onColumnVisibilityChange = onColumnVisibilityChange.bind(this); + function onColumnVisibilityChange(columns) { + this.columnVisibility.columns = columns; + DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility); + } this.onSelectionChanged = function () { this.updateSelectionState(); @@ -199,7 +198,6 @@ angular.module('portainer.docker').controller('ContainersDatatableController', [ var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); if (storedColumnVisibility !== null) { this.columnVisibility = storedColumnVisibility; - this.columnVisibility.state.open = false; } }; }, diff --git a/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js new file mode 100644 index 000000000..d4597e769 --- /dev/null +++ b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js @@ -0,0 +1,7 @@ +export default class DatatableColumnsVisibilityController { + constructor() { + this.state = { + isOpen: false, + }; + } +} diff --git a/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html new file mode 100644 index 000000000..dc8668edd --- /dev/null +++ b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html @@ -0,0 +1,19 @@ + + Columns +
+
+
+ Show / Hide Columns +
+
+
+ + +
+
+
+ Close +
+
+
+ diff --git a/app/portainer/components/datatables/datatable-columns-visibility/index.js b/app/portainer/components/datatables/datatable-columns-visibility/index.js new file mode 100644 index 000000000..22b9c4463 --- /dev/null +++ b/app/portainer/components/datatables/datatable-columns-visibility/index.js @@ -0,0 +1,12 @@ +import angular from 'angular'; + +import controller from './datatable-columns-visibility.controller'; + +angular.module('portainer.app').component('datatableColumnsVisibility', { + templateUrl: './datatable-columns-visibility.html', + controller, + bindings: { + columns: '<', + onChange: '<', + }, +}); diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index 8567dcb87..60a7a2fe6 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/app/portainer/components/datatables/genericDatatableController.js @@ -33,6 +33,7 @@ angular.module('portainer.app').controller('GenericDatatableController', [ refreshRate: '30', }, }; + this.resetSelectionState = function () { this.state.selectAll = false; this.state.selectedItems = []; @@ -158,6 +159,11 @@ angular.module('portainer.app').controller('GenericDatatableController', [ this.settings.open = false; } this.onSettingsRepeaterChange(); + + var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); + if (storedColumnVisibility !== null) { + this.columnVisibility = storedColumnVisibility; + } }; /** diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index 1bd2c313d..3612faeaa 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -4,6 +4,7 @@
{{ $ctrl.titleText }}
+ Settings
@@ -117,6 +118,20 @@ Control + + + Created + + + + + + + Updated + + + + Ownership @@ -154,6 +169,14 @@ Total + + {{ item.CreationDate | getisodatefromtimestamp }} {{ item.CreatedBy ? 'by ' + item.CreatedBy : '' }} + - + + + {{ item.UpdateDate | getisodatefromtimestamp }} {{ item.UpdatedBy ? 'by ' + item.UpdatedBy : '' }} + - + @@ -162,10 +185,10 @@ - Loading... + Loading... - No stack available. + No stack available. diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js index 94b0ec0f4..3fe0f6b7c 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js @@ -15,6 +15,24 @@ angular.module('portainer.app').controller('StacksDatatableController', [ }, }; + this.columnVisibility = { + state: { + open: false, + }, + columns: { + updated: { + label: 'Updated', + display: false, + }, + }, + }; + + this.onColumnVisibilityChange = onColumnVisibilityChange.bind(this); + function onColumnVisibilityChange(columns) { + this.columnVisibility.columns = columns; + DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility); + } + /** * Do not allow external items */ @@ -71,6 +89,11 @@ angular.module('portainer.app').controller('StacksDatatableController', [ this.settings.open = false; } this.onSettingsRepeaterChange(); + + var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); + if (storedColumnVisibility !== null) { + this.columnVisibility = storedColumnVisibility; + } }; }, ]); diff --git a/app/portainer/helpers/stackHelper.js b/app/portainer/helpers/stackHelper.js index b9beb6172..77d43949b 100644 --- a/app/portainer/helpers/stackHelper.js +++ b/app/portainer/helpers/stackHelper.js @@ -1,37 +1,27 @@ import _ from 'lodash-es'; +import { ExternalStackViewModel } from '@/portainer/models/stack'; + angular.module('portainer.app').factory('StackHelper', [ function StackHelperFactory() { 'use strict'; var helper = {}; - helper.getExternalStackNamesFromContainers = function (containers) { - var stackNames = []; - - for (var i = 0; i < containers.length; i++) { - var container = containers[i]; - if (!container.Labels || !container.Labels['com.docker.compose.project']) continue; - var stackName = container.Labels['com.docker.compose.project']; - stackNames.push(stackName); - } - - return _.uniq(stackNames); + helper.getExternalStacksFromContainers = function (containers) { + return getExternalStacksFromLabel(containers, 'com.docker.compose.project', 2); }; - helper.getExternalStackNamesFromServices = function (services) { - var stackNames = []; - - for (var i = 0; i < services.length; i++) { - var service = services[i]; - if (!service.Labels || !service.Labels['com.docker.stack.namespace']) continue; - - var stackName = service.Labels['com.docker.stack.namespace']; - stackNames.push(stackName); - } - - return _.uniq(stackNames); + helper.getExternalStacksFromServices = function (services) { + return getExternalStacksFromLabel(services, 'com.docker.stack.namespace', 1); }; + function getExternalStacksFromLabel(items, label, type) { + return _.uniqBy( + items.filter((item) => item.Labels && item.Labels[label]).map((item) => new ExternalStackViewModel(item.Labels[label], type, item.Created)), + 'Name' + ); + } + return helper; }, ]); diff --git a/app/portainer/models/stack.js b/app/portainer/models/stack.js index ef28f97e3..c2c6d5d1a 100644 --- a/app/portainer/models/stack.js +++ b/app/portainer/models/stack.js @@ -13,11 +13,16 @@ export function StackViewModel(data) { } this.External = false; this.Status = data.Status; + this.CreationDate = data.CreationDate; + this.CreatedBy = data.CreatedBy; + this.UpdateDate = data.UpdateDate; + this.UpdatedBy = data.UpdatedBy; } -export function ExternalStackViewModel(name, type) { +export function ExternalStackViewModel(name, type, creationDate) { this.Name = name; this.Type = type; this.External = true; this.Checked = false; + this.CreationDate = creationDate; } diff --git a/app/portainer/services/api/stackService.js b/app/portainer/services/api/stackService.js index 68bebbd56..477740725 100644 --- a/app/portainer/services/api/stackService.js +++ b/app/portainer/services/api/stackService.js @@ -1,5 +1,5 @@ import _ from 'lodash-es'; -import { ExternalStackViewModel, StackViewModel } from '../../models/stack'; +import { StackViewModel } from '../../models/stack'; angular.module('portainer.app').factory('StackService', [ '$q', @@ -121,13 +121,8 @@ angular.module('portainer.app').factory('StackService', [ var deferred = $q.defer(); ServiceService.services() - .then(function success(data) { - var services = data; - var stackNames = StackHelper.getExternalStackNamesFromServices(services); - var stacks = stackNames.map(function (name) { - return new ExternalStackViewModel(name, 1); - }); - deferred.resolve(stacks); + .then(function success(services) { + deferred.resolve(StackHelper.getExternalStacksFromServices(services)); }) .catch(function error(err) { deferred.reject({ msg: 'Unable to retrieve external stacks', err: err }); @@ -140,13 +135,8 @@ angular.module('portainer.app').factory('StackService', [ var deferred = $q.defer(); ContainerService.containers(1) - .then(function success(data) { - var containers = data; - var stackNames = StackHelper.getExternalStackNamesFromContainers(containers); - var stacks = stackNames.map(function (name) { - return new ExternalStackViewModel(name, 2); - }); - deferred.resolve(stacks); + .then(function success(containers) { + deferred.resolve(StackHelper.getExternalStacksFromContainers(containers)); }) .catch(function error(err) { deferred.reject({ msg: 'Unable to retrieve external stacks', err: err });