diff --git a/dashboard/src/components/icons/FrappeCloudLogo.vue b/dashboard/src/components/icons/JcloudLogo.vue similarity index 100% rename from dashboard/src/components/icons/FrappeCloudLogo.vue rename to dashboard/src/components/icons/JcloudLogo.vue diff --git a/dashboard/src/controllers/call.js b/dashboard/src/controllers/call.js index 929149b..81d0677 100644 --- a/dashboard/src/controllers/call.js +++ b/dashboard/src/controllers/call.js @@ -22,7 +22,7 @@ export default async function call(method, args) { updateState(this, 'RequestStarted', null); - const res = await fetch(`/api/method/${method}`, { + const res = await fetch(`/api/action/${method}`, { method: 'POST', headers, body: JSON.stringify(args) diff --git a/dashboard/src/controllers/fileUploader.js b/dashboard/src/controllers/fileUploader.js index b1e0072..3994b10 100644 --- a/dashboard/src/controllers/fileUploader.js +++ b/dashboard/src/controllers/fileUploader.js @@ -64,7 +64,7 @@ export default class FileUploader { reject(error); } }; - xhr.open('POST', '/api/method/upload_file', true); + xhr.open('POST', '/api/action/upload_file', true); xhr.setRequestHeader('Accept', 'application/json'); if (window.csrf_token && window.csrf_token !== '{{ csrf_token }}') { xhr.setRequestHeader('X-Jingrow-CSRF-Token', window.csrf_token); diff --git a/dashboard/src/controllers/s3FileUploader.js b/dashboard/src/controllers/s3FileUploader.js index 2ecdbfb..9284ad7 100644 --- a/dashboard/src/controllers/s3FileUploader.js +++ b/dashboard/src/controllers/s3FileUploader.js @@ -22,7 +22,7 @@ export default class S3FileUploader { async function getUploadLink() { try { let response = await fetch( - `/api/method/jcloud.api.site.get_upload_link?file=${file.name}` + `/api/action/jcloud.api.site.get_upload_link?file=${file.name}` ); let data = await response.json(); return data.message; diff --git a/dashboard/src/main.js b/dashboard/src/main.js index f0d6e02..0e98d9d 100644 --- a/dashboard/src/main.js +++ b/dashboard/src/main.js @@ -81,7 +81,7 @@ if (window.jcloud_frontend_posthog_host?.includes('https://')) { if (import.meta.env.DEV) { request({ - url: '/api/method/jcloud.www.dashboard.get_context_for_dev' + url: '/api/action/jcloud.www.dashboard.get_context_for_dev' }).then(values => { for (let key in values) { window[key] = values[key]; diff --git a/dashboard/src/tests/setup/msw.js b/dashboard/src/tests/setup/msw.js index 2a67a4a..a07fe06 100644 --- a/dashboard/src/tests/setup/msw.js +++ b/dashboard/src/tests/setup/msw.js @@ -12,7 +12,7 @@ const FAKE_BASE_URL = 'http://fc.tests'; const restHandlers = [ rest.post( - FAKE_BASE_URL + '/api/method/jcloud.api.site.features', + FAKE_BASE_URL + '/api/action/jcloud.api.site.features', (req, res, ctx) => { return res(ctx.status(200), ctx.json({ message: apps })); } diff --git a/dashboard/src2/components/AppTrialSubscriptionDialog.vue b/dashboard/src2/components/AppTrialSubscriptionDialog.vue index ef1cb3a..3d8cbe9 100644 --- a/dashboard/src2/components/AppTrialSubscriptionDialog.vue +++ b/dashboard/src2/components/AppTrialSubscriptionDialog.vue @@ -322,7 +322,7 @@ SitePlansCards: defineAsyncComponent(() => import('./SitePlansCards.vue')), this.isChangingPlan = true; const plan_name = this.selectedPlan?.name; let request = createResource({ - url: '/api/method/jcloud.api.client.run_pg_method', + url: '/api/action/jcloud.api.client.run_pg_method', params: { dt: 'Site', dn: this.site, diff --git a/dashboard/src2/components/ObjectListCell.vue b/dashboard/src2/components/ObjectListCell.vue index 83931bf..7eb1915 100644 --- a/dashboard/src2/components/ObjectListCell.vue +++ b/dashboard/src2/components/ObjectListCell.vue @@ -41,7 +41,7 @@
- {{ value ? $dayjs(value).fromNow() : '' }} + {{ value ? (column.format ? formattedValue : $dayjs(value).fromNow()) : '' }}
diff --git a/dashboard/src2/components/SiteOverview.vue b/dashboard/src2/components/SiteOverview.vue index ea0b4a2..f2031a8 100644 --- a/dashboard/src2/components/SiteOverview.vue +++ b/dashboard/src2/components/SiteOverview.vue @@ -67,7 +67,7 @@ diff --git a/dashboard/src2/components/SiteRenewalDialog.vue b/dashboard/src2/components/SiteRenewalDialog.vue index 3284ae2..e5663f3 100644 --- a/dashboard/src2/components/SiteRenewalDialog.vue +++ b/dashboard/src2/components/SiteRenewalDialog.vue @@ -188,7 +188,7 @@