Merge pull request #11754 from hashicorp/b-ui/fix-linter

ui:  fix linter and prettier

.gitignore

@@ -89,6 +89,7 @@ rkt-*
 
 # misc
 /ui/.sass-cache
+/ui/.eslintcache
 /ui/.storybook/preview-head.html
 /ui/connect.lock
 /ui/coverage/*

ui/.eslintrc.js

@@ -2,56 +2,50 @@
 
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
+  },
   globals: {
     server: true,
   },
   env: {
     browser: true,
-    es6: true,
   },
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
     'plugin:ember/recommended',
-  ],
-  parser: 'babel-eslint',
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
-    },
-  },
-  plugins: [
-    'ember'
+    'plugin:prettier/recommended',
   ],
   rules: {
-    indent: ['error', 2, { SwitchCase: 1 }],
-    'linebreak-style': ['error', 'unix'],
-    quotes: ['error', 'single', 'avoid-escape'],
-    semi: ['error', 'always'],
-    'no-constant-condition': [
-      'error',
-      {
-        checkLoops: false,
-      },
-    ],
     'ember/classic-decorator-hooks': 'error',
     'ember/classic-decorator-no-classic-methods': 'error',
     'ember/no-get': 'off',
     'ember/no-mixins': 'off',
+    'ember/no-classic-classes': 'off',
+    'ember/no-computed-properties-in-native-classes': 'off',
+    'ember/no-classic-components': 'off',
+    'ember/no-component-lifecycle-hooks': 'off',
+    'ember/require-tagless-components': 'off',
   },
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'server/**/*.js',
         'lib/*/index.js',
+        'server/**/*.js',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -61,14 +55,15 @@ module.exports = {
         node: true,
       },
       plugins: ['node'],
+      extends: ['plugin:node/recommended'],
       rules: {
-        'node/no-unpublished-require': 'off'
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off',
       },
     },
     {
-      files: [
-        'stories/**/*.js'
-      ],
+      files: ['stories/**/*.js'],
       parserOptions: {
         sourceType: 'module',
       },

ui/.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

ui/.prettierrc

@@ -1,7 +1,5 @@
 {
-  "printWidth": 100,
   "singleQuote": true,
-  "trailingComma": "es5",
   "overrides": [
     {
       "files": "*.hbs",

ui/.prettierrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

ui/.storybook/babel.config.js

@@ -14,7 +14,11 @@ module.exports = {
         shippedProposals: true,
         useBuiltIns: 'usage',
         corejs: '3',
-        targets: ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'],
+        targets: [
+          'last 1 Chrome versions',
+          'last 1 Firefox versions',
+          'last 1 Safari versions',
+        ],
       },
     ],
   ],
@@ -27,7 +31,10 @@ module.exports = {
     ],
     ['@babel/plugin-proposal-class-properties', { loose: true }],
     '@babel/plugin-syntax-dynamic-import',
-    ['@babel/plugin-proposal-object-rest-spread', { loose: true, useBuiltIns: true }],
+    [
+      '@babel/plugin-proposal-object-rest-spread',
+      { loose: true, useBuiltIns: true },
+    ],
     'babel-plugin-macros',
     ['emotion', { sourceMap: true, autoLabel: true }],
     [

ui/.storybook/preview.js

@@ -10,7 +10,7 @@ addParameters({
   },
 });
 
-addDecorator(storyFn => {
+addDecorator((storyFn) => {
   let { template, context } = storyFn();
 
   let wrapperElementStyle = {

ui/.storybook/theme.js

@@ -18,7 +18,8 @@ export default create({
 
   // Typography
   // From variables.scss
-  fontBase: "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
+  fontBase:
+    "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
   // From Bulma
   fontCode: 'monospace',
 

ui/.storybook/webpack.config.js

@@ -1,5 +1,5 @@
 /* eslint-env node */
-module.exports = function({ config }) {
+module.exports = function ({ config }) {
   config.module.rules.push({
     test: /\.stories\.jsx?$/,
     loaders: [require.resolve('@storybook/source-loader')],

ui/app/abilities/abstract.js

@@ -26,33 +26,44 @@ export default class Abstract extends Ability {
   get rulesForNamespace() {
     let namespace = this._namespace;
 
-    return (this.get('token.selfTokenPolicies') || []).toArray().reduce((rules, policy) => {
-      let policyNamespaces = get(policy, 'rulesJSON.Namespaces') || [];
-
-      let matchingNamespace = this._findMatchingNamespace(policyNamespaces, namespace);
-
-      if (matchingNamespace) {
-        rules.push(policyNamespaces.find(namespace => namespace.Name === matchingNamespace));
-      }
+    return (this.get('token.selfTokenPolicies') || [])
+      .toArray()
+      .reduce((rules, policy) => {
+        let policyNamespaces = get(policy, 'rulesJSON.Namespaces') || [];
+
+        let matchingNamespace = this._findMatchingNamespace(
+          policyNamespaces,
+          namespace
+        );
+
+        if (matchingNamespace) {
+          rules.push(
+            policyNamespaces.find(
+              (namespace) => namespace.Name === matchingNamespace
+            )
+          );
+        }
 
-      return rules;
-    }, []);
+        return rules;
+      }, []);
   }
 
   @computed('token.selfTokenPolicies.[]')
   get capabilitiesForAllNamespaces() {
     return (this.get('token.selfTokenPolicies') || [])
       .toArray()
       .reduce((allCapabilities, policy) => {
-        (get(policy, 'rulesJSON.Namespaces') || []).forEach(({ Capabilities }) => {
-          allCapabilities = allCapabilities.concat(Capabilities);
-        });
+        (get(policy, 'rulesJSON.Namespaces') || []).forEach(
+          ({ Capabilities }) => {
+            allCapabilities = allCapabilities.concat(Capabilities);
+          }
+        );
         return allCapabilities;
       }, []);
   }
 
   namespaceIncludesCapability(capability) {
-    return this.rulesForNamespace.some(rules => {
+    return this.rulesForNamespace.some((rules) => {
       let capabilities = get(rules, 'Capabilities') || [];
       return capabilities.includes(capability);
     });
@@ -76,12 +87,16 @@ export default class Abstract extends Ability {
       return namespace;
     }
 
-    let globNamespaceNames = namespaceNames.filter(namespaceName => namespaceName.includes('*'));
+    let globNamespaceNames = namespaceNames.filter((namespaceName) =>
+      namespaceName.includes('*')
+    );
 
     let matchingNamespaceName = globNamespaceNames.reduce(
       (mostMatching, namespaceName) => {
         // Convert * wildcards to .* for regex matching
-        let namespaceNameRegExp = new RegExp(namespaceName.replace(/\*/g, '.*'));
+        let namespaceNameRegExp = new RegExp(
+          namespaceName.replace(/\*/g, '.*')
+        );
         let characterDifference = namespace.length - namespaceName.length;
 
         if (
@@ -96,7 +111,10 @@ export default class Abstract extends Ability {
           return mostMatching;
         }
       },
-      { mostMatchingNamespaceName: null, mostMatchingCharacterDifference: Number.MAX_SAFE_INTEGER }
+      {
+        mostMatchingNamespaceName: null,
+        mostMatchingCharacterDifference: Number.MAX_SAFE_INTEGER,
+      }
     ).mostMatchingNamespaceName;
 
     if (matchingNamespaceName) {

ui/app/abilities/agent.js

@@ -3,16 +3,20 @@ import { computed, get } from '@ember/object';
 import { or } from '@ember/object/computed';
 
 export default class Client extends AbstractAbility {
-  @or('bypassAuthorization', 'selfTokenIsManagement', 'policiesIncludeAgentReadOrWrite')
+  @or(
+    'bypassAuthorization',
+    'selfTokenIsManagement',
+    'policiesIncludeAgentReadOrWrite'
+  )
   canRead;
 
   @computed('token.selfTokenPolicies.[]')
   get policiesIncludeAgentReadOrWrite() {
     const policies = (get(this, 'token.selfTokenPolicies') || [])
       .toArray()
-      .map(policy => get(policy, 'rulesJSON.Agent.Policy'))
+      .map((policy) => get(policy, 'rulesJSON.Agent.Policy'))
       .compact();
 
-    return policies.some(policy => policy === 'read' || policy === 'write');
+    return policies.some((policy) => policy === 'read' || policy === 'write');
   }
 }

ui/app/abilities/allocation.js

@@ -8,7 +8,7 @@ export default class Allocation extends AbstractAbility {
 
   @computed('[email protected]')
   get policiesSupportExec() {
-    return this.rulesForNamespace.some(rules => {
+    return this.rulesForNamespace.some((rules) => {
       let capabilities = get(rules, 'Capabilities') || [];
       return capabilities.includes('alloc-exec');
     });

ui/app/abilities/client.js

@@ -10,27 +10,36 @@ export default class Client extends AbstractAbility {
   @or('bypassAuthorization', 'selfTokenIsManagement', 'policiesIncludeNodeRead')
   canRead;
 
-  @or('bypassAuthorization', 'selfTokenIsManagement', 'policiesIncludeNodeWrite')
+  @or(
+    'bypassAuthorization',
+    'selfTokenIsManagement',
+    'policiesIncludeNodeWrite'
+  )
   canWrite;
 
   @computed('token.selfTokenPolicies.[]')
   get policiesIncludeNodeRead() {
-    return policiesIncludePermissions(this.get('token.selfTokenPolicies'), ['read', 'write']);
+    return policiesIncludePermissions(this.get('token.selfTokenPolicies'), [
+      'read',
+      'write',
+    ]);
   }
 
   @computed('token.selfTokenPolicies.[]')
   get policiesIncludeNodeWrite() {
-    return policiesIncludePermissions(this.get('token.selfTokenPolicies'), ['write']);
+    return policiesIncludePermissions(this.get('token.selfTokenPolicies'), [
+      'write',
+    ]);
   }
 }
 
 function policiesIncludePermissions(policies = [], permissions = []) {
   // For each policy record, extract the Node policy
   const nodePolicies = policies
     .toArray()
-    .map(policy => get(policy, 'rulesJSON.Node.Policy'))
+    .map((policy) => get(policy, 'rulesJSON.Node.Policy'))
     .compact();
 
   // Check for requested permissions
-  return nodePolicies.some(policy => permissions.includes(policy));
+  return nodePolicies.some((policy) => permissions.includes(policy));
 }

ui/app/abilities/job.js

@@ -20,7 +20,11 @@ export default class Job extends AbstractAbility {
   @or('bypassAuthorization', 'selfTokenIsManagement')
   canListAll;
 
-  @or('bypassAuthorization', 'selfTokenIsManagement', 'policiesSupportDispatching')
+  @or(
+    'bypassAuthorization',
+    'selfTokenIsManagement',
+    'policiesSupportDispatching'
+  )
   canDispatch;
 
   @computed('[email protected]')

ui/app/abilities/recommendation.js

@@ -6,7 +6,11 @@ export default class Recommendation extends AbstractAbility {
   @and('dynamicApplicationSizingIsPresent', 'hasPermissions')
   canAccept;
 
-  @or('bypassAuthorization', 'selfTokenIsManagement', 'policiesSupportAcceptingOnAnyNamespace')
+  @or(
+    'bypassAuthorization',
+    'selfTokenIsManagement',
+    'policiesSupportAcceptingOnAnyNamespace'
+  )
   hasPermissions;
 
   @computed('capabilitiesForAllNamespaces.[]')