added the app name in the document title and fixed the double initial load on records list

.github/workflows/release.yaml

@@ -29,6 +29,11 @@ jobs:
       - name: Build Admin dashboard UI
         run: npm --prefix=./ui ci && npm --prefix=./ui run build
 
+      # The prebuilt golangci-lint doesn't support go 1.18+ yet
+      # https://github.com/golangci/golangci-lint/issues/2649
+      # - name: Run linter
+      #   uses: golangci/golangci-lint-action@v3
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:

CONTRIBUTING.md

@@ -0,0 +1,80 @@
+Contributing to PocketBase
+======================================================================
+
+Thanks for taking the time to improve PocketBase!
+
+This document describes how to prepare a PR for a change in the main repository.
+
+- [Prerequisites](#prerequisites)
+- [Making changes in the Go code](#making-changes-in-the-go-code)
+- [Making changes in the Admin UI](#making-changes-in-the-admin-ui)
+
+
+## Prerequisites
+
+- Go 1.18+ (for making changes in the Go code)
+- Node 16+ (for making changes in the Admin UI)
+
+If you haven't already, you can fork the main repository and clone your fork so that you can work locally:
+```
+git clone https://github.com/your_username/pocketbase.git
+```
+
+> It is recommended to create a new branch from master for each of your bugfixes and features.
+> This is required if you are planning to submit multiple PRs in order to keep the changes separate for review until they eventually get merged.
+
+
+## Making changes in the Go code
+
+PocketBase is a Go package, which means that in order to run the project you'll have to create a Go `main` program that imports the package.
+
+The repository already includes such program, located in `/examples/base`, that is also used for the prebuilt executables.
+
+So, let's assume that you already done some changes in the PocketBase Go code and you want now to run them:
+
+1. Navigate to `examples/base`
+2. Run `go run main.go serve`
+
+This will start a web server on `http://localhost:8090` with the embedded prebuilt Admin UI from `ui/dist`. And that's it!
+
+**Before making a PR to the main repository, it is a good idea to:**
+
+- Add unit/integration tests for your changes (we are using the standard `testing` go package).
+  To run the tests, you could execute (while in the root project directory):
+    ```sh
+    go test ./...
+
+    # or using the Makefile
+    make test
+    ```
+
+- Run the linter - **golangci** ([see how to install](https://golangci-lint.run/usage/install/#local-installation)):
+    ```sh
+    golangci-lint run -c ./golangci.yml ./...
+
+    # or using the Makefile
+    make lint
+    ```
+
+## Making changes in the Admin UI
+
+PocketBase Admin UI is a single-page application (SPA) built with Svelte and Vite.
+
+To start the Admin UI:
+
+1. Navigate to the `ui` project directory
+2. Run `npm install` to install the node dependencies
+3. Start vite's dev server
+    ```sh
+    npm run dev
+    ```
+
+You could open the browser and access the running Admin UI at `http://localhost:3000`.
+
+Since the Admin UI is just a client-side application, you need to have the PocketBase backend server also running in the background (either manually running the `examples/base/main.go` or download a prebuilt executable).
+
+> By default, the Admin UI is expecting the backend server to be started at `http://localhost:8090`, but you could change that by creating a new `ui/.env.development.local` file with `PB_BACKEND_URL = YOUR_ADDRESS` variable inside it.
+
+Every change you make in the Admin UI should be automatically reflected in the browser at `http://localhost:3000` without reloading the page.
+
+Once you are done with your changes, you have to build the Admin UI with `npm run build`, so that it can be embedded in the go package. And that's it - you can make your PR to the main PocketBase repository.

README.md

@@ -120,8 +120,9 @@ PocketBase is free and open source project licensed under the [MIT License](LICE
 
 You could help continuing its development by:
 
-- [Suggest new features, report issues and fix bugs](https://github.com/pocketbase/pocketbase/issues)
+- [Contribute to the source code](CONTRIBUTING.md)
+- [Suggest new features and report issues](https://github.com/pocketbase/pocketbase/issues)
 - [Donate a small amount](https://pocketbase.io/support-us)
 
-> Please also note that PocketBase was initially created to serve as a new backend for my other open source project - [Presentator](https://presentator.io) (see [#183](https://github.com/presentator/presentator/issues/183)),
+> Please note that PocketBase was initially created to serve as a new backend for my other open source project - [Presentator](https://presentator.io) (see [#183](https://github.com/presentator/presentator/issues/183)),
 so all feature requests will be first aligned with what we need for Presentator v3.

apis/collection.go

@@ -1,8 +1,6 @@
 package apis
 
 import (
-	"errors"
-	"log"
 	"net/http"
 
 	"github.com/labstack/echo/v5"
@@ -160,13 +158,6 @@ func (api *collectionApi) delete(c echo.Context) error {
 			return rest.NewBadRequestError("Failed to delete collection. Make sure that the collection is not referenced by other collections.", err)
 		}
 
-		// try to delete the collection files
-		if err := api.deleteCollectionFiles(e.Collection); err != nil && api.app.IsDebug() {
-			// non critical error - only log for debug
-			// (usually could happen because of S3 api limits)
-			log.Println(err)
-		}
-
 		return e.HttpContext.NoContent(http.StatusNoContent)
 	})
 
@@ -176,18 +167,3 @@ func (api *collectionApi) delete(c echo.Context) error {
 
 	return handlerErr
 }
-
-func (api *collectionApi) deleteCollectionFiles(collection *models.Collection) error {
-	fs, err := api.app.NewFilesystem()
-	if err != nil {
-		return err
-	}
-	defer fs.Close()
-
-	failed := fs.DeletePrefix(collection.BaseFilesPath())
-	if len(failed) > 0 {
-		return errors.New("Failed to delete all record files.")
-	}
-
-	return nil
-}

apis/middlewares.go

@@ -77,7 +77,7 @@ func RequireAdminAuth() echo.MiddlewareFunc {
 	}
 }
 
-// RequireAdminAuthIfAny middleware requires a request to have
+// RequireAdminAuthOnlyIfAny middleware requires a request to have
 // a valid admin Authorization header set (aka. `Authorization: Admin ...`)
 // ONLY if the application has at least 1 existing Admin model.
 func RequireAdminAuthOnlyIfAny(app core.App) echo.MiddlewareFunc {

apis/realtime.go

@@ -159,8 +159,8 @@ func (api *realtimeApi) bindEvents() {
 	adminTable := (&models.Admin{}).TableName()
 
 	// update user/admin auth state
-	api.app.OnModelAfterUpdate().Add(func(data *core.ModelEvent) error {
-		modelTable := data.Model.TableName()
+	api.app.OnModelAfterUpdate().Add(func(e *core.ModelEvent) error {
+		modelTable := e.Model.TableName()
 
 		var contextKey string
 		switch modelTable {
@@ -174,8 +174,8 @@ func (api *realtimeApi) bindEvents() {
 
 		for _, client := range api.app.SubscriptionsBroker().Clients() {
 			model, _ := client.Get(contextKey).(models.Model)
-			if model != nil && model.GetId() == data.Model.GetId() {
-				client.Set(contextKey, data.Model)
+			if model != nil && model.GetId() == e.Model.GetId() {
+				client.Set(contextKey, e.Model)
 			}
 		}
 
@@ -183,8 +183,8 @@ func (api *realtimeApi) bindEvents() {
 	})
 
 	// remove user/admin client(s)
-	api.app.OnModelAfterDelete().Add(func(data *core.ModelEvent) error {
-		modelTable := data.Model.TableName()
+	api.app.OnModelAfterDelete().Add(func(e *core.ModelEvent) error {
+		modelTable := e.Model.TableName()
 
 		var contextKey string
 		switch modelTable {
@@ -198,7 +198,7 @@ func (api *realtimeApi) bindEvents() {
 
 		for _, client := range api.app.SubscriptionsBroker().Clients() {
 			model, _ := client.Get(contextKey).(models.Model)
-			if model != nil && model.GetId() == data.Model.GetId() {
+			if model != nil && model.GetId() == e.Model.GetId() {
 				api.app.SubscriptionsBroker().Unregister(client.Id())
 			}
 		}
@@ -206,18 +206,20 @@ func (api *realtimeApi) bindEvents() {
 		return nil
 	})
 
-	api.app.OnRecordAfterCreateRequest().Add(func(data *core.RecordCreateEvent) error {
-		api.broadcastRecord("create", data.Record)
+	api.app.OnRecordAfterCreateRequest().Add(func(e *core.RecordCreateEvent) error {
+		api.broadcastRecord("create", e.Record)
 		return nil
 	})
 
-	api.app.OnRecordAfterUpdateRequest().Add(func(data *core.RecordUpdateEvent) error {
-		api.broadcastRecord("update", data.Record)
+	api.app.OnRecordAfterUpdateRequest().Add(func(e *core.RecordUpdateEvent) error {
+		api.broadcastRecord("update", e.Record)
 		return nil
 	})
 
-	api.app.OnRecordAfterDeleteRequest().Add(func(data *core.RecordDeleteEvent) error {
-		api.broadcastRecord("delete", data.Record)
+	api.app.OnModelBeforeDelete().Add(func(e *core.ModelEvent) error {
+		if record, ok := e.Model.(*models.Record); ok {
+			api.broadcastRecord("delete", record)
+		}
 		return nil
 	})
 }

apis/record.go

@@ -356,13 +356,6 @@ func (api *recordApi) delete(c echo.Context) error {
 			return rest.NewBadRequestError("Failed to delete record. Make sure that the record is not part of a required relation reference.", err)
 		}
 
-		// try to delete the record files
-		if err := api.deleteRecordFiles(e.Record); err != nil && api.app.IsDebug() {
-			// non critical error - only log for debug
-			// (usually could happen due to S3 api limits)
-			log.Println(err)
-		}
-
 		return e.HttpContext.NoContent(http.StatusNoContent)
 	})
 
@@ -373,21 +366,6 @@ func (api *recordApi) delete(c echo.Context) error {
 	return handlerErr
 }
 
-func (api *recordApi) deleteRecordFiles(record *models.Record) error {
-	fs, err := api.app.NewFilesystem()
-	if err != nil {
-		return err
-	}
-	defer fs.Close()
-
-	failed := fs.DeletePrefix(record.BaseFilesPath())
-	if len(failed) > 0 {
-		return fmt.Errorf("Failed to delete %d record files.", len(failed))
-	}
-
-	return nil
-}
-
 func (api *recordApi) exportRequestData(c echo.Context) map[string]any {
 	result := map[string]any{}
 	queryParams := map[string]any{}

apis/record_test.go

@@ -144,12 +144,11 @@ func TestRecordsList(t *testing.T) {
 				`"manyrels":[{`,
 				`"manyrels":[]`,
 				`"rel_cascade":"`,
-				`"rel_cascade":null`,
 				`"onerel":{"@collectionId":"3f2888f8-075d-49fe-9d09-ea7e951000dc","@collectionName":"demo",`,
 				`"json":[1,2,3]`,
 				`"select":["a","b"]`,
 				`"select":[]`,
-				`"user":null`,
+				`"user":""`,
 				`"bool":true`,
 				`"number":456`,
 				`"user":"97cc3d3d-6ba2-383f-b42a-7bc84d27410c"`,
@@ -455,11 +454,13 @@ func TestRecordDelete(t *testing.T) {
 				"OnRecordAfterDeleteRequest":  1,
 				"OnModelAfterUpdate":          1, // nullify related record
 				"OnModelBeforeUpdate":         1, // nullify related record
-				"OnModelBeforeDelete":         2, // +1 cascade delete related record
-				"OnModelAfterDelete":          2, // +1 cascade delete related record
+				"OnModelBeforeDelete":         3, // +1 cascade delete related record
+				"OnModelAfterDelete":          3, // +1 cascade delete related record
 			},
 			AfterFunc: func(t *testing.T, app *tests.TestApp, e *echo.Echo) {
 				ensureDeletedFiles(app, "3f2888f8-075d-49fe-9d09-ea7e951000dc", "577bd676-aacb-4072-b7da-99d00ee210a4")
+				ensureDeletedFiles(app, "2c1010aa-b8fe-41d9-a980-99534ca8a167", "94568ca2-0bee-49d7-b749-06cb97956fd9")
+				ensureDeletedFiles(app, "2c1010aa-b8fe-41d9-a980-99534ca8a167", "63c2ab80-84ab-4057-a592-4604a731f78f")
 			},
 		},
 		{
@@ -475,11 +476,13 @@ func TestRecordDelete(t *testing.T) {
 				"OnRecordAfterDeleteRequest":  1,
 				"OnModelAfterUpdate":          1, // nullify related record
 				"OnModelBeforeUpdate":         1, // nullify related record
-				"OnModelBeforeDelete":         2, // +1 cascade delete related record
-				"OnModelAfterDelete":          2, // +1 cascade delete related record
+				"OnModelBeforeDelete":         3, // +1 cascade delete related record
+				"OnModelAfterDelete":          3, // +1 cascade delete related record
 			},
 			AfterFunc: func(t *testing.T, app *tests.TestApp, e *echo.Echo) {
 				ensureDeletedFiles(app, "3f2888f8-075d-49fe-9d09-ea7e951000dc", "577bd676-aacb-4072-b7da-99d00ee210a4")
+				ensureDeletedFiles(app, "2c1010aa-b8fe-41d9-a980-99534ca8a167", "94568ca2-0bee-49d7-b749-06cb97956fd9")
+				ensureDeletedFiles(app, "2c1010aa-b8fe-41d9-a980-99534ca8a167", "63c2ab80-84ab-4057-a592-4604a731f78f")
 			},
 		},
 		{
@@ -554,8 +557,8 @@ func TestRecordDelete(t *testing.T) {
 				"OnRecordAfterDeleteRequest":  1,
 				"OnModelBeforeUpdate":         1,
 				"OnModelAfterUpdate":          1,
-				"OnModelBeforeDelete":         2,
-				"OnModelAfterDelete":          2,
+				"OnModelBeforeDelete":         3,
+				"OnModelAfterDelete":          3,
 			},
 			AfterFunc: func(t *testing.T, app *tests.TestApp, e *echo.Echo) {
 				recId := "63c2ab80-84ab-4057-a592-4604a731f78f"
@@ -565,6 +568,7 @@ func TestRecordDelete(t *testing.T) {
 					t.Errorf("Expected record %s to be cascade deleted", recId)
 				}
 				ensureDeletedFiles(app, "3f2888f8-075d-49fe-9d09-ea7e951000dc", "577bd676-aacb-4072-b7da-99d00ee210a4")
+				ensureDeletedFiles(app, "2c1010aa-b8fe-41d9-a980-99534ca8a167", "94568ca2-0bee-49d7-b749-06cb97956fd9")
 				ensureDeletedFiles(app, "2c1010aa-b8fe-41d9-a980-99534ca8a167", "63c2ab80-84ab-4057-a592-4604a731f78f")
 			},
 		},
@@ -650,7 +654,8 @@ func TestRecordCreate(t *testing.T) {
 				"onerel": "577bd676-aacb-4072-b7da-99d00ee210a4",
 				"manyrels": ["577bd676-aacb-4072-b7da-99d00ee210a4"],
 				"text": "test123",
-				"bool": "false"
+				"bool": "false",
+				"number": 1
 			}`),
 			RequestHeaders: map[string]string{
 				// test@example.com
@@ -668,7 +673,8 @@ func TestRecordCreate(t *testing.T) {
 				"onerel":"577bd676-aacb-4072-b7da-99d00ee210a4",
 				"manyrels":["577bd676-aacb-4072-b7da-99d00ee210a4"],
 				"text":"test123",
-				"bool":true
+				"bool":true,
+				"number":1
 			}`),
 			RequestHeaders: map[string]string{
 				// test3@example.com
@@ -682,6 +688,7 @@ func TestRecordCreate(t *testing.T) {
 				`"manyrels":["577bd676-aacb-4072-b7da-99d00ee210a4"]`,
 				`"text":"test123"`,
 				`"bool":true`,
+				`"number":1`,
 			},
 			ExpectedEvents: map[string]int{
 				"OnRecordBeforeCreateRequest": 1,
@@ -695,11 +702,12 @@ func TestRecordCreate(t *testing.T) {
 			Method: http.MethodPost,
 			Url:    "/api/collections/demo2/records",
 			Body: strings.NewReader(`{
-				"rel_cascade":"577bd676-aacb-4072-b7da-99d00ee210a4",
-				"onerel":"577bd676-aacb-4072-b7da-99d00ee210a4",
-				"manyrels":["577bd676-aacb-4072-b7da-99d00ee210a4"],
-				"text":"test123",
-				"bool":false
+				"rel_cascade": "577bd676-aacb-4072-b7da-99d00ee210a4",
+				"onerel": "577bd676-aacb-4072-b7da-99d00ee210a4",
+				"manyrels" :["577bd676-aacb-4072-b7da-99d00ee210a4"],
+				"text": "test123",
+				"bool": false,
+				"number": 1
 			}`),
 			RequestHeaders: map[string]string{
 				"Authorization": "Admin eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjJiNGE5N2NjLTNmODMtNGQwMS1hMjZiLTNkNzdiYzg0MmQzYyIsInR5cGUiOiJhZG1pbiIsImV4cCI6MTg3MzQ2Mjc5Mn0.AtRtXR6FHBrCUGkj5OffhmxLbSZaQ4L_Qgw4gfoHyfo",
@@ -712,6 +720,7 @@ func TestRecordCreate(t *testing.T) {
 				`"manyrels":["577bd676-aacb-4072-b7da-99d00ee210a4"]`,
 				`"text":"test123"`,
 				`"bool":false`,
+				`"number":1`,
 			},
 			ExpectedEvents: map[string]int{
 				"OnRecordBeforeCreateRequest": 1,
@@ -867,7 +876,8 @@ func TestRecordUpdate(t *testing.T) {
 			Method: http.MethodPatch,
 			Url:    "/api/collections/demo2/records/63c2ab80-84ab-4057-a592-4604a731f78f",
 			Body: strings.NewReader(`{
-				"text":"test_new"
+				"text":"test_new",
+				"number":1
 			}`),
 			RequestHeaders: map[string]string{
 				"Authorization": "Admin eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjJiNGE5N2NjLTNmODMtNGQwMS1hMjZiLTNkNzdiYzg0MmQzYyIsInR5cGUiOiJhZG1pbiIsImV4cCI6MTg3MzQ2Mjc5Mn0.AtRtXR6FHBrCUGkj5OffhmxLbSZaQ4L_Qgw4gfoHyfo",
@@ -876,6 +886,7 @@ func TestRecordUpdate(t *testing.T) {
 			ExpectedContent: []string{
 				`"id":"63c2ab80-84ab-4057-a592-4604a731f78f"`,
 				`"text":"test_new"`,
+				`"number":1`,
 			},
 			ExpectedEvents: map[string]int{
 				"OnRecordBeforeUpdateRequest": 1,

core/base.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"errors"
+	"log"
 	"os"
 	"path/filepath"
 	"time"
@@ -123,7 +124,7 @@ type BaseApp struct {
 //
 // To initialize the app, you need to call `app.Bootsrap()`.
 func NewBaseApp(dataDir string, encryptionEnv string, isDebug bool) *BaseApp {
-	return &BaseApp{
+	app := &BaseApp{
 		dataDir:             dataDir,
 		isDebug:             isDebug,
 		encryptionEnv:       encryptionEnv,
@@ -209,6 +210,10 @@ func NewBaseApp(dataDir string, encryptionEnv string, isDebug bool) *BaseApp {
 		onCollectionBeforeDeleteRequest: &hook.Hook[*CollectionDeleteEvent]{},
 		onCollectionAfterDeleteRequest:  &hook.Hook[*CollectionDeleteEvent]{},
 	}
+
+	app.registerDefaultHooks()
+
+	return app
 }
 
 // Bootstrap initializes the application
@@ -750,3 +755,33 @@ func (app *BaseApp) createDao(db dbx.Builder) *daos.Dao {
 
 	return dao
 }
+
+func (app *BaseApp) registerDefaultHooks() {
+	deletePrefix := func(prefix string) error {
+		fs, err := app.NewFilesystem()
+		if err != nil {
+			return err
+		}
+		defer fs.Close()
+
+		failed := fs.DeletePrefix(prefix)
+		if len(failed) > 0 {
+			return errors.New("Failed to delete the files at " + prefix)
+		}
+
+		return nil
+	}
+
+	// delete storage files from deleted Collection, Records, etc.
+	app.OnModelAfterDelete().Add(func(e *ModelEvent) error {
+		if m, ok := e.Model.(models.FilesManager); ok && m.BaseFilesPath() != "" {
+			if err := deletePrefix(m.BaseFilesPath()); err != nil && app.IsDebug() {
+				// non critical error - only log for debug
+				// (usually could happen because of S3 api limits)
+				log.Println(err)
+			}
+		}
+
+		return nil
+	})
+}

daos/base.go

@@ -115,9 +115,8 @@ func (dao *Dao) Delete(m models.Model) error {
 		}
 	}
 
-	deleteErr := dao.db.Model(m).Delete()
-	if deleteErr != nil {
-		return deleteErr
+	if err := dao.db.Model(m).Delete(); err != nil {
+		return err
 	}
 
 	if dao.AfterDeleteFunc != nil {
@@ -162,8 +161,7 @@ func (dao *Dao) update(m models.Model) error {
 			return err
 		}
 	} else {
-		err := dao.db.Model(m).Update()
-		if err != nil {
+		if err := dao.db.Model(m).Update(); err != nil {
 			return err
 		}
 	}
@@ -203,8 +201,7 @@ func (dao *Dao) create(m models.Model) error {
 			return err
 		}
 	} else {
-		err := dao.db.Model(m).Insert()
-		if err != nil {
+		if err := dao.db.Model(m).Insert(); err != nil {
 			return err
 		}
 	}

daos/param.go

@@ -40,7 +40,7 @@ func (dao *Dao) SaveParam(key string, value any, optEncryptionKey ...string) err
 		param = &models.Param{Key: key}
 	}
 
-	var normalizedValue any
+	normalizedValue := value
 
 	// encrypt if optEncryptionKey is set
 	if len(optEncryptionKey) > 0 && optEncryptionKey[0] != "" {
@@ -55,8 +55,6 @@ func (dao *Dao) SaveParam(key string, value any, optEncryptionKey ...string) err
 		}
 
 		normalizedValue = encryptVal
-	} else {
-		normalizedValue = value
 	}
 
 	encodedValue := types.JsonRaw{}

daos/record.go

@@ -9,6 +9,7 @@ import (
 	"github.com/pocketbase/pocketbase/models"
 	"github.com/pocketbase/pocketbase/models/schema"
 	"github.com/pocketbase/pocketbase/tools/list"
+	"github.com/pocketbase/pocketbase/tools/security"
 	"github.com/pocketbase/pocketbase/tools/types"
 )
 
@@ -329,23 +330,44 @@ func (dao *Dao) SyncRecordTableSchema(newCollection *models.Collection, oldColle
 		}
 
 		// check for new or renamed columns
+		toRename := map[string]string{}
 		for _, field := range newSchema.Fields() {
 			oldField := oldSchema.GetFieldById(field.Id)
-			if oldField != nil {
-				// rename
-				_, err := txDao.DB().RenameColumn(newTableName, oldField.Name, field.Name).Execute()
+			// Note:
+			// We are using a temporary column name when adding or renaming columns
+			// to ensure that there are no name collisions in case there is
+			// names switch/reuse of existing columns (eg. name, title -> title, name).
+			// This way we are always doing 1 more rename operation but it provides better dev experience.
+
+			if oldField == nil {
+				tempName := field.Name + security.RandomString(5)
+				toRename[tempName] = field.Name
+
+				// add
+				_, err := txDao.DB().AddColumn(newTableName, tempName, field.ColDefinition()).Execute()
 				if err != nil {
 					return err
 				}
-			} else {
-				// add
-				_, err := txDao.DB().AddColumn(newTableName, field.Name, field.ColDefinition()).Execute()
+			} else if oldField.Name != field.Name {
+				tempName := field.Name + security.RandomString(5)
+				toRename[tempName] = field.Name
+
+				// rename
+				_, err := txDao.DB().RenameColumn(newTableName, oldField.Name, tempName).Execute()
 				if err != nil {
 					return err
 				}
 			}
 		}
 
+		// set the actual columns name
+		for tempName, actualName := range toRename {
+			_, err := txDao.DB().RenameColumn(newTableName, tempName, actualName).Execute()
+			if err != nil {
+				return err
+			}
+		}
+
 		return nil
 	})
 }

daos/record_expand.go

@@ -64,7 +64,7 @@ func (dao *Dao) expandRecords(records []*models.Record, expandPath string, fetch
 	}
 
 	// extract the id of the relations to expand
-	relIds := []string{}
+	relIds := make([]string, 0, len(records))
 	for _, record := range records {
 		relIds = append(relIds, record.GetStringSliceDataValue(relField.Name)...)
 	}
@@ -92,7 +92,7 @@ func (dao *Dao) expandRecords(records []*models.Record, expandPath string, fetch
 	for _, model := range records {
 		relIds := model.GetStringSliceDataValue(relField.Name)
 
-		validRels := []*models.Record{}
+		validRels := make([]*models.Record, 0, len(relIds))
 		for _, id := range relIds {
 			if rel, ok := indexedRels[id]; ok {
 				validRels = append(validRels, rel)
@@ -120,20 +120,18 @@ func (dao *Dao) expandRecords(records []*models.Record, expandPath string, fetch
 // normalizeExpands normalizes expand strings and merges self containing paths
 // (eg. ["a.b.c", "a.b", "   test  ", "  ", "test"] -> ["a.b.c", "test"]).
 func normalizeExpands(paths []string) []string {
-	result := []string{}
-
 	// normalize paths
-	normalized := []string{}
+	normalized := make([]string, 0, len(paths))
 	for _, p := range paths {
-		p := strings.ReplaceAll(p, " ", "") // replace spaces
-		p = strings.Trim(p, ".")            // trim incomplete paths
-		if p == "" {
-			continue
+		p = strings.ReplaceAll(p, " ", "") // replace spaces
+		p = strings.Trim(p, ".")           // trim incomplete paths
+		if p != "" {
+			normalized = append(normalized, p)
 		}
-		normalized = append(normalized, p)
 	}
 
 	// merge containing paths
+	result := make([]string, 0, len(normalized))
 	for i, p1 := range normalized {
 		var skip bool
 		for j, p2 := range normalized {

daos/user.go

@@ -43,10 +43,10 @@ func (dao *Dao) LoadProfiles(users []*models.User) error {
 	}
 
 	// extract user ids
-	ids := []string{}
+	ids := make([]string, len(users))
 	usersMap := map[string]*models.User{}
-	for _, user := range users {
-		ids = append(ids, user.Id)
+	for i, user := range users {
+		ids[i] = user.Id
 		usersMap[user.Id] = user
 	}
 

forms/collection_upsert.go

@@ -78,7 +78,6 @@ func (form *CollectionUpsert) Validate() error {
 			&form.Schema,
 			validation.By(form.ensureNoSystemFieldsChange),
 			validation.By(form.ensureNoFieldsTypeChange),
-			validation.By(form.ensureNoFieldsNameReuse),
 		),
 		validation.Field(&form.ListRule, validation.By(form.checkRule)),
 		validation.Field(&form.ViewRule, validation.By(form.checkRule)),
@@ -154,20 +153,6 @@ func (form *CollectionUpsert) ensureNoSystemFieldsChange(value any) error {
 	return nil
 }
 
-func (form *CollectionUpsert) ensureNoFieldsNameReuse(value any) error {
-	v, _ := value.(schema.Schema)
-
-	for _, field := range v.Fields() {
-		oldField := form.collection.Schema.GetFieldByName(field.Name)
-
-		if oldField != nil && oldField.Id != field.Id {
-			return validation.NewError("validation_field_old_field_exist", "Cannot use existing schema field names when renaming fields.")
-		}
-	}
-
-	return nil
-}
-
 func (form *CollectionUpsert) checkRule(value any) error {
 	v, _ := value.(*string)
 

forms/collection_upsert_test.go

@@ -261,7 +261,7 @@ func TestCollectionUpsertSubmit(t *testing.T) {
 			}`,
 			[]string{"schema"},
 		},
-		// update failure - rename fields to existing field names (aka. reusing field names)
+		// update success - rename fields to existing field names (aka. reusing field names)
 		{
 			"test_new",
 			`{
@@ -270,7 +270,7 @@ func TestCollectionUpsertSubmit(t *testing.T) {
 					{"id":"b123456","name":"test1","type":"email"}
 				]
 			}`,
-			[]string{"schema"},
+			[]string{},
 		},
 		// update failure - existing name
 		{

forms/record_upsert.go

@@ -150,76 +150,77 @@ func (form *RecordUpsert) LoadData(r *http.Request) error {
 		value := extendedData[key]
 		value = field.PrepareValue(value)
 
-		if field.Type == schema.FieldTypeFile {
-			options, _ := field.Options.(*schema.FileOptions)
-			oldNames := list.ToUniqueStringSlice(form.Data[key])
+		if field.Type != schema.FieldTypeFile {
+			form.Data[key] = value
+			continue
+		}
 
-			// delete previously uploaded file(s)
-			if options.MaxSelect == 1 {
-				// search for unset zero indexed key as a fallback
-				indexedKeyValue, hasIndexedKey := extendedData[key+".0"]
+		options, _ := field.Options.(*schema.FileOptions)
+		oldNames := list.ToUniqueStringSlice(form.Data[key])
 
-				if cast.ToString(value) == "" || (hasIndexedKey && cast.ToString(indexedKeyValue) == "") {
-					if len(oldNames) > 0 {
-						form.filesToDelete = append(form.filesToDelete, oldNames...)
-					}
-					form.Data[key] = nil
+		// delete previously uploaded file(s)
+		if options.MaxSelect == 1 {
+			// search for unset zero indexed key as a fallback
+			indexedKeyValue, hasIndexedKey := extendedData[key+".0"]
+
+			if cast.ToString(value) == "" || (hasIndexedKey && cast.ToString(indexedKeyValue) == "") {
+				if len(oldNames) > 0 {
+					form.filesToDelete = append(form.filesToDelete, oldNames...)
 				}
-			} else if options.MaxSelect > 1 {
-				// search for individual file index to delete (eg. "file.0")
-				keyExp, _ := regexp.Compile(`^` + regexp.QuoteMeta(key) + `\.\d+$`)
-				indexesToDelete := []int{}
-				for indexedKey := range extendedData {
-					if keyExp.MatchString(indexedKey) && cast.ToString(extendedData[indexedKey]) == "" {
-						index, indexErr := strconv.Atoi(indexedKey[len(key)+1:])
-						if indexErr != nil || index >= len(oldNames) {
-							continue
-						}
-						indexesToDelete = append(indexesToDelete, index)
-					}
-				}
-
-				// slice to fill only with the non-deleted indexes
-				nonDeleted := []string{}
-				for i, name := range oldNames {
-					// not marked for deletion
-					if !list.ExistInSlice(i, indexesToDelete) {
-						nonDeleted = append(nonDeleted, name)
+				form.Data[key] = ""
+			}
+		} else if options.MaxSelect > 1 {
+			// search for individual file index to delete (eg. "file.0")
+			keyExp, _ := regexp.Compile(`^` + regexp.QuoteMeta(key) + `\.\d+$`)
+			indexesToDelete := make([]int, 0, len(extendedData))
+			for indexedKey := range extendedData {
+				if keyExp.MatchString(indexedKey) && cast.ToString(extendedData[indexedKey]) == "" {
+					index, indexErr := strconv.Atoi(indexedKey[len(key)+1:])
+					if indexErr != nil || index >= len(oldNames) {
 						continue
 					}
-
-					// store the id to actually delete the file later
-					form.filesToDelete = append(form.filesToDelete, name)
+					indexesToDelete = append(indexesToDelete, index)
 				}
-				form.Data[key] = nonDeleted
 			}
 
-			// check if there are any new uploaded form files
-			files, err := rest.FindUploadedFiles(r, key)
-			if err != nil {
-				continue // skip invalid or missing file(s)
-			}
-
-			// refresh oldNames list
-			oldNames = list.ToUniqueStringSlice(form.Data[key])
-
-			if options.MaxSelect == 1 {
-				// delete previous file(s) before replacing
-				if len(oldNames) > 0 {
-					form.filesToDelete = list.ToUniqueStringSlice(append(form.filesToDelete, oldNames...))
+			// slice to fill only with the non-deleted indexes
+			nonDeleted := make([]string, 0, len(oldNames))
+			for i, name := range oldNames {
+				// not marked for deletion
+				if !list.ExistInSlice(i, indexesToDelete) {
+					nonDeleted = append(nonDeleted, name)
+					continue
 				}
-				form.filesToUpload = append(form.filesToUpload, files[0])
-				form.Data[key] = files[0].Name()
-			} else if options.MaxSelect > 1 {
-				// append the id of each uploaded file instance
-				form.filesToUpload = append(form.filesToUpload, files...)
-				for _, file := range files {
-					oldNames = append(oldNames, file.Name())
-				}
-				form.Data[key] = oldNames
+
+				// store the id to actually delete the file later
+				form.filesToDelete = append(form.filesToDelete, name)
 			}
-		} else {
-			form.Data[key] = value
+			form.Data[key] = nonDeleted
+		}
+
+		// check if there are any new uploaded form files
+		files, err := rest.FindUploadedFiles(r, key)
+		if err != nil {
+			continue // skip invalid or missing file(s)
+		}
+
+		// refresh oldNames list
+		oldNames = list.ToUniqueStringSlice(form.Data[key])
+
+		if options.MaxSelect == 1 {
+			// delete previous file(s) before replacing
+			if len(oldNames) > 0 {
+				form.filesToDelete = list.ToUniqueStringSlice(append(form.filesToDelete, oldNames...))
+			}
+			form.filesToUpload = append(form.filesToUpload, files[0])
+			form.Data[key] = files[0].Name()
+		} else if options.MaxSelect > 1 {
+			// append the id of each uploaded file instance
+			form.filesToUpload = append(form.filesToUpload, files...)
+			for _, file := range files {
+				oldNames = append(oldNames, file.Name())
+			}
+			form.Data[key] = oldNames
 		}
 	}
 

forms/record_upsert_test.go

@@ -98,8 +98,8 @@ func TestRecordUpsertLoadDataJson(t *testing.T) {
 	if !ok {
 		t.Fatal("Expect onefile field to be set")
 	}
-	if onefile != nil {
-		t.Fatalf("Expect onefile field to be nil, got %v", onefile)
+	if onefile != "" {
+		t.Fatalf("Expect onefile field to be empty string, got %v", onefile)
 	}
 
 	manyfiles, ok := form.Data["manyfiles"]
@@ -166,8 +166,8 @@ func TestRecordUpsertLoadDataMultipart(t *testing.T) {
 	if !ok {
 		t.Fatal("Expect onefile field to be set")
 	}
-	if onefile != nil {
-		t.Fatalf("Expect onefile field to be nil, got %v", onefile)
+	if onefile != "" {
+		t.Fatalf("Expect onefile field to be empty string, got %v", onefile)
 	}
 
 	manyfiles, ok := form.Data["manyfiles"]

forms/user_oauth2_login.go

@@ -98,35 +98,36 @@ func (form *UserOauth2Login) Submit() (*models.User, *auth.AuthUser, error) {
 				return nil, authData, err
 			}
 		}
-	} else {
-		if !config.AllowRegistrations {
-			// registration of new users is not allowed via the Oauth2 provider
-			return nil, authData, errors.New("Cannot find user with the authorized email.")
-		}
+		return user, authData, nil
+	}
 
-		// create new user
-		user = &models.User{Verified: true}
-		upsertForm := NewUserUpsert(form.app, user)
-		upsertForm.Email = authData.Email
-		upsertForm.Password = security.RandomString(30)
-		upsertForm.PasswordConfirm = upsertForm.Password
+	if !config.AllowRegistrations {
+		// registration of new users is not allowed via the Oauth2 provider
+		return nil, authData, errors.New("Cannot find user with the authorized email.")
+	}
 
-		event := &core.UserOauth2RegisterEvent{
-			User:     user,
-			AuthData: authData,
-		}
+	// create new user
+	user = &models.User{Verified: true}
+	upsertForm := NewUserUpsert(form.app, user)
+	upsertForm.Email = authData.Email
+	upsertForm.Password = security.RandomString(30)
+	upsertForm.PasswordConfirm = upsertForm.Password
 
-		if err := form.app.OnUserBeforeOauth2Register().Trigger(event); err != nil {
-			return nil, authData, err
-		}
+	event := &core.UserOauth2RegisterEvent{
+		User:     user,
+		AuthData: authData,
+	}
 
-		if err := upsertForm.Submit(); err != nil {
-			return nil, authData, err
-		}
+	if err := form.app.OnUserBeforeOauth2Register().Trigger(event); err != nil {
+		return nil, authData, err
+	}
 
-		if err := form.app.OnUserAfterOauth2Register().Trigger(event); err != nil {
-			return nil, authData, err
-		}
+	if err := upsertForm.Submit(); err != nil {
+		return nil, authData, err
+	}
+
+	if err := form.app.OnUserAfterOauth2Register().Trigger(event); err != nil {
+		return nil, authData, err
 	}
 
 	return user, authData, nil

forms/validators/record_data.go

@@ -240,7 +240,6 @@ func (validator *RecordDataValidator) checkUrlValue(field *schema.SchemaField, v
 
 func (validator *RecordDataValidator) checkDateValue(field *schema.SchemaField, value any) error {
 	val, _ := value.(types.DateTime)
-
 	if val.IsZero() {
 		if field.Required {
 			return requiredErr
@@ -268,6 +267,9 @@ func (validator *RecordDataValidator) checkDateValue(field *schema.SchemaField,
 func (validator *RecordDataValidator) checkSelectValue(field *schema.SchemaField, value any) error {
 	normalizedVal := list.ToUniqueStringSlice(value)
 	if len(normalizedVal) == 0 {
+		if field.Required {
+			return requiredErr
+		}
 		return nil // nothing to check
 	}
 
@@ -302,13 +304,9 @@ func (validator *RecordDataValidator) checkJsonValue(field *schema.SchemaField,
 }
 
 func (validator *RecordDataValidator) checkFileValue(field *schema.SchemaField, value any) error {
-	// normalize value access
-	var names []string
-	switch v := value.(type) {
-	case []string:
-		names = v
-	case string:
-		names = []string{v}
+	names := list.ToUniqueStringSlice(value)
+	if len(names) == 0 && field.Required {
+		return requiredErr
 	}
 
 	options, _ := field.Options.(*schema.FileOptions)
@@ -318,12 +316,10 @@ func (validator *RecordDataValidator) checkFileValue(field *schema.SchemaField,
 	}
 
 	// extract the uploaded files
-	files := []*rest.UploadedFile{}
-	if len(validator.uploadedFiles) > 0 {
-		for _, file := range validator.uploadedFiles {
-			if list.ExistInSlice(file.Name(), names) {
-				files = append(files, file)
-			}
+	files := make([]*rest.UploadedFile, 0, len(validator.uploadedFiles))
+	for _, file := range validator.uploadedFiles {
+		if list.ExistInSlice(file.Name(), names) {
+			files = append(files, file)
 		}
 	}
 
@@ -345,16 +341,11 @@ func (validator *RecordDataValidator) checkFileValue(field *schema.SchemaField,
 }
 
 func (validator *RecordDataValidator) checkRelationValue(field *schema.SchemaField, value any) error {
-	// normalize value access
-	var ids []string
-	switch v := value.(type) {
-	case []string:
-		ids = v
-	case string:
-		ids = []string{v}
-	}
-
+	ids := list.ToUniqueStringSlice(value)
 	if len(ids) == 0 {
+		if field.Required {
+			return requiredErr
+		}
 		return nil // nothing to check
 	}
 
@@ -385,16 +376,11 @@ func (validator *RecordDataValidator) checkRelationValue(field *schema.SchemaFie
 }
 
 func (validator *RecordDataValidator) checkUserValue(field *schema.SchemaField, value any) error {
-	// normalize value access
-	var ids []string
-	switch v := value.(type) {
-	case []string:
-		ids = v
-	case string:
-		ids = []string{v}
-	}
-
+	ids := list.ToUniqueStringSlice(value)
 	if len(ids) == 0 {
+		if field.Required {
+			return requiredErr
+		}
 		return nil // nothing to check
 	}
 

forms/validators/record_data_test.go

@@ -89,7 +89,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(text) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -99,7 +99,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check unique constraint",
+			"(text) check unique constraint",
 			map[string]any{
 				"field1": "test",
 				"field2": "test",
@@ -109,7 +109,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check min constraint",
+			"(text) check min constraint",
 			map[string]any{
 				"field1": "test",
 				"field2": "test",
@@ -119,7 +119,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check max constraint",
+			"(text) check max constraint",
 			map[string]any{
 				"field1": "test",
 				"field2": "test",
@@ -129,7 +129,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check pattern constraint",
+			"(text) check pattern constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": "test",
@@ -139,7 +139,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"valid data (only required)",
+			"(text) valid data (only required)",
 			map[string]any{
 				"field2": "test",
 			},
@@ -147,7 +147,7 @@ func TestRecordDataValidatorValidateText(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data (all)",
+			"(text) valid data (all)",
 			map[string]any{
 				"field1": "test",
 				"field2": 12345, // test value cast
@@ -168,7 +168,7 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 	// create new test collection
 	collection := &models.Collection{}
 	collection.Name = "validate_test"
-	min := 1.0
+	min := 0.0
 	max := 150.0
 	collection.Schema = schema.NewSchema(
 		&schema.SchemaField{
@@ -205,7 +205,7 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(number) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -215,17 +215,17 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint + casting",
+			"(number) check required constraint + casting",
 			map[string]any{
 				"field1": "invalid",
 				"field2": "invalid",
 				"field3": "invalid",
 			},
 			nil,
-			[]string{"field2", "field3"},
+			[]string{"field2"},
 		},
 		{
-			"check unique constraint",
+			"(number) check unique constraint",
 			map[string]any{
 				"field1": 123,
 				"field2": 123,
@@ -235,7 +235,7 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check min constraint",
+			"(number) check min constraint",
 			map[string]any{
 				"field1": 0.5,
 				"field2": 1,
@@ -245,7 +245,7 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check max constraint",
+			"(number) check max constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": max,
@@ -255,7 +255,7 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"valid data (only required)",
+			"(number) valid data (only required)",
 			map[string]any{
 				"field2": 1,
 			},
@@ -263,7 +263,7 @@ func TestRecordDataValidatorValidateNumber(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data (all)",
+			"(number) valid data (all)",
 			map[string]any{
 				"field1": nil,
 				"field2": 123, // test value cast
@@ -316,7 +316,7 @@ func TestRecordDataValidatorValidateBool(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(bool) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -326,7 +326,7 @@ func TestRecordDataValidatorValidateBool(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint + casting",
+			"(bool) check required constraint + casting",
 			map[string]any{
 				"field1": "invalid",
 				"field2": "invalid",
@@ -336,7 +336,7 @@ func TestRecordDataValidatorValidateBool(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check unique constraint",
+			"(bool) check unique constraint",
 			map[string]any{
 				"field1": true,
 				"field2": true,
@@ -346,7 +346,7 @@ func TestRecordDataValidatorValidateBool(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"valid data (only required)",
+			"(bool) valid data (only required)",
 			map[string]any{
 				"field2": 1,
 			},
@@ -354,7 +354,7 @@ func TestRecordDataValidatorValidateBool(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data (all)",
+			"(bool) valid data (all)",
 			map[string]any{
 				"field1": false,
 				"field2": true,
@@ -412,7 +412,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(email) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -422,7 +422,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check email format validator",
+			"(email) check email format validator",
 			map[string]any{
 				"field1": "test",
 				"field2": "test.com",
@@ -432,7 +432,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 			[]string{"field1", "field2", "field3"},
 		},
 		{
-			"check unique constraint",
+			"(email) check unique constraint",
 			map[string]any{
 				"field1": "test@example.com",
 				"field2": "test@test.com",
@@ -442,7 +442,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check ExceptDomains constraint",
+			"(email) check ExceptDomains constraint",
 			map[string]any{
 				"field1": "test@example.com",
 				"field2": "test@example.com",
@@ -452,7 +452,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check OnlyDomains constraint",
+			"(email) check OnlyDomains constraint",
 			map[string]any{
 				"field1": "test@test.com",
 				"field2": "test@test.com",
@@ -462,7 +462,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"valid data (only required)",
+			"(email) valid data (only required)",
 			map[string]any{
 				"field2": "test@test.com",
 			},
@@ -470,7 +470,7 @@ func TestRecordDataValidatorValidateEmail(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data (all)",
+			"(email) valid data (all)",
 			map[string]any{
 				"field1": "123@example.com",
 				"field2": "test@test.com",
@@ -528,7 +528,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(url) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -538,7 +538,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check url format validator",
+			"(url) check url format validator",
 			map[string]any{
 				"field1": "/abc",
 				"field2": "test.com", // valid
@@ -548,7 +548,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{"field1", "field3"},
 		},
 		{
-			"check unique constraint",
+			"(url) check unique constraint",
 			map[string]any{
 				"field1": "http://example.com",
 				"field2": "http://test.com",
@@ -558,7 +558,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check ExceptDomains constraint",
+			"(url) check ExceptDomains constraint",
 			map[string]any{
 				"field1": "http://example.com",
 				"field2": "http://example.com",
@@ -568,7 +568,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check OnlyDomains constraint",
+			"(url) check OnlyDomains constraint",
 			map[string]any{
 				"field1": "http://test.com/abc",
 				"field2": "http://test.com/abc",
@@ -578,7 +578,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check subdomains constraint",
+			"(url) check subdomains constraint",
 			map[string]any{
 				"field1": "http://test.test.com",
 				"field2": "http://test.example.com",
@@ -588,7 +588,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"valid data (only required)",
+			"(url) valid data (only required)",
 			map[string]any{
 				"field2": "http://sub.test.com/abc",
 			},
@@ -596,7 +596,7 @@ func TestRecordDataValidatorValidateUrl(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data (all)",
+			"(url) valid data (all)",
 			map[string]any{
 				"field1": "http://example.com/123",
 				"field2": "http://test.com/",
@@ -656,7 +656,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(date) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -666,7 +666,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint + cast",
+			"(date) check required constraint + cast",
 			map[string]any{
 				"field1": "invalid",
 				"field2": "invalid",
@@ -676,7 +676,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint + zero datetime",
+			"(date) check required constraint + zero datetime",
 			map[string]any{
 				"field1": "January 1, year 1, 00:00:00 UTC",
 				"field2": "0001-01-01 00:00:00",
@@ -686,7 +686,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check unique constraint",
+			"(date) check unique constraint",
 			map[string]any{
 				"field1": "2029-01-01 01:01:01.123",
 				"field2": "2029-01-01 01:01:01.123",
@@ -696,7 +696,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check min date constraint",
+			"(date) check min date constraint",
 			map[string]any{
 				"field1": "2021-01-01 01:01:01",
 				"field2": "2021-01-01 01:01:01",
@@ -706,7 +706,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check max date constraint",
+			"(date) check max date constraint",
 			map[string]any{
 				"field1": "2030-02-01 01:01:01",
 				"field2": "2030-02-01 01:01:01",
@@ -716,7 +716,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"valid data (only required)",
+			"(date) valid data (only required)",
 			map[string]any{
 				"field2": "2029-01-01 01:01:01",
 			},
@@ -724,7 +724,7 @@ func TestRecordDataValidatorValidateDate(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data (all)",
+			"(date) valid data (all)",
 			map[string]any{
 				"field1": "2029-01-01 01:01:01.000",
 				"field2": "2029-01-01 01:01:01",
@@ -788,7 +788,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint",
+			"(select) check required constraint",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -798,7 +798,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint - empty values",
+			"(select) check required constraint - empty values",
 			map[string]any{
 				"field1": "",
 				"field2": "",
@@ -808,7 +808,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint - multiple select cast",
+			"(select) check required constraint - multiple select cast",
 			map[string]any{
 				"field1": "a",
 				"field2": "a",
@@ -818,7 +818,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{},
 		},
 		{
-			"check unique constraint",
+			"(select) check unique constraint",
 			map[string]any{
 				"field1": "a",
 				"field2": "b",
@@ -828,7 +828,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check unique constraint - same elements but different order",
+			"(select) check unique constraint - same elements but different order",
 			map[string]any{
 				"field1": "a",
 				"field2": "b",
@@ -838,7 +838,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{},
 		},
 		{
-			"check Values constraint",
+			"(select) check Values constraint",
 			map[string]any{
 				"field1": 1,
 				"field2": "d",
@@ -848,7 +848,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{"field2", "field3"},
 		},
 		{
-			"check MaxSelect constraint",
+			"(select) check MaxSelect constraint",
 			map[string]any{
 				"field1": []string{"a", "b"}, // this will be normalized to a single string value
 				"field2": []string{"a", "b", "c"},
@@ -858,7 +858,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"valid data - only required fields",
+			"(select) valid data - only required fields",
 			map[string]any{
 				"field2": []string{"a", "b"},
 			},
@@ -866,7 +866,7 @@ func TestRecordDataValidatorValidateSelect(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data - all fields with normalizations",
+			"(select) valid data - all fields with normalizations",
 			map[string]any{
 				"field1": "a",
 				"field2": []string{"a", "b", "b"}, // will be collapsed
@@ -918,7 +918,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 
 	scenarios := []testDataFieldScenario{
 		{
-			"check required constraint - nil",
+			"(json) check required constraint - nil",
 			map[string]any{
 				"field1": nil,
 				"field2": nil,
@@ -928,7 +928,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint - zero string",
+			"(json) check required constraint - zero string",
 			map[string]any{
 				"field1": "",
 				"field2": "",
@@ -938,7 +938,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{"field2"},
 		},
 		{
-			"check required constraint - zero number",
+			"(json) check required constraint - zero number",
 			map[string]any{
 				"field1": 0,
 				"field2": 0,
@@ -948,7 +948,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{},
 		},
 		{
-			"check required constraint - zero slice",
+			"(json) check required constraint - zero slice",
 			map[string]any{
 				"field1": []string{},
 				"field2": []string{},
@@ -958,7 +958,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{},
 		},
 		{
-			"check required constraint - zero map",
+			"(json) check required constraint - zero map",
 			map[string]any{
 				"field1": map[string]string{},
 				"field2": map[string]string{},
@@ -968,7 +968,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{},
 		},
 		{
-			"check unique constraint",
+			"(json) check unique constraint",
 			map[string]any{
 				"field1": `{"test":123}`,
 				"field2": `{"test":123}`,
@@ -978,7 +978,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{"field3"},
 		},
 		{
-			"check json text validator",
+			"(json) check json text validator",
 			map[string]any{
 				"field1": `[1, 2, 3`,
 				"field2": `invalid`,
@@ -988,7 +988,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{"field1", "field2"},
 		},
 		{
-			"valid data - only required fields",
+			"(json) valid data - only required fields",
 			map[string]any{
 				"field2": `{"test":123}`,
 			},
@@ -996,7 +996,7 @@ func TestRecordDataValidatorValidateJson(t *testing.T) {
 			[]string{},
 		},
 		{
-			"valid data - all fields with normalizations",
+			"(json) valid data - all fields with normalizations",
 			map[string]any{
 				"field1": []string{"a", "b", "c"},
 				"field2": 123,

models/base.go

@@ -15,6 +15,12 @@ type ColumnValueMapper interface {
 	ColumnValueMap() map[string]any
 }
 
+// FilesManager defines an interface with common methods that files manager models should implement.
+type FilesManager interface {
+	// BaseFilesPath returns the storage dir path used by the interface instance.
+	BaseFilesPath() string
+}
+
 // Model defines an interface with common methods that all db models should have.
 type Model interface {
 	TableName() string
@@ -71,7 +77,7 @@ func (m *BaseModel) RefreshCreated() {
 	m.Created = types.NowDateTime()
 }
 
-// RefreshUpdated updates the model's Created field with the current datetime.
+// RefreshUpdated updates the model's Updated field with the current datetime.
 func (m *BaseModel) RefreshUpdated() {
 	m.Updated = types.NowDateTime()
 }

models/collection.go

@@ -3,6 +3,7 @@ package models
 import "github.com/pocketbase/pocketbase/models/schema"
 
 var _ Model = (*Collection)(nil)
+var _ FilesManager = (*Collection)(nil)
 
 type Collection struct {
 	BaseModel

models/record.go

@@ -16,6 +16,7 @@ import (
 
 var _ Model = (*Record)(nil)
 var _ ColumnValueMapper = (*Record)(nil)
+var _ FilesManager = (*Record)(nil)
 
 type Record struct {
 	BaseModel
@@ -68,10 +69,10 @@ func NewRecordFromNullStringMap(collection *Collection, data dbx.NullStringMap)
 // NewRecordsFromNullStringMaps initializes a new Record model for
 // each row in the provided NullStringMap slice.
 func NewRecordsFromNullStringMaps(collection *Collection, rows []dbx.NullStringMap) []*Record {
-	result := []*Record{}
+	result := make([]*Record, len(rows))
 
-	for _, row := range rows {
-		result = append(result, NewRecordFromNullStringMap(collection, row))
+	for i, row := range rows {
+		result[i] = NewRecordFromNullStringMap(collection, row)
 	}
 
 	return result

models/record_test.go

@@ -118,7 +118,7 @@ func TestNewRecordFromNullStringMap(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expected := `{"@collectionId":"","@collectionName":"test","created":"2022-01-01 10:00:00.123","field1":"test","field2":null,"field3":true,"field4":123.123,"field5":"test1","field6":["test"],"id":"c23eb053-d07e-4fbe-86b3-b8ac31982e9a","updated":"2022-01-01 10:00:00.456"}`
+	expected := `{"@collectionId":"","@collectionName":"test","created":"2022-01-01 10:00:00.123","field1":"test","field2":"","field3":true,"field4":123.123,"field5":"test1","field6":["test"],"id":"c23eb053-d07e-4fbe-86b3-b8ac31982e9a","updated":"2022-01-01 10:00:00.456"}`
 
 	if string(encoded) != expected {
 		t.Fatalf("Expected %v, got \n%v", expected, string(encoded))
@@ -185,10 +185,10 @@ func TestNewRecordsFromNullStringMaps(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expected := `[{"@collectionId":"","@collectionName":"test","created":"2022-01-01 10:00:00.123","field1":"test1","field2":null,"id":"11111111-d07e-4fbe-86b3-b8ac31982e9a","updated":"2022-01-01 10:00:00.456"},{"@collectionId":"","@collectionName":"test","created":"","field1":"test2","field2":123,"id":"22222222-d07e-4fbe-86b3-b8ac31982e9a","updated":""}]`
+	expected := `[{"@collectionId":"","@collectionName":"test","created":"2022-01-01 10:00:00.123","field1":"test1","field2":0,"id":"11111111-d07e-4fbe-86b3-b8ac31982e9a","updated":"2022-01-01 10:00:00.456"},{"@collectionId":"","@collectionName":"test","created":"","field1":"test2","field2":123,"id":"22222222-d07e-4fbe-86b3-b8ac31982e9a","updated":""}]`
 
 	if string(encoded) != expected {
-		t.Fatalf("Expected %v, got \n%v", expected, string(encoded))
+		t.Fatalf("Expected \n%v, got \n%v", expected, string(encoded))
 	}
 }
 

models/schema/schema_field.go

@@ -218,31 +218,19 @@ func (f *SchemaField) PrepareValue(value any) any {
 	f.InitOptions()
 
 	switch f.Type {
-	case FieldTypeText, FieldTypeEmail, FieldTypeUrl: // string
-		if value == nil {
-			return nil
-		}
+	case FieldTypeText, FieldTypeEmail, FieldTypeUrl:
 		return cast.ToString(value)
-	case FieldTypeJson: // string
-		if value == nil {
-			return nil
-		}
+	case FieldTypeJson:
 		val, _ := types.ParseJsonRaw(value)
 		return val
-	case FieldTypeNumber: // nil, int or float
-		if value == nil {
-			return nil
-		}
+	case FieldTypeNumber:
 		return cast.ToFloat64(value)
-	case FieldTypeBool: // bool
+	case FieldTypeBool:
 		return cast.ToBool(value)
-	case FieldTypeDate: // string, DateTime or time.Time
-		if value == nil {
-			return nil
-		}
+	case FieldTypeDate:
 		val, _ := types.ParseDateTime(value)
 		return val
-	case FieldTypeSelect: // nil, string or slice of strings
+	case FieldTypeSelect:
 		val := list.ToUniqueStringSlice(value)
 
 		options, _ := f.Options.(*SelectOptions)
@@ -250,11 +238,11 @@ func (f *SchemaField) PrepareValue(value any) any {
 			if len(val) > 0 {
 				return val[0]
 			}
-			return nil
+			return ""
 		}
 
 		return val
-	case FieldTypeFile: // nil, string or slice of strings
+	case FieldTypeFile:
 		val := list.ToUniqueStringSlice(value)
 
 		options, _ := f.Options.(*FileOptions)
@@ -262,11 +250,11 @@ func (f *SchemaField) PrepareValue(value any) any {
 			if len(val) > 0 {
 				return val[0]
 			}
-			return nil
+			return ""
 		}
 
 		return val
-	case FieldTypeRelation: // nil, string or slice of strings
+	case FieldTypeRelation:
 		ids := list.ToUniqueStringSlice(value)
 
 		options, _ := f.Options.(*RelationOptions)
@@ -274,11 +262,11 @@ func (f *SchemaField) PrepareValue(value any) any {
 			if len(ids) > 0 {
 				return ids[0]
 			}
-			return nil
+			return ""
 		}
 
 		return ids
-	case FieldTypeUser: // nil, string or slice of strings
+	case FieldTypeUser:
 		ids := list.ToUniqueStringSlice(value)
 
 		options, _ := f.Options.(*UserOptions)
@@ -286,7 +274,7 @@ func (f *SchemaField) PrepareValue(value any) any {
 			if len(ids) > 0 {
 				return ids[0]
 			}
-			return nil
+			return ""
 		}
 
 		return ids

models/schema/schema_field_test.go

@@ -498,19 +498,22 @@ func TestSchemaFieldPrepareValue(t *testing.T) {
 		{schema.SchemaField{Type: "unknown"}, []int{1, 2, 1}, "[1,2,1]"},
 
 		// text
-		{schema.SchemaField{Type: schema.FieldTypeText}, nil, `null`},
+		{schema.SchemaField{Type: schema.FieldTypeText}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeText}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeText}, []int{1, 2}, `""`},
 		{schema.SchemaField{Type: schema.FieldTypeText}, "test", `"test"`},
 		{schema.SchemaField{Type: schema.FieldTypeText}, 123, `"123"`},
 
 		// email
-		{schema.SchemaField{Type: schema.FieldTypeEmail}, nil, `null`},
+		{schema.SchemaField{Type: schema.FieldTypeEmail}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeEmail}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeEmail}, []int{1, 2}, `""`},
 		{schema.SchemaField{Type: schema.FieldTypeEmail}, "test", `"test"`},
 		{schema.SchemaField{Type: schema.FieldTypeEmail}, 123, `"123"`},
 
 		// url
-		{schema.SchemaField{Type: schema.FieldTypeUrl}, nil, `null`},
+		{schema.SchemaField{Type: schema.FieldTypeUrl}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeUrl}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeUrl}, []int{1, 2}, `""`},
 		{schema.SchemaField{Type: schema.FieldTypeUrl}, "test", `"test"`},
 		{schema.SchemaField{Type: schema.FieldTypeUrl}, 123, `"123"`},
@@ -523,7 +526,9 @@ func TestSchemaFieldPrepareValue(t *testing.T) {
 		{schema.SchemaField{Type: schema.FieldTypeJson}, []int{1, 2, 1}, `[1,2,1]`},
 
 		// number
-		{schema.SchemaField{Type: schema.FieldTypeNumber}, nil, "null"},
+		{schema.SchemaField{Type: schema.FieldTypeNumber}, nil, "0"},
+		{schema.SchemaField{Type: schema.FieldTypeNumber}, "", "0"},
+		{schema.SchemaField{Type: schema.FieldTypeNumber}, "test", "0"},
 		{schema.SchemaField{Type: schema.FieldTypeNumber}, 1, "1"},
 		{schema.SchemaField{Type: schema.FieldTypeNumber}, 1.5, "1.5"},
 		{schema.SchemaField{Type: schema.FieldTypeNumber}, "1.5", "1.5"},
@@ -533,22 +538,24 @@ func TestSchemaFieldPrepareValue(t *testing.T) {
 		{schema.SchemaField{Type: schema.FieldTypeBool}, 1, "true"},
 		{schema.SchemaField{Type: schema.FieldTypeBool}, 0, "false"},
 		{schema.SchemaField{Type: schema.FieldTypeBool}, "", "false"},
+		{schema.SchemaField{Type: schema.FieldTypeBool}, "test", "false"},
 		{schema.SchemaField{Type: schema.FieldTypeBool}, "false", "false"},
 		{schema.SchemaField{Type: schema.FieldTypeBool}, "true", "true"},
 		{schema.SchemaField{Type: schema.FieldTypeBool}, false, "false"},
 		{schema.SchemaField{Type: schema.FieldTypeBool}, true, "true"},
 
 		// date
-		{schema.SchemaField{Type: schema.FieldTypeDate}, nil, "null"},
+		{schema.SchemaField{Type: schema.FieldTypeDate}, nil, `""`},
 		{schema.SchemaField{Type: schema.FieldTypeDate}, "", `""`},
+		{schema.SchemaField{Type: schema.FieldTypeDate}, "test", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeDate}, 1641024040, `"2022-01-01 08:00:40.000"`},
 		{schema.SchemaField{Type: schema.FieldTypeDate}, "2022-01-01 11:27:10.123", `"2022-01-01 11:27:10.123"`},
 		{schema.SchemaField{Type: schema.FieldTypeDate}, types.DateTime{}, `""`},
 		{schema.SchemaField{Type: schema.FieldTypeDate}, time.Time{}, `""`},
 
 		// select (single)
-		{schema.SchemaField{Type: schema.FieldTypeSelect}, nil, `null`},
-		{schema.SchemaField{Type: schema.FieldTypeSelect}, "", `null`},
+		{schema.SchemaField{Type: schema.FieldTypeSelect}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeSelect}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeSelect}, 123, `"123"`},
 		{schema.SchemaField{Type: schema.FieldTypeSelect}, "test", `"test"`},
 		{schema.SchemaField{Type: schema.FieldTypeSelect}, []string{"test1", "test2"}, `"test1"`},
@@ -624,8 +631,8 @@ func TestSchemaFieldPrepareValue(t *testing.T) {
 		},
 
 		// file (single)
-		{schema.SchemaField{Type: schema.FieldTypeFile}, nil, `null`},
-		{schema.SchemaField{Type: schema.FieldTypeFile}, "", `null`},
+		{schema.SchemaField{Type: schema.FieldTypeFile}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeFile}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeFile}, 123, `"123"`},
 		{schema.SchemaField{Type: schema.FieldTypeFile}, "test", `"test"`},
 		{schema.SchemaField{Type: schema.FieldTypeFile}, []string{"test1", "test2"}, `"test1"`},
@@ -690,8 +697,8 @@ func TestSchemaFieldPrepareValue(t *testing.T) {
 		},
 
 		// relation (single)
-		{schema.SchemaField{Type: schema.FieldTypeRelation}, nil, `null`},
-		{schema.SchemaField{Type: schema.FieldTypeRelation}, "", `null`},
+		{schema.SchemaField{Type: schema.FieldTypeRelation}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeRelation}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeRelation}, 123, `"123"`},
 		{schema.SchemaField{Type: schema.FieldTypeRelation}, "abc", `"abc"`},
 		{schema.SchemaField{Type: schema.FieldTypeRelation}, "1ba88b4f-e9da-42f0-9764-9a55c953e724", `"1ba88b4f-e9da-42f0-9764-9a55c953e724"`},
@@ -761,8 +768,8 @@ func TestSchemaFieldPrepareValue(t *testing.T) {
 		},
 
 		// user (single)
-		{schema.SchemaField{Type: schema.FieldTypeUser}, nil, `null`},
-		{schema.SchemaField{Type: schema.FieldTypeUser}, "", `null`},
+		{schema.SchemaField{Type: schema.FieldTypeUser}, nil, `""`},
+		{schema.SchemaField{Type: schema.FieldTypeUser}, "", `""`},
 		{schema.SchemaField{Type: schema.FieldTypeUser}, 123, `"123"`},
 		{schema.SchemaField{Type: schema.FieldTypeUser}, "1ba88b4f-e9da-42f0-9764-9a55c953e724", `"1ba88b4f-e9da-42f0-9764-9a55c953e724"`},
 		{

models/user.go

@@ -9,10 +9,10 @@ import (
 var _ Model = (*User)(nil)
 
 const (
-	// The name of the system user profiles collection.
+	// ProfileCollectionName is the name of the system user profiles collection.
 	ProfileCollectionName = "profiles"
 
-	// The name of the user field from the system user profiles collection.
+	// ProfileCollectionUserFieldName is the name of the user field from the system user profiles collection.
 	ProfileCollectionUserFieldName = "userId"
 )
 

resolvers/record_field_resolver.go

@@ -168,7 +168,7 @@ func (r *RecordFieldResolver) Resolve(fieldName string) (resultName string, plac
 			return "", nil, fmt.Errorf("Failed to find field %q collection.", prop)
 		}
 		newCollectionName := relCollection.Name
-		newTableAlias := (currentTableAlias + "_" + field.Name)
+		newTableAlias := currentTableAlias + "_" + field.Name
 
 		r.addJoin(
 			newCollectionName,

tests/api.go

@@ -48,7 +48,7 @@ func (scenario *ApiScenario) Test(t *testing.T) {
 	recorder := httptest.NewRecorder()
 	req := httptest.NewRequest(scenario.Method, scenario.Url, scenario.Body)
 
-	// add middeware to timeout long running requests (eg. keep-alive routes)
+	// add middleware to timeout long-running requests (eg. keep-alive routes)
 	e.Pre(func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
 			ctx, cancelFunc := context.WithTimeout(c.Request().Context(), 100*time.Millisecond)

tools/auth/base_provider.go

@@ -3,6 +3,7 @@ package auth
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
@@ -120,6 +121,16 @@ func (p *baseProvider) FetchRawUserData(token *oauth2.Token, result any) error {
 		return err
 	}
 
+	// http.Client.Get doesn't treat non 2xx responses as error
+	if response.StatusCode >= 400 {
+		return fmt.Errorf(
+			"Failed to fetch OAuth2 user profile via %s (%d):\n%s",
+			p.userApiUrl,
+			response.StatusCode,
+			string(content),
+		)
+	}
+
 	return json.Unmarshal(content, &result)
 }
 

tools/filesystem/filesystem.go

@@ -153,7 +153,7 @@ func (s *System) DeletePrefix(prefix string) []error {
 	// (this operation usually is optional and there is no need to strictly check the result)
 	// ---
 	// fill dirs slice
-	dirs := []string{}
+	dirs := make([]string, 0, len(dirsMap))
 	for d := range dirsMap {
 		dirs = append(dirs, d)
 	}

tools/hook/hook.go

@@ -44,7 +44,9 @@ func (h *Hook[T]) Reset() {
 // - any non-nil error is returned in one of the handlers
 func (h *Hook[T]) Trigger(data T, oneOffHandlers ...Handler[T]) error {
 	h.mux.Lock()
-	handlers := append(h.handlers, oneOffHandlers...) //nolint:gocritic
+	handlers := make([]Handler[T], 0, len(h.handlers)+len(oneOffHandlers))
+	handlers = append(handlers, h.handlers...)
+	handlers = append(handlers, oneOffHandlers...)
 	// unlock is not deferred to avoid deadlocks when Trigger is called recursive by the handlers
 	h.mux.Unlock()
 

tools/inflector/inflector.go

@@ -32,15 +32,14 @@ func Sentenize(str string) string {
 		return ""
 	}
 
-	s := []rune(str)
-	sentence := string(unicode.ToUpper(s[0])) + string(s[1:])
+	str = UcFirst(str)
 
-	lastChar := string(s[len(s)-1:])
+	lastChar := str[len(str)-1:]
 	if lastChar != "." && lastChar != "?" && lastChar != "!" {
-		return sentence + "."
+		return str + "."
 	}
 
-	return sentence
+	return str
 }
 
 // Sanitize sanitizes `str` by removing all characters satisfying `removePattern`.

tools/inflector/inflector_test.go

@@ -12,6 +12,7 @@ func TestUcFirst(t *testing.T) {
 		expected string
 	}{
 		{"", ""},
+		{" ", " "},
 		{"Test", "Test"},
 		{"test", "Test"},
 		{"test test2", "Test test2"},
@@ -55,6 +56,9 @@ func TestSentenize(t *testing.T) {
 	}{
 		{"", ""},
 		{"   ", ""},
+		{".", "."},
+		{"?", "?"},
+		{"!", "!"},
 		{"Test", "Test."},
 		{" test ", "Test."},
 		{"hello world", "Hello world."},

tools/search/filter.go

@@ -89,30 +89,18 @@ func (f FilterData) resolveTokenizedExpr(expr fexpr.Expr, fieldResolver FieldRes
 
 	// merge both operands parameters (if any)
 	params := dbx.Params{}
-	if len(lParams) > 0 {
-		for k, v := range lParams {
-			params[k] = v
-		}
+	for k, v := range lParams {
+		params[k] = v
 	}
-	if len(rParams) > 0 {
-		for k, v := range rParams {
-			params[k] = v
-		}
+	for k, v := range rParams {
+		params[k] = v
 	}
 
 	switch expr.Op {
 	case fexpr.SignEq:
-		op := "="
-		if strings.ToLower(lName) == "null" || strings.ToLower(rName) == "null" {
-			op = "IS"
-		}
-		return dbx.NewExp(fmt.Sprintf("%s %s %s", lName, op, rName), params), nil
+		return dbx.NewExp(fmt.Sprintf("COALESCE(%s, '') = COALESCE(%s, '')", lName, rName), params), nil
 	case fexpr.SignNeq:
-		op := "!="
-		if strings.ToLower(lName) == "null" || strings.ToLower(rName) == "null" {
-			op = "IS NOT"
-		}
-		return dbx.NewExp(fmt.Sprintf("%s %s %s", lName, op, rName), params), nil
+		return dbx.NewExp(fmt.Sprintf("COALESCE(%s, '') != COALESCE(%s, '')", lName, rName), params), nil
 	case fexpr.SignLike:
 		// normalize operands and switch sides if the left operand is a number or text
 		if len(lParams) > 0 {
@@ -139,35 +127,31 @@ func (f FilterData) resolveTokenizedExpr(expr fexpr.Expr, fieldResolver FieldRes
 }
 
 func (f FilterData) resolveToken(token fexpr.Token, fieldResolver FieldResolver) (name string, params dbx.Params, err error) {
-	if token.Type == fexpr.TokenIdentifier {
+	switch token.Type {
+	case fexpr.TokenIdentifier:
 		name, params, err := fieldResolver.Resolve(token.Literal)
 
 		if name == "" || err != nil {
-			// if `null` field is missing, treat `null` identifier as NULL token
-			if strings.ToLower(token.Literal) == "null" {
-				return "NULL", nil, nil
+			m := map[string]string{
+				// if `null` field is missing, treat `null` identifier as NULL token
+				"null": "NULL",
+				// if `true` field is missing, treat `true` identifier as TRUE token
+				"true": "1",
+				// if `false` field is missing, treat `false` identifier as FALSE token
+				"false": "0",
 			}
-
-			// if `true` field is missing, treat `true` identifier as TRUE token
-			if strings.ToLower(token.Literal) == "true" {
-				return "1", nil, nil
+			if v, ok := m[strings.ToLower(token.Literal)]; ok {
+				return v, nil, nil
 			}
-
-			// if `false` field is missing, treat `false` identifier as FALSE token
-			if strings.ToLower(token.Literal) == "false" {
-				return "0", nil, nil
-			}
-
 			return "", nil, err
 		}
 
 		return name, params, err
-	}
-
-	if token.Type == fexpr.TokenNumber || token.Type == fexpr.TokenText {
+	case fexpr.TokenNumber, fexpr.TokenText:
 		placeholder := "t" + security.RandomString(7)
 		name := fmt.Sprintf("{:%s}", placeholder)
 		params := dbx.Params{placeholder: token.Literal}
+
 		return name, params, nil
 	}
 
@@ -177,10 +161,6 @@ func (f FilterData) resolveToken(token fexpr.Token, fieldResolver FieldResolver)
 func (f FilterData) normalizeLikeParams(params dbx.Params) dbx.Params {
 	result := dbx.Params{}
 
-	if len(params) == 0 {
-		return result
-	}
-
 	for k, v := range params {
 		vStr := cast.ToString(v)
 		if !strings.Contains(vStr, "%") {

tools/search/filter_test.go

@@ -39,25 +39,25 @@ func TestFilterDataBuildExpr(t *testing.T) {
 			"^" +
 				regexp.QuoteMeta("((([[test1]] > {:") +
 				".+" +
-				regexp.QuoteMeta("}) OR ([[test2]] != {:") +
+				regexp.QuoteMeta("}) OR (COALESCE([[test2]], '') != COALESCE({:") +
 				".+" +
-				regexp.QuoteMeta("})) AND ([[test3]] LIKE {:") +
+				regexp.QuoteMeta("}, ''))) AND ([[test3]] LIKE {:") +
 				".+" +
-				regexp.QuoteMeta("})) AND ([[test4.sub]] IS NULL)") +
+				regexp.QuoteMeta("})) AND (COALESCE([[test4.sub]], '') = COALESCE(NULL, ''))") +
 				"$",
 		},
 		// combination of special literals (null, true, false)
 		{
 			"test1=true && test2 != false && test3 = null || test4.sub != null",
 			false,
-			"^" + regexp.QuoteMeta("((([[test1]] = 1) AND ([[test2]] != 0)) AND ([[test3]] IS NULL)) OR ([[test4.sub]] IS NOT NULL)") + "$",
+			"^" + regexp.QuoteMeta("(((COALESCE([[test1]], '') = COALESCE(1, '')) AND (COALESCE([[test2]], '') != COALESCE(0, ''))) AND (COALESCE([[test3]], '') = COALESCE(NULL, ''))) OR (COALESCE([[test4.sub]], '') != COALESCE(NULL, ''))") + "$",
 		},
 		// all operators
 		{
 			"(test1 = test2 || test2 != test3) && (test2 ~ 'example' || test2 !~ '%%abc') && 'switch1%%' ~ test1 && 'switch2' !~ test2 && test3 > 1 && test3 >= 0 && test3 <= 4 && 2 < 5",
 			false,
 			"^" +
-				regexp.QuoteMeta("(((((((([[test1]] = [[test2]]) OR ([[test2]] != [[test3]])) AND (([[test2]] LIKE {:") +
+				regexp.QuoteMeta("((((((((COALESCE([[test1]], '') = COALESCE([[test2]], '')) OR (COALESCE([[test2]], '') != COALESCE([[test3]], ''))) AND (([[test2]] LIKE {:") +
 				".+" +
 				regexp.QuoteMeta("}) OR ([[test2]] NOT LIKE {:") +
 				".+" +

tools/search/provider_test.go

@@ -273,8 +273,8 @@ func TestProviderExecNonEmptyQuery(t *testing.T) {
 			false,
 			`{"page":1,"perPage":` + fmt.Sprint(MaxPerPage) + `,"totalItems":1,"items":[{"test1":2,"test2":"test2.2","test3":""}]}`,
 			[]string{
-				"SELECT count(*) FROM `test` WHERE ((NOT (`test1` IS NULL)) AND (test2 IS NOT null)) AND (test1 >= '2') ORDER BY `test1` ASC, `test2` DESC",
-				"SELECT * FROM `test` WHERE ((NOT (`test1` IS NULL)) AND (test2 IS NOT null)) AND (test1 >= '2') ORDER BY `test1` ASC, `test2` DESC LIMIT 200",
+				"SELECT count(*) FROM `test` WHERE ((NOT (`test1` IS NULL)) AND (COALESCE(test2, '') != COALESCE(null, ''))) AND (test1 >= '2') ORDER BY `test1` ASC, `test2` DESC",
+				"SELECT * FROM `test` WHERE ((NOT (`test1` IS NULL)) AND (COALESCE(test2, '') != COALESCE(null, ''))) AND (test1 >= '2') ORDER BY `test1` ASC, `test2` DESC LIMIT 200",
 			},
 		},
 		// valid sort and filter fields (zero results)
@@ -286,8 +286,8 @@ func TestProviderExecNonEmptyQuery(t *testing.T) {
 			false,
 			`{"page":1,"perPage":10,"totalItems":0,"items":[]}`,
 			[]string{
-				"SELECT count(*) FROM `test` WHERE (NOT (`test1` IS NULL)) AND (test3 != '') ORDER BY `test1` ASC, `test3` ASC",
-				"SELECT * FROM `test` WHERE (NOT (`test1` IS NULL)) AND (test3 != '') ORDER BY `test1` ASC, `test3` ASC LIMIT 10",
+				"SELECT count(*) FROM `test` WHERE (NOT (`test1` IS NULL)) AND (COALESCE(test3, '') != COALESCE('', '')) ORDER BY `test1` ASC, `test3` ASC",
+				"SELECT * FROM `test` WHERE (NOT (`test1` IS NULL)) AND (COALESCE(test3, '') != COALESCE('', '')) ORDER BY `test1` ASC, `test3` ASC LIMIT 10",
 			},
 		},
 		// pagination test
@@ -344,7 +344,7 @@ func TestProviderExecNonEmptyQuery(t *testing.T) {
 
 		for _, q := range testDB.CalledQueries {
 			if !list.ExistInSliceWithRegex(q, s.expectQueries) {
-				t.Errorf("(%d) Didn't expect query %v", i, q)
+				t.Errorf("(%d) Didn't expect query \n%v", i, q)
 			}
 		}
 	}

tools/security/encrypt.go

@@ -66,10 +66,5 @@ func Decrypt(cipherText string, key string) ([]byte, error) {
 	}
 
 	nonce, cipherByteClean := cipherByte[:nonceSize], cipherByte[nonceSize:]
-	plainData, err := gcm.Open(nil, nonce, cipherByteClean, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return plainData, nil
+	return gcm.Open(nil, nonce, cipherByteClean, nil)
 }

ui/dist/assets/PageAdminConfirmPasswordReset.0292017c.js

@@ -1,2 +1,2 @@
-import{S as E,i as G,s as I,F as K,c as F,m as B,t as H,a as N,d as T,C as M,w as q,e as c,f as u,g as b,h as _,x as O,o as w,q as J,b as k,r as L,u as h,v as Q,j as U,l as V,A as X,p as W,B as Y,D as Z,z as S}from"./index.85945a65.js";function y(f){let e,o,s;return{c(){e=q("for "),o=c("strong"),s=q(f[3]),u(o,"class","txt-nowrap")},m(l,t){b(l,e,t),b(l,o,t),_(o,s)},p(l,t){t&8&&O(s,l[3])},d(l){l&&w(e),l&&w(o)}}}function x(f){let e,o,s,l,t,r,p,d;return{c(){e=c("label"),o=q("New password"),l=k(),t=c("input"),u(e,"for",s=f[8]),u(t,"type","password"),u(t,"id",r=f[8]),t.required=!0,t.autofocus=!0},m(n,i){b(n,e,i),_(e,o),b(n,l,i),b(n,t,i),S(t,f[0]),t.focus(),p||(d=h(t,"input",f[6]),p=!0)},p(n,i){i&256&&s!==(s=n[8])&&u(e,"for",s),i&256&&r!==(r=n[8])&&u(t,"id",r),i&1&&t.value!==n[0]&&S(t,n[0])},d(n){n&&w(e),n&&w(l),n&&w(t),p=!1,d()}}}function ee(f){let e,o,s,l,t,r,p,d;return{c(){e=c("label"),o=q("New password confirm"),l=k(),t=c("input"),u(e,"for",s=f[8]),u(t,"type","password"),u(t,"id",r=f[8]),t.required=!0},m(n,i){b(n,e,i),_(e,o),b(n,l,i),b(n,t,i),S(t,f[1]),p||(d=h(t,"input",f[7]),p=!0)},p(n,i){i&256&&s!==(s=n[8])&&u(e,"for",s),i&256&&r!==(r=n[8])&&u(t,"id",r),i&2&&t.value!==n[1]&&S(t,n[1])},d(n){n&&w(e),n&&w(l),n&&w(t),p=!1,d()}}}function te(f){let e,o,s,l,t,r,p,d,n,i,g,R,C,v,P,A,j,m=f[3]&&y(f);return r=new J({props:{class:"form-field required",name:"password",$$slots:{default:[x,({uniqueId:a})=>({8:a}),({uniqueId:a})=>a?256:0]},$$scope:{ctx:f}}}),d=new J({props:{class:"form-field required",name:"passwordConfirm",$$slots:{default:[ee,({uniqueId:a})=>({8:a}),({uniqueId:a})=>a?256:0]},$$scope:{ctx:f}}}),{c(){e=c("form"),o=c("div"),s=c("h4"),l=q(`Reset your admin password
-                `),m&&m.c(),t=k(),F(r.$$.fragment),p=k(),F(d.$$.fragment),n=k(),i=c("button"),g=c("span"),g.textContent="Set new password",R=k(),C=c("div"),v=c("a"),v.textContent="Back to login",u(s,"class","m-b-xs"),u(o,"class","content txt-center m-b-sm"),u(g,"class","txt"),u(i,"type","submit"),u(i,"class","btn btn-lg btn-block"),i.disabled=f[2],L(i,"btn-loading",f[2]),u(e,"class","m-b-base"),u(v,"href","/login"),u(v,"class","link-hint"),u(C,"class","content txt-center")},m(a,$){b(a,e,$),_(e,o),_(o,s),_(s,l),m&&m.m(s,null),_(e,t),B(r,e,null),_(e,p),B(d,e,null),_(e,n),_(e,i),_(i,g),b(a,R,$),b(a,C,$),_(C,v),P=!0,A||(j=[h(e,"submit",Q(f[4])),U(V.call(null,v))],A=!0)},p(a,$){a[3]?m?m.p(a,$):(m=y(a),m.c(),m.m(s,null)):m&&(m.d(1),m=null);const z={};$&769&&(z.$$scope={dirty:$,ctx:a}),r.$set(z);const D={};$&770&&(D.$$scope={dirty:$,ctx:a}),d.$set(D),(!P||$&4)&&(i.disabled=a[2]),$&4&&L(i,"btn-loading",a[2])},i(a){P||(H(r.$$.fragment,a),H(d.$$.fragment,a),P=!0)},o(a){N(r.$$.fragment,a),N(d.$$.fragment,a),P=!1},d(a){a&&w(e),m&&m.d(),T(r),T(d),a&&w(R),a&&w(C),A=!1,X(j)}}}function se(f){let e,o;return e=new K({props:{$$slots:{default:[te]},$$scope:{ctx:f}}}),{c(){F(e.$$.fragment)},m(s,l){B(e,s,l),o=!0},p(s,[l]){const t={};l&527&&(t.$$scope={dirty:l,ctx:s}),e.$set(t)},i(s){o||(H(e.$$.fragment,s),o=!0)},o(s){N(e.$$.fragment,s),o=!1},d(s){T(e,s)}}}function le(f,e,o){let s,{params:l}=e,t="",r="",p=!1;async function d(){if(!p){o(2,p=!0);try{await W.Admins.confirmPasswordReset(l==null?void 0:l.token,t,r),Y("Successfully set a new admin password."),Z("/")}catch(g){W.errorResponseHandler(g)}o(2,p=!1)}}function n(){t=this.value,o(0,t)}function i(){r=this.value,o(1,r)}return f.$$set=g=>{"params"in g&&o(5,l=g.params)},f.$$.update=()=>{f.$$.dirty&32&&o(3,s=M.getJWTPayload(l==null?void 0:l.token).email||"")},[t,r,p,s,d,l,n,i]}class ae extends E{constructor(e){super(),G(this,e,le,se,I,{params:5})}}export{ae as default};
+import{S as E,i as G,s as I,F as K,c as F,m as B,t as H,a as N,d as T,C as M,q as J,e as c,w as q,b as k,f as u,r as L,g as b,h as _,u as h,v as O,j as Q,l as U,o as w,A as V,p as W,B as X,D as Y,x as Z,z as S}from"./index.0d48f812.js";function y(f){let e,o,s;return{c(){e=q("for "),o=c("strong"),s=q(f[3]),u(o,"class","txt-nowrap")},m(l,t){b(l,e,t),b(l,o,t),_(o,s)},p(l,t){t&8&&Z(s,l[3])},d(l){l&&w(e),l&&w(o)}}}function x(f){let e,o,s,l,t,r,p,d;return{c(){e=c("label"),o=q("New password"),l=k(),t=c("input"),u(e,"for",s=f[8]),u(t,"type","password"),u(t,"id",r=f[8]),t.required=!0,t.autofocus=!0},m(n,i){b(n,e,i),_(e,o),b(n,l,i),b(n,t,i),S(t,f[0]),t.focus(),p||(d=h(t,"input",f[6]),p=!0)},p(n,i){i&256&&s!==(s=n[8])&&u(e,"for",s),i&256&&r!==(r=n[8])&&u(t,"id",r),i&1&&t.value!==n[0]&&S(t,n[0])},d(n){n&&w(e),n&&w(l),n&&w(t),p=!1,d()}}}function ee(f){let e,o,s,l,t,r,p,d;return{c(){e=c("label"),o=q("New password confirm"),l=k(),t=c("input"),u(e,"for",s=f[8]),u(t,"type","password"),u(t,"id",r=f[8]),t.required=!0},m(n,i){b(n,e,i),_(e,o),b(n,l,i),b(n,t,i),S(t,f[1]),p||(d=h(t,"input",f[7]),p=!0)},p(n,i){i&256&&s!==(s=n[8])&&u(e,"for",s),i&256&&r!==(r=n[8])&&u(t,"id",r),i&2&&t.value!==n[1]&&S(t,n[1])},d(n){n&&w(e),n&&w(l),n&&w(t),p=!1,d()}}}function te(f){let e,o,s,l,t,r,p,d,n,i,g,R,C,v,P,A,j,m=f[3]&&y(f);return r=new J({props:{class:"form-field required",name:"password",$$slots:{default:[x,({uniqueId:a})=>({8:a}),({uniqueId:a})=>a?256:0]},$$scope:{ctx:f}}}),d=new J({props:{class:"form-field required",name:"passwordConfirm",$$slots:{default:[ee,({uniqueId:a})=>({8:a}),({uniqueId:a})=>a?256:0]},$$scope:{ctx:f}}}),{c(){e=c("form"),o=c("div"),s=c("h4"),l=q(`Reset your admin password
+                `),m&&m.c(),t=k(),F(r.$$.fragment),p=k(),F(d.$$.fragment),n=k(),i=c("button"),g=c("span"),g.textContent="Set new password",R=k(),C=c("div"),v=c("a"),v.textContent="Back to login",u(s,"class","m-b-xs"),u(o,"class","content txt-center m-b-sm"),u(g,"class","txt"),u(i,"type","submit"),u(i,"class","btn btn-lg btn-block"),i.disabled=f[2],L(i,"btn-loading",f[2]),u(e,"class","m-b-base"),u(v,"href","/login"),u(v,"class","link-hint"),u(C,"class","content txt-center")},m(a,$){b(a,e,$),_(e,o),_(o,s),_(s,l),m&&m.m(s,null),_(e,t),B(r,e,null),_(e,p),B(d,e,null),_(e,n),_(e,i),_(i,g),b(a,R,$),b(a,C,$),_(C,v),P=!0,A||(j=[h(e,"submit",O(f[4])),Q(U.call(null,v))],A=!0)},p(a,$){a[3]?m?m.p(a,$):(m=y(a),m.c(),m.m(s,null)):m&&(m.d(1),m=null);const z={};$&769&&(z.$$scope={dirty:$,ctx:a}),r.$set(z);const D={};$&770&&(D.$$scope={dirty:$,ctx:a}),d.$set(D),(!P||$&4)&&(i.disabled=a[2]),$&4&&L(i,"btn-loading",a[2])},i(a){P||(H(r.$$.fragment,a),H(d.$$.fragment,a),P=!0)},o(a){N(r.$$.fragment,a),N(d.$$.fragment,a),P=!1},d(a){a&&w(e),m&&m.d(),T(r),T(d),a&&w(R),a&&w(C),A=!1,V(j)}}}function se(f){let e,o;return e=new K({props:{$$slots:{default:[te]},$$scope:{ctx:f}}}),{c(){F(e.$$.fragment)},m(s,l){B(e,s,l),o=!0},p(s,[l]){const t={};l&527&&(t.$$scope={dirty:l,ctx:s}),e.$set(t)},i(s){o||(H(e.$$.fragment,s),o=!0)},o(s){N(e.$$.fragment,s),o=!1},d(s){T(e,s)}}}function le(f,e,o){let s,{params:l}=e,t="",r="",p=!1;async function d(){if(!p){o(2,p=!0);try{await W.Admins.confirmPasswordReset(l==null?void 0:l.token,t,r),X("Successfully set a new admin password."),Y("/")}catch(g){W.errorResponseHandler(g)}o(2,p=!1)}}function n(){t=this.value,o(0,t)}function i(){r=this.value,o(1,r)}return f.$$set=g=>{"params"in g&&o(5,l=g.params)},f.$$.update=()=>{f.$$.dirty&32&&o(3,s=M.getJWTPayload(l==null?void 0:l.token).email||"")},[t,r,p,s,d,l,n,i]}class ae extends E{constructor(e){super(),G(this,e,le,se,I,{params:5})}}export{ae as default};

ui/dist/assets/PageAdminRequestPasswordReset.3bf5709f.js

@@ -1,2 +1,2 @@
-import{S as E,i as M,s as T,F as j,c as H,m as L,t as w,a as y,d as S,b as g,e as _,f as p,g as k,h as d,j as z,l as B,k as N,n as D,o as v,p as C,q as G,r as F,u as A,v as I,w as h,x as J,y as P,z as R}from"./index.85945a65.js";function K(c){let e,s,n,l,t,o,f,m,i,a,b,u;return l=new G({props:{class:"form-field required",name:"email",$$slots:{default:[Q,({uniqueId:r})=>({5:r}),({uniqueId:r})=>r?32:0]},$$scope:{ctx:c}}}),{c(){e=_("form"),s=_("div"),s.innerHTML=`<h4 class="m-b-xs">Forgotten admin password</h4> 
+import{S as E,i as M,s as T,F as j,c as H,m as L,t as w,a as y,d as S,b as g,e as _,f as p,g as k,h as d,j as z,l as B,k as N,n as D,o as v,p as C,q as G,r as F,u as A,v as I,w as h,x as J,y as P,z as R}from"./index.0d48f812.js";function K(c){let e,s,n,l,t,o,f,m,i,a,b,u;return l=new G({props:{class:"form-field required",name:"email",$$slots:{default:[Q,({uniqueId:r})=>({5:r}),({uniqueId:r})=>r?32:0]},$$scope:{ctx:c}}}),{c(){e=_("form"),s=_("div"),s.innerHTML=`<h4 class="m-b-xs">Forgotten admin password</h4> 
                 <p>Enter the email associated with your account and we\u2019ll send you a recovery link:</p>`,n=g(),H(l.$$.fragment),t=g(),o=_("button"),f=_("i"),m=g(),i=_("span"),i.textContent="Send recovery link",p(s,"class","content txt-center m-b-sm"),p(f,"class","ri-mail-send-line"),p(i,"class","txt"),p(o,"type","submit"),p(o,"class","btn btn-lg btn-block"),o.disabled=c[1],F(o,"btn-loading",c[1]),p(e,"class","m-b-base")},m(r,$){k(r,e,$),d(e,s),d(e,n),L(l,e,null),d(e,t),d(e,o),d(o,f),d(o,m),d(o,i),a=!0,b||(u=A(e,"submit",I(c[3])),b=!0)},p(r,$){const q={};$&97&&(q.$$scope={dirty:$,ctx:r}),l.$set(q),(!a||$&2)&&(o.disabled=r[1]),$&2&&F(o,"btn-loading",r[1])},i(r){a||(w(l.$$.fragment,r),a=!0)},o(r){y(l.$$.fragment,r),a=!1},d(r){r&&v(e),S(l),b=!1,u()}}}function O(c){let e,s,n,l,t,o,f,m,i;return{c(){e=_("div"),s=_("div"),s.innerHTML='<i class="ri-checkbox-circle-line"></i>',n=g(),l=_("div"),t=_("p"),o=h("Check "),f=_("strong"),m=h(c[0]),i=h(" for the recovery link."),p(s,"class","icon"),p(f,"class","txt-nowrap"),p(l,"class","content"),p(e,"class","alert alert-success")},m(a,b){k(a,e,b),d(e,s),d(e,n),d(e,l),d(l,t),d(t,o),d(t,f),d(f,m),d(t,i)},p(a,b){b&1&&J(m,a[0])},i:P,o:P,d(a){a&&v(e)}}}function Q(c){let e,s,n,l,t,o,f,m;return{c(){e=_("label"),s=h("Email"),l=g(),t=_("input"),p(e,"for",n=c[5]),p(t,"type","email"),p(t,"id",o=c[5]),t.required=!0,t.autofocus=!0},m(i,a){k(i,e,a),d(e,s),k(i,l,a),k(i,t,a),R(t,c[0]),t.focus(),f||(m=A(t,"input",c[4]),f=!0)},p(i,a){a&32&&n!==(n=i[5])&&p(e,"for",n),a&32&&o!==(o=i[5])&&p(t,"id",o),a&1&&t.value!==i[0]&&R(t,i[0])},d(i){i&&v(e),i&&v(l),i&&v(t),f=!1,m()}}}function U(c){let e,s,n,l,t,o,f,m;const i=[O,K],a=[];function b(u,r){return u[2]?0:1}return e=b(c),s=a[e]=i[e](c),{c(){s.c(),n=g(),l=_("div"),t=_("a"),t.textContent="Back to login",p(t,"href","/login"),p(t,"class","link-hint"),p(l,"class","content txt-center")},m(u,r){a[e].m(u,r),k(u,n,r),k(u,l,r),d(l,t),o=!0,f||(m=z(B.call(null,t)),f=!0)},p(u,r){let $=e;e=b(u),e===$?a[e].p(u,r):(N(),y(a[$],1,1,()=>{a[$]=null}),D(),s=a[e],s?s.p(u,r):(s=a[e]=i[e](u),s.c()),w(s,1),s.m(n.parentNode,n))},i(u){o||(w(s),o=!0)},o(u){y(s),o=!1},d(u){a[e].d(u),u&&v(n),u&&v(l),f=!1,m()}}}function V(c){let e,s;return e=new j({props:{$$slots:{default:[U]},$$scope:{ctx:c}}}),{c(){H(e.$$.fragment)},m(n,l){L(e,n,l),s=!0},p(n,[l]){const t={};l&71&&(t.$$scope={dirty:l,ctx:n}),e.$set(t)},i(n){s||(w(e.$$.fragment,n),s=!0)},o(n){y(e.$$.fragment,n),s=!1},d(n){S(e,n)}}}function W(c,e,s){let n="",l=!1,t=!1;async function o(){if(!l){s(1,l=!0);try{await C.Admins.requestPasswordReset(n),s(2,t=!0)}catch(m){C.errorResponseHandler(m)}s(1,l=!1)}}function f(){n=this.value,s(0,n)}return[n,l,t,o,f]}class Y extends E{constructor(e){super(),M(this,e,W,V,T,{})}}export{Y as default};

ui/dist/assets/PageUserConfirmEmailChange.8fb1af81.js

@@ -1,4 +1,4 @@
-import{S as J,i as M,s as N,F as R,c as S,m as U,t as $,a as v,d as z,C as W,E as Y,g as _,k as j,n as A,o as b,p as F,w as y,e as m,f as d,h as k,x as B,q as D,b as C,r as H,u as E,v as G,y as h,z as T}from"./index.85945a65.js";function I(r){let e,s,t,l,n,o,c,a,i,u,g,q,p=r[3]&&L(r);return o=new D({props:{class:"form-field required",name:"password",$$slots:{default:[O,({uniqueId:f})=>({8:f}),({uniqueId:f})=>f?256:0]},$$scope:{ctx:r}}}),{c(){e=m("form"),s=m("div"),t=m("h4"),l=y(`Type your password to confirm changing your email address
-                    `),p&&p.c(),n=C(),S(o.$$.fragment),c=C(),a=m("button"),i=m("span"),i.textContent="Confirm new email",d(t,"class","m-b-xs"),d(s,"class","content txt-center m-b-sm"),d(i,"class","txt"),d(a,"type","submit"),d(a,"class","btn btn-lg btn-block"),a.disabled=r[1],H(a,"btn-loading",r[1])},m(f,w){_(f,e,w),k(e,s),k(s,t),k(t,l),p&&p.m(t,null),k(e,n),U(o,e,null),k(e,c),k(e,a),k(a,i),u=!0,g||(q=E(e,"submit",G(r[4])),g=!0)},p(f,w){f[3]?p?p.p(f,w):(p=L(f),p.c(),p.m(t,null)):p&&(p.d(1),p=null);const P={};w&769&&(P.$$scope={dirty:w,ctx:f}),o.$set(P),(!u||w&2)&&(a.disabled=f[1]),w&2&&H(a,"btn-loading",f[1])},i(f){u||($(o.$$.fragment,f),u=!0)},o(f){v(o.$$.fragment,f),u=!1},d(f){f&&b(e),p&&p.d(),z(o),g=!1,q()}}}function K(r){let e,s,t,l,n;return{c(){e=m("div"),e.innerHTML=`<div class="icon"><i class="ri-checkbox-circle-line"></i></div> 
+import{S as J,i as M,s as N,F as R,c as S,m as U,t as $,a as v,d as z,C as W,E as Y,g as _,k as j,n as A,o as b,p as F,q as B,e as m,w as y,b as C,f as d,r as H,h as k,u as E,v as D,y as h,x as G,z as T}from"./index.0d48f812.js";function I(r){let e,s,t,l,n,o,c,a,i,u,g,q,p=r[3]&&L(r);return o=new B({props:{class:"form-field required",name:"password",$$slots:{default:[O,({uniqueId:f})=>({8:f}),({uniqueId:f})=>f?256:0]},$$scope:{ctx:r}}}),{c(){e=m("form"),s=m("div"),t=m("h4"),l=y(`Type your password to confirm changing your email address
+                    `),p&&p.c(),n=C(),S(o.$$.fragment),c=C(),a=m("button"),i=m("span"),i.textContent="Confirm new email",d(t,"class","m-b-xs"),d(s,"class","content txt-center m-b-sm"),d(i,"class","txt"),d(a,"type","submit"),d(a,"class","btn btn-lg btn-block"),a.disabled=r[1],H(a,"btn-loading",r[1])},m(f,w){_(f,e,w),k(e,s),k(s,t),k(t,l),p&&p.m(t,null),k(e,n),U(o,e,null),k(e,c),k(e,a),k(a,i),u=!0,g||(q=E(e,"submit",D(r[4])),g=!0)},p(f,w){f[3]?p?p.p(f,w):(p=L(f),p.c(),p.m(t,null)):p&&(p.d(1),p=null);const P={};w&769&&(P.$$scope={dirty:w,ctx:f}),o.$set(P),(!u||w&2)&&(a.disabled=f[1]),w&2&&H(a,"btn-loading",f[1])},i(f){u||($(o.$$.fragment,f),u=!0)},o(f){v(o.$$.fragment,f),u=!1},d(f){f&&b(e),p&&p.d(),z(o),g=!1,q()}}}function K(r){let e,s,t,l,n;return{c(){e=m("div"),e.innerHTML=`<div class="icon"><i class="ri-checkbox-circle-line"></i></div> 
             <div class="content txt-bold"><p>Email address changed</p> 
-                <p>You can now sign in with your new email address.</p></div>`,s=C(),t=m("button"),t.textContent="Close",d(e,"class","alert alert-success"),d(t,"type","button"),d(t,"class","btn btn-secondary btn-block")},m(o,c){_(o,e,c),_(o,s,c),_(o,t,c),l||(n=E(t,"click",r[6]),l=!0)},p:h,i:h,o:h,d(o){o&&b(e),o&&b(s),o&&b(t),l=!1,n()}}}function L(r){let e,s,t;return{c(){e=y("to "),s=m("strong"),t=y(r[3]),d(s,"class","txt-nowrap")},m(l,n){_(l,e,n),_(l,s,n),k(s,t)},p(l,n){n&8&&B(t,l[3])},d(l){l&&b(e),l&&b(s)}}}function O(r){let e,s,t,l,n,o,c,a;return{c(){e=m("label"),s=y("Password"),l=C(),n=m("input"),d(e,"for",t=r[8]),d(n,"type","password"),d(n,"id",o=r[8]),n.required=!0,n.autofocus=!0},m(i,u){_(i,e,u),k(e,s),_(i,l,u),_(i,n,u),T(n,r[0]),n.focus(),c||(a=E(n,"input",r[7]),c=!0)},p(i,u){u&256&&t!==(t=i[8])&&d(e,"for",t),u&256&&o!==(o=i[8])&&d(n,"id",o),u&1&&n.value!==i[0]&&T(n,i[0])},d(i){i&&b(e),i&&b(l),i&&b(n),c=!1,a()}}}function Q(r){let e,s,t,l;const n=[K,I],o=[];function c(a,i){return a[2]?0:1}return e=c(r),s=o[e]=n[e](r),{c(){s.c(),t=Y()},m(a,i){o[e].m(a,i),_(a,t,i),l=!0},p(a,i){let u=e;e=c(a),e===u?o[e].p(a,i):(j(),v(o[u],1,1,()=>{o[u]=null}),A(),s=o[e],s?s.p(a,i):(s=o[e]=n[e](a),s.c()),$(s,1),s.m(t.parentNode,t))},i(a){l||($(s),l=!0)},o(a){v(s),l=!1},d(a){o[e].d(a),a&&b(t)}}}function V(r){let e,s;return e=new R({props:{nobranding:!0,$$slots:{default:[Q]},$$scope:{ctx:r}}}),{c(){S(e.$$.fragment)},m(t,l){U(e,t,l),s=!0},p(t,[l]){const n={};l&527&&(n.$$scope={dirty:l,ctx:t}),e.$set(n)},i(t){s||($(e.$$.fragment,t),s=!0)},o(t){v(e.$$.fragment,t),s=!1},d(t){z(e,t)}}}function X(r,e,s){let t,{params:l}=e,n="",o=!1,c=!1;async function a(){if(!o){s(1,o=!0);try{await F.Users.confirmEmailChange(l==null?void 0:l.token,n),s(2,c=!0)}catch(g){F.errorResponseHandler(g)}s(1,o=!1)}}const i=()=>window.close();function u(){n=this.value,s(0,n)}return r.$$set=g=>{"params"in g&&s(5,l=g.params)},r.$$.update=()=>{r.$$.dirty&32&&s(3,t=W.getJWTPayload(l==null?void 0:l.token).newEmail||"")},[n,o,c,t,a,l,i,u]}class x extends J{constructor(e){super(),M(this,e,X,V,N,{params:5})}}export{x as default};
+                <p>You can now sign in with your new email address.</p></div>`,s=C(),t=m("button"),t.textContent="Close",d(e,"class","alert alert-success"),d(t,"type","button"),d(t,"class","btn btn-secondary btn-block")},m(o,c){_(o,e,c),_(o,s,c),_(o,t,c),l||(n=E(t,"click",r[6]),l=!0)},p:h,i:h,o:h,d(o){o&&b(e),o&&b(s),o&&b(t),l=!1,n()}}}function L(r){let e,s,t;return{c(){e=y("to "),s=m("strong"),t=y(r[3]),d(s,"class","txt-nowrap")},m(l,n){_(l,e,n),_(l,s,n),k(s,t)},p(l,n){n&8&&G(t,l[3])},d(l){l&&b(e),l&&b(s)}}}function O(r){let e,s,t,l,n,o,c,a;return{c(){e=m("label"),s=y("Password"),l=C(),n=m("input"),d(e,"for",t=r[8]),d(n,"type","password"),d(n,"id",o=r[8]),n.required=!0,n.autofocus=!0},m(i,u){_(i,e,u),k(e,s),_(i,l,u),_(i,n,u),T(n,r[0]),n.focus(),c||(a=E(n,"input",r[7]),c=!0)},p(i,u){u&256&&t!==(t=i[8])&&d(e,"for",t),u&256&&o!==(o=i[8])&&d(n,"id",o),u&1&&n.value!==i[0]&&T(n,i[0])},d(i){i&&b(e),i&&b(l),i&&b(n),c=!1,a()}}}function Q(r){let e,s,t,l;const n=[K,I],o=[];function c(a,i){return a[2]?0:1}return e=c(r),s=o[e]=n[e](r),{c(){s.c(),t=Y()},m(a,i){o[e].m(a,i),_(a,t,i),l=!0},p(a,i){let u=e;e=c(a),e===u?o[e].p(a,i):(j(),v(o[u],1,1,()=>{o[u]=null}),A(),s=o[e],s?s.p(a,i):(s=o[e]=n[e](a),s.c()),$(s,1),s.m(t.parentNode,t))},i(a){l||($(s),l=!0)},o(a){v(s),l=!1},d(a){o[e].d(a),a&&b(t)}}}function V(r){let e,s;return e=new R({props:{nobranding:!0,$$slots:{default:[Q]},$$scope:{ctx:r}}}),{c(){S(e.$$.fragment)},m(t,l){U(e,t,l),s=!0},p(t,[l]){const n={};l&527&&(n.$$scope={dirty:l,ctx:t}),e.$set(n)},i(t){s||($(e.$$.fragment,t),s=!0)},o(t){v(e.$$.fragment,t),s=!1},d(t){z(e,t)}}}function X(r,e,s){let t,{params:l}=e,n="",o=!1,c=!1;async function a(){if(!o){s(1,o=!0);try{await F.Users.confirmEmailChange(l==null?void 0:l.token,n),s(2,c=!0)}catch(g){F.errorResponseHandler(g)}s(1,o=!1)}}const i=()=>window.close();function u(){n=this.value,s(0,n)}return r.$$set=g=>{"params"in g&&s(5,l=g.params)},r.$$.update=()=>{r.$$.dirty&32&&s(3,t=W.getJWTPayload(l==null?void 0:l.token).newEmail||"")},[n,o,c,t,a,l,i,u]}class x extends J{constructor(e){super(),M(this,e,X,V,N,{params:5})}}export{x as default};

ui/dist/assets/PageUserConfirmPasswordReset.4b8deb9a.js

@@ -1,4 +1,4 @@
-import{S as W,i as Y,s as j,F as A,c as H,m as N,t as P,a as q,d as S,C as B,E as D,g as _,k as G,n as I,o as m,p as z,w as y,e as b,h as w,x as K,q as E,b as C,f as c,r as J,u as h,v as O,y as F,z as R}from"./index.85945a65.js";function Q(i){let e,l,t,n,s,o,p,a,r,u,v,g,k,L,d=i[4]&&M(i);return o=new E({props:{class:"form-field required",name:"password",$$slots:{default:[X,({uniqueId:f})=>({10:f}),({uniqueId:f})=>f?1024:0]},$$scope:{ctx:i}}}),a=new E({props:{class:"form-field required",name:"passwordConfirm",$$slots:{default:[Z,({uniqueId:f})=>({10:f}),({uniqueId:f})=>f?1024:0]},$$scope:{ctx:i}}}),{c(){e=b("form"),l=b("div"),t=b("h4"),n=y(`Reset your user password
-                    `),d&&d.c(),s=C(),H(o.$$.fragment),p=C(),H(a.$$.fragment),r=C(),u=b("button"),v=b("span"),v.textContent="Set new password",c(t,"class","m-b-xs"),c(l,"class","content txt-center m-b-sm"),c(v,"class","txt"),c(u,"type","submit"),c(u,"class","btn btn-lg btn-block"),u.disabled=i[2],J(u,"btn-loading",i[2])},m(f,$){_(f,e,$),w(e,l),w(l,t),w(t,n),d&&d.m(t,null),w(e,s),N(o,e,null),w(e,p),N(a,e,null),w(e,r),w(e,u),w(u,v),g=!0,k||(L=h(e,"submit",O(i[5])),k=!0)},p(f,$){f[4]?d?d.p(f,$):(d=M(f),d.c(),d.m(t,null)):d&&(d.d(1),d=null);const T={};$&3073&&(T.$$scope={dirty:$,ctx:f}),o.$set(T);const U={};$&3074&&(U.$$scope={dirty:$,ctx:f}),a.$set(U),(!g||$&4)&&(u.disabled=f[2]),$&4&&J(u,"btn-loading",f[2])},i(f){g||(P(o.$$.fragment,f),P(a.$$.fragment,f),g=!0)},o(f){q(o.$$.fragment,f),q(a.$$.fragment,f),g=!1},d(f){f&&m(e),d&&d.d(),S(o),S(a),k=!1,L()}}}function V(i){let e,l,t,n,s;return{c(){e=b("div"),e.innerHTML=`<div class="icon"><i class="ri-checkbox-circle-line"></i></div> 
+import{S as W,i as Y,s as j,F as A,c as H,m as N,t as P,a as q,d as S,C as B,E as D,g as _,k as G,n as I,o as m,p as z,q as E,e as b,w as y,b as C,f as c,r as J,h as w,u as h,v as K,y as F,x as O,z as R}from"./index.0d48f812.js";function Q(i){let e,l,t,n,s,o,p,a,r,u,v,g,k,L,d=i[4]&&M(i);return o=new E({props:{class:"form-field required",name:"password",$$slots:{default:[X,({uniqueId:f})=>({10:f}),({uniqueId:f})=>f?1024:0]},$$scope:{ctx:i}}}),a=new E({props:{class:"form-field required",name:"passwordConfirm",$$slots:{default:[Z,({uniqueId:f})=>({10:f}),({uniqueId:f})=>f?1024:0]},$$scope:{ctx:i}}}),{c(){e=b("form"),l=b("div"),t=b("h4"),n=y(`Reset your user password
+                    `),d&&d.c(),s=C(),H(o.$$.fragment),p=C(),H(a.$$.fragment),r=C(),u=b("button"),v=b("span"),v.textContent="Set new password",c(t,"class","m-b-xs"),c(l,"class","content txt-center m-b-sm"),c(v,"class","txt"),c(u,"type","submit"),c(u,"class","btn btn-lg btn-block"),u.disabled=i[2],J(u,"btn-loading",i[2])},m(f,$){_(f,e,$),w(e,l),w(l,t),w(t,n),d&&d.m(t,null),w(e,s),N(o,e,null),w(e,p),N(a,e,null),w(e,r),w(e,u),w(u,v),g=!0,k||(L=h(e,"submit",K(i[5])),k=!0)},p(f,$){f[4]?d?d.p(f,$):(d=M(f),d.c(),d.m(t,null)):d&&(d.d(1),d=null);const T={};$&3073&&(T.$$scope={dirty:$,ctx:f}),o.$set(T);const U={};$&3074&&(U.$$scope={dirty:$,ctx:f}),a.$set(U),(!g||$&4)&&(u.disabled=f[2]),$&4&&J(u,"btn-loading",f[2])},i(f){g||(P(o.$$.fragment,f),P(a.$$.fragment,f),g=!0)},o(f){q(o.$$.fragment,f),q(a.$$.fragment,f),g=!1},d(f){f&&m(e),d&&d.d(),S(o),S(a),k=!1,L()}}}function V(i){let e,l,t,n,s;return{c(){e=b("div"),e.innerHTML=`<div class="icon"><i class="ri-checkbox-circle-line"></i></div> 
             <div class="content txt-bold"><p>Password changed</p> 
-                <p>You can now sign in with your new password.</p></div>`,l=C(),t=b("button"),t.textContent="Close",c(e,"class","alert alert-success"),c(t,"type","button"),c(t,"class","btn btn-secondary btn-block")},m(o,p){_(o,e,p),_(o,l,p),_(o,t,p),n||(s=h(t,"click",i[7]),n=!0)},p:F,i:F,o:F,d(o){o&&m(e),o&&m(l),o&&m(t),n=!1,s()}}}function M(i){let e,l,t;return{c(){e=y("for "),l=b("strong"),t=y(i[4])},m(n,s){_(n,e,s),_(n,l,s),w(l,t)},p(n,s){s&16&&K(t,n[4])},d(n){n&&m(e),n&&m(l)}}}function X(i){let e,l,t,n,s,o,p,a;return{c(){e=b("label"),l=y("New password"),n=C(),s=b("input"),c(e,"for",t=i[10]),c(s,"type","password"),c(s,"id",o=i[10]),s.required=!0,s.autofocus=!0},m(r,u){_(r,e,u),w(e,l),_(r,n,u),_(r,s,u),R(s,i[0]),s.focus(),p||(a=h(s,"input",i[8]),p=!0)},p(r,u){u&1024&&t!==(t=r[10])&&c(e,"for",t),u&1024&&o!==(o=r[10])&&c(s,"id",o),u&1&&s.value!==r[0]&&R(s,r[0])},d(r){r&&m(e),r&&m(n),r&&m(s),p=!1,a()}}}function Z(i){let e,l,t,n,s,o,p,a;return{c(){e=b("label"),l=y("New password confirm"),n=C(),s=b("input"),c(e,"for",t=i[10]),c(s,"type","password"),c(s,"id",o=i[10]),s.required=!0},m(r,u){_(r,e,u),w(e,l),_(r,n,u),_(r,s,u),R(s,i[1]),p||(a=h(s,"input",i[9]),p=!0)},p(r,u){u&1024&&t!==(t=r[10])&&c(e,"for",t),u&1024&&o!==(o=r[10])&&c(s,"id",o),u&2&&s.value!==r[1]&&R(s,r[1])},d(r){r&&m(e),r&&m(n),r&&m(s),p=!1,a()}}}function x(i){let e,l,t,n;const s=[V,Q],o=[];function p(a,r){return a[3]?0:1}return e=p(i),l=o[e]=s[e](i),{c(){l.c(),t=D()},m(a,r){o[e].m(a,r),_(a,t,r),n=!0},p(a,r){let u=e;e=p(a),e===u?o[e].p(a,r):(G(),q(o[u],1,1,()=>{o[u]=null}),I(),l=o[e],l?l.p(a,r):(l=o[e]=s[e](a),l.c()),P(l,1),l.m(t.parentNode,t))},i(a){n||(P(l),n=!0)},o(a){q(l),n=!1},d(a){o[e].d(a),a&&m(t)}}}function ee(i){let e,l;return e=new A({props:{nobranding:!0,$$slots:{default:[x]},$$scope:{ctx:i}}}),{c(){H(e.$$.fragment)},m(t,n){N(e,t,n),l=!0},p(t,[n]){const s={};n&2079&&(s.$$scope={dirty:n,ctx:t}),e.$set(s)},i(t){l||(P(e.$$.fragment,t),l=!0)},o(t){q(e.$$.fragment,t),l=!1},d(t){S(e,t)}}}function te(i,e,l){let t,{params:n}=e,s="",o="",p=!1,a=!1;async function r(){if(!p){l(2,p=!0);try{await z.Users.confirmPasswordReset(n==null?void 0:n.token,s,o),l(3,a=!0)}catch(k){z.errorResponseHandler(k)}l(2,p=!1)}}const u=()=>window.close();function v(){s=this.value,l(0,s)}function g(){o=this.value,l(1,o)}return i.$$set=k=>{"params"in k&&l(6,n=k.params)},i.$$.update=()=>{i.$$.dirty&64&&l(4,t=B.getJWTPayload(n==null?void 0:n.token).email||"")},[s,o,p,a,t,r,n,u,v,g]}class le extends W{constructor(e){super(),Y(this,e,te,ee,j,{params:6})}}export{le as default};
+                <p>You can now sign in with your new password.</p></div>`,l=C(),t=b("button"),t.textContent="Close",c(e,"class","alert alert-success"),c(t,"type","button"),c(t,"class","btn btn-secondary btn-block")},m(o,p){_(o,e,p),_(o,l,p),_(o,t,p),n||(s=h(t,"click",i[7]),n=!0)},p:F,i:F,o:F,d(o){o&&m(e),o&&m(l),o&&m(t),n=!1,s()}}}function M(i){let e,l,t;return{c(){e=y("for "),l=b("strong"),t=y(i[4])},m(n,s){_(n,e,s),_(n,l,s),w(l,t)},p(n,s){s&16&&O(t,n[4])},d(n){n&&m(e),n&&m(l)}}}function X(i){let e,l,t,n,s,o,p,a;return{c(){e=b("label"),l=y("New password"),n=C(),s=b("input"),c(e,"for",t=i[10]),c(s,"type","password"),c(s,"id",o=i[10]),s.required=!0,s.autofocus=!0},m(r,u){_(r,e,u),w(e,l),_(r,n,u),_(r,s,u),R(s,i[0]),s.focus(),p||(a=h(s,"input",i[8]),p=!0)},p(r,u){u&1024&&t!==(t=r[10])&&c(e,"for",t),u&1024&&o!==(o=r[10])&&c(s,"id",o),u&1&&s.value!==r[0]&&R(s,r[0])},d(r){r&&m(e),r&&m(n),r&&m(s),p=!1,a()}}}function Z(i){let e,l,t,n,s,o,p,a;return{c(){e=b("label"),l=y("New password confirm"),n=C(),s=b("input"),c(e,"for",t=i[10]),c(s,"type","password"),c(s,"id",o=i[10]),s.required=!0},m(r,u){_(r,e,u),w(e,l),_(r,n,u),_(r,s,u),R(s,i[1]),p||(a=h(s,"input",i[9]),p=!0)},p(r,u){u&1024&&t!==(t=r[10])&&c(e,"for",t),u&1024&&o!==(o=r[10])&&c(s,"id",o),u&2&&s.value!==r[1]&&R(s,r[1])},d(r){r&&m(e),r&&m(n),r&&m(s),p=!1,a()}}}function x(i){let e,l,t,n;const s=[V,Q],o=[];function p(a,r){return a[3]?0:1}return e=p(i),l=o[e]=s[e](i),{c(){l.c(),t=D()},m(a,r){o[e].m(a,r),_(a,t,r),n=!0},p(a,r){let u=e;e=p(a),e===u?o[e].p(a,r):(G(),q(o[u],1,1,()=>{o[u]=null}),I(),l=o[e],l?l.p(a,r):(l=o[e]=s[e](a),l.c()),P(l,1),l.m(t.parentNode,t))},i(a){n||(P(l),n=!0)},o(a){q(l),n=!1},d(a){o[e].d(a),a&&m(t)}}}function ee(i){let e,l;return e=new A({props:{nobranding:!0,$$slots:{default:[x]},$$scope:{ctx:i}}}),{c(){H(e.$$.fragment)},m(t,n){N(e,t,n),l=!0},p(t,[n]){const s={};n&2079&&(s.$$scope={dirty:n,ctx:t}),e.$set(s)},i(t){l||(P(e.$$.fragment,t),l=!0)},o(t){q(e.$$.fragment,t),l=!1},d(t){S(e,t)}}}function te(i,e,l){let t,{params:n}=e,s="",o="",p=!1,a=!1;async function r(){if(!p){l(2,p=!0);try{await z.Users.confirmPasswordReset(n==null?void 0:n.token,s,o),l(3,a=!0)}catch(k){z.errorResponseHandler(k)}l(2,p=!1)}}const u=()=>window.close();function v(){s=this.value,l(0,s)}function g(){o=this.value,l(1,o)}return i.$$set=k=>{"params"in k&&l(6,n=k.params)},i.$$.update=()=>{i.$$.dirty&64&&l(4,t=B.getJWTPayload(n==null?void 0:n.token).email||"")},[s,o,p,a,t,r,n,u,v,g]}class le extends W{constructor(e){super(),Y(this,e,te,ee,j,{params:6})}}export{le as default};

ui/dist/assets/PageUserConfirmVerification.6dfff926.js

@@ -1,3 +1,3 @@
-import{S as k,i as v,s as y,F as w,c as x,m as C,t as g,a as $,d as L,p as H,E as M,g as r,o as a,e as u,b as m,f,u as _,y as p}from"./index.85945a65.js";function P(o){let t,s,e,n,i;return{c(){t=u("div"),t.innerHTML=`<div class="icon"><i class="ri-error-warning-line"></i></div> 
+import{S as k,i as v,s as y,F as w,c as x,m as C,t as g,a as $,d as L,p as H,E as M,g as r,o as a,e as u,b as m,f,u as _,y as p}from"./index.0d48f812.js";function P(o){let t,s,e,n,i;return{c(){t=u("div"),t.innerHTML=`<div class="icon"><i class="ri-error-warning-line"></i></div> 
             <div class="content txt-bold"><p>Invalid or expired verification token.</p></div>`,s=m(),e=u("button"),e.textContent="Close",f(t,"class","alert alert-danger"),f(e,"type","button"),f(e,"class","btn btn-secondary btn-block")},m(l,c){r(l,t,c),r(l,s,c),r(l,e,c),n||(i=_(e,"click",o[4]),n=!0)},p,d(l){l&&a(t),l&&a(s),l&&a(e),n=!1,i()}}}function S(o){let t,s,e,n,i;return{c(){t=u("div"),t.innerHTML=`<div class="icon"><i class="ri-checkbox-circle-line"></i></div> 
             <div class="content txt-bold"><p>Successfully verified email address.</p></div>`,s=m(),e=u("button"),e.textContent="Close",f(t,"class","alert alert-success"),f(e,"type","button"),f(e,"class","btn btn-secondary btn-block")},m(l,c){r(l,t,c),r(l,s,c),r(l,e,c),n||(i=_(e,"click",o[3]),n=!0)},p,d(l){l&&a(t),l&&a(s),l&&a(e),n=!1,i()}}}function T(o){let t;return{c(){t=u("div"),t.innerHTML='<div class="loader loader-lg"><em>Please wait...</em></div>',f(t,"class","txt-center")},m(s,e){r(s,t,e)},p,d(s){s&&a(t)}}}function F(o){let t;function s(i,l){return i[1]?T:i[0]?S:P}let e=s(o),n=e(o);return{c(){n.c(),t=M()},m(i,l){n.m(i,l),r(i,t,l)},p(i,l){e===(e=s(i))&&n?n.p(i,l):(n.d(1),n=e(i),n&&(n.c(),n.m(t.parentNode,t)))},d(i){n.d(i),i&&a(t)}}}function U(o){let t,s;return t=new w({props:{nobranding:!0,$$slots:{default:[F]},$$scope:{ctx:o}}}),{c(){x(t.$$.fragment)},m(e,n){C(t,e,n),s=!0},p(e,[n]){const i={};n&67&&(i.$$scope={dirty:n,ctx:e}),t.$set(i)},i(e){s||(g(t.$$.fragment,e),s=!0)},o(e){$(t.$$.fragment,e),s=!1},d(e){L(t,e)}}}function V(o,t,s){let{params:e}=t,n=!1,i=!1;l();async function l(){s(1,i=!0);try{await H.Users.confirmVerification(e==null?void 0:e.token),s(0,n=!0)}catch(d){console.warn(d),s(0,n=!1)}s(1,i=!1)}const c=()=>window.close(),b=()=>window.close();return o.$$set=d=>{"params"in d&&s(2,e=d.params)},[n,i,e,c,b]}class E extends k{constructor(t){super(),v(this,t,V,U,y,{params:2})}}export{E as default};

ui/dist/index.html

@@ -20,8 +20,8 @@
         window.Prism = window.Prism || {};
         window.Prism.manual = true;
     </script>
-  <script type="module" crossorigin src="/_/assets/index.85945a65.js"></script>
-  <link rel="stylesheet" href="/_/assets/index.16491115.css">
+  <script type="module" crossorigin src="/_/assets/index.0d48f812.js"></script>
+  <link rel="stylesheet" href="/_/assets/index.15ba3d82.css">
 </head>
 <body>
     <div id="app"></div>

ui/package-lock.json

@@ -922,9 +922,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.76.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.76.0.tgz",
-      "integrity": "sha512-9jwRIEY1jOzKLj3nsY/yot41r19ITdQrhs+q3ggNWhr9TQgduHqANvPpS32RNpzGklJu3G1AJfvlZLi/6wFgWA==",
+      "version": "2.77.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.0.tgz",
+      "integrity": "sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1662,9 +1662,9 @@
       }
     },
     "rollup": {
-      "version": "2.76.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.76.0.tgz",
-      "integrity": "sha512-9jwRIEY1jOzKLj3nsY/yot41r19ITdQrhs+q3ggNWhr9TQgduHqANvPpS32RNpzGklJu3G1AJfvlZLi/6wFgWA==",
+      "version": "2.77.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.0.tgz",
+      "integrity": "sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==",
       "dev": true,
       "requires": {
         "fsevents": "~2.3.2"

ui/src/App.svelte

@@ -10,6 +10,7 @@
     import Toasts from "@/components/base/Toasts.svelte";
     import Toggler from "@/components/base/Toggler.svelte";
     import Confirmation from "@/components/base/Confirmation.svelte";
+    import { pageTitle, appName } from "@/stores/app";
     import { admin } from "@/stores/admin";
     import { setErrors } from "@/stores/errors";
     import { resetConfirmation } from "@/stores/confirmation";
@@ -18,6 +19,10 @@
 
     let showAppSidebar = false;
 
+    $: if ($admin?.id) {
+        loadAppName();
+    }
+
     function handleRouteLoading(e) {
         if (e?.detail?.location === oldLocation) {
             return; // not an actual change
@@ -28,7 +33,7 @@
         oldLocation = e?.detail?.location;
 
         // resets
-        CommonHelper.setDocumentTitle("");
+        $pageTitle = "";
         setErrors({});
         resetConfirmation();
     }
@@ -37,11 +42,30 @@
         replace("/");
     }
 
+    async function loadAppName() {
+        if (!$admin?.id) {
+            return;
+        }
+
+        try {
+            const settings = await ApiClient.Settings.getAll({
+                $cancelKey: "loadAppName",
+            });
+            $appName = settings?.meta?.appName || "";
+        } catch (err) {
+            console.warn("Failed to load app name.", err);
+        }
+    }
+
     function logout() {
         ApiClient.logout();
     }
 </script>
 
+<svelte:head>
+    <title>{CommonHelper.joinNonEmpty([$pageTitle, $appName, "PocketBase"], " - ")}</title>
+</svelte:head>
+
 <div class="app-layout">
     {#if $admin?.id && showAppSidebar}
         <aside class="app-sidebar">

ui/src/components/admins/PageAdmins.svelte

@@ -1,6 +1,7 @@
 <script>
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle } from "@/stores/app";
     import { admin as loggedAdmin } from "@/stores/admin";
     import Searchbar from "@/components/base/Searchbar.svelte";
     import RefreshButton from "@/components/base/RefreshButton.svelte";
@@ -12,6 +13,8 @@
 
     const queryParams = CommonHelper.getQueryParams(window.location?.href);
 
+    $pageTitle = "Admins";
+
     let adminUpsertPanel;
     let admins = [];
     let isLoading = false;
@@ -28,8 +31,6 @@
         loadAdmins();
     }
 
-    CommonHelper.setDocumentTitle("Admins");
-
     export function loadAdmins() {
         isLoading = true;
 
@@ -64,7 +65,7 @@
     <header class="page-header">
         <nav class="breadcrumbs">
             <div class="breadcrumb-item">Settings</div>
-            <div class="breadcrumb-item">Admins</div>
+            <div class="breadcrumb-item">{$pageTitle}</div>
         </nav>
 
         <RefreshButton on:refresh={() => loadAdmins()} />

ui/src/components/base/Field.svelte

@@ -23,9 +23,11 @@
     }
 
     onMount(() => {
+        container.addEventListener("input", handleChange);
         container.addEventListener("change", handleChange);
 
         return () => {
+            container.removeEventListener("input", handleChange);
             container.removeEventListener("change", handleChange);
         };
     });

ui/src/components/base/FilterAutocompleteInput.svelte

@@ -96,6 +96,8 @@
                 readOnlyCompartment.reconfigure(EditorState.readOnly.of(disabled)),
             ],
         });
+
+        triggerNativeChange();
     }
 
     $: if (editor && value != editor.state.doc.toString()) {
@@ -228,7 +230,7 @@
             return null;
         }
 
-        let options = [{ label: "null" }, { label: "false" }, { label: "true" }];
+        let options = [{ label: "false" }, { label: "true" }];
 
         if (!disableIndirectCollectionsKeys) {
             options.push({ label: "@collection.*", apply: "@collection." });

ui/src/components/base/PreviewPopup.svelte

@@ -26,11 +26,19 @@
     }
 </script>
 
-<OverlayPanel bind:this={panel} class="image-preview" popup on:show on:hide>
+<OverlayPanel bind:this={panel} class="image-preview" btnClose={false} popup on:show on:hide>
+    <svelte:fragment slot="header">
+        <div class="overlay-close" on:click|preventDefault={hide}>
+            <i class="ri-close-line" />
+        </div>
+    </svelte:fragment>
+
     <img src={url} alt="Preview" />
 
     <svelte:fragment slot="footer">
-        <a href={url} class="link-hint txt-ellipsis">/../{url.substring(url.lastIndexOf("/") + 1)}</a>
+        <a href={url} title="Download" class="link-hint txt-ellipsis">
+            /../{url.substring(url.lastIndexOf("/") + 1)}
+        </a>
         <div class="flex-fill" />
         <button type="button" class="btn btn-secondary" on:click={hide}>Close</button>
     </svelte:fragment>

ui/src/components/base/RefreshButton.svelte

@@ -45,6 +45,6 @@
         }
     }
     .btn.refreshing i {
-        animation: refresh 200ms linear;
+        animation: refresh 200ms ease-out;
     }
 </style>

ui/src/components/collections/CollectionFieldsTab.svelte

@@ -44,16 +44,16 @@
     function getSiblingsFieldNames(currentField) {
         let result = [];
 
+        if (currentField.toDelete) {
+            return result;
+        }
+
         for (let field of collection.schema) {
-            if (field === currentField) {
-                continue; // skip current
+            if (field === currentField || field.toDelete) {
+                continue; // skip current and deleted fields
             }
 
             result.push(field.name);
-
-            if (field.id && field.originalName !== "" && field.originalName !== field.name) {
-                result.push(field.originalName);
-            }
         }
 
         return result;

ui/src/components/collections/CollectionRulesTab.svelte

@@ -104,7 +104,7 @@
                     <p>
                         Example rule:
                         <br />
-                        <code>@request.user.id!=null && created>"2022-01-01 00:00:00"</code>
+                        <code>@request.user.id!="" && created>"2022-01-01 00:00:00"</code>
                     </p>
                 </div>
             </div>

ui/src/components/collections/CollectionUpsertPanel.svelte

@@ -166,7 +166,7 @@
 
 <OverlayPanel
     bind:this={collectionPanel}
-    class="overlay-panel-lg colored-header collection-panel"
+    class="overlay-panel-lg colored-header compact-header collection-panel"
     beforeHide={() => {
         if (hasChanges && confirmClose) {
             confirm("You have unsaved changes. Do you really want to close the panel?", () => {

ui/src/components/collections/FieldAccordion.svelte

@@ -37,13 +37,6 @@
         field.unique = false;
     }
 
-    $: if (excludeNames.length) {
-        const normalizedName = normalizeFieldName(field.name);
-        if (field.name !== normalizedName) {
-            field.name = normalizedName;
-        }
-    }
-
     $: canBeStored = !CommonHelper.isEmpty(field.name) && field.type;
 
     $: if (!canBeStored) {
@@ -54,7 +47,7 @@
         accordion && collapse();
 
         // reset the name if it was previously deleted
-        if (!field.name && field.originalName) {
+        if (field.originalName && field.name !== field.originalName) {
             field.name = field.originalName;
         }
     }
@@ -67,9 +60,16 @@
         field.toDelete = false; // normalize
     }
 
+    $: if (field.required) {
+        field.nullable = false;
+    }
+
     $: interactive = !disabled && !field.system && !field.toDelete && canBeStored;
 
-    $: hasErrors = !CommonHelper.isEmpty(CommonHelper.getNestedVal($errors, `schema.${key}`));
+    $: hasValidName = validateFieldName(field.name);
+
+    $: hasErrors =
+        !hasValidName || !CommonHelper.isEmpty(CommonHelper.getNestedVal($errors, `schema.${key}`));
 
     export function expand() {
         accordion?.expand();
@@ -88,15 +88,23 @@
         }
     }
 
-    function normalizeFieldName(name) {
-        name = CommonHelper.slugify(name);
-
-        let counter = "";
-        while (excludeNames.includes(name + counter)) {
-            ++counter;
+    function validateFieldName(name) {
+        name = ("" + name).toLowerCase();
+        if (!name) {
+            return false;
         }
 
-        return name + counter;
+        for (const excluded of excludeNames) {
+            if (excluded.toLowerCase() === name) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    function normalizeFieldName(name) {
+        return CommonHelper.slugify(name);
     }
 
     onMount(() => {
@@ -116,7 +124,7 @@
     {interactive}
     class={disabled || field.toDelete || field.system ? "field-accordion disabled" : "field-accordion"}
 >
-    <svelte:fragment slot="header" let:active={expanded}>
+    <svelte:fragment slot="header">
         <div class="inline-flex">
             <span class="icon field-type">
                 <i class={CommonHelper.getFieldTypeIcon(field.type)} />
@@ -145,7 +153,7 @@
 
         <div class="flex-fill" />
 
-        {#if hasErrors}
+        {#if hasErrors && !field.system}
             <i
                 class="ri-error-warning-fill txt-danger"
                 transition:scale={{ duration: 150, start: 0.7 }}
@@ -153,28 +161,6 @@
             />
         {/if}
 
-        {#if expanded && !field.toDelete}
-            <div class="inline-flex flex-gap-sm flex-nowrap" in:fly={{ duration: 200, x: 20, opacity: 0 }}>
-                <button
-                    type="button"
-                    class="btn btn-sm fade p-l-0 p-r-0"
-                    on:click|stopPropagation={handleDelete}
-                >
-                    <span class="txt">Remove</span>
-                </button>
-
-                {#if interactive}
-                    <button
-                        type="button"
-                        class="btn btn-sm btn-outline btn-expanded-sm"
-                        on:click|stopPropagation={collapse}
-                    >
-                        <span class="txt">Done</span>
-                    </button>
-                {/if}
-            </div>
-        {/if}
-
         {#if field.toDelete}
             <button
                 type="button"
@@ -207,11 +193,23 @@
             </div>
             <div class="col-sm-6">
                 <Field
-                    class="form-field required {field.id && field.system ? 'disabled' : ''}"
+                    class="
+                        form-field
+                        required
+                        {!hasValidName ? 'invalid' : ''}
+                        {field.id && field.system ? 'disabled' : ''}
+                    "
                     name="schema.{key}.name"
                     let:uniqueId
                 >
-                    <label for={uniqueId}>Name</label>
+                    <label for={uniqueId}>
+                        <span class="txt">Name</span>
+                        {#if !hasValidName}
+                            <span class="txt invalid-name-note" transition:fly={{ duration: 150, x: 5 }}>
+                                Duplicated or invalid name
+                            </span>
+                        {/if}
+                    </label>
                     <!-- svelte-ignore a11y-autofocus -->
                     <input
                         type="text"
@@ -255,14 +253,14 @@
                 {/if}
             </div>
 
-            <div class="col-4">
+            <div class="col-sm-4 flex">
                 <Field class="form-field form-field-toggle m-0" name="requried" let:uniqueId>
                     <input type="checkbox" id={uniqueId} bind:checked={field.required} />
                     <label for={uniqueId}>Required</label>
                 </Field>
             </div>
 
-            <div class="col-4">
+            <div class="col-sm-4 flex">
                 {#if field.type !== "file"}
                     <Field class="form-field form-field-toggle m-0" name="unique" let:uniqueId>
                         <input type="checkbox" id={uniqueId} bind:checked={field.unique} />
@@ -270,6 +268,31 @@
                     </Field>
                 {/if}
             </div>
+
+            {#if !field.toDelete}
+                <div class="col-sm-4 txt-right">
+                    <div class="flex-fill" />
+                    <div class="inline-flex flex-gap-base flex-nowrap">
+                        <button
+                            type="button"
+                            class="btn btn-sm btn-secondary fade"
+                            on:click|stopPropagation={handleDelete}
+                        >
+                            <span class="txt">Remove</span>
+                        </button>
+
+                        {#if interactive}
+                            <button
+                                type="button"
+                                class="btn btn-sm btn-outline btn-expanded-sm"
+                                on:click|stopPropagation={collapse}
+                            >
+                                <span class="txt">Done</span>
+                            </button>
+                        {/if}
+                    </div>
+                </div>
+            {/if}
         </div>
 
         <input type="submit" class="hidden" tabindex="-1" />
@@ -277,6 +300,12 @@
 </Accordion>
 
 <style>
+    .invalid-name-note {
+        position: absolute;
+        right: 10px;
+        top: 10px;
+        text-transform: none;
+    }
     .title.field-name {
         max-width: 130px;
         overflow: hidden;

ui/src/components/collections/schema/EmailOptions.svelte

@@ -16,7 +16,7 @@
                 <i
                     class="ri-information-line link-hint"
                     use:tooltip={{
-                        text: 'Domains that are NOT allowed as value. \n This field is disabled if "Only domains" is set.',
+                        text: 'List of domains that are NOT allowed. \n This field is disabled if "Only domains" is set.',
                         position: "top",
                     }}
                 />
@@ -37,7 +37,7 @@
                 <i
                     class="ri-information-line link-hint"
                     use:tooltip={{
-                        text: 'Domains that are ONLY allowed as value. \n This field is disabled if "Except domains" is set.',
+                        text: 'List of domains that are ONLY allowed. \n This field is disabled if "Except domains" is set.',
                         position: "top",
                     }}
                 />

ui/src/components/collections/schema/FileOptions.svelte

@@ -41,7 +41,7 @@
                 <i
                     class="ri-information-line link-hint"
                     use:tooltip={{
-                        text: "Allow uploading files ONLY with the listed mime types. \n Leave empty for no restriction.",
+                        text: "Allow files ONLY with the listed mime types. \n Leave empty for no restriction.",
                         position: "top",
                     }}
                 />
@@ -56,6 +56,21 @@
                 <span class="inline-flex">
                     <span class="txt link-primary">Choose presets</span>
                     <Toggler class="dropdown dropdown-sm dropdown-nowrap">
+                        <div
+                            tabindex="0"
+                            class="dropdown-item closable"
+                            on:click={() => {
+                                options.mimeTypes = [
+                                    "application/pdf",
+                                    "application/msword",
+                                    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                                    "application/vnd.ms-excel",
+                                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                                ];
+                            }}
+                        >
+                            <span class="txt">Documents (pdf, doc/docx, xls/xlsx)</span>
+                        </div>
                         <div
                             tabindex="0"
                             class="dropdown-item closable"
@@ -76,15 +91,14 @@
                             class="dropdown-item closable"
                             on:click={() => {
                                 options.mimeTypes = [
-                                    "application/pdf",
-                                    "application/msword",
-                                    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-                                    "application/vnd.ms-excel",
-                                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                                    "video/mp4",
+                                    "video/x-ms-wmv",
+                                    "video/quicktime",
+                                    "video/3gpp",
                                 ];
                             }}
                         >
-                            <span class="txt">Documents (pdf, doc/docx, xls/xlsx)</span>
+                            <span class="txt">Videos (mp4, avi, mov, 3gp)</span>
                         </div>
                         <div
                             tabindex="0"

ui/src/components/logs/PageLogs.svelte

@@ -1,5 +1,5 @@
 <script>
-    import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle } from "@/stores/app";
     import Field from "@/components/base/Field.svelte";
     import Searchbar from "@/components/base/Searchbar.svelte";
     import RefreshButton from "@/components/base/RefreshButton.svelte";
@@ -9,6 +9,8 @@
 
     const ADMIN_LOGS_LOCAL_STORAGE_KEY = "includeAdminLogs";
 
+    $pageTitle = "Request logs";
+
     let logPanel;
     let filter = "";
     let includeAdminLogs = window.localStorage?.getItem(ADMIN_LOGS_LOCAL_STORAGE_KEY) << 0;
@@ -23,15 +25,13 @@
     function refresh() {
         refreshToken++;
     }
-
-    CommonHelper.setDocumentTitle("Request logs");
 </script>
 
 <main class="page-wrapper">
     <div class="page-header-wrapper m-b-0">
         <header class="page-header">
             <nav class="breadcrumbs">
-                <div class="breadcrumb-item">Request logs</div>
+                <div class="breadcrumb-item">{$pageTitle}</div>
             </nav>
 
             <RefreshButton on:refresh={() => refresh()} />

ui/src/components/records/PageRecords.svelte

@@ -7,6 +7,7 @@
     } from "@/stores/collections";
     import CommonHelper from "@/utils/CommonHelper";
     import tooltip from "@/actions/tooltip";
+    import { pageTitle } from "@/stores/app";
     import Searchbar from "@/components/base/Searchbar.svelte";
     import RefreshButton from "@/components/base/RefreshButton.svelte";
     import CollectionsSidebar from "@/components/collections/CollectionsSidebar.svelte";
@@ -17,6 +18,8 @@
 
     const queryParams = CommonHelper.getQueryParams(window.location?.href);
 
+    $pageTitle = "Collections";
+
     let collectionUpsertPanel;
     let collectionDocsPanel;
     let recordPanel;
@@ -29,9 +32,7 @@
 
     // reset filter and sort on collection change
     $: if ($activeCollection?.id && selectedCollectionId != $activeCollection.id) {
-        selectedCollectionId = $activeCollection.id;
-        sort = "-created";
-        filter = "";
+        reset();
     }
 
     // keep the url params in sync
@@ -43,7 +44,11 @@
         });
     }
 
-    CommonHelper.setDocumentTitle("Collections");
+    function reset() {
+        selectedCollectionId = $activeCollection.id;
+        sort = "-created";
+        filter = "";
+    }
 
     loadCollections(selectedCollectionId);
 </script>
@@ -123,6 +128,7 @@
 {/if}
 
 <CollectionUpsertPanel bind:this={collectionUpsertPanel} />
+
 <CollectionDocsPanel bind:this={collectionDocsPanel} />
 
 <RecordUpsertPanel

ui/src/components/records/RecordFieldCell.svelte

@@ -44,7 +44,7 @@
     {:else if field.type === "file"}
         <div class="inline-flex">
             {#each CommonHelper.toArray(record[field.name]) as filename}
-                <figure class="thumb thumb-sm" use:tooltip={filename}>
+                <figure class="thumb thumb-sm">
                     <RecordFilePreview {record} {filename} />
                 </figure>
             {/each}

ui/src/components/records/RecordFilePreview.svelte

@@ -1,23 +1,42 @@
 <script>
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import PreviewPopup from "@/components/base/PreviewPopup.svelte";
 
     export let record;
     export let filename;
 
-    let previewUrl = "";
+    let previewPopup;
+    let thumbUrl = "";
+    let originalUrl = "";
 
-    $: if (CommonHelper.hasImageExtension(filename)) {
-        previewUrl = ApiClient.Records.getFileUrl(record, `${filename}?thumb=100x100`);
+    $: hasPreview = CommonHelper.hasImageExtension(filename);
+
+    $: if (hasPreview) {
+        originalUrl = ApiClient.Records.getFileUrl(record, `${filename}`);
     }
 
+    $: thumbUrl = originalUrl ? originalUrl + "?thumb=100x100" : "";
+
     function onError() {
-        previewUrl = "";
+        thumbUrl = "";
     }
 </script>
 
-{#if previewUrl}
-    <img src={previewUrl} alt={filename} on:error={onError} />
+{#if hasPreview}
+    <img
+        src={thumbUrl}
+        alt={filename}
+        title="Preview {filename}"
+        class:link-fade={hasPreview}
+        on:click={(e) => {
+            e.stopPropagation();
+            previewPopup?.show(originalUrl);
+        }}
+        on:error={onError}
+    />
 {:else}
     <i class="ri-file-line" />
 {/if}
+
+<PreviewPopup bind:this={previewPopup} />

ui/src/components/records/RecordSelect.svelte

@@ -23,7 +23,7 @@
     let isLoadingSelected = false;
 
     $: if (collectionId) {
-        loadList();
+        loadList(true);
     }
 
     $: isLoading = isLoadingList || isLoadingSelected;

ui/src/components/records/RecordUpsertPanel.svelte

@@ -1,5 +1,5 @@
 <script>
-    import { createEventDispatcher } from "svelte";
+    import { createEventDispatcher, tick } from "svelte";
     import { Record } from "pocketbase";
     import CommonHelper from "@/utils/CommonHelper";
     import ApiClient from "@/utils/ApiClient";
@@ -57,12 +57,13 @@
         return recordPanel?.hide();
     }
 
-    function load(model) {
+    async function load(model) {
         setErrors({}); // reset errors
         original = model || {};
         record = model?.clone ? model.clone() : new Record();
         uploadedFilesMap = {};
         deletedFileIndexesMap = {};
+        await tick(); // wait to populate the fields to get the normalized values
         initialFormHash = calculateFormHash(record);
     }
 
@@ -71,7 +72,7 @@
     }
 
     function save() {
-        if (isSaving || !hasChanges) {
+        if (isSaving || !canSave) {
             return;
         }
 

ui/src/components/records/fields/FileField.svelte

@@ -5,17 +5,15 @@
     import tooltip from "@/actions/tooltip";
     import Field from "@/components/base/Field.svelte";
     import UploadedFilePreview from "@/components/base/UploadedFilePreview.svelte";
-    import PreviewPopup from "@/components/base/PreviewPopup.svelte";
     import RecordFilePreview from "@/components/records/RecordFilePreview.svelte";
 
     export let record;
-    export let value = null;
+    export let value = "";
     export let uploadedFiles = []; // Array<File> array
     export let deletedFileIndexes = []; // Array<int> array
     export let field = new SchemaField();
 
     let fileInput;
-    let previewPopup;
     let filesListElem;
 
     // normalize uploadedFiles type
@@ -30,8 +28,8 @@
 
     $: isMultiple = field.options?.maxSelect > 1;
 
-    $: if (typeof value === "undefined" || value === null) {
-        value = isMultiple ? [] : null;
+    $: if (CommonHelper.isEmpty(value)) {
+        value = isMultiple ? [] : "";
     }
 
     $: valueAsArray = CommonHelper.toArray(value);
@@ -81,18 +79,9 @@
     <div bind:this={filesListElem} class="files-list">
         {#each valueAsArray as filename, i (filename)}
             <div class="list-item">
-                <figute
-                    class="thumb"
-                    class:fade={deletedFileIndexes.includes(i)}
-                    class:link-fade={CommonHelper.hasImageExtension(filename)}
-                    title={CommonHelper.hasImageExtension(filename) ? "Preview" : ""}
-                    on:click={() =>
-                        CommonHelper.hasImageExtension(filename)
-                            ? previewPopup?.show(ApiClient.Records.getFileUrl(record, filename))
-                            : false}
-                >
+                <figure class="thumb" class:fade={deletedFileIndexes.includes(i)}>
                     <RecordFilePreview {record} {filename} />
-                </figute>
+                </figure>
                 <a
                     href={ApiClient.Records.getFileUrl(record, filename)}
                     class="filename"
@@ -128,9 +117,9 @@
 
         {#each uploadedFiles as file, i}
             <div class="list-item">
-                <figute class="thumb">
+                <figure class="thumb">
                     <UploadedFilePreview {file} />
-                </figute>
+                </figure>
                 <div class="filename" title={file.name}>
                     <small class="label label-success m-r-5">New</small>
                     <span class="txt">{file.name}</span>
@@ -173,5 +162,3 @@
         {/if}
     </div>
 </Field>
-
-<PreviewPopup bind:this={previewPopup} />

ui/src/components/records/fields/JsonField.svelte

@@ -18,5 +18,5 @@
         <i class={CommonHelper.getFieldTypeIcon(field.type)} />
         <span class="txt">{field.name}</span>
     </label>
-    <textarea id={uniqueId} required={field.required} class="txt-mono txt-sm" bind:value />
+    <textarea id={uniqueId} required={field.required} class="txt-mono" bind:value />
 </Field>

ui/src/components/records/fields/SelectField.svelte

@@ -10,7 +10,7 @@
     $: isMultiple = field.options?.maxSelect > 1;
 
     $: if (typeof value === "undefined") {
-        value = isMultiple ? [] : null;
+        value = isMultiple ? [] : "";
     }
 
     $: if (isMultiple && Array.isArray(value) && value.length > field.options.maxSelect) {

ui/src/components/settings/PageApplication.svelte

@@ -1,10 +1,13 @@
 <script>
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle, appName } from "@/stores/app";
     import { addSuccessToast } from "@/stores/toasts";
     import Field from "@/components/base/Field.svelte";
     import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
 
+    $pageTitle = "Application settings";
+
     let formSettings = {};
     let isLoading = false;
     let isSaving = false;
@@ -12,8 +15,6 @@
 
     $: hasChanges = initialHash != JSON.stringify(formSettings);
 
-    CommonHelper.setDocumentTitle("Application settings");
-
     loadSettings();
 
     async function loadSettings() {
@@ -48,10 +49,13 @@
     }
 
     function init(settings = {}) {
+        $appName = settings?.meta?.appName;
+
         formSettings = {
             meta: settings?.meta || {},
             logs: settings?.logs || {},
         };
+
         initialHash = JSON.stringify(formSettings);
     }
 </script>

ui/src/components/settings/PageAuthProviders.svelte

@@ -1,12 +1,15 @@
 <script>
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle } from "@/stores/app";
     import { setErrors } from "@/stores/errors";
     import { addSuccessToast } from "@/stores/toasts";
     import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
     import EmailAuthAccordion from "@/components/settings/EmailAuthAccordion.svelte";
     import AuthProviderAccordion from "@/components/settings/AuthProviderAccordion.svelte";
 
+    $pageTitle = "Auth providers";
+
     let emailAuthAccordion;
     let authSettings = {};
     let isLoading = false;
@@ -15,8 +18,6 @@
 
     $: hasChanges = initialHash != JSON.stringify(authSettings);
 
-    CommonHelper.setDocumentTitle("Auth providers");
-
     loadSettings();
 
     async function loadSettings() {
@@ -76,7 +77,7 @@
     <header class="page-header">
         <nav class="breadcrumbs">
             <div class="breadcrumb-item">Settings</div>
-            <div class="breadcrumb-item">Auth providers</div>
+            <div class="breadcrumb-item">{$pageTitle}</div>
         </nav>
     </header>
 

ui/src/components/settings/PageMail.svelte

@@ -2,6 +2,7 @@
     import { slide } from "svelte/transition";
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle } from "@/stores/app";
     import { addSuccessToast } from "@/stores/toasts";
     import Field from "@/components/base/Field.svelte";
     import ObjectSelect from "@/components/base/ObjectSelect.svelte";
@@ -13,6 +14,8 @@
         { label: "Always", value: true },
     ];
 
+    $pageTitle = "Mail settings";
+
     let formSettings = {};
     let isLoading = false;
     let isSaving = false;
@@ -20,8 +23,6 @@
 
     $: hasChanges = initialHash != JSON.stringify(formSettings);
 
-    CommonHelper.setDocumentTitle("Mail settings");
-
     loadSettings();
 
     async function loadSettings() {
@@ -70,7 +71,7 @@
     <header class="page-header">
         <nav class="breadcrumbs">
             <div class="breadcrumb-item">Settings</div>
-            <div class="breadcrumb-item">Mail settings</div>
+            <div class="breadcrumb-item">{$pageTitle}</div>
         </nav>
     </header>
 

ui/src/components/settings/PageStorage.svelte

@@ -2,12 +2,15 @@
     import { slide } from "svelte/transition";
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle } from "@/stores/app";
     import { setErrors } from "@/stores/errors";
     import { addSuccessToast } from "@/stores/toasts";
     import Field from "@/components/base/Field.svelte";
     import RedactedPasswordInput from "@/components/base/RedactedPasswordInput.svelte";
     import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
 
+    $pageTitle = "Files storage";
+
     let s3 = {};
     let isLoading = false;
     let isSaving = false;
@@ -16,8 +19,6 @@
 
     $: hasChanges = initialHash != JSON.stringify(s3);
 
-    CommonHelper.setDocumentTitle("Files storage");
-
     loadSettings();
 
     async function loadSettings() {
@@ -65,7 +66,7 @@
     <header class="page-header">
         <nav class="breadcrumbs">
             <div class="breadcrumb-item">Settings</div>
-            <div class="breadcrumb-item">Files storage</div>
+            <div class="breadcrumb-item">{$pageTitle}</div>
         </nav>
     </header>
 
@@ -87,7 +88,7 @@
                 </Field>
 
                 {#if initialEnabled != s3.enabled}
-                    <div transition:slide={{ duration: 150 }}>
+                    <div transition:slide|local={{ duration: 150 }}>
                         <div class="alert alert-warning m-0">
                             <div class="icon">
                                 <i class="ri-error-warning-line" />

ui/src/components/settings/PageTokenOptions.svelte

@@ -1,6 +1,7 @@
 <script>
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
+    import { pageTitle } from "@/stores/app";
     import { addSuccessToast } from "@/stores/toasts";
     import Field from "@/components/base/Field.svelte";
     import SettingsSidebar from "@/components/settings/SettingsSidebar.svelte";
@@ -14,6 +15,8 @@
         { key: "adminPasswordResetToken", label: "Admins password reset token" },
     ];
 
+    $pageTitle = "Token options";
+
     let tokenSettings = {};
     let isLoading = false;
     let isSaving = false;
@@ -21,8 +24,6 @@
 
     $: hasChanges = initialHash != JSON.stringify(tokenSettings);
 
-    CommonHelper.setDocumentTitle("Token options");
-
     loadSettings();
 
     async function loadSettings() {
@@ -76,7 +77,7 @@
     <header class="page-header">
         <nav class="breadcrumbs">
             <div class="breadcrumb-item">Settings</div>
-            <div class="breadcrumb-item">Token options</div>
+            <div class="breadcrumb-item">{$pageTitle}</div>
         </nav>
     </header>
 

ui/src/components/users/PageUsers.svelte

@@ -3,6 +3,7 @@
     import ApiClient from "@/utils/ApiClient";
     import CommonHelper from "@/utils/CommonHelper";
     import tooltip from "@/actions/tooltip";
+    import { pageTitle } from "@/stores/app";
     import Searchbar from "@/components/base/Searchbar.svelte";
     import RefreshButton from "@/components/base/RefreshButton.svelte";
     import SortHeader from "@/components/base/SortHeader.svelte";
@@ -16,6 +17,8 @@
     const queryParams = CommonHelper.getQueryParams(window.location?.href);
     const excludedProfileFields = ["id", "userId", "created", "updated"];
 
+    $pageTitle = "Users";
+
     let userUpsertPanel;
     let collectionUpsertPanel;
     let recordUpsertPanel;
@@ -44,8 +47,6 @@
         (field) => !excludedProfileFields.includes(field.name)
     );
 
-    CommonHelper.setDocumentTitle("Users");
-
     loadProfilesCollection();
 
     export async function loadUsers(page = 1) {
@@ -111,7 +112,7 @@
     <main class="page-wrapper">
         <header class="page-header">
             <nav class="breadcrumbs">
-                <div class="breadcrumb-item">Users</div>
+                <div class="breadcrumb-item">{$pageTitle}</div>
             </nav>
 
             <button

ui/src/components/users/UserSelect.svelte

@@ -23,7 +23,7 @@
 
     $: canLoadMore = totalItems > list.length;
 
-    loadList();
+    loadList(true);
 
     loadSelected();
 

ui/src/scss/_accordion.scss

@@ -132,15 +132,3 @@
         }
     }
 }
-
-.field-accordion {
-    &.active {
-        .accordion-header {
-            padding-right: var(--smSpacing);
-            &:after {
-                content: none;
-                display: none;
-            }
-        }
-    }
-}

ui/src/scss/_form.scss

@@ -227,7 +227,16 @@ button {
         border-radius: 50%;
         padding: 0;
         i {
+            $iconSize: 23px;
             font-size: 1.2857rem;
+            text-align: center;
+            width: $iconSize;
+            height: $iconSize;
+            line-height: $iconSize;
+            &:before {
+                margin: 0;
+                display: block;
+            }
         }
         &.btn-sm i,
         &.btn-xs i {
@@ -340,7 +349,7 @@ button {
         border-color: var(--baseAlt2Color);
     }
     &.txt-mono {
-        font-size: var(--smFontSize);
+        line-height: var(--smLineHeight);
     }
 }
 
@@ -400,7 +409,7 @@ select {
     label {
         display: flex;
         width: 100%;
-        column-gap: 10px;
+        column-gap: 5px;
         align-items: center;
         user-select: none;
         font-weight: 600;
@@ -427,9 +436,6 @@ select {
             line-height: 1;
             margin-top: -2px;
             margin-bottom: -2px;
-            + .txt {
-                margin-left: -5px;
-            }
         }
     }
     %input, label {
@@ -478,7 +484,8 @@ select {
     }
 
     // states
-    &.error {
+    &.error,
+    &.invalid {
         .help-block-error {
             color: var(--dangerColor);
         }
@@ -486,11 +493,17 @@ select {
             color: var(--dangerColor);
         }
     }
+    &.invalid {
+        label, %input {
+            background: var(--dangerAltColor);
+        }
+    }
     &.required:not(.form-field-toggle) {
         > label:after {
             content: '*';
             color: var(--dangerColor);
-            margin-left: -7px;
+            margin-top: -2px;
+            margin-left: -2px;
         }
     }
     &.disabled {

ui/src/scss/_overlay_panel.scss

@@ -79,8 +79,8 @@
             text-align: center;
             font-size: 1.6rem;
             line-height: 1;
-            border-top-left-radius: $size;
-            border-bottom-left-radius: $size;
+            border-top-left-radius: 50%;
+            border-bottom-left-radius: 50%;
             border-top-right-radius: 0;
             border-bottom-right-radius: 0;
             color: #fff;
@@ -154,7 +154,7 @@
         width: 850px;
     }
     &.overlay-panel-lg {
-        width: 650px;
+        width: 700px;
     }
     &.overlay-panel-sm {
         width: 460px;
@@ -188,13 +188,30 @@
             padding-top: calc(var(--baseSpacing) - 5px);
         }
     }
+    &.compact-header {
+        .panel-header {
+            row-gap: var(--smSpacing);
+        }
+    }
     &.image-preview {
         width: auto;
         min-width: 300px;
         max-width: 70%;
+        max-height: 90%;
         .panel-header {
             position: absolute;
             z-index: 99;
+            .overlay-close {
+                left: 100%;
+                right: auto;
+                border-top-left-radius: 0;
+                border-bottom-left-radius: 0;
+                border-top-right-radius: 50%;
+                border-bottom-right-radius: 50%;
+                i {
+                    margin-right: 5px;
+                }
+            }
         }
         .panel-header,
         .panel-footer {

ui/src/scss/_vars.scss

@@ -20,7 +20,7 @@
     --infoColor:       #3da9fc;
     --infoAltColor:    #d8eefe;
     --successColor:    #2cb67d;
-    --successAltColor: #daf6ea;
+    --successAltColor: #d6f5e8;
     --dangerColor:     #ef4565;
     --dangerAltColor:  #fcdee4;
     --warningColor:    #ff8e3c;

ui/src/stores/app.js

@@ -0,0 +1,5 @@
+import { writable } from "svelte/store";
+
+export const pageTitle = writable('');
+
+export const appName = writable('');

ui/src/utils/CommonHelper.js

@@ -118,15 +118,15 @@ export default class CommonHelper {
      * Normalizes and returns arr as a valid array instance (if not already).
      *
      * @param  {Array}   arr
-     * @param  {Boolean} [allowNull]
+     * @param  {Boolean} [allowEmpty]
      * @return {Array}
      */
-    static toArray(arr, allowNull = false) {
+    static toArray(arr, allowEmpty = false) {
         if (Array.isArray(arr)) {
             return arr;
         }
 
-        return (allowNull || arr !== null) && typeof arr !== "undefined" ? [arr] : [];
+        return (allowEmpty || !CommonHelper.isEmpty(arr)) && typeof arr !== "undefined" ? [arr] : [];
     }
 
     /**
@@ -859,25 +859,6 @@ export default class CommonHelper {
         });
     }
 
-    /**
-     * Updates the page document title.
-     *
-     * @param {String} title
-     * @param {String} [suffix]
-     */
-    static setDocumentTitle(title, suffix = "PocketBase") {
-        let parts = [];
-        if (!CommonHelper.isEmpty(title)) {
-            parts.push(title.trim());
-        }
-
-        if (!CommonHelper.isEmpty(suffix)) {
-            parts.push(suffix.trim());
-        }
-
-        document.title = parts.join(' - ')
-    }
-
     /**
      * Normalizes and append a value to the provided form data.
      *