chore(project): add prettier for code format (#3645)

* chore(project): install prettier and lint-staged * chore(project): apply prettier to html too * chore(project): git ignore eslintcache * chore(project): add a comment about format script * chore(prettier): update printWidth * chore(prettier): remove useTabs option * chore(prettier): add HTML validation * refactor(prettier): fix closing tags * feat(prettier): define angular parser for html templates * style(prettier): run prettier on codebase Co-authored-by: Anthony Lapenna <lapenna.anthony@gmail.com>
2025-08-06 06:15:22 +02:00 · 2020-04-11 00:54:53 +03:00 · 2020-04-11 00:54:53 +03:00 · cf5056d9c0
commit cf5056d9c0
parent 6663073be1
714 changed files with 31228 additions and 28305 deletions
--- a/app/docker/views/secrets/create/createSecretController.js
+++ b/app/docker/views/secrets/create/createSecretController.js
@ -1,89 +1,95 @@
 import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel';

-angular.module('portainer.docker')
-.controller('CreateSecretController', ['$scope', '$state', 'Notifications', 'SecretService', 'LabelHelper', 'Authentication', 'ResourceControlService', 'FormValidator',
-function ($scope, $state, Notifications, SecretService, LabelHelper, Authentication, ResourceControlService, FormValidator) {
+angular.module('portainer.docker').controller('CreateSecretController', [
+  '$scope',
+  '$state',
+  'Notifications',
+  'SecretService',
+  'LabelHelper',
+  'Authentication',
+  'ResourceControlService',
+  'FormValidator',
+  function ($scope, $state, Notifications, SecretService, LabelHelper, Authentication, ResourceControlService, FormValidator) {
+    $scope.formValues = {
+      Name: '',
+      Data: '',
+      Labels: [],
+      encodeSecret: true,
+      AccessControlData: new AccessControlFormData(),
+    };

-  $scope.formValues = {
-    Name: '',
-    Data: '',
-    Labels: [],
-    encodeSecret: true,
-    AccessControlData: new AccessControlFormData()
-  };
+    $scope.state = {
+      formValidationError: '',
+      actionInProgress: false,
+    };

-  $scope.state = {
-    formValidationError: '',
-    actionInProgress: false
-  };
+    $scope.addLabel = function () {
+      $scope.formValues.Labels.push({ key: '', value: '' });
+    };

-  $scope.addLabel = function() {
-    $scope.formValues.Labels.push({ key: '', value: ''});
-  };
+    $scope.removeLabel = function (index) {
+      $scope.formValues.Labels.splice(index, 1);
+    };

-  $scope.removeLabel = function(index) {
-    $scope.formValues.Labels.splice(index, 1);
-  };
-
-  function prepareLabelsConfig(config) {
-    config.Labels = LabelHelper.fromKeyValueToLabelHash($scope.formValues.Labels);
-  }
-
-  function prepareSecretData(config) {
-    if ($scope.formValues.encodeSecret) {
-      config.Data = btoa(unescape(encodeURIComponent($scope.formValues.Data)));
-    } else {
-      config.Data = $scope.formValues.Data;
-    }
-  }
-
-  function prepareConfiguration() {
-    var config = {};
-    config.Name = $scope.formValues.Name;
-    prepareSecretData(config);
-    prepareLabelsConfig(config);
-    return config;
-  }
-
-  function validateForm(accessControlData, isAdmin) {
-    $scope.state.formValidationError = '';
-    var error = '';
-    error = FormValidator.validateAccessControl(accessControlData, isAdmin);
-
-    if (error) {
-      $scope.state.formValidationError = error;
-      return false;
-    }
-    return true;
-  }
-
-  $scope.create = function () {
-
-    const accessControlData = $scope.formValues.AccessControlData;
-    const userDetails = Authentication.getUserDetails();
-    const isAdmin = Authentication.isAdmin();
-
-    if (!validateForm(accessControlData, isAdmin)) {
-      return;
+    function prepareLabelsConfig(config) {
+      config.Labels = LabelHelper.fromKeyValueToLabelHash($scope.formValues.Labels);
    }

-    $scope.state.actionInProgress = true;
-    var secretConfiguration = prepareConfiguration();
-    SecretService.create(secretConfiguration)
-    .then(function success(data) {
-      const userId = userDetails.ID;
-      const resourceControl = data.Portainer.ResourceControl;
-      return ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
-    })
-    .then(function success() {
-      Notifications.success('Secret successfully created');
-      $state.go('docker.secrets', {}, {reload: true});
-    })
-    .catch(function error(err) {
-      Notifications.error('Failure', err, 'Unable to create secret');
-    })
-    .finally(function final() {
-      $scope.state.actionInProgress = false;
-    });
-  };
-}]);
+    function prepareSecretData(config) {
+      if ($scope.formValues.encodeSecret) {
+        config.Data = btoa(unescape(encodeURIComponent($scope.formValues.Data)));
+      } else {
+        config.Data = $scope.formValues.Data;
+      }
+    }
+
+    function prepareConfiguration() {
+      var config = {};
+      config.Name = $scope.formValues.Name;
+      prepareSecretData(config);
+      prepareLabelsConfig(config);
+      return config;
+    }
+
+    function validateForm(accessControlData, isAdmin) {
+      $scope.state.formValidationError = '';
+      var error = '';
+      error = FormValidator.validateAccessControl(accessControlData, isAdmin);
+
+      if (error) {
+        $scope.state.formValidationError = error;
+        return false;
+      }
+      return true;
+    }
+
+    $scope.create = function () {
+      const accessControlData = $scope.formValues.AccessControlData;
+      const userDetails = Authentication.getUserDetails();
+      const isAdmin = Authentication.isAdmin();
+
+      if (!validateForm(accessControlData, isAdmin)) {
+        return;
+      }
+
+      $scope.state.actionInProgress = true;
+      var secretConfiguration = prepareConfiguration();
+      SecretService.create(secretConfiguration)
+        .then(function success(data) {
+          const userId = userDetails.ID;
+          const resourceControl = data.Portainer.ResourceControl;
+          return ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
+        })
+        .then(function success() {
+          Notifications.success('Secret successfully created');
+          $state.go('docker.secrets', {}, { reload: true });
+        })
+        .catch(function error(err) {
+          Notifications.error('Failure', err, 'Unable to create secret');
+        })
+        .finally(function final() {
+          $scope.state.actionInProgress = false;
+        });
+    };
+  },
+]);
--- a/app/docker/views/secrets/create/createsecret.html
+++ b/app/docker/views/secrets/create/createsecret.html
@ -1,8 +1,6 @@
 <rd-header>
  <rd-header-title title-text="Create secret"></rd-header-title>
-  <rd-header-content>
-    <a ui-sref="docker.secrets">Secrets</a> &gt; Add secret
-  </rd-header-content>
+  <rd-header-content> <a ui-sref="docker.secrets">Secrets</a> &gt; Add secret </rd-header-content>
 </rd-header>

 <div class="row">
@ -14,7 +12,7 @@
          <div class="form-group">
            <label for="secret_name" class="col-sm-1 control-label text-left">Name</label>
            <div class="col-sm-11">
-              <input type="text" class="form-control" ng-model="formValues.Name" id="secret_name" placeholder="e.g. mySecret">
+              <input type="text" class="form-control" ng-model="formValues.Name" id="secret_name" placeholder="e.g. mySecret" />
            </div>
          </div>
          <!-- !name-input -->
@ -33,9 +31,7 @@
                Encode secret
                <portainer-tooltip position="bottom" message="Secrets need to be base64 encoded. Disable this if your secret is already base64 encoded."></portainer-tooltip>
              </label>
-              <label class="switch" style="margin-left: 20px;">
-                <input type="checkbox" name="encode_secret" ng-model="formValues.encodeSecret"><i></i>
-              </label>
+              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" name="encode_secret" ng-model="formValues.encodeSecret" /><i></i> </label>
            </div>
          </div>
          <!-- !encode-secret -->
@ -43,20 +39,18 @@
          <div class="form-group">
            <div class="col-sm-12" style="margin-top: 5px;">
              <label class="control-label text-left">Labels</label>
-              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()">
-                <i class="fa fa-plus-circle" aria-hidden="true"></i> add label
-              </span>
+              <span class="label label-default interactive" style="margin-left: 10px;" ng-click="addLabel()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> add label </span>
            </div>
            <!-- labels-input-list -->
            <div class="col-sm-12 form-inline" style="margin-top: 10px;">
              <div ng-repeat="label in formValues.Labels" style="margin-top: 2px;">
                <div class="input-group col-sm-5 input-group-sm">
                  <span class="input-group-addon">name</span>
-                  <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo">
+                  <input type="text" class="form-control" ng-model="label.key" placeholder="e.g. com.example.foo" />
                </div>
                <div class="input-group col-sm-5 input-group-sm">
                  <span class="input-group-addon">value</span>
-                  <input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar">
+                  <input type="text" class="form-control" ng-model="label.value" placeholder="e.g. bar" />
                </div>
                <button class="btn btn-sm btn-danger" type="button" ng-click="removeLabel($index)">
                  <i class="fa fa-trash" aria-hidden="true"></i>
@ -75,7 +69,13 @@
          </div>
          <div class="form-group">
            <div class="col-sm-12">
-              <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.Name || !formValues.Data" ng-click="create()" button-spinner="state.actionInProgress">
+              <button
+                type="button"
+                class="btn btn-primary btn-sm"
+                ng-disabled="state.actionInProgress || !formValues.Name || !formValues.Data"
+                ng-click="create()"
+                button-spinner="state.actionInProgress"
+              >
                <span ng-hide="state.actionInProgress">Create the secret</span>
                <span ng-show="state.actionInProgress">Creating secret...</span>
              </button>
--- a/app/docker/views/secrets/edit/secret.html
+++ b/app/docker/views/secrets/edit/secret.html
@ -24,7 +24,9 @@
              <td>ID</td>
              <td>
                {{ secret.Id }}
-                <button authorization="DockerSecretDelete" class="btn btn-xs btn-danger" ng-click="removeSecret(secret.Id)"><i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Delete this secret</button>
+                <button authorization="DockerSecretDelete" class="btn btn-xs btn-danger" ng-click="removeSecret(secret.Id)"
+                  ><i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Delete this secret</button
+                >
              </td>
            </tr>
            <tr>
@ -54,10 +56,6 @@
 </div>

 <!-- access-control-panel -->
-<por-access-control-panel
-  ng-if="secret && applicationState.application.authentication"
-  resource-id="secret.Id"
-  resource-control="secret.ResourceControl"
-  resource-type="'secret'">
+<por-access-control-panel ng-if="secret && applicationState.application.authentication" resource-id="secret.Id" resource-control="secret.ResourceControl" resource-type="'secret'">
 </por-access-control-panel>
 <!-- !access-control-panel -->
--- a/app/docker/views/secrets/edit/secretController.js
+++ b/app/docker/views/secrets/edit/secretController.js
@ -1,27 +1,31 @@
-angular.module('portainer.docker')
-.controller('SecretController', ['$scope', '$transition$', '$state', 'SecretService', 'Notifications',
-function ($scope, $transition$, $state, SecretService, Notifications) {
+angular.module('portainer.docker').controller('SecretController', [
+  '$scope',
+  '$transition$',
+  '$state',
+  'SecretService',
+  'Notifications',
+  function ($scope, $transition$, $state, SecretService, Notifications) {
+    $scope.removeSecret = function removeSecret(secretId) {
+      SecretService.remove(secretId)
+        .then(function success() {
+          Notifications.success('Secret successfully removed');
+          $state.go('docker.secrets', {});
+        })
+        .catch(function error(err) {
+          Notifications.error('Failure', err, 'Unable to remove secret');
+        });
+    };

-  $scope.removeSecret = function removeSecret(secretId) {
-    SecretService.remove(secretId)
-    .then(function success() {
-      Notifications.success('Secret successfully removed');
-      $state.go('docker.secrets', {});
-    })
-    .catch(function error(err) {
-      Notifications.error('Failure', err, 'Unable to remove secret');
-    });
-  };
+    function initView() {
+      SecretService.secret($transition$.params().id)
+        .then(function success(data) {
+          $scope.secret = data;
+        })
+        .catch(function error(err) {
+          Notifications.error('Failure', err, 'Unable to retrieve secret details');
+        });
+    }

-  function initView() {
-    SecretService.secret($transition$.params().id)
-    .then(function success(data) {
-      $scope.secret = data;
-    })
-    .catch(function error(err) {
-      Notifications.error('Failure', err, 'Unable to retrieve secret details');
-    });
-  }
-
-  initView();
-}]);
+    initView();
+  },
+]);
--- a/app/docker/views/secrets/secrets.html
+++ b/app/docker/views/secrets/secrets.html
@ -10,12 +10,14 @@
 <div class="row">
  <div class="col-sm-12">
    <secrets-datatable
-    title-text="Secrets" title-icon="fa-user-secret"
-    dataset="secrets" table-key="secrets"
-    order-by="Name" 
-    show-ownership-column="applicationState.application.authentication"
-    remove-action="removeAction"
-    refresh-callback="getSecrets"
+      title-text="Secrets"
+      title-icon="fa-user-secret"
+      dataset="secrets"
+      table-key="secrets"
+      order-by="Name"
+      show-ownership-column="applicationState.application.authentication"
+      remove-action="removeAction"
+      refresh-callback="getSecrets"
    ></secrets-datatable>
  </div>
 </div>
--- a/app/docker/views/secrets/secretsController.js
+++ b/app/docker/views/secrets/secretsController.js
@ -1,44 +1,47 @@
-angular.module('portainer.docker')
-.controller('SecretsController', ['$scope', '$state', 'SecretService', 'Notifications',
-function ($scope, $state, SecretService, Notifications) {
-
-  $scope.removeAction = function (selectedItems) {
-    var actionCount = selectedItems.length;
-    angular.forEach(selectedItems, function (secret) {
-      SecretService.remove(secret.Id)
-      .then(function success() {
-        Notifications.success('Secret successfully removed', secret.Name);
-        var index = $scope.secrets.indexOf(secret);
-        $scope.secrets.splice(index, 1);
-      })
-      .catch(function error(err) {
-        Notifications.error('Failure', err, 'Unable to remove secret');
-      })
-      .finally(function final() {
-        --actionCount;
-        if (actionCount === 0) {
-          $state.reload();
-        }
+angular.module('portainer.docker').controller('SecretsController', [
+  '$scope',
+  '$state',
+  'SecretService',
+  'Notifications',
+  function ($scope, $state, SecretService, Notifications) {
+    $scope.removeAction = function (selectedItems) {
+      var actionCount = selectedItems.length;
+      angular.forEach(selectedItems, function (secret) {
+        SecretService.remove(secret.Id)
+          .then(function success() {
+            Notifications.success('Secret successfully removed', secret.Name);
+            var index = $scope.secrets.indexOf(secret);
+            $scope.secrets.splice(index, 1);
+          })
+          .catch(function error(err) {
+            Notifications.error('Failure', err, 'Unable to remove secret');
+          })
+          .finally(function final() {
+            --actionCount;
+            if (actionCount === 0) {
+              $state.reload();
+            }
+          });
      });
-    });
-  };
+    };

-  $scope.getSecrets = getSecrets;
+    $scope.getSecrets = getSecrets;

-  function getSecrets() {
-    SecretService.secrets()
-    .then(function success(data) {
-      $scope.secrets = data;
-    })
-    .catch(function error(err) {
-      $scope.secrets = [];
-      Notifications.error('Failure', err, 'Unable to retrieve secrets');
-    });
-  }
+    function getSecrets() {
+      SecretService.secrets()
+        .then(function success(data) {
+          $scope.secrets = data;
+        })
+        .catch(function error(err) {
+          $scope.secrets = [];
+          Notifications.error('Failure', err, 'Unable to retrieve secrets');
+        });
+    }

-  function initView() {
-    getSecrets();
-  }
+    function initView() {
+      getSecrets();
+    }

-  initView();
-}]);
+    initView();
+  },
+]);