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

feat(update): highlight business edition feature auto update change window EE-1482 (#5961) 

* remove unuse component from ce (#5930)

* update wording to Change Window

Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Co-authored-by: waysonwei <degui.wei@gmail.com>
pull/6014/head
Matt Hook 2021-11-03 09:57:21 +13:00 committed by GitHub
parent 28f71e486a
commit 3fb8a232b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/docker/views/docker-features-configuration/docker-features-configuration.controller.js
View File

@ -1,3 +1,5 @@
import { HIDE_AUTO_UPDATE_WINDOW } from 'Portainer/feature-flags/feature-ids';
export default class DockerFeaturesConfigurationController {
/* @ngInject */
constructor($async, EndpointService, Notifications, StateManager) {
@ -6,6 +8,8 @@ export default class DockerFeaturesConfigurationController {
this.Notifications = Notifications;
this.StateManager = StateManager;
this.limitedFeature = HIDE_AUTO_UPDATE_WINDOW;
this.formValues = {
enableHostManagementFeatures: false,
allowVolumeBrowserForRegularUsers: false,

19
app/docker/views/docker-features-configuration/docker-features-configuration.html
View File

@ -41,6 +41,25 @@
></por-switch-field>
</div>
</div>
<!-- auto update window -->
<div class="col-sm-12 form-section-title">
Change Window Setting
</div>
<div class="form-group">
<div class="col-sm-12">
<por-switch-field
ng-model="$ctrl.state.autoUpdateSettings.Enabled"
name="disableSysctlSettingForRegularUsers"
label="Enable Change Window"
label-class="col-sm-7 col-lg-4"
feature="$ctrl.limitedFeature"
tooltip="Specify a timeframe during which automatic updates can occur in this environment."
>
</por-switch-field>
</div>
</div>
<!-- security -->
<div class="col-sm-12 form-section-title">
Docker Security Settings

18
app/kubernetes/views/configure/configure.html
View File

@ -141,6 +141,24 @@
</span>
</div>
<!-- auto update window -->
<div class="col-sm-12 form-section-title">
Change Window Setting
</div>
<div class="form-group">
<div class="col-sm-12">
<por-switch-field
ng-model="$ctrl.state.autoUpdateSettings.Enabled"
name="disableSysctlSettingForRegularUsers"
label="Enable Change Window"
feature="ctrl.limitedFeatureAutoWindow"
tooltip="Specify a timeframe during which automatic updates can occur in this environment."
>
</por-switch-field>
</div>
</div>
<div class="col-sm-12 form-section-title">
Security
</div>

2
app/kubernetes/views/configure/configureController.js
View File

@ -7,6 +7,7 @@ import KubernetesFormValidationHelper from 'Kubernetes/helpers/formValidationHel
import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
import { K8S_SETUP_DEFAULT } from '@/portainer/feature-flags/feature-ids';
import { HIDE_AUTO_UPDATE_WINDOW } from 'Portainer/feature-flags/feature-ids';
class KubernetesConfigureController {
/* #region CONSTRUCTOR */
@ -39,6 +40,7 @@ class KubernetesConfigureController {
this.onInit = this.onInit.bind(this);
this.configureAsync = this.configureAsync.bind(this);
this.limitedFeature = K8S_SETUP_DEFAULT;
this.limitedFeatureAutoWindow = HIDE_AUTO_UPDATE_WINDOW;
}
/* #endregion */

1
app/portainer/feature-flags/feature-flags.service.js
View File

@ -29,6 +29,7 @@ export function featureService() {
[FEATURE_IDS.REGISTRY_MANAGEMENT]: EDITIONS.BE,
[FEATURE_IDS.S3_BACKUP_SETTING]: EDITIONS.BE,
[FEATURE_IDS.TEAM_MEMBERSHIP]: EDITIONS.BE,
[FEATURE_IDS.HIDE_AUTO_UPDATE_WINDOW]: EDITIONS.BE,
[FEATURE_IDS.FORCE_REDEPLOYMENT]: EDITIONS.BE,
};

1
app/portainer/feature-flags/feature-ids.js
View File

@ -9,4 +9,5 @@ export const TEAM_MEMBERSHIP = 'team-membership';
export const HIDE_INTERNAL_AUTH = 'hide-internal-auth';
export const EXTERNAL_AUTH_LDAP = 'external-auth-ldap';
export const ACTIVITY_AUDIT = 'activity-audit';
export const HIDE_AUTO_UPDATE_WINDOW = 'hide-auto-update-window';
export const FORCE_REDEPLOYMENT = 'force-redeployment';