tomas/pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated sdk to ^0.3.0

Browse Source
This commit is contained in:
Gani Georgiev
2022-08-02 17:00:14 +03:00
parent 8268c26d8b
commit a049a37624
47 changed files with 246 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/App.svelte
+1 -1
View File
@@ -48,7 +48,7 @@
}
try {
const settings = await ApiClient.Settings.getAll({
const settings = await ApiClient.settings.getAll({
$cancelKey: "loadAppName",
});
$appName = settings?.meta?.appName || "";
ui/src/components/PageIndex.svelte
+1 -1
View File
@@ -19,7 +19,7 @@
return;
}
if (ApiClient.AuthStore.isValid) {
if (ApiClient.authStore.isValid) {
replace("/collections");
} else {
ApiClient.logout();
ui/src/components/admins/AdminUpsertPanel.svelte
+5 -5
View File
@@ -71,9 +71,9 @@
let request;
if (admin.isNew) {
request = ApiClient.Admins.create(data);
request = ApiClient.admins.create(data);
} else {
request = ApiClient.Admins.update(admin.id, data);
request = ApiClient.admins.update(admin.id, data);
}
request
@@ -83,8 +83,8 @@
addSuccessToast(admin.isNew ? "Successfully created admin." : "Successfully updated admin.");
dispatch("save", result);
if (ApiClient.AuthStore.model?.id === result.id) {
ApiClient.AuthStore.save(ApiClient.AuthStore.token, result);
if (ApiClient.authStore.model?.id === result.id) {
ApiClient.authStore.save(ApiClient.authStore.token, result);
}
})
.catch((err) => {
@@ -101,7 +101,7 @@
}
confirm(`Do you really want to delete the selected admin?`, () => {
return ApiClient.Admins.delete(admin.id)
return ApiClient.admins.delete(admin.id)
.then(() => {
confirmClose = false;
hide();
ui/src/components/admins/PageAdminConfirmPasswordReset.svelte
+1 -1
View File
@@ -22,7 +22,7 @@
isLoading = true;
try {
await ApiClient.Admins.confirmPasswordReset(params?.token, newPassword, newPasswordConfirm);
await ApiClient.admins.confirmPasswordReset(params?.token, newPassword, newPasswordConfirm);
addSuccessToast("Successfully set a new admin password.");
replace("/");
} catch (err) {
ui/src/components/admins/PageAdminLogin.svelte
+1 -1
View File
@@ -18,7 +18,7 @@
isLoading = true;
return ApiClient.Admins.authViaEmail(email, password)
return ApiClient.admins.authViaEmail(email, password)
.then(() => {
replace("/");
})
ui/src/components/admins/PageAdminRequestPasswordReset.svelte
+1 -1
View File
@@ -16,7 +16,7 @@
isLoading = true;
try {
await ApiClient.Admins.requestPasswordReset(email);
await ApiClient.admins.requestPasswordReset(email);
success = true;
} catch (err) {
ApiClient.errorResponseHandler(err);
ui/src/components/admins/PageAdmins.svelte
+1 -1
View File
@@ -35,7 +35,7 @@
admins = []; // reset
return ApiClient.Admins.getFullList(100, {
return ApiClient.admins.getFullList(100, {
sort: sort || "-created",
filter: filter,
})
ui/src/components/base/Installer.svelte
+2 -2
View File
@@ -18,13 +18,13 @@
isLoading = true;
try {
await ApiClient.Admins.create({
await ApiClient.admins.create({
email,
password,
passwordConfirm,
});
await ApiClient.Admins.authViaEmail(email, password);
await ApiClient.admins.authViaEmail(email, password);
dispatch("submit");
} catch (err) {
ui/src/components/collections/CollectionUpsertPanel.svelte
+3 -3
View File
@@ -97,9 +97,9 @@
let request;
if (collection.isNew) {
request = ApiClient.Collections.create(data);
request = ApiClient.collections.create(data);
} else {
request = ApiClient.Collections.update(collection.id, data);
request = ApiClient.collections.update(collection.id, data);
}
request
@@ -146,7 +146,7 @@
}
confirm(`Do you really want to delete collection "${original?.name}" and all its records?`, () => {
return ApiClient.Collections.delete(original?.id)
return ApiClient.collections.delete(original?.id)
.then(() => {
hide();
addSuccessToast(`Successfully deleted collection "${original?.name}".`);
ui/src/components/collections/docs/CreateApiDocs.svelte
+1 -1
View File
@@ -82,7 +82,7 @@
const data = { ... };
const record = await client.Records.create('${collection?.name}', data);
const record = await client.records.create('${collection?.name}', data);
`}
dart={`
import 'package:pocketbase/pocketbase.dart';
ui/src/components/collections/docs/DeleteApiDocs.svelte
+1 -1
View File
@@ -84,7 +84,7 @@
...
await client.Records.delete('${collection?.name}', 'RECORD_ID');
await client.records.delete('${collection?.name}', 'RECORD_ID');
`}
dart={`
import 'package:pocketbase/pocketbase.dart';
ui/src/components/collections/docs/ListApiDocs.svelte
+2 -2
View File
@@ -97,12 +97,12 @@
...
// fetch a paginated records list
const resultList = await client.Records.getList('${collection?.name}', 1, 50, {
const resultList = await client.records.getList('${collection?.name}', 1, 50, {
filter: 'created >= '2022-01-01 00:00:00'',
});
// alternatively you can also fetch all records at once via getFullList:
const records = await client.Records.getFullList('${collection?.name}', 200 /* batch size */, {
const records = await client.records.getFullList('${collection?.name}', 200 /* batch size */, {
sort: '-created',
});
`}
ui/src/components/collections/docs/RealtimeApiDocs.svelte
+6 -6
View File
@@ -56,22 +56,22 @@
...
// (Optionally) authenticate
client.Users.authViaEmail('test@example.com', '123456');
client.users.authViaEmail('test@example.com', '123456');
// Subscribe to changes in any record from the collection
client.Realtime.subscribe('${collection?.name}', function (e) {
client.realtime.subscribe('${collection?.name}', function (e) {
console.log(e.record);
});
// Subscribe to changes in a single record
client.Realtime.subscribe('${collection?.name}/RECORD_ID', function (e) {
client.realtime.subscribe('${collection?.name}/RECORD_ID', function (e) {
console.log(e.record);
});
// Unsubscribe
client.Realtime.unsubscribe() // remove all subscriptions
client.Realtime.unsubscribe('${collection?.name}') // remove only the collection subscription
client.Realtime.unsubscribe('${collection?.name}/RECORD_ID') // remove only the record subscription
client.realtime.unsubscribe() // remove all subscriptions
client.realtime.unsubscribe('${collection?.name}') // remove only the collection subscription
client.realtime.unsubscribe('${collection?.name}/RECORD_ID') // remove only the record subscription
`}
dart={`
import 'package:pocketbase/pocketbase.dart';
ui/src/components/collections/docs/UpdateApiDocs.svelte
+1 -1
View File
@@ -92,7 +92,7 @@
const data = { ... };
const record = await client.Records.update('${collection?.name}', 'RECORD_ID', data);
const record = await client.records.update('${collection?.name}', 'RECORD_ID', data);
`}
dart={`
import 'package:pocketbase/pocketbase.dart';
ui/src/components/collections/docs/ViewApiDocs.svelte
+1 -1
View File
@@ -72,7 +72,7 @@
...
const record = await client.Records.getOne('${collection?.name}', 'RECORD_ID', {
const record = await client.records.getOne('${collection?.name}', 'RECORD_ID', {
expand: 'some_relation'
});
`}
ui/src/components/collections/schema/RelationOptions.svelte
+1 -1
View File
@@ -29,7 +29,7 @@
function loadCollections() {
isLoading = true;
ApiClient.Collections.getFullList(200, { sort: "-created" })
ApiClient.collections.getFullList(200, { sort: "-created" })
.then((items) => {
collections = items;
})
ui/src/components/logs/LogsChart.svelte
+1 -1
View File
@@ -36,7 +36,7 @@
export async function load() {
isLoading = true;
return ApiClient.Logs.getRequestsStats({
return ApiClient.logs.getRequestsStats({
filter: [presets, filter].filter(Boolean).join("&&"),
})
.then((result) => {
ui/src/components/logs/LogsList.svelte
+1 -1
View File
@@ -32,7 +32,7 @@
export async function load(page = 1) {
isLoading = true;
return ApiClient.Logs.getRequestsList(page, 40, {
return ApiClient.logs.getRequestsList(page, 40, {
sort: sort,
filter: [presets, filter].filter(Boolean).join("&&"),
})
ui/src/components/records/RecordFilePreview.svelte
+1 -1
View File
@@ -13,7 +13,7 @@
$: hasPreview = CommonHelper.hasImageExtension(filename);
$: if (hasPreview) {
originalUrl = ApiClient.Records.getFileUrl(record, `${filename}`);
originalUrl = ApiClient.records.getFileUrl(record, `${filename}`);
}
$: thumbUrl = originalUrl ? originalUrl + "?thumb=100x100" : "";
ui/src/components/records/RecordSelect.svelte
+2 -2
View File
@@ -47,7 +47,7 @@
filters.push(`id="${id}"`);
}
selected = await ApiClient.Records.getFullList(collectionId, 200, {
selected = await ApiClient.records.getFullList(collectionId, 200, {
sort: "-created",
filter: filters.join("||"),
$cancelKey: uniqueId + "loadSelected",
@@ -72,7 +72,7 @@
try {
const page = reset ? 1 : currentPage + 1;
const result = await ApiClient.Records.getList(collectionId, page, 200, {
const result = await ApiClient.records.getList(collectionId, page, 200, {
sort: "-created",
$cancelKey: uniqueId + "loadList",
});
ui/src/components/records/RecordUpsertPanel.svelte
+3 -3
View File
@@ -82,9 +82,9 @@
let request;
if (record.isNew) {
request = ApiClient.Records.create(collection?.id, data);
request = ApiClient.records.create(collection?.id, data);
} else {
request = ApiClient.Records.update(collection?.id, record.id, data);
request = ApiClient.records.update(collection?.id, record.id, data);
}
request
@@ -110,7 +110,7 @@
}
confirm(`Do you really want to delete the selected record?`, () => {
return ApiClient.Records.delete(original["@collectionId"], original.id)
return ApiClient.records.delete(original["@collectionId"], original.id)
.then(() => {
hide();
addSuccessToast("Successfully deleted record.");
ui/src/components/records/RecordsList.svelte
+2 -2
View File
@@ -47,7 +47,7 @@
clearList();
}
return ApiClient.Records.getList(collection.id, page, 50, {
return ApiClient.records.getList(collection.id, page, 50, {
sort: sort,
filter: filter,
})
@@ -120,7 +120,7 @@
let promises = [];
for (const recordId of Object.keys(bulkSelected)) {
promises.push(ApiClient.Records.delete(collection?.id, recordId));
promises.push(ApiClient.records.delete(collection?.id, recordId));
}
isDeleting = true;
ui/src/components/records/fields/FileField.svelte
+1 -1
View File
@@ -83,7 +83,7 @@
<RecordFilePreview {record} {filename} />
</figure>
<a
href={ApiClient.Records.getFileUrl(record, filename)}
href={ApiClient.records.getFileUrl(record, filename)}
class="filename link-hint"
class:txt-strikethrough={deletedFileIndexes.includes(i)}
use:tooltip={{ position: "right", text: "Download" }}
ui/src/components/settings/PageApplication.svelte
+2 -2
View File
@@ -21,7 +21,7 @@
isLoading = true;
try {
const settings = (await ApiClient.Settings.getAll()) || {};
const settings = (await ApiClient.settings.getAll()) || {};
init(settings);
} catch (err) {
ApiClient.errorResponseHandler(err);
@@ -38,7 +38,7 @@
isSaving = true;
try {
const settings = await ApiClient.Settings.update(CommonHelper.filterRedactedProps(formSettings));
const settings = await ApiClient.settings.update(CommonHelper.filterRedactedProps(formSettings));
init(settings);
addSuccessToast("Successfully saved application settings.");
} catch (err) {
ui/src/components/settings/PageAuthProviders.svelte
+2 -2
View File
@@ -24,7 +24,7 @@
isLoading = true;
try {
const result = (await ApiClient.Settings.getAll()) || {};
const result = (await ApiClient.settings.getAll()) || {};
initSettings(result);
} catch (err) {
ApiClient.errorResponseHandler(err);
@@ -41,7 +41,7 @@
isSaving = true;
try {
const result = await ApiClient.Settings.update(CommonHelper.filterRedactedProps(authSettings));
const result = await ApiClient.settings.update(CommonHelper.filterRedactedProps(authSettings));
initSettings(result);
setErrors({});
emailAuthAccordion?.collapseSiblings();
ui/src/components/settings/PageMail.svelte
+2 -2
View File
@@ -29,7 +29,7 @@
isLoading = true;
try {
const settings = (await ApiClient.Settings.getAll()) || {};
const settings = (await ApiClient.settings.getAll()) || {};
init(settings);
} catch (err) {
ApiClient.errorResponseHandler(err);
@@ -46,7 +46,7 @@
isSaving = true;
try {
const settings = await ApiClient.Settings.update(CommonHelper.filterRedactedProps(formSettings));
const settings = await ApiClient.settings.update(CommonHelper.filterRedactedProps(formSettings));
init(settings);
addSuccessToast("Successfully saved mail settings.");
} catch (err) {
ui/src/components/settings/PageStorage.svelte
+2 -2
View File
@@ -26,7 +26,7 @@
isLoading = true;
try {
const settings = (await ApiClient.Settings.getAll()) || {};
const settings = (await ApiClient.settings.getAll()) || {};
init(settings);
} catch (err) {
ApiClient.errorResponseHandler(err);
@@ -43,7 +43,7 @@
isSaving = true;
try {
const settings = await ApiClient.Settings.update(CommonHelper.filterRedactedProps({ s3 }));
const settings = await ApiClient.settings.update(CommonHelper.filterRedactedProps({ s3 }));
init(settings);
setErrors({});
addSuccessToast("Successfully saved Files storage settings.");
ui/src/components/settings/PageTokenOptions.svelte
+2 -2
View File
@@ -30,7 +30,7 @@
isLoading = true;
try {
const result = (await ApiClient.Settings.getAll()) || {};
const result = (await ApiClient.settings.getAll()) || {};
initSettings(result);
} catch (err) {
ApiClient.errorResponseHandler(err);
@@ -47,7 +47,7 @@
isSaving = true;
try {
const result = await ApiClient.Settings.update(CommonHelper.filterRedactedProps(tokenSettings));
const result = await ApiClient.settings.update(CommonHelper.filterRedactedProps(tokenSettings));
initSettings(result);
addSuccessToast("Successfully saved tokens options.");
} catch (err) {
ui/src/components/users/PageUserConfirmEmailChange.svelte
+1 -1
View File
@@ -20,7 +20,7 @@
isLoading = true;
try {
await ApiClient.Users.confirmEmailChange(params?.token, password);
await ApiClient.users.confirmEmailChange(params?.token, password);
success = true;
} catch (err) {
ApiClient.errorResponseHandler(err);
ui/src/components/users/PageUserConfirmPasswordReset.svelte
+1 -1
View File
@@ -21,7 +21,7 @@
isLoading = true;
try {
await ApiClient.Users.confirmPasswordReset(params?.token, newPassword, newPasswordConfirm);
await ApiClient.users.confirmPasswordReset(params?.token, newPassword, newPasswordConfirm);
success = true;
} catch (err) {
ApiClient.errorResponseHandler(err);
ui/src/components/users/PageUserConfirmVerification.svelte
+1 -1
View File
@@ -13,7 +13,7 @@
isLoading = true;
try {
await ApiClient.Users.confirmVerification(params?.token);
await ApiClient.users.confirmVerification(params?.token);
success = true;
} catch (err) {
console.warn(err);
ui/src/components/users/PageUsers.svelte
+2 -2
View File
@@ -55,7 +55,7 @@
clearList();
}
return ApiClient.Users.getList(page, 50, {
return ApiClient.users.getList(page, 50, {
sort: sort || "-created",
filter: filter,
})
@@ -93,7 +93,7 @@
isLoadingProfileCollection = true;
try {
profileCollection = await ApiClient.Collections.getOne(import.meta.env.PB_PROFILE_COLLECTION);
profileCollection = await ApiClient.collections.getOne(import.meta.env.PB_PROFILE_COLLECTION);
} catch (err) {
ApiClient.errorResponseHandler(err);
}
ui/src/components/users/UserSelect.svelte
+2 -2
View File
@@ -41,7 +41,7 @@
filters.push(`id="${id}"`);
}
selected = await ApiClient.Users.getFullList(100, {
selected = await ApiClient.users.getFullList(100, {
sort: "-created",
filter: filters.join("||"),
$cancelKey: uniqueId + "loadSelected",
@@ -62,7 +62,7 @@
try {
const page = reset ? 1 : currentPage + 1;
const result = await ApiClient.Users.getList(page, 200, {
const result = await ApiClient.users.getList(page, 200, {
sort: "-created",
$cancelKey: uniqueId + "loadList",
});
ui/src/components/users/UserUpsertPanel.svelte
+4 -4
View File
@@ -68,9 +68,9 @@
let request;
if (user.isNew) {
request = ApiClient.Users.create(data);
request = ApiClient.users.create(data);
} else {
request = ApiClient.Users.update(user.id, data);
request = ApiClient.users.update(user.id, data);
}
request
@@ -98,7 +98,7 @@
}
confirm(`Do you really want to delete the selected user?`, () => {
return ApiClient.Users.delete(user.id)
return ApiClient.users.delete(user.id)
.then(() => {
confirmClose = false;
hide();
@@ -112,7 +112,7 @@
}
function sendVerificationEmail(notify = true) {
return ApiClient.Users.requestVerification(user.isNew ? email : user.email)
return ApiClient.users.requestVerification(user.isNew ? email : user.email)
.then(() => {
confirmClose = false;
hide();
ui/src/routes.js
+12 -12
View File
@@ -28,37 +28,37 @@ const baseConditions = [
const routes = {
"/login": wrap({
component: PageAdminLogin,
conditions: baseConditions.concat([(_) => !ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => !ApiClient.authStore.isValid]),
userData: { showAppSidebar: false },
}),
"/request-password-reset": wrap({
asyncComponent: () => import("@/components/admins/PageAdminRequestPasswordReset.svelte"),
conditions: baseConditions.concat([(_) => !ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => !ApiClient.authStore.isValid]),
userData: { showAppSidebar: false },
}),
"/confirm-password-reset/:token": wrap({
asyncComponent: () => import("@/components/admins/PageAdminConfirmPasswordReset.svelte"),
conditions: baseConditions.concat([(_) => !ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => !ApiClient.authStore.isValid]),
userData: { showAppSidebar: false },
}),
"/collections": wrap({
component: PageRecords,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/logs": wrap({
component: PageLogs,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/users": wrap({
component: PageUsers,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
@@ -100,37 +100,37 @@ const routes = {
"/settings": wrap({
component: PageApplication,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/settings/admins": wrap({
component: PageAdmins,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/settings/mail": wrap({
component: PageMail,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/settings/storage": wrap({
component: PageStorage,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/settings/auth-providers": wrap({
component: PageAuthProviders,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
"/settings/tokens": wrap({
component: PageTokenOptions,
conditions: baseConditions.concat([(_) => ApiClient.AuthStore.isValid]),
conditions: baseConditions.concat([(_) => ApiClient.authStore.isValid]),
userData: { showAppSidebar: true },
}),
ui/src/stores/collections.js
+1 -1
View File
@@ -42,7 +42,7 @@ export async function loadCollections(activeId = null) {
activeCollection.set({});
collections.set([]);
return ApiClient.Collections.getFullList(200, {
return ApiClient.collections.getFullList(200, {
"sort": "+created",
})
.then((items) => {
ui/src/utils/ApiClient.js
+4 -3
View File
@@ -12,7 +12,7 @@ import { setAdmin } from "@/stores/admin";
* @param {Boolean} [redirect] Whether to redirect to the login page.
*/
PocketBase.prototype.logout = function(redirect = true) {
this.AuthStore.clear();
this.authStore.clear();
if (redirect) {
replace('/login');
@@ -81,6 +81,7 @@ class AppAuthStore extends LocalAuthStore {
*/
clear() {
super.clear();
setAdmin(null);
}
}
@@ -91,8 +92,8 @@ const client = new PocketBase(
new AppAuthStore("pb_admin_auth")
);
if (client.AuthStore.model instanceof Admin) {
setAdmin(client.AuthStore.model);
if (client.authStore.model instanceof Admin) {
setAdmin(client.authStore.model);
}
export default client;