fix eslint

okami101 · Jun 5, 2020 · ef36633 · ef36633
1 parent ae9d321
commit ef36633
Show file tree

Hide file tree

Showing 28 changed files with 331 additions and 109 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,6 @@
 **/generator/admin
-**/generator/auth
-**/generator/dashboard
+**/generator/login
+**/generator/profile
 **/generator/material
 **/generator/users
 node_modules

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,7 +3,7 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ["plugin:vue/essential", "@vue/prettier"],
+  extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"],
   parserOptions: {
     parser: "babel-eslint",
   },

diff --git a/packages/admin/src/admin.js b/packages/admin/src/admin.js
@@ -111,7 +111,7 @@ export default class VtecAdmin {
             return i18n.te(titleKey)
               ? i18n.t(titleKey)
               : i18n.t(`va.pages.${action}`, {
-                  resource: getName("list" ? 10 : 1).toLowerCase(),
+                  resource: getName(action === "list" ? 10 : 1).toLowerCase(),
                 });
           },
           canAction: (action) => {
@@ -241,16 +241,18 @@ export default class VtecAdmin {
     /**
      * Add API resources modules dynamically
      */
-    this.resources.forEach((resource) =>
-      store.registerModule(
-        resource.name,
-        resourceCrudModule({
-          provider: this.dataProvider,
-          resource,
-          i18n,
-        })
-      )
-    );
+    if (this.dataProvider) {
+      this.resources.forEach((resource) =>
+        store.registerModule(
+          resource.name,
+          resourceCrudModule({
+            provider: this.dataProvider,
+            resource,
+            i18n,
+          })
+        )
+      );
+    }
 
     /**
      * Add resources routes dynamically

diff --git a/packages/admin/src/components/layout/Aside.vue b/packages/admin/src/components/layout/Aside.vue
@@ -47,7 +47,7 @@ export default {
     };
   },
   methods: {
-    handleUpdate(newContent, oldContent) {
+    handleUpdate(newContent) {
       this.opened = newContent;
     },
   },

diff --git a/packages/admin/src/components/ui/injectors/List.vue b/packages/admin/src/components/ui/injectors/List.vue
@@ -425,7 +425,7 @@ export default {
         query.filter = JSON.stringify(this.currentFilter);
       }
 
-      this.$router.push({ query }).catch((e) => {});
+      this.$router.push({ query }).catch(() => {});
     },
     async fetchData() {
       if (!this.loaded || isEmpty(this.listState.options)) {
@@ -450,7 +450,7 @@ export default {
       if (!this.disablePagination) {
         params.pagination = {
           page,
-          ...(!this.disableItemsPerPage && { perPage: this.itemsPerPage }),
+          ...(!this.disableItemsPerPage && { perPage: itemsPerPage }),
         };
       }
 
@@ -504,7 +504,7 @@ export default {
       });
       return fields;
     },
-    async onDelete(item) {
+    async onDelete() {
       this.fetchData();
     },
     onAction(action) {

diff --git a/packages/admin/src/components/ui/inputs/AutocompleteInput.vue b/packages/admin/src/components/ui/inputs/AutocompleteInput.vue
@@ -29,7 +29,6 @@
 import Input from "../../../mixins/input";
 import Multiple from "../../../mixins/multiple";
 import ReferenceInput from "../../../mixins/reference-input";
-import get from "lodash/get";
 
 /**
  * Value editing from a searchable choices. Support multiple and references.

diff --git a/packages/admin/src/components/ui/inputs/RichTextInput.vue b/packages/admin/src/components/ui/inputs/RichTextInput.vue
@@ -134,7 +134,7 @@ export default {
 
       if (fileBrowserUrl) {
         init.file_picker_callback = (callback, value, meta) => {
-          tinymce.activeEditor.windowManager.openUrl({
+          window.tinymce.activeEditor.windowManager.openUrl({
             title: this.$t("va.file_manager"),
             url: fileBrowserUrl,
             /**

diff --git a/packages/admin/src/components/ui/list/DataTable.vue b/packages/admin/src/components/ui/list/DataTable.vue
@@ -161,7 +161,7 @@
 
 <script>
 import List from "../../../mixins/list";
-import { mapState, mapActions, mapMutations } from "vuex";
+import { mapActions } from "vuex";
 import upperFirst from "lodash/upperFirst";
 
 /**

diff --git a/packages/admin/src/components/ui/wrappers/Field.vue b/packages/admin/src/components/ui/wrappers/Field.vue
@@ -19,8 +19,6 @@
 
 <script>
 import Field from "../../../mixins/field";
-import upperFirst from "lodash/upperFirst";
-import lowerCase from "lodash/lowerCase";
 
 /**
  * Wrapper component for field which support label localization and supported VA field, mainly used for show page.

diff --git a/packages/admin/src/mixins/input-wrapper.js b/packages/admin/src/mixins/input-wrapper.js
@@ -1,6 +1,3 @@
-import upperFirst from "lodash/upperFirst";
-import lowerCase from "lodash/lowerCase";
-
 /**
  * Common props for all inputs.
  */
@@ -49,7 +46,7 @@ export default {
     },
     /**
      * Override default label behavior.
-     * Default is to get the localized VueI18n label from both ressource and property source.
+     * Default is to get the localized VueI18n label from both resource and property source.
      */
     label: {
       type: String,

diff --git a/packages/admin/src/providers/auth/basic.js b/packages/admin/src/providers/auth/basic.js
@@ -61,14 +61,8 @@ export default (axios, params = {}) => {
       }
       return Promise.resolve();
     },
-    [GET_NAME]: (user) => {
-      return getName(user);
-    },
-    [GET_EMAIL]: (user) => {
-      return getEmail(user);
-    },
-    [GET_PERMISSIONS]: (user) => {
-      return getPermissions(user);
-    },
+    [GET_NAME]: (user) => getName(user),
+    [GET_EMAIL]: (user) => getEmail(user),
+    [GET_PERMISSIONS]: (user) => getPermissions(user),
   };
 };
diff --git a/packages/admin/src/providers/auth/fake.js b/packages/admin/src/providers/auth/fake.js
@@ -26,7 +26,6 @@ export default () => {
     [CHECK_ERROR]: ({ status }) => {
       if (status === 401 || status === 403) {
         localStorage.removeItem("username");
-        updateToken();
         return Promise.reject();
       }
       return Promise.resolve();

diff --git a/packages/admin/src/providers/auth/jwt.js b/packages/admin/src/providers/auth/jwt.js
@@ -115,14 +115,8 @@ export default (axios, params = {}) => {
       }
       return Promise.resolve();
     },
-    [GET_NAME]: (user) => {
-      return getName(user);
-    },
-    [GET_EMAIL]: (user) => {
-      return getEmail(user);
-    },
-    [GET_PERMISSIONS]: (user) => {
-      return getPermissions(user);
-    },
+    [GET_NAME]: (user) => getName(user),
+    [GET_EMAIL]: (user) => getEmail(user),
+    [GET_PERMISSIONS]: (user) => getPermissions(user),
   };
 };
diff --git a/packages/admin/src/providers/auth/sanctum.js b/packages/admin/src/providers/auth/sanctum.js
@@ -66,14 +66,8 @@ export default (axios, params = {}) => {
       }
       return Promise.resolve();
     },
-    [GET_NAME]: (user) => {
-      return getName(user);
-    },
-    [GET_EMAIL]: (user) => {
-      return getEmail(user);
-    },
-    [GET_PERMISSIONS]: (user) => {
-      return getPermissions(user);
-    },
+    [GET_NAME]: (user) => getName(user),
+    [GET_EMAIL]: (user) => getEmail(user),
+    [GET_PERMISSIONS]: (user) => getPermissions(user),
   };
 };
diff --git a/packages/admin/src/providers/data/hydra.js b/packages/admin/src/providers/data/hydra.js
@@ -13,7 +13,7 @@ import qs from "qs";
 export default (axios) => {
   const getRequest = (type, resource, params = {}) => {
     switch (type) {
-      case GET_LIST:
+      case GET_LIST: {
         const { pagination, sort, filter } = params;
 
         let query = filter || {};
@@ -37,32 +37,34 @@ export default (axios) => {
         }
 
         return { url: resource, query };
+      }
 
-      case GET_ONE:
-        return { url: `${resource}/${params.id}`, query };
+      case GET_ONE: {
+        return { url: `${resource}/${params.id}` };
+      }
 
-      case CREATE:
+      case CREATE: {
         return {
           url: resource,
-          query,
           method: "post",
           data: params.data,
         };
+      }
 
-      case UPDATE:
+      case UPDATE: {
         return {
           url: `${resource}/${params.id}`,
-          query,
           method: "put",
           data: params.data,
         };
+      }
 
-      case DELETE:
+      case DELETE: {
         return {
           url: `${resource}/${params.id}`,
-          query,
           method: "delete",
         };
+      }
 
       default:
         throw new Error(`Unsupported fetch action type ${type}`);
@@ -140,23 +142,26 @@ export default (axios) => {
      */
     switch (type) {
       case GET_LIST:
-      case GET_MANY:
+      case GET_MANY: {
         let data = response.data["hydra:member"];
         let total = response.data["hydra:totalItems"];
 
         return Promise.resolve({
           data: data.map((r) => getResourceWithId(r)),
           total,
         });
-      case DELETE:
+      }
+      case DELETE: {
         return Promise.resolve();
+      }
 
       case GET_ONE:
       case CREATE:
-      case UPDATE:
+      case UPDATE: {
         return Promise.resolve({
           data: getResourceWithId(response.data),
         });
+      }
     }
   };
 

diff --git a/packages/admin/src/providers/data/json-server.js b/packages/admin/src/providers/data/json-server.js
@@ -14,7 +14,7 @@ export default (axios) => {
   const getRequest = (type, resource, params = {}) => {
     switch (type) {
       case GET_LIST:
-      case GET_MANY:
+      case GET_MANY: {
         const { include, pagination, sort, filter } = params;
         let query = {};
 
@@ -56,8 +56,11 @@ export default (axios) => {
           url: resource,
           query,
         };
+      }
+
+      case GET_ONE: {
+        let query = {};
 
-      case GET_ONE:
         if (params.include) {
           let { embed, expand } = params.include;
           query = {
@@ -67,26 +70,30 @@ export default (axios) => {
         }
 
         return { url: `${resource}/${params.id}`, query };
+      }
 
-      case CREATE:
+      case CREATE: {
         return {
           url: resource,
           method: "post",
           data: params.data,
         };
+      }
 
-      case UPDATE:
+      case UPDATE: {
         return {
           url: `${resource}/${params.id}`,
           method: "put",
           data: params.data,
         };
+      }
 
-      case DELETE:
+      case DELETE: {
         return {
           url: `${resource}/${params.id}`,
           method: "delete",
         };
+      }
 
       default:
         throw new Error(`Unsupported fetch action type ${type}`);
@@ -116,20 +123,23 @@ export default (axios) => {
      */
     switch (type) {
       case GET_LIST:
-      case GET_MANY:
+      case GET_MANY: {
         let { data, headers } = response;
 
         return Promise.resolve({
           data,
           total: parseInt(headers["x-total-count"], 10),
         });
-      case DELETE:
+      }
+      case DELETE: {
         return Promise.resolve();
+      }
 
       case GET_ONE:
       case CREATE:
-      case UPDATE:
+      case UPDATE: {
         return Promise.resolve(response);
+      }
     }
   };