chore: frappe-ui version parity

Cris10Lobo · Jan 12, 2023 · 1ce65f6 · 1ce65f6
1 parent e9f44c4
commit 1ce65f6
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 29 deletions.
diff --git a/frontend/src/components/ColorPicker.vue b/frontend/src/components/ColorPicker.vue
@@ -105,7 +105,7 @@ export default {
  resources: {
  updateColor() {
  return {
- method: 'drive.api.files.call_controller_method',
+ url: 'drive.api.files.call_controller_method',
  params: {
  method: 'change_color',
  entity_name: this.entityName,

diff --git a/frontend/src/components/DeleteDialog.vue b/frontend/src/components/DeleteDialog.vue
@@ -48,7 +48,7 @@ export default {
  resources: {
  delete() {
  return {
- method: 'drive.api.files.delete_entities',
+ url: 'drive.api.files.delete_entities',
  params: {
  entity_names: JSON.stringify(
  this.entities?.map((entity) => entity.name)

diff --git a/frontend/src/components/GeneralDialog.vue b/frontend/src/components/GeneralDialog.vue
@@ -94,7 +94,7 @@ export default {
  resources: {
  method() {
  return {
- method: this.dialogData.methodName,
+ url: this.dialogData.methodName,
  params: {
  entity_names: JSON.stringify(
  this.entities.map((entity) => entity.name)

diff --git a/frontend/src/components/InfoSidebar.vue b/frontend/src/components/InfoSidebar.vue
@@ -195,7 +195,7 @@ export default {
  resources: {
  comments() {
  return {
- method: 'drive.api.files.list_entity_comments',
+ url: 'drive.api.files.list_entity_comments',
  params: { entity_name: this.entity.name },
  onSuccess(data) {
  data.forEach((comment) => {

diff --git a/frontend/src/components/NewFolderDialog.vue b/frontend/src/components/NewFolderDialog.vue
@@ -62,7 +62,7 @@ export default {
  resources: {
  createFolder() {
  return {
- method: 'drive.api.files.create_folder',
+ url: 'drive.api.files.create_folder',
  params: {
  title: this.folderName,
  parent: this.parent,

diff --git a/frontend/src/components/RenameDialog.vue b/frontend/src/components/RenameDialog.vue
@@ -67,7 +67,7 @@ export default {
  resources: {
  rename() {
  return {
- method: 'drive.api.files.call_controller_method',
+ url: 'drive.api.files.call_controller_method',
  params: {
  method: 'rename',
  entity_name: this.entityName,

diff --git a/frontend/src/components/SearchPopup.vue b/frontend/src/components/SearchPopup.vue
@@ -108,7 +108,7 @@ export default {
  resources: {
  entities() {
  return {
- method: 'drive.api.permissions.get_all_my_entities',
+ url: 'drive.api.permissions.get_all_my_entities',
  onSuccess(data) {
  this.$resources.entities.error = null
  data.forEach((entity) => {

diff --git a/frontend/src/components/ShareDialog.vue b/frontend/src/components/ShareDialog.vue
@@ -301,7 +301,7 @@ export default {
  resources: {
  sharedWith() {
  return {
- method: 'drive.api.permissions.get_shared_with_list',
+ url: 'drive.api.permissions.get_shared_with_list',
  params: {
  entity_name: this.entityName,
  },
@@ -310,7 +310,7 @@ export default {
  },
  entity() {
  return {
- method: 'drive.api.files.get_entity',
+ url: 'drive.api.files.get_entity',
  params: {
  entity_name: this.entityName,
  fields: 'title,is_group,allow_comments',
@@ -323,7 +323,7 @@ export default {
  },
  generalAccess() {
  return {
- method: 'drive.api.permissions.get_general_access',
+ url: 'drive.api.permissions.get_general_access',
  params: { entity_name: this.entityName },
  onSuccess(data) {
  data = data || {};
@@ -337,7 +337,7 @@ export default {
  },
  share() {
  return {
- method: 'drive.api.files.call_controller_method',
+ url: 'drive.api.files.call_controller_method',
  params: {
  method: 'share',
  entity_name: this.entityName,
@@ -362,10 +362,10 @@ export default {
  },
  toggleAllowComments() {
  return {
- method: 'drive.api.files.call_controller_method',
+ url: 'drive.api.files.call_controller_method',
  params: {
  entity_name: this.entityName,
- method: 'toggle_allow_comments',
+ url: 'toggle_allow_comments',
  },
  onSuccess() {
  this.$resources.entity.fetch();
@@ -380,7 +380,7 @@ export default {
  },
  updateAccess() {
  return {
- method: 'drive.api.files.call_controller_method',
+ url: 'drive.api.files.call_controller_method',
  onSuccess() {
  this.$resources.generalAccess.fetch();
  },

diff --git a/frontend/src/main.js b/frontend/src/main.js
@@ -1,11 +1,12 @@
 import { createApp } from 'vue';
-import { FrappeUI, Button, onOutsideClickDirective } from 'frappe-ui';
+import { FrappeUI, Button, onOutsideClickDirective, setConfig, frappeRequest } from 'frappe-ui';
 import store from './store';
 import router from './router';
 import App from './App.vue';
 import mitt from 'mitt';
 import './index.css';
 
+setConfig('resourceFetcher', frappeRequest)
 const emitter = mitt();
 
 const app = createApp(App);

diff --git a/frontend/src/pages/Favourites.vue b/frontend/src/pages/Favourites.vue
@@ -331,7 +331,7 @@ export default {
  resources: {
  folderContents() {
  return {
- method: 'drive.api.files.list_favourites',
+ url: 'drive.api.files.list_favourites',
  params: {
  order_by: this.orderBy,
  fields:
@@ -354,7 +354,7 @@ export default {
  },
  toggleFavourite() {
  return {
- method: 'drive.api.files.add_or_remove_favourites',
+ url: 'drive.api.files.add_or_remove_favourites',
  params: {
  entity_names: JSON.stringify(
  this.selectedEntities?.map((entity) => entity.name)

diff --git a/frontend/src/pages/File.vue b/frontend/src/pages/File.vue
@@ -102,7 +102,7 @@ export default {
  resources: {
  file() {
  return {
- method: 'drive.api.permissions.get_file_with_permissions',
+ url: 'drive.api.permissions.get_file_with_permissions',
  params: { entity_name: this.entityName },
  onSuccess(data) {
  data.size_in_bytes = data.file_size;

diff --git a/frontend/src/pages/Folder.vue b/frontend/src/pages/Folder.vue
@@ -445,14 +445,14 @@ export default {
  resources: {
  folderAccess() {
  return {
- method: 'drive.api.permissions.get_user_access',
+ url: 'drive.api.permissions.get_user_access',
  params: { entity_name: this.entityName },
  };
  },
 
  folderContents() {
  return {
- method: 'drive.api.files.list_folder_contents',
+ url: 'drive.api.files.list_folder_contents',
  // cache: ['folderContents', this.entityName],
  params: {
  entity_name: this.entityName,
@@ -478,7 +478,7 @@ export default {
 
  pathEntities() {
  return {
- method: 'drive.api.files.get_entities_in_path',
+ url: 'drive.api.files.get_entities_in_path',
  // cache: ['pathEntities', this.entityName],
  params: {
  entity_name: this.entityName,
@@ -519,7 +519,7 @@ export default {
 
  toggleFavourite() {
  return {
- method: 'drive.api.files.add_or_remove_favourites',
+ url: 'drive.api.files.add_or_remove_favourites',
  params: {
  entity_names: JSON.stringify(
  this.selectedEntities?.map((entity) => entity.name)
@@ -539,7 +539,7 @@ export default {
 
  removeEntity() {
  return {
- method: 'drive.api.files.unshare_entities',
+ url: 'drive.api.files.unshare_entities',
  params: {
  entity_names: JSON.stringify(
  this.selectedEntities.map((entity) => entity.name)

diff --git a/frontend/src/pages/Home.vue b/frontend/src/pages/Home.vue
@@ -426,7 +426,7 @@ export default {
  resources: {
  createFolder() {
  return {
- method: "drive.api.files.create_folder",
+ url: "drive.api.files.create_folder",
  params: {
  title: this.folderName,
  parent: this.parent,
@@ -452,7 +452,7 @@ export default {
 
  folderContents() {
  return {
- method: 'drive.api.files.list_folder_contents',
+ url: 'drive.api.files.list_folder_contents',
  params: {
  order_by: this.orderBy,
  fields:
@@ -476,7 +476,7 @@ export default {
 
  toggleFavourite() {
  return {
- method: 'drive.api.files.add_or_remove_favourites',
+ url: 'drive.api.files.add_or_remove_favourites',
  params: {
  entity_names: JSON.stringify(
  this.selectedEntities?.map((entity) => entity.name)

diff --git a/frontend/src/pages/Shared.vue b/frontend/src/pages/Shared.vue
@@ -302,7 +302,7 @@ export default {
  resources: {
  folderContents() {
  return {
- method: 'drive.api.permissions.get_shared_with_me',
+ url: 'drive.api.permissions.get_shared_with_me',
  params: {
  order_by: this.orderBy,
  },
@@ -323,7 +323,7 @@ export default {
 
  toggleFavourite() {
  return {
- method: 'drive.api.files.add_or_remove_favourites',
+ url: 'drive.api.files.add_or_remove_favourites',
  params: {
  entity_names: JSON.stringify(
  this.selectedEntities?.map((entity) => entity.name)

diff --git a/frontend/src/pages/Trash.vue b/frontend/src/pages/Trash.vue
@@ -213,7 +213,7 @@ export default {
  resources: {
  folderContents() {
  return {
- method: 'drive.api.files.list_folder_contents',
+ url: 'drive.api.files.list_folder_contents',
  params: {
  order_by: this.orderBy,
  fields: