Free and open low code
Build and host powerful applications with full control and ownership
+
+ 
+ Live demo + - + News + - + Downloads + - + Documentation + - + Applications +
+ +Free yourself from walled gardens and cloud-only SaaS offerings. REI3 enables powerful low code applications, selfhosted in the cloud or on-premise. Create and then use, share or even sell your REI3 applications.
+ + + + +## :star: Features +* **Fast results**: Quickly replace spreadsheet based 'solutions' with proper multi-user applications. +* **It can count**: Summarize records, do date calculations, apply business rules and much more. +* **Make things visible**: Show tasks on Gantt charts, generate diagrams or display information-dense lists. +* **Workflows included**: Adjust forms based on the current state of a record, export to PDF or send notifications. +* **Compliance tools**: With roles and access policies, REI3 can give and restrict access globally or for specific records. +* **End-to-end encryption**: Built-in support for E2EE - easy to use with integrated key management features. +* **Integration options**: REI3 can serve as and call REST endpoints, create or import CSV files and offer ICS for accessing calendars. +* **Ready for mobile**: Works well on all devices, with specific mobile settings and PWA features for great-feeling apps. +* **Fulltext search**: Users can quickly find desired content by using search phrases and language specific lookups. +* **Many inputs available**: From simple date ranges, to drawing inputs for signatures, to bar- & QR code inputs that can scan codes via camera - REI3 offers a growing list of input types for various needs. +* **Blazingly fast**: REI3 takes advantage of multi-core processors and communicates with clients over bi-directional data channels. +* **Security features**: Apply password policies, block brute-force attempts and enable MFA for your users. +* **Fully transparent**: Directly read and even change data in the REI3 database - everything is human-readable. +* **Selfhosted**: Run REI3 as you wish, locally or in the cloud - with full control on where your data is located. +* **Enterprise-ready**: Adjust REI3 to your corporate identity, manage users & access via LDAP and grow with your organization by extending applications and clustering REI3. + + + + + +## :rocket: Quickstart +### Linux +1. Extract the REI3 package ([x64](https://rei3.de/latest/x64_linux)/[arm64](https://rei3.de/latest/arm64_linux)) to any location (like `/opt/rei3`) and make the binary `r3` executable (`chmod u+x r3`). +1. Copy the file `config_template.json` to `config.json` and fill in details to an empty, UTF8 encoded Postgres database. The DB user needs full permissions to this database. +1. Install optional dependencies - ImageMagick & Ghostscript for image and PDF thumbnails (`sudo apt install imagemagick ghostscript`), PostgreSQL client utilities for integrated backups (`sudo apt install postgresql-client`). +1. Register (`sudo ./r3 -install`) and start REI3 with your service manager (`sudo systemctl start rei3`). +### Windows +1. Setup the standalone version directly on any Windows Server with the [installer](https://rei3.de/latest/x64_installer). +1. Optionally, install [Ghostscript](https://www.ghostscript.com/) on the same Windows Server for PDF thumbnails. + +Once running, REI3 is available at https://localhost (default port 443) with both username and password being `admin`. For the full documentation, visit [rei3.de](https://rei3.de/en/docs). + +If you plan to run REI3 behind a proxy, please make sure to disable client timeouts for websockets. More details [here](https://rei3.de/en/docs/admin#proxies). + +There are also Docker Compose files ([x64](https://rei3.de/docker_x64)/[arm64](https://rei3.de/docker_arm64)) and a [portable version](https://rei3.de/latest/x64_portable) for Windows available to quickly setup a test or development system. + +## :bulb: Where to get help +You can visit our [community forum](https://community.rei3.de) for anything related to REI3. The full documentation is available on [rei3.de](https://rei3.de/en/docs), including documentation for [admins](https://rei3.de/en/docs/admin) and [application authors](https://rei3.de/en/docs/builder) as well as [Youtube videos](https://www.youtube.com/channel/UCKb1YPyUV-O4GxcCdHc4Csw). + +## :clap: Thank you +REI3 would not be possible without the help of our contributors and people using REI3 and providing feedback for continuous improvement. So thank you to everybody involved with the REI3 project! + +[](https://github.com/r3-team/r3/stargazers) + +REI3 is built on-top of amazing open source software and technologies. Naming them all would take pages, but here are some core libraries and software that helped shape REI3: +* [Golang](https://golang.org/) to enable state-of-the-art web services and robust code even on multi-threaded systems. +* [PostgreSQL](https://www.postgresql.org/) for powerful features and the most reliable database management system we´ve ever had the pleasure to work with. +* [Vue.js](https://vuejs.org/) to provide stable and efficient frontend components and to make working with user interfaces fun. + +## :+1: How to contribute +Contributions are always welcome - feel free to fork and submit pull requests. + +REI3 follows a four-digit versioning syntax, such as `3.2.0.4246` (MAJOR.MINOR.PATCH.BUILD). The major release will stay at `3` indefinitely, while we introduce new features and database changes with each minor release. Patch releases primarily focus on fixes, but may include small features as long as the database is not changed. + +The branch `main` will contain the currently released minor version of REI3; patches for this version can directly be submitted for the main branch. Each new minor release will use a separate branch, which will merge with `main` once the latest minor version is released. + +## :nut_and_bolt: Build REI3 yourself +If you want to build REI3 itself, you can fork this repo or download the source code to build your own executable. The master branch contains the current minor release, while new minor releases are managed in new branches. 1. Install the latest version of [Golang](https://golang.org/dl/). -1. Choose the source code for the version you want to build - usually that´s the master branch, but you can also choose any released version (as in `2.5.1.2980`). 1. Go into the source code directory (where `r3.go` is located) and execute: `go build -ldflags "-X main.appVersion={YOUR_APP_VERSION}"`. * Replace `{YOUR_APP_VERSION}` with the version of the extracted source code. Example: `go build -ldflags "-X main.appVersion=2.5.1.2980"` * You can change the build version anytime. If you want to upgrade the major/minor version numbers however, you need to deal with upgrading the REI3 database (see `db/upgrade/upgrade.go`). * By setting the environment parameter `GOOS`, you can cross-compile for other systems (`GOOS=windows`, `GOOS=linux`, ...). - * Since REI3 2.5, static resource files (HTML, JS, CSS, etc.) are embedded into the binary during compilation - so changes to these files are only reflected after you recompile. Alternatively, you can use the `-wwwpath` command line argument to load REI3 with an external `www` directory, in which you can make changes directly. + * Static resource files (HTML, JS, CSS, etc.) are embedded into the binary during compilation - so changes to these files are only reflected after you recompile. Alternatively, you can use the `-wwwpath` command line argument to load REI3 with an external `www` directory, in which you can make changes directly. 1. Use your new, compiled binary of REI3 to replace an already installed one. -1. You are now running your own version of REI3. - -## 📇 Technologies -The REI3 server application is built on [Golang](https://golang.org/) with the frontend primarily based on [Vue.js](https://vuejs.org/). By using modern web standards, REI3 applications run very fast (cached application schemas, data-only websocket transfers) and can optionally be installed as progressive web apps (PWA) on client devices. +1. You can now start your own REI3 version. Make sure to clear all browser caches after creating/updating your own version. -REI3 heavily relies on [PostgreSQL](https://www.postgresql.org/) for data management, storage and backend functions. +## :page_with_curl: Copyright, license & trademark +REI3© 2019-2025 Gabriel Victor Herbert -## 👏 How to contribute -Contributions are always welcome - feel free to fork and submit pull requests. +The REI3 source code is released under the [MIT license](https://opensource.org/license/mit). -REI3 follows a four-digit versioning syntax, such as 3.2.0.4246 (MAJOR.MINOR.PATCH.BUILD). The major release will stay at 3 indefinitely, while we introduce new features and database changes with each minor release. Patch releases primarily focus on fixes, but may include small features as long as the database is not changed. - -The branch `main` will contain the currently released minor version of REI3; patches for this version can directly be submitted for the main branch. Each new minor release will use a separate branch, which will merge with `main` once the latest minor version is released. +REI3® is a registered trademark (class 42, number 30 2024 242 850). While the source code is open, we protect the name to differentiate our releases and services around REI3. If you intend to release third party extensions or versions of REI3 itself, please [get in contact](https://leansw.de/en/contact) with us to avoid issues with the REI3 trademark. diff --git a/backup/backup.go b/backup/backup.go index d69a32c4..0af22879 100644 --- a/backup/backup.go +++ b/backup/backup.go @@ -7,12 +7,11 @@ import ( "os" "os/exec" "path/filepath" - "r3/compress" "r3/config" "r3/log" "r3/tools" + "r3/tools/compress" "r3/types" - "strconv" "sync" ) @@ -164,7 +163,7 @@ func jobBackup(tocFile *types.BackupTocFile, jobName string) error { // database backup dbPath := filepath.Join(jobDir, subPathDb) - if err := os.MkdirAll(dbPath, 0700); err != nil { + if err := os.MkdirAll(dbPath, 0755); err != nil { return err } if err := dumpDb(dbPath); err != nil { @@ -196,14 +195,8 @@ func jobBackup(tocFile *types.BackupTocFile, jobName string) error { } // update TOC file - _, _, appBuild, _ := config.GetAppVersions() - appBuildInt, err := strconv.Atoi(appBuild) - if err != nil { - return err - } - tocFile.Backups = append(tocFile.Backups, types.BackupDef{ - AppBuild: appBuildInt, + AppBuild: config.GetAppVersion().Build, JobName: jobName, Timestamp: newTimestamp, }) @@ -219,6 +212,7 @@ func dumpDb(path string) error { args := []string{ "-h", config.File.Db.Host, "-p", fmt.Sprintf("%d", config.File.Db.Port), + "-d", config.File.Db.Name, "-U", config.File.Db.User, "-j", "4", // number of parallel jobs "-Fd", // custom format, to file directory diff --git a/bruteforce/bruteforce.go b/bruteforce/bruteforce.go index 5c15d796..5bd57ea3 100644 --- a/bruteforce/bruteforce.go +++ b/bruteforce/bruteforce.go @@ -9,7 +9,7 @@ import ( ) var ( - access_mx sync.Mutex + access_mx sync.RWMutex attempts int = 100 // max allowed failed attempts before block enabled bool = false // enable bruteforce protection @@ -30,8 +30,8 @@ func SetConfig() { // returns counts of tracked and blocked hosts func GetCounts() (int, int) { - access_mx.Lock() - defer access_mx.Unlock() + access_mx.RLock() + defer access_mx.RUnlock() return len(hostMapTracked), len(hostMapBlocked) } @@ -47,9 +47,8 @@ func Check(r *http.Request) bool { // like Check() but with host string instead of http.Request func CheckByHost(host string) bool { - - access_mx.Lock() - defer access_mx.Unlock() + access_mx.RLock() + defer access_mx.RUnlock() if !enabled { return false @@ -100,7 +99,6 @@ func BadAttemptByHost(host string) { } func ClearHostMap() error { - access_mx.Lock() defer access_mx.Unlock() diff --git a/cache/cache_access.go b/cache/cache_access.go index bcb7c913..3bf893ba 100644 --- a/cache/cache_access.go +++ b/cache/cache_access.go @@ -1,79 +1,110 @@ package cache import ( + "context" "errors" + "fmt" "r3/db" "r3/types" "sync" "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) var ( - access_mx sync.Mutex + access_mx sync.RWMutex loginIdMapAccess = make(map[int64]types.LoginAccess) // access permissions by login ID ) // get effective access for specified login +// access cache is created when authentication occurs +// if no access cache exists, authentication did not occur func GetAccessById(loginId int64) (types.LoginAccess, error) { - if loginId == 0 { return types.LoginAccess{}, errors.New("invalid login ID 0") } - access_mx.Lock() - defer access_mx.Unlock() + access_mx.RLock() + defer access_mx.RUnlock() - if _, exists := loginIdMapAccess[loginId]; !exists { - if err := load(loginId); err != nil { - return types.LoginAccess{}, err - } + if accessMap, exists := loginIdMapAccess[loginId]; exists { + return accessMap, nil } - return loginIdMapAccess[loginId], nil + return types.LoginAccess{}, fmt.Errorf("missing access cache for login %d", loginId) } -// renew permissions for all cached logins -func RenewAccessAll() error { +// load access cache for one login +func LoadAccessIfUnknown(loginId int64) error { + access_mx.RLock() + _, exists := loginIdMapAccess[loginId] + access_mx.RUnlock() + if exists { + return nil + } + + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) + + if err := load_tx(ctx, tx, loginId); err != nil { + return err + } + return tx.Commit(ctx) +} + +// renew permissions for all known logins +func RenewAccessAll_tx(ctx context.Context, tx pgx.Tx) error { for loginId, _ := range loginIdMapAccess { - if err := RenewAccessById(loginId); err != nil { + if err := RenewAccessById_tx(ctx, tx, loginId); err != nil { return err } } return nil } -// renew permissions for one login -func RenewAccessById(loginId int64) error { - access_mx.Lock() - defer access_mx.Unlock() - - if _, exists := loginIdMapAccess[loginId]; !exists { +// renew permissions for one known login +func RenewAccessById_tx(ctx context.Context, tx pgx.Tx, loginId int64) error { + access_mx.RLock() + _, exists := loginIdMapAccess[loginId] + access_mx.RUnlock() + if !exists { return nil } - return load(loginId) + return load_tx(ctx, tx, loginId) } // load access permissions for login ID into cache -func load(loginId int64) error { - Schema_mx.RLock() - defer Schema_mx.RUnlock() +func load_tx(ctx context.Context, tx pgx.Tx, loginId int64) error { - roleIds, err := loadRoleIds(loginId) + roleIds, err := loadRoleIds_tx(ctx, tx, loginId) if err != nil { return err } + Schema_mx.RLock() + defer Schema_mx.RUnlock() + access_mx.Lock() + defer access_mx.Unlock() + loginIdMapAccess[loginId] = types.LoginAccess{ - RoleIds: roleIds, - Api: make(map[uuid.UUID]int), - Attribute: make(map[uuid.UUID]int), - Collection: make(map[uuid.UUID]int), - Menu: make(map[uuid.UUID]int), - Relation: make(map[uuid.UUID]int), + RoleIds: roleIds, + Api: make(map[uuid.UUID]int), + Attribute: make(map[uuid.UUID]int), + ClientEvent: make(map[uuid.UUID]int), + Collection: make(map[uuid.UUID]int), + Menu: make(map[uuid.UUID]int), + Relation: make(map[uuid.UUID]int), + Widget: make(map[uuid.UUID]int), } for _, roleId := range roleIds { - role, _ := RoleIdMap[roleId] + role := RoleIdMap[roleId] // because access rights work cumulatively, apply highest right only for id, access := range role.AccessApis { @@ -90,6 +121,13 @@ func load(loginId int64) error { loginIdMapAccess[loginId].Attribute[id] = access } } + for id, access := range role.AccessClientEvents { + if _, exists := loginIdMapAccess[loginId].ClientEvent[id]; !exists || + loginIdMapAccess[loginId].ClientEvent[id] < access { + + loginIdMapAccess[loginId].ClientEvent[id] = access + } + } for id, access := range role.AccessCollections { if _, exists := loginIdMapAccess[loginId].Collection[id]; !exists || loginIdMapAccess[loginId].Collection[id] < access { @@ -111,15 +149,21 @@ func load(loginId int64) error { loginIdMapAccess[loginId].Relation[id] = access } } + for id, access := range role.AccessWidgets { + if _, exists := loginIdMapAccess[loginId].Widget[id]; !exists || + loginIdMapAccess[loginId].Widget[id] < access { + + loginIdMapAccess[loginId].Widget[id] = access + } + } } return nil } -func loadRoleIds(loginId int64) ([]uuid.UUID, error) { - +func loadRoleIds_tx(ctx context.Context, tx pgx.Tx, loginId int64) ([]uuid.UUID, error) { roleIds := make([]uuid.UUID, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` -- get nested children of assigned roles WITH RECURSIVE child_ids AS ( SELECT role_id_child @@ -129,10 +173,12 @@ func loadRoleIds(loginId int64) ([]uuid.UUID, error) { FROM instance.login_role WHERE login_id = $1 ) + UNION - SELECT c.role_id_child - FROM app.role_child AS c - INNER JOIN child_ids AS r ON c.role_id = r.role_id_child + + SELECT c.role_id_child + FROM app.role_child AS c + INNER JOIN child_ids AS r ON c.role_id = r.role_id_child ) SELECT * FROM child_ids diff --git a/cache/cache_caption.go b/cache/cache_caption.go index 23bca824..403e4953 100644 --- a/cache/cache_caption.go +++ b/cache/cache_caption.go @@ -1,5 +1,39 @@ package cache +import ( + "context" + "r3/config/captionMap" + "r3/types" + "sync" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" +) + +var ( + caption_mx sync.RWMutex + captionMapCustom types.CaptionMapsAll // custom captions (for local instance) +) + func GetCaptionLanguageCodes() []string { - return []string{"en_us", "de_de", "it_it", "ro_ro"} + return []string{"en_us", "de_de", "ar_eg", "es_es", "fr_fr", "hu_hu", "it_it", "lv_lv", "ro_ro", "zh_cn"} +} + +func GetCaptionMapCustom() types.CaptionMapsAll { + caption_mx.RLock() + defer caption_mx.RUnlock() + return captionMapCustom +} + +func LoadCaptionMapCustom_tx(ctx context.Context, tx pgx.Tx) error { + cus, err := captionMap.Get_tx(ctx, tx, pgtype.UUID{}, "instance") + if err != nil { + return err + } + + caption_mx.Lock() + captionMapCustom = cus + caption_mx.Unlock() + + return nil } diff --git a/cache/cache_cluster.go b/cache/cache_cluster.go index 4c4de131..fb24097d 100644 --- a/cache/cache_cluster.go +++ b/cache/cache_cluster.go @@ -1,44 +1,50 @@ package cache import ( - "os" + "sync" "github.com/gofrs/uuid" ) var ( - hostname string + cluster_mx sync.RWMutex isClusterMaster bool // node is cluster master, only one is allowed nodeId uuid.UUID // ID of node, self assigned on startup if not set nodeName string // name of node, self assigned on startup if not set, overwritable by admin ) -func GetHostname() string { - return hostname -} -func SetHostnameFromOs() error { - var err error - hostname, err = os.Hostname() - return err -} - +// is master func GetIsClusterMaster() bool { + cluster_mx.RLock() + defer cluster_mx.RUnlock() return isClusterMaster } func SetIsClusterMaster(value bool) { + cluster_mx.Lock() + defer cluster_mx.Unlock() isClusterMaster = value } +// node ID func GetNodeId() uuid.UUID { + cluster_mx.RLock() + defer cluster_mx.RUnlock() return nodeId } func SetNodeId(value uuid.UUID) { + cluster_mx.Lock() + defer cluster_mx.Unlock() nodeId = value } +// node name func GetNodeName() string { + cluster_mx.RLock() + defer cluster_mx.RUnlock() return nodeName } func SetNodeName(value string) { + cluster_mx.Lock() + defer cluster_mx.Unlock() nodeName = value } diff --git a/cache/cache_dict.go b/cache/cache_dict.go new file mode 100644 index 00000000..adf48cdb --- /dev/null +++ b/cache/cache_dict.go @@ -0,0 +1,36 @@ +package cache + +import ( + "context" + "slices" + "sync" + + "github.com/jackc/pgx/v5" +) + +var ( + dict []string // list of dictionaries for full text search, read from DB + dict_mx sync.RWMutex +) + +func GetSearchDictionaries() []string { + dict_mx.RLock() + defer dict_mx.RUnlock() + return dict +} + +func GetSearchDictionaryIsValid(entry string) bool { + dict_mx.RLock() + defer dict_mx.RUnlock() + return slices.Contains(dict, entry) +} + +func LoadSearchDictionaries_tx(ctx context.Context, tx pgx.Tx) error { + dict_mx.Lock() + defer dict_mx.Unlock() + + return tx.QueryRow(ctx, ` + SELECT ARRAY_AGG(cfgname::TEXT) + FROM pg_catalog.pg_ts_config + `).Scan(&dict) +} diff --git a/cache/cache_ics.go b/cache/cache_ics.go index 23073e10..b96c759c 100644 --- a/cache/cache_ics.go +++ b/cache/cache_ics.go @@ -1,11 +1,13 @@ package cache import ( + "context" "r3/schema/field" "r3/types" "sync" "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) var ( @@ -13,7 +15,7 @@ var ( fieldIdMapIcs = make(map[uuid.UUID]types.FieldCalendar) ) -func GetCalendarField(fieldId uuid.UUID) (types.FieldCalendar, error) { +func GetCalendarField_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID) (types.FieldCalendar, error) { ics_mx.Lock() defer ics_mx.Unlock() @@ -22,7 +24,7 @@ func GetCalendarField(fieldId uuid.UUID) (types.FieldCalendar, error) { return f, nil } - f, err := field.GetCalendar(fieldId) + f, err := field.GetCalendar_tx(ctx, tx, fieldId) if err != nil { return f, err } diff --git a/cache/cache_ldap.go b/cache/cache_ldap.go index 6b251a53..bce9bc7b 100644 --- a/cache/cache_ldap.go +++ b/cache/cache_ldap.go @@ -2,7 +2,6 @@ package cache import ( "errors" - "r3/ldap" "r3/types" "sync" ) @@ -19,7 +18,6 @@ func GetLdapIdMap() map[int32]types.Ldap { } func GetLdap(id int32) (types.Ldap, error) { - ldap_mx.Lock() defer ldap_mx.Unlock() @@ -30,20 +28,12 @@ func GetLdap(id int32) (types.Ldap, error) { return ldap, nil } -func LoadLdapMap() error { - +func SetLdaps(ldaps []types.Ldap) { ldap_mx.Lock() defer ldap_mx.Unlock() - ldaps, err := ldap.Get() - if err != nil { - return err - } - ldapIdMap = make(map[int32]types.Ldap) - for _, ldap := range ldaps { ldapIdMap[ldap.Id] = ldap } - return nil } diff --git a/cache/cache_mail.go b/cache/cache_mail.go index c598b5fd..0c8721da 100644 --- a/cache/cache_mail.go +++ b/cache/cache_mail.go @@ -1,27 +1,29 @@ package cache import ( + "context" "fmt" - "r3/db" "r3/types" "sync" + + "github.com/jackc/pgx/v5" ) var ( - mail_mx sync.Mutex + mail_mx sync.RWMutex mailAccountIdMap map[int32]types.MailAccount ) func GetMailAccountMap() map[int32]types.MailAccount { - mail_mx.Lock() - defer mail_mx.Unlock() + mail_mx.RLock() + defer mail_mx.RUnlock() return mailAccountIdMap } func GetMailAccount(id int32, mode string) (types.MailAccount, error) { - mail_mx.Lock() - defer mail_mx.Unlock() + mail_mx.RLock() + defer mail_mx.RUnlock() ma, exists := mailAccountIdMap[id] if !exists || mode != ma.Mode { @@ -31,8 +33,8 @@ func GetMailAccount(id int32, mode string) (types.MailAccount, error) { } func GetMailAccountAny(mode string) (types.MailAccount, error) { - mail_mx.Lock() - defer mail_mx.Unlock() + mail_mx.RLock() + defer mail_mx.RUnlock() for _, ma := range mailAccountIdMap { if mode == ma.Mode { @@ -43,21 +45,17 @@ func GetMailAccountAny(mode string) (types.MailAccount, error) { } func GetMailAccountsExist() bool { - mail_mx.Lock() - defer mail_mx.Unlock() + mail_mx.RLock() + defer mail_mx.RUnlock() return len(mailAccountIdMap) != 0 } -func LoadMailAccountMap() error { - mail_mx.Lock() - defer mail_mx.Unlock() - - mailAccountIdMap = make(map[int32]types.MailAccount) +func LoadMailAccountMap_tx(ctx context.Context, tx pgx.Tx) error { - rows, err := db.Pool.Query(db.Ctx, ` - SELECT id, name, mode, username, password, start_tls, send_as, - host_name, host_port + rows, err := tx.Query(ctx, ` + SELECT id, oauth_client_id, name, mode, auth_method, username, + password, start_tls, send_as, host_name, host_port, comment FROM instance.mail_account `) if err != nil { @@ -65,11 +63,16 @@ func LoadMailAccountMap() error { } defer rows.Close() + mail_mx.Lock() + defer mail_mx.Unlock() + + mailAccountIdMap = make(map[int32]types.MailAccount) for rows.Next() { var ma types.MailAccount - if err := rows.Scan(&ma.Id, &ma.Name, &ma.Mode, &ma.Username, &ma.Password, - &ma.StartTls, &ma.SendAs, &ma.HostName, &ma.HostPort); err != nil { + if err := rows.Scan(&ma.Id, &ma.OauthClientId, &ma.Name, &ma.Mode, + &ma.AuthMethod, &ma.Username, &ma.Password, &ma.StartTls, + &ma.SendAs, &ma.HostName, &ma.HostPort, &ma.Comment); err != nil { return err } diff --git a/cache/cache_oauthClient.go b/cache/cache_oauthClient.go new file mode 100644 index 00000000..57620338 --- /dev/null +++ b/cache/cache_oauthClient.go @@ -0,0 +1,61 @@ +package cache + +import ( + "context" + "fmt" + "r3/types" + "sync" + + "github.com/jackc/pgx/v5" +) + +var ( + oauthClient_mx sync.RWMutex + oauthClientIdMap map[int32]types.OauthClient +) + +func GetOauthClientMap() map[int32]types.OauthClient { + oauthClient_mx.RLock() + defer oauthClient_mx.RUnlock() + + return oauthClientIdMap +} + +func GetOauthClient(id int32) (types.OauthClient, error) { + oauthClient_mx.RLock() + defer oauthClient_mx.RUnlock() + + c, exists := oauthClientIdMap[id] + if !exists { + return c, fmt.Errorf("OAUTH client with ID %d does not exist", id) + } + return c, nil +} + +func LoadOauthClientMap_tx(ctx context.Context, tx pgx.Tx) error { + + rows, err := tx.Query(ctx, ` + SELECT id, name, client_id, client_secret, date_expiry, scopes, tenant, token_url + FROM instance.oauth_client + `) + if err != nil { + return err + } + defer rows.Close() + + oauthClient_mx.Lock() + defer oauthClient_mx.Unlock() + oauthClientIdMap = make(map[int32]types.OauthClient) + + for rows.Next() { + var c types.OauthClient + + if err := rows.Scan(&c.Id, &c.Name, &c.ClientId, &c.ClientSecret, + &c.DateExpiry, &c.Scopes, &c.Tenant, &c.TokenUrl); err != nil { + + return err + } + oauthClientIdMap[c.Id] = c + } + return nil +} diff --git a/cache/cache_preset.go b/cache/cache_preset.go index 1fd093a2..74dcb2d3 100644 --- a/cache/cache_preset.go +++ b/cache/cache_preset.go @@ -1,25 +1,26 @@ package cache import ( - "r3/db" + "context" "sync" "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) var ( - preset_mx sync.Mutex + preset_mx sync.RWMutex presetIdMapRecordId map[uuid.UUID]int64 ) func GetPresetRecordIds() map[uuid.UUID]int64 { - preset_mx.Lock() - defer preset_mx.Unlock() + preset_mx.RLock() + defer preset_mx.RUnlock() return presetIdMapRecordId } func GetPresetRecordId(presetId uuid.UUID) int64 { - preset_mx.Lock() - defer preset_mx.Unlock() + preset_mx.RLock() + defer preset_mx.RUnlock() v, exists := presetIdMapRecordId[presetId] if !exists { @@ -28,13 +29,13 @@ func GetPresetRecordId(presetId uuid.UUID) int64 { return v } -func renewPresetRecordIds() error { +func renewPresetRecordIds_tx(ctx context.Context, tx pgx.Tx) error { preset_mx.Lock() defer preset_mx.Unlock() presetIdMapRecordId = make(map[uuid.UUID]int64) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT preset_id, record_id_wofk FROM instance.preset_record `) diff --git a/cache/cache_pwa.go b/cache/cache_pwa.go new file mode 100644 index 00000000..35fb5dab --- /dev/null +++ b/cache/cache_pwa.go @@ -0,0 +1,88 @@ +package cache + +import ( + "context" + "encoding/base64" + "r3/db" + "sync" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" +) + +var ( + pwa_mx sync.RWMutex + pwaIconIdMap = make(map[uuid.UUID]string) + pwaDomainMap = make(map[string]uuid.UUID) // key = sub domain name, value = module ID (for direct app acess) +) + +func GetPwaIcon(id uuid.UUID) (string, error) { + pwa_mx.RLock() + file, exists := pwaIconIdMap[id] + pwa_mx.RUnlock() + + if exists { + return file, nil + } + + var f []byte + if err := db.Pool.QueryRow(context.Background(), ` + SELECT file + FROM app.icon + WHERE id = $1 + `, id).Scan(&f); err != nil { + return file, err + } + file = base64.StdEncoding.EncodeToString(f) + + pwa_mx.Lock() + pwaIconIdMap[id] = file + pwa_mx.Unlock() + + return file, nil +} + +func GetPwaDomainMap() map[string]uuid.UUID { + pwa_mx.RLock() + defer pwa_mx.RUnlock() + + return pwaDomainMap +} + +func GetPwaModuleId(subdomain string) uuid.UUID { + pwa_mx.RLock() + defer pwa_mx.RUnlock() + + id, exists := pwaDomainMap[subdomain] + if !exists { + return uuid.Nil + } + return id +} + +func LoadPwaDomainMap_tx(ctx context.Context, tx pgx.Tx) error { + pwa_mx.Lock() + defer pwa_mx.Unlock() + + pwaDomainMap = make(map[string]uuid.UUID) + + rows, err := tx.Query(ctx, ` + SELECT module_id, domain + FROM instance.pwa_domain + `) + if err != nil { + return err + } + defer rows.Close() + + for rows.Next() { + var modId uuid.UUID + var domain string + + if err := rows.Scan(&modId, &domain); err != nil { + return err + } + pwaDomainMap[domain] = modId + } + return nil +} diff --git a/cache/cache_schema.go b/cache/cache_schema.go index f6c53a17..ccafea33 100644 --- a/cache/cache_schema.go +++ b/cache/cache_schema.go @@ -4,21 +4,21 @@ package cache import ( + "context" "encoding/json" "fmt" - "r3/config" - "r3/db" + "r3/config/module_meta" "r3/log" - "r3/module_option" "r3/schema/api" "r3/schema/article" "r3/schema/attribute" + "r3/schema/clientEvent" "r3/schema/collection" "r3/schema/form" "r3/schema/icon" "r3/schema/jsFunction" "r3/schema/loginForm" - "r3/schema/menu" + "r3/schema/menuTab" "r3/schema/module" "r3/schema/pgFunction" "r3/schema/pgIndex" @@ -26,140 +26,143 @@ import ( "r3/schema/preset" "r3/schema/relation" "r3/schema/role" + "r3/schema/variable" + "r3/schema/widget" "r3/tools" "r3/types" "sync" "github.com/gofrs/uuid" - "github.com/jackc/pgx/v5/pgtype" + "github.com/jackc/pgx/v5" + "golang.org/x/exp/maps" ) -type schemaCacheType struct { - Modules []types.Module `json:"modules"` - ModuleOptions []types.ModuleOption `json:"moduleOptions"` - PresetRecordIds map[uuid.UUID]int64 `json:"presetRecordIds"` -} - var ( // schema cache access and state Schema_mx sync.RWMutex - // cached entities for regular use during normal operation - ModuleIdMap map[uuid.UUID]types.Module // all modules by ID - ModuleApiNameMapId map[string]map[string]uuid.UUID // all API IDs by module+API name - RelationIdMap map[uuid.UUID]types.Relation // all relations by ID - AttributeIdMap map[uuid.UUID]types.Attribute // all attributes by ID - RoleIdMap map[uuid.UUID]types.Role // all roles by ID - PgFunctionIdMap map[uuid.UUID]types.PgFunction // all PG functions by ID - ApiIdMap map[uuid.UUID]types.Api // all APIs by ID - // schema cache - moduleIdsOrdered []uuid.UUID // all module IDs in desired order - schemaCacheJson json.RawMessage // full schema cache as JSON - schemaTimestamp int64 // timestamp of last update to schema cache + moduleIdMapJson = make(map[uuid.UUID]json.RawMessage) // ID map of module definition as JSON + moduleIdMapMeta = make(map[uuid.UUID]types.ModuleMeta) // ID map of module meta data + + // cached entities for regular use during normal operation + ModuleIdMap = make(map[uuid.UUID]types.Module) // all modules by ID + ModuleApiNameMapId = make(map[string]map[string]uuid.UUID) // all API IDs by module+API name + RelationIdMap = make(map[uuid.UUID]types.Relation) // all relations by ID + AttributeIdMap = make(map[uuid.UUID]types.Attribute) // all attributes by ID + RoleIdMap = make(map[uuid.UUID]types.Role) // all roles by ID + PgFunctionIdMap = make(map[uuid.UUID]types.PgFunction) // all PG functions by ID + ApiIdMap = make(map[uuid.UUID]types.Api) // all APIs by ID + ClientEventIdMap = make(map[uuid.UUID]types.ClientEvent) // all client events by ID ) -func GetSchemaTimestamp() int64 { +func GetModuleIdMapMeta() map[uuid.UUID]types.ModuleMeta { Schema_mx.RLock() defer Schema_mx.RUnlock() - return schemaTimestamp + return moduleIdMapMeta } -func GetSchemaCacheJson() json.RawMessage { +func GetModuleCacheJson(moduleId uuid.UUID) (json.RawMessage, error) { Schema_mx.RLock() defer Schema_mx.RUnlock() - return schemaCacheJson + + json, exists := moduleIdMapJson[moduleId] + if !exists { + return []byte{}, fmt.Errorf("module %s does not exist in schema cache", moduleId) + } + return json, nil +} +func LoadModuleIdMapMeta_tx(ctx context.Context, tx pgx.Tx) error { + moduleIdMapMetaNew, err := module_meta.GetIdMap_tx(ctx, tx) + if err != nil { + return err + } + Schema_mx.Lock() + defer Schema_mx.Unlock() + + // apply deletions if relevant + for id, _ := range moduleIdMapMeta { + if _, exists := moduleIdMapMetaNew[id]; !exists { + delete(ModuleIdMap, id) + delete(moduleIdMapJson, id) + } + } + + // set new meta data + moduleIdMapMeta = moduleIdMapMetaNew + return nil } -// update module schema cache in memory -// takes either single module ID for specific update or NULL for updating all modules -// can just load schema or create a new version timestamp, which forces reload on clients -func UpdateSchema(newVersion bool, moduleIdsUpdateOnly []uuid.UUID) error { +// load all modules into the schema cache +func LoadSchema_tx(ctx context.Context, tx pgx.Tx) error { + return UpdateSchema_tx(ctx, tx, maps.Keys(moduleIdMapMeta), true) +} + +// update module schema cache +func UpdateSchema_tx(ctx context.Context, tx pgx.Tx, moduleIds []uuid.UUID, initialLoad bool) error { var err error - // update schema cache - if err := updateSchemaCache(moduleIdsUpdateOnly); err != nil { + if err := updateSchemaCache_tx(ctx, tx, moduleIds); err != nil { return err } // renew caches, affected by potentially changed modules (preset records, login access) renewIcsFields() - if err := renewPresetRecordIds(); err != nil { + if err := renewPresetRecordIds_tx(ctx, tx); err != nil { return err } // create JSON copy of schema cache for fast retrieval - schemaCache := schemaCacheType{ - Modules: make([]types.Module, 0), - PresetRecordIds: GetPresetRecordIds(), - } - schemaCache.ModuleOptions, err = module_option.Get() - if err != nil { - return err - } - for _, id := range moduleIdsOrdered { - schemaCache.Modules = append(schemaCache.Modules, ModuleIdMap[id]) - } - - schemaCacheJson, err = json.Marshal(schemaCache) - if err != nil { - return err + for _, id := range moduleIds { + Schema_mx.Lock() + moduleIdMapJson[id], err = json.Marshal(ModuleIdMap[id]) + Schema_mx.Unlock() + if err != nil { + return err + } } - // set schema timestamp - // keep timestamp if nothing changed (cache reuse) or renew it (cache refresh) - if !newVersion { - schemaTimestamp = int64(config.GetUint64("schemaTimestamp")) + if initialLoad { return nil } - schemaTimestamp = tools.GetTimeUnix() - tx, err := db.Pool.Begin(db.Ctx) - if err != nil { + // update change date for updated modules + now := tools.GetTimeUnix() + if err := module_meta.SetDateChange_tx(ctx, tx, moduleIds, now); err != nil { return err } - defer tx.Rollback(db.Ctx) - if err := config.SetUint64_tx(tx, "schemaTimestamp", uint64(schemaTimestamp)); err != nil { - return err + // update module meta cache + Schema_mx.Lock() + for _, id := range moduleIds { + meta, exists := moduleIdMapMeta[id] + if !exists { + meta, err = module_meta.Get_tx(ctx, tx, id) + if err != nil { + return err + } + } + meta.DateChange = now + moduleIdMapMeta[id] = meta } - return tx.Commit(db.Ctx) + Schema_mx.Unlock() + return nil } -func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { +func updateSchemaCache_tx(ctx context.Context, tx pgx.Tx, moduleIds []uuid.UUID) error { Schema_mx.Lock() defer Schema_mx.Unlock() - allModules := len(moduleIdsUpdateOnly) == 0 - - if allModules { - log.Info("cache", "starting schema processing for all modules") - moduleIdsOrdered = make([]uuid.UUID, 0) - ModuleIdMap = make(map[uuid.UUID]types.Module) - ModuleApiNameMapId = make(map[string]map[string]uuid.UUID) - RelationIdMap = make(map[uuid.UUID]types.Relation) - AttributeIdMap = make(map[uuid.UUID]types.Attribute) - RoleIdMap = make(map[uuid.UUID]types.Role) - PgFunctionIdMap = make(map[uuid.UUID]types.PgFunction) - ApiIdMap = make(map[uuid.UUID]types.Api) - } else { - log.Info("cache", "starting schema processing for one module") - } + log.Info("cache", fmt.Sprintf("starting schema processing for %d module(s)", len(moduleIds))) - mods, err := module.Get(moduleIdsUpdateOnly) + mods, err := module.Get_tx(ctx, tx, moduleIds) if err != nil { return err } for _, mod := range mods { - - if allModules { - // store returned module order to create ordered cache - moduleIdsOrdered = append(moduleIdsOrdered, mod.Id) - } - log.Info("cache", fmt.Sprintf("parsing module '%s'", mod.Name)) mod.Relations = make([]types.Relation, 0) mod.Forms = make([]types.Form, 0) - mod.Menus = make([]types.Menu, 0) + mod.MenuTabs = make([]types.MenuTab, 0) mod.Icons = make([]types.Icon, 0) mod.Roles = make([]types.Role, 0) mod.Articles = make([]types.Article, 0) @@ -168,12 +171,15 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { mod.JsFunctions = make([]types.JsFunction, 0) mod.Collections = make([]types.Collection, 0) mod.Apis = make([]types.Api, 0) + mod.ClientEvents = make([]types.ClientEvent, 0) + mod.Variables = make([]types.Variable, 0) + mod.Widgets = make([]types.Widget, 0) ModuleApiNameMapId[mod.Name] = make(map[string]uuid.UUID) // get articles log.Info("cache", "load articles") - mod.Articles, err = article.Get(mod.Id) + mod.Articles, err = article.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -181,7 +187,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get relations log.Info("cache", "load relations") - rels, err := relation.Get(mod.Id) + rels, err := relation.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -189,7 +195,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { for _, rel := range rels { // get attributes - atrs, err := attribute.Get(rel.Id) + atrs, err := attribute.Get_tx(ctx, tx, rel.Id) if err != nil { return err } @@ -201,19 +207,13 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { } // get indexes - rel.Indexes, err = pgIndex.Get(rel.Id) + rel.Indexes, err = pgIndex.Get_tx(ctx, tx, rel.Id) if err != nil { return err } // get presets - rel.Presets, err = preset.Get(rel.Id) - if err != nil { - return err - } - - // get triggers - rel.Triggers, err = pgTrigger.Get(rel.Id) + rel.Presets, err = preset.Get_tx(ctx, tx, rel.Id) if err != nil { return err } @@ -226,15 +226,15 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get forms log.Info("cache", "load forms") - mod.Forms, err = form.Get(mod.Id, []uuid.UUID{}) + mod.Forms, err = form.Get_tx(ctx, tx, mod.Id, []uuid.UUID{}) if err != nil { return err } - // get menus - log.Info("cache", "load menus") + // get menu tabs + log.Info("cache", "load menu tabs") - mod.Menus, err = menu.Get(mod.Id, pgtype.UUID{}) + mod.MenuTabs, err = menuTab.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -242,7 +242,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get icons log.Info("cache", "load icons") - mod.Icons, err = icon.Get(mod.Id) + mod.Icons, err = icon.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -250,7 +250,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get roles log.Info("cache", "load roles") - mod.Roles, err = role.Get(mod.Id) + mod.Roles, err = role.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -263,7 +263,13 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get login forms log.Info("cache", "load login forms") - mod.LoginForms, err = loginForm.Get(mod.Id) + mod.LoginForms, err = loginForm.Get_tx(ctx, tx, mod.Id) + if err != nil { + return err + } + + // get triggers + mod.PgTriggers, err = pgTrigger.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -271,7 +277,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // store & backfill PG functions log.Info("cache", "load PG functions") - mod.PgFunctions, err = pgFunction.Get(mod.Id) + mod.PgFunctions, err = pgFunction.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -282,7 +288,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get JS functions log.Info("cache", "load JS functions") - mod.JsFunctions, err = jsFunction.Get(mod.Id) + mod.JsFunctions, err = jsFunction.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -290,7 +296,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get collections log.Info("cache", "load collections") - mod.Collections, err = collection.Get(mod.Id) + mod.Collections, err = collection.Get_tx(ctx, tx, mod.Id) if err != nil { return err } @@ -298,7 +304,7 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { // get APIs log.Info("cache", "load APIs") - mod.Apis, err = api.Get(mod.Id, uuid.Nil) + mod.Apis, err = api.Get_tx(ctx, tx, mod.Id, uuid.Nil) if err != nil { return err } @@ -307,6 +313,33 @@ func updateSchemaCache(moduleIdsUpdateOnly []uuid.UUID) error { ModuleApiNameMapId[mod.Name][fmt.Sprintf("%s.v%d", a.Name, a.Version)] = a.Id } + // get client events + log.Info("cache", "load client events") + + mod.ClientEvents, err = clientEvent.Get_tx(ctx, tx, mod.Id) + if err != nil { + return err + } + for _, ce := range mod.ClientEvents { + ClientEventIdMap[ce.Id] = ce + } + + // get variables + log.Info("cache", "load variables") + + mod.Variables, err = variable.Get_tx(ctx, tx, mod.Id) + if err != nil { + return err + } + + // get widgets + log.Info("cache", "load widgets") + + mod.Widgets, err = widget.Get_tx(ctx, tx, mod.Id) + if err != nil { + return err + } + // update cache map with parsed module ModuleIdMap[mod.Id] = mod } diff --git a/cache/clients/r3_client_amd64_linux.bin b/cache/clients/r3_client_amd64_linux.bin index fb1a418a..86654269 100644 Binary files a/cache/clients/r3_client_amd64_linux.bin and b/cache/clients/r3_client_amd64_linux.bin differ diff --git a/cache/clients/r3_client_amd64_mac.dmg b/cache/clients/r3_client_amd64_mac.dmg index 8efa56c9..6a1f6610 100644 Binary files a/cache/clients/r3_client_amd64_mac.dmg and b/cache/clients/r3_client_amd64_mac.dmg differ diff --git a/cache/clients/r3_client_amd64_win.exe b/cache/clients/r3_client_amd64_win.exe index 21392ff0..b4bde242 100644 Binary files a/cache/clients/r3_client_amd64_win.exe and b/cache/clients/r3_client_amd64_win.exe differ diff --git a/cache/clients/r3_client_arm64_linux.bin b/cache/clients/r3_client_arm64_linux.bin index 060473cd..e5c81d81 100644 Binary files a/cache/clients/r3_client_arm64_linux.bin and b/cache/clients/r3_client_arm64_linux.bin differ diff --git a/cache/packages/core_company.rei3 b/cache/packages/core_company.rei3 index 9a9bae08..30d694af 100644 Binary files a/cache/packages/core_company.rei3 and b/cache/packages/core_company.rei3 differ diff --git a/cluster/cluster.go b/cluster/cluster.go index 4bf8d9ff..449e671a 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -1,6 +1,7 @@ package cluster import ( + "context" "encoding/json" "r3/cache" "r3/config" @@ -11,21 +12,17 @@ import ( "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" ) var ( SchedulerRestart = make(chan bool, 10) - websocketClientCount int - WebsocketClientEvents = make(chan types.ClusterWebsocketClientEvent, 10) + WebsocketClientEvents = make(chan types.ClusterEvent, 10) ) -func SetWebsocketClientCount(value int) { - websocketClientCount = value -} - // register cluster node with shared database // read existing node ID from configuration file if exists -func StartNode() error { +func StartNode_tx(ctx context.Context, tx pgx.Tx) error { // create node ID for itself if it does not exist yet if config.File.Cluster.NodeId == "" { @@ -50,7 +47,7 @@ func StartNode() error { // check whether node is already registered var nodeName string - err = db.Pool.QueryRow(db.Ctx, ` + err = tx.QueryRow(ctx, ` SELECT name FROM instance_cluster.node WHERE id = $1 @@ -63,23 +60,23 @@ func StartNode() error { if !exists { // generate new node name - if err := db.Pool.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT CONCAT('node',(COUNT(*)+1)::TEXT) FROM instance_cluster.node `).Scan(&nodeName); err != nil { return err } - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO instance_cluster.node (id,name,hostname,date_started, - date_check_in,stat_sessions,stat_memory,cluster_master,running) - VALUES ($1,$2,$3,$4,0,-1,-1,false,true) - `, nodeId, nodeName, cache.GetHostname(), tools.GetTimeUnix()); err != nil { + date_check_in,stat_memory,cluster_master,running) + VALUES ($1,$2,$3,$4,0,-1,false,true) + `, nodeId, nodeName, config.GetHostname(), tools.GetTimeUnix()); err != nil { return err } } else { // node is starting up - set start time, disable master role and delete missed events - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE instance_cluster.node SET date_started = $1, cluster_master = false, running = true WHERE id = $2 @@ -87,7 +84,7 @@ func StartNode() error { return err } - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM instance_cluster.node_event WHERE node_id = $1 `, nodeId); err != nil { @@ -101,28 +98,28 @@ func StartNode() error { log.SetNodeId(nodeId) return nil } -func StopNode() error { +func StopNode(ctx context.Context) error { // on shutdown: Give up master role and disable running state - _, err := db.Pool.Exec(db.Ctx, ` + _, err := db.Pool.Exec(ctx, ` UPDATE instance_cluster.node SET cluster_master = false, running = false WHERE id = $1 `, cache.GetNodeId()) return err } -func DelNode_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := db.Pool.Exec(db.Ctx, ` +func DelNode_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, ` DELETE FROM instance_cluster.node WHERE id = $1 `, id) return err } -func GetNodes() ([]types.ClusterNode, error) { +func GetNodes_tx(ctx context.Context, tx pgx.Tx) ([]types.ClusterNode, error) { nodes := make([]types.ClusterNode, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, name, hostname, cluster_master, running, - date_check_in, date_started, stat_memory, stat_sessions + date_check_in, date_started, stat_memory FROM instance_cluster.node ORDER BY name `) @@ -135,8 +132,7 @@ func GetNodes() ([]types.ClusterNode, error) { var n types.ClusterNode if err := rows.Scan(&n.Id, &n.Name, &n.Hostname, &n.ClusterMaster, - &n.Running, &n.DateCheckIn, &n.DateStarted, &n.StatMemory, - &n.StatSessions); err != nil { + &n.Running, &n.DateCheckIn, &n.DateStarted, &n.StatMemory); err != nil { return nodes, err } @@ -144,8 +140,8 @@ func GetNodes() ([]types.ClusterNode, error) { } return nodes, nil } -func SetNode_tx(tx pgx.Tx, id uuid.UUID, name string) error { - _, err := db.Pool.Exec(db.Ctx, ` +func SetNode_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID, name string) error { + _, err := tx.Exec(ctx, ` UPDATE instance_cluster.node SET name = $1 WHERE id = $2 @@ -154,29 +150,60 @@ func SetNode_tx(tx pgx.Tx, id uuid.UUID, name string) error { } // helper -func CreateEventForNode(nodeId uuid.UUID, content string, payload interface{}) error { +// creates node events to some nodes (by node IDs) or all but the current node (if no node IDs are given) +func CreateEventForNodes_tx(ctx context.Context, tx pgx.Tx, nodeIds []uuid.UUID, content string, payload interface{}, target types.ClusterEventTarget) error { payloadJson, err := json.Marshal(payload) if err != nil { return err } - _, err = db.Pool.Exec(db.Ctx, ` - INSERT INTO instance_cluster.node_event (node_id,content,payload) - VALUES ($1,$2,$3) - `, nodeId, content, payloadJson) - return err -} -func createEventsForOtherNodes(content string, payload interface{}) error { - payloadJson, err := json.Marshal(payload) - if err != nil { - return err + address := pgtype.Text{ + String: target.Address, + Valid: target.Address != "", + } + device := pgtype.Int2{ + Int16: int16(target.Device), + Valid: target.Device != 0, + } + loginId := pgtype.Int8{ + Int64: target.LoginId, + Valid: target.LoginId != 0, } - _, err = db.Pool.Exec(db.Ctx, ` - INSERT INTO instance_cluster.node_event (node_id,content,payload) - SELECT id,$1,$2 - FROM instance_cluster.node - WHERE id <> $3 - `, content, payloadJson, cache.GetNodeId()) - return err + // only generate events for nodes that have checked in within the last hour + // node events are temporary and not relevant for nodes checking in after the fact + checkInCutOff := tools.GetTimeUnix() - 3600 + + if len(nodeIds) == 0 { + // if no node IDs are defined, apply to all other nodes + if _, err := tx.Exec(ctx, ` + INSERT INTO instance_cluster.node_event ( + node_id, content, payload, target_address, + target_device, target_login_id + ) + SELECT id, $1, $2, $3, $4, $5 + FROM instance_cluster.node + WHERE id <> $6 + AND date_check_in > $7 + `, content, payloadJson, address, device, loginId, cache.GetNodeId(), checkInCutOff); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO instance_cluster.node_event ( + node_id, content, payload, target_address, + target_device, target_login_id + ) + SELECT id, $1, $2, $3, $4, $5 + FROM instance_cluster.node + WHERE id = ANY($6) + AND date_check_in > $7 + `, content, payloadJson, address, device, loginId, nodeIds, checkInCutOff); err != nil { + return err + } + } + return nil +} +func createEventsForOtherNodes_tx(ctx context.Context, tx pgx.Tx, content string, payload interface{}, target types.ClusterEventTarget) error { + return CreateEventForNodes_tx(ctx, tx, []uuid.UUID{}, content, payload, target) } diff --git a/cluster/cluster_tasks.go b/cluster/cluster_tasks.go index 44e6f78e..01169d56 100644 --- a/cluster/cluster_tasks.go +++ b/cluster/cluster_tasks.go @@ -1,8 +1,8 @@ package cluster import ( + "context" "fmt" - "r3/activation" "r3/bruteforce" "r3/cache" "r3/config" @@ -22,20 +22,17 @@ func CheckInNode() error { var m runtime.MemStats runtime.ReadMemStats(&m) - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := db.Pool.Exec(context.Background(), ` UPDATE instance_cluster.node - SET date_check_in = $1, hostname = $2, - stat_memory = $3, stat_sessions = $4 - WHERE id = $5 - `, tools.GetTimeUnix(), cache.GetHostname(), (m.Sys / 1024 / 1024), - websocketClientCount, cache.GetNodeId()); err != nil { - + SET date_check_in = $1, hostname = $2, stat_memory = $3 + WHERE id = $4 + `, tools.GetTimeUnix(), config.GetHostname(), (m.Sys / 1024 / 1024), cache.GetNodeId()); err != nil { return err } // check whether current cluster master is doing its job var masterLastCheckIn int64 - if err := db.Pool.QueryRow(db.Ctx, ` + if err := db.Pool.QueryRow(context.Background(), ` SELECT date_check_in FROM instance_cluster.node WHERE cluster_master @@ -47,7 +44,7 @@ func CheckInNode() error { log.Info("cluster", "node has recognized an absent master, requesting role for itself") // cluster master missing, request cluster master role for this node - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := db.Pool.Exec(context.Background(), ` SELECT instance_cluster.master_role_request($1) `, cache.GetNodeId()); err != nil { return err @@ -57,137 +54,219 @@ func CheckInNode() error { } // events relevant to all cluster nodes -func CollectionUpdated(collectionId uuid.UUID, loginIds []int64) error { +func ClientEventsChanged_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, address string, loginId int64) error { + target := types.ClusterEventTarget{Address: address, Device: types.WebsocketClientDeviceFatClient, LoginId: loginId} - if len(loginIds) == 0 { - // no logins defined, update for all - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: 0, CollectionChanged: collectionId} - return nil + if updateNodes { + if err := createEventsForOtherNodes_tx(ctx, tx, "clientEventsChanged", nil, target); err != nil { + return err + } } - - // logins defined, update for specific logins - for _, id := range loginIds { - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: id, CollectionChanged: collectionId} + WebsocketClientEvents <- types.ClusterEvent{ + Content: "clientEventsChanged", + Payload: nil, + Target: target, } return nil } -func ConfigChanged(updateNodes bool, loadConfigFromDb bool, switchToMaintenance bool) error { +func CollectionsUpdated(updates []types.ClusterEventCollectionUpdated) { + + // if triggers are badly designed or bulk updates executed, many identical collection updates can be triggered at once + collectionIdMapGlobal := make(map[uuid.UUID]bool) + collectionIdMapLogins := make(map[uuid.UUID]map[int64]bool) + + // first, go through global collection updates (for all logins) + for _, upd := range updates { + if len(upd.LoginIds) != 0 { + continue + } + if _, exists := collectionIdMapGlobal[upd.CollectionId]; !exists { + collectionIdMapGlobal[upd.CollectionId] = true + + WebsocketClientEvents <- types.ClusterEvent{ + Content: "collectionChanged", + Payload: upd.CollectionId, + Target: types.ClusterEventTarget{Device: types.WebsocketClientDeviceBrowser}, + } + } + } + + // go through collection updates for specific logins + for _, upd := range updates { + if len(upd.LoginIds) == 0 { + continue + } + + // no need to update for specific logins, if global update already exists + if _, exists := collectionIdMapGlobal[upd.CollectionId]; exists { + continue + } + + // update for specific logins, if not done already + if _, exists := collectionIdMapLogins[upd.CollectionId]; !exists { + collectionIdMapLogins[upd.CollectionId] = make(map[int64]bool) + } + + for _, loginId := range upd.LoginIds { + if _, exists := collectionIdMapLogins[upd.CollectionId][loginId]; !exists { + collectionIdMapLogins[upd.CollectionId][loginId] = true + + WebsocketClientEvents <- types.ClusterEvent{ + Content: "collectionChanged", + Payload: upd.CollectionId, + Target: types.ClusterEventTarget{Device: types.WebsocketClientDeviceBrowser, LoginId: loginId}, + } + } + } + } +} +func ConfigChanged_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, loadConfigFromDb bool, productionModeChange bool) error { if updateNodes { - if err := createEventsForOtherNodes("configChanged", types.ClusterEventConfigChanged{ - SwitchToMaintenance: switchToMaintenance, - }); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "configChanged", productionModeChange, types.ClusterEventTarget{}); err != nil { return err } } // load all config settings from the database if loadConfigFromDb { - config.LoadFromDb() - } - - // update websocket clients if relevant config changed - if switchToMaintenance { - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: 0, KickNonAdmin: true} + config.LoadFromDb_tx(ctx, tx) } // inform clients about changed config - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: 0, ConfigChanged: true} + if productionModeChange { + WebsocketClientEvents <- types.ClusterEvent{Content: "kickNonAdmin"} + } + WebsocketClientEvents <- types.ClusterEvent{Content: "configChanged"} // apply config to other areas - activation.SetLicense() bruteforce.SetConfig() + config.ActivateLicense() config.SetLogLevels() return nil } -func FilesCopied(updateNodes bool, loginId int64, attributeId uuid.UUID, - fileIds []uuid.UUID, recordId int64) error { +func FilesCopied_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, address string, loginId int64, + attributeId uuid.UUID, fileIds []uuid.UUID, recordId int64) error { + + target := types.ClusterEventTarget{Address: address, Device: types.WebsocketClientDeviceBrowser, LoginId: loginId} + payload := types.ClusterEventFilesCopied{ + AttributeId: attributeId, + FileIds: fileIds, + RecordId: recordId, + } if updateNodes { - if err := createEventsForOtherNodes("filesCopied", types.ClusterEventFilesCopied{ - LoginId: loginId, - AttributeId: attributeId, - FileIds: fileIds, - RecordId: recordId, - }); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "filesCopied", payload, target); err != nil { return err } } - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{ - LoginId: loginId, - FilesCopiedAttributeId: attributeId, - FilesCopiedFileIds: fileIds, - FilesCopiedRecordId: recordId, + WebsocketClientEvents <- types.ClusterEvent{ + Content: "filesCopied", + Payload: payload, + Target: target, } return nil } -func FileRequested(updateNodes bool, loginId int64, attributeId uuid.UUID, +func FileRequested_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, address string, loginId int64, attributeId uuid.UUID, fileId uuid.UUID, fileHash string, fileName string, chooseApp bool) error { + target := types.ClusterEventTarget{Address: address, Device: types.WebsocketClientDeviceFatClient, LoginId: loginId} + payload := types.ClusterEventFileRequested{ + AttributeId: attributeId, + ChooseApp: chooseApp, + FileId: fileId, + FileHash: fileHash, + FileName: fileName, + } + + if updateNodes { + if err := createEventsForOtherNodes_tx(ctx, tx, "fileRequested", payload, target); err != nil { + return err + } + } + WebsocketClientEvents <- types.ClusterEvent{ + Content: "fileRequested", + Payload: payload, + Target: target, + } + return nil +} +func JsFunctionCalled_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, address string, + loginId int64, moduleId uuid.UUID, jsFunctionId uuid.UUID, arguments []interface{}) error { + + target := types.ClusterEventTarget{Address: address, Device: types.WebsocketClientDeviceBrowser, LoginId: loginId, PwaModuleIdPreferred: moduleId} + payload := types.ClusterEventJsFunctionCalled{ + ModuleId: moduleId, + JsFunctionId: jsFunctionId, + Arguments: arguments, + } + if updateNodes { - if err := createEventsForOtherNodes("fileRequested", types.ClusterEventFileRequested{ - LoginId: loginId, - AttributeId: attributeId, - ChooseApp: chooseApp, - FileId: fileId, - FileHash: fileHash, - FileName: fileName, - }); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "jsFunctionCalled", payload, target); err != nil { return err } } - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{ - LoginId: loginId, - FileRequestedAttributeId: attributeId, - FileRequestedChooseApp: chooseApp, - FileRequestedFileId: fileId, - FileRequestedFileHash: fileHash, - FileRequestedFileName: fileName, + WebsocketClientEvents <- types.ClusterEvent{ + Content: "jsFunctionCalled", + Payload: payload, + Target: target, } return nil } -func LoginDisabled(updateNodes bool, loginId int64) error { +func KeystrokesRequested_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, address string, loginId int64, keystrokes string) error { + target := types.ClusterEventTarget{Address: address, Device: types.WebsocketClientDeviceFatClient, LoginId: loginId} if updateNodes { - if err := createEventsForOtherNodes("loginDisabled", types.ClusterEventLogin{ - LoginId: loginId, - }); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "keystrokesRequested", keystrokes, target); err != nil { return err } } - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: loginId, Kick: true} + WebsocketClientEvents <- types.ClusterEvent{ + Content: "keystrokesRequested", + Payload: keystrokes, + Target: target, + } + return nil +} +func LoginDisabled_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, loginId int64) error { + target := types.ClusterEventTarget{LoginId: loginId} + if updateNodes { + if err := createEventsForOtherNodes_tx(ctx, tx, "loginDisabled", nil, target); err != nil { + return err + } + } + WebsocketClientEvents <- types.ClusterEvent{Content: "kick", Target: target} return nil } -func LoginReauthorized(updateNodes bool, loginId int64) error { +func LoginReauthorized_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, loginId int64) error { + target := types.ClusterEventTarget{LoginId: loginId} if updateNodes { - if err := createEventsForOtherNodes("loginReauthorized", types.ClusterEventLogin{ - LoginId: loginId, - }); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "loginReauthorized", nil, target); err != nil { return err } } // renew access cache - if err := cache.RenewAccessById(loginId); err != nil { + if err := cache.RenewAccessById_tx(ctx, tx, loginId); err != nil { return err } // inform client to retrieve new access cache - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: loginId, Renew: true} + WebsocketClientEvents <- types.ClusterEvent{Content: "renew", Target: target} return nil } -func LoginReauthorizedAll(updateNodes bool) error { +func LoginReauthorizedAll_tx(ctx context.Context, tx pgx.Tx, updateNodes bool) error { if updateNodes { - if err := createEventsForOtherNodes("loginReauthorizedAll", nil); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "loginReauthorizedAll", nil, types.ClusterEventTarget{}); err != nil { return err } } // renew access cache for all logins - if err := cache.RenewAccessAll(); err != nil { + if err := cache.RenewAccessAll_tx(ctx, tx); err != nil { return err } // inform clients to retrieve new access cache - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: 0, Renew: true} + WebsocketClientEvents <- types.ClusterEvent{Content: "renew"} return nil } func MasterAssigned(state bool) error { @@ -198,48 +277,51 @@ func MasterAssigned(state bool) error { SchedulerRestart <- true return nil } -func SchemaChangedAll(updateNodes bool, newVersion bool) error { - return SchemaChanged(updateNodes, newVersion, make([]uuid.UUID, 0)) -} -func SchemaChanged(updateNodes bool, newVersion bool, moduleIdsUpdateOnly []uuid.UUID) error { +func SchemaChanged_tx(ctx context.Context, tx pgx.Tx, updateNodes bool, moduleIds []uuid.UUID) error { + target := types.ClusterEventTarget{Device: types.WebsocketClientDeviceBrowser} + if updateNodes { - if err := createEventsForOtherNodes("schemaChanged", types.ClusterEventSchemaChanged{ - ModuleIdsUpdateOnly: moduleIdsUpdateOnly, - NewVersion: newVersion, - }); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "schemaChanged", moduleIds, target); err != nil { return err } } // inform all clients about schema reloading - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: 0, SchemaLoading: true} + WebsocketClientEvents <- types.ClusterEvent{Content: "schemaLoading", Target: target} + // inform all clients about schema loading being finished, regardless of success or error defer func() { - // inform regardless of success or error - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{ - LoginId: 0, - SchemaTimestamp: int64(config.GetUint64("schemaTimestamp"))} + WebsocketClientEvents <- types.ClusterEvent{Content: "schemaLoaded", Target: target} }() - if err := cache.UpdateSchema(newVersion, moduleIdsUpdateOnly); err != nil { - return err - } + if len(moduleIds) != 0 { + // modules were changed, update schema & access cache + if err := cache.UpdateSchema_tx(ctx, tx, moduleIds, false); err != nil { + return err + } + if err := cache.RenewAccessAll_tx(ctx, tx); err != nil { + return err + } - // renew access cache for all logins - if err := cache.RenewAccessAll(); err != nil { - return err + // inform clients to retrieve new access cache + WebsocketClientEvents <- types.ClusterEvent{Content: "renew"} + } else { + // no module IDs are given if modules were deleted, module options were changed, or custom captions were updated + if err := cache.LoadModuleIdMapMeta_tx(ctx, tx); err != nil { + return err + } + if err := cache.LoadCaptionMapCustom_tx(ctx, tx); err != nil { + return err + } } - // reload scheduler as module schedules could have changed + // reload scheduler as module schedules could have changed (modules changed or deleted) SchedulerRestart <- true - - // inform clients to retrieve new access cache - WebsocketClientEvents <- types.ClusterWebsocketClientEvent{LoginId: 0, Renew: true} return nil } -func TasksChanged(updateNodes bool) error { +func TasksChanged_tx(ctx context.Context, tx pgx.Tx, updateNodes bool) error { if updateNodes { - if err := createEventsForOtherNodes("tasksChanged", nil); err != nil { + if err := createEventsForOtherNodes_tx(ctx, tx, "tasksChanged", nil, types.ClusterEventTarget{}); err != nil { return err } } diff --git a/compatible/compatible.go b/compatible/compatible.go deleted file mode 100644 index cbcd725f..00000000 --- a/compatible/compatible.go +++ /dev/null @@ -1,249 +0,0 @@ -/* central package for fixing issues with modules from older versions */ -package compatible - -import ( - "encoding/json" - "fmt" - "r3/db" - "r3/tools" - "r3/types" - - "github.com/gofrs/uuid" - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgtype" -) - -// < 3.3 -// migrate attribute content use -func FixAttributeContentUse(contentUse string) string { - if contentUse == "" { - return "default" - } - return contentUse -} -func MigrateDisplayToContentUse_tx(tx pgx.Tx, attributeId uuid.UUID, display string) (string, error) { - - if tools.StringInSlice(display, []string{"textarea", - "richtext", "date", "datetime", "time", "color"}) { - - _, err := tx.Exec(db.Ctx, ` - UPDATE app.attribute - SET content_use = $1 - WHERE id = $2 - `, display, attributeId) - - return "default", err - } - return display, nil -} - -// < 3.2 -// migrate old module/form help pages to help articles -func FixCaptions_tx(tx pgx.Tx, entity string, entityId uuid.UUID, captionMap types.CaptionMap) (types.CaptionMap, error) { - - var articleId uuid.UUID - var moduleId uuid.UUID - var name string - - switch entity { - case "module": - moduleId = entityId - name = "Migrated from application help" - case "form": - if err := tx.QueryRow(db.Ctx, ` - SELECT module_id, CONCAT('Migrated from form help of ', name) - FROM app.form - WHERE id = $1 - `, entityId).Scan(&moduleId, &name); err != nil { - return captionMap, err - } - default: - return captionMap, fmt.Errorf("invalid entity for help->article migration '%s'", entity) - } - - for content, langMap := range captionMap { - if content != "moduleHelp" && content != "formHelp" { - continue - } - - // delete outdated caption entry - delete(captionMap, content) - - // check whether there is anything to migrate - anyValue := false - for _, value := range langMap { - if value != "" { - anyValue = true - break - } - } - if !anyValue { - continue - } - - // check edge case: installed < 3.2 module gets another < 3.2 update - // this would cause duplicates of migration articles - // solution: we do not touch migrated articles until a version >= 3.2 is released, - // in which module authors can handle/update the migrated articles - exists := false - if err := tx.QueryRow(db.Ctx, ` - SELECT EXISTS ( - SELECT id - FROM app.article - WHERE module_id = $1 - AND name = $2 - ) - `, moduleId, name).Scan(&exists); err != nil { - return captionMap, err - } - if exists { - continue - } - - if err := tx.QueryRow(db.Ctx, ` - INSERT INTO app.article (id, module_id, name) - VALUES (gen_random_uuid(), $1, $2) - RETURNING id - `, moduleId, name).Scan(&articleId); err != nil { - return captionMap, err - } - - for langCode, value := range langMap { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.caption (article_id, content, language_code, value) - VALUES ($1, 'articleBody', $2, $3) - `, articleId, langCode, value); err != nil { - return captionMap, err - } - } - - switch content { - case "moduleHelp": - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.article_help (article_id, module_id, position) - VALUES ($1, $2, 0) - `, articleId, moduleId); err != nil { - return captionMap, err - } - case "formHelp": - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.article_form (article_id, form_id, position) - VALUES ($1, $2, 0) - `, articleId, entityId); err != nil { - return captionMap, err - } - } - } - return captionMap, nil -} - -// < 3.1 -// fix legacy file attribute format -func FixLegacyFileAttributeValue(jsonValue []byte) []types.DataGetValueFile { - - // legacy format - var files struct { - Files []types.DataGetValueFile `json:"files"` - } - if err := json.Unmarshal(jsonValue, &files); err == nil && len(files.Files) != 0 { - return files.Files - } - - // current format - var filesNew []types.DataGetValueFile - json.Unmarshal(jsonValue, &filesNew) - return filesNew -} - -// < 2.7 -// migrate to new format of form state conditions -func MigrateNewConditions(c types.FormStateCondition) types.FormStateCondition { - - // if either sides content is filled, new version is used, nothing to do - if c.Side0.Content != "" || c.Side1.Content != "" { - return c - } - - // set empty - c.Side0.CollectionId.Valid = false - c.Side0.ColumnId.Valid = false - c.Side0.FieldId.Valid = false - c.Side0.PresetId.Valid = false - c.Side0.RoleId.Valid = false - c.Side0.Value.Valid = false - c.Side1.CollectionId.Valid = false - c.Side1.ColumnId.Valid = false - c.Side1.FieldId.Valid = false - c.Side1.PresetId.Valid = false - c.Side1.RoleId.Valid = false - c.Side1.Value.Valid = false - - c.Side0.Brackets = c.Brackets0 - c.Side1.Brackets = c.Brackets1 - - if c.FieldChanged.Valid { - c.Side0.Content = "fieldChanged" - c.Side1.Content = "true" - c.Side0.FieldId = c.FieldId0 - - c.Operator = "=" - if !c.FieldChanged.Bool { - c.Operator = "<>" - } - } else if c.NewRecord.Valid { - c.Side0.Content = "recordNew" - c.Side1.Content = "true" - c.Operator = "=" - if !c.NewRecord.Bool { - c.Operator = "<>" - } - } else if c.RoleId.Valid { - c.Side0.Content = "role" - c.Side1.Content = "true" - c.Side0.RoleId = c.RoleId - } else { - if c.FieldId0.Valid { - c.Side0.Content = "field" - c.Side0.FieldId = c.FieldId0 - - if c.Operator == "IS NULL" || c.Operator == "IS NOT NULL" { - c.Side1.Content = "value" - } - } - if c.FieldId1.Valid { - c.Side1.Content = "field" - c.Side1.FieldId = c.FieldId1 - } - if c.Login1.Valid { - c.Side1.Content = "login" - } - if c.PresetId1.Valid { - c.Side1.Content = "preset" - c.Side1.PresetId = c.PresetId1 - } - if c.Value1.Valid && c.Value1.String != "" { - c.Side1.Content = "value" - c.Side1.Value = c.Value1 - } - } - return c -} - -// < 2.6 -// fix empty 'open form' entity for fields -func FixMissingOpenForm(formIdOpen pgtype.UUID, attributeIdRecord pgtype.UUID, - oForm types.OpenForm) types.OpenForm { - - // legacy option was used - if formIdOpen.Valid { - return types.OpenForm{ - FormIdOpen: formIdOpen.Bytes, - AttributeIdApply: attributeIdRecord, - RelationIndex: 0, - PopUp: false, - MaxHeight: 0, - MaxWidth: 0, - } - } - return oForm -} diff --git a/compress/compress.go b/compress/compress.go deleted file mode 100644 index 7c9d47dd..00000000 --- a/compress/compress.go +++ /dev/null @@ -1,69 +0,0 @@ -package compress - -import ( - "archive/zip" - "io" - "os" - "path/filepath" - "strings" -) - -func Path(zipPath string, sourcePath string) error { - - zipFile, err := os.Create(zipPath) - if err != nil { - return err - } - defer zipFile.Close() - - zipWriter := zip.NewWriter(zipFile) - defer zipWriter.Close() - - sourcePathInfo, err := os.Stat(sourcePath) - if err != nil { - return err - } - - var baseDir string - if sourcePathInfo.IsDir() { - baseDir = filepath.Base(sourcePath) - } - - filepath.Walk(sourcePath, func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - - // ignore directories themselves - // included files have header paths which include their respective paths - if info.IsDir() { - return nil - } - - header, err := zip.FileInfoHeader(info) - if err != nil { - return err - } - - if baseDir != "" { - // trim prefix to remove source path from file path inside zip - header.Name = strings.Trim(strings.TrimPrefix(path, filepath.Clean(sourcePath)), "/\\") - } - header.Method = zip.Deflate - - writer, err := zipWriter.CreateHeader(header) - if err != nil { - return err - } - - file, err := os.Open(path) - if err != nil { - return err - } - defer file.Close() - - _, err = io.Copy(writer, file) - return err - }) - return nil -} diff --git a/config/captionMap/captionMap.go b/config/captionMap/captionMap.go new file mode 100644 index 00000000..ad75e8c1 --- /dev/null +++ b/config/captionMap/captionMap.go @@ -0,0 +1,315 @@ +package captionMap + +import ( + "context" + "fmt" + "r3/schema/caption" + "r3/types" + "slices" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" +) + +var captionMapTargets = []string{"app", "instance"} + +func Get_tx(ctx context.Context, tx pgx.Tx, id pgtype.UUID, target string) (types.CaptionMapsAll, error) { + var caps types.CaptionMapsAll + + if !slices.Contains(captionMapTargets, target) { + return caps, fmt.Errorf("invalid target '%s' for caption map", target) + } + + caps.ArticleIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.AttributeIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.ClientEventIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.ColumnIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.FieldIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.FormIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.FormActionIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.JsFunctionIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.LoginFormIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.MenuIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.MenuTabIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.ModuleIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.PgFunctionIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.QueryChoiceIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.RoleIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.TabIdMap = make(map[uuid.UUID]types.CaptionMap) + caps.WidgetIdMap = make(map[uuid.UUID]types.CaptionMap) + + sqlSelect := `SELECT CASE + WHEN article_id IS NOT NULL THEN 'article' + WHEN attribute_id IS NOT NULL THEN 'attribute' + WHEN client_event_id IS NOT NULL THEN 'clientEvent' + WHEN column_id IS NOT NULL THEN 'column' + WHEN field_id IS NOT NULL THEN 'field' + WHEN form_action_id IS NOT NULL THEN 'formAction' + WHEN form_id IS NOT NULL THEN 'form' + WHEN js_function_id IS NOT NULL THEN 'jsFunction' + WHEN login_form_id IS NOT NULL THEN 'loginForm' + WHEN menu_id IS NOT NULL THEN 'menu' + WHEN menu_tab_id IS NOT NULL THEN 'menuTab' + WHEN module_id IS NOT NULL THEN 'module' + WHEN pg_function_id IS NOT NULL THEN 'pgFunction' + WHEN query_choice_id IS NOT NULL THEN 'queryChoice' + WHEN role_id IS NOT NULL THEN 'role' + WHEN tab_id IS NOT NULL THEN 'tab' + WHEN widget_id IS NOT NULL THEN 'widget' + END AS entity, + COALESCE( + article_id, + attribute_id, + client_event_id, + column_id, + field_id, + form_id, + form_action_id, + js_function_id, + login_form_id, + menu_id, + menu_tab_id, + module_id, + pg_function_id, + query_choice_id, + role_id, + tab_id, + widget_id + ) AS entity_id, + content, + language_code, + value` + + // fetch all or captions for a single module + var err error + var rows pgx.Rows + if !id.Valid { + rows, err = tx.Query(ctx, fmt.Sprintf(`%s FROM %s.caption`, sqlSelect, target)) + } else { + rows, err = tx.Query(ctx, fmt.Sprintf(` + %s + FROM %s.caption + WHERE module_id = $1 + OR attribute_id IN ( + SELECT id FROM app.attribute WHERE relation_id IN ( + SELECT id FROM app.relation WHERE module_id = $2 + ) + ) + OR column_id IN ( + SELECT id FROM app.column WHERE field_id IN ( + SELECT id FROM app.field WHERE form_id IN ( + SELECT id FROM app.form WHERE module_id = $3 + ) + ) + OR collection_id IN ( + SELECT id FROM app.collection WHERE module_id = $4 + ) + OR api_id IN ( + SELECT id FROM app.api WHERE module_id = $5 + ) + ) + OR field_id IN ( + SELECT id FROM app.field WHERE form_id IN ( + SELECT id FROM app.form WHERE module_id = $6 + ) + ) + OR form_action_id IN ( + SELECT id FROM app.form_action WHERE form_id IN ( + SELECT id FROM app.form WHERE module_id = $7 + ) + ) + OR menu_id IN ( + SELECT id FROM app.menu WHERE menu_tab_id IN ( + SELECT id FROM app.menu_tab WHERE module_id = $8 + ) + ) + OR tab_id IN ( + SELECT id FROM app.tab WHERE field_id IN ( + SELECT id FROM app.field WHERE form_id IN ( + SELECT id FROM app.form WHERE module_id = $9 + ) + ) + ) + OR query_choice_id IN ( + SELECT id FROM app.query_choice WHERE query_id IN ( + SELECT id FROM app.query + WHERE field_id IN ( + SELECT id FROM app.field WHERE form_id IN ( + SELECT id FROM app.form WHERE module_id = $10 + ) + ) + -- only direct field queries have filter choices and therefore captions + -- most queries do not: form query, collection query, column sub query, filter sub query + ) + ) + OR article_id IN (SELECT id FROM app.article WHERE module_id = $11) + OR client_event_id IN (SELECT id FROM app.client_event WHERE module_id = $12) + OR form_id IN (SELECT id FROM app.form WHERE module_id = $13) + OR js_function_id IN (SELECT id FROM app.js_function WHERE module_id = $14) + OR login_form_id IN (SELECT id FROM app.login_form WHERE module_id = $15) + OR menu_tab_id IN (SELECT id FROM app.menu_tab WHERE module_id = $16) + OR pg_function_id IN (SELECT id FROM app.pg_function WHERE module_id = $17) + OR role_id IN (SELECT id FROM app.role WHERE module_id = $18) + OR widget_id IN (SELECT id FROM app.widget WHERE module_id = $19) + `, sqlSelect, target), id, id, id, id, id, id, id, id, id, id, id, id, id, id, id, id, id, id, id) + } + + if err != nil { + return caps, err + } + defer rows.Close() + + var content string + var entity string + var entityId uuid.UUID + var exists bool + var langCode string + var captionMap types.CaptionMap + var value string + + for rows.Next() { + if err := rows.Scan(&entity, &entityId, &content, &langCode, &value); err != nil { + return caps, err + } + + switch entity { + case "article": + captionMap, exists = caps.ArticleIdMap[entityId] + case "attribute": + captionMap, exists = caps.AttributeIdMap[entityId] + case "clientEvent": + captionMap, exists = caps.ClientEventIdMap[entityId] + case "column": + captionMap, exists = caps.ColumnIdMap[entityId] + case "field": + captionMap, exists = caps.FieldIdMap[entityId] + case "form": + captionMap, exists = caps.FormIdMap[entityId] + case "formAction": + captionMap, exists = caps.FormActionIdMap[entityId] + case "jsFunction": + captionMap, exists = caps.JsFunctionIdMap[entityId] + case "loginForm": + captionMap, exists = caps.LoginFormIdMap[entityId] + case "menu": + captionMap, exists = caps.MenuIdMap[entityId] + case "menuTab": + captionMap, exists = caps.MenuTabIdMap[entityId] + case "module": + captionMap, exists = caps.ModuleIdMap[entityId] + case "pgFunction": + captionMap, exists = caps.PgFunctionIdMap[entityId] + case "queryChoice": + captionMap, exists = caps.QueryChoiceIdMap[entityId] + case "role": + captionMap, exists = caps.RoleIdMap[entityId] + case "tab": + captionMap, exists = caps.TabIdMap[entityId] + case "widget": + captionMap, exists = caps.WidgetIdMap[entityId] + } + + if !exists { + captionMap = caption.GetDefaultContent(entity) + } + captionMap[content][langCode] = value + + switch entity { + case "article": + caps.ArticleIdMap[entityId] = captionMap + case "attribute": + caps.AttributeIdMap[entityId] = captionMap + case "clientEvent": + caps.ClientEventIdMap[entityId] = captionMap + case "column": + caps.ColumnIdMap[entityId] = captionMap + case "field": + caps.FieldIdMap[entityId] = captionMap + case "form": + caps.FormIdMap[entityId] = captionMap + case "formAction": + caps.FormActionIdMap[entityId] = captionMap + case "jsFunction": + caps.JsFunctionIdMap[entityId] = captionMap + case "loginForm": + caps.LoginFormIdMap[entityId] = captionMap + case "menu": + caps.MenuIdMap[entityId] = captionMap + case "menuTab": + caps.MenuTabIdMap[entityId] = captionMap + case "module": + caps.ModuleIdMap[entityId] = captionMap + case "pgFunction": + caps.PgFunctionIdMap[entityId] = captionMap + case "queryChoice": + caps.QueryChoiceIdMap[entityId] = captionMap + case "role": + caps.RoleIdMap[entityId] = captionMap + case "tab": + caps.TabIdMap[entityId] = captionMap + case "widget": + caps.WidgetIdMap[entityId] = captionMap + } + } + return caps, nil +} + +func SetOne_tx(ctx context.Context, tx pgx.Tx, target string, entityId uuid.UUID, + content string, languageCode string, value string) error { + + if !slices.Contains(captionMapTargets, target) { + return fmt.Errorf("invalid target '%s' for caption map", target) + } + + entity, err := caption.GetEntityName(content) + if err != nil { + return err + } + + // empty value, delete + if value == "" { + _, err := tx.Exec(ctx, fmt.Sprintf(` + DELETE FROM %s.caption + WHERE %s = $1 + AND content = $2 + AND language_code = $3 + `, target, entity), entityId, content, languageCode) + + return err + } + + // insert or update + var exists bool + if err := tx.QueryRow(ctx, fmt.Sprintf(` + SELECT EXISTS ( + SELECT 1 + FROM %s.caption + WHERE %s = $1 + AND content = $2 + AND language_code = $3 + ) + `, target, entity), entityId, content, languageCode).Scan(&exists); err != nil { + return err + } + + if !exists { + if _, err := tx.Exec(ctx, fmt.Sprintf(` + INSERT INTO %s.caption (%s, content, language_code, value) + VALUES ($1,$2,$3,$4) + `, target, entity), entityId, content, languageCode, value); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, fmt.Sprintf(` + UPDATE %s.caption + SET value = $1 + WHERE %s = $2 + AND content = $3 + AND language_code = $4 + `, target, entity), value, entityId, content, languageCode); err != nil { + return err + } + } + return nil +} diff --git a/config/config.go b/config/config.go index 2abc0961..af74482e 100644 --- a/config/config.go +++ b/config/config.go @@ -1,32 +1,32 @@ package config import ( + "context" "encoding/json" "math/rand" "os" - "r3/db" "r3/log" "r3/tools" "r3/types" "regexp" + "strconv" "sync" "github.com/gbrlsnchs/jwt/v3" "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) var ( - access_mx = &sync.Mutex{} + access_mx = &sync.RWMutex{} // application names appName string appNameShort string - // application version details (version syntax: major.minor.patch.build) - // only major/minor version updates may effect the database - appVersion string // full version of this application (1.2.0.1023) - appVersionCut string // major+minor version of this application (1.2) - appVersionBuild string // build counter of this application (1023) + // application versions + appVersion types.Version // r3 + appVersionClient types.Version // r3 fat client // configuration file location filePath string // location of configuration file in JSON format @@ -36,48 +36,124 @@ var ( File types.FileType // operation data - TokenSecret *jwt.HMACSHA - License types.License = types.License{} + hostname string + license = types.License{} + tokenSecret *jwt.HMACSHA + + // regex + rxVersionBuild = regexp.MustCompile(`^\d+\.\d+\.\d+\.`) + rxVersionCut = regexp.MustCompile(`\.\d+\.\d+$`) ) -// returns -// *full application version (1.2.0.1023) -// *major+minor application version (1.2) -// *build number (1023) -// *database version (1.2), which is kept equal to major+minor app version -func GetAppVersions() (string, string, string, string) { - dbVersionCut := GetString("dbVersionCut") +func GetAppVersion() types.Version { + access_mx.RLock() + defer access_mx.RUnlock() + return appVersion +} - access_mx.Lock() - defer access_mx.Unlock() - return appVersion, appVersionCut, appVersionBuild, dbVersionCut +func GetAppVersionClient() types.Version { + access_mx.RLock() + defer access_mx.RUnlock() + return appVersionClient } + func GetAppName() (string, string) { + access_mx.RLock() + defer access_mx.RUnlock() return appName, appNameShort } func GetConfigFilepath() string { + access_mx.RLock() + defer access_mx.RUnlock() return filePath } +func GetDbVersionCut() string { + return GetString("dbVersionCut") +} +func GetHostname() string { + access_mx.RLock() + defer access_mx.RUnlock() + return hostname +} +func GetLicense() types.License { + access_mx.RLock() + defer access_mx.RUnlock() + return license +} func GetLicenseActive() bool { - return License.ValidUntil > tools.GetTimeUnix() + access_mx.RLock() + defer access_mx.RUnlock() + return license.ValidUntil > tools.GetTimeUnix() +} +func GetLicenseLoginCount(limitedLogins bool) int64 { + access_mx.RLock() + defer access_mx.RUnlock() + + if limitedLogins { + return license.LoginCount * 3 + } + return license.LoginCount +} +func GetLicenseUsed() bool { + access_mx.RLock() + defer access_mx.RUnlock() + return license.ValidUntil != 0 +} +func GetLicenseValidUntil() int64 { + access_mx.RLock() + defer access_mx.RUnlock() + return license.ValidUntil +} +func GetTokenSecret() *jwt.HMACSHA { + access_mx.RLock() + defer access_mx.RUnlock() + return tokenSecret } // setters -func SetAppVersion(version string) { +func SetAppVersion(versionFull string, target string) error { access_mx.Lock() defer access_mx.Unlock() - appVersion = version - appVersionCut = regexp.MustCompile(`\.\d+\.\d+$`).ReplaceAllString(version, "") - appVersionBuild = regexp.MustCompile(`^\d+\.\d+\.\d+\.`).ReplaceAllString(version, "") + build, err := strconv.Atoi(rxVersionBuild.ReplaceAllString(versionFull, "")) + if err != nil { + return err + } + + if target == "service" { + appVersion.Build = build + appVersion.Cut = rxVersionCut.ReplaceAllString(versionFull, "") + appVersion.Full = versionFull + } else if target == "fatClient" { + appVersionClient.Build = build + appVersionClient.Cut = rxVersionCut.ReplaceAllString(versionFull, "") + appVersionClient.Full = versionFull + } + return nil } func SetAppName(name string, nameShort string) { + access_mx.Lock() + defer access_mx.Unlock() appName = name appNameShort = nameShort } func SetConfigFilePath(path string) { + access_mx.Lock() + defer access_mx.Unlock() filePath = path } +func SetHostnameFromOs() error { + access_mx.Lock() + defer access_mx.Unlock() + var err error + hostname, err = os.Hostname() + return err +} +func SetLicense(l types.License) { + access_mx.Lock() + defer access_mx.Unlock() + license = l +} func SetLogLevels() { log.SetLogLevel("api", int(GetUint64("logApi"))) log.SetLogLevel("backup", int(GetUint64("logBackup"))) @@ -93,8 +169,7 @@ func SetLogLevels() { log.SetLogLevel("transfer", int(GetUint64("logTransfer"))) log.SetLogLevel("websocket", int(GetUint64("logWebsocket"))) } - -func SetInstanceIdIfEmpty() error { +func SetInstanceIdIfEmpty_tx(ctx context.Context, tx pgx.Tx) error { if GetString("instanceId") != "" { return nil } @@ -103,17 +178,7 @@ func SetInstanceIdIfEmpty() error { if err != nil { return err } - - tx, err := db.Pool.Begin(db.Ctx) - if err != nil { - return err - } - defer tx.Rollback(db.Ctx) - - if err := SetString_tx(tx, "instanceId", id.String()); err != nil { - return err - } - return tx.Commit(db.Ctx) + return SetString_tx(ctx, tx, "instanceId", id.String()) } // config file @@ -158,33 +223,20 @@ func WriteFile() error { } // token -func GetTokenSecret() *jwt.HMACSHA { - access_mx.Lock() - defer access_mx.Unlock() - - return TokenSecret -} -func ProcessTokenSecret() error { +func ProcessTokenSecret_tx(ctx context.Context, tx pgx.Tx) error { secret := GetString("tokenSecret") if secret == "" { - tx, err := db.Pool.Begin(db.Ctx) - if err != nil { - return err - } - min, max := 32, 48 secret = tools.RandStringRunes(rand.Intn(max-min+1) + min) - if err := SetString_tx(tx, "tokenSecret", secret); err != nil { - tx.Rollback(db.Ctx) + if err := SetString_tx(ctx, tx, "tokenSecret", secret); err != nil { return err } - tx.Commit(db.Ctx) } access_mx.Lock() defer access_mx.Unlock() - TokenSecret = jwt.NewHS256([]byte(secret)) + tokenSecret = jwt.NewHS256([]byte(secret)) return nil } diff --git a/activation/activation.go b/config/config_activation.go similarity index 87% rename from activation/activation.go rename to config/config_activation.go index e46fe9ac..6f8fd5ad 100644 --- a/activation/activation.go +++ b/config/config_activation.go @@ -1,4 +1,4 @@ -package activation +package config import ( "crypto" @@ -9,11 +9,15 @@ import ( "encoding/json" "encoding/pem" "errors" - "r3/config" + "fmt" "r3/log" "r3/types" + "slices" ) +// license revocations +var revocations = []string{"LI00334231"} + // public key of OC2020_license_key, created 2020-10-05 var publicKey = `-----BEGIN RSA PUBLIC KEY----- MIIICgKCCAEA0uKHJsK1xrhIQq7JRStnkWTjgn8qRZ0tgJbDIOKiteJlInfsXNkE @@ -61,15 +65,18 @@ vCPF8QXc4V/wgJZtn6vdSXGR5W0dByItU5TLOlk6kLX4Aj6G8T+J//7NX5InD5Q/ 7YPTU7NMcyC54h7EbTSPO8dQu0mQuo/dHEONCFaVEpaKVGYMY3Au8tUCAwEAAQ== -----END RSA PUBLIC KEY-----` -func SetLicense() { - if config.GetString("licenseFile") == "" { +func ActivateLicense() { + if GetString("licenseFile") == "" { log.Info("server", "skipping activation check, no license installed") + + // set empty in case license was removed + SetLicense(types.License{}) return } var licFile types.LicenseFile - if err := json.Unmarshal([]byte(config.GetString("licenseFile")), &licFile); err != nil { + if err := json.Unmarshal([]byte(GetString("licenseFile")), &licFile); err != nil { log.Error("server", "could not unmarshal license from config", err) return } @@ -105,7 +112,13 @@ func SetLicense() { return } + // check if license has been revoked + if slices.Contains(revocations, licFile.License.LicenseId) { + log.Error("server", "failed to enable license", fmt.Errorf("license ID '%s' has been revoked", licFile.License.LicenseId)) + return + } + // set license log.Info("server", "setting license") - config.License = licFile.License + SetLicense(licFile.License) } diff --git a/config/config_http.go b/config/config_http.go new file mode 100644 index 00000000..d1fa12d2 --- /dev/null +++ b/config/config_http.go @@ -0,0 +1,36 @@ +package config + +import ( + "crypto/tls" + "net/http" + "net/url" + "time" +) + +var ( + timeoutHandshake = time.Duration(5) +) + +func GetHttpClient(skipVerify bool, timeoutHttp int64) (http.Client, error) { + + tlsConfig := tls.Config{ + InsecureSkipVerify: skipVerify, + PreferServerCipherSuites: true, + } + transport := &http.Transport{ + TLSHandshakeTimeout: time.Second * time.Duration(timeoutHandshake), + TLSClientConfig: &tlsConfig, + } + + if GetString("proxyUrl") != "" { + proxyUrl, err := url.Parse(GetString("proxyUrl")) + if err != nil { + return http.Client{}, err + } + transport.Proxy = http.ProxyURL(proxyUrl) + } + return http.Client{ + Timeout: time.Second * time.Duration(timeoutHttp), + Transport: transport, + }, nil +} diff --git a/config/config_store.go b/config/config_store.go index 6deecdec..abf2e470 100644 --- a/config/config_store.go +++ b/config/config_store.go @@ -2,6 +2,7 @@ package config import ( "context" + "encoding/json" "fmt" "r3/db" "r3/log" @@ -12,14 +13,17 @@ import ( var ( // configuration store (with values from database) - storeUint64 map[string]uint64 = make(map[string]uint64) - storeString map[string]string = make(map[string]string) - - NamesString = []string{"appName", "appNameShort", "backupDir", "companyColorHeader", - "companyColorLogin", "companyLogo", "companyLogoUrl", "companyName", - "companyWelcome", "dbVersionCut", "defaultLanguageCode", "exportPrivateKey", - "instanceId", "licenseFile", "publicHostName", "repoPass", "repoPublicKeys", - "repoUrl", "repoUser", "tokenSecret", "updateCheckUrl", "updateCheckVersion"} + storeString = make(map[string]string) + storeUint64 = make(map[string]uint64) + storeUint64Slice = make(map[string][]uint64) + + NamesString = []string{"adminMails", "appName", "appNameShort", "backupDir", + "companyColorHeader", "companyColorLogin", "companyLoginImage", + "companyLogo", "companyLogoUrl", "companyName", "companyWelcome", "css", + "dbVersionCut", "exportPrivateKey", "iconPwa1", "iconPwa2", + "instanceId", "licenseFile", "publicHostName", "proxyUrl", "repoPass", + "repoPublicKeys", "repoUrl", "repoUser", "systemMsgText", "tokenSecret", + "updateCheckUrl", "updateCheckVersion"} NamesUint64 = []string{"backupDaily", "backupMonthly", "backupWeekly", "backupCountDaily", "backupCountMonthly", "backupCountWeekly", @@ -30,49 +34,64 @@ var ( "icsDaysPre", "icsDownload", "imagerThumbWidth", "logApi", "logBackup", "logCache", "logCluster", "logCsv", "logImager", "logLdap", "logMail", "logModule", "logServer", "logScheduler", "logTransfer", "logWebsocket", - "logsKeepDays", "productionMode", "pwForceDigit", "pwForceLower", - "pwForceSpecial", "pwForceUpper", "pwLengthMin", "schemaTimestamp", - "repoChecked", "repoFeedback", "repoSkipVerify", "tokenExpiryHours"} + "logsKeepDays", "mailTrafficKeepDays", "productionMode", "pwForceDigit", + "pwForceLower", "pwForceSpecial", "pwForceUpper", "pwLengthMin", + "repoChecked", "repoFeedback", "repoSkipVerify", "systemMsgDate0", + "systemMsgDate1", "systemMsgMaintenance", "tokenExpiryHours", + "tokenKeepEnable"} + + NamesUint64Slice = []string{"loginBackgrounds"} ) // store setters -func SetString_tx(tx pgx.Tx, name string, value string) error { +func SetString_tx(ctx context.Context, tx pgx.Tx, name string, value string) error { access_mx.Lock() defer access_mx.Unlock() if _, exists := storeString[name]; !exists { return fmt.Errorf("configuration string value '%s' does not exist", name) } - - if _, err := tx.Exec(context.Background(), ` - UPDATE instance.config SET value = $1 WHERE name = $2 - `, value, name); err != nil { + if err := writeToDb_tx(ctx, tx, name, value); err != nil { return err } storeString[name] = value return nil } -func SetUint64_tx(tx pgx.Tx, name string, value uint64) error { +func SetUint64_tx(ctx context.Context, tx pgx.Tx, name string, value uint64) error { access_mx.Lock() defer access_mx.Unlock() if _, exists := storeUint64[name]; !exists { return fmt.Errorf("configuration uint64 value '%s' does not exist", name) } - - if _, err := tx.Exec(context.Background(), ` - UPDATE instance.config SET value = $1 WHERE name = $2 - `, fmt.Sprintf("%d", value), name); err != nil { + if err := writeToDb_tx(ctx, tx, name, fmt.Sprintf("%d", value)); err != nil { return err } storeUint64[name] = value return nil } +func SetUint64Slice_tx(ctx context.Context, tx pgx.Tx, name string, value []uint64) error { + access_mx.Lock() + defer access_mx.Unlock() + + if _, exists := storeUint64Slice[name]; !exists { + return fmt.Errorf("configuration uint64 slice value '%s' does not exist", name) + } + vJson, err := json.Marshal(value) + if err != nil { + return err + } + if err := writeToDb_tx(ctx, tx, name, string(vJson)); err != nil { + return err + } + storeUint64Slice[name] = value + return nil +} // store getters func GetString(name string) string { - access_mx.Lock() - defer access_mx.Unlock() + access_mx.RLock() + defer access_mx.RUnlock() if _, exists := storeString[name]; !exists { log.Error("server", "configuration store get error", @@ -83,8 +102,8 @@ func GetString(name string) string { return storeString[name] } func GetUint64(name string) uint64 { - access_mx.Lock() - defer access_mx.Unlock() + access_mx.RLock() + defer access_mx.RUnlock() if _, exists := storeUint64[name]; !exists { log.Error("server", "configuration store get error", @@ -94,20 +113,50 @@ func GetUint64(name string) uint64 { } return storeUint64[name] } +func GetUint64Slice(name string) []uint64 { + access_mx.RLock() + defer access_mx.RUnlock() + + if _, exists := storeUint64Slice[name]; !exists { + log.Error("server", "configuration store get error", + fmt.Errorf("uint64 slice value '%s' does not exist", name)) + + return make([]uint64, 0) + } + return storeUint64Slice[name] +} func LoadFromDb() error { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) + + if err := LoadFromDb_tx(ctx, tx); err != nil { + return err + } + return tx.Commit(ctx) +} +func LoadFromDb_tx(ctx context.Context, tx pgx.Tx) error { access_mx.Lock() defer access_mx.Unlock() // reset value stores + for _, name := range NamesString { + storeString[name] = "" + } for _, name := range NamesUint64 { storeUint64[name] = 0 } - for _, name := range NamesString { - storeString[name] = "" + for _, name := range NamesUint64Slice { + storeUint64Slice[name] = make([]uint64, 0) } - rows, err := db.Pool.Query(db.Ctx, "SELECT name, value FROM instance.config") + rows, err := tx.Query(ctx, "SELECT name, value FROM instance.config") if err != nil { return err } @@ -128,7 +177,21 @@ func LoadFromDb() error { if err != nil { return err } + } else if _, exists := storeUint64Slice[name]; exists { + var v []uint64 + if err := json.Unmarshal([]byte(value), &v); err != nil { + return err + } + storeUint64Slice[name] = v } } return nil } + +func writeToDb_tx(ctx context.Context, tx pgx.Tx, name string, value string) error { + _, err := tx.Exec(ctx, ` + UPDATE instance.config SET value = $1 WHERE name = $2 + `, value, name) + + return err +} diff --git a/config/module_meta/module_meta.go b/config/module_meta/module_meta.go new file mode 100644 index 00000000..6d98f1c7 --- /dev/null +++ b/config/module_meta/module_meta.go @@ -0,0 +1,111 @@ +package module_meta + +import ( + "context" + "r3/types" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" +) + +func Create_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, hidden bool, owner bool, position int) error { + + // module hash is updated after import transfer or on first version for new modules + _, err := tx.Exec(ctx, ` + INSERT INTO instance.module_meta (module_id, hidden, owner, position, date_change, hash) + VALUES ($1,$2,$3,$4,EXTRACT(EPOCH FROM NOW()),'00000000000000000000000000000000000000000000') + `, moduleId, hidden, owner, position) + return err +} + +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) (types.ModuleMeta, error) { + var m = types.ModuleMeta{ + Id: moduleId, + } + + err := tx.QueryRow(ctx, ` + SELECT hidden, owner, position, date_change, languages_custom + FROM instance.module_meta + WHERE module_id = $1 + `, moduleId).Scan(&m.Hidden, &m.Owner, &m.Position, &m.DateChange, &m.LanguagesCustom) + + if m.LanguagesCustom == nil { + m.LanguagesCustom = make([]string, 0) + } + return m, err +} +func GetIdMap_tx(ctx context.Context, tx pgx.Tx) (map[uuid.UUID]types.ModuleMeta, error) { + moduleIdMap := make(map[uuid.UUID]types.ModuleMeta) + + rows, err := tx.Query(ctx, ` + SELECT module_id, hidden, owner, position, date_change, languages_custom + FROM instance.module_meta + `) + if err != nil { + return moduleIdMap, err + } + defer rows.Close() + + for rows.Next() { + var m types.ModuleMeta + if err := rows.Scan(&m.Id, &m.Hidden, &m.Owner, &m.Position, &m.DateChange, &m.LanguagesCustom); err != nil { + return moduleIdMap, err + } + if m.LanguagesCustom == nil { + m.LanguagesCustom = make([]string, 0) + } + moduleIdMap[m.Id] = m + } + return moduleIdMap, nil +} +func GetHash_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) (string, error) { + var hash string + err := tx.QueryRow(ctx, ` + SELECT hash + FROM instance.module_meta + WHERE module_id = $1 + `, moduleId).Scan(&hash) + return hash, err +} +func GetOwner_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) (bool, error) { + var isOwner bool + err := tx.QueryRow(ctx, ` + SELECT owner + FROM instance.module_meta + WHERE module_id = $1 + `, moduleId).Scan(&isOwner) + return isOwner, err +} + +func SetDateChange_tx(ctx context.Context, tx pgx.Tx, moduleIds []uuid.UUID, date int64) error { + _, err := tx.Exec(ctx, ` + UPDATE instance.module_meta + SET date_change = $2 + WHERE module_id = ANY($1) + `, moduleIds, date) + return err +} +func SetHash_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, hash string) error { + _, err := tx.Exec(ctx, ` + UPDATE instance.module_meta + SET hash = $1 + WHERE module_id = $2 + `, hash, moduleId) + return err +} +func SetLanguagesCustom_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, languages []string) error { + _, err := tx.Exec(ctx, ` + UPDATE instance.module_meta + SET languages_custom = $1 + WHERE module_id = $2 + `, languages, moduleId) + return err +} +func SetOptions_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, hidden bool, owner bool, position int) error { + _, err := tx.Exec(ctx, ` + UPDATE instance.module_meta + SET hidden = $1, owner = $2, position = $3 + WHERE module_id = $4 + `, hidden, owner, position, moduleId) + return err +} diff --git a/config_dedicated.json b/config_dedicated.json index 76c05953..f6af3dc5 100644 --- a/config_dedicated.json +++ b/config_dedicated.json @@ -10,11 +10,14 @@ "user": "app", "pass": "app", "ssl": false, - "sslSkipVerify": false + "sslSkipVerify": false, + "connsMax": 0, + "connsMin": 0 }, + "mirror": false, "paths": { "certificates": "data/certificates/", - "embeddedDbBin": "pgsql/bin/", + "embeddedDbBin": "pgsql16/bin/", "embeddedDbData": "data/database/", "files": "data/files/", "temp": "data/temp/", @@ -25,6 +28,7 @@ "cert": "cert.crt", "key": "cert.key", "listen": "0.0.0.0", - "port": 443 + "port": 443, + "tlsMinVersion":"1.2" } } \ No newline at end of file diff --git a/config_portable.json b/config_portable.json index bd82e8f9..f631ffa1 100644 --- a/config_portable.json +++ b/config_portable.json @@ -10,11 +10,14 @@ "user": "app", "pass": "app", "ssl": false, - "sslSkipVerify": false + "sslSkipVerify": false, + "connsMax": 0, + "connsMin": 0 }, + "mirror": false, "paths": { "certificates": "data/certificates/", - "embeddedDbBin": "pgsql/bin/", + "embeddedDbBin": "pgsql16/bin/", "embeddedDbData": "data/database/", "files": "data/files/", "temp": "data/temp/", @@ -25,6 +28,7 @@ "cert": "cert.crt", "key": "cert.key", "listen": "0.0.0.0", - "port": 443 + "port": 0, + "tlsMinVersion":"1.2" } } \ No newline at end of file diff --git a/config_template.json b/config_template.json index f1a1d5a2..192b1a43 100644 --- a/config_template.json +++ b/config_template.json @@ -10,11 +10,14 @@ "user": "app", "pass": "app", "ssl": false, - "sslSkipVerify": false + "sslSkipVerify": false, + "connsMax": 0, + "connsMin": 0 }, + "mirror": false, "paths": { "certificates": "data/certificates/", - "embeddedDbBin": "pgsql/bin/", + "embeddedDbBin": "pgsql16/bin/", "embeddedDbData": "data/database/", "files": "data/files/", "temp": "data/temp/", @@ -25,6 +28,7 @@ "cert": "cert.crt", "key": "cert.key", "listen": "0.0.0.0", - "port": 443 + "port": 443, + "tlsMinVersion":"1.2" } } \ No newline at end of file diff --git a/data/data.go b/data/data.go index 4ebab457..7f0cf4a0 100644 --- a/data/data.go +++ b/data/data.go @@ -6,8 +6,8 @@ import ( "r3/cache" "r3/handler" "r3/schema" - "r3/tools" "r3/types" + "slices" "strings" "github.com/gofrs/uuid" @@ -42,7 +42,7 @@ func authorizedAttribute(loginId int64, attributeId uuid.UUID, requestedAccess i } // check whether access to relation is authorized -// cases: creating or deleting relation tupels +// cases: creating or deleting relation tuples func authorizedRelation(loginId int64, relationId uuid.UUID, requestedAccess int) bool { access, err := cache.GetAccessById(loginId) @@ -76,7 +76,7 @@ func getPolicyFunctionNames(loginId int64, policies []types.RelationPolicy, acti for _, p := range policies { // ignore if login does not have role - if !tools.UuidInSlice(p.RoleId, access.RoleIds) { + if !slices.Contains(access.RoleIds, p.RoleId) { continue } diff --git a/data/data_del.go b/data/data_del.go index f291e5a4..2b9247f9 100644 --- a/data/data_del.go +++ b/data/data_del.go @@ -31,7 +31,7 @@ func Del_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, // check for protected preset record for _, preset := range rel.Presets { if preset.Protected && cache.GetPresetRecordId(preset.Id) == recordId { - return handler.CreateErrCode("APP", handler.ErrCodeAppPresetProtected) + return handler.CreateErrCode(handler.ErrContextApp, handler.ErrCodeAppPresetProtected) } } diff --git a/data/data_enc/data_enc.go b/data/data_enc/data_enc.go index 80bf105d..54dadd55 100644 --- a/data/data_enc/data_enc.go +++ b/data/data_enc/data_enc.go @@ -41,9 +41,12 @@ func SetKeys_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, return nil } + // ignore existing, we cannot guarantee that only non-existing keys are inserted + // primary key is record_id + login_id if _, err := tx.Prepare(ctx, "store_keys", fmt.Sprintf(` INSERT INTO instance_e2ee."%s" (record_id, login_id, key_enc) VALUES ($1,$2,$3) + ON CONFLICT (record_id,login_id) DO NOTHING `, schema.GetEncKeyTableName(relationId))); err != nil { return err } diff --git a/data/data_file.go b/data/data_file.go index 6239d422..2ddafff6 100644 --- a/data/data_file.go +++ b/data/data_file.go @@ -10,9 +10,9 @@ import ( "path/filepath" "r3/cache" "r3/config" + "r3/data/data_image" "r3/db" "r3/handler" - "r3/image" "r3/schema" "r3/tools" "r3/types" @@ -62,10 +62,7 @@ func GetFilePathVersion(fileId uuid.UUID, version int64) string { } // attempts to store file upload -func SetFile(loginId int64, attributeId uuid.UUID, fileId uuid.UUID, - part *multipart.Part, isNewFile bool) error { - - var err error +func SetFile(ctx context.Context, loginId int64, attributeId uuid.UUID, fileId uuid.UUID, part *multipart.Part, isNewFile bool) error { cache.Schema_mx.RLock() attribute, exists := cache.AttributeIdMap[attributeId] @@ -84,7 +81,7 @@ func SetFile(loginId int64, attributeId uuid.UUID, fileId uuid.UUID, var recordIds []int64 var version int64 = 0 if !isNewFile { - if err := db.Pool.QueryRow(db.Ctx, fmt.Sprintf(` + if err := db.Pool.QueryRow(ctx, fmt.Sprintf(` SELECT v.version+1, ( SELECT ARRAY_AGG(r.record_id) FROM instance_file."%s" AS r @@ -138,34 +135,33 @@ func SetFile(loginId int64, attributeId uuid.UUID, fileId uuid.UUID, } // create/update thumbnail - failure should not block progress - image.CreateThumbnail(fileId, filepath.Ext(part.FileName()), filePath, + data_image.CreateThumbnail(fileId, filepath.Ext(part.FileName()), filePath, GetFilePathThumb(fileId), false) // store file meta data in database - tx, err := db.Pool.Begin(db.Ctx) + tx, err := db.Pool.Begin(ctx) if err != nil { return err } + defer tx.Rollback(ctx) - if err := FileApplyVersion_tx(db.Ctx, tx, isNewFile, attributeId, + if err := FileApplyVersion_tx(ctx, tx, isNewFile, attributeId, attribute.RelationId, fileId, hash, part.FileName(), fileSizeKb, version, recordIds, loginId); err != nil { - tx.Rollback(db.Ctx) return err } - return tx.Commit(db.Ctx) + return tx.Commit(ctx) } // stores database changes for uploaded/updated files -func FileApplyVersion_tx(ctx context.Context, tx pgx.Tx, isNewFile bool, - attributeId uuid.UUID, relationId uuid.UUID, fileId uuid.UUID, fileHash string, - fileName string, fileSizeKb int64, fileVersion int64, recordIds []int64, - loginId int64) error { +func FileApplyVersion_tx(ctx context.Context, tx pgx.Tx, isNewFile bool, attributeId uuid.UUID, + relationId uuid.UUID, fileId uuid.UUID, fileHash string, fileName string, + fileSizeKb int64, fileVersion int64, recordIds []int64, loginId int64) error { if isNewFile { // store file reference - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO instance.file (id, ref_counter) VALUES ($1,0) `, fileId); err != nil { return err @@ -177,7 +173,7 @@ func FileApplyVersion_tx(ctx context.Context, tx pgx.Tx, isNewFile bool, Int32: int32(loginId), Valid: loginId != -1, } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO instance.file_version ( file_id,version,login_id,hash,size_kb,date_change) VALUES ($1,$2,$3,$4,$5,$6) @@ -204,12 +200,12 @@ func FileApplyVersion_tx(ctx context.Context, tx pgx.Tx, isNewFile bool, } logAttributes := []types.DataSetAttribute{ - types.DataSetAttribute{ + { AttributeId: attributeId, AttributeIdNm: pgtype.UUID{}, Value: types.DataSetFileChanges{ FileIdMapChange: map[uuid.UUID]types.DataSetFileChange{ - fileId: types.DataSetFileChange{ + fileId: { Action: "update", Name: fileName, Version: fileVersion, @@ -222,7 +218,7 @@ func FileApplyVersion_tx(ctx context.Context, tx pgx.Tx, isNewFile bool, logValuesOld := []interface{}{nil} for _, recordId := range recordIds { - if err := setLog_tx(db.Ctx, tx, relationId, logAttributes, + if err := setLog_tx(ctx, tx, relationId, logAttributes, logAttributeFileIndexes, false, logValuesOld, recordId, loginId); err != nil { @@ -362,8 +358,11 @@ func FilesSetDeletedForRecord_tx(ctx context.Context, tx pgx.Tx, } func FileGetLatestVersion(fileId uuid.UUID) (int64, error) { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + var version int64 - err := db.Pool.QueryRow(db.Ctx, ` + err := db.Pool.QueryRow(ctx, ` SELECT MAX(version) FROM instance.file_version WHERE file_id = $1 diff --git a/data/data_file_copy.go b/data/data_file_copy.go index a123e764..4f2b5f6f 100644 --- a/data/data_file_copy.go +++ b/data/data_file_copy.go @@ -1,16 +1,17 @@ package data import ( + "context" "fmt" - "r3/db" "r3/schema" "r3/tools" "r3/types" "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) -func CopyFiles(loginId int64, srcAttributeId uuid.UUID, srcFileIds []uuid.UUID, +func CopyFiles_tx(ctx context.Context, tx pgx.Tx, loginId int64, srcAttributeId uuid.UUID, srcFileIds []uuid.UUID, srcRecordId int64, dstAttributeId uuid.UUID) ([]types.DataGetValueFile, error) { files := make([]types.DataGetValueFile, 0) @@ -23,7 +24,7 @@ func CopyFiles(loginId int64, srcAttributeId uuid.UUID, srcFileIds []uuid.UUID, return files, err } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` + rows, err := tx.Query(ctx, fmt.Sprintf(` SELECT v.file_id, r.name, v.version, v.hash, v.size_kb, v.date_change FROM instance.file_version AS v JOIN instance_file."%s" AS r @@ -82,26 +83,7 @@ func CopyFiles(loginId int64, srcAttributeId uuid.UUID, srcFileIds []uuid.UUID, // insert every successfully created file immediately // (to have the reference to clean in case of issues) - tx, err := db.Pool.Begin(db.Ctx) - if err != nil { - return files, err - } - - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO instance.file (id, ref_counter) VALUES ($1,0) - `, idNew); err != nil { - tx.Rollback(db.Ctx) - return files, err - } - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO instance.file_version ( - file_id, version, login_id, hash, size_kb, date_change) - VALUES ($1,$2,$3,$4,$5,$6) - `, idNew, 0, loginId, f.Hash, f.Size, f.Changed); err != nil { - tx.Rollback(db.Ctx) - return files, err - } - if err := tx.Commit(db.Ctx); err != nil { + if err := copyFilesRef(ctx, tx, idNew, loginId, f); err != nil { return files, err } @@ -111,3 +93,20 @@ func CopyFiles(loginId int64, srcAttributeId uuid.UUID, srcFileIds []uuid.UUID, } return files, nil } + +func copyFilesRef(ctx context.Context, tx pgx.Tx, idNew uuid.UUID, loginId int64, f types.DataGetValueFile) error { + if _, err := tx.Exec(ctx, ` + INSERT INTO instance.file (id, ref_counter) VALUES ($1,0) + `, idNew); err != nil { + return err + } + + if _, err := tx.Exec(ctx, ` + INSERT INTO instance.file_version ( + file_id, version, login_id, hash, size_kb, date_change) + VALUES ($1,$2,$3,$4,$5,$6) + `, idNew, 0, loginId, f.Hash, f.Size, f.Changed); err != nil { + return err + } + return nil +} diff --git a/data/data_get.go b/data/data_get.go index a0cda2ce..2e306d23 100644 --- a/data/data_get.go +++ b/data/data_get.go @@ -9,15 +9,14 @@ import ( "r3/data/data_sql" "r3/handler" "r3/schema" - "r3/tools" "r3/types" "regexp" + "slices" "strconv" "strings" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgtype" ) var regexRelId = regexp.MustCompile(`^\_r(\d+)id`) // finds: _r3id @@ -36,12 +35,9 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, results := make([]types.DataGetResult, 0) // data GET results queryArgs := make([]interface{}, 0) // SQL arguments for data query queryCount := "" // SQL query to retrieve a total count - queryCountArgs := make([]interface{}, 0) // SQL query arguments for count (potentially less, no expressions besides COUNT) // prepare SQL query for data GET request - *query, queryCount, err = prepareQuery(data, indexRelationIds, - &queryArgs, &queryCountArgs, loginId, 0) - + *query, queryCount, err = prepareQuery(data, indexRelationIds, &queryArgs, loginId, 0) if err != nil { return results, 0, err } @@ -59,8 +55,8 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, return results, 0, err } - indexRecordIds := make(map[int]interface{}) // ID for each relation tupel by index - indexRecordEncKeys := make(map[int]string) // encrypted key for each relation tupel by index + indexRecordIds := make(map[int]interface{}) // ID for each relation tuple by index + indexRecordEncKeys := make(map[int]string) // encrypted key for each relation tuple by index values := make([]interface{}, 0) // final values for selected attributes // collect values for expressions @@ -68,7 +64,7 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, values = append(values, valuesAll[i]) } - // collect relation tupel IDs + // collect relation tuple IDs // relation ID columns start after expressions for i, j := len(data.Expressions), len(columns); i < j; i++ { @@ -176,15 +172,15 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, } // deny DEL if record ID is in blacklist or not in whitelist (if used) - if tools.Int64InSlice(recordId, indexMapDelBlacklist[index]) || - (indexMapDelWhitelistUsed[index] && !tools.Int64InSlice(recordId, indexMapDelWhitelist[index])) { + if slices.Contains(indexMapDelBlacklist[index], recordId) || + (indexMapDelWhitelistUsed[index] && !slices.Contains(indexMapDelWhitelist[index], recordId)) { results[i].IndexesPermNoDel = append(results[i].IndexesPermNoDel, index) } // deny SET if record ID is in blacklist or not in whitelist (if used) - if tools.Int64InSlice(recordId, indexMapSetBlacklist[index]) || - (indexMapSetWhitelistUsed[index] && !tools.Int64InSlice(recordId, indexMapSetWhitelist[index])) { + if slices.Contains(indexMapSetBlacklist[index], recordId) || + (indexMapSetWhitelistUsed[index] && !slices.Contains(indexMapSetWhitelist[index], recordId)) { results[i].IndexesPermNoSet = append(results[i].IndexesPermNoSet, index) } @@ -208,7 +204,7 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, return results, 0, handler.ErrSchemaUnknownAttribute(expr.AttributeId.Bytes) } - if !atr.Encrypted || tools.IntInSlice(expr.Index, relationIndexesEnc) { + if !atr.Encrypted || slices.Contains(relationIndexesEnc, expr.Index) { continue } relationIndexesEnc = append(relationIndexesEnc, expr.Index) @@ -228,8 +224,7 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, case int64: recordIds = append(recordIds, v) default: - return results, 0, handler.CreateErrCode("SEC", - handler.ErrCodeSecDataKeysNotAvailable) + return results, 0, handler.CreateErrCode(handler.ErrContextSec, handler.ErrCodeSecDataKeysNotAvailable) } } } @@ -242,8 +237,7 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, } if len(encKeys) != len(recordIds) { - return results, 0, handler.CreateErrCode("SEC", - handler.ErrCodeSecDataKeysNotAvailable) + return results, 0, handler.CreateErrCode(handler.ErrContextSec, handler.ErrCodeSecDataKeysNotAvailable) } // assign record keys in order @@ -261,7 +255,7 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, if data.Limit != 0 && (count >= data.Limit || data.Offset != 0) { // defined limit has been reached or offset was used, get total count - if err := tx.QueryRow(ctx, queryCount, queryCountArgs...).Scan(&count); err != nil { + if err := tx.QueryRow(ctx, queryCount, queryArgs...).Scan(&count); err != nil { return results, 0, err } } @@ -272,8 +266,7 @@ func Get_tx(ctx context.Context, tx pgx.Tx, data types.DataGet, loginId int64, // also used for sub queries, a nesting level is included for separation (0 = main query) // returns data + count SQL query strings func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, - queryArgs *[]interface{}, queryCountArgs *[]interface{}, loginId int64, - nestingLevel int) (string, string, error) { + queryArgs *[]interface{}, loginId int64, nestingLevel int) (string, string, error) { // check for authorized access, READ(1) for GET for _, expr := range data.Expressions { @@ -301,10 +294,6 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, return "", "", handler.ErrSchemaUnknownModule(rel.ModuleId) } - // define relation code for source relation - // source relation might have index != 0 (for GET from joined relation) - relCode := getRelationCode(data.IndexSource, nestingLevel) - // add relations as joins via relationship attributes indexRelationIds[data.IndexSource] = data.RelationId for _, join := range data.Joins { @@ -312,32 +301,23 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, continue } - if err := addJoin(indexRelationIds, join, &inJoin, loginId, nestingLevel); err != nil { + line, err := getQueryJoin(indexRelationIds, join, getFiltersByIndex(data.Filters, join.Index), queryArgs, loginId, nestingLevel) + if err != nil { return "", "", err } + inJoin = append(inJoin, line) } // add filters from data GET query // before expressions because these are excluded from 'total count' query and can contain sub query filters // SQL arguments are numbered ($1, $2, ...) with no way to skip any (? placeholder is not allowed); // excluded sub queries arguments from expressions causes missing argument numbers - for i, filter := range data.Filters { - - // overwrite first filter connector and add brackets in first and last filter line - // done so that query filters do not interfere with other filters - if i == 0 { - filter.Connector = "AND" - filter.Side0.Brackets++ - } - if i == len(data.Filters)-1 { - filter.Side1.Brackets++ - } - - if err := addWhere(filter, queryArgs, queryCountArgs, - loginId, &inWhere, nestingLevel); err != nil { - + for _, filter := range getFiltersByIndex(data.Filters, 0) { + line, err := getQueryWhere(filter, queryArgs, loginId, nestingLevel) + if err != nil { return "", "", err } + inWhere = append(inWhere, line) } // add filter for base relation policy if applicable @@ -369,18 +349,9 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, // non-attribute expression if !expr.AttributeId.Valid { - - // in expressions of main query, disable SQL arguments for count query - // count query has no sub queries with arguments and only 1 expression: COUNT(*) - queryCountArgsOptional := queryCountArgs - if nestingLevel == 0 { - queryCountArgsOptional = nil - } indexRelationIdsSub := make(map[int]uuid.UUID) - subQuery, _, err := prepareQuery(expr.Query, indexRelationIdsSub, - queryArgs, queryCountArgsOptional, loginId, nestingLevel+1) - + subQuery, _, err := prepareQuery(expr.Query, indexRelationIdsSub, queryArgs, loginId, nestingLevel+1) if err != nil { return "", "", err } @@ -392,9 +363,11 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, } // attribute expression - if err := addSelect(pos, expr, indexRelationIds, &inSelect, nestingLevel); err != nil { + line, err := getQuerySelect(pos, expr, nestingLevel) + if err != nil { return "", "", err } + inSelect = append(inSelect, line) if expr.Aggregator.Valid { mapIndex_agg[expr.Index] = true @@ -404,7 +377,7 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, } } - // add expressions for relation tupel IDs after attributes (on main query) + // add expressions for relation tuple IDs after attributes (on main query) if nestingLevel == 0 { for index, _ := range indexRelationIds { @@ -418,7 +391,7 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, inSelect = append(inSelect, fmt.Sprintf(`"%s"."%s" AS %s`, getRelationCode(index, nestingLevel), schema.PkName, - getTupelIdCode(index, nestingLevel))) + getTupleIdCode(index, nestingLevel))) } } @@ -433,9 +406,9 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, // group by record ID if record must be kept during aggregation if expr.Aggregator.String == "record" { - relId := getTupelIdCode(expr.Index, nestingLevel) + relId := getTupleIdCode(expr.Index, nestingLevel) - if !tools.StringInSlice(relId, groupByItems) { + if !slices.Contains(groupByItems, relId) { groupByItems = append(groupByItems, relId) } } @@ -450,7 +423,7 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, } // build ORDER BY - queryOrder, err := addOrderBy(data, nestingLevel) + queryOrder, err := getQueryLineOrderBy(data, nestingLevel) if err != nil { return "", "", err } @@ -464,6 +437,10 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, queryOffset = fmt.Sprintf("\nOFFSET %d", data.Offset) } + // define relation code for source relation + // source relation might have index != 0 (for GET from joined relation) + relCode := getRelationCode(data.IndexSource, nestingLevel) + // build final data retrieval SQL query query := fmt.Sprintf( `SELECT %s`+"\n"+ @@ -480,16 +457,14 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, // build final total count SQL query (not relevant for sub queries) queryCount := "" if nestingLevel == 0 { - - // distinct to keep count for source relation records correct independent of joins queryCount = fmt.Sprintf( - `SELECT COUNT(DISTINCT "%s"."%s")`+"\n"+ - `FROM "%s"."%s" AS "%s" %s%s`, - getRelationCode(data.IndexSource, nestingLevel), schema.PkName, // SELECT - mod.Name, rel.Name, relCode, // FROM + `SELECT COUNT(*) FROM (SELECT %s`+"\n"+ + `FROM "%s"."%s" AS "%s" %s%s%s) AS q`, + strings.Join(inSelect, `, `), // SELECT + mod.Name, rel.Name, relCode, // FROM strings.Join(inJoin, ""), // JOINS - queryWhere) // WHERE - + queryWhere, // WHERE + queryGroup) // GROUP BY } // add intendation for nested sub queries @@ -501,23 +476,20 @@ func prepareQuery(data types.DataGet, indexRelationIds map[int]uuid.UUID, } // add SELECT for attribute in given relation index -// if attribute is from another relation than given index (relationship), attribute value = tupel IDs in relation with given index via given attribute +// if attribute is from another relation than given index (relationship), attribute value = tuple IDs in relation with given index via given attribute // 'outside in' is important in cases of self reference, where direction cannot be ascertained by attribute -func addSelect(exprPos int, expr types.DataGetExpression, - indexRelationIds map[int]uuid.UUID, inSelect *[]string, nestingLevel int) error { +func getQuerySelect(exprPos int, expr types.DataGetExpression, nestingLevel int) (string, error) { relCode := getRelationCode(expr.Index, nestingLevel) atr, exists := cache.AttributeIdMap[expr.AttributeId.Bytes] if !exists { - return handler.ErrSchemaUnknownAttribute(expr.AttributeId.Bytes) + return "", handler.ErrSchemaUnknownAttribute(expr.AttributeId.Bytes) } - alias := data_sql.GetExpressionAlias(exprPos) - if schema.IsContentFiles(atr.Content) { // attribute is files attribute - *inSelect = append(*inSelect, fmt.Sprintf(`( + return fmt.Sprintf(`( SELECT ARRAY_TO_JSON(ARRAY_AGG(ROW_TO_JSON(t))) FROM ( SELECT r.file_id AS id, r.name, COALESCE(v.hash,'') AS hash, @@ -532,32 +504,24 @@ func addSelect(exprPos int, expr types.DataGetExpression, ) WHERE r.record_id = "%s"."%s" AND r.date_delete IS NULL - ) AS t)`, schema.GetFilesTableName(atr.Id), relCode, schema.PkName)) - return nil + ) AS t)`, schema.GetFilesTableName(atr.Id), relCode, schema.PkName), nil } + alias := data_sql.GetExpressionAlias(exprPos) + if !expr.OutsideIn { // attribute is from index relation - code, err := getAttributeCode(expr.AttributeId.Bytes, relCode) - if err != nil { - return err - } - *inSelect = append(*inSelect, data_sql.GetExpression(expr, code, alias)) - return nil + return data_sql.GetExpression(expr, getAttributeCode(relCode, atr.Name), alias), nil } // attribute comes via relationship from other relation (or self reference from same relation) shipRel, exists := cache.RelationIdMap[atr.RelationId] if !exists { - return handler.ErrSchemaUnknownRelation(atr.RelationId) - } - - shipMod, exists := cache.ModuleIdMap[shipRel.ModuleId] - if !exists { - return handler.ErrSchemaUnknownModule(shipRel.ModuleId) + return "", handler.ErrSchemaUnknownRelation(atr.RelationId) } + shipMod := cache.ModuleIdMap[shipRel.ModuleId] - // get tupel IDs from other relation + // get tuple IDs from other relation if !expr.AttributeIdNm.Valid { var selectExpr string @@ -568,8 +532,8 @@ func addSelect(exprPos int, expr types.DataGetExpression, selectExpr = fmt.Sprintf(`JSON_AGG("%s")`, schema.PkName) } - // from other relation, collect tupel IDs in relationship with given index tupel - *inSelect = append(*inSelect, fmt.Sprintf(`( + // from other relation, collect tuple IDs in relationship with given index tuple + return fmt.Sprintf(`( SELECT %s FROM "%s"."%s" WHERE "%s"."%s" = "%s"."%s" @@ -577,39 +541,37 @@ func addSelect(exprPos int, expr types.DataGetExpression, selectExpr, shipMod.Name, shipRel.Name, shipRel.Name, atr.Name, relCode, schema.PkName, - alias)) + alias), nil - } else { - shipAtrNm, exists := cache.AttributeIdMap[expr.AttributeIdNm.Bytes] - if !exists { - return errors.New("attribute does not exist") - } - - // from other relation, collect tupel IDs from n:m relationship attribute - *inSelect = append(*inSelect, fmt.Sprintf(`( - SELECT JSON_AGG("%s") - FROM "%s"."%s" - WHERE "%s"."%s" = "%s"."%s" - ) AS %s`, - shipAtrNm.Name, - shipMod.Name, shipRel.Name, - shipRel.Name, atr.Name, relCode, schema.PkName, - alias)) } - return nil + + shipAtrNm, exists := cache.AttributeIdMap[expr.AttributeIdNm.Bytes] + if !exists { + return "", errors.New("attribute does not exist") + } + + // from other relation, collect tuple IDs from n:m relationship attribute + return fmt.Sprintf(`( + SELECT JSON_AGG("%s") + FROM "%s"."%s" + WHERE "%s"."%s" = "%s"."%s" + ) AS %s`, + shipAtrNm.Name, + shipMod.Name, shipRel.Name, + shipRel.Name, atr.Name, relCode, schema.PkName, + alias), nil } -func addJoin(indexRelationIds map[int]uuid.UUID, join types.DataGetJoin, - inJoin *[]string, loginId int64, nestingLevel int) error { +func getQueryJoin(indexRelationIds map[int]uuid.UUID, join types.DataGetJoin, filters []types.DataGetFilter, + queryArgs *[]interface{}, loginId int64, nestingLevel int) (string, error) { // check join attribute atr, exists := cache.AttributeIdMap[join.AttributeId] if !exists { - return errors.New("join attribute does not exist") + return "", errors.New("join attribute does not exist") } - if !atr.RelationshipId.Valid { - return errors.New("relationship of attribute is invalid") + return "", errors.New("relationship of attribute is invalid") } // is join attribute on source relation? (direction of relationship) @@ -637,17 +599,13 @@ func addJoin(indexRelationIds map[int]uuid.UUID, join types.DataGetJoin, // check other relation and corresponding module relTarget, exists := cache.RelationIdMap[relIdTarget] if !exists { - return handler.ErrSchemaUnknownRelation(relIdTarget) - } - - modTarget, exists := cache.ModuleIdMap[relTarget.ModuleId] - if !exists { - return handler.ErrSchemaUnknownModule(relTarget.ModuleId) + return "", handler.ErrSchemaUnknownRelation(relIdTarget) } + modTarget := cache.ModuleIdMap[relTarget.ModuleId] // define JOIN type - if !tools.StringInSlice(join.Connector, types.QueryJoinConnectors) { - return errors.New("invalid join type") + if !slices.Contains(types.QueryJoinConnectors, join.Connector) { + return "", errors.New("invalid join type") } // apply filter policy to JOIN if applicable @@ -655,44 +613,49 @@ func addJoin(indexRelationIds map[int]uuid.UUID, join types.DataGetJoin, getRelationCode(join.Index, nestingLevel), relTarget.Policies) if err != nil { - return err + return "", err } - *inJoin = append(*inJoin, fmt.Sprintf("\n"+`%s JOIN "%s"."%s" AS "%s" ON "%s"."%s" = "%s"."%s" %s`, + // parse join filters + inWhere := make([]string, 0) + for _, filter := range filters { + line, err := getQueryWhere(filter, queryArgs, loginId, nestingLevel) + if err != nil { + return "", err + } + inWhere = append(inWhere, line) + } + + return fmt.Sprintf("\n"+`%s JOIN "%s"."%s" AS "%s" ON "%s"."%s" = "%s"."%s" %s%s`, join.Connector, modTarget.Name, relTarget.Name, relCodeTarget, relCodeFrom, atr.Name, relCodeTo, schema.PkName, - policyFilter)) - - return nil + policyFilter, strings.Join(inWhere, "")), nil } // parses filters to generate query lines and arguments -func addWhere(filter types.DataGetFilter, queryArgs *[]interface{}, - queryCountArgs *[]interface{}, loginId int64, inWhere *[]string, - nestingLevel int) error { +func getQueryWhere(filter types.DataGetFilter, queryArgs *[]interface{}, loginId int64, nestingLevel int) (string, error) { - if !tools.StringInSlice(filter.Connector, types.QueryFilterConnectors) { - return errors.New("bad filter connector") + if !slices.Contains(types.QueryFilterConnectors, filter.Connector) { + return "", errors.New("bad filter connector") } - if !tools.StringInSlice(filter.Operator, types.QueryFilterOperators) { - return errors.New("bad filter operator") + if !slices.Contains(types.QueryFilterOperators, filter.Operator) { + return "", errors.New("bad filter operator") } + // check for full text search + ftsActive := filter.Side0.FtsDict.Valid || filter.Side1.FtsDict.Valid isNullOp := isNullOperator(filter.Operator) // define comparisons var getComp = func(s types.DataGetFilterSide, comp *string) error { - var err error var isQuery = s.Query.RelationId != uuid.Nil // sub query filter if isQuery { indexRelationIdsSub := make(map[int]uuid.UUID) - subQuery, _, err := prepareQuery(s.Query, indexRelationIdsSub, - queryArgs, queryCountArgs, loginId, nestingLevel+1) - + subQuery, _, err := prepareQuery(s.Query, indexRelationIdsSub, queryArgs, loginId, nestingLevel+1) if err != nil { return err } @@ -702,23 +665,47 @@ func addWhere(filter types.DataGetFilter, queryArgs *[]interface{}, // attribute filter if s.AttributeId.Valid { - *comp, err = getAttributeCode(s.AttributeId.Bytes, - getRelationCode(s.AttributeIndex, s.AttributeNested)) - if err != nil { - return err + atr, exists := cache.AttributeIdMap[s.AttributeId.Bytes] + if !exists { + return handler.ErrSchemaUnknownAttribute(s.AttributeId.Bytes) } + *comp = getAttributeCode(getRelationCode(s.AttributeIndex, s.AttributeNested), atr.Name) + + if ftsActive { + ftsDict := "'simple'" + + // use dictionary attribute on corresponding text index, if there is one + rel := cache.RelationIdMap[atr.RelationId] + for _, ind := range rel.Indexes { + if ind.Method == "GIN" && + len(ind.Attributes) == 1 && + ind.Attributes[0].AttributeId == s.AttributeId.Bytes && + ind.AttributeIdDict.Valid { + + // use dictionary attribute name without quotes as its a column + atrDict := cache.AttributeIdMap[ind.AttributeIdDict.Bytes] + ftsDict = atrDict.Name + break + } + } - // special case: (I)LIKE comparison needs attribute cast as TEXT - // this is relevant for integers/floats/etc. - if isLikeOperator(filter.Operator) { - *comp = fmt.Sprintf("%s::TEXT", *comp) + // apply ts_vector operation with or without dictionary definition + *comp = fmt.Sprintf("to_tsvector(CASE WHEN %s IS NULL THEN 'simple'::REGCONFIG ELSE %s END,%s)", + ftsDict, ftsDict, *comp) + } else { + // special cases + // (I)LIKE comparison needs attribute cast as TEXT (relevant for integers/floats/etc.) + // REGCONFIG attributes must be cast as TEXT + if isLikeOperator(filter.Operator) || atr.Content == "regconfig" { + *comp = fmt.Sprintf("%s::TEXT", *comp) + } } return nil } - // user value filter - // can be anything, text, numbers, floats, boolean, NULL values + // fixed value filter + // can be anything, text, floats, boolean, NULL values // create placeholders and add to query arguments if isNullOp { @@ -737,59 +724,72 @@ func addWhere(filter types.DataGetFilter, queryArgs *[]interface{}, } if isLikeOperator(filter.Operator) { - if v, ok := s.Value.(pgtype.Text); ok { - s.Value = v.String - } - // special syntax for (I)LIKE comparison (add wildcard characters) - s.Value = fmt.Sprintf("%%%s%%", s.Value) - } - - // PGX fix: cannot use proper true/false values in SQL parameters - // no good solution found so far, error: 'cannot convert (true|false) to Text' - if fmt.Sprintf("%T", s.Value) == "bool" { - if s.Value.(bool) == true { - s.Value = "true" + // add wildcard characters before/after for (I)LIKE comparison unless input includes them + v := fmt.Sprintf("%s", s.Value) + if strings.Contains(v, "%") { + s.Value = v } else { - s.Value = "false" + s.Value = fmt.Sprintf("%%%s%%", v) } } *queryArgs = append(*queryArgs, s.Value) - if queryCountArgs != nil { - *queryCountArgs = append(*queryCountArgs, s.Value) - } - *comp = fmt.Sprintf("$%d", len(*queryArgs)) + if s.FtsDict.Valid { + if !cache.GetSearchDictionaryIsValid(s.FtsDict.String) { + s.FtsDict.String = "simple" + } + + // websearch_to_tsquery supports + // AND logic: 'coffee tea' results in: 'coffe' & 'tea' + // OR logic: 'coffee or tea' results in: 'coffe' | 'tea' + // negation: 'coffee -tea' results in: 'coffe' & !'tea' + // followed: '"coffe tea"' results in: 'coffe' <-> 'tea' + // https://www.postgresql.org/docs/current/textsearch-controls.html + *comp = fmt.Sprintf("websearch_to_tsquery('%s',$%d)", s.FtsDict.String, len(*queryArgs)) + } else { + // cast args for certain data types, known issues: + // * uncast bool args cannot be compared to another uncast bool arg via equal operator (=) + // * uncast real/double args cannot be compared to another uncast real/double arg via equal operator (=) + argCast := "" + if s.Value != nil { + switch fmt.Sprintf("%T", s.Value) { + case "bool": + argCast = "::BOOL" + case "float64": + argCast = "::FLOAT8" // short alias to double precision, float64 is default coming from JSON decode of JS number values + } + } + *comp = fmt.Sprintf("$%d%s", len(*queryArgs), argCast) + } return nil } // build left/right comparison sides (ignore right side, if NULL operator) comp0, comp1 := "", "" if err := getComp(filter.Side0, &comp0); err != nil { - return err + return "", err } if !isNullOp { if err := getComp(filter.Side1, &comp1); err != nil { - return err + return "", err } - // array operator, add round brackets to right side comparison + // array operator, add round brackets around right side comparison if isArrayOperator(filter.Operator) { comp1 = fmt.Sprintf("(%s)", comp1) } } // generate WHERE line from parsed filter definition - *inWhere = append(*inWhere, fmt.Sprintf("\n%s %s%s %s %s%s", + return fmt.Sprintf("\n%s %s%s %s %s%s", filter.Connector, getBrackets(filter.Side0.Brackets, false), comp0, filter.Operator, comp1, - getBrackets(filter.Side1.Brackets, true))) - - return nil + getBrackets(filter.Side1.Brackets, true)), nil } -func addOrderBy(data types.DataGet, nestingLevel int) (string, error) { +func getQueryLineOrderBy(data types.DataGet, nestingLevel int) (string, error) { if len(data.Orders) == 0 { return "", nil @@ -797,7 +797,6 @@ func addOrderBy(data types.DataGet, nestingLevel int) (string, error) { orderItems := make([]string, len(data.Orders)) var alias string - var err error for i, ord := range data.Orders { @@ -819,12 +818,12 @@ func addOrderBy(data types.DataGet, nestingLevel int) (string, error) { if expressionPosAlias != -1 { alias = data_sql.GetExpressionAlias(expressionPosAlias) } else { - alias, err = getAttributeCode(ord.AttributeId.Bytes, - getRelationCode(int(ord.Index.Int32), nestingLevel)) - - if err != nil { - return "", err + atr, exists := cache.AttributeIdMap[ord.AttributeId.Bytes] + if !exists { + return "", handler.ErrSchemaUnknownAttribute(ord.AttributeId.Bytes) } + + alias = getAttributeCode(getRelationCode(int(ord.Index.Int32), nestingLevel), atr.Name) } } else if ord.ExpressionPos.Valid { @@ -856,20 +855,16 @@ func getRelationCode(relationIndex int, nestingLevel int) string { return fmt.Sprintf("_r%d_l%d", relationIndex, nestingLevel) } -// tupel IDs are uniquely identified by the relation code + the fixed string 'id' -func getTupelIdCode(relationIndex int, nestingLevel int) string { +// tuple IDs are uniquely identified by the relation code + the fixed string 'id' +func getTupleIdCode(relationIndex int, nestingLevel int) string { return fmt.Sprintf("%sid", getRelationCode(relationIndex, nestingLevel)) } // an attribute is referenced by the relation code + the attribute name // due to the relation code, this will always uniquely identify an attribute from a specific index // example: _r3.surname maps to person.surname from index 3 -func getAttributeCode(attributeId uuid.UUID, relCode string) (string, error) { - atr, exists := cache.AttributeIdMap[attributeId] - if !exists { - return "", handler.ErrSchemaUnknownAttribute(attributeId) - } - return fmt.Sprintf(`"%s"."%s"`, relCode, atr.Name), nil +func getAttributeCode(relationCode string, attributeName string) string { + return fmt.Sprintf(`"%s"."%s"`, relationCode, attributeName) } func getBrackets(count int, right bool) string { @@ -883,20 +878,38 @@ func getBrackets(count int, right bool) string { } out := "" - for count > 0 { + for ; count > 0; count-- { out += bracketChar - count-- } return fmt.Sprintf("%s", out) } +func getFiltersByIndex(filters []types.DataGetFilter, index int) []types.DataGetFilter { + out := make([]types.DataGetFilter, 0) + + for _, filter := range filters { + if filter.Index == index { + out = append(out, filter) + } + } + + // overwrite first filter connector and add brackets in first and last filter line + // so that query filters do not interfere with other filters + if len(out) != 0 { + out[0].Connector = "AND" + out[0].Side0.Brackets++ + out[len(out)-1].Side1.Brackets++ + } + return out +} + // operator types func isArrayOperator(operator string) bool { - return tools.StringInSlice(operator, []string{"= ANY", "<> ALL"}) + return slices.Contains([]string{"= ANY", "<> ALL"}, operator) } func isLikeOperator(operator string) bool { - return tools.StringInSlice(operator, []string{"LIKE", "ILIKE", "NOT LIKE", "NOT ILIKE"}) + return slices.Contains([]string{"LIKE", "ILIKE", "NOT LIKE", "NOT ILIKE"}, operator) } func isNullOperator(operator string) bool { - return tools.StringInSlice(operator, []string{"IS NULL", "IS NOT NULL"}) + return slices.Contains([]string{"IS NULL", "IS NOT NULL"}, operator) } diff --git a/image/image.go b/data/data_image/data_image.go similarity index 92% rename from image/image.go rename to data/data_image/data_image.go index 58069b4c..4701491a 100644 --- a/image/image.go +++ b/data/data_image/data_image.go @@ -1,9 +1,10 @@ -package image +package data_image import ( "bufio" "errors" "fmt" + "net/http" "os" "os/exec" "r3/config" @@ -192,3 +193,19 @@ func processFile(fileId uuid.UUID, ext string, src string, dst string) { return } } + +func detectType(filePath string) (string, error) { + file, err := os.Open(filePath) + if err != nil { + return "", err + } + defer file.Close() + + // read first 512 bytes to detect content type + // http://golang.org/pkg/net/http/#DetectContentType + fileBytes := make([]byte, 512) + if _, err := file.Read(fileBytes); err != nil { + return "", err + } + return http.DetectContentType(fileBytes), nil +} diff --git a/image/image_linux.go b/data/data_image/data_image_linux.go similarity index 92% rename from image/image_linux.go rename to data/data_image/data_image_linux.go index 530ddd8f..daa3da36 100644 --- a/image/image_linux.go +++ b/data/data_image/data_image_linux.go @@ -1,6 +1,6 @@ //go:build !windows -package image +package data_image import "os/exec" diff --git a/image/image_windows.go b/data/data_image/data_image_windows.go similarity index 94% rename from image/image_windows.go rename to data/data_image/data_image_windows.go index e00163ec..7ea584d5 100644 --- a/image/image_windows.go +++ b/data/data_image/data_image_windows.go @@ -1,6 +1,6 @@ //go:build windows -package image +package data_image import ( "r3/tools" diff --git a/data/data_import/data_import.go b/data/data_import/data_import.go index 4ccdb5e1..3f9fa018 100644 --- a/data/data_import/data_import.go +++ b/data/data_import/data_import.go @@ -7,9 +7,10 @@ import ( "r3/cache" "r3/data" "r3/handler" + "r3/log" "r3/schema" - "r3/tools" "r3/types" + "slices" "strings" "github.com/gofrs/uuid" @@ -115,7 +116,7 @@ func FromInterfaceValues_tx(ctx context.Context, tx pgx.Tx, loginId int64, for i := 0; i < attempts; i++ { for _, join := range joins { - dataSet, _ := dataSetsByIndex[join.Index] + dataSet := dataSetsByIndex[join.Index] if dataSet.RecordId != 0 { continue // record already looked up @@ -126,7 +127,7 @@ func FromInterfaceValues_tx(ctx context.Context, tx pgx.Tx, loginId int64, continue // no unique PG index defined, nothing to do } - if tools.IntInSlice(join.Index, indexesResolved) { + if slices.Contains(indexesResolved, join.Index) { continue // lookup already done } @@ -135,7 +136,7 @@ func FromInterfaceValues_tx(ctx context.Context, tx pgx.Tx, loginId int64, for _, pgIndexAtrId := range pgIndexAtrIds { - pgIndexAtr, _ := cache.AttributeIdMap[pgIndexAtrId] + pgIndexAtr := cache.AttributeIdMap[pgIndexAtrId] if !schema.IsContentRelationship(pgIndexAtr.Content) { // PG index attribute is non-relationship, can directly be used @@ -214,25 +215,39 @@ func FromInterfaceValues_tx(ctx context.Context, tx pgx.Tx, loginId int64, } } - // apply join create/update restrictions after resolving unique indexes + // go through to be created/updated records after resolving unique indexes for _, join := range joins { + dataSet := dataSetsByIndex[join.Index] + newRecord := dataSet.RecordId == 0 + badNulls := false + + // check for not nullable attributes for which values are set to NULL + // only on joins != -1, as primary record should throw an error if it cannot be imported + if join.IndexFrom != -1 { + for _, setAtr := range dataSet.Attributes { + atr := cache.AttributeIdMap[setAtr.AttributeId] + + if !atr.Nullable && setAtr.Value == nil { + rel := cache.RelationIdMap[atr.RelationId] + log.Info("csv", fmt.Sprintf("skips record on relation '%s', no value set for required attribute '%s'", + rel.Name, atr.Name)) + + badNulls = true + break + } + } + } - if !join.ApplyUpdate && dataSetsByIndex[join.Index].RecordId != 0 { - - // existing record but must not update + if newRecord && (badNulls || !join.ApplyCreate) { + // new record cannot or must not be created (required attribute values are NULL or join setting) + // remove entire data SET - if it does not exist and won´t be created, it cannot be used as relationship either + delete(dataSetsByIndex, join.Index) + } + if !newRecord && (badNulls || !join.ApplyUpdate) { + // existing record, but cannot or must not be updated (required attribute values are NULL or join setting) // remove attribute values - still keep record itself for updating relationship attributes where allowed - dataSet := dataSetsByIndex[join.Index] dataSet.Attributes = make([]types.DataSetAttribute, 0) dataSetsByIndex[join.Index] = dataSet - continue - } - - if !join.ApplyCreate && dataSetsByIndex[join.Index].RecordId == 0 { - - // new record but must not create - // remove entire data SET - if it does not exist and must not be created, it cannot be used as relationship either - delete(dataSetsByIndex, join.Index) - continue } } diff --git a/data/data_log.go b/data/data_log.go index 91da1172..0d435069 100644 --- a/data/data_log.go +++ b/data/data_log.go @@ -9,6 +9,7 @@ import ( "r3/handler" "r3/tools" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" @@ -17,6 +18,14 @@ import ( // delete data change logs according to retention settings func DelLogsBackground() error { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutDbTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) cache.Schema_mx.RLock() defer cache.Schema_mx.RUnlock() @@ -26,7 +35,7 @@ func DelLogsBackground() error { // delete logs for relations with no retention if !r.RetentionCount.Valid && !r.RetentionDays.Valid { - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM instance.data_log WHERE id IN ( SELECT data_log_id @@ -46,7 +55,7 @@ func DelLogsBackground() error { // delete logs according to retention settings now := tools.GetTimeUnix() - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM instance.data_log AS p WHERE p.relation_id = $1 @@ -66,7 +75,7 @@ func DelLogsBackground() error { return err } } - return nil + return tx.Commit(ctx) } // get data change logs for specified record and attributes @@ -83,9 +92,10 @@ func GetLogs_tx(ctx context.Context, tx pgx.Tx, recordId int64, } rows, err := tx.Query(ctx, ` - SELECT d.id, d.relation_id, l.name, d.date_change + SELECT d.id, d.relation_id, d.date_change, l.name, lm.name_display FROM instance.data_log as d - LEFT JOIN instance.login AS l ON l.id = d.login_id_wofk + LEFT JOIN instance.login AS l ON l.id = d.login_id_wofk + LEFT JOIN instance.login_meta AS lm ON lm.login_id = l.id WHERE d.record_id_wofk = $1 AND d.id IN ( SELECT data_log_id @@ -101,12 +111,16 @@ func GetLogs_tx(ctx context.Context, tx pgx.Tx, recordId int64, for rows.Next() { var l types.DataLog var name pgtype.Text + var nameDisplay pgtype.Text - if err := rows.Scan(&l.Id, &l.RelationId, &name, &l.DateChange); err != nil { + if err := rows.Scan(&l.Id, &l.RelationId, &l.DateChange, &name, &nameDisplay); err != nil { return logs, err } l.RecordId = recordId l.LoginName = name.String + if nameDisplay.Valid && nameDisplay.String != "" { + l.LoginName = nameDisplay.String + } logs = append(logs, l) } rows.Close() @@ -178,7 +192,7 @@ func setLog_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, // special case: file attributes // new value is always delta (file uploaded/removed/etc.), old value is not needed - if tools.IntInSlice(i, fileAttributeIndexes) { + if slices.Contains(fileAttributeIndexes, i) { if atr.Value == nil { continue } diff --git a/data/data_query/data_query.go b/data/data_query/data_query.go index d6281f03..91267d07 100644 --- a/data/data_query/data_query.go +++ b/data/data_query/data_query.go @@ -2,14 +2,15 @@ package data_query import ( "r3/cache" - "r3/tools" "r3/types" + "slices" "time" "github.com/jackc/pgx/v5/pgtype" ) -func ConvertColumnToExpression(column types.Column, loginId int64, languageCode string) types.DataGetExpression { +func ConvertColumnToExpression(column types.Column, loginId int64, languageCode string, + getterKeyMapValue map[string]string) types.DataGetExpression { expr := types.DataGetExpression{ AttributeId: pgtype.UUID{Bytes: column.AttributeId, Valid: true}, @@ -28,38 +29,33 @@ func ConvertColumnToExpression(column types.Column, loginId int64, languageCode RelationId: column.Query.RelationId.Bytes, Joins: ConvertQueryToDataJoins(column.Query.Joins), Expressions: []types.DataGetExpression{expr}, - Filters: ConvertQueryToDataFilter(column.Query.Filters, loginId, languageCode), + Filters: ConvertQueryToDataFilter(column.Query.Filters, loginId, languageCode, getterKeyMapValue), Orders: ConvertQueryToDataOrders(column.Query.Orders), Limit: column.Query.FixedLimit, }, } } -func ConvertSubQueryToDataGet(query types.Query, queryAggregator pgtype.Text, - attributeId pgtype.UUID, attributeIndex int, loginId int64, - languageCode string) types.DataGet { +func ConvertSubQueryToDataGet(query types.Query, queryAggregator pgtype.Text, attributeId pgtype.UUID, + attributeIndex int, loginId int64, languageCode string, getterKeyMapValue map[string]string) types.DataGet { return types.DataGet{ RelationId: query.RelationId.Bytes, Joins: ConvertQueryToDataJoins(query.Joins), - Expressions: []types.DataGetExpression{ - types.DataGetExpression{ - Aggregator: queryAggregator, - AttributeId: attributeId, - AttributeIdNm: pgtype.UUID{}, - Index: attributeIndex, - }, - }, - Filters: ConvertQueryToDataFilter(query.Filters, loginId, languageCode), + Expressions: []types.DataGetExpression{{ + Aggregator: queryAggregator, + AttributeId: attributeId, + AttributeIdNm: pgtype.UUID{}, + Index: attributeIndex, + }}, + Filters: ConvertQueryToDataFilter(query.Filters, loginId, languageCode, getterKeyMapValue), Orders: ConvertQueryToDataOrders(query.Orders), Limit: query.FixedLimit, } } -func ConvertQueryToDataFilter(filters []types.QueryFilter, - loginId int64, languageCode string) []types.DataGetFilter { - - filtersOut := make([]types.DataGetFilter, len(filters)) +func ConvertQueryToDataFilter(filters []types.QueryFilter, loginId int64, + languageCode string, getterKeyMapValue map[string]string) []types.DataGetFilter { var processSide = func(side types.QueryFilterSide) types.DataGetFilterSide { sideOut := types.DataGetFilterSide{ @@ -72,12 +68,20 @@ func ConvertQueryToDataFilter(filters []types.QueryFilter, Value: side.Value, } switch side.Content { + // API + case "getter": + if value, ok := getterKeyMapValue[side.Value.String]; ok { + sideOut.Value = value + } else { + sideOut.Value = nil + } + // data case "preset": sideOut.Value = cache.GetPresetRecordId(side.PresetId.Bytes) case "subQuery": sideOut.Query = ConvertSubQueryToDataGet(side.Query, side.QueryAggregator, - side.AttributeId, side.AttributeIndex, loginId, languageCode) + side.AttributeId, side.AttributeIndex, loginId, languageCode, getterKeyMapValue) case "true": sideOut.Value = true @@ -101,31 +105,43 @@ func ConvertQueryToDataFilter(filters []types.QueryFilter, case "role": access, err := cache.GetAccessById(loginId) if err == nil { - sideOut.Value = tools.UuidInSlice(side.RoleId.Bytes, access.RoleIds) + sideOut.Value = slices.Contains(access.RoleIds, side.RoleId.Bytes) } else { sideOut.Value = false } + + // value + case "value": + sideOut.Value = side.Value.String } return sideOut } - for i, filter := range filters { - - filterOut := types.DataGetFilter{ - Connector: filter.Connector, - Operator: filter.Operator, - Side0: processSide(filter.Side0), - Side1: processSide(filter.Side1), - } - if i == 0 { - filterOut.Side0.Brackets++ + // process both base & join filters + filtersBase := make([]types.DataGetFilter, 0) + filtersJoin := make([]types.DataGetFilter, 0) + + for _, f := range filters { + filter := types.DataGetFilter{ + Connector: f.Connector, + Index: f.Index, + Operator: f.Operator, + Side0: processSide(f.Side0), + Side1: processSide(f.Side1), } - if i == len(filters)-1 { - filterOut.Side1.Brackets++ + if f.Index == 0 { + filtersBase = append(filtersBase, filter) + } else { + filtersJoin = append(filtersJoin, filter) } - filtersOut[i] = filterOut } - return filtersOut + + // encapsulate base filters + if len(filtersBase) > 0 { + filtersBase[0].Side0.Brackets++ + filtersBase[len(filtersBase)-1].Side1.Brackets++ + } + return slices.Concat(filtersBase, filtersJoin) } func ConvertQueryToDataJoins(joins []types.QueryJoin) []types.DataGetJoin { diff --git a/data/data_set.go b/data/data_set.go index 121c72cc..179503e6 100644 --- a/data/data_set.go +++ b/data/data_set.go @@ -9,8 +9,9 @@ import ( "r3/data/data_enc" "r3/handler" "r3/schema" - "r3/tools" "r3/types" + "reflect" + "slices" "sort" "strings" @@ -22,8 +23,8 @@ import ( // sets data // uses indexes (unique integers) to identify specific relations, which can be joined by relationships // starting with source relation (index:0), joined relations refer to their partner (indexFrom:0, indexFrom:1, ...) -// if tupel needs to exist for joined relation to refer to, it will be created -// each index provides tupel ID (0 if new) +// if tuple needs to exist for joined relation to refer to, it will be created +// each index provides tuple ID (0 if new) // each index provides values for its relation attributes or partner relation attributes (relationship attributes from other relation) func Set_tx(ctx context.Context, tx pgx.Tx, dataSetsByIndex map[int]types.DataSet, loginId int64) (map[int]int64, error) { @@ -54,7 +55,7 @@ func Set_tx(ctx context.Context, tx pgx.Tx, dataSetsByIndex map[int]types.DataSe return indexRecordIds, handler.ErrSchemaUnknownRelation(dataSet.RelationId) } - // check write access for tupel creation + // check write access for tuple creation if isNewRecord && !authorizedRelation(loginId, dataSet.RelationId, 2) { return indexRecordIds, errors.New(handler.ErrUnauthorized) } @@ -150,7 +151,7 @@ func Set_tx(ctx context.Context, tx pgx.Tx, dataSetsByIndex map[int]types.DataSe } // set data values for specific relation index -// recursive call, if relationship tupel must be created first +// recursive call, if relationship tuple must be created first func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, dataSetsByIndex map[int]types.DataSet, indexRecordIds map[int]int64, indexRecordsCreated map[int]bool, loginId int64) error { @@ -182,7 +183,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, params := make([]string, 0) // value parameters for insert/update statement values := make([]interface{}, 0) // values for insert/update statements - // values for relationship tupel IDs are dealt with separately + // values for relationship tuple IDs are dealt with separately type relationshipValue struct { attributeId uuid.UUID attributeIdNm pgtype.UUID @@ -197,10 +198,10 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, } // process relationship values from other relation - // (1:n, 1:1 relationships refering to this tupel) + // (1:n, 1:1 relationships referring to this tuple) if attribute.OutsideIn && schema.IsContentRelationship(atr.Content) { - // store relationship values to apply later (tupel might need to be created first) + // store relationship values to apply later (tuple might need to be created first) shipValues := relationshipValue{ attributeId: attribute.AttributeId, attributeIdNm: attribute.AttributeIdNm, @@ -212,6 +213,9 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, shipValues.values = append(shipValues.values, int64(v)) case []interface{}: for _, v1 := range v { + if v1 == nil || reflect.TypeOf(v1).String() != "float64" { + return fmt.Errorf("invalid type for relationship value") + } shipValues.values = append(shipValues.values, int64(v1.(float64))) } } @@ -226,7 +230,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, continue } - // process attribute values for this relation tupel + // process attribute values for this relation tuple values = append(values, attribute.Value) if isNewRecord { @@ -278,11 +282,11 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, return handler.ErrSchemaUnknownAttribute(dataSetOther.AttributeId) } - // if attribute is on our side, we need to add its value to this tupel - // if its on the other side, its value will be added when the other tupel is being created + // if attribute is on our side, we need to add its value to this tuple + // if its on the other side, its value will be added when the other tuple is being created if relAtrOther.RelationId == dataSet.RelationId { - // the other relation has a higher index, so its tupel might not exist yet + // the other relation has a higher index, so its tuple might not exist yet if err := setForIndex_tx(ctx, tx, indexOther, dataSetsByIndex, indexRecordIds, indexRecordsCreated, loginId); err != nil { @@ -290,7 +294,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, } indexRecordsCreated[indexOther] = true - // if there is no relationship value available yet, we add it to the tupel + // if there is no relationship value available yet, we add it to the tuple relValueNotSet := true for _, atr := range dataSet.Attributes { if atr.AttributeId == relAtrOther.Id { @@ -302,7 +306,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, } if relValueNotSet { - // add relationship attribute value for this tupel creation + // add relationship attribute value for this tuple creation values = append(values, indexRecordIds[indexOther]) names = append(names, fmt.Sprintf(`"%s"`, relAtrOther.Name)) params = append(params, fmt.Sprintf(`$%d`, len(values))) @@ -320,7 +324,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, } // if attribute is on this side, add to this record - // other relation tupel exists already as its index is lower + // other relation tuple exists already as its index is lower // exclude if both relations are the same, in this case the lower index always wins if relAtr.RelationId == dataSet.RelationId && dataSet.RelationId != dataSetOther.RelationId { @@ -373,7 +377,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, } } - // assign relationship references to this tupel via attributes from partner relations + // assign relationship references to this tuple via attributes from partner relations for _, shipValues := range relationshipValues { shipAtr, exists := cache.AttributeIdMap[shipValues.attributeId] @@ -417,7 +421,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, if !shipValues.attributeIdNm.Valid { - // remove old references to this tupel + // remove old references to this tuple if _, err := tx.Exec(ctx, fmt.Sprintf(` UPDATE "%s"."%s" SET "%s" = NULL WHERE "%s" = $1 @@ -429,7 +433,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, return err } - // add new references to this tupel + // add new references to this tuple if _, err := tx.Exec(ctx, fmt.Sprintf(` UPDATE "%s"."%s" SET "%s" = $1 WHERE "%s" = ANY($2) @@ -444,7 +448,7 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, return handler.ErrSchemaUnknownAttribute(shipValues.attributeIdNm.Bytes) } - // get current references to this tupel + // get current references to this tuple valuesCurr := make([]int64, 0) if err := tx.QueryRow(ctx, fmt.Sprintf(` SELECT ARRAY( @@ -457,9 +461,9 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, return err } - // remove old references to this tupel + // remove old references to this tuple for _, value := range valuesCurr { - if tools.Int64InSlice(value, shipValues.values) { + if slices.Contains(shipValues.values, value) { continue } @@ -474,9 +478,9 @@ func setForIndex_tx(ctx context.Context, tx pgx.Tx, index int, } } - // add new references to this tupel + // add new references to this tuple for _, value := range shipValues.values { - if tools.Int64InSlice(value, valuesCurr) { + if slices.Contains(valuesCurr, value) { continue } @@ -509,20 +513,20 @@ func collectCurrentValuesForLog_tx(ctx context.Context, tx pgx.Tx, dataGet := types.DataGet{ RelationId: relationId, IndexSource: 0, - Filters: []types.DataGetFilter{ - types.DataGetFilter{ - Connector: "AND", - Operator: "=", - Side0: types.DataGetFilterSide{ - AttributeId: pgtype.UUID{ - Bytes: rel.AttributeIdPk, - Valid: true, - }, - }, - Side1: types.DataGetFilterSide{ - Value: recordId, + Filters: []types.DataGetFilter{{ + Connector: "AND", + Index: 0, + Operator: "=", + Side0: types.DataGetFilterSide{ + AttributeId: pgtype.UUID{ + Bytes: rel.AttributeIdPk, + Valid: true, }, }, + Side1: types.DataGetFilterSide{ + Value: recordId, + }, + }, }, } @@ -538,7 +542,7 @@ func collectCurrentValuesForLog_tx(ctx context.Context, tx pgx.Tx, // special case: file attribute // no need to lookup current values as file attribute values already only include changes - ReturnNull: tools.IntInSlice(i, fileAttributeIndexes), + ReturnNull: slices.Contains(fileAttributeIndexes, i), }) } diff --git a/db/check/check.go b/db/check/check.go index 84bbbe73..71f28f71 100644 --- a/db/check/check.go +++ b/db/check/check.go @@ -11,7 +11,7 @@ import ( func DbIdentifier(input string) error { if input == "" { - return handler.CreateErrCode("APP", handler.ErrCodeAppNameEmpty) + return handler.CreateErrCode(handler.ErrContextApp, handler.ErrCodeAppNameEmpty) } // must start with [a-z], followed by [a-z0-9\_], max. 60 chars (max. identifier size in PostgreSQL: 63) @@ -21,7 +21,7 @@ func DbIdentifier(input string) error { return err } if input != rex.FindString(input) { - return handler.CreateErrCode("APP", handler.ErrCodeAppNameInvalid) + return handler.CreateErrCode(handler.ErrContextApp, handler.ErrCodeAppNameInvalid) } return nil } diff --git a/db/db.go b/db/db.go index f9386039..c4b0e338 100644 --- a/db/db.go +++ b/db/db.go @@ -7,6 +7,7 @@ import ( "net/url" "r3/tools" "r3/types" + "strconv" "time" pgxuuid "github.com/jackc/pgx-gofrs-uuid" @@ -14,8 +15,18 @@ import ( "github.com/jackc/pgx/v5/pgxpool" ) -var Ctx = context.TODO() -var Pool *pgxpool.Pool +var ( + Pool *pgxpool.Pool + + // default context timeouts + CtxDefTimeoutDbTask = 300 * time.Second // heavy DB operations (init/upgrade/relation retention cleanup) + CtxDefTimeoutLogWrite = 30 * time.Second // writing to database log + CtxDefTimeoutPgFunc = 240 * time.Second // executing plsql functions, to be replaced by config option + CtxDefTimeoutShutdown = 10 * time.Second // shutting down system + CtxDefTimeoutSysTask = 30 * time.Second // executing system tasks + CtxDefTimeoutSysStart = 300 * time.Second // executing system startup tasks + CtxDefTimeoutTransfer = 600 * time.Second // executing module transfers, to be replaced by config option +) // attempts to open a database connection // repeat attempts until successful or predefined time limit is reached @@ -31,6 +42,7 @@ func OpenWait(timeoutSeconds int64, config types.FileTypeDb) error { } time.Sleep(time.Millisecond * 500) } + Pool = nil return fmt.Errorf("timeout reached, last error: %s", err) } @@ -50,7 +62,12 @@ func Open(config types.FileTypeDb) error { if err != nil { return err } - + if config.ConnsMax != 0 { + poolConfig.MaxConns = config.ConnsMax + } + if config.ConnsMin != 0 { + poolConfig.MinConns = config.ConnsMin + } if config.Ssl { poolConfig.ConnConfig.TLSConfig = &tls.Config{ InsecureSkipVerify: config.SslSkipVerify, @@ -70,7 +87,13 @@ func Open(config types.FileTypeDb) error { return Pool.Ping(context.Background()) } +// set transaction config parameters +// these are used by system functions, such as instance.get_login_id() +func SetSessionConfig_tx(ctx context.Context, tx pgx.Tx, loginId int64) error { + _, err := tx.Exec(ctx, `SELECT SET_CONFIG('r3.login_id',$1,TRUE)`, strconv.FormatInt(loginId, 10)) + return err +} + func Close() { Pool.Close() - Pool = nil } diff --git a/db/embedded/embedded.go b/db/embedded/embedded.go index 0a174fd6..724d5c96 100644 --- a/db/embedded/embedded.go +++ b/db/embedded/embedded.go @@ -1,22 +1,12 @@ /* - controls embedded postgres database via pg_ctl - sets locale for messages (LC_MESSAGES) for parsing call outputs +controls embedded postgres database via pg_ctl +sets locale for messages (LC_MESSAGES) for parsing call outputs */ package embedded import ( - "bufio" - "context" - "errors" - "fmt" - "os" - "os/exec" "path/filepath" "r3/config" - "r3/log" - "r3/tools" - "strings" - "time" ) var ( @@ -40,141 +30,3 @@ func SetPaths() { dbBinCtl = filepath.Join(dbBin, "pg_ctl") dbData = config.File.Paths.EmbeddedDbData } - -func Start() error { - - // check for existing embedded database path - exists, err := tools.Exists(dbData) - if err != nil { - return err - } - if !exists { - - // get database from template - if err := tools.FileMove(strings.Replace(dbData, "database", "database_template", 1), - dbData, false); err != nil { - - return err - } - } - - // check embedded database state - state, err := status() - if err != nil { - return err - } - - if state { - return fmt.Errorf("database already running, another instance is likely active") - } - _, err = execWaitFor(dbBinCtl, []string{"start", "-D", dbData, - fmt.Sprintf(`-o "-p %d"`, config.File.Db.Port)}, []string{msgStarted}, 10) - - return err -} - -func Stop() error { - - state, err := status() - if err != nil { - return err - } - - if !state { - log.Info("server", "embedded database already stopped") - return nil - } - - _, err = execWaitFor(dbBinCtl, []string{"stop", "-D", dbData}, []string{msgStopped}, 10) - return err -} - -func status() (bool, error) { - - foundLine, err := execWaitFor(dbBinCtl, []string{"status", "-D", dbData}, - []string{msgState0, msgState1}, 5) - - if err != nil { - return false, err - } - - if strings.Contains(foundLine, msgState1) { - return true, nil - } - return false, nil -} - -// executes call and waits for specified lines to return -// will return automatically after timeout -func execWaitFor(call string, args []string, waitFor []string, waitTime int) (string, error) { - - ctx, _ := context.WithTimeout(context.Background(), time.Duration(waitTime)*time.Second) - - cmd := exec.CommandContext(ctx, call, args...) - tools.CmdAddSysProgAttrs(cmd) - cmd.Env = append(os.Environ(), fmt.Sprintf("LC_MESSAGES=%s", locale)) - - stdout, err := cmd.StdoutPipe() - if err != nil { - return "", err - } - - done := make(chan bool) - var doneErr error = nil - var doneLine string = "" - - // react to call timeout - go func() { - for { - <-ctx.Done() - doneErr = errors.New("timeout reached") - done <- true - return - } - }() - - // react to new lines from standard output - go func() { - if err := cmd.Start(); err != nil { - doneErr = err - done <- true - return - } - - log := []string{} - buf := bufio.NewReader(stdout) - for { - line, _, err := buf.ReadLine() - if err != nil { - doneErr = err - break - } - log = append(log, string(line)) - - // success if expected lines turned up - for _, waitLine := range waitFor { - - if strings.Contains(string(line), waitLine) { - - doneLine = waitLine - done <- true - return - } - } - } - - if len(log) == 0 { - // nothing turned up - doneErr = errors.New("output is empty") - done <- true - return - } - - // expected lines did not turn up - doneErr = fmt.Errorf("unexpected output, got: %s", strings.Join(log, ",")) - done <- true - }() - - <-done - return doneLine, doneErr -} diff --git a/db/embedded/embedded_linux.go b/db/embedded/embedded_linux.go new file mode 100644 index 00000000..595c0858 --- /dev/null +++ b/db/embedded/embedded_linux.go @@ -0,0 +1,12 @@ +//go:build linux || darwin + +package embedded + +import "fmt" + +func Start() error { + return fmt.Errorf("embedded database is only supported on Windows") +} +func Stop() error { + return fmt.Errorf("embedded database is only supported on Windows") +} diff --git a/db/embedded/embedded_windows.go b/db/embedded/embedded_windows.go new file mode 100644 index 00000000..f5ebfba5 --- /dev/null +++ b/db/embedded/embedded_windows.go @@ -0,0 +1,158 @@ +//go:build windows + +package embedded + +import ( + "bufio" + "context" + "errors" + "fmt" + "io" + "os" + "os/exec" + "r3/config" + "r3/log" + "r3/tools" + "strings" + "syscall" + "time" +) + +func Start() error { + + // check for existing embedded database path + exists, err := tools.Exists(dbData) + if err != nil { + return err + } + if !exists { + + // get database from template + if err := tools.FileMove(strings.Replace(dbData, "database", "database_template", 1), + dbData, false); err != nil { + + return err + } + } + + // check embedded database state + state, err := status() + if err != nil { + return err + } + + if state { + return fmt.Errorf("database already running, another instance is likely active") + } + _, err = execWaitFor(dbBinCtl, []string{"start", "-D", dbData, + fmt.Sprintf(`-o "-p %d"`, config.File.Db.Port)}, []string{msgStarted}, 10) + + return err +} + +func Stop() error { + + state, err := status() + if err != nil { + return err + } + + if !state { + log.Info("server", "embedded database already stopped") + return nil + } + + _, err = execWaitFor(dbBinCtl, []string{"stop", "-D", dbData}, []string{msgStopped}, 10) + return err +} + +func status() (bool, error) { + + foundLine, err := execWaitFor(dbBinCtl, []string{"status", "-D", dbData}, + []string{msgState0, msgState1}, 5) + + if err != nil { + return false, err + } + // returns true if DB server is running + return strings.Contains(foundLine, msgState1), nil +} + +// executes call and waits for specified lines to return +// will return automatically after timeout +func execWaitFor(call string, args []string, waitFor []string, waitTime int) (string, error) { + + ctx, _ := context.WithTimeout(context.Background(), time.Duration(waitTime)*time.Second) + cmd := exec.CommandContext(ctx, call, args...) + tools.CmdAddSysProgAttrs(cmd) + cmd.Env = append(os.Environ(), fmt.Sprintf("LC_MESSAGES=%s", locale)) + + // create as separate process for clean shutdown, otherwise child progs are killed immediately on SIGINT + cmd.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP, + } + + stdout, err := cmd.StdoutPipe() + if err != nil { + return "", err + } + + type chanReturnType struct { + err error + line string + } + chanReturn := make(chan chanReturnType) + + // react to call timeout + go func() { + for { + <-ctx.Done() + chanReturn <- chanReturnType{err: errors.New("timeout reached")} + return + } + }() + + // react to new lines from standard output + go func() { + if err := cmd.Start(); err != nil { + chanReturn <- chanReturnType{err: err} + return + } + + buf := bufio.NewReader(stdout) + bufLines := []string{} + for { + line, _, err := buf.ReadLine() + if err != nil { + if err != io.EOF { + // log error if not end-of-file + log.Error("server", "failed to read from std out", err) + } + break + } + bufLines = append(bufLines, string(line)) + + // success if expected lines turned up + for _, waitLine := range waitFor { + if strings.Contains(string(line), waitLine) { + chanReturn <- chanReturnType{ + err: nil, + line: waitLine, + } + return + } + } + } + + if len(bufLines) == 0 { + // nothing turned up + chanReturn <- chanReturnType{err: errors.New("output is empty")} + } else { + // expected lines did not turn up + chanReturn <- chanReturnType{err: fmt.Errorf("unexpected output, got: %s", strings.Join(bufLines, ","))} + } + }() + + res := <-chanReturn + return res.line, res.err +} diff --git a/db/initialize/initialize.go b/db/initialize/initialize.go index d42c18e2..f6c6b721 100644 --- a/db/initialize/initialize.go +++ b/db/initialize/initialize.go @@ -1,7 +1,9 @@ package initialize import ( + "context" "fmt" + "r3/bruteforce" "r3/config" "r3/db" "r3/db/upgrade" @@ -12,9 +14,11 @@ import ( ) func PrepareDbIfNew() error { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutDbTask) + defer ctxCanc() var exists bool - if err := db.Pool.QueryRow(db.Ctx, ` + if err := db.Pool.QueryRow(ctx, ` SELECT exists( SELECT FROM pg_tables WHERE schemaname = 'instance' @@ -27,29 +31,29 @@ func PrepareDbIfNew() error { return nil } - tx, err := db.Pool.Begin(db.Ctx) + tx, err := db.Pool.Begin(ctx) if err != nil { return err } - defer tx.Rollback(db.Ctx) + defer tx.Rollback(ctx) - if err := initAppSchema_tx(tx); err != nil { + if err := initAppSchema_tx(ctx, tx); err != nil { return err } - if err := initInstanceValues_tx(tx); err != nil { + if err := initInstanceValues_tx(ctx, tx); err != nil { return err } // replace database password for embedded database if config.File.Db.Embedded { - if err := renewDbUserPw_tx(tx); err != nil { + if err := renewDbUserPw_tx(ctx, tx); err != nil { return err } } // commit changes - if err := tx.Commit(db.Ctx); err != nil { + if err := tx.Commit(ctx); err != nil { return err } @@ -65,23 +69,23 @@ func PrepareDbIfNew() error { if err := config.LoadFromDb(); err != nil { return err } + bruteforce.SetConfig() + config.ActivateLicense() + config.SetLogLevels() // before doing any more work, upgrade DB if necessary if err := upgrade.RunIfRequired(); err != nil { return err } - // create initial login - if err := login.CreateAdmin("admin", "admin"); err != nil { - return err - } - return nil + // create initial login last, in case database upgrade is required beforehand + return login.CreateAdmin("admin", "admin") } -func renewDbUserPw_tx(tx pgx.Tx) error { +func renewDbUserPw_tx(ctx context.Context, tx pgx.Tx) error { newPass := tools.RandStringRunes(48) - _, err := tx.Exec(db.Ctx, fmt.Sprintf(`ALTER USER %s WITH PASSWORD '%s'`, + _, err := tx.Exec(ctx, fmt.Sprintf(`ALTER USER %s WITH PASSWORD '%s'`, config.File.Db.User, newPass)) if err != nil { @@ -96,73 +100,88 @@ func renewDbUserPw_tx(tx pgx.Tx) error { return nil } -// for later inits -/* - create default login template - INSERT INTO instance.login_template (name) - VALUES ('GLOBAL'); - - INSERT INTO instance.login_setting (login_template_id, language_code, date_format, - sunday_first_dow, font_size, borders_all, borders_corner, page_limit, - header_captions, spacing, dark, compact, hint_update_version, - mobile_scroll_form, warn_unsaved, menu_colored, pattern, font_family, - tab_remember, field_clean) - SELECT id, 'en_us', 'Y-m-d', true, 100, false, 'keep', 2000, true, 3, false, - true, 0, true, true, false, 'bubbles', 'helvetica', true, true - FROM instance.login_template - WHERE name = 'GLOBAL'; -*/ - -// instance initalized to 3.0 -func initInstanceValues_tx(tx pgx.Tx) error { +// instance initalized to 3.10 +func initInstanceValues_tx(ctx context.Context, tx pgx.Tx) error { appName, appNameShort := config.GetAppName() - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + _, err := tx.Exec(ctx, fmt.Sprintf(` + -- default login template + INSERT INTO instance.login_template (name) VALUES ('GLOBAL'); + + INSERT INTO instance.login_setting ( + login_template_id, dark, date_format, header_captions, hint_update_version, language_code, mobile_scroll_form, font_family, + font_size, pattern, spacing, sunday_first_dow, warn_unsaved, tab_remember, borders_squared, color_classic_mode, color_header, + color_menu, color_header_single, header_modules, list_colored, list_spaced, number_sep_decimal, number_sep_thousand, + bool_as_icon, form_actions_align, shadows_inputs) + VALUES ( + ( + SELECT id + FROM instance.login_template + WHERE name = 'GLOBAL' + ), false, 'Y-m-d', true, 0, 'en_us', true, 'helvetica', + 100, 'bubbles', 3, true, true, true, false, false, NULL, + NULL, false, true, true, false, '.', ',', + true, 'center', true); + -- config INSERT INTO instance.config (name,value) VALUES + ('adminMails',''), ('appName','%s'), ('appNameShort','%s'), - ('backupDir',''), + ('backupCountDaily','7'), + ('backupCountMonthly','3'), + ('backupCountWeekly','4'), ('backupDaily','0'), + ('backupDir',''), ('backupMonthly','0'), ('backupWeekly','0'), - ('backupCountDaily','7'), - ('backupCountWeekly','4'), - ('backupCountMonthly','3'), ('bruteforceAttempts','50'), ('bruteforceProtection','1'), ('builderMode','0'), ('clusterNodeMissingAfter','180'), ('companyColorHeader',''), ('companyColorLogin',''), + ('companyLoginImage',''), ('companyLogo',''), ('companyLogoUrl',''), ('companyName',''), ('companyWelcome',''), + ('css',''), ('dbTimeoutCsv','120'), ('dbTimeoutDataRest','60'), ('dbTimeoutDataWs','300'), ('dbTimeoutIcs','30'), - ('dbVersionCut','3.0'), - ('defaultLanguageCode','en_us'), + ('dbVersionCut','3.10'), + ('filesKeepDaysDeleted','90'), + ('fileVersionsKeepCount','30'), + ('fileVersionsKeepDays','90'), + ('iconPwa1',''), + ('iconPwa2',''), ('icsDaysPost','365'), ('icsDaysPre','365'), ('icsDownload','1'), + ('imagerThumbWidth','300'), ('instanceId',''), ('licenseFile',''), - ('logApplication','2'), + ('logApi','2'), ('logBackup','2'), ('logCache','2'), ('logCluster','2'), ('logCsv','2'), + ('logImager','2'), + ('loginBackgrounds','[2,5,6,9,11]'), ('logLdap','2'), ('logMail','2'), + ('logModule','2'), ('logScheduler','2'), ('logServer','2'), - ('logTransfer','2'), ('logsKeepDays','90'), + ('logTransfer','2'), + ('logWebsocket','2'), + ('mailTrafficKeepDays','90'), ('productionMode','0'), + ('proxyUrl',''), ('publicHostName','localhost'), ('pwForceDigit','1'), ('pwForceLower','1'), @@ -176,8 +195,12 @@ func initInstanceValues_tx(tx pgx.Tx) error { ('repoSkipVerify','0'), ('repoUrl','https://store.rei3.de'), ('repoUser','repo_public'), - ('schemaTimestamp','0'), + ('systemMsgDate0','0'), + ('systemMsgDate1','0'), + ('systemMsgMaintenance','0'), + ('systemMsgText',''), ('tokenExpiryHours','168'), + ('tokenKeepEnable','1'), ('tokenSecret',''), ('updateCheckUrl','https://rei3.de/version'), ('updateCheckVersion',''); @@ -186,55 +209,65 @@ func initInstanceValues_tx(tx pgx.Tx) error { INSERT INTO instance.task (name,interval_seconds,cluster_master_only,embedded_only,active,active_only) VALUES + ('adminMails',86400,true,false,true,false), + ('backupRun',3600,true,false,true,false), ('cleanupBruteforce',86400,false,false,true,false), ('cleanupDataLogs',86400,true,false,true,false), + ('cleanupFiles',86400,true,false,true,false), ('cleanupLogs',86400,true,false,true,false), + ('cleanupMailTraffic',604800,true,false,true,false), ('cleanupTempDir',86400,true,false,true,false), - ('cleanupFiles',86400,true,false,true,false), ('clusterCheckIn',60,false,false,true,true), ('clusterProcessEvents',5,false,false,true,true), - ('embeddedBackup',3600,true,true,true,false), + ('dbOptimize',2580000,true,false,true,false), ('httpCertRenew',86400,false,false,true,false), ('importLdapLogins',900,true,false,true,false), ('mailAttach',30,true,false,true,false), ('mailRetrieve',60,true,false,true,false), ('mailSend',10,true,false,true,false), ('repoCheck',86400,true,false,true,false), + ('restExecute',15,true,false,true,false), + ('systemMsgMaintenance',30,true,false,true,true), ('updateCheck',86400,true,false,true,false); INSERT INTO instance.schedule (task_name,date_attempt,date_success) VALUES + ('adminMails',0,0), + ('backupRun',0,0), ('cleanupBruteforce',0,0), ('cleanupDataLogs',0,0), + ('cleanupFiles',0,0), ('cleanupLogs',0,0), + ('cleanupMailTraffic',0,0), ('cleanupTempDir',0,0), - ('cleanupFiles',0,0), ('clusterCheckIn',0,0), ('clusterProcessEvents',0,0), - ('embeddedBackup',0,0), + ('dbOptimize',0,0), ('httpCertRenew',0,0), ('importLdapLogins',0,0), ('mailAttach',0,0), ('mailRetrieve',0,0), ('mailSend',0,0), ('repoCheck',0,0), + ('restExecute',0,0), + ('systemMsgMaintenance',0,0), ('updateCheck',0,0); `, appName, appNameShort)) return err } -// app initalized to 3.0 -func initAppSchema_tx(tx pgx.Tx) error { - _, err := tx.Exec(db.Ctx, ` +// app initialized to 3.10 +func initAppSchema_tx(ctx context.Context, tx pgx.Tx) error { + _, err := tx.Exec(ctx, ` -- -- PostgreSQL database dump -- -- Dumped from database version 13.7 --- Dumped by pg_dump version 14.3 +-- Dumped by pg_dump version 17.1 --- Started on 2022-07-12 12:35:48 +-- Started on 2025-02-05 11:27:36 SET statement_timeout = 0; SET lock_timeout = 0; @@ -256,7 +289,7 @@ CREATE SCHEMA app; -- --- TOC entry 5 (class 2615 OID 16388) +-- TOC entry 7 (class 2615 OID 16388) -- Name: instance; Type: SCHEMA; Schema: -; Owner: - -- @@ -264,7 +297,7 @@ CREATE SCHEMA instance; -- --- TOC entry 9 (class 2615 OID 18448) +-- TOC entry 8 (class 2615 OID 16389) -- Name: instance_cluster; Type: SCHEMA; Schema: -; Owner: - -- @@ -272,7 +305,7 @@ CREATE SCHEMA instance_cluster; -- --- TOC entry 4 (class 2615 OID 18338) +-- TOC entry 9 (class 2615 OID 16390) -- Name: instance_e2ee; Type: SCHEMA; Schema: -; Owner: - -- @@ -280,430 +313,667 @@ CREATE SCHEMA instance_e2ee; -- --- TOC entry 726 (class 1247 OID 16390) +-- TOC entry 10 (class 2615 OID 18390) +-- Name: instance_file; Type: SCHEMA; Schema: -; Owner: - +-- + +CREATE SCHEMA instance_file; + + +-- +-- TOC entry 4 (class 2615 OID 2200) +-- Name: public; Type: SCHEMA; Schema: -; Owner: - +-- + +-- *not* creating schema, since initdb creates it + + +-- +-- TOC entry 775 (class 1247 OID 16392) -- Name: aggregator; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.aggregator AS ENUM ( - 'avg', - 'count', - 'list', - 'max', - 'min', - 'sum', - 'record', - 'array', - 'json' + 'avg', + 'count', + 'list', + 'max', + 'min', + 'sum', + 'record', + 'array', + 'json' ); -- --- TOC entry 729 (class 1247 OID 16406) +-- TOC entry 778 (class 1247 OID 16412) -- Name: attribute_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.attribute_content AS ENUM ( - 'integer', - 'bigint', - 'numeric', - 'real', - 'double precision', - 'varchar', - 'text', - 'boolean', - '1:1', - 'n:1', - 'files' + 'integer', + 'bigint', + 'numeric', + 'real', + 'double precision', + 'varchar', + 'text', + 'boolean', + '1:1', + 'n:1', + 'files', + 'uuid', + 'regconfig', + '1:n' +); + + +-- +-- TOC entry 1129 (class 1247 OID 18590) +-- Name: attribute_content_use; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.attribute_content_use AS ENUM ( + 'default', + 'textarea', + 'richtext', + 'date', + 'datetime', + 'time', + 'color', + 'iframe', + 'drawing', + 'barcode' ); -- --- TOC entry 732 (class 1247 OID 16430) +-- TOC entry 781 (class 1247 OID 16436) -- Name: attribute_fk_actions; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.attribute_fk_actions AS ENUM ( - 'NO ACTION', - 'RESTRICT', - 'CASCADE', - 'SET NULL', - 'SET DEFAULT' + 'NO ACTION', + 'RESTRICT', + 'CASCADE', + 'SET NULL', + 'SET DEFAULT' ); -- --- TOC entry 735 (class 1247 OID 16442) +-- TOC entry 1121 (class 1247 OID 18507) -- Name: caption_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.caption_content AS ENUM ( - 'attributeTitle', - 'columnTitle', - 'fieldHelp', - 'fieldTitle', - 'formHelp', - 'formTitle', - 'menuTitle', - 'moduleHelp', - 'moduleTitle', - 'queryChoiceTitle', - 'roleDesc', - 'roleTitle', - 'pgFunctionTitle', - 'pgFunctionDesc', - 'loginFormTitle', - 'jsFunctionTitle', - 'jsFunctionDesc' -); - - --- --- TOC entry 1046 (class 1247 OID 18374) + 'articleBody', + 'articleTitle', + 'attributeTitle', + 'columnTitle', + 'fieldHelp', + 'fieldTitle', + 'formTitle', + 'menuTitle', + 'moduleTitle', + 'queryChoiceTitle', + 'roleDesc', + 'roleTitle', + 'pgFunctionTitle', + 'pgFunctionDesc', + 'loginFormTitle', + 'jsFunctionTitle', + 'jsFunctionDesc', + 'tabTitle', + 'widgetTitle', + 'formActionTitle', + 'clientEventTitle', + 'menuTabTitle' +); + + +-- +-- TOC entry 1216 (class 1247 OID 19252) +-- Name: client_event_action; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.client_event_action AS ENUM ( + 'callJsFunction', + 'callPgFunction' +); + + +-- +-- TOC entry 1219 (class 1247 OID 19258) +-- Name: client_event_argument; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.client_event_argument AS ENUM ( + 'clipboard', + 'hostname', + 'username', + 'windowTitle' +); + + +-- +-- TOC entry 1222 (class 1247 OID 19268) +-- Name: client_event_event; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.client_event_event AS ENUM ( + 'onConnect', + 'onDisconnect', + 'onHotkey' +); + + +-- +-- TOC entry 1225 (class 1247 OID 19276) +-- Name: client_event_hotkey_modifier; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.client_event_hotkey_modifier AS ENUM ( + 'ALT', + 'CMD', + 'CTRL', + 'SHIFT' +); + + +-- +-- TOC entry 784 (class 1247 OID 16484) -- Name: collection_consumer_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.collection_consumer_content AS ENUM ( - 'fieldDataDefault', - 'fieldFilterSelector', - 'headerDisplay', - 'menuDisplay' + 'fieldDataDefault', + 'fieldFilterSelector', + 'headerDisplay', + 'menuDisplay', + 'widgetDisplay' +); + + +-- +-- TOC entry 1269 (class 1247 OID 19548) +-- Name: collection_consumer_flag; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.collection_consumer_flag AS ENUM ( + 'multiValue', + 'noDisplayEmpty', + 'showRowCount' +); + + +-- +-- TOC entry 1164 (class 1247 OID 18828) +-- Name: column_style; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.column_style AS ENUM ( + 'bold', + 'italic', + 'alignEnd', + 'alignMid', + 'clipboard', + 'vertical', + 'wrap', + 'monospace', + 'previewLarge', + 'boolAtrIcon' ); -- --- TOC entry 738 (class 1247 OID 16468) +-- TOC entry 787 (class 1247 OID 16494) -- Name: condition_connector; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.condition_connector AS ENUM ( - 'AND', - 'OR' + 'AND', + 'OR' ); -- --- TOC entry 741 (class 1247 OID 16474) +-- TOC entry 790 (class 1247 OID 16500) -- Name: condition_operator; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.condition_operator AS ENUM ( - '=', - '<>', - '<', - '>', - '<=', - '>=', - 'IS NULL', - 'IS NOT NULL', - 'LIKE', - 'ILIKE', - 'NOT LIKE', - 'NOT ILIKE', - '= ANY', - '<> ALL', - '@>', - '<@', - '&&' -); - - --- --- TOC entry 744 (class 1247 OID 16504) + '=', + '<>', + '<', + '>', + '<=', + '>=', + 'IS NULL', + 'IS NOT NULL', + 'LIKE', + 'ILIKE', + 'NOT LIKE', + 'NOT ILIKE', + '= ANY', + '<> ALL', + '@>', + '<@', + '&&', + '~', + '~*', + '!~', + '!~*' +); + + +-- +-- TOC entry 1132 (class 1247 OID 18607) -- Name: data_display; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.data_display AS ENUM ( - 'color', - 'date', - 'datetime', - 'default', - 'email', - 'gallery', - 'hidden', - 'login', - 'phone', - 'richtext', - 'slider', - 'textarea', - 'time', - 'url', - 'password' -); - - --- --- TOC entry 747 (class 1247 OID 16534) + 'default', + 'email', + 'gallery', + 'hidden', + 'login', + 'password', + 'phone', + 'slider', + 'url', + 'rating' +); + + +-- +-- TOC entry 793 (class 1247 OID 16568) -- Name: field_calendar_gantt_steps; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.field_calendar_gantt_steps AS ENUM ( - 'days', - 'hours' + 'days', + 'hours' ); -- --- TOC entry 750 (class 1247 OID 16540) +-- TOC entry 796 (class 1247 OID 16574) -- Name: field_container_align_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.field_container_align_content AS ENUM ( - 'center', - 'flex-end', - 'flex-start', - 'space-between', - 'space-around', - 'stretch' + 'center', + 'flex-end', + 'flex-start', + 'space-between', + 'space-around', + 'stretch', + 'space-evenly' ); -- --- TOC entry 753 (class 1247 OID 16554) +-- TOC entry 799 (class 1247 OID 16588) -- Name: field_container_align_items; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.field_container_align_items AS ENUM ( - 'baseline', - 'center', - 'flex-end', - 'flex-start', - 'stretch' + 'baseline', + 'center', + 'flex-end', + 'flex-start', + 'stretch' ); -- --- TOC entry 756 (class 1247 OID 16566) +-- TOC entry 802 (class 1247 OID 16600) -- Name: field_container_direction; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.field_container_direction AS ENUM ( - 'column', - 'row' + 'column', + 'row' ); -- --- TOC entry 759 (class 1247 OID 16572) +-- TOC entry 805 (class 1247 OID 16606) -- Name: field_container_justify_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.field_container_justify_content AS ENUM ( - 'flex-start', - 'flex-end', - 'center', - 'space-between', - 'space-around', - 'space-evenly' + 'flex-start', + 'flex-end', + 'center', + 'space-between', + 'space-around', + 'space-evenly' ); -- --- TOC entry 762 (class 1247 OID 16586) +-- TOC entry 808 (class 1247 OID 16620) -- Name: field_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.field_content AS ENUM ( - 'button', - 'calendar', - 'container', - 'data', - 'header', - 'list', - 'chart' + 'button', + 'calendar', + 'container', + 'data', + 'header', + 'list', + 'chart', + 'tabs', + 'kanban', + 'variable' ); -- --- TOC entry 765 (class 1247 OID 16600) --- Name: field_list_layout; Type: TYPE; Schema: app; Owner: - +-- TOC entry 1265 (class 1247 OID 19537) +-- Name: field_flag; Type: TYPE; Schema: app; Owner: - -- -CREATE TYPE app.field_list_layout AS ENUM ( - 'cards', - 'table' +CREATE TYPE app.field_flag AS ENUM ( + 'alignEnd', + 'hideInputs', + 'monospace' ); -- --- TOC entry 768 (class 1247 OID 16606) --- Name: field_state; Type: TYPE; Schema: app; Owner: - +-- TOC entry 811 (class 1247 OID 16636) +-- Name: field_list_layout; Type: TYPE; Schema: app; Owner: - -- -CREATE TYPE app.field_state AS ENUM ( - 'default', - 'hidden', - 'readonly', - 'required', - 'optional' +CREATE TYPE app.field_list_layout AS ENUM ( + 'cards', + 'table' ); -- --- TOC entry 1035 (class 1247 OID 16638) +-- TOC entry 814 (class 1247 OID 16654) -- Name: filter_side_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.filter_side_content AS ENUM ( - 'attribute', - 'field', - 'javascript', - 'languageCode', - 'login', - 'record', - 'recordNew', - 'role', - 'subQuery', - 'true', - 'value', - 'preset', - 'collection', - 'fieldChanged' + 'attribute', + 'field', + 'javascript', + 'languageCode', + 'login', + 'record', + 'recordNew', + 'role', + 'subQuery', + 'true', + 'value', + 'preset', + 'collection', + 'fieldChanged', + 'nowDate', + 'nowDatetime', + 'nowTime', + 'fieldValid', + 'formChanged', + 'variable', + 'getter', + 'formState' ); -- --- TOC entry 1023 (class 1247 OID 18159) +-- TOC entry 817 (class 1247 OID 16684) -- Name: form_function_event; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.form_function_event AS ENUM ( - 'open', - 'save', - 'delete' + 'open', + 'save', + 'delete' +); + + +-- +-- TOC entry 1167 (class 1247 OID 18838) +-- Name: open_form_context; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.open_form_context AS ENUM ( + 'bulk' +); + + +-- +-- TOC entry 1170 (class 1247 OID 18842) +-- Name: open_form_pop_up_type; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.open_form_pop_up_type AS ENUM ( + 'float', + 'inline' ); -- --- TOC entry 771 (class 1247 OID 16616) +-- TOC entry 820 (class 1247 OID 16692) -- Name: pg_function_schedule_interval; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.pg_function_schedule_interval AS ENUM ( - 'seconds', - 'minutes', - 'hours', - 'days', - 'weeks', - 'months', - 'years', - 'once' + 'seconds', + 'minutes', + 'hours', + 'days', + 'weeks', + 'months', + 'years', + 'once' +); + + +-- +-- TOC entry 1254 (class 1247 OID 19434) +-- Name: pg_function_volatility; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.pg_function_volatility AS ENUM ( + 'VOLATILE', + 'STABLE', + 'IMMUTABLE' ); -- --- TOC entry 774 (class 1247 OID 16632) +-- TOC entry 1147 (class 1247 OID 18742) +-- Name: pg_index_method; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.pg_index_method AS ENUM ( + 'BTREE', + 'GIN' +); + + +-- +-- TOC entry 823 (class 1247 OID 16710) -- Name: pg_trigger_fires; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.pg_trigger_fires AS ENUM ( - 'AFTER', - 'BEFORE' + 'AFTER', + 'BEFORE' ); -- --- TOC entry 777 (class 1247 OID 16662) +-- TOC entry 826 (class 1247 OID 16716) -- Name: query_join_connector; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.query_join_connector AS ENUM ( - 'INNER', - 'LEFT', - 'RIGHT', - 'FULL', - 'CROSS' + 'INNER', + 'LEFT', + 'RIGHT', + 'FULL', + 'CROSS' ); -- --- TOC entry 780 (class 1247 OID 16674) +-- TOC entry 829 (class 1247 OID 16728) -- Name: role_access_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.role_access_content AS ENUM ( - 'none', - 'read', - 'write' + 'none', + 'read', + 'write' ); -- --- TOC entry 1043 (class 1247 OID 18358) +-- TOC entry 832 (class 1247 OID 16736) -- Name: role_content; Type: TYPE; Schema: app; Owner: - -- CREATE TYPE app.role_content AS ENUM ( - 'admin', - 'everyone', - 'other', - 'user' + 'admin', + 'everyone', + 'other', + 'user' +); + + +-- +-- TOC entry 1106 (class 1247 OID 16642) +-- Name: state_effect; Type: TYPE; Schema: app; Owner: - +-- + +CREATE TYPE app.state_effect AS ENUM ( + 'default', + 'hidden', + 'readonly', + 'required', + 'optional' +); + + +-- +-- TOC entry 1209 (class 1247 OID 19164) +-- Name: admin_mail_reason; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.admin_mail_reason AS ENUM ( + 'licenseExpiration', + 'oauthClientExpiration' +); + + +-- +-- TOC entry 1283 (class 1247 OID 19655) +-- Name: align_horizontal; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.align_horizontal AS ENUM ( + 'left', + 'center', + 'right' ); -- --- TOC entry 783 (class 1247 OID 16682) +-- TOC entry 1103 (class 1247 OID 18393) +-- Name: file_meta; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.file_meta AS ( + id uuid, + login_id_creator integer, + hash text, + name text, + size_kb integer, + version integer, + date_change bigint, + date_delete bigint, + user_id_creator integer +); + + +-- +-- TOC entry 835 (class 1247 OID 16746) -- Name: log_context; Type: TYPE; Schema: instance; Owner: - -- CREATE TYPE instance.log_context AS ENUM ( - 'backup', - 'cache', - 'csv', - 'ldap', - 'mail', - 'scheduler', - 'server', - 'transfer', - 'module', - 'cluster' + 'backup', + 'cache', + 'csv', + 'ldap', + 'mail', + 'scheduler', + 'server', + 'transfer', + 'module', + 'cluster', + 'imager', + 'websocket', + 'api' ); -- --- TOC entry 786 (class 1247 OID 16700) --- Name: login_setting_border_corner; Type: TYPE; Schema: instance; Owner: - +-- TOC entry 1236 (class 1247 OID 19365) +-- Name: login_session_device; Type: TYPE; Schema: instance; Owner: - -- -CREATE TYPE instance.login_setting_border_corner AS ENUM ( - 'keep', - 'rounded', - 'squared' +CREATE TYPE instance.login_session_device AS ENUM ( + 'browser', + 'fatClient' ); -- --- TOC entry 1051 (class 1247 OID 18418) +-- TOC entry 838 (class 1247 OID 16776) -- Name: login_setting_font_family; Type: TYPE; Schema: instance; Owner: - -- CREATE TYPE instance.login_setting_font_family AS ENUM ( - 'calibri', - 'comic_sans_ms', - 'consolas', - 'georgia', - 'helvetica', - 'lucida_console', - 'segoe_script', - 'segoe_ui', - 'times_new_roman', - 'trebuchet_ms', - 'verdana' + 'calibri', + 'comic_sans_ms', + 'consolas', + 'georgia', + 'helvetica', + 'lucida_console', + 'segoe_script', + 'segoe_ui', + 'times_new_roman', + 'trebuchet_ms', + 'verdana' ); -- --- TOC entry 1054 (class 1247 OID 18442) +-- TOC entry 841 (class 1247 OID 16800) -- Name: login_setting_pattern; Type: TYPE; Schema: instance; Owner: - -- CREATE TYPE instance.login_setting_pattern AS ENUM ( - 'bubbles', - 'waves' + 'bubbles', + 'waves', + 'circuits', + 'cubes', + 'triangles' ); -- --- TOC entry 989 (class 1247 OID 17832) +-- TOC entry 844 (class 1247 OID 16807) -- Name: mail; Type: TYPE; Schema: instance; Owner: - -- @@ -718,53 +988,164 @@ CREATE TYPE instance.mail AS ( -- --- TOC entry 992 (class 1247 OID 17844) +-- TOC entry 1173 (class 1247 OID 18852) +-- Name: mail_account_auth_method; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.mail_account_auth_method AS ENUM ( + 'plain', + 'login', + 'xoauth2' +); + + +-- +-- TOC entry 847 (class 1247 OID 16809) -- Name: mail_account_mode; Type: TYPE; Schema: instance; Owner: - -- CREATE TYPE instance.mail_account_mode AS ENUM ( - 'imap', - 'smtp' + 'imap', + 'smtp' +); + + +-- +-- TOC entry 1153 (class 1247 OID 18771) +-- Name: rest_method; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.rest_method AS ENUM ( + 'DELETE', + 'GET', + 'PATCH', + 'POST', + 'PUT' ); -- --- TOC entry 789 (class 1247 OID 16711) +-- TOC entry 850 (class 1247 OID 16814) -- Name: token_fixed_context; Type: TYPE; Schema: instance; Owner: - -- CREATE TYPE instance.token_fixed_context AS ENUM ( - 'ics' + 'ics', + 'client', + 'totp' +); + + +-- +-- TOC entry 1247 (class 1247 OID 19405) +-- Name: user_data; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.user_data AS ( + id integer, + is_active boolean, + is_admin boolean, + is_limited boolean, + is_public boolean, + username character varying(128), + department character varying(512), + email character varying(512), + location character varying(512), + name_display character varying(512), + name_fore character varying(512), + name_sur character varying(512), + notes character varying(8196), + organization character varying(512), + phone_fax character varying(512), + phone_landline character varying(512), + phone_mobile character varying(512) +); + + +-- +-- TOC entry 1193 (class 1247 OID 19018) +-- Name: widget_content; Type: TYPE; Schema: instance; Owner: - +-- + +CREATE TYPE instance.widget_content AS ENUM ( + 'moduleWidget', + 'systemModuleMenu' ); -- --- TOC entry 1057 (class 1247 OID 18450) +-- TOC entry 853 (class 1247 OID 16818) -- Name: node_event_content; Type: TYPE; Schema: instance_cluster; Owner: - -- CREATE TYPE instance_cluster.node_event_content AS ENUM ( - 'collectionUpdated', - 'configChanged', - 'loginDisabled', - 'loginReauthorized', - 'loginReauthorizedAll', - 'masterAssigned', - 'schemaChanged', - 'shutdownTriggered', - 'tasksChanged', - 'taskTriggered' + 'collectionUpdated', + 'configChanged', + 'loginDisabled', + 'loginReauthorized', + 'loginReauthorizedAll', + 'masterAssigned', + 'schemaChanged', + 'shutdownTriggered', + 'tasksChanged', + 'taskTriggered', + 'filesCopied', + 'fileRequested', + 'jsFunctionCalled', + 'clientEventsChanged', + 'keystrokesRequested' ); -- --- TOC entry 307 (class 1255 OID 17881) +-- TOC entry 347 (class 1255 OID 18727) +-- Name: get_preset_ids_inside_queries(uuid[]); Type: FUNCTION; Schema: app; Owner: - +-- + +CREATE FUNCTION app.get_preset_ids_inside_queries(query_ids_in uuid[]) RETURNS uuid[] + LANGUAGE plpgsql IMMUTABLE + AS $$ + DECLARE + preset_ids UUID[]; + query_ids_sub UUID[]; + BEGIN + IF array_length(query_ids_in,1) = 0 THEN + RETURN preset_ids; + END IF; + + -- collect preset directly + SELECT ARRAY_AGG(preset_id) INTO preset_ids + FROM app.query_filter_side + WHERE query_id = ANY(query_ids_in) + AND content = 'preset'; + + -- collect presets from filters inside sub queries + SELECT ARRAY_AGG(q.id) INTO query_ids_sub + FROM app.query_filter_side AS s + JOIN app.query AS q + ON q.query_filter_query_id = s.query_id + AND q.query_filter_position = s.query_filter_position + AND q.query_filter_side = s.side + WHERE s.query_id = ANY(query_ids_in) + AND s.content = 'subQuery'; + + IF array_length(query_ids_sub,1) <> 0 THEN + preset_ids := array_cat(preset_ids, app.get_preset_ids_inside_queries(query_ids_sub)); + END IF; + + RETURN preset_ids; + END; + $$; + + +-- +-- TOC entry 319 (class 1255 OID 16839) -- Name: abort_show_message(text); Type: FUNCTION; Schema: instance; Owner: - -- CREATE FUNCTION instance.abort_show_message(message text) RETURNS void - LANGUAGE plpgsql - AS $$ + LANGUAGE plpgsql + AS $$ DECLARE BEGIN RAISE EXCEPTION 'R3_MSG: %', message; @@ -773,13 +1154,13 @@ CREATE FUNCTION instance.abort_show_message(message text) RETURNS void -- --- TOC entry 313 (class 1255 OID 18339) +-- TOC entry 320 (class 1255 OID 16840) -- Name: clean_up_e2ee_keys(integer, uuid, integer[]); Type: FUNCTION; Schema: instance; Owner: - -- CREATE FUNCTION instance.clean_up_e2ee_keys(login_id integer, relation_id uuid, record_ids_access integer[]) RETURNS void - LANGUAGE plpgsql - AS $_$ + LANGUAGE plpgsql + AS $_$ DECLARE BEGIN EXECUTE ' @@ -795,13 +1176,137 @@ CREATE FUNCTION instance.clean_up_e2ee_keys(login_id integer, relation_id uuid, -- --- TOC entry 283 (class 1255 OID 16713) +-- TOC entry 345 (class 1255 OID 18395) +-- Name: file_link(uuid, text, uuid, bigint); Type: FUNCTION; Schema: instance; Owner: - +-- + +CREATE FUNCTION instance.file_link(file_id uuid, file_name text, attribute_id uuid, record_id bigint) RETURNS void + LANGUAGE plpgsql + AS $_$ + DECLARE + BEGIN + EXECUTE FORMAT( + 'INSERT INTO instance_file.%I (record_id, file_id, name) VALUES ($1, $2, $3)', + CONCAT(attribute_id::TEXT, '_record') + ) USING record_id, file_id, file_name; + END; + $_$; + + +-- +-- TOC entry 363 (class 1255 OID 19672) +-- Name: file_unlink(uuid, uuid, bigint); Type: FUNCTION; Schema: instance; Owner: - +-- + +CREATE FUNCTION instance.file_unlink(file_id uuid, attribute_id uuid, record_id bigint) RETURNS void + LANGUAGE plpgsql + AS $_$ + DECLARE + BEGIN + EXECUTE FORMAT( + 'DELETE FROM instance_file.%I + WHERE file_id = $1 + AND record_id = $2', + CONCAT(attribute_id::TEXT, '_record') + ) USING file_id, record_id; + END; + $_$; + + +-- +-- TOC entry 346 (class 1255 OID 18394) +-- Name: files_get(uuid, bigint, boolean); Type: FUNCTION; Schema: instance; Owner: - +-- + +CREATE FUNCTION instance.files_get(attribute_id uuid, record_id bigint, include_deleted boolean DEFAULT false) RETURNS instance.file_meta[] + LANGUAGE plpgsql STABLE + AS $_$ + DECLARE + file instance.file_meta; + files instance.file_meta[]; + rec RECORD; + BEGIN + FOR rec IN + EXECUTE FORMAT(' + SELECT r.file_id, r.name, v.login_id, v.hash, v.version, v.size_kb, v.date_change, r.date_delete + FROM instance_file.%I AS r + JOIN instance.file_version AS v + ON v.file_id = r.file_id + AND v.version = ( + SELECT MAX(s.version) + FROM instance.file_version AS s + WHERE s.file_id = r.file_id + ) + WHERE r.record_id = $1 + AND ($2 OR r.date_delete IS NULL) + ', CONCAT(attribute_id::TEXT,'_record')) USING record_id, include_deleted + LOOP + file.id := rec.file_id; + file.login_id_creator := rec.login_id; -- for callsYou are receiving this message, because your email address has been added to the REI3 admin notification list.
+To change this setting, please visit your REI3 instance: {URL}
`, + licenseExpirationBody: `Your license expires on: {DATE}
`, + licenseExpirationSubject: `Your REI3 Professional license is about to expire`, + oauthClientExpirationBody: `Your OAuth client expires on: {DATE}
`, + oauthClientExpirationSubject: `Your REI3 OAuth client is about to expire`, + } + + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + var sendMail = func(subject string, body string, dateExpiration int64, reason string) error { + // get mail receivers + if config.GetString("adminMails") == "" { + log.Warning("server", "cannot send admin notification mails", fmt.Errorf("no mail receivers defined")) + return nil + } + + var toList []string + if err := json.Unmarshal([]byte(config.GetString("adminMails")), &toList); err != nil { + return fmt.Errorf("cannot read admin mail receivers, %s", err.Error()) + } + + if len(toList) == 0 { + log.Warning("server", "cannot send admin notification mails", fmt.Errorf("no mail receivers defined")) + return nil + } + + // apply intro + body = fmt.Sprintf("%s%s", templates.intro, body) + + // replace known placeholders + body = strings.Replace(body, "{URL}", config.GetString("publicHostName"), -1) + body = strings.Replace(body, "{DATE}", time.Unix(dateExpiration, 0).String(), -1) + + tx, err := db.Pool.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) + + if _, err := tx.Exec(ctx, ` + SELECT instance.mail_send($1,$2,$3) + `, subject, body, strings.Join(toList, ",")); err != nil { + return err + } + + if _, err := tx.Exec(ctx, ` + UPDATE instance.admin_mail + SET date_last_sent = DATE_PART('EPOCH',CURRENT_DATE) + WHERE reason = $1 + `, reason); err != nil { + return err + } + return tx.Commit(ctx) + } + + // collect admin mail definitions + type adminMail struct { + reason string + daysBeforeList []int64 + dateLastSent int64 + } + adminMails := make([]adminMail, 0) + + rows, err := db.Pool.Query(ctx, ` + SELECT reason, days_before, date_last_sent + FROM instance.admin_mail + `) + if err != nil { + return err + } + + for rows.Next() { + var am adminMail + if err := rows.Scan(&am.reason, &am.daysBeforeList, &am.dateLastSent); err != nil { + return err + } + adminMails = append(adminMails, am) + } + rows.Close() + + // collect earliest expirying OAuth client + var dateExpirationOauth int64 = -1 + if err := db.Pool.QueryRow(ctx, ` + SELECT date_expiry + FROM instance.oauth_client + WHERE date_expiry > DATE_PART('EPOCH',CURRENT_DATE) + ORDER BY date_expiry ASC + LIMIT 1 + `).Scan(&dateExpirationOauth); err != nil && err != pgx.ErrNoRows { + return err + } + + // send admin mails + now := tools.GetTimeUnix() + reasonsSent := make([]string, 0) // avoid multiple mails for the same notification reason + + for _, am := range adminMails { + for _, daysBefore := range am.daysBeforeList { + if slices.Contains(reasonsSent, am.reason) { + continue + } + + var body, subject string + var dateExpiration int64 + + switch am.reason { + case "licenseExpiration": + if !config.GetLicenseUsed() { + continue + } + dateExpiration = config.GetLicenseValidUntil() + subject = templates.licenseExpirationSubject + body = templates.licenseExpirationBody + + case "oauthClientExpiration": + if dateExpirationOauth == -1 { + continue + } + dateExpiration = dateExpirationOauth + subject = templates.oauthClientExpirationSubject + body = templates.oauthClientExpirationBody + } + + dateNotifySend := dateExpiration - (daysBefore * oneDayInSeconds) + if now < dateNotifySend || am.dateLastSent > dateNotifySend { + continue + } + if err := sendMail(subject, body, dateExpiration, am.reason); err != nil { + return err + } + reasonsSent = append(reasonsSent, am.reason) + } + } + return nil +} diff --git a/scheduler/scheduler_cleanup.go b/scheduler/scheduler_cleanup.go index 07cd9c92..f3290588 100644 --- a/scheduler/scheduler_cleanup.go +++ b/scheduler/scheduler_cleanup.go @@ -1,6 +1,7 @@ package scheduler import ( + "context" "fmt" "os" "path/filepath" @@ -14,7 +15,14 @@ import ( "github.com/gofrs/uuid" ) -var oneDayInSeconds int64 = 60 * 60 * 24 +// optimize DB +func dbOptimize() error { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutDbTask) + defer ctxCanc() + + _, err := db.Pool.Exec(ctx, `VACUUM`) + return err +} // deletes files older than 1 day from temporary directory func cleanupTemp() error { @@ -44,21 +52,36 @@ func cleanupTemp() error { // deletes expired logs func cleanupLogs() error { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutDbTask) + defer ctxCanc() keepForDays := config.GetUint64("logsKeepDays") if keepForDays == 0 { return nil } - deleteOlderMilli := (tools.GetTimeUnix() - (oneDayInSeconds * int64(keepForDays))) * 1000 - - if _, err := db.Pool.Exec(db.Ctx, ` + _, err := db.Pool.Exec(ctx, ` DELETE FROM instance.log WHERE date_milli < $1 - `, deleteOlderMilli); err != nil { - return err + `, (tools.GetTimeUnix()-(oneDayInSeconds*int64(keepForDays)))*1000) + return err +} + +// deletes expired mail traffic entries +func cleanupMailTraffic() error { + keepForDays := config.GetUint64("mailTrafficKeepDays") + if keepForDays == 0 { + return nil } - return nil + + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutDbTask) + defer ctxCanc() + + _, err := db.Pool.Exec(ctx, ` + DELETE FROM instance.mail_traffic + WHERE date < $1 + `, tools.GetTimeUnix()-(oneDayInSeconds*int64(keepForDays))) + return err } // removes files that were deleted from their attribute or that are not assigned to a record @@ -69,7 +92,7 @@ func cleanUpFiles() error { // delete file record assignments, if file link was deleted and retention has been reached attributeIdsFile := make([]uuid.UUID, 0) - if err := db.Pool.QueryRow(db.Ctx, ` + if err := db.Pool.QueryRow(context.Background(), ` SELECT ARRAY_AGG(id) FROM app.attribute WHERE content = 'files' @@ -78,7 +101,7 @@ func cleanUpFiles() error { } for _, atrId := range attributeIdsFile { - if _, err := db.Pool.Exec(db.Ctx, fmt.Sprintf(` + if _, err := db.Pool.Exec(context.Background(), fmt.Sprintf(` DELETE FROM instance_file."%s" WHERE date_delete IS NOT NULL AND date_delete < $1 @@ -100,7 +123,7 @@ func cleanUpFiles() error { removeCnt := 0 fileVersions := make([]fileVersion, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := db.Pool.Query(context.Background(), ` SELECT v.file_id, v.version FROM instance.file_version AS v @@ -152,7 +175,7 @@ func cleanUpFiles() error { } } - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := db.Pool.Exec(context.Background(), ` DELETE FROM instance.file_version WHERE file_id = $1 AND version = $2 @@ -179,7 +202,7 @@ func cleanUpFiles() error { // delete files that no records references for { fileIds := make([]uuid.UUID, 0) - if err := db.Pool.QueryRow(db.Ctx, ` + if err := db.Pool.QueryRow(context.Background(), ` SELECT ARRAY_AGG(id) FROM instance.file WHERE ref_counter = 0 @@ -194,7 +217,7 @@ func cleanUpFiles() error { for _, fileId := range fileIds { versions := make([]int64, 0) - if err := db.Pool.QueryRow(db.Ctx, ` + if err := db.Pool.QueryRow(context.Background(), ` SELECT ARRAY_AGG(version) FROM instance.file_version WHERE file_id = $1 @@ -223,7 +246,7 @@ func cleanUpFiles() error { // either file version existed on disk and could be deleted or it didn´t exist // either case we delete the file reference - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := db.Pool.Exec(context.Background(), ` DELETE FROM instance.file_version WHERE file_id = $1 AND version = $2 @@ -243,7 +266,7 @@ func cleanUpFiles() error { } // delete references of files that have no versions left - tag, err := db.Pool.Exec(db.Ctx, ` + tag, err := db.Pool.Exec(context.Background(), ` DELETE FROM instance.file AS f WHERE 0 = ( SELECT COUNT(*) diff --git a/scheduler/scheduler_cluster.go b/scheduler/scheduler_cluster.go index 6757336c..23847895 100644 --- a/scheduler/scheduler_cluster.go +++ b/scheduler/scheduler_cluster.go @@ -1,6 +1,7 @@ package scheduler import ( + "context" "encoding/json" "fmt" "r3/cache" @@ -9,13 +10,27 @@ import ( "r3/log" "r3/types" "syscall" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) // collect cluster events from shared database for node to react to func clusterProcessEvents() error { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) - rows, err := db.Pool.Query(db.Ctx, ` - SELECT content, payload + rows, err := tx.Query(ctx, ` + SELECT content, payload, + COALESCE(target_address, ''), + COALESCE(target_device, 0), + COALESCE(target_login_id, 0) FROM instance_cluster.node_event WHERE node_id = $1 `, cache.GetNodeId()) @@ -26,7 +41,9 @@ func clusterProcessEvents() error { events := make([]types.ClusterEvent, 0) for rows.Next() { var e types.ClusterEvent - if err := rows.Scan(&e.Content, &e.Payload); err != nil { + if err := rows.Scan(&e.Content, &e.Payload, &e.Target.Address, + &e.Target.Device, &e.Target.LoginId); err != nil { + return err } events = append(events, e) @@ -35,11 +52,11 @@ func clusterProcessEvents() error { // no events, nothing to do if len(events) == 0 { - return nil + return tx.Commit(ctx) } // delete collected events - if _, err := db.Pool.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM instance_cluster.node_event WHERE node_id = $1 `, cache.GetNodeId()); err != nil { @@ -47,76 +64,102 @@ func clusterProcessEvents() error { } // react to collected events + collectionUpdates := make([]types.ClusterEventCollectionUpdated, 0) + for _, e := range events { - log.Info("cluster", fmt.Sprintf("node is reacting to event '%s'", e.Content)) - - switch e.Content { - case "collectionUpdated": - var p types.ClusterEventCollectionUpdated - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.CollectionUpdated(p.CollectionId, p.LoginIds) - case "configChanged": - var p types.ClusterEventConfigChanged - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.ConfigChanged(false, true, p.SwitchToMaintenance) - case "filesCopied": - var p types.ClusterEventFilesCopied - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.FilesCopied(false, p.LoginId, - p.AttributeId, p.FileIds, p.RecordId) - case "fileRequested": - var p types.ClusterEventFileRequested - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.FileRequested(false, p.LoginId, p.AttributeId, - p.FileId, p.FileHash, p.FileName, p.ChooseApp) - case "loginDisabled": - var p types.ClusterEventLogin - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.LoginDisabled(false, p.LoginId) - case "loginReauthorized": - var p types.ClusterEventLogin - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.LoginReauthorized(false, p.LoginId) - case "loginReauthorizedAll": - err = cluster.LoginReauthorizedAll(false) - case "masterAssigned": - var p types.ClusterEventMasterAssigned - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.MasterAssigned(p.State) - case "schemaChanged": - var p types.ClusterEventSchemaChanged - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - err = cluster.SchemaChanged(false, p.NewVersion, p.ModuleIdsUpdateOnly) - case "tasksChanged": - err = cluster.TasksChanged(false) - case "taskTriggered": - var p types.ClusterEventTaskTriggered - if err := json.Unmarshal(e.Payload, &p); err != nil { - return err - } - runTaskDirectly(p.TaskName, p.PgFunctionId, p.PgFunctionScheduleId) - case "shutdownTriggered": - OsExit <- syscall.SIGTERM + if err := clusterProcessEvent(ctx, tx, e, &collectionUpdates); err != nil { + return err + } + } + + // apply collection updates + cluster.CollectionsUpdated(collectionUpdates) + + return tx.Commit(ctx) +} + +func clusterProcessEvent(ctx context.Context, tx pgx.Tx, e types.ClusterEvent, collectionUpdates *[]types.ClusterEventCollectionUpdated) error { + + log.Info("cluster", fmt.Sprintf("node is reacting to event '%s'", e.Content)) + var err error + var jsonPayload []byte + + switch v := e.Payload.(type) { + case string: + jsonPayload = []byte(v) + } + + switch e.Content { + case "clientEventsChanged": + err = cluster.ClientEventsChanged_tx(ctx, tx, false, e.Target.Address, e.Target.LoginId) + case "collectionUpdated": + var p types.ClusterEventCollectionUpdated + if err := json.Unmarshal(jsonPayload, &p); err != nil { + return err + } + *collectionUpdates = append(*collectionUpdates, p) + err = nil + case "configChanged": + var switchToMaintenance bool + if err := json.Unmarshal(jsonPayload, &switchToMaintenance); err != nil { + return err + } + err = cluster.ConfigChanged_tx(ctx, tx, false, true, switchToMaintenance) + case "filesCopied": + var p types.ClusterEventFilesCopied + if err := json.Unmarshal(jsonPayload, &p); err != nil { + return err + } + err = cluster.FilesCopied_tx(ctx, tx, false, e.Target.Address, + e.Target.LoginId, p.AttributeId, p.FileIds, p.RecordId) + case "fileRequested": + var p types.ClusterEventFileRequested + if err := json.Unmarshal(jsonPayload, &p); err != nil { + return err + } + err = cluster.FileRequested_tx(ctx, tx, false, e.Target.Address, e.Target.LoginId, + p.AttributeId, p.FileId, p.FileHash, p.FileName, p.ChooseApp) + case "jsFunctionCalled": + var p types.ClusterEventJsFunctionCalled + if err := json.Unmarshal(jsonPayload, &p); err != nil { + return err + } + err = cluster.JsFunctionCalled_tx(ctx, tx, false, e.Target.Address, + e.Target.LoginId, p.ModuleId, p.JsFunctionId, p.Arguments) + case "keystrokesRequested": + var keystrokes string + if err := json.Unmarshal(jsonPayload, &keystrokes); err != nil { + return err + } + err = cluster.KeystrokesRequested_tx(ctx, tx, false, e.Target.Address, e.Target.LoginId, keystrokes) + case "loginDisabled": + err = cluster.LoginDisabled_tx(ctx, tx, false, e.Target.LoginId) + case "loginReauthorized": + err = cluster.LoginReauthorized_tx(ctx, tx, false, e.Target.LoginId) + case "loginReauthorizedAll": + err = cluster.LoginReauthorizedAll_tx(ctx, tx, false) + case "masterAssigned": + var p types.ClusterEventMasterAssigned + if err := json.Unmarshal(jsonPayload, &p); err != nil { + return err + } + err = cluster.MasterAssigned(p.State) + case "schemaChanged": + var moduleIds []uuid.UUID + if err := json.Unmarshal(jsonPayload, &moduleIds); err != nil { + return err } - if err != nil { + err = cluster.SchemaChanged_tx(ctx, tx, false, moduleIds) + case "tasksChanged": + err = cluster.TasksChanged_tx(ctx, tx, false) + case "taskTriggered": + var p types.ClusterEventTaskTriggered + if err := json.Unmarshal(jsonPayload, &p); err != nil { return err } + runTaskDirectly(p.TaskName, p.PgFunctionId, p.PgFunctionScheduleId) + case "shutdownTriggered": + OsExit <- syscall.SIGTERM } - return nil + return err } diff --git a/scheduler/scheduler_systemMsg.go b/scheduler/scheduler_systemMsg.go new file mode 100644 index 00000000..d0742e13 --- /dev/null +++ b/scheduler/scheduler_systemMsg.go @@ -0,0 +1,43 @@ +package scheduler + +import ( + "context" + "r3/cluster" + "r3/config" + "r3/db" + "r3/tools" +) + +// switch to maintenance mode after system message expired +// if feature is enabled and system is not already in maintenance mode +func systemMsgMaintenance() error { + date1 := config.GetUint64("systemMsgDate1") + now := uint64(tools.GetTimeUnix()) + switchToMaintenance := config.GetUint64("systemMsgMaintenance") == 1 + systemInMaintenance := config.GetUint64("productionMode") == 0 + + if date1 != 0 && date1 < now && switchToMaintenance && !systemInMaintenance { + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) + + if err := config.SetUint64_tx(ctx, tx, "systemMsgMaintenance", 0); err != nil { + return err + } + if err := config.SetUint64_tx(ctx, tx, "productionMode", 0); err != nil { + return err + } + if err := cluster.ConfigChanged_tx(ctx, tx, true, false, true); err != nil { + return err + } + if err := tx.Commit(ctx); err != nil { + return err + } + } + return nil +} diff --git a/scheduler/scheduler_update.go b/scheduler/scheduler_update.go index 6e5f6380..cc1ea6da 100644 --- a/scheduler/scheduler_update.go +++ b/scheduler/scheduler_update.go @@ -1,6 +1,7 @@ package scheduler import ( + "context" "encoding/json" "fmt" "io" @@ -8,7 +9,6 @@ import ( "r3/config" "r3/db" "r3/log" - "time" ) func updateCheck() error { @@ -16,13 +16,13 @@ func updateCheck() error { var check struct { Version string `json:"version"` } - appVersion, _, _, _ := config.GetAppVersions() - url := fmt.Sprintf("%s?old=%s", config.GetString("updateCheckUrl"), appVersion) + url := fmt.Sprintf("%s?old=%s", config.GetString("updateCheckUrl"), config.GetAppVersion().Full) log.Info("server", fmt.Sprintf("starting update check at '%s'", url)) - httpClient := http.Client{ - Timeout: time.Second * 10, + httpClient, err := config.GetHttpClient(false, 10) + if err != nil { + return err } httpReq, err := http.NewRequest(http.MethodGet, url, nil) @@ -45,16 +45,19 @@ func updateCheck() error { return err } - tx, err := db.Pool.Begin(db.Ctx) + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) if err != nil { return err } - defer tx.Rollback(db.Ctx) + defer tx.Rollback(ctx) - if err := config.SetString_tx(tx, "updateCheckVersion", check.Version); err != nil { + if err := config.SetString_tx(ctx, tx, "updateCheckVersion", check.Version); err != nil { return err } - if err := tx.Commit(db.Ctx); err != nil { + if err := tx.Commit(ctx); err != nil { return err } diff --git a/schema/api/api.go b/schema/api/api.go index 0769c33e..cd286577 100644 --- a/schema/api/api.go +++ b/schema/api/api.go @@ -1,9 +1,9 @@ package api import ( + "context" "errors" "fmt" - "r3/db" "r3/db/check" "r3/schema" "r3/schema/column" @@ -15,9 +15,9 @@ import ( "github.com/jackc/pgx/v5" ) -func Copy_tx(tx pgx.Tx, id uuid.UUID) error { +func Copy_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - apis, err := Get(uuid.Nil, id) + apis, err := Get_tx(ctx, tx, uuid.Nil, id) if err != nil { return err } @@ -28,7 +28,7 @@ func Copy_tx(tx pgx.Tx, id uuid.UUID) error { api := apis[0] // get new version number (latest + 1) - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT MAX(version) + 1 FROM app.api WHERE module_id = $1 @@ -53,15 +53,15 @@ func Copy_tx(tx pgx.Tx, id uuid.UUID) error { if err != nil { return err } - return Set_tx(tx, api) + return Set_tx(ctx, tx, api) } -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.api WHERE id = $1`, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.api WHERE id = $1`, id) return err } -func Get(moduleId uuid.UUID, id uuid.UUID) ([]types.Api, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID) ([]types.Api, error) { apis := make([]types.Api, 0) sqlWheres := []string{} @@ -75,7 +75,7 @@ func Get(moduleId uuid.UUID, id uuid.UUID) ([]types.Api, error) { sqlValues = append(sqlValues, id) } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` + rows, err := tx.Query(ctx, fmt.Sprintf(` SELECT id, module_id, name, comment, has_delete, has_get, has_post, limit_def, limit_max, verbose_def, version FROM app.api @@ -101,11 +101,11 @@ func Get(moduleId uuid.UUID, id uuid.UUID) ([]types.Api, error) { // collect query and columns for i, a := range apis { - a.Query, err = query.Get("api", a.Id, 0, 0) + a.Query, err = query.Get_tx(ctx, tx, "api", a.Id, 0, 0, 0) if err != nil { return apis, err } - a.Columns, err = column.Get("api", a.Id) + a.Columns, err = column.Get_tx(ctx, tx, "api", a.Id) if err != nil { return apis, err } @@ -114,19 +114,19 @@ func Get(moduleId uuid.UUID, id uuid.UUID) ([]types.Api, error) { return apis, nil } -func Set_tx(tx pgx.Tx, api types.Api) error { +func Set_tx(ctx context.Context, tx pgx.Tx, api types.Api) error { if err := check.DbIdentifier(api.Name); err != nil { return err } - known, err := schema.CheckCreateId_tx(tx, &api.Id, "api", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &api.Id, "api", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.api SET name = $1, comment = $2, has_delete = $3, has_get = $4, has_post = $5, limit_def = $6, limit_max = $7, verbose_def = $8, @@ -138,7 +138,7 @@ func Set_tx(tx pgx.Tx, api types.Api) error { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.api (id, module_id, name, comment, has_delete, has_get, has_post, limit_def, limit_max, verbose_def, version) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) @@ -148,8 +148,8 @@ func Set_tx(tx pgx.Tx, api types.Api) error { return err } } - if err := query.Set_tx(tx, "api", api.Id, 0, 0, api.Query); err != nil { + if err := query.Set_tx(ctx, tx, "api", api.Id, 0, 0, 0, api.Query); err != nil { return err } - return column.Set_tx(tx, "api", api.Id, api.Columns) + return column.Set_tx(ctx, tx, "api", api.Id, api.Columns) } diff --git a/schema/article/article.go b/schema/article/article.go index df3a0e32..dd0bee9c 100644 --- a/schema/article/article.go +++ b/schema/article/article.go @@ -1,8 +1,8 @@ package article import ( + "context" "errors" - "r3/db" "r3/schema" "r3/schema/caption" "r3/types" @@ -11,17 +11,17 @@ import ( "github.com/jackc/pgx/v5" ) -func Assign_tx(tx pgx.Tx, target string, targetId uuid.UUID, articleIds []uuid.UUID) error { +func Assign_tx(ctx context.Context, tx pgx.Tx, target string, targetId uuid.UUID, articleIds []uuid.UUID) error { switch target { case "form": - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.article_form WHERE form_id = $1 `, targetId); err != nil { return err } for i, articleId := range articleIds { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.article_form (article_id, form_id, position) VALUES ($1, $2, $3) `, articleId, targetId, i); err != nil { @@ -29,14 +29,14 @@ func Assign_tx(tx pgx.Tx, target string, targetId uuid.UUID, articleIds []uuid.U } } case "module": - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.article_help WHERE module_id = $1 `, targetId); err != nil { return err } for i, articleId := range articleIds { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.article_help (article_id, module_id, position) VALUES ($1, $2, $3) `, articleId, targetId, i); err != nil { @@ -49,19 +49,19 @@ func Assign_tx(tx pgx.Tx, target string, targetId uuid.UUID, articleIds []uuid.U return nil } -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, ` +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, ` DELETE FROM app.article WHERE id = $1 `, id) return err } -func Get(moduleId uuid.UUID) ([]types.Article, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Article, error) { articles := make([]types.Article, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, name FROM app.article WHERE module_id = $1 @@ -70,42 +70,39 @@ func Get(moduleId uuid.UUID) ([]types.Article, error) { if err != nil { return articles, err } + defer rows.Close() for rows.Next() { var a types.Article if err := rows.Scan(&a.Id, &a.Name); err != nil { - rows.Close() return articles, err } a.ModuleId = moduleId articles = append(articles, a) } - rows.Close() - // get title/body captions for i, a := range articles { - a.Captions, err = caption.Get("article", a.Id, []string{"articleBody", "articleTitle"}) + articles[i].Captions, err = caption.Get_tx(ctx, tx, "article", a.Id, []string{"articleBody", "articleTitle"}) if err != nil { return articles, err } - articles[i] = a } return articles, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, captions types.CaptionMap) error { if name == "" { return errors.New("missing name") } - known, err := schema.CheckCreateId_tx(tx, &id, "article", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &id, "article", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.article SET name = $1 WHERE id = $2 @@ -113,7 +110,7 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, captions t return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.article (id, module_id, name) VALUES ($1,$2,$3) `, id, moduleId, name); err != nil { @@ -122,5 +119,5 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, captions t } // set captions - return caption.Set_tx(tx, id, captions) + return caption.Set_tx(ctx, tx, id, captions) } diff --git a/schema/attribute/attribute.go b/schema/attribute/attribute.go index 4b0cd6ec..da9e2dba 100644 --- a/schema/attribute/attribute.go +++ b/schema/attribute/attribute.go @@ -1,17 +1,17 @@ package attribute import ( + "context" "errors" "fmt" - "r3/compatible" - "r3/db" "r3/db/check" "r3/schema" "r3/schema/caption" + "r3/schema/compatible" "r3/schema/pgFunction" "r3/schema/pgIndex" - "r3/tools" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" @@ -19,37 +19,37 @@ import ( ) var contentTypes = []string{"integer", "bigint", "numeric", "real", - "double precision", "varchar", "text", "boolean", "uuid", "1:1", - "n:1", "files"} + "double precision", "varchar", "text", "boolean", "regconfig", "uuid", + "1:1", "n:1", "files"} -var contentUseTypes = []string{"default", "textarea", - "richtext", "date", "datetime", "time", "color"} +var contentUseTypes = []string{"default", "textarea", "richtext", + "date", "datetime", "time", "color", "iframe", "drawing", "barcode"} var fkBreakActions = []string{"NO ACTION", "RESTRICT", "CASCADE", "SET NULL", "SET DEFAULT"} -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - moduleName, relationName, name, content, err := schema.GetAttributeDetailsById_tx(tx, id) + moduleName, relationName, name, content, err := schema.GetAttributeDetailsById_tx(ctx, tx, id) if err != nil { return err } // delete FK index if relationship attribute if schema.IsContentRelationship(content) { - if err := pgIndex.DelAutoFkiForAttribute_tx(tx, id); err != nil { + if err := pgIndex.DelAutoFkiForAttribute_tx(ctx, tx, id); err != nil { return err } } // delete attribute database entities if schema.IsContentFiles(content) { - if err := FileRelationsDelete_tx(tx, id); err != nil { + if err := FileRelationsDelete_tx(ctx, tx, id); err != nil { return err } } else { // DROP COLUMN removes constraints if there - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" DROP COLUMN "%s" `, moduleName, relationName, name)); err != nil { @@ -58,19 +58,19 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { } // delete attribute reference - _, err = tx.Exec(db.Ctx, `DELETE FROM app.attribute WHERE id = $1`, id) + _, err = tx.Exec(ctx, `DELETE FROM app.attribute WHERE id = $1`, id) return err } -func Get(relationId uuid.UUID) ([]types.Attribute, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID) ([]types.Attribute, error) { var onUpdateNull pgtype.Text var onDeleteNull pgtype.Text attributes := make([]types.Attribute, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, relationship_id, icon_id, name, content, content_use, - length, nullable, encrypted, def, on_update, on_delete + length, length_fract, nullable, encrypted, def, on_update, on_delete FROM app.attribute WHERE relation_id = $1 ORDER BY CASE WHEN name = 'id' THEN 0 END, name ASC @@ -78,11 +78,12 @@ func Get(relationId uuid.UUID) ([]types.Attribute, error) { if err != nil { return attributes, err } + defer rows.Close() for rows.Next() { var atr types.Attribute - if err := rows.Scan(&atr.Id, &atr.RelationshipId, &atr.IconId, - &atr.Name, &atr.Content, &atr.ContentUse, &atr.Length, &atr.Nullable, + if err := rows.Scan(&atr.Id, &atr.RelationshipId, &atr.IconId, &atr.Name, + &atr.Content, &atr.ContentUse, &atr.Length, &atr.LengthFract, &atr.Nullable, &atr.Encrypted, &atr.Def, &onUpdateNull, &onDeleteNull); err != nil { return attributes, err @@ -92,55 +93,48 @@ func Get(relationId uuid.UUID) ([]types.Attribute, error) { atr.RelationId = relationId attributes = append(attributes, atr) } - rows.Close() - // get captions for i, atr := range attributes { - atr.Captions, err = caption.Get("attribute", atr.Id, []string{"attributeTitle"}) + attributes[i].Captions, err = caption.Get_tx(ctx, tx, "attribute", atr.Id, []string{"attributeTitle"}) if err != nil { return attributes, err } - attributes[i] = atr } return attributes, nil } -func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, - relationshipId pgtype.UUID, iconId pgtype.UUID, name string, - content string, contentUse string, length int, nullable bool, - encrypted bool, def string, onUpdate string, onDelete string, - captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, atr types.Attribute) error { - if err := checkName(name); err != nil { + if err := check.DbIdentifier(atr.Name); err != nil { return err } // fix imports < 3.3: Empty content use - contentUse = compatible.FixAttributeContentUse(contentUse) + atr.ContentUse = compatible.FixAttributeContentUse(atr.ContentUse) - if encrypted && content != "text" { + if atr.Encrypted && atr.Content != "text" { return fmt.Errorf("only text attributes can be encrypted") } - if !tools.StringInSlice(content, contentTypes) { - return fmt.Errorf("invalid attribute content type '%s'", content) + if !slices.Contains(contentTypes, atr.Content) { + return fmt.Errorf("invalid attribute content type '%s'", atr.Content) } - if !tools.StringInSlice(contentUse, contentUseTypes) { - return fmt.Errorf("invalid attribute content use type '%s'", contentUse) + if !slices.Contains(contentUseTypes, atr.ContentUse) { + return fmt.Errorf("invalid attribute content use type '%s'", atr.ContentUse) } - _, moduleName, err := schema.GetModuleDetailsByRelationId_tx(tx, relationId) + _, moduleName, err := schema.GetModuleDetailsByRelationId_tx(ctx, tx, atr.RelationId) if err != nil { return err } - relationName, relEncryption, err := schema.GetRelationDetailsById_tx(tx, relationId) + relationName, relEncryption, err := schema.GetRelationDetailsById_tx(ctx, tx, atr.RelationId) if err != nil { return err } - isNew := id == uuid.Nil - isRel := schema.IsContentRelationship(content) - isFiles := schema.IsContentFiles(content) - known, err := schema.CheckCreateId_tx(tx, &id, "attribute", "id") + isNew := atr.Id == uuid.Nil + isRel := schema.IsContentRelationship(atr.Content) + isFiles := schema.IsContentFiles(atr.Content) + known, err := schema.CheckCreateId_tx(ctx, tx, &atr.Id, "attribute", "id") if err != nil { return err } @@ -150,13 +144,13 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, var onDeleteNull = pgtype.Text{} if isRel { - onUpdateNull.String = onUpdate + onUpdateNull.String = atr.OnUpdate onUpdateNull.Valid = true - onDeleteNull.String = onDelete + onDeleteNull.String = atr.OnDelete onDeleteNull.Valid = true } else { - onUpdate = "" - onDelete = "" + atr.OnUpdate = "" + atr.OnDelete = "" } if known { @@ -164,25 +158,26 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, var nameEx string var contentEx string var lengthEx int + var lengthFractEx int var nullableEx bool var defEx string var onUpdateEx pgtype.Text var onDeleteEx pgtype.Text var relationshipIdEx pgtype.UUID - if err := tx.QueryRow(db.Ctx, ` - SELECT name, content, length, nullable, def, - on_update, on_delete, relationship_id + if err := tx.QueryRow(ctx, ` + SELECT name, content, length, length_fract, nullable, + def, on_update, on_delete, relationship_id FROM app.attribute WHERE id = $1 - `, id).Scan(&nameEx, &contentEx, &lengthEx, &nullableEx, &defEx, - &onUpdateEx, &onDeleteEx, &relationshipIdEx); err != nil { + `, atr.Id).Scan(&nameEx, &contentEx, &lengthEx, &lengthFractEx, &nullableEx, + &defEx, &onUpdateEx, &onDeleteEx, &relationshipIdEx); err != nil { return err } // check for primary key attribute - if nameEx == schema.PkName && (name != nameEx || length != lengthEx || - nullable != nullableEx || def != defEx) { + if nameEx == schema.PkName && (atr.Name != nameEx || atr.Length != lengthEx || + atr.LengthFract != lengthFractEx || atr.Nullable != nullableEx || atr.Def != defEx) { return errors.New("primary key attribute may only update: content, title") } @@ -195,44 +190,47 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, case "integer": // keep integer or upgrade to bigint fallthrough case "bigint": // keep bigint or downgrade to integer - contentUpdateOk = tools.StringInSlice(content, []string{"integer", "bigint"}) + contentUpdateOk = slices.Contains([]string{"integer", "bigint"}, atr.Content) case "numeric": // keep numeric - contentUpdateOk = content == "numeric" + contentUpdateOk = atr.Content == "numeric" case "real": // keep real or upgrade to double fallthrough case "double precision": // keep double or downgrade to real - contentUpdateOk = tools.StringInSlice(content, []string{"real", "double precision"}) + contentUpdateOk = slices.Contains([]string{"real", "double precision"}, atr.Content) case "varchar": // keep varchar or upgrade to text fallthrough case "text": // keep text or downgrade to varchar - contentUpdateOk = tools.StringInSlice(content, []string{"varchar", "text"}) + contentUpdateOk = slices.Contains([]string{"varchar", "text"}, atr.Content) case "boolean": // keep boolean - contentUpdateOk = content == "boolean" + contentUpdateOk = atr.Content == "boolean" + + case "regconfig": // keep regconfig + contentUpdateOk = atr.Content == "regconfig" case "uuid": // keep UUID - contentUpdateOk = content == "uuid" + contentUpdateOk = atr.Content == "uuid" case "1:1": // keep 1:1 or switch to n:1 fallthrough case "n:1": // keep n:1 or switch to 1:1 - contentUpdateOk = tools.StringInSlice(content, []string{"1:1", "n:1"}) + contentUpdateOk = slices.Contains([]string{"1:1", "n:1"}, atr.Content) case "files": // keep files - contentUpdateOk = content == "files" + contentUpdateOk = atr.Content == "files" } if !contentUpdateOk { - return fmt.Errorf("'%s' and '%s' are not compatible types", contentEx, content) + return fmt.Errorf("'%s' and '%s' are not compatible types", contentEx, atr.Content) } // do not allow relationship target change // if data exists, IDs will not match new target relation // if data does not exist, attribute can be recreated with new target relation instead - if relationshipIdEx.Valid && relationshipIdEx.Bytes != relationshipId.Bytes { + if relationshipIdEx.Valid && relationshipIdEx.Bytes != atr.RelationshipId.Bytes { return fmt.Errorf("cannot change relationship target for existing attribute") } @@ -241,15 +239,16 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, // update attribute name // must happen first, as other statements refer to new attribute name - if nameEx != name { - if err := setName_tx(tx, id, name, false, isFiles); err != nil { + if nameEx != atr.Name { + if err := setName_tx(ctx, tx, atr.Id, atr.Name, false, isFiles); err != nil { return err } } // update attribute column definition (not for files attributes: no column) - if !isFiles && (contentEx != content || nullableEx != nullable || defEx != def || - (content == "varchar" && lengthEx != length)) { + if !isFiles && (contentEx != atr.Content || nullableEx != atr.Nullable || defEx != atr.Def || + (atr.Content == "varchar" && lengthEx != atr.Length) || + (atr.Content == "numeric" && (lengthEx != atr.Length || lengthFractEx != atr.LengthFract))) { // handle relationship attribute var contentRel string @@ -257,65 +256,65 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, if isRel { // rebuild foreign key index if content changed (as in 1:1 -> n:1) // this also adds/removes unique constraint, if required - if content != contentEx { - if err := pgIndex.DelAutoFkiForAttribute_tx(tx, id); err != nil { + if atr.Content != contentEx { + if err := pgIndex.DelAutoFkiForAttribute_tx(ctx, tx, atr.Id); err != nil { return err } - if err := pgIndex.SetAutoFkiForAttribute_tx(tx, relationId, id, (content == "1:1")); err != nil { + if err := pgIndex.SetAutoFkiForAttribute_tx(ctx, tx, atr.RelationId, atr.Id, (atr.Content == "1:1")); err != nil { return err } } - contentRel, err = schema.GetAttributeContentByRelationPk_tx(tx, relationshipId.Bytes) + contentRel, err = schema.GetAttributeContentByRelationPk_tx(ctx, tx, atr.RelationshipId.Bytes) if err != nil { return err } } // column definition - columnDef, err := getContentColumnDefinition(content, length, contentRel) + columnDef, err := getContentColumnDefinition(atr.Content, atr.Length, atr.LengthFract, contentRel) if err != nil { return err } // nullable definition nullableDef := "DROP NOT NULL" - if !nullable { + if !atr.Nullable { nullableDef = "SET NOT NULL" } // default definition defaultDef := "DROP DEFAULT" - if def != "" { - if schema.IsContentText(content) { + if atr.Def != "" { + if schema.IsContentText(atr.Content) { // add quotes around default value for text - defaultDef = fmt.Sprintf("SET DEFAULT '%s'", def) + defaultDef = fmt.Sprintf("SET DEFAULT '%s'", atr.Def) } else { - defaultDef = fmt.Sprintf("SET DEFAULT %s", def) + defaultDef = fmt.Sprintf("SET DEFAULT %s", atr.Def) } } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" ALTER COLUMN "%s" TYPE %s, ALTER COLUMN "%s" %s, ALTER COLUMN "%s" %s `, moduleName, relationName, - name, columnDef, - name, nullableDef, - name, defaultDef)); err != nil { + atr.Name, columnDef, + atr.Name, nullableDef, + atr.Name, defaultDef)); err != nil { return err } } // update onUpdate / onDelete for relationship attributes - if (onUpdateEx.String != onUpdate || onDeleteEx.String != onDelete) && isRel { + if (onUpdateEx.String != atr.OnUpdate || onDeleteEx.String != atr.OnDelete) && isRel { - if err := deleteFK_tx(tx, moduleName, relationName, id); err != nil { + if err := deleteFK_tx(ctx, tx, moduleName, relationName, atr.Id); err != nil { return err } - if err := createFK_tx(tx, moduleName, relationName, id, name, - relationshipId.Bytes, onUpdate, onDelete); err != nil { + if err := createFK_tx(ctx, tx, moduleName, relationName, atr.Id, atr.Name, + atr.RelationshipId.Bytes, atr.OnUpdate, atr.OnDelete); err != nil { return err } @@ -323,109 +322,112 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, // update attribute reference // encrypted option cannot be updated - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.attribute - SET icon_id = $1, content = $2, content_use = $3, length = $4, - nullable = $5, def = $6, on_update = $7, on_delete = $8 - WHERE id = $9 - `, iconId, content, contentUse, length, nullable, - def, onUpdateNull, onDeleteNull, id); err != nil { + SET icon_id = $1, content = $2, content_use = $3, length = $4, length_fract = $5, + nullable = $6, def = $7, on_update = $8, on_delete = $9 + WHERE id = $10 + `, atr.IconId, atr.Content, atr.ContentUse, atr.Length, atr.LengthFract, atr.Nullable, + atr.Def, onUpdateNull, onDeleteNull, atr.Id); err != nil { return err } // update PK characteristics, if PK attribute - if name == schema.PkName && content != contentEx { - if err := updatePK_tx(tx, moduleName, relationName, relationId, content); err != nil { + if atr.Name == schema.PkName && atr.Content != contentEx { + if err := updatePK_tx(ctx, tx, moduleName, relationName, atr.RelationId, atr.Content); err != nil { return err } - if err := updateReferingFKs_tx(tx, relationId, content); err != nil { + if err := updateReferingFKs_tx(ctx, tx, atr.RelationId, atr.Content); err != nil { return err } } } else { // create attribute column (files attribute have no column) if isFiles { - if err := fileRelationsCreate_tx(tx, id, moduleName, relationName); err != nil { + if err := fileRelationsCreate_tx(ctx, tx, atr.Id, moduleName, relationName); err != nil { return err } } else { // check relationship target if relationship attribute var contentRel string if isRel { - if !relationshipId.Valid { + if !atr.RelationshipId.Valid { return fmt.Errorf("relationship requires valid target") } - contentRel, err = schema.GetAttributeContentByRelationPk_tx(tx, relationshipId.Bytes) + contentRel, err = schema.GetAttributeContentByRelationPk_tx(ctx, tx, atr.RelationshipId.Bytes) if err != nil { return err } - } else if relationshipId.Valid { + } else if atr.RelationshipId.Valid { return errors.New("cannot define non-relationship with relationship target") } // column definition - columnDef, err := getContentColumnDefinition(content, length, contentRel) + columnDef, err := getContentColumnDefinition(atr.Content, atr.Length, atr.LengthFract, contentRel) if err != nil { return err } // nullable definition nullableDef := "" - if !nullable { + if !atr.Nullable { nullableDef = "NOT NULL" } // default definition defaultDef := "" - if def != "" { - if schema.IsContentText(content) { + if atr.Def != "" { + if schema.IsContentText(atr.Content) { // add quotes around default value for text - defaultDef = fmt.Sprintf("DEFAULT '%s'", def) + defaultDef = fmt.Sprintf("DEFAULT '%s'", atr.Def) } else { - defaultDef = fmt.Sprintf("DEFAULT %s", def) + defaultDef = fmt.Sprintf("DEFAULT %s", atr.Def) } } // add attribute to relation - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" ADD COLUMN "%s" %s %s %s - `, moduleName, relationName, name, columnDef, nullableDef, defaultDef)); err != nil { + `, moduleName, relationName, atr.Name, columnDef, nullableDef, defaultDef)); err != nil { return err } } // insert attribute reference - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.attribute (id, relation_id, relationship_id, - icon_id, name, content, content_use, length, nullable, - encrypted, def, on_update, on_delete) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13) - `, id, relationId, relationshipId, iconId, name, content, contentUse, - length, nullable, encrypted, def, onUpdateNull, onDeleteNull); err != nil { + icon_id, name, content, content_use, length, length_fract, + nullable, encrypted, def, on_update, on_delete) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14) + `, atr.Id, atr.RelationId, atr.RelationshipId, atr.IconId, atr.Name, + atr.Content, atr.ContentUse, atr.Length, atr.LengthFract, atr.Nullable, + atr.Encrypted, atr.Def, onUpdateNull, onDeleteNull); err != nil { return err } // apply PK characteristics, if PK attribute - if name == schema.PkName { - if err := createPK_tx(tx, moduleName, relationName, id, relationId); err != nil { + if atr.Name == schema.PkName { + if err := createPK_tx(ctx, tx, moduleName, relationName, atr.RelationId); err != nil { return err } - // create PK PG index reference - if err := pgIndex.SetPrimaryKeyForAttribute_tx(tx, relationId, id); err != nil { - return err + // create PK PG index reference for new attributes + if isNew { + if err := pgIndex.SetPrimaryKeyForAttribute_tx(ctx, tx, atr.RelationId, atr.Id); err != nil { + return err + } } // create table for encrypted record keys if relation supports encryption if relEncryption { - tName := schema.GetEncKeyTableName(relationId) + tName := schema.GetEncKeyTableName(atr.RelationId) - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` CREATE TABLE IF NOT EXISTS instance_e2ee."%s" ( record_id bigint NOT NULL, login_id integer NOT NULL, @@ -457,15 +459,15 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, if isRel { // add FK constraint - if err := createFK_tx(tx, moduleName, relationName, id, name, - relationshipId.Bytes, onUpdate, onDelete); err != nil { + if err := createFK_tx(ctx, tx, moduleName, relationName, atr.Id, atr.Name, + atr.RelationshipId.Bytes, atr.OnUpdate, atr.OnDelete); err != nil { return err } if isNew { // add automatic FK index for new attributes - if err := pgIndex.SetAutoFkiForAttribute_tx(tx, relationId, id, - (content == "1:1")); err != nil { + if err := pgIndex.SetAutoFkiForAttribute_tx(ctx, tx, atr.RelationId, + atr.Id, (atr.Content == "1:1")); err != nil { return err } @@ -474,31 +476,31 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, } // set captions - return caption.Set_tx(tx, id, captions) + return caption.Set_tx(ctx, tx, atr.Id, atr.Captions) } -func setName_tx(tx pgx.Tx, id uuid.UUID, name string, ignoreNameCheck bool, isFiles bool) error { +func setName_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID, name string, ignoreNameCheck bool, isFiles bool) error { // name check can be ignored by internal tasks, never ignore for user input if !ignoreNameCheck { - if err := checkName(name); err != nil { + if err := check.DbIdentifier(name); err != nil { return err } } - known, err := schema.CheckCreateId_tx(tx, &id, "attribute", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &id, "attribute", "id") if err != nil || !known { return err } - moduleName, relationName, nameEx, _, err := schema.GetAttributeDetailsById_tx(tx, id) + moduleName, relationName, nameEx, _, err := schema.GetAttributeDetailsById_tx(ctx, tx, id) if err != nil { return err } if nameEx != name { if !isFiles { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" RENAME COLUMN "%s" TO "%s" `, moduleName, relationName, nameEx, name)); err != nil { @@ -506,7 +508,7 @@ func setName_tx(tx pgx.Tx, id uuid.UUID, name string, ignoreNameCheck bool, isFi } } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.attribute SET name = $1 WHERE id = $2 @@ -514,20 +516,28 @@ func setName_tx(tx pgx.Tx, id uuid.UUID, name string, ignoreNameCheck bool, isFi return err } - if err := pgFunction.RecreateAffectedBy_tx(tx, "attribute", id); err != nil { + if err := pgFunction.RecreateAffectedBy_tx(ctx, tx, "attribute", id); err != nil { return err } } return nil } -func getContentColumnDefinition(content string, length int, contentRel string) (string, error) { +func getContentColumnDefinition(content string, length int, lengthFract int, contentRel string) (string, error) { // by default content is named after column definition columnDef := content // special cases switch content { + case "numeric": + if length != 0 { + if lengthFract != 0 { + columnDef = fmt.Sprintf("numeric(%d,%d)", length, lengthFract) + } else { + columnDef = fmt.Sprintf("numeric(%d)", length) + } + } case "varchar": if length == 0 { return "", fmt.Errorf("varchar requires defined length") @@ -542,21 +552,12 @@ func getContentColumnDefinition(content string, length int, contentRel string) ( return columnDef, nil } -func checkName(name string) error { - // check valid DB identifier as attribute also becomes column - if err := check.DbIdentifier(name); err != nil { - return err - } - return nil -} - // primary key handling -func createPK_tx(tx pgx.Tx, moduleName string, relationName string, - id uuid.UUID, relationId uuid.UUID) error { +func createPK_tx(ctx context.Context, tx pgx.Tx, moduleName string, relationName string, relationId uuid.UUID) error { // create PK sequence // default type is BIGINT if not otherwise specified (works in all our cases) - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` CREATE SEQUENCE "%s"."%s" `, moduleName, schema.GetSequenceName(relationId))); err != nil { return err @@ -566,20 +567,18 @@ func createPK_tx(tx pgx.Tx, moduleName string, relationName string, // additional single quotes are required for nextval() def := fmt.Sprintf(`NEXTVAL('"%s"."%s"')`, moduleName, schema.GetSequenceName(relationId)) - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" ALTER COLUMN "%s" SET DEFAULT %s, ADD CONSTRAINT "%s" PRIMARY KEY ("%s") `, moduleName, relationName, schema.PkName, def, - schema.GetPkConstraintName(relationId), schema.PkName)); err != nil { + schema.GetPkConstraintName(relationId), schema.PkName)) - return err - } - return nil + return err } -func updatePK_tx(tx pgx.Tx, moduleName string, relationName string, +func updatePK_tx(ctx context.Context, tx pgx.Tx, moduleName string, relationName string, relationId uuid.UUID, content string) error { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" ALTER COLUMN "%s" TYPE %s, ALTER COLUMN "%s" SET DEFAULT NEXTVAL('"%s"."%s"') @@ -589,7 +588,7 @@ func updatePK_tx(tx pgx.Tx, moduleName string, relationName string, return err } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER SEQUENCE "%s"."%s" AS %s `, moduleName, schema.GetSequenceName(relationId), content)); err != nil { return err @@ -598,25 +597,25 @@ func updatePK_tx(tx pgx.Tx, moduleName string, relationName string, } // foreign key handling -func createFK_tx(tx pgx.Tx, moduleName string, relationName string, +func createFK_tx(ctx context.Context, tx pgx.Tx, moduleName string, relationName string, attributeId uuid.UUID, attributeName string, relationshipId uuid.UUID, onUpdate string, onDelete string) error { - if !tools.StringInSlice(onUpdate, fkBreakActions) { + if !slices.Contains(fkBreakActions, onUpdate) { return fmt.Errorf("invalid attribute ON UPDATE definition '%s'", onUpdate) } - if !tools.StringInSlice(onDelete, fkBreakActions) { + if !slices.Contains(fkBreakActions, onDelete) { return fmt.Errorf("invalid attribute ON DELETE definition '%s'", onDelete) } // get relationship relation & module names - modName, relName, err := schema.GetRelationNamesById_tx(tx, relationshipId) + modName, relName, err := schema.GetRelationNamesById_tx(ctx, tx, relationshipId) if err != nil { return err } // add attribute with foreign key - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" ADD CONSTRAINT "%s" FOREIGN KEY ("%s") @@ -630,16 +629,16 @@ func createFK_tx(tx pgx.Tx, moduleName string, relationName string, } return nil } -func deleteFK_tx(tx pgx.Tx, moduleName string, relationName string, attributeId uuid.UUID) error { - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` +func deleteFK_tx(ctx context.Context, tx pgx.Tx, moduleName string, relationName string, attributeId uuid.UUID) error { + _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" DROP CONSTRAINT "%s" `, moduleName, relationName, schema.GetFkConstraintName(attributeId))) return err } -// update all foreign keys refering to specified relation via relationship attribute -func updateReferingFKs_tx(tx pgx.Tx, relationshipId uuid.UUID, content string) error { +// update all foreign keys referring to specified relation via relationship attribute +func updateReferingFKs_tx(ctx context.Context, tx pgx.Tx, relationshipId uuid.UUID, content string) error { type update struct { ModName string @@ -648,7 +647,7 @@ func updateReferingFKs_tx(tx pgx.Tx, relationshipId uuid.UUID, content string) e } updates := make([]update, 0) - rows, err := tx.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT m.name, r.name, a.name FROM app.attribute AS a INNER JOIN app.relation AS r ON r.id = a.relation_id @@ -658,6 +657,7 @@ func updateReferingFKs_tx(tx pgx.Tx, relationshipId uuid.UUID, content string) e if err != nil { return err } + defer rows.Close() for rows.Next() { var u update @@ -666,10 +666,9 @@ func updateReferingFKs_tx(tx pgx.Tx, relationshipId uuid.UUID, content string) e } updates = append(updates, u) } - rows.Close() for _, u := range updates { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" ALTER COLUMN "%s" TYPE %s `, u.ModName, u.RelName, u.AtrName, content)); err != nil { diff --git a/schema/attribute/attribute_del_check.go b/schema/attribute/attribute_del_check.go new file mode 100644 index 00000000..3b040c90 --- /dev/null +++ b/schema/attribute/attribute_del_check.go @@ -0,0 +1,227 @@ +package attribute + +import ( + "context" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" +) + +func DelCheck_tx(ctx context.Context, tx pgx.Tx, attributeId uuid.UUID) (interface{}, error) { + + // dependencies we need for further checks + var queryIds []uuid.UUID + var columnIdsSubQueries []uuid.UUID + + // final dependencies we send back for display + type depField struct { + FieldId uuid.UUID `json:"fieldId"` + FormId uuid.UUID `json:"formId"` + } + var dependencies struct { + ApiIds []uuid.UUID `json:"apiIds"` // attribute used in API column or query + CollectionIds []uuid.UUID `json:"collectionIds"` // attribute used in collection column or query + FormIds []uuid.UUID `json:"formIds"` // attribute used in form query + PgIndexIds []uuid.UUID `json:"pgIndexIds"` // attribute used in PG index + LoginFormNames []string `json:"loginFormNames"` // attribute used in login form (either lookup or login ID) + + Fields []depField `json:"fields"` // attribute used in data field, field columns or query + } + dependencies.Fields = make([]depField, 0) + + // collect affected queries + if err := tx.QueryRow(ctx, ` + -- get nested children of queries + WITH RECURSIVE queries AS ( + -- initial result set: all queries that include attribute in any way + SELECT id, query_filter_query_id + FROM app.query + WHERE id IN ( + SELECT query_id + FROM app.query_order + WHERE attribute_id = $1 + + UNION + + SELECT query_id + FROM app.query_join + WHERE attribute_id = $1 + + UNION + + SELECT query_id + FROM app.query_filter_side + WHERE attribute_id = $1 + ) + + UNION + + -- recursive results + -- all parent queries up to the main element (form, field, API, collection, column) + SELECT c.id, c.query_filter_query_id + FROM app.query AS c + INNER JOIN queries AS q ON q.query_filter_query_id = c.id + ) + SELECT ARRAY_AGG(id) + FROM queries + `, attributeId).Scan(&queryIds); err != nil { + return nil, err + } + + // collect affected columns + if err := tx.QueryRow(ctx, ` + SELECT ARRAY_AGG(column_id) + FROM app.query + WHERE column_id IS NOT NULL + AND id = ANY($1) + `, queryIds).Scan(&columnIdsSubQueries); err != nil { + return nil, err + } + + // collect affected APIs, collections, forms, PG indexes, login forms + if err := tx.QueryRow(ctx, ` + SELECT + ARRAY( + -- APIs with affected queries + SELECT api_id + FROM app.query + WHERE api_id IS NOT NULL + AND id = ANY($2) + + UNION + + -- APIs with affected sub query columns + SELECT api_id + FROM app.column + WHERE api_id IS NOT NULL + AND ( + attribute_id = $1 + OR id = ANY($3) + ) + ) AS apis, + ARRAY( + -- collections with affected queries + SELECT collection_id + FROM app.query + WHERE collection_id IS NOT NULL + AND id = ANY($2) + + UNION + + -- collections with affected sub query columns + SELECT collection_id + FROM app.column + WHERE collection_id IS NOT NULL + AND ( + attribute_id = $1 + OR id = ANY($3) + ) + ) AS collections, + ARRAY( + -- forms with affected queries + SELECT form_id + FROM app.query + WHERE form_id IS NOT NULL + AND id = ANY($2) + ) AS forms, + ARRAY( + SELECT pia.pg_index_id + FROM app.pg_index_attribute AS pia + JOIN app.pg_index AS pi ON pi.id = pia.pg_index_id + WHERE pia.attribute_id = $1 + AND pi.auto_fki = false + AND pi.primary_key = false + ) AS pgIndexes, + ARRAY( + SELECT name + FROM app.login_form + WHERE attribute_id_login = $1 + OR attribute_id_lookup = $1 + ) AS loginForms + `, attributeId, queryIds, columnIdsSubQueries).Scan( + &dependencies.ApiIds, + &dependencies.CollectionIds, + &dependencies.FormIds, + &dependencies.PgIndexIds, + &dependencies.LoginFormNames); err != nil { + + return nil, err + } + + // collect affected fields + rows, err := tx.Query(ctx, ` + SELECT frm.id, fld.id + FROM app.field AS fld + INNER JOIN app.form AS frm ON frm.id = fld.form_id + WHERE fld.id IN ( + -- fields opening forms with attribute + SELECT field_id + FROM app.open_form + WHERE attribute_id_apply = $1 + + UNION + + -- data fields + SELECT field_id + FROM app.field_data + WHERE attribute_id = $1 + OR attribute_id_alt = $1 + + UNION + + -- data relationship fields + SELECT field_id + FROM app.field_data_relationship + WHERE attribute_id_nm = $1 + + UNION + + -- field queries + SELECT field_id + FROM app.query + WHERE field_id IS NOT NULL + AND id = ANY($2) + + UNION + + -- field columns + SELECT field_id + FROM app.column + WHERE field_id IS NOT NULL + AND ( + attribute_id = $1 + OR id = ANY($3) + ) + + UNION + + -- calendar fields + SELECT field_id + FROM app.field_calendar + WHERE attribute_id_color = $1 + OR attribute_id_date0 = $1 + OR attribute_id_date1 = $1 + + UNION + + -- kanban fields + SELECT field_id + FROM app.field_kanban + WHERE attribute_id_sort = $1 + ) + `, attributeId, queryIds, columnIdsSubQueries) + if err != nil { + return nil, err + } + + for rows.Next() { + var d depField + if err := rows.Scan(&d.FormId, &d.FieldId); err != nil { + return nil, err + } + dependencies.Fields = append(dependencies.Fields, d) + } + rows.Close() + + return dependencies, nil +} diff --git a/schema/attribute/attribute_files.go b/schema/attribute/attribute_files.go index 6f66adf3..53331e96 100644 --- a/schema/attribute/attribute_files.go +++ b/schema/attribute/attribute_files.go @@ -1,20 +1,20 @@ package attribute import ( + "context" "fmt" - "r3/db" "r3/schema" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func fileRelationsCreate_tx(tx pgx.Tx, attributeId uuid.UUID, +func fileRelationsCreate_tx(ctx context.Context, tx pgx.Tx, attributeId uuid.UUID, moduleName string, relationName string) error { tNameR := schema.GetFilesTableName(attributeId) - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + _, err := tx.Exec(ctx, fmt.Sprintf(` CREATE TABLE instance_file."%s" ( file_id uuid NOT NULL, record_id bigint NOT NULL, @@ -51,8 +51,8 @@ func fileRelationsCreate_tx(tx pgx.Tx, attributeId uuid.UUID, return err } -func FileRelationsDelete_tx(tx pgx.Tx, attributeId uuid.UUID) error { - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` +func FileRelationsDelete_tx(ctx context.Context, tx pgx.Tx, attributeId uuid.UUID) error { + _, err := tx.Exec(ctx, fmt.Sprintf(` DROP TABLE instance_file."%s" `, schema.GetFilesTableName(attributeId))) return err diff --git a/schema/caption/caption.go b/schema/caption/caption.go index 1b4412a2..c4c25691 100644 --- a/schema/caption/caption.go +++ b/schema/caption/caption.go @@ -1,23 +1,23 @@ package caption import ( + "context" "errors" "fmt" - "r3/db" "r3/types" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func Get(entity string, id uuid.UUID, expectedContents []string) (types.CaptionMap, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, entity string, id uuid.UUID, expectedContents []string) (types.CaptionMap, error) { caps := make(types.CaptionMap) for _, content := range expectedContents { caps[content] = make(map[string]string) } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` + rows, err := tx.Query(ctx, fmt.Sprintf(` SELECT language_code, content, value FROM app.caption WHERE %s_id = $1 @@ -34,22 +34,26 @@ func Get(entity string, id uuid.UUID, expectedContents []string) (types.CaptionM if err := rows.Scan(&code, &content, &value); err != nil { return caps, err } + + if _, exists := caps[content]; !exists { + return caps, fmt.Errorf("caption content '%s' was unexpected", content) + } caps[content][code] = value } return caps, nil } -func Set_tx(tx pgx.Tx, id uuid.UUID, captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID, captions types.CaptionMap) error { for content, codes := range captions { - entityName, err := getEntityName(content) + entityName, err := GetEntityName(content) if err != nil { return err } // delete captions for this content - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DELETE FROM app.caption WHERE %s = $1 AND content = $2 @@ -64,7 +68,7 @@ func Set_tx(tx pgx.Tx, id uuid.UUID, captions types.CaptionMap) error { continue } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.caption (language_code, %s, value, content) VALUES ($1,$2,$3,$4) `, entityName), code, id, value, content); err != nil { @@ -75,7 +79,86 @@ func Set_tx(tx pgx.Tx, id uuid.UUID, captions types.CaptionMap) error { return nil } -func getEntityName(content string) (string, error) { +// helpers +func GetDefaultContent(entity string) types.CaptionMap { + switch entity { + case "article": + return types.CaptionMap{ + "articleTitle": make(map[string]string), + "articleBody": make(map[string]string), + } + case "attribute": + return types.CaptionMap{ + "attributeTitle": make(map[string]string), + } + case "clientEvent": + return types.CaptionMap{ + "clientEventTitle": make(map[string]string), + } + case "column": + return types.CaptionMap{ + "columnTitle": make(map[string]string), + } + case "field": + return types.CaptionMap{ + "fieldTitle": make(map[string]string), + "fieldHelp": make(map[string]string), + } + case "form": + return types.CaptionMap{ + "formTitle": make(map[string]string), + } + case "formAction": + return types.CaptionMap{ + "formActionTitle": make(map[string]string), + } + case "jsFunction": + return types.CaptionMap{ + "jsFunctionDesc": make(map[string]string), + "jsFunctionTitle": make(map[string]string), + } + case "loginForm": + return types.CaptionMap{ + "loginFormTitle": make(map[string]string), + } + case "menu": + return types.CaptionMap{ + "menuTitle": make(map[string]string), + } + case "menuTab": + return types.CaptionMap{ + "menuTabTitle": make(map[string]string), + } + case "module": + return types.CaptionMap{ + "moduleTitle": make(map[string]string), + } + case "pgFunction": + return types.CaptionMap{ + "pgFunctionTitle": make(map[string]string), + "pgFunctionDesc": make(map[string]string), + } + case "queryChoice": + return types.CaptionMap{ + "queryChoiceTitle": make(map[string]string), + } + case "role": + return types.CaptionMap{ + "roleTitle": make(map[string]string), + "roleDesc": make(map[string]string), + } + case "tab": + return types.CaptionMap{ + "tabTitle": make(map[string]string), + } + case "widget": + return types.CaptionMap{ + "widgetTitle": make(map[string]string), + } + } + return types.CaptionMap{} +} +func GetEntityName(content string) (string, error) { switch content { @@ -85,12 +168,18 @@ func getEntityName(content string) (string, error) { case "attributeTitle": return "attribute_id", nil + case "clientEventTitle": + return "client_event_id", nil + case "columnTitle": return "column_id", nil case "fieldTitle", "fieldHelp": return "field_id", nil + case "formActionTitle": + return "form_action_id", nil + case "formTitle", "formHelp": return "form_id", nil @@ -103,6 +192,9 @@ func getEntityName(content string) (string, error) { case "menuTitle": return "menu_id", nil + case "menuTabTitle": + return "menu_tab_id", nil + case "moduleTitle": return "module_id", nil @@ -117,6 +209,9 @@ func getEntityName(content string) (string, error) { case "tabTitle": return "tab_id", nil + + case "widgetTitle": + return "widget_id", nil } return "", errors.New("bad caption content name") } diff --git a/schema/clientEvent/clientEvent.go b/schema/clientEvent/clientEvent.go new file mode 100644 index 00000000..63d929e3 --- /dev/null +++ b/schema/clientEvent/clientEvent.go @@ -0,0 +1,91 @@ +package clientEvent + +import ( + "context" + "r3/schema" + "r3/schema/caption" + "r3/types" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" +) + +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.client_event WHERE id = $1`, id) + return err +} + +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.ClientEvent, error) { + + clientEvents := make([]types.ClientEvent, 0) + rows, err := tx.Query(ctx, ` + SELECT id, action, arguments, event, hotkey_modifier1, + hotkey_modifier2, hotkey_char, js_function_id, pg_function_id + FROM app.client_event + WHERE module_id = $1 + ORDER BY id ASC + `, moduleId) + if err != nil { + return clientEvents, err + } + defer rows.Close() + + for rows.Next() { + var e types.ClientEvent + e.ModuleId = moduleId + if err := rows.Scan(&e.Id, &e.Action, &e.Arguments, &e.Event, &e.HotkeyModifier1, + &e.HotkeyModifier2, &e.HotkeyChar, &e.JsFunctionId, &e.PgFunctionId); err != nil { + + return clientEvents, err + } + clientEvents = append(clientEvents, e) + } + + for i, e := range clientEvents { + clientEvents[i].Captions, err = caption.Get_tx(ctx, tx, "client_event", e.Id, []string{"clientEventTitle"}) + if err != nil { + return clientEvents, err + } + } + return clientEvents, nil +} + +func Set_tx(ctx context.Context, tx pgx.Tx, ce types.ClientEvent) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &ce.Id, "client_event", "id") + if err != nil { + return err + } + + if ce.Action != "callJsFunction" { + ce.JsFunctionId = pgtype.UUID{} + } + if ce.Action != "callPgFunction" { + ce.PgFunctionId = pgtype.UUID{} + } + + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.client_event + SET action = $1, arguments = $2, event = $3, hotkey_modifier1 = $4, + hotkey_modifier2 = $5, hotkey_char = $6, js_function_id = $7, pg_function_id = $8 + WHERE id = $9 + `, ce.Action, ce.Arguments, ce.Event, ce.HotkeyModifier1, ce.HotkeyModifier2, + ce.HotkeyChar, ce.JsFunctionId, ce.PgFunctionId, ce.Id); err != nil { + + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.client_event (id, module_id, action, arguments, event, hotkey_modifier1, + hotkey_modifier2, hotkey_char, js_function_id, pg_function_id) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) + `, ce.Id, ce.ModuleId, ce.Action, ce.Arguments, ce.Event, ce.HotkeyModifier1, + ce.HotkeyModifier2, ce.HotkeyChar, ce.JsFunctionId, ce.PgFunctionId); err != nil { + + return err + } + } + return caption.Set_tx(ctx, tx, ce.Id, ce.Captions) +} diff --git a/schema/collection/collection.go b/schema/collection/collection.go index a74b2ac7..b4587d10 100644 --- a/schema/collection/collection.go +++ b/schema/collection/collection.go @@ -1,7 +1,7 @@ package collection import ( - "r3/db" + "context" "r3/schema" "r3/schema/collection/consumer" "r3/schema/column" @@ -13,15 +13,15 @@ import ( "github.com/jackc/pgx/v5/pgtype" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.collection WHERE id = $1`, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.collection WHERE id = $1`, id) return err } -func Get(moduleId uuid.UUID) ([]types.Collection, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Collection, error) { collections := make([]types.Collection, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, icon_id, name FROM app.collection WHERE module_id = $1 @@ -44,15 +44,15 @@ func Get(moduleId uuid.UUID) ([]types.Collection, error) { // collect query and columns for i, c := range collections { - c.Query, err = query.Get("collection", c.Id, 0, 0) + c.Query, err = query.Get_tx(ctx, tx, "collection", c.Id, 0, 0, 0) if err != nil { return collections, err } - c.Columns, err = column.Get("collection", c.Id) + c.Columns, err = column.Get_tx(ctx, tx, "collection", c.Id) if err != nil { return collections, err } - c.InHeader, err = consumer.Get("collection", c.Id, "headerDisplay") + c.InHeader, err = consumer.Get_tx(ctx, tx, "collection", c.Id, "headerDisplay") if err != nil { return collections, err } @@ -61,16 +61,16 @@ func Get(moduleId uuid.UUID) ([]types.Collection, error) { return collections, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, iconId pgtype.UUID, name string, +func Set_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, iconId pgtype.UUID, name string, columns []types.Column, queryIn types.Query, inHeader []types.CollectionConsumer) error { - known, err := schema.CheckCreateId_tx(tx, &id, "collection", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &id, "collection", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.collection SET icon_id = $1, name = $2 WHERE id = $3 @@ -78,18 +78,18 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, iconId pgtype.UUID, nam return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.collection (id,icon_id,module_id,name) VALUES ($1,$2,$3,$4) `, id, iconId, moduleId, name); err != nil { return err } } - if err := query.Set_tx(tx, "collection", id, 0, 0, queryIn); err != nil { + if err := query.Set_tx(ctx, tx, "collection", id, 0, 0, 0, queryIn); err != nil { return err } - if err := column.Set_tx(tx, "collection", id, columns); err != nil { + if err := column.Set_tx(ctx, tx, "collection", id, columns); err != nil { return err } - return consumer.Set_tx(tx, "collection", id, "headerDisplay", inHeader) + return consumer.Set_tx(ctx, tx, "collection", id, "headerDisplay", inHeader) } diff --git a/schema/collection/consumer/consumer.go b/schema/collection/consumer/consumer.go index d59bf2c3..11c5354a 100644 --- a/schema/collection/consumer/consumer.go +++ b/schema/collection/consumer/consumer.go @@ -1,55 +1,53 @@ package consumer import ( + "context" "errors" "fmt" - "r3/db" + "r3/schema/compatible" "r3/schema/openForm" - "r3/tools" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" ) -var entitiesAllowed = []string{"collection", "field", "menu"} +var entitiesAllowed = []string{"collection", "field", "menu", "widget"} -func GetOne(entity string, entityId uuid.UUID, content string) (types.CollectionConsumer, error) { +func GetOne_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, content string) (types.CollectionConsumer, error) { var err error var c types.CollectionConsumer - if !tools.StringInSlice(entity, entitiesAllowed) { + if !slices.Contains(entitiesAllowed, entity) { return c, errors.New("invalid collection consumer entity") } - if err := db.Pool.QueryRow(db.Ctx, fmt.Sprintf(` - SELECT id, collection_id, column_id_display, - multi_value, no_display_empty, on_mobile + if err := tx.QueryRow(ctx, fmt.Sprintf(` + SELECT id, collection_id, column_id_display, flags, on_mobile FROM app.collection_consumer WHERE %s_id = $1 AND content = $2 - `, entity), entityId, content).Scan(&c.Id, &c.CollectionId, &c.ColumnIdDisplay, - &c.MultiValue, &c.NoDisplayEmpty, &c.OnMobile); err != nil && err != pgx.ErrNoRows { - + `, entity), entityId, content).Scan(&c.Id, &c.CollectionId, &c.ColumnIdDisplay, &c.Flags, &c.OnMobile); err != nil && err != pgx.ErrNoRows { return c, err } - c.OpenForm, err = openForm.Get("collection_consumer", c.Id) + c.OpenForm, err = openForm.Get_tx(ctx, tx, "collection_consumer", c.Id, pgtype.Text{}) if err != nil { return c, err } return c, nil } -func Get(entity string, entityId uuid.UUID, content string) ([]types.CollectionConsumer, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, content string) ([]types.CollectionConsumer, error) { var consumers = make([]types.CollectionConsumer, 0) - if !tools.StringInSlice(entity, entitiesAllowed) { + if !slices.Contains(entitiesAllowed, entity) { return consumers, errors.New("invalid collection consumer entity") } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` - SELECT id, collection_id, column_id_display, - multi_value, no_display_empty, on_mobile + rows, err := tx.Query(ctx, fmt.Sprintf(` + SELECT id, collection_id, column_id_display, flags, on_mobile FROM app.collection_consumer WHERE %s_id = $1 AND content = $2 @@ -61,28 +59,27 @@ func Get(entity string, entityId uuid.UUID, content string) ([]types.CollectionC for rows.Next() { var c types.CollectionConsumer - - if err := rows.Scan(&c.Id, &c.CollectionId, &c.ColumnIdDisplay, - &c.MultiValue, &c.NoDisplayEmpty, &c.OnMobile); err != nil { - + if err := rows.Scan(&c.Id, &c.CollectionId, &c.ColumnIdDisplay, &c.Flags, &c.OnMobile); err != nil { return consumers, err } - c.OpenForm, err = openForm.Get("collection_consumer", c.Id) + consumers = append(consumers, c) + } + + for i, c := range consumers { + consumers[i].OpenForm, err = openForm.Get_tx(ctx, tx, "collection_consumer", c.Id, pgtype.Text{}) if err != nil { return consumers, err } - consumers = append(consumers, c) } return consumers, nil } -func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, content string, - consumers []types.CollectionConsumer) error { +func Set_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, content string, consumers []types.CollectionConsumer) error { - if !tools.StringInSlice(entity, entitiesAllowed) { + if !slices.Contains(entitiesAllowed, entity) { return errors.New("invalid collection consumer entity") } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DELETE FROM app.collection_consumer WHERE %s_id = $1 AND content = $2 @@ -96,6 +93,9 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, content string, continue } + // fix import < 3.10: add missing flags + c = compatible.FixCollectionConsumerFlags(c) + if c.Id == uuid.Nil { c.Id, err = uuid.NewV4() if err != nil { @@ -104,30 +104,21 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, content string, } if entity == "collection" { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.collection_consumer (id, collection_id, - column_id_display, content, multi_value, no_display_empty, - on_mobile) - VALUES ($1,$2,$3,$4,$5,$6,$7) - `, c.Id, c.CollectionId, c.ColumnIdDisplay, content, c.MultiValue, - c.NoDisplayEmpty, c.OnMobile); err != nil { - + if _, err := tx.Exec(ctx, ` + INSERT INTO app.collection_consumer (id, collection_id, column_id_display, content, flags, on_mobile) + VALUES ($1,$2,$3,$4,$5,$6) + `, c.Id, c.CollectionId, c.ColumnIdDisplay, content, c.Flags, c.OnMobile); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` - INSERT INTO app.collection_consumer (id, collection_id, %s_id, - column_id_display, content, multi_value, no_display_empty, - on_mobile) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8) - `, entity), c.Id, c.CollectionId, entityId, c.ColumnIdDisplay, content, - c.MultiValue, c.NoDisplayEmpty, c.OnMobile); err != nil { - + if _, err := tx.Exec(ctx, fmt.Sprintf(` + INSERT INTO app.collection_consumer (id, collection_id, %s_id, column_id_display, content, flags, on_mobile) + VALUES ($1,$2,$3,$4,$5,$6,$7) + `, entity), c.Id, c.CollectionId, entityId, c.ColumnIdDisplay, content, c.Flags, c.OnMobile); err != nil { return err } } - - if err := openForm.Set_tx(tx, "collection_consumer", c.Id, c.OpenForm); err != nil { + if err := openForm.Set_tx(ctx, tx, "collection_consumer", c.Id, c.OpenForm, pgtype.Text{}); err != nil { return err } } diff --git a/schema/column/column.go b/schema/column/column.go index 3af0c3c0..c0fef994 100644 --- a/schema/column/column.go +++ b/schema/column/column.go @@ -1,15 +1,15 @@ package column import ( + "context" "errors" "fmt" - "r3/compatible" - "r3/db" "r3/schema" "r3/schema/caption" + "r3/schema/compatible" "r3/schema/query" - "r3/tools" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" @@ -18,21 +18,21 @@ import ( var allowedEntities = []string{"api", "collection", "field"} -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.column WHERE id = $1`, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.column WHERE id = $1`, id) return err } -func Get(entity string, entityId uuid.UUID) ([]types.Column, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID) ([]types.Column, error) { columns := make([]types.Column, 0) - if !tools.StringInSlice(entity, allowedEntities) { + if !slices.Contains(allowedEntities, entity) { return columns, errors.New("bad entity") } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` - SELECT id, attribute_id, index, batch, basis, length, wrap, display, - group_by, aggregator, distincted, sub_query, on_mobile, clipboard + rows, err := tx.Query(ctx, fmt.Sprintf(` + SELECT id, attribute_id, index, batch, basis, length, display, group_by, + aggregator, distincted, hidden, on_mobile, sub_query, styles FROM app.column WHERE %s_id = $1 ORDER BY position ASC @@ -40,22 +40,22 @@ func Get(entity string, entityId uuid.UUID) ([]types.Column, error) { if err != nil { return columns, err } + defer rows.Close() for rows.Next() { var c types.Column if err := rows.Scan(&c.Id, &c.AttributeId, &c.Index, &c.Batch, &c.Basis, - &c.Length, &c.Wrap, &c.Display, &c.GroupBy, &c.Aggregator, - &c.Distincted, &c.SubQuery, &c.OnMobile, &c.Clipboard); err != nil { + &c.Length, &c.Display, &c.GroupBy, &c.Aggregator, &c.Distincted, + &c.Hidden, &c.OnMobile, &c.SubQuery, &c.Styles); err != nil { return columns, err } columns = append(columns, c) } - rows.Close() for i, c := range columns { if c.SubQuery { - c.Query, err = query.Get("column", c.Id, 0, 0) + c.Query, err = query.Get_tx(ctx, tx, "column", c.Id, 0, 0, 0) if err != nil { return columns, err } @@ -63,8 +63,7 @@ func Get(entity string, entityId uuid.UUID) ([]types.Column, error) { c.Query.RelationId = pgtype.UUID{} } - // get captions - c.Captions, err = caption.Get("column", c.Id, []string{"columnTitle"}) + c.Captions, err = caption.Get_tx(ctx, tx, "column", c.Id, []string{"columnTitle"}) if err != nil { return columns, err } @@ -73,9 +72,9 @@ func Get(entity string, entityId uuid.UUID) ([]types.Column, error) { return columns, nil } -func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, columns []types.Column) error { +func Set_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, columns []types.Column) error { - if !tools.StringInSlice(entity, allowedEntities) { + if !slices.Contains(allowedEntities, entity) { return errors.New("bad entity") } @@ -85,7 +84,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, columns []types.Column idsKeep = append(idsKeep, c.Id) } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DELETE FROM app.column WHERE %s_id = $1 AND id <> ALL($2) @@ -96,55 +95,57 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, columns []types.Column // insert new/update existing columns for position, c := range columns { - known, err := schema.CheckCreateId_tx(tx, &c.Id, "column", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &c.Id, "column", "id") if err != nil { return err } // fix imports < 3.3: Migrate display option to attribute content use - c.Display, err = compatible.MigrateDisplayToContentUse_tx(tx, c.AttributeId, c.Display) + c.Display, err = compatible.MigrateDisplayToContentUse_tx(ctx, tx, c.AttributeId, c.Display) if err != nil { return err } + // fix imports < 3.8: Convert to new styles + c = compatible.FixColumnStyles(c) + if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.column - SET attribute_id = $1, index = $2, position = $3, batch = $4, - basis = $5, length = $6, wrap = $7, display = $8, - group_by = $9, aggregator = $10, distincted = $11, - sub_query = $12, on_mobile = $13, clipboard = $14 + SET attribute_id = $1, index = $2, position = $3, batch = $4, basis = $5, + length = $6, display = $7, group_by = $8, aggregator = $9, distincted = $10, + hidden = $11, on_mobile = $12, sub_query = $13, styles = $14 WHERE id = $15 - `, c.AttributeId, c.Index, position, c.Batch, c.Basis, c.Length, - c.Wrap, c.Display, c.GroupBy, c.Aggregator, c.Distincted, - c.SubQuery, c.OnMobile, c.Clipboard, c.Id); err != nil { + `, c.AttributeId, c.Index, position, c.Batch, c.Basis, c.Length, c.Display, + c.GroupBy, c.Aggregator, c.Distincted, c.Hidden, c.OnMobile, c.SubQuery, + c.Styles, c.Id); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.column ( - id, %s_id, attribute_id, index, position, batch, basis, - length, wrap, display, group_by, aggregator, distincted, - on_mobile, sub_query, clipboard + id, %s_id, attribute_id, index, position, batch, basis, length, + display, group_by, aggregator, distincted, hidden, on_mobile, + sub_query, styles ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16) `, entity), c.Id, entityId, c.AttributeId, c.Index, position, c.Batch, - c.Basis, c.Length, c.Wrap, c.Display, c.GroupBy, c.Aggregator, - c.Distincted, c.OnMobile, c.SubQuery, c.Clipboard); err != nil { + c.Basis, c.Length, c.Display, c.GroupBy, c.Aggregator, c.Distincted, + c.Hidden, c.OnMobile, c.SubQuery, c.Styles); err != nil { return err } } if c.SubQuery { - if err := query.Set_tx(tx, "column", c.Id, 0, 0, c.Query); err != nil { + if err := query.Set_tx(ctx, tx, "column", c.Id, 0, 0, 0, c.Query); err != nil { return err } } // set captions - if err := caption.Set_tx(tx, c.Id, c.Captions); err != nil { + if err := caption.Set_tx(ctx, tx, c.Id, c.Captions); err != nil { return err } } diff --git a/schema/compatible/compatible.go b/schema/compatible/compatible.go new file mode 100644 index 00000000..4ceeab82 --- /dev/null +++ b/schema/compatible/compatible.go @@ -0,0 +1,297 @@ +/* central package for fixing issues with modules from older versions */ +package compatible + +import ( + "context" + "encoding/json" + "fmt" + "r3/types" + "slices" + "strings" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" +) + +// < 3.10 +// fix missing menu tab (at least 1 must exist) +func FixMissingMenuTab(moduleId uuid.UUID, mts []types.MenuTab, menus []types.Menu) ([]types.MenuTab, error) { + if len(mts) == 0 { + menuTabId, err := uuid.NewV4() + if err != nil { + return mts, err + } + + mts = append(mts, types.MenuTab{ + Id: menuTabId, + ModuleId: moduleId, + IconId: pgtype.UUID{}, + Menus: menus, + }) + } + return mts, nil +} +func FixCollectionConsumerFlags(c types.CollectionConsumer) types.CollectionConsumer { + if c.Flags == nil { + c.Flags = make([]string, 0) + } + if c.MultiValue { + c.Flags = append(c.Flags, "multiValue") + } + if c.NoDisplayEmpty { + c.Flags = append(c.Flags, "noDisplayEmpty") + } + return c +} +func FixNilFieldFlags(flags []string) []string { + if flags == nil { + return make([]string, 0) + } + return flags +} + +// < 3.9 +// fix missing volatility setting +func FixMissingVolatility(fnc types.PgFunction) types.PgFunction { + if fnc.Volatility == "" { + fnc.Volatility = "VOLATILE" + } + return fnc +} + +// < 3.8 +// migrate column styles +func FixPresetNull(value pgtype.Text) interface{} { + if !value.Valid || value.String == "" { + return nil + } + return value +} +func FixColumnStyles(column types.Column) types.Column { + if column.Display == "hidden" { + column.Hidden = true + column.Display = "default" + } + if column.BatchVertical { + column.Styles = append(column.Styles, "vertical") + } + if column.Clipboard { + column.Styles = append(column.Styles, "clipboard") + } + if column.Wrap { + column.Styles = append(column.Styles, "wrap") + } + return column +} + +// < 3.7 +// migrate PG triggers from relations to module +func FixPgTriggerLocation(triggers []types.PgTrigger, relations []types.Relation) []types.PgTrigger { + for _, relation := range relations { + for _, trg := range relation.Triggers { + trg.ModuleId = relation.ModuleId + triggers = append(triggers, trg) + } + } + return triggers +} + +// < 3.5 +// migrate relation index apply +func FixOpenFormRelationIndexApply(openForm types.OpenForm) types.OpenForm { + if openForm.RelationIndex != -1 { + openForm.RelationIndexApply = openForm.RelationIndex + } + return openForm +} +func FixOpenFormRelationIndexApplyDefault(openForm types.OpenForm) types.OpenForm { + openForm.RelationIndex = -1 + return openForm +} + +// migrate default calendar view if not set +func FixCalendarDefaultView(days int) int { + if days == 0 { + return 42 + } + return days +} + +// < 3.4 +// migrate open form pop-up type +func FixOpenFormPopUpType(openForm types.OpenForm) types.OpenForm { + if openForm.PopUp && !openForm.PopUpType.Valid { + openForm.PopUpType.String = "float" + openForm.PopUpType.Valid = true + } + return openForm +} + +// < 3.4 +// migrate PG index method +func FixPgIndexMethod(method string) string { + if method == "" { + return "BTREE" + } + return method +} + +// < 3.3 +// migrate attribute content use +func FixAttributeContentUse(contentUse string) string { + if contentUse == "" { + return "default" + } + return contentUse +} +func MigrateDisplayToContentUse_tx(ctx context.Context, tx pgx.Tx, attributeId uuid.UUID, display string) (string, error) { + + if slices.Contains([]string{"textarea", "richtext", "date", "datetime", "time", "color"}, display) { + _, err := tx.Exec(ctx, ` + UPDATE app.attribute + SET content_use = $1 + WHERE id = $2 + `, display, attributeId) + + return "default", err + } + return display, nil +} + +// < 3.2 +// migrate old module/form help pages to help articles +func FixCaptions_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, captionMap types.CaptionMap) (types.CaptionMap, error) { + + var articleId uuid.UUID + var moduleId uuid.UUID + var name string + + switch entity { + case "module": + moduleId = entityId + name = "Migrated from application help" + case "form": + if err := tx.QueryRow(ctx, ` + SELECT module_id, CONCAT('Migrated from form help of ', name) + FROM app.form + WHERE id = $1 + `, entityId).Scan(&moduleId, &name); err != nil { + return captionMap, err + } + default: + return captionMap, fmt.Errorf("invalid entity for help->article migration '%s'", entity) + } + + for content, langMap := range captionMap { + if content != "moduleHelp" && content != "formHelp" { + continue + } + + // delete outdated caption entry + delete(captionMap, content) + + // check whether there is anything to migrate + anyValue := false + for _, value := range langMap { + if value != "" { + anyValue = true + break + } + } + if !anyValue { + continue + } + + // check edge case: installed < 3.2 module gets another < 3.2 update + // this would cause duplicates of migration articles + // solution: we do not touch migrated articles until a version >= 3.2 is released, + // in which module authors can handle/update the migrated articles + exists := false + if err := tx.QueryRow(ctx, ` + SELECT EXISTS ( + SELECT id + FROM app.article + WHERE module_id = $1 + AND name = $2 + ) + `, moduleId, name).Scan(&exists); err != nil { + return captionMap, err + } + if exists { + continue + } + + if err := tx.QueryRow(ctx, ` + INSERT INTO app.article (id, module_id, name) + VALUES (gen_random_uuid(), $1, $2) + RETURNING id + `, moduleId, name).Scan(&articleId); err != nil { + return captionMap, err + } + + for langCode, value := range langMap { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.caption (article_id, content, language_code, value) + VALUES ($1, 'articleBody', $2, $3) + `, articleId, langCode, value); err != nil { + return captionMap, err + } + } + + switch content { + case "moduleHelp": + if _, err := tx.Exec(ctx, ` + INSERT INTO app.article_help (article_id, module_id, position) + VALUES ($1, $2, 0) + `, articleId, moduleId); err != nil { + return captionMap, err + } + case "formHelp": + if _, err := tx.Exec(ctx, ` + INSERT INTO app.article_form (article_id, form_id, position) + VALUES ($1, $2, 0) + `, articleId, entityId); err != nil { + return captionMap, err + } + } + } + return captionMap, nil +} + +// < 3.1 +// fix legacy file attribute format +func FixLegacyFileAttributeValue(jsonValue []byte) []types.DataGetValueFile { + + // legacy format + var files struct { + Files []types.DataGetValueFile `json:"files"` + } + if err := json.Unmarshal(jsonValue, &files); err == nil && len(files.Files) != 0 { + return files.Files + } + + // current format + var filesNew []types.DataGetValueFile + json.Unmarshal(jsonValue, &filesNew) + return filesNew +} + +// < 3.0 +// fix missing role content +func FixMissingRoleContent(role types.Role) types.Role { + if role.Content == "" { + if role.Name == "everyone" { + role.Content = "everyone" + } else if strings.Contains(strings.ToLower(role.Name), "admin") { + role.Content = "admin" + } else if strings.Contains(strings.ToLower(role.Name), "data") { + role.Content = "other" + } else if strings.Contains(strings.ToLower(role.Name), "csv") { + role.Content = "other" + } else { + role.Content = "user" + } + } + return role +} diff --git a/schema/field/field.go b/schema/field/field.go index bd1976ed..563b9940 100644 --- a/schema/field/field.go +++ b/schema/field/field.go @@ -1,21 +1,21 @@ package field import ( + "context" "database/sql" "encoding/json" "errors" "fmt" - "r3/compatible" - "r3/db" "r3/schema" "r3/schema/caption" "r3/schema/collection/consumer" "r3/schema/column" + "r3/schema/compatible" "r3/schema/openForm" "r3/schema/query" "r3/schema/tab" - "r3/tools" "r3/types" + "slices" "sort" "github.com/gofrs/uuid" @@ -23,18 +23,17 @@ import ( "github.com/jackc/pgx/v5/pgtype" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.field WHERE id = $1`, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.field WHERE id = $1`, id) return err } -func Get(formId uuid.UUID) ([]interface{}, error) { - +func Get_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID) ([]interface{}, error) { fields := make([]interface{}, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT f.id, f.parent_id, f.tab_id, f.icon_id, f.content, f.state, - f.on_mobile, a.content, + f.flags, f.on_mobile, a.content, -- button field fb.js_function_id, @@ -43,6 +42,7 @@ func Get(formId uuid.UUID) ([]interface{}, error) { fn.attribute_id_date0, fn.attribute_id_date1, fn.attribute_id_color, fn.index_date0, fn.index_date1, fn.index_color, fn.ics, fn.gantt, fn.gantt_steps, fn.gantt_steps_toggle, fn.date_range0, fn.date_range1, + fn.days, fn.days_toggle, -- chart field fa.chart_option, @@ -52,7 +52,7 @@ func Get(formId uuid.UUID) ([]interface{}, error) { fc.wrap, fc.grow, fc.shrink, fc.basis, fc.per_min, fc.per_max, -- header field - fh.size, + fh.richtext, fh.size, -- data field fd.attribute_id, fd.attribute_id_alt, fd.index, fd.display, fd.min, @@ -66,9 +66,16 @@ func Get(formId uuid.UUID) ([]interface{}, error) { WHERE field_id = fr.field_id ) AS preset_ids, + -- kanban field + fk.relation_index_data, fk.relation_index_axis_x, + fk.relation_index_axis_y, fk.attribute_id_sort, + -- list field fl.auto_renew, fl.csv_export, fl.csv_import, fl.layout, - fl.filter_quick, fl.result_limit + fl.filter_quick, fl.result_limit, + + -- variable field + fv.variable_id, fv.js_function_id, fv.clipboard FROM app.field AS f LEFT JOIN app.field_button AS fb ON fb.field_id = f.id @@ -78,7 +85,9 @@ func Get(formId uuid.UUID) ([]interface{}, error) { LEFT JOIN app.field_data AS fd ON fd.field_id = f.id LEFT JOIN app.field_data_relationship AS fr ON fr.field_id = f.id LEFT JOIN app.field_header AS fh ON fh.field_id = f.id + LEFT JOIN app.field_kanban AS fk ON fk.field_id = f.id LEFT JOIN app.field_list AS fl ON fl.field_id = f.id + LEFT JOIN app.field_variable AS fv ON fv.field_id = f.id LEFT JOIN app.attribute AS a ON a.id = fd.attribute_id WHERE f.form_id = $1 ORDER BY f.position ASC @@ -96,9 +105,11 @@ func Get(formId uuid.UUID) ([]interface{}, error) { posDataLookup := make([]int, 0) posDataRelLookup := make([]int, 0) posHeaderLookup := make([]int, 0) + posKanbanLookup := make([]int, 0) posListLookup := make([]int, 0) posParentLookup := make([]int, 0) posTabsLookup := make([]int, 0) + posVariableLookup := make([]int, 0) posMapParentId := make(map[int]uuid.UUID) posMapTabId := make(map[int]uuid.UUID) @@ -111,28 +122,35 @@ func Get(formId uuid.UUID) ([]interface{}, error) { var alignItems, alignContent, chartOption, def, direction, display, ganttSteps, justifyContent, layout, regexCheck pgtype.Text - var autoSelect, grow, shrink, basis, perMin, perMax, index, indexDate0, - indexDate1, size, resultLimit pgtype.Int2 + var autoSelect, days, grow, shrink, basis, perMin, perMax, index, + indexDate0, indexDate1, size, relationIndexKanbanData, + relationIndexKanbanAxisX, relationIndexKanbanAxisY, + resultLimit pgtype.Int2 var autoRenew, dateRange0, dateRange1, indexColor, min, max pgtype.Int4 var attributeId, attributeIdAlt, attributeIdNm, attributeIdDate0, - attributeIdDate1, attributeIdColor, fieldParentId, iconId, - jsFunctionIdButton, jsFunctionIdData, tabId pgtype.UUID - var category, clipboard, csvExport, csvImport, filterQuick, - filterQuickList, gantt, ganttStepsToggle, ics, outsideIn, - wrap pgtype.Bool + attributeIdDate1, attributeIdColor, attributeIdKanbanSort, + fieldParentId, iconId, jsFunctionIdButton, jsFunctionIdData, + jsFunctionIdVariable, tabId, variableId pgtype.UUID + var category, clipboard, clipboardVariable, csvExport, csvImport, + daysToggle, filterQuick, filterQuickList, gantt, ganttStepsToggle, + ics, outsideIn, richtext, wrap pgtype.Bool var defPresetIds []uuid.UUID + var flags []string if err := rows.Scan(&fieldId, &fieldParentId, &tabId, &iconId, &content, - &state, &onMobile, &atrContent, &jsFunctionIdButton, &attributeIdDate0, - &attributeIdDate1, &attributeIdColor, &indexDate0, &indexDate1, - &indexColor, &ics, &gantt, &ganttSteps, &ganttStepsToggle, - &dateRange0, &dateRange1, &chartOption, &direction, &justifyContent, - &alignItems, &alignContent, &wrap, &grow, &shrink, &basis, &perMin, - &perMax, &size, &attributeId, &attributeIdAlt, &index, &display, - &min, &max, &def, ®exCheck, &jsFunctionIdData, &clipboard, - &attributeIdNm, &category, &filterQuick, &outsideIn, &autoSelect, - &defPresetIds, &autoRenew, &csvExport, &csvImport, &layout, - &filterQuickList, &resultLimit); err != nil { + &state, &flags, &onMobile, &atrContent, &jsFunctionIdButton, + &attributeIdDate0, &attributeIdDate1, &attributeIdColor, &indexDate0, + &indexDate1, &indexColor, &ics, &gantt, &ganttSteps, &ganttStepsToggle, + &dateRange0, &dateRange1, &days, &daysToggle, &chartOption, + &direction, &justifyContent, &alignItems, &alignContent, &wrap, + &grow, &shrink, &basis, &perMin, &perMax, &richtext, &size, + &attributeId, &attributeIdAlt, &index, &display, &min, &max, &def, + ®exCheck, &jsFunctionIdData, &clipboard, &attributeIdNm, + &category, &filterQuick, &outsideIn, &autoSelect, &defPresetIds, + &relationIndexKanbanData, &relationIndexKanbanAxisX, + &relationIndexKanbanAxisY, &attributeIdKanbanSort, &autoRenew, + &csvExport, &csvImport, &layout, &filterQuickList, &resultLimit, + &variableId, &jsFunctionIdVariable, &clipboardVariable); err != nil { rows.Close() return fields, err @@ -150,13 +168,10 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, JsFunctionId: jsFunctionIdButton, OpenForm: types.OpenForm{}, - - // legacy - FormIdOpen: pgtype.UUID{}, - AttributeIdRecord: pgtype.UUID{}, }) posButtonLookup = append(posButtonLookup, pos) case "calendar": @@ -166,6 +181,7 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, AttributeIdDate0: attributeIdDate0.Bytes, AttributeIdDate1: attributeIdDate1.Bytes, @@ -179,13 +195,11 @@ func Get(formId uuid.UUID) ([]interface{}, error) { GanttStepsToggle: ganttStepsToggle.Bool, DateRange0: int64(dateRange0.Int32), DateRange1: int64(dateRange1.Int32), + Days: int(days.Int16), + DaysToggle: daysToggle.Bool, Columns: []types.Column{}, Query: types.Query{}, OpenForm: types.OpenForm{}, - - // legacy - FormIdOpen: pgtype.UUID{}, - AttributeIdRecord: pgtype.UUID{}, }) posCalendarLookup = append(posCalendarLookup, pos) case "chart": @@ -195,10 +209,12 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, ChartOption: chartOption.String, Columns: []types.Column{}, Query: types.Query{}, + Captions: types.CaptionMap{}, }) posChartLookup = append(posChartLookup, pos) case "container": @@ -208,6 +224,7 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, Direction: direction.String, JustifyContent: justifyContent.String, @@ -231,6 +248,7 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, Clipboard: clipboard.Bool, AttributeId: attributeId.Bytes, @@ -254,10 +272,8 @@ func Get(formId uuid.UUID) ([]interface{}, error) { Captions: types.CaptionMap{}, // legacy - FormIdOpen: pgtype.UUID{}, - AttributeIdRecord: pgtype.UUID{}, - CollectionIdDef: pgtype.UUID{}, - ColumnIdDef: pgtype.UUID{}, + CollectionIdDef: pgtype.UUID{}, + ColumnIdDef: pgtype.UUID{}, }) posDataRelLookup = append(posDataRelLookup, pos) } else { @@ -267,6 +283,7 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, Clipboard: clipboard.Bool, AttributeId: attributeId.Bytes, @@ -294,35 +311,56 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, + Richtext: richtext.Bool, Size: int(size.Int16), Captions: types.CaptionMap{}, }) posHeaderLookup = append(posHeaderLookup, pos) + case "kanban": + fields = append(fields, types.FieldKanban{ + Id: fieldId, + TabId: tabId, + IconId: iconId, + Content: content, + State: state, + Flags: flags, + OnMobile: onMobile, + RelationIndexData: int(relationIndexKanbanData.Int16), + RelationIndexAxisX: int(relationIndexKanbanAxisX.Int16), + RelationIndexAxisY: relationIndexKanbanAxisY, + AttributeIdSort: attributeIdKanbanSort, + OpenForm: types.OpenForm{}, + Columns: []types.Column{}, + Query: types.Query{}, + }) + posKanbanLookup = append(posKanbanLookup, pos) + case "list": fields = append(fields, types.FieldList{ - Id: fieldId, - TabId: tabId, - IconId: iconId, - Content: content, - State: state, - OnMobile: onMobile, - Columns: []types.Column{}, - AutoRenew: autoRenew, - CsvExport: csvExport.Bool, - CsvImport: csvImport.Bool, - Layout: layout.String, - FilterQuick: filterQuickList.Bool, - Query: types.Query{}, - OpenForm: types.OpenForm{}, - ResultLimit: int(resultLimit.Int16), - - // legacy - FormIdOpen: pgtype.UUID{}, - AttributeIdRecord: pgtype.UUID{}, + Id: fieldId, + TabId: tabId, + IconId: iconId, + Content: content, + State: state, + Flags: flags, + OnMobile: onMobile, + Columns: []types.Column{}, + AutoRenew: autoRenew, + CsvExport: csvExport.Bool, + CsvImport: csvImport.Bool, + Layout: layout.String, + FilterQuick: filterQuickList.Bool, + Query: types.Query{}, + Captions: types.CaptionMap{}, + OpenForm: types.OpenForm{}, + OpenFormBulk: types.OpenForm{}, + ResultLimit: int(resultLimit.Int16), }) posListLookup = append(posListLookup, pos) + case "tabs": fields = append(fields, types.FieldTabs{ Id: fieldId, @@ -330,11 +368,28 @@ func Get(formId uuid.UUID) ([]interface{}, error) { IconId: iconId, Content: content, State: state, + Flags: flags, OnMobile: onMobile, + Captions: types.CaptionMap{}, Tabs: []types.Tab{}, }) posTabsLookup = append(posTabsLookup, pos) posParentLookup = append(posParentLookup, pos) + + case "variable": + fields = append(fields, types.FieldVariable{ + Id: fieldId, + VariableId: variableId, + JsFunctionId: jsFunctionIdVariable, + IconId: iconId, + Content: content, + State: state, + Flags: flags, + OnMobile: onMobile, + Clipboard: clipboardVariable.Bool, + Captions: types.CaptionMap{}, + }) + posVariableLookup = append(posVariableLookup, pos) } pos++ } @@ -344,11 +399,11 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posButtonLookup { var field = fields[pos].(types.FieldButton) - field.OpenForm, err = openForm.Get("field", field.Id) + field.OpenForm, err = openForm.Get_tx(ctx, tx, "field", field.Id, pgtype.Text{}) if err != nil { return fields, err } - field.Captions, err = caption.Get("field", field.Id, []string{"fieldTitle"}) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle"}) if err != nil { return fields, err } @@ -359,19 +414,19 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posCalendarLookup { var field = fields[pos].(types.FieldCalendar) - field.OpenForm, err = openForm.Get("field", field.Id) + field.OpenForm, err = openForm.Get_tx(ctx, tx, "field", field.Id, pgtype.Text{}) if err != nil { return fields, err } - field.Query, err = query.Get("field", field.Id, 0, 0) + field.Query, err = query.Get_tx(ctx, tx, "field", field.Id, 0, 0, 0) if err != nil { return fields, err } - field.Columns, err = column.Get("field", field.Id) + field.Columns, err = column.Get_tx(ctx, tx, "field", field.Id) if err != nil { return fields, err } - field.Collections, err = consumer.Get("field", field.Id, "fieldFilterSelector") + field.Collections, err = consumer.Get_tx(ctx, tx, "field", field.Id, "fieldFilterSelector") if err != nil { return fields, err } @@ -382,11 +437,15 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posChartLookup { var field = fields[pos].(types.FieldChart) - field.Query, err = query.Get("field", field.Id, 0, 0) + field.Query, err = query.Get_tx(ctx, tx, "field", field.Id, 0, 0, 0) + if err != nil { + return fields, err + } + field.Columns, err = column.Get_tx(ctx, tx, "field", field.Id) if err != nil { return fields, err } - field.Columns, err = column.Get("field", field.Id) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle"}) if err != nil { return fields, err } @@ -397,11 +456,11 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posDataLookup { var field = fields[pos].(types.FieldData) - field.DefCollection, err = consumer.GetOne("field", field.Id, "fieldDataDefault") + field.DefCollection, err = consumer.GetOne_tx(ctx, tx, "field", field.Id, "fieldDataDefault") if err != nil { return fields, err } - field.Captions, err = caption.Get("field", field.Id, []string{"fieldTitle", "fieldHelp"}) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle", "fieldHelp"}) if err != nil { return fields, err } @@ -412,23 +471,23 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posDataRelLookup { var field = fields[pos].(types.FieldDataRelationship) - field.OpenForm, err = openForm.Get("field", field.Id) + field.OpenForm, err = openForm.Get_tx(ctx, tx, "field", field.Id, pgtype.Text{}) if err != nil { return fields, err } - field.Query, err = query.Get("field", field.Id, 0, 0) + field.Query, err = query.Get_tx(ctx, tx, "field", field.Id, 0, 0, 0) if err != nil { return fields, err } - field.Columns, err = column.Get("field", field.Id) + field.Columns, err = column.Get_tx(ctx, tx, "field", field.Id) if err != nil { return fields, err } - field.DefCollection, err = consumer.GetOne("field", field.Id, "fieldDataDefault") + field.DefCollection, err = consumer.GetOne_tx(ctx, tx, "field", field.Id, "fieldDataDefault") if err != nil { return fields, err } - field.Captions, err = caption.Get("field", field.Id, []string{"fieldTitle", "fieldHelp"}) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle", "fieldHelp"}) if err != nil { return fields, err } @@ -439,7 +498,30 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posHeaderLookup { var field = fields[pos].(types.FieldHeader) - field.Captions, err = caption.Get("field", field.Id, []string{"fieldTitle"}) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle"}) + if err != nil { + return fields, err + } + fields[pos] = field + } + + // lookup kanban fields: open form, query, columns, consumed collections + for _, pos := range posKanbanLookup { + var field = fields[pos].(types.FieldKanban) + + field.OpenForm, err = openForm.Get_tx(ctx, tx, "field", field.Id, pgtype.Text{}) + if err != nil { + return fields, err + } + field.Query, err = query.Get_tx(ctx, tx, "field", field.Id, 0, 0, 0) + if err != nil { + return fields, err + } + field.Columns, err = column.Get_tx(ctx, tx, "field", field.Id) + if err != nil { + return fields, err + } + field.Collections, err = consumer.Get_tx(ctx, tx, "field", field.Id, "fieldFilterSelector") if err != nil { return fields, err } @@ -450,19 +532,27 @@ func Get(formId uuid.UUID) ([]interface{}, error) { for _, pos := range posListLookup { var field = fields[pos].(types.FieldList) - field.OpenForm, err = openForm.Get("field", field.Id) + field.OpenForm, err = openForm.Get_tx(ctx, tx, "field", field.Id, pgtype.Text{}) + if err != nil { + return fields, err + } + field.OpenFormBulk, err = openForm.Get_tx(ctx, tx, "field", field.Id, pgtype.Text{String: "bulk", Valid: true}) if err != nil { return fields, err } - field.Query, err = query.Get("field", field.Id, 0, 0) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle"}) if err != nil { return fields, err } - field.Columns, err = column.Get("field", field.Id) + field.Query, err = query.Get_tx(ctx, tx, "field", field.Id, 0, 0, 0) if err != nil { return fields, err } - field.Collections, err = consumer.Get("field", field.Id, "fieldFilterSelector") + field.Columns, err = column.Get_tx(ctx, tx, "field", field.Id) + if err != nil { + return fields, err + } + field.Collections, err = consumer.Get_tx(ctx, tx, "field", field.Id, "fieldFilterSelector") if err != nil { return fields, err } @@ -472,14 +562,37 @@ func Get(formId uuid.UUID) ([]interface{}, error) { // lookup tabs fields: get tabs for _, pos := range posTabsLookup { var field = fields[pos].(types.FieldTabs) - field.Tabs, err = tab.Get("field", field.Id) + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle"}) + if err != nil { + return fields, err + } + field.Tabs, err = tab.Get_tx(ctx, tx, "field", field.Id) + if err != nil { + return fields, err + } + fields[pos] = field + } + + // lookup variable fields: open form, query, columns, captions + for _, pos := range posVariableLookup { + var field = fields[pos].(types.FieldVariable) + + field.Query, err = query.Get_tx(ctx, tx, "field", field.Id, 0, 0, 0) + if err != nil { + return fields, err + } + field.Columns, err = column.Get_tx(ctx, tx, "field", field.Id) + if err != nil { + return fields, err + } + field.Captions, err = caption.Get_tx(ctx, tx, "field", field.Id, []string{"fieldTitle", "fieldHelp"}) if err != nil { return fields, err } fields[pos] = field } - // get sorted keys for field positions with parent Id + // get sorted keys for field positions with parent ID orderedPos := make([]int, 0, len(posMapParentId)) for k := range posMapParentId { orderedPos = append(orderedPos, k) @@ -497,13 +610,13 @@ func Get(formId uuid.UUID) ([]interface{}, error) { } // no parent field - if !tools.IntInSlice(pos, posParentLookup) { + if !slices.Contains(posParentLookup, pos) { children = append(children, fields[pos]) continue } // tabs field - if tools.IntInSlice(pos, posTabsLookup) { + if slices.Contains(posTabsLookup, pos) { field := fields[pos].(types.FieldTabs) for i, tab := range field.Tabs { @@ -525,45 +638,45 @@ func Get(formId uuid.UUID) ([]interface{}, error) { // recursively resolve all fields with their children return getChildren(uuid.Nil, uuid.Nil), nil } -func GetCalendar(fieldId uuid.UUID) (types.FieldCalendar, error) { +func GetCalendar_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID) (types.FieldCalendar, error) { var f types.FieldCalendar f.Id = fieldId - err := db.Pool.QueryRow(db.Ctx, ` + err := tx.QueryRow(ctx, ` SELECT attribute_id_date0, attribute_id_date1, index_date0, index_date1, - date_range0, date_range1 + date_range0, date_range1, days, days_toggle FROM app.field_calendar WHERE ics AND gantt = FALSE AND field_id = $1 `, fieldId).Scan(&f.AttributeIdDate0, &f.AttributeIdDate1, &f.IndexDate0, - &f.IndexDate1, &f.DateRange0, &f.DateRange1) + &f.IndexDate1, &f.DateRange0, &f.DateRange1, &f.Days, &f.DaysToggle) if err != nil { return f, err } - f.OpenForm, err = openForm.Get("field", f.Id) + f.OpenForm, err = openForm.Get_tx(ctx, tx, "field", f.Id, pgtype.Text{}) if err != nil { return f, err } - f.Query, err = query.Get("field", f.Id, 0, 0) + f.Query, err = query.Get_tx(ctx, tx, "field", f.Id, 0, 0, 0) if err != nil { return f, err } - f.Columns, err = column.Get("field", f.Id) + f.Columns, err = column.Get_tx(ctx, tx, "field", f.Id) if err != nil { return f, err } - f.Collections, err = consumer.Get("field", f.Id, "fieldFilterSelector") + f.Collections, err = consumer.Get_tx(ctx, tx, "field", f.Id, "fieldFilterSelector") if err != nil { return f, err } return f, nil } -func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID, +func Set_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID, fields []interface{}, fieldIdMapQuery map[uuid.UUID]types.Query) error { for pos, fieldIf := range fields { @@ -577,9 +690,11 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - fieldId, err := setGeneric_tx(tx, formId, f.Id, parentId, tabId, - f.IconId, f.Content, f.State, f.OnMobile, pos) + // fix imports < 3.10: New field flags + f.Flags = compatible.FixNilFieldFlags(f.Flags) + + fieldId, err := setGeneric_tx(ctx, tx, formId, parentId, tabId, f, pos) if err != nil { return err } @@ -590,12 +705,10 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setButton_tx(tx, fieldId, f.AttributeIdRecord, - f.FormIdOpen, f.OpenForm, f.JsFunctionId); err != nil { - + if err := setButton_tx(ctx, tx, fieldId, f); err != nil { return err } - if err := caption.Set_tx(tx, fieldId, f.Captions); err != nil { + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { return err } case "calendar": @@ -603,12 +716,7 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setCalendar_tx(tx, fieldId, f.FormIdOpen, - f.AttributeIdDate0, f.AttributeIdDate1, f.AttributeIdColor, - f.AttributeIdRecord, f.IndexDate0, f.IndexDate1, f.IndexColor, - f.Gantt, f.GanttSteps, f.GanttStepsToggle, f.Ics, f.DateRange0, - f.DateRange1, f.Columns, f.Collections, f.OpenForm); err != nil { - + if err := setCalendar_tx(ctx, tx, fieldId, f); err != nil { return err } fieldIdMapQuery[fieldId] = f.Query @@ -618,7 +726,10 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setChart_tx(tx, fieldId, f.ChartOption, f.Columns); err != nil { + if err := setChart_tx(ctx, tx, fieldId, f); err != nil { + return err + } + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { return err } fieldIdMapQuery[fieldId] = f.Query @@ -628,15 +739,12 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setContainer_tx(tx, fieldId, f.Direction, f.JustifyContent, - f.AlignItems, f.AlignContent, f.Wrap, f.Grow, f.Shrink, f.Basis, - f.PerMin, f.PerMax); err != nil { - + if err := setContainer_tx(ctx, tx, fieldId, f); err != nil { return err } // update container children - if err := Set_tx(tx, formId, pgtype.UUID{Bytes: fieldId, Valid: true}, + if err := Set_tx(ctx, tx, formId, pgtype.UUID{Bytes: fieldId, Valid: true}, pgtype.UUID{}, f.Fields, fieldIdMapQuery); err != nil { return err @@ -647,13 +755,10 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setData_tx(tx, fieldId, f.AttributeId, f.AttributeIdAlt, - f.Index, f.Def, f.Display, f.Min, f.Max, f.RegexCheck, f.JsFunctionId, - f.Clipboard, f.DefCollection, f.CollectionIdDef, f.ColumnIdDef); err != nil { - + if err := setData_tx(ctx, tx, fieldId, f); err != nil { return err } - if err := caption.Set_tx(tx, fieldId, f.Captions); err != nil { + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { return err } @@ -668,11 +773,7 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setDataRelationship_tx(tx, fieldId, f.FormIdOpen, - f.AttributeIdRecord, f.AttributeIdNm, f.Columns, f.Category, - f.FilterQuick, f.OutsideIn, f.AutoSelect, f.DefPresetIds, - f.OpenForm); err != nil { - + if err := setDataRelationship_tx(ctx, tx, fieldId, f); err != nil { return err } fieldIdMapQuery[fieldId] = f.Query @@ -683,22 +784,32 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setHeader_tx(tx, fieldId, f.Size); err != nil { + if err := setHeader_tx(ctx, tx, fieldId, f); err != nil { return err } - if err := caption.Set_tx(tx, fieldId, f.Captions); err != nil { + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { return err } + case "kanban": + var f types.FieldKanban + if err := json.Unmarshal(fieldJson, &f); err != nil { + return err + } + if err := setKanban_tx(ctx, tx, fieldId, f); err != nil { + return err + } + fieldIdMapQuery[fieldId] = f.Query + case "list": var f types.FieldList if err := json.Unmarshal(fieldJson, &f); err != nil { return err } - if err := setList_tx(tx, fieldId, f.AttributeIdRecord, f.FormIdOpen, - f.AutoRenew, f.CsvExport, f.CsvImport, f.Layout, f.FilterQuick, - f.ResultLimit, f.Columns, f.Collections, f.OpenForm); err != nil { - + if err := setList_tx(ctx, tx, fieldId, f); err != nil { + return err + } + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { return err } fieldIdMapQuery[fieldId] = f.Query @@ -715,12 +826,12 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID // insert/update/delete tabs idsKeep := make([]uuid.UUID, 0) for i, t := range f.Tabs { - t.Id, err = tab.Set_tx(tx, "field", fieldId, i, t) + t.Id, err = tab.Set_tx(ctx, tx, "field", fieldId, i, t) if err != nil { return err } - if err := Set_tx(tx, formId, + if err := Set_tx(ctx, tx, formId, pgtype.UUID{Bytes: fieldId, Valid: true}, pgtype.UUID{Bytes: t.Id, Valid: true}, t.Fields, fieldIdMapQuery); err != nil { @@ -729,13 +840,29 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID } idsKeep = append(idsKeep, t.Id) } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.tab WHERE field_id = $1 AND id <> ALL($2) `, f.Id, idsKeep); err != nil { return err } + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { + return err + } + + case "variable": + var f types.FieldVariable + if err := json.Unmarshal(fieldJson, &f); err != nil { + return err + } + if err := setVariable_tx(ctx, tx, fieldId, f); err != nil { + return err + } + if err := caption.Set_tx(ctx, tx, fieldId, f.Captions); err != nil { + return err + } + fieldIdMapQuery[fieldId] = f.Query default: return errors.New("unknown field content") @@ -744,291 +871,269 @@ func Set_tx(tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, tabId pgtype.UUID return nil } -func setGeneric_tx(tx pgx.Tx, formId uuid.UUID, id uuid.UUID, - parentId pgtype.UUID, tabId pgtype.UUID, iconId pgtype.UUID, content string, - state string, onMobile bool, position int) (uuid.UUID, error) { +func setGeneric_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, parentId pgtype.UUID, + tabId pgtype.UUID, f types.Field, position int) (uuid.UUID, error) { - known, err := schema.CheckCreateId_tx(tx, &id, "field", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &f.Id, "field", "id") if err != nil { - return id, err + return f.Id, err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field SET parent_id = $1, tab_id = $2, icon_id = $3, state = $4, - on_mobile = $5, position = $6 - WHERE id = $7 - `, parentId, tabId, iconId, state, onMobile, position, id); err != nil { - return id, err + flags = $5, on_mobile = $6, position = $7 + WHERE id = $8 + `, parentId, tabId, f.IconId, f.State, f.Flags, f.OnMobile, position, f.Id); err != nil { + return f.Id, err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field (id, form_id, parent_id, tab_id, - icon_id, content, state, on_mobile, position) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9) - `, id, formId, parentId, tabId, iconId, content, state, onMobile, position); err != nil { - return id, err + icon_id, content, state, flags, on_mobile, position) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) + `, f.Id, formId, parentId, tabId, f.IconId, f.Content, f.State, f.Flags, f.OnMobile, position); err != nil { + return f.Id, err } } - return id, nil + return f.Id, nil } -func setButton_tx(tx pgx.Tx, fieldId uuid.UUID, attributeIdRecord pgtype.UUID, - formIdOpen pgtype.UUID, oForm types.OpenForm, jsFunctionId pgtype.UUID) error { +func setButton_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldButton) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_button", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_button", "field_id") if err != nil { return err } - // fix imports < 2.6: New open form entity - oForm = compatible.FixMissingOpenForm(formIdOpen, attributeIdRecord, oForm) - if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_button SET js_function_id = $1 WHERE field_id = $2 - `, jsFunctionId, fieldId); err != nil { + `, f.JsFunctionId, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_button (field_id, js_function_id) VALUES ($1,$2) - `, fieldId, jsFunctionId); err != nil { + `, fieldId, f.JsFunctionId); err != nil { return err } } // set open form - return openForm.Set_tx(tx, "field", fieldId, oForm) + return openForm.Set_tx(ctx, tx, "field", fieldId, f.OpenForm, pgtype.Text{}) } -func setCalendar_tx(tx pgx.Tx, fieldId uuid.UUID, formIdOpen pgtype.UUID, - attributeIdDate0 uuid.UUID, attributeIdDate1 uuid.UUID, - attributeIdColor pgtype.UUID, attributeIdRecord pgtype.UUID, indexDate0 int, - indexDate1 int, indexColor pgtype.Int4, gantt bool, ganttSteps pgtype.Text, - ganttStepsToggle bool, ics bool, dateRange0 int64, dateRange1 int64, - columns []types.Column, collections []types.CollectionConsumer, - oForm types.OpenForm) error { - - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_calendar", "field_id") +func setCalendar_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldCalendar) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_calendar", "field_id") if err != nil { return err } + // fix imports < 3.5: Default view + f.Days = compatible.FixCalendarDefaultView(f.Days) + if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_calendar SET attribute_id_date0 = $1, attribute_id_date1 = $2, attribute_id_color = $3, index_date0 = $4, index_date1 = $5, index_color = $6, gantt = $7, gantt_steps = $8, gantt_steps_toggle = $9, ics = $10, date_range0 = $11, - date_range1 = $12 - WHERE field_id = $13 - `, attributeIdDate0, attributeIdDate1, attributeIdColor, indexDate0, - indexDate1, indexColor, gantt, ganttSteps, ganttStepsToggle, ics, - dateRange0, dateRange1, fieldId); err != nil { + date_range1 = $12, days = $13, days_toggle = $14 + WHERE field_id = $15 + `, f.AttributeIdDate0, f.AttributeIdDate1, f.AttributeIdColor, + f.IndexDate0, f.IndexDate1, f.IndexColor, f.Gantt, f.GanttSteps, + f.GanttStepsToggle, f.Ics, f.DateRange0, f.DateRange1, f.Days, + f.DaysToggle, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_calendar ( field_id, attribute_id_date0, attribute_id_date1, attribute_id_color, index_date0, index_date1, index_color, gantt, gantt_steps, gantt_steps_toggle, ics, date_range0, - date_range1 - ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13) - `, fieldId, attributeIdDate0, attributeIdDate1, attributeIdColor, - indexDate0, indexDate1, indexColor, gantt, ganttSteps, - ganttStepsToggle, ics, dateRange0, dateRange1); err != nil { + date_range1, days, days_toggle + ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15) + `, fieldId, f.AttributeIdDate0, f.AttributeIdDate1, f.AttributeIdColor, + f.IndexDate0, f.IndexDate1, f.IndexColor, f.Gantt, f.GanttSteps, + f.GanttStepsToggle, f.Ics, f.DateRange0, f.DateRange1, f.Days, + f.DaysToggle); err != nil { return err } } - // fix imports < 2.6: New open form entity - oForm = compatible.FixMissingOpenForm(formIdOpen, attributeIdRecord, oForm) - // set open form - if err := openForm.Set_tx(tx, "field", fieldId, oForm); err != nil { + if err := openForm.Set_tx(ctx, tx, "field", fieldId, f.OpenForm, pgtype.Text{}); err != nil { return err } // set collection consumer - if err := consumer.Set_tx(tx, "field", fieldId, "fieldFilterSelector", collections); err != nil { + if err := consumer.Set_tx(ctx, tx, "field", fieldId, "fieldFilterSelector", f.Collections); err != nil { return err } // set columns - return column.Set_tx(tx, "field", fieldId, columns) + return column.Set_tx(ctx, tx, "field", fieldId, f.Columns) } -func setChart_tx(tx pgx.Tx, fieldId uuid.UUID, chartOption string, columns []types.Column) error { +func setChart_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldChart) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_chart", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_chart", "field_id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_chart SET chart_option = $1 WHERE field_id = $2 - `, chartOption, fieldId); err != nil { + `, f.ChartOption, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_chart (field_id, chart_option) VALUES ($1,$2) - `, fieldId, chartOption); err != nil { + `, fieldId, f.ChartOption); err != nil { return err } } - return column.Set_tx(tx, "field", fieldId, columns) + return column.Set_tx(ctx, tx, "field", fieldId, f.Columns) } -func setContainer_tx(tx pgx.Tx, fieldId uuid.UUID, direction string, - justifyContent string, alignItems string, alignContent string, wrap bool, - grow int, shrink int, basis int, perMin int, perMax int) error { +func setContainer_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldContainer) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_container", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_container", "field_id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_container SET direction = $1, justify_content = $2, align_items = $3, align_content = $4, wrap = $5, grow = $6, shrink = $7, basis = $8, per_min = $9, per_max = $10 WHERE field_id = $11 - `, direction, justifyContent, alignItems, alignContent, wrap, grow, shrink, - basis, perMin, perMax, fieldId); err != nil { + `, f.Direction, f.JustifyContent, f.AlignItems, f.AlignContent, f.Wrap, f.Grow, f.Shrink, + f.Basis, f.PerMin, f.PerMax, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_container ( field_id, direction, justify_content, align_items, align_content, wrap, grow, shrink, basis, per_min, per_max ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) - `, fieldId, direction, justifyContent, alignItems, alignContent, wrap, - grow, shrink, basis, perMin, perMax); err != nil { + `, fieldId, f.Direction, f.JustifyContent, f.AlignItems, f.AlignContent, f.Wrap, + f.Grow, f.Shrink, f.Basis, f.PerMin, f.PerMax); err != nil { return err } } return nil } -func setData_tx(tx pgx.Tx, fieldId uuid.UUID, attributeId uuid.UUID, - attributeIdAlt pgtype.UUID, index int, def string, display string, - min pgtype.Int4, max pgtype.Int4, regexCheck pgtype.Text, - jsFunctionId pgtype.UUID, clipboard bool, defCollection types.CollectionConsumer, - collectionIdDef pgtype.UUID, columnIdDef pgtype.UUID) error { +func setData_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldData) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_data", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_data", "field_id") if err != nil { return err } // fix imports < 3.0: Migrate legacy definitions - if collectionIdDef.Valid { - defCollection.CollectionId = collectionIdDef.Bytes - defCollection.ColumnIdDisplay = columnIdDef - defCollection.MultiValue = false + if f.CollectionIdDef.Valid { + f.DefCollection.CollectionId = f.CollectionIdDef.Bytes + f.DefCollection.ColumnIdDisplay = f.ColumnIdDef + f.DefCollection.Flags = make([]string, 0) } // fix imports < 3.3: Migrate display option to attribute content use - display, err = compatible.MigrateDisplayToContentUse_tx(tx, attributeId, display) + f.Display, err = compatible.MigrateDisplayToContentUse_tx(ctx, tx, f.AttributeId, f.Display) if err != nil { return err } - if attributeIdAlt.Valid { - _, err = compatible.MigrateDisplayToContentUse_tx(tx, attributeIdAlt.Bytes, display) + if f.AttributeIdAlt.Valid { + _, err = compatible.MigrateDisplayToContentUse_tx(ctx, tx, f.AttributeIdAlt.Bytes, f.Display) if err != nil { return err } } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_data SET attribute_id = $1, attribute_id_alt = $2, index = $3, def = $4, display = $5,min = $6, max = $7, regex_check = $8, js_function_id = $9, clipboard = $10 WHERE field_id = $11 - `, attributeId, attributeIdAlt, index, def, display, min, max, - regexCheck, jsFunctionId, clipboard, fieldId); err != nil { + `, f.AttributeId, f.AttributeIdAlt, f.Index, f.Def, f.Display, f.Min, f.Max, + f.RegexCheck, f.JsFunctionId, f.Clipboard, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_data ( field_id, attribute_id, attribute_id_alt, index, def, display, min, max, regex_check, js_function_id, clipboard ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) - `, fieldId, attributeId, attributeIdAlt, index, def, - display, min, max, regexCheck, jsFunctionId, clipboard); err != nil { + `, fieldId, f.AttributeId, f.AttributeIdAlt, f.Index, f.Def, + f.Display, f.Min, f.Max, f.RegexCheck, f.JsFunctionId, f.Clipboard); err != nil { return err } } // set collection consumer - return consumer.Set_tx(tx, "field", fieldId, "fieldDataDefault", - []types.CollectionConsumer{defCollection}) + return consumer.Set_tx(ctx, tx, "field", fieldId, "fieldDataDefault", + []types.CollectionConsumer{f.DefCollection}) } -func setDataRelationship_tx(tx pgx.Tx, fieldId uuid.UUID, formIdOpen pgtype.UUID, - attributeIdRecord pgtype.UUID, attributeIdNm pgtype.UUID, - columns []types.Column, category bool, filterQuick bool, outsideIn bool, - autoSelect int, defPresetIds []uuid.UUID, oForm types.OpenForm) error { +func setDataRelationship_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldDataRelationship) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_data_relationship", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_data_relationship", "field_id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_data_relationship SET attribute_id_nm = $1, category = $2, filter_quick = $3, outside_in = $4, auto_select = $5 WHERE field_id = $6 - `, attributeIdNm, category, filterQuick, - outsideIn, autoSelect, fieldId); err != nil { - + `, f.AttributeIdNm, f.Category, f.FilterQuick, f.OutsideIn, f.AutoSelect, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_data_relationship ( field_id, attribute_id_nm, category, filter_quick, outside_in, auto_select ) VALUES ($1,$2,$3,$4,$5,$6) - `, fieldId, attributeIdNm, category, filterQuick, - outsideIn, autoSelect); err != nil { - + `, fieldId, f.AttributeIdNm, f.Category, f.FilterQuick, f.OutsideIn, f.AutoSelect); err != nil { return err } } // set default preset IDs - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.field_data_relationship_preset WHERE field_id = $1 `, fieldId); err != nil { return err } - for _, presetId := range defPresetIds { - if _, err := tx.Exec(db.Ctx, ` + for _, presetId := range f.DefPresetIds { + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_data_relationship_preset (field_id, preset_id) VALUES ($1,$2) `, fieldId, presetId); err != nil { @@ -1036,87 +1141,157 @@ func setDataRelationship_tx(tx pgx.Tx, fieldId uuid.UUID, formIdOpen pgtype.UUID } } - // fix imports < 2.6: New open form entity - oForm = compatible.FixMissingOpenForm(formIdOpen, attributeIdRecord, oForm) - // set open form - if err := openForm.Set_tx(tx, "field", fieldId, oForm); err != nil { + if err := openForm.Set_tx(ctx, tx, "field", fieldId, f.OpenForm, pgtype.Text{}); err != nil { return err } - return column.Set_tx(tx, "field", fieldId, columns) + return column.Set_tx(ctx, tx, "field", fieldId, f.Columns) } -func setHeader_tx(tx pgx.Tx, fieldId uuid.UUID, size int) error { +func setHeader_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldHeader) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_header", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_header", "field_id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.field_header - SET size = $1 - WHERE field_id = $2 - `, size, fieldId); err != nil { + SET richtext = $1, size = $2 + WHERE field_id = $3 + `, f.Richtext, f.Size, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.field_header (field_id, size) - VALUES ($1,$2) - `, fieldId, size); err != nil { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.field_header (field_id, richtext, size) + VALUES ($1,$2,$3) + `, fieldId, f.Richtext, f.Size); err != nil { return err } } return nil } -func setList_tx(tx pgx.Tx, fieldId uuid.UUID, attributeIdRecord pgtype.UUID, - formIdOpen pgtype.UUID, autoRenew pgtype.Int4, csvExport bool, csvImport bool, - layout string, filterQuick bool, resultLimit int, columns []types.Column, - collections []types.CollectionConsumer, oForm types.OpenForm) error { +func setKanban_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldKanban) error { - known, err := schema.CheckCreateId_tx(tx, &fieldId, "field_list", "field_id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_kanban", "field_id") if err != nil { return err } + if f.RelationIndexData == f.RelationIndexAxisX { + return errors.New("a separate relation must be chosen for Kanban columns") + } + if f.RelationIndexAxisY.Valid && int(f.RelationIndexAxisY.Int16) == f.RelationIndexAxisX { + return errors.New("relations for Kanban columns & rows must be different") + } + if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` + UPDATE app.field_kanban + SET relation_index_data = $1, relation_index_axis_x = $2, + relation_index_axis_y = $3, attribute_id_sort = $4 + WHERE field_id = $5 + `, f.RelationIndexData, f.RelationIndexAxisX, f.RelationIndexAxisY, + f.AttributeIdSort, fieldId); err != nil { + + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.field_kanban ( + field_id, relation_index_data, relation_index_axis_x, + relation_index_axis_y, attribute_id_sort + ) + VALUES ($1,$2,$3,$4,$5) + `, fieldId, f.RelationIndexData, f.RelationIndexAxisX, + f.RelationIndexAxisY, f.AttributeIdSort); err != nil { + + return err + } + } + + // set open form + if err := openForm.Set_tx(ctx, tx, "field", fieldId, f.OpenForm, pgtype.Text{}); err != nil { + return err + } + + // set collection consumer + if err := consumer.Set_tx(ctx, tx, "field", fieldId, "fieldFilterSelector", f.Collections); err != nil { + return err + } + + // set columns + return column.Set_tx(ctx, tx, "field", fieldId, f.Columns) +} +func setList_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldList) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_list", "field_id") + if err != nil { + return err + } + + if known { + if _, err := tx.Exec(ctx, ` UPDATE app.field_list SET auto_renew = $1, csv_export = $2, csv_import = $3, layout = $4, filter_quick = $5, result_limit = $6 WHERE field_id = $7 - `, autoRenew, csvExport, csvImport, layout, - filterQuick, resultLimit, fieldId); err != nil { - + `, f.AutoRenew, f.CsvExport, f.CsvImport, f.Layout, f.FilterQuick, f.ResultLimit, fieldId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.field_list ( field_id, auto_renew, csv_export, csv_import, layout, filter_quick, result_limit ) VALUES ($1,$2,$3,$4,$5,$6,$7) - `, fieldId, autoRenew, csvExport, csvImport, - layout, filterQuick, resultLimit); err != nil { - + `, fieldId, f.AutoRenew, f.CsvExport, f.CsvImport, f.Layout, f.FilterQuick, f.ResultLimit); err != nil { return err } } - // fix imports < 2.6: New open form entity - oForm = compatible.FixMissingOpenForm(formIdOpen, attributeIdRecord, oForm) - // set open form - if err := openForm.Set_tx(tx, "field", fieldId, oForm); err != nil { + // set open forms + if err := openForm.Set_tx(ctx, tx, "field", fieldId, f.OpenForm, pgtype.Text{}); err != nil { + return err + } + if err := openForm.Set_tx(ctx, tx, "field", fieldId, f.OpenFormBulk, pgtype.Text{String: "bulk", Valid: true}); err != nil { return err } // set collection consumer - if err := consumer.Set_tx(tx, "field", fieldId, "fieldFilterSelector", collections); err != nil { + if err := consumer.Set_tx(ctx, tx, "field", fieldId, "fieldFilterSelector", f.Collections); err != nil { + return err + } + + // set columns + return column.Set_tx(ctx, tx, "field", fieldId, f.Columns) +} +func setVariable_tx(ctx context.Context, tx pgx.Tx, fieldId uuid.UUID, f types.FieldVariable) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &fieldId, "field_variable", "field_id") + if err != nil { return err } + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.field_variable + SET variable_id = $1, js_function_id = $2, clipboard = $3 + WHERE field_id = $4 + `, f.VariableId, f.JsFunctionId, f.Clipboard, fieldId); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.field_variable (field_id, variable_id, js_function_id, clipboard) + VALUES ($1,$2,$3,$4) + `, fieldId, f.VariableId, f.JsFunctionId, f.Clipboard); err != nil { + return err + } + } + // set columns - return column.Set_tx(tx, "field", fieldId, columns) + return column.Set_tx(ctx, tx, "field", fieldId, f.Columns) } diff --git a/schema/form/form.go b/schema/form/form.go index e5c7d98f..349b5d78 100644 --- a/schema/form/form.go +++ b/schema/form/form.go @@ -1,14 +1,14 @@ package form import ( + "context" "encoding/json" "errors" "fmt" - "r3/compatible" - "r3/db" "r3/schema" "r3/schema/article" "r3/schema/caption" + "r3/schema/compatible" "r3/schema/field" "r3/schema/query" "r3/types" @@ -19,9 +19,9 @@ import ( "github.com/jackc/pgx/v5/pgtype" ) -func Copy_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, newName string) error { +func Copy_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, newName string) error { - forms, err := Get(uuid.Nil, []uuid.UUID{id}) + forms, err := Get_tx(ctx, tx, uuid.Nil, []uuid.UUID{id}) if err != nil { return err } @@ -30,6 +30,8 @@ func Copy_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, newName string) error return errors.New("form copy target does not exist") } form := forms[0] + form.Name = newName + form.ModuleId = moduleId // replace IDs with new ones // keep association between old (replaced) and new ID @@ -45,9 +47,13 @@ func Copy_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, newName string) error return err } - // remove form functions (cannot be copied without recreating all functions) + // remove form actions & functions (cannot be copied without recreating referenced functions) + form.Actions = make([]types.FormAction, 0) form.Functions = make([]types.FormFunction, 0) + // remove field focus (copy not supported) + form.FieldIdFocus = pgtype.UUID{} + // replace IDs from fields as well as their (sub)queries, columns, etc. // run twice: once for all field IDs and again to update dependent field sub entities // example: filters from columns (sub queries) or other fields (list queries) can reference field IDs @@ -58,7 +64,7 @@ func Copy_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, newName string) error // replace IDs inside fields // first run: field IDs // second run: IDs for (sub)queries, columns, tabs - fieldIf, err = replaceFieldIds(fieldIf, idMapReplaced, runs == 0) + fieldIf, err = replaceFieldIds(ctx, tx, fieldIf, idMapReplaced, runs == 0) if err != nil { return err } @@ -114,17 +120,31 @@ func Copy_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, newName string) error } } } - return Set_tx(tx, moduleId, form.Id, form.PresetIdOpen, form.IconId, newName, - form.NoDataActions, form.Query, form.Fields, form.Functions, form.States, - form.ArticleIdsHelp, form.Captions) + + // replace state IDs in condition filters + for i, state := range form.States { + for j, c := range state.Conditions { + if c.Side0.FormStateId.Valid { + if id, exists := idMapReplaced[c.Side0.FormStateId.Bytes]; exists { + form.States[i].Conditions[j].Side0.FormStateId.Bytes = id + } + } + if c.Side1.FormStateId.Valid { + if id, exists := idMapReplaced[c.Side1.FormStateId.Bytes]; exists { + form.States[i].Conditions[j].Side1.FormStateId.Bytes = id + } + } + } + } + return Set_tx(ctx, tx, form) } -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, "DELETE FROM app.form WHERE id = $1", id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, "DELETE FROM app.form WHERE id = $1", id) return err } -func Get(moduleId uuid.UUID, ids []uuid.UUID) ([]types.Form, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, ids []uuid.UUID) ([]types.Form, error) { forms := make([]types.Form, 0) sqlWheres := []string{} @@ -142,8 +162,8 @@ func Get(moduleId uuid.UUID, ids []uuid.UUID) ([]types.Form, error) { sqlValues = append(sqlValues, ids) } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` - SELECT id, preset_id_open, icon_id, name, no_data_actions, ARRAY( + rows, err := tx.Query(ctx, fmt.Sprintf(` + SELECT id, preset_id_open, icon_id, field_id_focus, name, no_data_actions, ARRAY( SELECT article_id FROM app.article_form WHERE form_id = f.id @@ -161,8 +181,8 @@ func Get(moduleId uuid.UUID, ids []uuid.UUID) ([]types.Form, error) { for rows.Next() { var f types.Form - if err := rows.Scan(&f.Id, &f.PresetIdOpen, &f.IconId, &f.Name, - &f.NoDataActions, &f.ArticleIdsHelp); err != nil { + if err := rows.Scan(&f.Id, &f.PresetIdOpen, &f.IconId, &f.FieldIdFocus, + &f.Name, &f.NoDataActions, &f.ArticleIdsHelp); err != nil { return forms, err } @@ -173,23 +193,27 @@ func Get(moduleId uuid.UUID, ids []uuid.UUID) ([]types.Form, error) { // collect form query, fields, functions, states and captions for i, form := range forms { - form.Query, err = query.Get("form", form.Id, 0, 0) + form.Query, err = query.Get_tx(ctx, tx, "form", form.Id, 0, 0, 0) if err != nil { return forms, err } - form.Fields, err = field.Get(form.Id) + form.Fields, err = field.Get_tx(ctx, tx, form.Id) if err != nil { return forms, err } - form.Functions, err = getFunctions(form.Id) + form.Actions, err = getActions_tx(ctx, tx, form.Id) if err != nil { return forms, err } - form.States, err = getStates(form.Id) + form.Functions, err = getFunctions_tx(ctx, tx, form.Id) if err != nil { return forms, err } - form.Captions, err = caption.Get("form", form.Id, []string{"formTitle"}) + form.States, err = getStates_tx(ctx, tx, form.Id) + if err != nil { + return forms, err + } + form.Captions, err = caption.Get_tx(ctx, tx, "form", form.Id, []string{"formTitle"}) if err != nil { return forms, err } @@ -198,44 +222,48 @@ func Get(moduleId uuid.UUID, ids []uuid.UUID) ([]types.Form, error) { return forms, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, presetIdOpen pgtype.UUID, - iconId pgtype.UUID, name string, noDataActions bool, queryIn types.Query, - fields []interface{}, functions []types.FormFunction, states []types.FormState, - articleIdsHelp []uuid.UUID, captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, frm types.Form) error { + + // remove only invalid character (dot), used for form function references + frm.Name = strings.Replace(frm.Name, ".", "", -1) - known, err := schema.CheckCreateId_tx(tx, &id, "form", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &frm.Id, "form", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.form - SET preset_id_open = $1, icon_id = $2, name = $3, no_data_actions = $4 - WHERE id = $5 - `, presetIdOpen, iconId, name, noDataActions, id); err != nil { + SET preset_id_open = $1, icon_id = $2, field_id_focus = $3, + name = $4, no_data_actions = $5 + WHERE id = $6 + `, frm.PresetIdOpen, frm.IconId, frm.FieldIdFocus, + frm.Name, frm.NoDataActions, frm.Id); err != nil { + return err } } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.form ( - id, module_id, preset_id_open, icon_id, name, no_data_actions - ) - VALUES ($1,$2,$3,$4,$5,$6) - `, id, moduleId, presetIdOpen, iconId, name, noDataActions); err != nil { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.form (id, module_id, preset_id_open, icon_id, + field_id_focus, name, no_data_actions) + VALUES ($1,$2,$3,$4,$5,$6,$7) + `, frm.Id, frm.ModuleId, frm.PresetIdOpen, frm.IconId, + frm.FieldIdFocus, frm.Name, frm.NoDataActions); err != nil { + return err } } // set form query - if err := query.Set_tx(tx, "form", id, 0, 0, queryIn); err != nil { + if err := query.Set_tx(ctx, tx, "form", frm.Id, 0, 0, 0, frm.Query); err != nil { return err } // set fields (recursive) fieldIdMapQuery := make(map[uuid.UUID]types.Query) - if err := field.Set_tx(tx, id, pgtype.UUID{}, pgtype.UUID{}, - fields, fieldIdMapQuery); err != nil { + if err := field.Set_tx(ctx, tx, frm.Id, pgtype.UUID{}, pgtype.UUID{}, + frm.Fields, fieldIdMapQuery); err != nil { return err } @@ -243,37 +271,35 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, presetIdOpen pgtype.UUI // set field queries after fields themselves // query filters can reference fields so they must all exist for fieldId, queryIn := range fieldIdMapQuery { - if err := query.Set_tx(tx, "field", fieldId, 0, 0, queryIn); err != nil { + if err := query.Set_tx(ctx, tx, "field", fieldId, 0, 0, 0, queryIn); err != nil { return err } } - // set form functions - if err := setFunctions_tx(tx, id, functions); err != nil { + if err := setActions_tx(ctx, tx, frm.Id, frm.Actions); err != nil { return err } - - // set form states - if err := setStates_tx(tx, id, states); err != nil { + if err := setFunctions_tx(ctx, tx, frm.Id, frm.Functions); err != nil { return err } - - // set help articles - if err := article.Assign_tx(tx, "form", id, articleIdsHelp); err != nil { + if err := setStates_tx(ctx, tx, frm.Id, frm.States); err != nil { + return err + } + if err := article.Assign_tx(ctx, tx, "form", frm.Id, frm.ArticleIdsHelp); err != nil { return err } - - // set form captions // fix imports < 3.2: Migration from help captions to help articles - captions, err = compatible.FixCaptions_tx(tx, "form", id, captions) + frm.Captions, err = compatible.FixCaptions_tx(ctx, tx, "form", frm.Id, frm.Captions) if err != nil { return err } - return caption.Set_tx(tx, id, captions) + return caption.Set_tx(ctx, tx, frm.Id, frm.Captions) } // form duplication -func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, setFieldIds bool) (interface{}, error) { +func replaceFieldIds(ctx context.Context, tx pgx.Tx, fieldIf interface{}, + idMapReplaced map[uuid.UUID]uuid.UUID, setFieldIds bool) (interface{}, error) { + var err error // replace form ID to open if it was replaced (field opening its own form) @@ -305,6 +331,17 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } else { field.OpenForm = replaceOpenForm(field.OpenForm) } + + // remove references to form bound entities that do not exist after form copy + if field.JsFunctionId.Valid { + isBound, err := schema.GetIsFormBound_tx(ctx, tx, "js_function", field.JsFunctionId.Bytes) + if err != nil { + return nil, err + } + if isBound { + field.JsFunctionId = pgtype.UUID{} + } + } fieldIf = field case types.FieldCalendar: @@ -355,7 +392,7 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } } for i, _ := range field.Fields { - field.Fields[i], err = replaceFieldIds(field.Fields[i], idMapReplaced, setFieldIds) + field.Fields[i], err = replaceFieldIds(ctx, tx, field.Fields[i], idMapReplaced, setFieldIds) if err != nil { return nil, err } @@ -371,6 +408,17 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } else { field.DefCollection = replaceCollectionConsumer(field.DefCollection) } + + // remove references to form bound entities that do not exist after form copy + if field.JsFunctionId.Valid { + isBound, err := schema.GetIsFormBound_tx(ctx, tx, "js_function", field.JsFunctionId.Bytes) + if err != nil { + return nil, err + } + if isBound { + field.JsFunctionId = pgtype.UUID{} + } + } fieldIf = field case types.FieldDataRelationship: @@ -391,6 +439,17 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } field.DefCollection = replaceCollectionConsumer(field.DefCollection) } + + // remove references to form bound entities that do not exist after form copy + if field.JsFunctionId.Valid { + isBound, err := schema.GetIsFormBound_tx(ctx, tx, "js_function", field.JsFunctionId.Bytes) + if err != nil { + return nil, err + } + if isBound { + field.JsFunctionId = pgtype.UUID{} + } + } fieldIf = field case types.FieldHeader: @@ -402,6 +461,28 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } fieldIf = field + case types.FieldKanban: + if setFieldIds { + field.Id, err = schema.ReplaceUuid(field.Id, idMapReplaced) + if err != nil { + return nil, err + } + } else { + field.OpenForm = replaceOpenForm(field.OpenForm) + field.Columns, err = schema.ReplaceColumnIds(field.Columns, idMapReplaced) + if err != nil { + return nil, err + } + field.Query, err = schema.ReplaceQueryIds(field.Query, idMapReplaced) + if err != nil { + return nil, err + } + for i, _ := range field.Collections { + field.Collections[i] = replaceCollectionConsumer(field.Collections[i]) + } + } + fieldIf = field + case types.FieldList: if setFieldIds { field.Id, err = schema.ReplaceUuid(field.Id, idMapReplaced) @@ -410,6 +491,7 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } } else { field.OpenForm = replaceOpenForm(field.OpenForm) + field.OpenFormBulk = replaceOpenForm(field.OpenFormBulk) field.Columns, err = schema.ReplaceColumnIds(field.Columns, idMapReplaced) if err != nil { return nil, err @@ -441,7 +523,7 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } for i, tab := range field.Tabs { for fi, _ := range tab.Fields { - tab.Fields[fi], err = replaceFieldIds(tab.Fields[fi], idMapReplaced, setFieldIds) + tab.Fields[fi], err = replaceFieldIds(ctx, tx, tab.Fields[fi], idMapReplaced, setFieldIds) if err != nil { return nil, err } @@ -450,8 +532,46 @@ func replaceFieldIds(fieldIf interface{}, idMapReplaced map[uuid.UUID]uuid.UUID, } fieldIf = field + case types.FieldVariable: + if setFieldIds { + field.Id, err = schema.ReplaceUuid(field.Id, idMapReplaced) + if err != nil { + return nil, err + } + } else { + field.Columns, err = schema.ReplaceColumnIds(field.Columns, idMapReplaced) + if err != nil { + return nil, err + } + field.Query, err = schema.ReplaceQueryIds(field.Query, idMapReplaced) + if err != nil { + return nil, err + } + } + + // remove references to form bound entities that do not exist after form copy + if field.JsFunctionId.Valid { + isBound, err := schema.GetIsFormBound_tx(ctx, tx, "js_function", field.JsFunctionId.Bytes) + if err != nil { + return nil, err + } + if isBound { + field.JsFunctionId = pgtype.UUID{} + } + } + if field.VariableId.Valid { + isBound, err := schema.GetIsFormBound_tx(ctx, tx, "variable", field.VariableId.Bytes) + if err != nil { + return nil, err + } + if isBound { + field.VariableId = pgtype.UUID{} + } + } + fieldIf = field + default: - return nil, fmt.Errorf("unknown field type, interface: '%T'", fieldIf) + return nil, fmt.Errorf("unknown field type '%T'", fieldIf) } return fieldIf, nil } diff --git a/schema/form/formAction.go b/schema/form/formAction.go new file mode 100644 index 00000000..c5f54571 --- /dev/null +++ b/schema/form/formAction.go @@ -0,0 +1,93 @@ +package form + +import ( + "context" + "r3/schema" + "r3/schema/caption" + "r3/types" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" +) + +func getActions_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID) ([]types.FormAction, error) { + actions := make([]types.FormAction, 0) + + rows, err := tx.Query(ctx, ` + SELECT id, js_function_id, icon_id, state, color + FROM app.form_action + WHERE form_id = $1 + ORDER BY position ASC + `, formId) + if err != nil { + return actions, err + } + defer rows.Close() + + for rows.Next() { + var a types.FormAction + if err := rows.Scan(&a.Id, &a.JsFunctionId, &a.IconId, &a.State, &a.Color); err != nil { + return actions, err + } + actions = append(actions, a) + } + + for i, a := range actions { + actions[i].Captions, err = caption.Get_tx(ctx, tx, "form_action", a.Id, []string{"formActionTitle"}) + if err != nil { + return actions, err + } + } + return actions, nil +} + +func setActions_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, actions []types.FormAction) error { + var err error + actionIds := make([]uuid.UUID, 0) + + for i, a := range actions { + a.Id, err = setAction_tx(ctx, tx, formId, a, i) + if err != nil { + return err + } + actionIds = append(actionIds, a.Id) + } + + // remove non-specified actions + _, err = tx.Exec(ctx, ` + DELETE FROM app.form_action + WHERE form_id = $1 + AND id <> ALL($2) + `, formId, actionIds) + + return err +} + +func setAction_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, a types.FormAction, position int) (uuid.UUID, error) { + + known, err := schema.CheckCreateId_tx(ctx, tx, &a.Id, "form_action", "id") + if err != nil { + return a.Id, err + } + + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.form_action + SET js_function_id = $1, icon_id = $2, position = $3, state = $4, color = $5 + WHERE id = $6 + `, a.JsFunctionId, a.IconId, position, a.State, a.Color, a.Id); err != nil { + return a.Id, err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.form_action (id, form_id, js_function_id, icon_id, position, state, color) + VALUES ($1,$2,$3,$4,$5,$6,$7) + `, a.Id, formId, a.JsFunctionId, a.IconId, position, a.State, a.Color); err != nil { + return a.Id, err + } + } + if err := caption.Set_tx(ctx, tx, a.Id, a.Captions); err != nil { + return a.Id, err + } + return a.Id, nil +} diff --git a/schema/form/formFunction.go b/schema/form/formFunction.go index 8da3d29d..09d52eb0 100644 --- a/schema/form/formFunction.go +++ b/schema/form/formFunction.go @@ -1,17 +1,17 @@ package form import ( - "r3/db" + "context" "r3/types" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func getFunctions(formId uuid.UUID) ([]types.FormFunction, error) { +func getFunctions_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID) ([]types.FormFunction, error) { fncs := make([]types.FormFunction, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT js_function_id, event, event_before FROM app.form_function WHERE form_id = $1 @@ -32,9 +32,9 @@ func getFunctions(formId uuid.UUID) ([]types.FormFunction, error) { return fncs, nil } -func setFunctions_tx(tx pgx.Tx, formId uuid.UUID, fncs []types.FormFunction) error { +func setFunctions_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, fncs []types.FormFunction) error { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.form_function WHERE form_id = $1 `, formId); err != nil { @@ -42,7 +42,7 @@ func setFunctions_tx(tx pgx.Tx, formId uuid.UUID, fncs []types.FormFunction) err } for i, f := range fncs { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.form_function ( form_id, position, js_function_id, event, event_before ) diff --git a/schema/form/formState.go b/schema/form/formState.go index f9212572..ec9fdd8a 100644 --- a/schema/form/formState.go +++ b/schema/form/formState.go @@ -1,8 +1,7 @@ package form import ( - "r3/compatible" - "r3/db" + "context" "r3/schema" "r3/types" @@ -10,11 +9,10 @@ import ( "github.com/jackc/pgx/v5" ) -func getStates(formId uuid.UUID) ([]types.FormState, error) { - +func getStates_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID) ([]types.FormState, error) { states := make([]types.FormState, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, description FROM app.form_state WHERE form_id = $1 @@ -25,25 +23,22 @@ func getStates(formId uuid.UUID) ([]types.FormState, error) { if err != nil { return states, err } + defer rows.Close() for rows.Next() { var s types.FormState - if err := rows.Scan(&s.Id, &s.Description); err != nil { return states, err } states = append(states, s) } - rows.Close() for i, _ := range states { - - states[i].Conditions, err = getStateConditions(states[i].Id) + states[i].Conditions, err = getStateConditions_tx(ctx, tx, states[i].Id) if err != nil { return states, nil } - - states[i].Effects, err = getStateEffects(states[i].Id) + states[i].Effects, err = getStateEffects_tx(ctx, tx, states[i].Id) if err != nil { return states, nil } @@ -51,10 +46,10 @@ func getStates(formId uuid.UUID) ([]types.FormState, error) { return states, nil } -func getStateConditions(formStateId uuid.UUID) ([]types.FormStateCondition, error) { +func getStateConditions_tx(ctx context.Context, tx pgx.Tx, formStateId uuid.UUID) ([]types.FormStateCondition, error) { conditions := make([]types.FormStateCondition, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT position, connector, operator FROM app.form_state_condition WHERE form_state_id = $1 @@ -63,6 +58,7 @@ func getStateConditions(formStateId uuid.UUID) ([]types.FormStateCondition, erro if err != nil { return conditions, err } + defer rows.Close() for rows.Next() { var c types.FormStateCondition @@ -71,14 +67,13 @@ func getStateConditions(formStateId uuid.UUID) ([]types.FormStateCondition, erro } conditions = append(conditions, c) } - rows.Close() for i, c := range conditions { - c.Side0, err = getStateConditionSide(formStateId, c.Position, 0) + c.Side0, err = getStateConditionSide_tx(ctx, tx, formStateId, c.Position, 0) if err != nil { return conditions, err } - c.Side1, err = getStateConditionSide(formStateId, c.Position, 1) + c.Side1, err = getStateConditionSide_tx(ctx, tx, formStateId, c.Position, 1) if err != nil { return conditions, err } @@ -87,29 +82,27 @@ func getStateConditions(formStateId uuid.UUID) ([]types.FormStateCondition, erro return conditions, nil } -func getStateConditionSide(formStateId uuid.UUID, position int, side int) (types.FormStateConditionSide, error) { +func getStateConditionSide_tx(ctx context.Context, tx pgx.Tx, formStateId uuid.UUID, position int, side int) (types.FormStateConditionSide, error) { var s types.FormStateConditionSide - err := db.Pool.QueryRow(db.Ctx, ` - SELECT collection_id, column_id, field_id, preset_id, - role_id, brackets, content, value + err := tx.QueryRow(ctx, ` + SELECT collection_id, column_id, field_id, form_state_id_result, + preset_id, role_id, variable_id, brackets, content, value FROM app.form_state_condition_side WHERE form_state_id = $1 AND form_state_condition_position = $2 AND side = $3 - `, formStateId, position, side).Scan(&s.CollectionId, &s.ColumnId, - &s.FieldId, &s.PresetId, &s.RoleId, &s.Brackets, &s.Content, - &s.Value) + `, formStateId, position, side).Scan(&s.CollectionId, &s.ColumnId, &s.FieldId, &s.FormStateId, + &s.PresetId, &s.RoleId, &s.VariableId, &s.Brackets, &s.Content, &s.Value) return s, err } -func getStateEffects(formStateId uuid.UUID) ([]types.FormStateEffect, error) { - +func getStateEffects_tx(ctx context.Context, tx pgx.Tx, formStateId uuid.UUID) ([]types.FormStateEffect, error) { effects := make([]types.FormStateEffect, 0) - rows, err := db.Pool.Query(db.Ctx, ` - SELECT field_id, tab_id, new_state + rows, err := tx.Query(ctx, ` + SELECT field_id, form_action_id, tab_id, new_data, new_state FROM app.form_state_effect WHERE form_state_id = $1 ORDER BY field_id ASC, tab_id ASC @@ -121,7 +114,7 @@ func getStateEffects(formStateId uuid.UUID) ([]types.FormStateEffect, error) { for rows.Next() { var e types.FormStateEffect - if err := rows.Scan(&e.FieldId, &e.TabId, &e.NewState); err != nil { + if err := rows.Scan(&e.FieldId, &e.FormActionId, &e.TabId, &e.NewData, &e.NewState); err != nil { return effects, err } effects = append(effects, e) @@ -130,14 +123,13 @@ func getStateEffects(formStateId uuid.UUID) ([]types.FormStateEffect, error) { } // set given form states, deletes non-specified states -func setStates_tx(tx pgx.Tx, formId uuid.UUID, states []types.FormState) error { +func setStates_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, states []types.FormState) error { var err error stateIds := make([]uuid.UUID, 0) for _, s := range states { - - s.Id, err = setState_tx(tx, formId, s) + s.Id, err = setState_tx(ctx, tx, formId, s) if err != nil { return err } @@ -145,7 +137,7 @@ func setStates_tx(tx pgx.Tx, formId uuid.UUID, states []types.FormState) error { } // remove non-specified states - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.form_state WHERE form_id = $1 AND id <> ALL($2) @@ -156,22 +148,22 @@ func setStates_tx(tx pgx.Tx, formId uuid.UUID, states []types.FormState) error { } // sets new/existing form state, returns form state ID -func setState_tx(tx pgx.Tx, formId uuid.UUID, state types.FormState) (uuid.UUID, error) { +func setState_tx(ctx context.Context, tx pgx.Tx, formId uuid.UUID, state types.FormState) (uuid.UUID, error) { - known, err := schema.CheckCreateId_tx(tx, &state.Id, "form_state", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &state.Id, "form_state", "id") if err != nil { return state.Id, err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.form_state SET description = $1 WHERE id = $2 `, state.Description, state.Id); err != nil { return state.Id, err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.form_state (id, form_id, description) VALUES ($1,$2,$3) `, state.Id, formId, state.Description); err != nil { @@ -180,7 +172,7 @@ func setState_tx(tx pgx.Tx, formId uuid.UUID, state types.FormState) (uuid.UUID, } // reset conditions - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.form_state_condition WHERE form_state_id = $1 `, state.Id); err != nil { @@ -188,11 +180,7 @@ func setState_tx(tx pgx.Tx, formId uuid.UUID, state types.FormState) (uuid.UUID, } for i, c := range state.Conditions { - - // fix legacy conditions format < 2.7 - c = compatible.MigrateNewConditions(c) - - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.form_state_condition ( form_state_id, position, connector, operator ) @@ -200,16 +188,16 @@ func setState_tx(tx pgx.Tx, formId uuid.UUID, state types.FormState) (uuid.UUID, `, state.Id, i, c.Connector, c.Operator); err != nil { return state.Id, err } - if err := setStateConditionSide_tx(tx, state.Id, i, 0, c.Side0); err != nil { + if err := setStateConditionSide_tx(ctx, tx, state.Id, i, 0, c.Side0); err != nil { return state.Id, err } - if err := setStateConditionSide_tx(tx, state.Id, i, 1, c.Side1); err != nil { + if err := setStateConditionSide_tx(ctx, tx, state.Id, i, 1, c.Side1); err != nil { return state.Id, err } } // reset effects - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.form_state_effect WHERE form_state_id = $1 `, state.Id); err != nil { @@ -217,29 +205,29 @@ func setState_tx(tx pgx.Tx, formId uuid.UUID, state types.FormState) (uuid.UUID, } for _, e := range state.Effects { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.form_state_effect ( - form_state_id, field_id, tab_id, new_state + form_state_id, field_id, form_action_id, tab_id, new_data, new_state ) - VALUES ($1,$2,$3,$4) - `, state.Id, e.FieldId, e.TabId, e.NewState); err != nil { + VALUES ($1,$2,$3,$4,$5,$6) + `, state.Id, e.FieldId, e.FormActionId, e.TabId, e.NewData, e.NewState); err != nil { return state.Id, err } } return state.Id, nil } -func setStateConditionSide_tx(tx pgx.Tx, formStateId uuid.UUID, +func setStateConditionSide_tx(ctx context.Context, tx pgx.Tx, formStateId uuid.UUID, position int, side int, s types.FormStateConditionSide) error { - _, err := tx.Exec(db.Ctx, ` + _, err := tx.Exec(ctx, ` INSERT INTO app.form_state_condition_side ( - form_state_id, form_state_condition_position, side, - collection_id, column_id, field_id, preset_id, role_id, - brackets, content, value + form_state_id, form_state_condition_position, side, collection_id, + column_id, field_id, form_state_id_result, preset_id, role_id, + variable_id, brackets, content, value ) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) - `, formStateId, position, side, s.CollectionId, s.ColumnId, s.FieldId, - s.PresetId, s.RoleId, s.Brackets, s.Content, s.Value) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13) + `, formStateId, position, side, s.CollectionId, s.ColumnId, s.FieldId, s.FormStateId, + s.PresetId, s.RoleId, s.VariableId, s.Brackets, s.Content, s.Value) return err } diff --git a/schema/icon/icon.go b/schema/icon/icon.go index 895ce81e..f0231f21 100644 --- a/schema/icon/icon.go +++ b/schema/icon/icon.go @@ -1,7 +1,7 @@ package icon import ( - "r3/db" + "context" "r3/schema" "r3/types" @@ -9,16 +9,16 @@ import ( "github.com/jackc/pgx/v5" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.icon WHERE id = $1 `, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.icon WHERE id = $1 `, id) return err } -func Get(moduleId uuid.UUID) ([]types.Icon, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Icon, error) { icons := make([]types.Icon, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, name, file FROM app.icon WHERE module_id = $1 @@ -41,15 +41,15 @@ func Get(moduleId uuid.UUID) ([]types.Icon, error) { return icons, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, file []byte, setName bool) error { +func Set_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, file []byte, setName bool) error { - known, err := schema.CheckCreateId_tx(tx, &id, "icon", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &id, "icon", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.icon SET file = $1 WHERE module_id = $2 @@ -58,7 +58,7 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, file []byt return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.icon (id,module_id,name,file) VALUES ($1,$2,'',$3) `, id, moduleId, file); err != nil { @@ -67,13 +67,13 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, file []byt } if setName { - return SetName_tx(tx, moduleId, id, name) + return SetName_tx(ctx, tx, moduleId, id, name) } return nil } -func SetName_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string) error { - _, err := tx.Exec(db.Ctx, ` +func SetName_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string) error { + _, err := tx.Exec(ctx, ` UPDATE app.icon SET name = $1 WHERE module_id = $2 diff --git a/schema/jsFunction/jsFunction.go b/schema/jsFunction/jsFunction.go index e6c12b28..86f61bb9 100644 --- a/schema/jsFunction/jsFunction.go +++ b/schema/jsFunction/jsFunction.go @@ -1,16 +1,16 @@ package jsFunction import ( + "context" "fmt" - "r3/db" "r3/schema" "r3/schema/caption" - "r3/tools" "r3/types" "regexp" + "slices" + "strings" "github.com/gofrs/uuid" - "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5" ) @@ -19,44 +19,44 @@ var ( rxUuid = `[a-z0-9\-]{36}` // naive regex for UUIDv4 format ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, ` +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, ` DELETE FROM app.js_function WHERE id = $1 `, id) return err } -func Get(moduleId uuid.UUID) ([]types.JsFunction, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.JsFunction, error) { var err error functions := make([]types.JsFunction, 0) - rows, err := db.Pool.Query(db.Ctx, ` - SELECT id, form_id, name, code_args, code_function, code_returns + rows, err := tx.Query(ctx, ` + SELECT id, form_id, name, code_args, code_function, code_returns, is_client_event_exec FROM app.js_function WHERE module_id = $1 - ORDER BY name ASC + ORDER BY form_id ASC, name ASC -- sort by both as name is only in unique in combination `, moduleId) if err != nil { return functions, err } + defer rows.Close() for rows.Next() { var f types.JsFunction - if err := rows.Scan(&f.Id, &f.FormId, &f.Name, - &f.CodeArgs, &f.CodeFunction, &f.CodeReturns); err != nil { + if err := rows.Scan(&f.Id, &f.FormId, &f.Name, &f.CodeArgs, + &f.CodeFunction, &f.CodeReturns, &f.IsClientEventExec); err != nil { return functions, err } functions = append(functions, f) } - rows.Close() for i, f := range functions { f.ModuleId = moduleId - f.Captions, err = caption.Get("js_function", f.Id, []string{"jsFunctionTitle", "jsFunctionDesc"}) + f.Captions, err = caption.Get_tx(ctx, tx, "js_function", f.Id, []string{"jsFunctionTitle", "jsFunctionDesc"}) if err != nil { return functions, err } @@ -64,75 +64,79 @@ func Get(moduleId uuid.UUID) ([]types.JsFunction, error) { } return functions, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, formId pgtype.UUID, - name string, codeArgs string, codeFunction string, codeReturns string, - captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, fnc types.JsFunction) error { - if name == "" { + // remove only invalid character (dot), used for form function references + fnc.Name = strings.Replace(fnc.Name, ".", "", -1) + + if fnc.Name == "" { return fmt.Errorf("function name must not be empty") } - known, err := schema.CheckCreateId_tx(tx, &id, "js_function", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fnc.Id, "js_function", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.js_function - SET name = $1, code_args = $2, code_function = $3, code_returns = $4 - WHERE id = $5 - `, name, codeArgs, codeFunction, codeReturns, id); err != nil { + SET name = $1, code_args = $2, code_function = $3, code_returns = $4, is_client_event_exec = $5 + WHERE id = $6 + `, fnc.Name, fnc.CodeArgs, fnc.CodeFunction, fnc.CodeReturns, fnc.IsClientEventExec, fnc.Id); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.js_function (id, module_id, - form_id, name, code_args, code_function, code_returns) - VALUES ($1,$2,$3,$4,$5,$6,$7) - `, id, moduleId, formId, name, codeArgs, codeFunction, codeReturns); err != nil { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.js_function (id, module_id, form_id, name, + code_args, code_function, code_returns, is_client_event_exec) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8) + `, fnc.Id, fnc.ModuleId, fnc.FormId, fnc.Name, fnc.CodeArgs, fnc.CodeFunction, fnc.CodeReturns, fnc.IsClientEventExec); err != nil { return err } } // set captions - if err := caption.Set_tx(tx, id, captions); err != nil { + if err := caption.Set_tx(ctx, tx, fnc.Id, fnc.Captions); err != nil { return err } // set dependencies - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.js_function_depends WHERE js_function_id = $1 - `, id); err != nil { + `, fnc.Id); err != nil { return err } - if err := storeDependencies_tx(tx, id, "collection", fmt.Sprintf(`%s\.collection_(read|update)\('(%s)'`, rxPrefix, rxUuid), 2, codeFunction); err != nil { + if err := storeDependencies_tx(ctx, tx, fnc.Id, "collection", fmt.Sprintf(`%s\.collection_(read|update)\('(%s)'`, rxPrefix, rxUuid), 2, fnc.CodeFunction); err != nil { + return err + } + if err := storeDependencies_tx(ctx, tx, fnc.Id, "field", fmt.Sprintf(`%s\.(get|set)_field_(value|value_changed|caption|chart|error|focus|order|file_links)\('(%s)'`, rxPrefix, rxUuid), 3, fnc.CodeFunction); err != nil { return err } - if err := storeDependencies_tx(tx, id, "field", fmt.Sprintf(`%s\.(get|set)_field_(value|caption)\('(%s)'`, rxPrefix, rxUuid), 3, codeFunction); err != nil { + if err := storeDependencies_tx(ctx, tx, fnc.Id, "js_function", fmt.Sprintf(`%s\.call_frontend\('(%s)'`, rxPrefix, rxUuid), 1, fnc.CodeFunction); err != nil { return err } - if err := storeDependencies_tx(tx, id, "js_function", fmt.Sprintf(`%s\.call_frontend\('(%s)'`, rxPrefix, rxUuid), 1, codeFunction); err != nil { + if err := storeDependencies_tx(ctx, tx, fnc.Id, "pg_function", fmt.Sprintf(`%s\.call_backend\('(%s)'`, rxPrefix, rxUuid), 1, fnc.CodeFunction); err != nil { return err } - if err := storeDependencies_tx(tx, id, "pg_function", fmt.Sprintf(`%s\.call_backend\('(%s)'`, rxPrefix, rxUuid), 1, codeFunction); err != nil { + if err := storeDependencies_tx(ctx, tx, fnc.Id, "form", fmt.Sprintf(`%s\.open_form\('(%s)'`, rxPrefix, rxUuid), 1, fnc.CodeFunction); err != nil { return err } - if err := storeDependencies_tx(tx, id, "form", fmt.Sprintf(`%s\.open_form\('(%s)'`, rxPrefix, rxUuid), 1, codeFunction); err != nil { + if err := storeDependencies_tx(ctx, tx, fnc.Id, "role", fmt.Sprintf(`%s\.has_role\('(%s)'`, rxPrefix, rxUuid), 1, fnc.CodeFunction); err != nil { return err } - if err := storeDependencies_tx(tx, id, "role", fmt.Sprintf(`%s\.has_role\('(%s)'`, rxPrefix, rxUuid), 1, codeFunction); err != nil { + if err := storeDependencies_tx(ctx, tx, fnc.Id, "variable", fmt.Sprintf(`%s\.(get|set)_variable\('(%s)'`, rxPrefix, rxUuid), 2, fnc.CodeFunction); err != nil { return err } return nil } -func storeDependencies_tx(tx pgx.Tx, functionId uuid.UUID, entity string, +func storeDependencies_tx(ctx context.Context, tx pgx.Tx, functionId uuid.UUID, entity string, regex string, submatchIndexId int, body string) error { - if !tools.StringInSlice(entity, []string{"collection", "field", "form", "js_function", "pg_function", "role"}) { + if !slices.Contains([]string{"collection", "field", "form", "js_function", "pg_function", "role", "variable"}, entity) { return fmt.Errorf("unknown JS function dependency '%s'", entity) } @@ -157,7 +161,7 @@ func storeDependencies_tx(tx pgx.Tx, functionId uuid.UUID, entity string, } idMap[id] = true - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.js_function_depends (js_function_id, %s_id_on) VALUES ($1,$2) `, entity), functionId, id); err != nil { diff --git a/schema/loginForm/loginForm.go b/schema/loginForm/loginForm.go index fcee1e69..85451749 100644 --- a/schema/loginForm/loginForm.go +++ b/schema/loginForm/loginForm.go @@ -1,7 +1,7 @@ package loginForm import ( - "r3/db" + "context" "r3/schema" "r3/schema/caption" "r3/types" @@ -10,15 +10,15 @@ import ( "github.com/jackc/pgx/v5" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.login_form WHERE id = $1`, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.login_form WHERE id = $1`, id) return err } -func Get(moduleId uuid.UUID) ([]types.LoginForm, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.LoginForm, error) { loginForms := make([]types.LoginForm, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, attribute_id_login, attribute_id_lookup, form_id, name FROM app.login_form WHERE module_id = $1 @@ -27,6 +27,7 @@ func Get(moduleId uuid.UUID) ([]types.LoginForm, error) { if err != nil { return loginForms, err } + defer rows.Close() for rows.Next() { var l types.LoginForm @@ -38,30 +39,28 @@ func Get(moduleId uuid.UUID) ([]types.LoginForm, error) { l.ModuleId = moduleId loginForms = append(loginForms, l) } - rows.Close() // get captions for i, l := range loginForms { - l.Captions, err = caption.Get("login_form", l.Id, []string{"loginFormTitle"}) + loginForms[i].Captions, err = caption.Get_tx(ctx, tx, "login_form", l.Id, []string{"loginFormTitle"}) if err != nil { return loginForms, err } - loginForms[i] = l } return loginForms, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, +func Set_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, attributeIdLogin uuid.UUID, attributeIdLookup uuid.UUID, formId uuid.UUID, name string, captions types.CaptionMap) error { - known, err := schema.CheckCreateId_tx(tx, &id, "login_form", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &id, "login_form", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.login_form SET attribute_id_login = $1, attribute_id_lookup = $2, form_id = $3, name = $4 @@ -70,7 +69,7 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.login_form ( id,module_id,attribute_id_login,attribute_id_lookup,form_id,name ) @@ -81,7 +80,7 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, } // set captions - if err := caption.Set_tx(tx, id, captions); err != nil { + if err := caption.Set_tx(ctx, tx, id, captions); err != nil { return err } return nil diff --git a/schema/lookups.go b/schema/lookups.go index a07a477c..59259e50 100644 --- a/schema/lookups.go +++ b/schema/lookups.go @@ -1,16 +1,16 @@ package schema import ( + "context" "fmt" - "r3/db" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func GetModuleNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { +func GetModuleNameById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, error) { var name string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT name FROM app.module WHERE id = $1 @@ -19,10 +19,10 @@ func GetModuleNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { } return name, nil } -func GetModuleDetailsByRelationId_tx(tx pgx.Tx, id uuid.UUID) (uuid.UUID, string, error) { +func GetModuleDetailsByRelationId_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (uuid.UUID, string, error) { var moduleId uuid.UUID var name string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT id, name FROM app.module WHERE id = ( @@ -37,9 +37,9 @@ func GetModuleDetailsByRelationId_tx(tx pgx.Tx, id uuid.UUID) (uuid.UUID, string } // returns module and relation names for given relation ID -func GetRelationNamesById_tx(tx pgx.Tx, id uuid.UUID) (string, string, error) { +func GetRelationNamesById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, string, error) { var moduleName, name string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT r.name, m.name FROM app.relation AS r INNER JOIN app.module AS m ON m.id = r.module_id @@ -49,10 +49,10 @@ func GetRelationNamesById_tx(tx pgx.Tx, id uuid.UUID) (string, string, error) { } return moduleName, name, nil } -func GetRelationDetailsById_tx(tx pgx.Tx, id uuid.UUID) (string, bool, error) { +func GetRelationDetailsById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, bool, error) { var name string var encryption bool - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT name, encryption FROM app.relation WHERE id = $1 @@ -63,11 +63,11 @@ func GetRelationDetailsById_tx(tx pgx.Tx, id uuid.UUID) (string, bool, error) { } // returns module, relation and attribute names as well as attribute content for given attribute ID -func GetAttributeDetailsById_tx(tx pgx.Tx, id uuid.UUID) (string, +func GetAttributeDetailsById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, string, string, string, error) { var moduleName, relationName, name, content string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT m.name, r.name, a.name, a.content FROM app.attribute AS a INNER JOIN app.relation AS r ON r.id = a.relation_id @@ -78,9 +78,9 @@ func GetAttributeDetailsById_tx(tx pgx.Tx, id uuid.UUID) (string, } return moduleName, relationName, name, content, nil } -func GetAttributeNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { +func GetAttributeNameById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, error) { var name string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT name FROM app.attribute WHERE id = $1 @@ -89,9 +89,9 @@ func GetAttributeNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { } return name, nil } -func GetAttributeContentByRelationPk_tx(tx pgx.Tx, relationId uuid.UUID) (string, error) { +func GetAttributeContentByRelationPk_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID) (string, error) { var content string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT content FROM app.attribute WHERE relation_id = $1 @@ -103,9 +103,9 @@ func GetAttributeContentByRelationPk_tx(tx pgx.Tx, relationId uuid.UUID) (string return content, nil } -func GetFormNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { +func GetFormNameById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, error) { var name string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT name FROM app.form WHERE id = $1 @@ -116,9 +116,9 @@ func GetFormNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { } // returns module and PG function names+arguments for given PG function ID -func GetPgFunctionNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { +func GetPgFunctionNameById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, error) { var name string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT name FROM app.pg_function WHERE id = $1 @@ -127,10 +127,10 @@ func GetPgFunctionNameById_tx(tx pgx.Tx, id uuid.UUID) (string, error) { } return name, nil } -func GetPgFunctionDetailsById_tx(tx pgx.Tx, id uuid.UUID) (string, string, string, bool, error) { +func GetPgFunctionDetailsById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, string, string, bool, error) { var moduleName, name, args string var isTrigger bool - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT f.name, f.code_args, f.is_trigger, m.name FROM app.pg_function AS f INNER JOIN app.module AS m ON m.id = f.module_id @@ -142,9 +142,9 @@ func GetPgFunctionDetailsById_tx(tx pgx.Tx, id uuid.UUID) (string, string, strin } // returns module and relation names for given PG trigger ID -func GetPgTriggerNamesById_tx(tx pgx.Tx, id uuid.UUID) (string, string, error) { +func GetPgTriggerNamesById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, string, error) { var moduleName, relationName string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT r.name, m.name FROM app.pg_trigger AS t INNER JOIN app.relation AS r ON r.id = t.relation_id @@ -157,9 +157,9 @@ func GetPgTriggerNamesById_tx(tx pgx.Tx, id uuid.UUID) (string, string, error) { } // returns module and relation names for given PG index ID -func GetPgIndexNamesById_tx(tx pgx.Tx, id uuid.UUID) (string, string, error) { +func GetPgIndexNamesById_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) (string, string, error) { var moduleName, relationName string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT r.name, m.name FROM app.pg_index AS i INNER JOIN app.relation AS r ON r.id = i.relation_id @@ -170,3 +170,19 @@ func GetPgIndexNamesById_tx(tx pgx.Tx, id uuid.UUID) (string, string, error) { } return moduleName, relationName, nil } + +func GetIsFormBound_tx(ctx context.Context, tx pgx.Tx, entity string, id uuid.UUID) (bool, error) { + + if entity != "js_function" && entity != "variable" { + return false, fmt.Errorf("invalid entity '%s'", entity) + } + + isFormBound := false + err := tx.QueryRow(ctx, fmt.Sprintf(` + SELECT form_id IS NOT NULL + FROM app.%s + WHERE id = $1 + `, entity), id).Scan(&isFormBound) + + return isFormBound, err +} diff --git a/schema/menu/menu.go b/schema/menu/menu.go deleted file mode 100644 index 158be11a..00000000 --- a/schema/menu/menu.go +++ /dev/null @@ -1,143 +0,0 @@ -package menu - -import ( - "fmt" - "r3/db" - "r3/schema" - "r3/schema/caption" - "r3/schema/collection/consumer" - "r3/types" - - "github.com/gofrs/uuid" - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgtype" -) - -func Copy_tx(tx pgx.Tx, moduleId uuid.UUID, moduleIdNew uuid.UUID) error { - - menus, err := Get(moduleId, pgtype.UUID{}) - if err != nil { - return err - } - - // reset entity IDs - menus = NilIds(menus, moduleIdNew) - - return Set_tx(tx, pgtype.UUID{}, menus) -} - -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.menu WHERE id = $1`, id) - return err -} - -func Get(moduleId uuid.UUID, parentId pgtype.UUID) ([]types.Menu, error) { - - menus := make([]types.Menu, 0) - - nullCheck := "AND (parent_id IS NULL OR parent_id = $2)" - if parentId.Valid { - nullCheck = "AND parent_id = $2" - } - - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` - SELECT id, form_id, icon_id, show_children - FROM app.menu - WHERE module_id = $1 - %s - ORDER BY position ASC - `, nullCheck), moduleId, parentId) - if err != nil { - return menus, err - } - - for rows.Next() { - var m types.Menu - - if err := rows.Scan(&m.Id, &m.FormId, &m.IconId, &m.ShowChildren); err != nil { - return menus, err - } - m.ModuleId = moduleId - menus = append(menus, m) - } - rows.Close() - - for i, m := range menus { - - // get children & collections & captions - m.Menus, err = Get(moduleId, pgtype.UUID{Bytes: m.Id, Valid: true}) - if err != nil { - return menus, err - } - m.Collections, err = consumer.Get("menu", m.Id, "menuDisplay") - if err != nil { - return menus, err - } - m.Captions, err = caption.Get("menu", m.Id, []string{"menuTitle"}) - if err != nil { - return menus, err - } - menus[i] = m - } - return menus, nil -} - -func Set_tx(tx pgx.Tx, parentId pgtype.UUID, menus []types.Menu) error { - - for i, m := range menus { - known, err := schema.CheckCreateId_tx(tx, &m.Id, "menu", "id") - if err != nil { - return err - } - - if known { - if _, err := tx.Exec(db.Ctx, ` - UPDATE app.menu - SET parent_id = $1, form_id = $2, icon_id = $3, position = $4, - show_children = $5 - WHERE id = $6 - `, parentId, m.FormId, m.IconId, i, m.ShowChildren, m.Id); err != nil { - return err - } - } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.menu (id, module_id, parent_id, form_id, - icon_id, position, show_children) - VALUES ($1,$2,$3,$4,$5,$6,$7) - `, m.Id, m.ModuleId, parentId, m.FormId, m.IconId, i, m.ShowChildren); err != nil { - return err - } - } - - // set children - if err := Set_tx(tx, pgtype.UUID{Bytes: m.Id, Valid: true}, m.Menus); err != nil { - return err - } - - // set collections - if err := consumer.Set_tx(tx, "menu", m.Id, "menuDisplay", m.Collections); err != nil { - return err - } - - // set captions - if err := caption.Set_tx(tx, m.Id, m.Captions); err != nil { - return err - } - } - return nil -} - -// nil menu IDs and set new module -func NilIds(menus []types.Menu, moduleIdNew uuid.UUID) []types.Menu { - - for i, _ := range menus { - menus[i].Id = uuid.Nil - menus[i].ModuleId = moduleIdNew - - for j, _ := range menus[i].Collections { - menus[i].Collections[j].Id = uuid.Nil - } - menus[i].Menus = NilIds(menus[i].Menus, moduleIdNew) - } - return menus -} diff --git a/schema/menuTab/menuTab.go b/schema/menuTab/menuTab.go new file mode 100644 index 00000000..88580678 --- /dev/null +++ b/schema/menuTab/menuTab.go @@ -0,0 +1,211 @@ +package menuTab + +import ( + "context" + "fmt" + "r3/schema" + "r3/schema/caption" + "r3/schema/collection/consumer" + "r3/types" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" +) + +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, ` + DELETE FROM app.menu_tab + WHERE id = $1 + `, id) + return err +} + +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.MenuTab, error) { + menuTabs := make([]types.MenuTab, 0) + + rows, err := tx.Query(ctx, ` + SELECT id, icon_id + FROM app.menu_tab + WHERE module_id = $1 + ORDER BY position ASC + `, moduleId) + if err != nil { + return menuTabs, err + } + defer rows.Close() + + for rows.Next() { + var mt types.MenuTab + if err := rows.Scan(&mt.Id, &mt.IconId); err != nil { + return menuTabs, err + } + mt.ModuleId = moduleId + menuTabs = append(menuTabs, mt) + } + + // get menus and captions + for i, mt := range menuTabs { + + mt.Menus, err = getMenus_tx(ctx, tx, mt.Id, pgtype.UUID{}) + if err != nil { + return menuTabs, err + } + + mt.Captions, err = caption.Get_tx(ctx, tx, "menu_tab", mt.Id, []string{"menuTabTitle"}) + if err != nil { + return menuTabs, err + } + menuTabs[i] = mt + } + return menuTabs, nil +} + +func Set_tx(ctx context.Context, tx pgx.Tx, position int, mt types.MenuTab) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &mt.Id, "menu_tab", "id") + if err != nil { + return err + } + + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.menu_tab + SET icon_id = $1, position = $2 + WHERE id = $3 + `, mt.IconId, position, mt.Id); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.menu_tab (id, module_id, icon_id, position) + VALUES ($1,$2,$3,$4) + `, mt.Id, mt.ModuleId, mt.IconId, position); err != nil { + return err + } + } + + // set menus + if err := setMenus_tx(ctx, tx, mt.Id, pgtype.UUID{}, mt.Menus); err != nil { + return err + } + + // set captions + return caption.Set_tx(ctx, tx, mt.Id, mt.Captions) +} + +// menus +func getMenus_tx(ctx context.Context, tx pgx.Tx, menuTabId uuid.UUID, parentId pgtype.UUID) ([]types.Menu, error) { + + menus := make([]types.Menu, 0) + + nullCheck := "AND (parent_id IS NULL OR parent_id = $2)" + if parentId.Valid { + nullCheck = "AND parent_id = $2" + } + + rows, err := tx.Query(ctx, fmt.Sprintf(` + SELECT id, form_id, icon_id, show_children, color + FROM app.menu + WHERE menu_tab_id = $1 + %s + ORDER BY position ASC + `, nullCheck), menuTabId, parentId) + if err != nil { + return menus, err + } + defer rows.Close() + + for rows.Next() { + var m types.Menu + + if err := rows.Scan(&m.Id, &m.FormId, &m.IconId, &m.ShowChildren, &m.Color); err != nil { + return menus, err + } + menus = append(menus, m) + } + + // get children & collections & captions + for i, m := range menus { + m.Menus, err = getMenus_tx(ctx, tx, menuTabId, pgtype.UUID{Bytes: m.Id, Valid: true}) + if err != nil { + return menus, err + } + m.Collections, err = consumer.Get_tx(ctx, tx, "menu", m.Id, "menuDisplay") + if err != nil { + return menus, err + } + m.Captions, err = caption.Get_tx(ctx, tx, "menu", m.Id, []string{"menuTitle"}) + if err != nil { + return menus, err + } + menus[i] = m + } + return menus, nil +} +func setMenus_tx(ctx context.Context, tx pgx.Tx, menuTabId uuid.UUID, parentId pgtype.UUID, menus []types.Menu) error { + + idsKeep := make([]uuid.UUID, 0) + for i, m := range menus { + known, err := schema.CheckCreateId_tx(ctx, tx, &m.Id, "menu", "id") + if err != nil { + return err + } + idsKeep = append(idsKeep, m.Id) + + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.menu + SET menu_tab_id = $1, parent_id = $2, form_id = $3, icon_id = $4, + position = $5, show_children = $6, color = $7 + WHERE id = $8 + `, menuTabId, parentId, m.FormId, m.IconId, i, m.ShowChildren, m.Color, m.Id); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.menu (id, menu_tab_id, parent_id, + form_id, icon_id, position, show_children, color) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8) + `, m.Id, menuTabId, parentId, m.FormId, m.IconId, i, m.ShowChildren, m.Color); err != nil { + return err + } + } + + // set children + if err := setMenus_tx(ctx, tx, menuTabId, pgtype.UUID{Bytes: m.Id, Valid: true}, m.Menus); err != nil { + return err + } + + // set collections + if err := consumer.Set_tx(ctx, tx, "menu", m.Id, "menuDisplay", m.Collections); err != nil { + return err + } + + // set captions + if err := caption.Set_tx(ctx, tx, m.Id, m.Captions); err != nil { + return err + } + } + + if parentId.Valid { + if _, err := tx.Exec(ctx, ` + DELETE FROM app.menu + WHERE menu_tab_id = $1 + AND parent_id = $2 + AND id <> ALL($3) + `, menuTabId, parentId.Bytes, idsKeep); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + DELETE FROM app.menu + WHERE menu_tab_id = $1 + AND parent_id IS NULL + AND id <> ALL($2) + `, menuTabId, idsKeep); err != nil { + return err + } + } + return nil +} diff --git a/schema/module/module.go b/schema/module/module.go index 0b730454..c0fb29a5 100644 --- a/schema/module/module.go +++ b/schema/module/module.go @@ -1,36 +1,35 @@ package module import ( + "context" "errors" "fmt" - "r3/compatible" - "r3/db" + "r3/config/module_meta" "r3/db/check" - "r3/module_option" "r3/schema" "r3/schema/article" "r3/schema/attribute" "r3/schema/caption" + "r3/schema/compatible" "r3/schema/pgFunction" - "r3/tools" "r3/types" + "slices" "strings" "github.com/gofrs/uuid" - "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - name, err := schema.GetModuleNameById_tx(tx, id) + name, err := schema.GetModuleNameById_tx(ctx, tx, id) if err != nil { return err } // drop e2ee data key relations for module relations with encryption relIdsEncrypted := make([]uuid.UUID, 0) - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT ARRAY_AGG(id) FROM app.relation WHERE module_id = $1 @@ -40,7 +39,7 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { } for _, relId := range relIdsEncrypted { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DROP TABLE IF EXISTS instance_e2ee."%s" `, schema.GetEncKeyTableName(relId))); err != nil { return err @@ -49,7 +48,7 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { // drop file attribute relations atrIdsFile := make([]uuid.UUID, 0) - if err := db.Pool.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT ARRAY_AGG(id) FROM app.attribute WHERE relation_id IN ( @@ -63,38 +62,30 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { } for _, atrId := range atrIdsFile { - if err := attribute.FileRelationsDelete_tx(tx, atrId); err != nil { + if err := attribute.FileRelationsDelete_tx(ctx, tx, atrId); err != nil { return err } } // drop module schema - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(`DROP SCHEMA "%s" CASCADE`, + if _, err := tx.Exec(ctx, fmt.Sprintf(`DROP SCHEMA "%s" CASCADE`, name)); err != nil { return err } // delete module reference - _, err = tx.Exec(db.Ctx, `DELETE FROM app.module WHERE id = $1`, id) + _, err = tx.Exec(ctx, `DELETE FROM app.module WHERE id = $1`, id) return err } -func Get(ids []uuid.UUID) ([]types.Module, error) { - +func Get_tx(ctx context.Context, tx pgx.Tx, ids []uuid.UUID) ([]types.Module, error) { modules := make([]types.Module, 0) - sqlWheres := []string{} - sqlValues := []interface{}{} - - // filter to specified module IDs - if len(ids) != 0 { - sqlWheres = append(sqlWheres, fmt.Sprintf("WHERE id = ANY($%d)", len(sqlValues)+1)) - sqlValues = append(sqlValues, ids) - } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` - SELECT id, parent_id, form_id, icon_id, name, color1, position, - language_main, release_build, release_build_app, release_date, + rows, err := tx.Query(ctx, ` + SELECT id, parent_id, form_id, icon_id, icon_id_pwa1, icon_id_pwa2, + js_function_id_on_login, pg_function_id_login_sync, name, name_pwa, name_pwa_short, + color1, position, language_main, release_build, release_build_app, release_date, ARRAY( SELECT module_id_on FROM app.module_depends @@ -114,44 +105,35 @@ func Get(ids []uuid.UUID) ([]types.Module, error) { ORDER BY language_code ASC ) AS "languages" FROM app.module AS m - %s - ORDER BY - CASE - WHEN parent_id IS NULL THEN name - ELSE CONCAT(( - SELECT name - FROM app.module - WHERE id = m.parent_id - ),'_',name) - END - `, strings.Join(sqlWheres, "\n")), sqlValues...) + WHERE id = ANY($1) + `, ids) if err != nil { return modules, err } + defer rows.Close() for rows.Next() { var m types.Module - if err := rows.Scan(&m.Id, &m.ParentId, &m.FormId, &m.IconId, &m.Name, - &m.Color1, &m.Position, &m.LanguageMain, &m.ReleaseBuild, - &m.ReleaseBuildApp, &m.ReleaseDate, &m.DependsOn, &m.ArticleIdsHelp, - &m.Languages); err != nil { + if err := rows.Scan(&m.Id, &m.ParentId, &m.FormId, &m.IconId, &m.IconIdPwa1, + &m.IconIdPwa2, &m.JsFunctionIdOnLogin, &m.PgFunctionIdLoginSync, &m.Name, + &m.NamePwa, &m.NamePwaShort, &m.Color1, &m.Position, &m.LanguageMain, + &m.ReleaseBuild, &m.ReleaseBuildApp, &m.ReleaseDate, &m.DependsOn, + &m.ArticleIdsHelp, &m.Languages); err != nil { - rows.Close() return modules, err } modules = append(modules, m) } - rows.Close() // get start forms & captions for i, mod := range modules { - mod.StartForms, err = getStartForms(mod.Id) + mod.StartForms, err = getStartForms_tx(ctx, tx, mod.Id) if err != nil { return modules, err } - mod.Captions, err = caption.Get("module", mod.Id, []string{"moduleTitle"}) + mod.Captions, err = caption.Get_tx(ctx, tx, "module", mod.Id, []string{"moduleTitle"}) if err != nil { return modules, err } @@ -160,196 +142,222 @@ func Get(ids []uuid.UUID) ([]types.Module, error) { return modules, nil } -func Set_tx(tx pgx.Tx, id uuid.UUID, parentId pgtype.UUID, - formId pgtype.UUID, iconId pgtype.UUID, name string, color1 string, - position int, languageMain string, releaseBuild int, releaseBuildApp int, - releaseDate int64, dependsOn []uuid.UUID, startForms []types.ModuleStartForm, - languages []string, articleIdsHelp []uuid.UUID, captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, mod types.Module) error { + _, err := SetReturnId_tx(ctx, tx, mod) + return err +} +func SetReturnId_tx(ctx context.Context, tx pgx.Tx, mod types.Module) (uuid.UUID, error) { - if err := check.DbIdentifier(name); err != nil { - return err + if err := check.DbIdentifier(mod.Name); err != nil { + return mod.Id, err } - if len(languageMain) != 5 { - return errors.New("language code must have 5 characters") + if len(mod.LanguageMain) != 5 { + return mod.Id, errors.New("language code must have 5 characters") } - create := id == uuid.Nil - known, err := schema.CheckCreateId_tx(tx, &id, "module", "id") + create := mod.Id == uuid.Nil + known, err := schema.CheckCreateId_tx(ctx, tx, &mod.Id, "module", "id") if err != nil { - return err + return mod.Id, err + } + + if strings.HasPrefix(mod.Name, "instance") { + return mod.Id, fmt.Errorf("application name must not start with 'instance'") } if known { var nameEx string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT name FROM app.module WHERE id = $1 - `, id).Scan(&nameEx); err != nil { - return err + `, mod.Id).Scan(&nameEx); err != nil { + return mod.Id, err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.module SET parent_id = $1, form_id = $2, icon_id = $3, - name = $4, color1 = $5, position = $6, language_main = $7, - release_build = $8, release_build_app = $9, release_date = $10 - WHERE id = $11 - `, parentId, formId, iconId, name, color1, position, languageMain, - releaseBuild, releaseBuildApp, releaseDate, id); err != nil { - - return err + icon_id_pwa1 = $4, icon_id_pwa2 = $5, js_function_id_on_login = $6, + pg_function_id_login_sync = $7, name = $8, name_pwa = $9, name_pwa_short = $10, + color1 = $11, position = $12, language_main = $13, release_build = $14, + release_build_app = $15, release_date = $16 + WHERE id = $17 + `, mod.ParentId, mod.FormId, mod.IconId, mod.IconIdPwa1, mod.IconIdPwa2, + mod.JsFunctionIdOnLogin, mod.PgFunctionIdLoginSync, mod.Name, mod.NamePwa, + mod.NamePwaShort, mod.Color1, mod.Position, mod.LanguageMain, mod.ReleaseBuild, + mod.ReleaseBuildApp, mod.ReleaseDate, mod.Id); err != nil { + + return mod.Id, err } - if name != nameEx { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(`ALTER SCHEMA "%s" RENAME TO "%s"`, - nameEx, name)); err != nil { + if mod.Name != nameEx { + if _, err := tx.Exec(ctx, fmt.Sprintf(`ALTER SCHEMA "%s" RENAME TO "%s"`, + nameEx, mod.Name)); err != nil { - return err + return mod.Id, err } - if err := pgFunction.RecreateAffectedBy_tx(tx, "module", id); err != nil { - return fmt.Errorf("failed to recreate affected PG functions, %s", err) + if err := pgFunction.RecreateAffectedBy_tx(ctx, tx, "module", mod.Id); err != nil { + return mod.Id, fmt.Errorf("failed to recreate affected PG functions, %s", err) } } } else { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(`CREATE SCHEMA "%s"`, name)); err != nil { - return err + if _, err := tx.Exec(ctx, fmt.Sprintf(`CREATE SCHEMA "%s"`, mod.Name)); err != nil { + return mod.Id, err } // insert module reference - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.module ( - id, parent_id, form_id, icon_id, name, color1, position, - language_main, release_build, release_build_app, release_date + id, parent_id, form_id, icon_id, icon_id_pwa1, icon_id_pwa2, + js_function_id_on_login, pg_function_id_login_sync, name, name_pwa, + name_pwa_short, color1, position, language_main, release_build, + release_build_app, release_date ) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) - `, id, parentId, formId, iconId, name, color1, position, - languageMain, releaseBuild, releaseBuildApp, releaseDate); err != nil { + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17) + `, mod.Id, mod.ParentId, mod.FormId, mod.IconId, mod.IconIdPwa1, mod.IconIdPwa2, + mod.JsFunctionIdOnLogin, mod.PgFunctionIdLoginSync, mod.Name, mod.NamePwa, + mod.NamePwaShort, mod.Color1, mod.Position, mod.LanguageMain, + mod.ReleaseBuild, mod.ReleaseBuildApp, mod.ReleaseDate); err != nil { - return err + return mod.Id, err } if create { - // insert default 'everyone' role for module - // only relevant if module did not exist before - // otherwise everyone role with ID (and possible assignments) already exists + // generate entities that need to be created if module did not exist before + // otherwise they are imported with existing IDs (and foreign key references) + + // generate default 'everyone' role for module roleId, err := uuid.NewV4() if err != nil { - return err + return mod.Id, err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.role (id, module_id, name, content, assignable) VALUES ($1,$2,'everyone','everyone',false) - `, roleId, id); err != nil { - return err + `, roleId, mod.Id); err != nil { + return mod.Id, err + } + + // generate first menu tab + menuTabId, err := uuid.NewV4() + if err != nil { + return mod.Id, err + } + + if _, err := tx.Exec(ctx, ` + INSERT INTO app.menu_tab (id, module_id, position) + VALUES ($1,$2,0) + `, menuTabId, mod.Id); err != nil { + return mod.Id, err } } - // insert module options for this instance - if err := module_option.Set_tx(tx, id, false, create, position); err != nil { - return err + // create module meta data record for instance + if err := module_meta.Create_tx(ctx, tx, mod.Id, false, create, mod.Position); err != nil { + return mod.Id, err } } // set dependencies to other modules - dependsOnCurrent, err := getDependsOn_tx(tx, id) + dependsOnCurrent, err := getDependsOn_tx(ctx, tx, mod.Id) if err != nil { - return err + return mod.Id, err } for _, moduleIdOn := range dependsOnCurrent { - if tools.UuidInSlice(moduleIdOn, dependsOn) { + if slices.Contains(mod.DependsOn, moduleIdOn) { continue } // existing dependency has been removed - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.module_depends WHERE module_id = $1 AND module_id_on = $2 - `, id, moduleIdOn); err != nil { - return err + `, mod.Id, moduleIdOn); err != nil { + return mod.Id, err } } - for _, moduleIdOn := range dependsOn { + for _, moduleIdOn := range mod.DependsOn { - if tools.UuidInSlice(moduleIdOn, dependsOnCurrent) { + if slices.Contains(dependsOnCurrent, moduleIdOn) { continue } // new dependency has been added - if id == moduleIdOn { - return errors.New("module dependency to itself is not allowed") + if mod.Id == moduleIdOn { + return mod.Id, errors.New("module dependency to itself is not allowed") } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.module_depends (module_id, module_id_on) VALUES ($1,$2) - `, id, moduleIdOn); err != nil { - return err + `, mod.Id, moduleIdOn); err != nil { + return mod.Id, err } } // set start forms - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.module_start_form WHERE module_id = $1 - `, id); err != nil { - return err + `, mod.Id); err != nil { + return mod.Id, err } - for i, sf := range startForms { - if _, err := tx.Exec(db.Ctx, ` + for i, sf := range mod.StartForms { + if _, err := tx.Exec(ctx, ` INSERT INTO app.module_start_form (module_id, position, role_id, form_id) VALUES ($1,$2,$3,$4) - `, id, i, sf.RoleId, sf.FormId); err != nil { - return err + `, mod.Id, i, sf.RoleId, sf.FormId); err != nil { + return mod.Id, err } } // set languages - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.module_language WHERE module_id = $1 - `, id); err != nil { - return err + `, mod.Id); err != nil { + return mod.Id, err } - for _, code := range languages { + for _, code := range mod.Languages { if len(code) != 5 { - return errors.New("language code must have 5 characters") + return mod.Id, errors.New("language code must have 5 characters") } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.module_language (module_id, language_code) VALUES ($1,$2) - `, id, code); err != nil { - return err + `, mod.Id, code); err != nil { + return mod.Id, err } } // set help articles - if err := article.Assign_tx(tx, "module", id, articleIdsHelp); err != nil { - return err + if err := article.Assign_tx(ctx, tx, "module", mod.Id, mod.ArticleIdsHelp); err != nil { + return mod.Id, err } // set captions // fix imports < 3.2: Migration from help captions to help articles - captions, err = compatible.FixCaptions_tx(tx, "module", id, captions) + mod.Captions, err = compatible.FixCaptions_tx(ctx, tx, "module", mod.Id, mod.Captions) if err != nil { - return err + return mod.Id, err } - return caption.Set_tx(tx, id, captions) + return mod.Id, caption.Set_tx(ctx, tx, mod.Id, mod.Captions) } -func getStartForms(id uuid.UUID) ([]types.ModuleStartForm, error) { +func getStartForms_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) ([]types.ModuleStartForm, error) { startForms := make([]types.ModuleStartForm, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT role_id, form_id FROM app.module_start_form WHERE module_id = $1 @@ -366,15 +374,14 @@ func getStartForms(id uuid.UUID) ([]types.ModuleStartForm, error) { return startForms, err } startForms = append(startForms, sf) - } return startForms, nil } -func getDependsOn_tx(tx pgx.Tx, id uuid.UUID) ([]uuid.UUID, error) { +func getDependsOn_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) ([]uuid.UUID, error) { moduleIdsDependsOn := make([]uuid.UUID, 0) - rows, err := tx.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT module_id_on FROM app.module_depends WHERE module_id = $1 @@ -390,7 +397,6 @@ func getDependsOn_tx(tx pgx.Tx, id uuid.UUID) ([]uuid.UUID, error) { return moduleIdsDependsOn, err } moduleIdsDependsOn = append(moduleIdsDependsOn, moduleIdDependsOn) - } return moduleIdsDependsOn, nil } diff --git a/schema/openForm/openForm.go b/schema/openForm/openForm.go index 523dcf48..9a4c889e 100644 --- a/schema/openForm/openForm.go +++ b/schema/openForm/openForm.go @@ -1,49 +1,82 @@ package openForm import ( + "context" "errors" "fmt" - "r3/db" - "r3/tools" + "r3/schema/compatible" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" ) var entitiesAllowed = []string{"column", "collection_consumer", "field"} -func Get(entity string, id uuid.UUID) (f types.OpenForm, err error) { +func Get_tx(ctx context.Context, tx pgx.Tx, entity string, id uuid.UUID, formContext pgtype.Text) (f types.OpenForm, err error) { - if !tools.StringInSlice(entity, entitiesAllowed) { + if !slices.Contains(entitiesAllowed, entity) { return f, errors.New("invalid open form entity") } - err = db.Pool.QueryRow(db.Ctx, fmt.Sprintf(` - SELECT form_id_open, attribute_id_apply, relation_index, - pop_up, max_height, max_width + sqlArgs := make([]interface{}, 0) + sqlArgs = append(sqlArgs, id) + + sqlWhere := "AND context IS NULL" + if formContext.Valid { + sqlArgs = append(sqlArgs, formContext.String) + sqlWhere = "AND context = $2" + } + + err = tx.QueryRow(ctx, fmt.Sprintf(` + SELECT form_id_open, relation_index_open, attribute_id_apply, + relation_index_apply, pop_up_type, max_height, max_width FROM app.open_form WHERE %s_id = $1 - `, entity), id).Scan(&f.FormIdOpen, &f.AttributeIdApply, - &f.RelationIndex, &f.PopUp, &f.MaxHeight, &f.MaxWidth) + %s + `, entity, sqlWhere), sqlArgs...).Scan(&f.FormIdOpen, &f.RelationIndexOpen, + &f.AttributeIdApply, &f.RelationIndexApply, &f.PopUpType, &f.MaxHeight, + &f.MaxWidth) // open form is optional if err == pgx.ErrNoRows { return f, nil } + + // fix exports > 3.4: Set default value for legacy relation index + f = compatible.FixOpenFormRelationIndexApplyDefault(f) + return f, err } -func Set_tx(tx pgx.Tx, entity string, id uuid.UUID, f types.OpenForm) error { +func Set_tx(ctx context.Context, tx pgx.Tx, entity string, id uuid.UUID, f types.OpenForm, context pgtype.Text) error { - if !tools.StringInSlice(entity, entitiesAllowed) { + if !slices.Contains(entitiesAllowed, entity) { return errors.New("invalid open form entity") } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + // fix imports < 3.4: Legacy pop-up option + f = compatible.FixOpenFormPopUpType(f) + + // fix imports < 3.5: Relation index for applying record relationship value + f = compatible.FixOpenFormRelationIndexApply(f) + + sqlArgs := make([]interface{}, 0) + sqlArgs = append(sqlArgs, id) + + sqlWhere := "AND context IS NULL" + if context.Valid { + sqlArgs = append(sqlArgs, context.String) + sqlWhere = "AND context = $2" + } + + if _, err := tx.Exec(ctx, fmt.Sprintf(` DELETE FROM app.open_form WHERE %s_id = $1 - `, entity), id); err != nil { + %s + `, entity, sqlWhere), sqlArgs...); err != nil { return err } @@ -51,14 +84,14 @@ func Set_tx(tx pgx.Tx, entity string, id uuid.UUID, f types.OpenForm) error { return nil } - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.open_form ( - %s_id, form_id_open, attribute_id_apply, - relation_index, pop_up, max_height, max_width + %s_id, context, form_id_open, relation_index_open, attribute_id_apply, + relation_index_apply, pop_up_type, max_height, max_width ) - VALUES ($1,$2,$3,$4,$5,$6,$7) - `, entity), id, f.FormIdOpen, f.AttributeIdApply, - f.RelationIndex, f.PopUp, f.MaxHeight, f.MaxWidth) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9) + `, entity), id, context, f.FormIdOpen, f.RelationIndexOpen, f.AttributeIdApply, + f.RelationIndexApply, f.PopUpType, f.MaxHeight, f.MaxWidth) return err } diff --git a/schema/pgFunction/pgFunction.go b/schema/pgFunction/pgFunction.go index 8dca0a31..30a681bb 100644 --- a/schema/pgFunction/pgFunction.go +++ b/schema/pgFunction/pgFunction.go @@ -1,35 +1,36 @@ package pgFunction import ( + "context" "errors" "fmt" - "r3/db" "r3/db/check" "r3/schema" "r3/schema/caption" - "r3/tools" + "r3/schema/compatible" "r3/types" "regexp" + "slices" "strings" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - nameMod, nameEx, _, _, err := schema.GetPgFunctionDetailsById_tx(tx, id) + nameMod, nameEx, _, _, err := schema.GetPgFunctionDetailsById_tx(ctx, tx, id) if err != nil { return err } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DROP FUNCTION "%s"."%s" `, nameMod, nameEx)); err != nil { return err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.pg_function WHERE id = $1 `, id); err != nil { @@ -38,14 +39,14 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { return nil } -func Get(moduleId uuid.UUID) ([]types.PgFunction, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.PgFunction, error) { var err error functions := make([]types.PgFunction, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, name, code_args, code_function, code_returns, - is_frontend_exec, is_trigger + is_frontend_exec, is_login_sync, is_trigger, volatility FROM app.pg_function WHERE module_id = $1 ORDER BY name ASC @@ -53,26 +54,26 @@ func Get(moduleId uuid.UUID) ([]types.PgFunction, error) { if err != nil { return functions, err } + defer rows.Close() for rows.Next() { var f types.PgFunction - if err := rows.Scan(&f.Id, &f.Name, &f.CodeArgs, &f.CodeFunction, - &f.CodeReturns, &f.IsFrontendExec, &f.IsTrigger); err != nil { + if err := rows.Scan(&f.Id, &f.Name, &f.CodeArgs, &f.CodeFunction, &f.CodeReturns, + &f.IsFrontendExec, &f.IsLoginSync, &f.IsTrigger, &f.Volatility); err != nil { return functions, err } functions = append(functions, f) } - rows.Close() for i, f := range functions { f.ModuleId = moduleId - f.Schedules, err = getSchedules(f.Id) + f.Schedules, err = getSchedules_tx(ctx, tx, f.Id) if err != nil { return functions, err } - f.Captions, err = caption.Get("pg_function", f.Id, []string{"pgFunctionTitle", "pgFunctionDesc"}) + f.Captions, err = caption.Get_tx(ctx, tx, "pg_function", f.Id, []string{"pgFunctionTitle", "pgFunctionDesc"}) if err != nil { return functions, err } @@ -80,27 +81,10 @@ func Get(moduleId uuid.UUID) ([]types.PgFunction, error) { } return functions, nil } -func getSchedules(pgFunctionId uuid.UUID) ([]types.PgFunctionSchedule, error) { +func getSchedules_tx(ctx context.Context, tx pgx.Tx, pgFunctionId uuid.UUID) ([]types.PgFunctionSchedule, error) { schedules := make([]types.PgFunctionSchedule, 0) - tx, err := db.Pool.Begin(db.Ctx) - if err != nil { - return schedules, err - } - defer tx.Rollback(db.Ctx) - - schedules, err = getSchedules_tx(tx, pgFunctionId) - if err != nil { - return schedules, err - } - tx.Commit(db.Ctx) - - return schedules, nil -} -func getSchedules_tx(tx pgx.Tx, pgFunctionId uuid.UUID) ([]types.PgFunctionSchedule, error) { - schedules := make([]types.PgFunctionSchedule, 0) - - rows, err := tx.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, at_second, at_minute, at_hour, at_day, interval_type, interval_value FROM app.pg_function_schedule WHERE pg_function_id = $1 @@ -124,93 +108,92 @@ func getSchedules_tx(tx pgx.Tx, pgFunctionId uuid.UUID) ([]types.PgFunctionSched return schedules, nil } -func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, - codeArgs string, codeFunction string, codeReturns string, - isFrontendExec bool, isTrigger bool, schedules []types.PgFunctionSchedule, - captions types.CaptionMap) error { +func Set_tx(ctx context.Context, tx pgx.Tx, fnc types.PgFunction) error { - if err := check.DbIdentifier(name); err != nil { + if err := check.DbIdentifier(fnc.Name); err != nil { return err } - nameMod, err := schema.GetModuleNameById_tx(tx, moduleId) + nameMod, err := schema.GetModuleNameById_tx(ctx, tx, fnc.ModuleId) if err != nil { return err } - // fix imports < 2.6: New "isTrigger" state - if strings.ToUpper(codeReturns) == "TRIGGER" && !isTrigger { - isTrigger = true - } + // fix imports < 3.9: Missing volatility setting + fnc = compatible.FixMissingVolatility(fnc) - // enforce trigger function - if isTrigger { - codeReturns = "TRIGGER" - isFrontendExec = false + // enforce valid function configuration + if fnc.IsLoginSync { + fnc.CodeReturns = "INTEGER" + fnc.IsTrigger = false + fnc.IsFrontendExec = false + } + if fnc.IsTrigger { + fnc.CodeReturns = "TRIGGER" + fnc.IsFrontendExec = false + fnc.IsLoginSync = false } - if codeFunction == "" || codeReturns == "" { + if fnc.CodeFunction == "" || fnc.CodeReturns == "" { return errors.New("empty function body or missing returns") } - known, err := schema.CheckCreateId_tx(tx, &id, "pg_function", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &fnc.Id, "pg_function", "id") if err != nil { return err } if known { - _, nameEx, _, isTriggerEx, err := schema.GetPgFunctionDetailsById_tx(tx, id) + _, nameEx, _, isTriggerEx, err := schema.GetPgFunctionDetailsById_tx(ctx, tx, fnc.Id) if err != nil { return err } - if isTrigger != isTriggerEx { + if fnc.IsTrigger != isTriggerEx { return errors.New("cannot convert between trigger and non-trigger function") } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.pg_function SET name = $1, code_args = $2, code_function = $3, - code_returns = $4, is_frontend_exec = $5 - WHERE id = $6 - `, name, codeArgs, codeFunction, codeReturns, isFrontendExec, id); err != nil { + code_returns = $4, is_frontend_exec = $5, volatility = $6 + WHERE id = $7 + `, fnc.Name, fnc.CodeArgs, fnc.CodeFunction, fnc.CodeReturns, fnc.IsFrontendExec, fnc.Volatility, fnc.Id); err != nil { return err } - if name != nameEx { - if err := RecreateAffectedBy_tx(tx, "pg_function", id); err != nil { + if fnc.Name != nameEx { + if err := RecreateAffectedBy_tx(ctx, tx, "pg_function", fnc.Id); err != nil { return fmt.Errorf("failed to recreate affected PG functions, %s", err) } } - if !isTrigger { - // drop and recreate non-trigger function because function arguments can change + if !fnc.IsTrigger { + // drop non-trigger function because function arguments can change // two functions with the same name but different interfaces can exist (overloading) - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` - DROP FUNCTION "%s"."%s" - `, nameMod, nameEx)); err != nil { + if _, err := tx.Exec(ctx, fmt.Sprintf(`DROP FUNCTION "%s"."%s"`, nameMod, nameEx)); err != nil { return err } } else { - if name != nameEx { + if fnc.Name != nameEx { // rename instead of drop function if trigger // we cannot drop trigger functions without recreating triggers // renaming changes the function name in the trigger and allows us to replace it // as triggers do not take arguments, overloading is not a problem - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER FUNCTION "%s"."%s" RENAME TO "%s" - `, nameMod, nameEx, name)); err != nil { + `, nameMod, nameEx, fnc.Name)); err != nil { return err } } } } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.pg_function (id, module_id, name, code_args, - code_function, code_returns, is_frontend_exec, is_trigger) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8) - `, id, moduleId, name, codeArgs, codeFunction, - codeReturns, isFrontendExec, isTrigger); err != nil { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.pg_function (id, module_id, name, code_args, code_function, + code_returns, is_frontend_exec, is_login_sync, is_trigger, volatility) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) + `, fnc.Id, fnc.ModuleId, fnc.Name, fnc.CodeArgs, fnc.CodeFunction, + fnc.CodeReturns, fnc.IsFrontendExec, fnc.IsLoginSync, fnc.IsTrigger, fnc.Volatility); err != nil { return err } @@ -218,15 +201,18 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, // set schedules scheduleIds := make([]uuid.UUID, 0) - for _, s := range schedules { + for _, s := range fnc.Schedules { - known, err = schema.CheckCreateId_tx(tx, &s.Id, "pg_function_schedule", "id") + known, err = schema.CheckCreateId_tx(ctx, tx, &s.Id, "pg_function_schedule", "id") if err != nil { return err } + // overwrite invalid inputs + s.AtDay = schema.GetValidAtDay(s.IntervalType, s.AtDay) + if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.pg_function_schedule SET at_second = $1, at_minute = $2, at_hour = $3, at_day = $4, interval_type = $5, interval_value = $6 @@ -237,18 +223,18 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.pg_function_schedule ( id, pg_function_id, at_second, at_minute, at_hour, at_day, interval_type, interval_value ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8) - `, s.Id, id, s.AtSecond, s.AtMinute, s.AtHour, s.AtDay, + `, s.Id, fnc.Id, s.AtSecond, s.AtMinute, s.AtHour, s.AtDay, s.IntervalType, s.IntervalValue); err != nil { return err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO instance.schedule ( pg_function_schedule_id,date_attempt,date_success ) @@ -260,52 +246,52 @@ func Set_tx(tx pgx.Tx, moduleId uuid.UUID, id uuid.UUID, name string, scheduleIds = append(scheduleIds, s.Id) } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.pg_function_schedule WHERE pg_function_id = $1 AND id <> ALL($2) - `, id, scheduleIds); err != nil { + `, fnc.Id, scheduleIds); err != nil { return err } // set captions - if err := caption.Set_tx(tx, id, captions); err != nil { + if err := caption.Set_tx(ctx, tx, fnc.Id, fnc.Captions); err != nil { return err } // apply function to database - codeFunction, err = processDependentIds_tx(tx, id, codeFunction) + fnc.CodeFunction, err = processDependentIds_tx(ctx, tx, fnc.Id, fnc.CodeFunction) if err != nil { return fmt.Errorf("failed to process entity IDs, %s", err) } - _, err = tx.Exec(db.Ctx, fmt.Sprintf(` + _, err = tx.Exec(ctx, fmt.Sprintf(` CREATE OR REPLACE FUNCTION "%s"."%s"(%s) - RETURNS %s LANGUAGE plpgsql AS %s - `, nameMod, name, codeArgs, codeReturns, codeFunction)) + RETURNS %s LANGUAGE plpgsql %s AS %s + `, nameMod, fnc.Name, fnc.CodeArgs, fnc.CodeReturns, fnc.Volatility, fnc.CodeFunction)) return err } // recreate all PG functions, affected by a changed entity for which a dependency exists // relevant entities: modules, relations, attributes, pg functions -func RecreateAffectedBy_tx(tx pgx.Tx, entity string, entityId uuid.UUID) error { +func RecreateAffectedBy_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID) error { pgFunctionIds := make([]uuid.UUID, 0) - if !tools.StringInSlice(entity, []string{"module", "relation", "attribute", "pg_function"}) { + if !slices.Contains([]string{"module", "relation", "attribute", "pg_function"}, entity) { return errors.New("unknown dependent on entity for pg function") } // stay in transaction to get altered states - rows, err := tx.Query(db.Ctx, fmt.Sprintf(` + rows, err := tx.Query(ctx, fmt.Sprintf(` SELECT pg_function_id FROM app.pg_function_depends WHERE %s_id_on = $1 `, entity), entityId) if err != nil { - return fmt.Errorf("failed to get PG function ID for %s ID %s: %w", - entity, entityId, err) + return fmt.Errorf("failed to get PG function ID for %s ID %s: %w", entity, entityId, err) } + defer rows.Close() for rows.Next() { var id uuid.UUID @@ -314,35 +300,30 @@ func RecreateAffectedBy_tx(tx pgx.Tx, entity string, entityId uuid.UUID) error { } pgFunctionIds = append(pgFunctionIds, id) } - rows.Close() for _, id := range pgFunctionIds { var f types.PgFunction - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT id, module_id, name, code_args, code_function, code_returns, - is_frontend_exec, is_trigger + is_frontend_exec, is_login_sync, is_trigger, volatility FROM app.pg_function WHERE id = $1 - `, id).Scan(&f.Id, &f.ModuleId, &f.Name, &f.CodeArgs, &f.CodeFunction, - &f.CodeReturns, &f.IsFrontendExec, &f.IsTrigger); err != nil { + `, id).Scan(&f.Id, &f.ModuleId, &f.Name, &f.CodeArgs, &f.CodeFunction, &f.CodeReturns, + &f.IsFrontendExec, &f.IsLoginSync, &f.IsTrigger, &f.Volatility); err != nil { return err } - f.Schedules, err = getSchedules_tx(tx, f.Id) + f.Schedules, err = getSchedules_tx(ctx, tx, f.Id) if err != nil { return err } - f.Captions, err = caption.Get("pg_function", f.Id, []string{"pgFunctionTitle", "pgFunctionDesc"}) + f.Captions, err = caption.Get_tx(ctx, tx, "pg_function", f.Id, []string{"pgFunctionTitle", "pgFunctionDesc"}) if err != nil { return err } - - if err := Set_tx(tx, f.ModuleId, f.Id, f.Name, f.CodeArgs, - f.CodeFunction, f.CodeReturns, f.IsFrontendExec, f.IsTrigger, - f.Schedules, f.Captions); err != nil { - + if err := Set_tx(ctx, tx, f); err != nil { return err } } @@ -353,10 +334,10 @@ func RecreateAffectedBy_tx(tx pgx.Tx, entity string, entityId uuid.UUID) error { // as entity names can change any time, keeping IDs is safer // to create a PG function, we need to replace these IDs with proper names // we also store IDs of all entities so that we can create foreign keys and ensure consistency -func processDependentIds_tx(tx pgx.Tx, id uuid.UUID, body string) (string, error) { +func processDependentIds_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID, body string) (string, error) { // rebuilt dependency records for this function - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.pg_function_depends WHERE pg_function_id = $1 `, id); err != nil { @@ -383,12 +364,12 @@ func processDependentIds_tx(tx pgx.Tx, id uuid.UUID, body string) (string, error } idMap[modId] = true - modName, err := schema.GetModuleNameById_tx(tx, modId) + modName, err := schema.GetModuleNameById_tx(ctx, tx, modId) if err != nil { return "", err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.pg_function_depends (pg_function_id, module_id_on) VALUES ($1,$2) `, id, modId); err != nil { @@ -417,12 +398,12 @@ func processDependentIds_tx(tx pgx.Tx, id uuid.UUID, body string) (string, error } idMap[fncId] = true - fncName, err := schema.GetPgFunctionNameById_tx(tx, fncId) + fncName, err := schema.GetPgFunctionNameById_tx(ctx, tx, fncId) if err != nil { return "", err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.pg_function_depends (pg_function_id, pg_function_id_on) VALUES ($1,$2) `, id, fncId); err != nil { @@ -451,12 +432,12 @@ func processDependentIds_tx(tx pgx.Tx, id uuid.UUID, body string) (string, error } idMap[relId] = true - _, relName, err := schema.GetRelationNamesById_tx(tx, relId) + _, relName, err := schema.GetRelationNamesById_tx(ctx, tx, relId) if err != nil { return "", err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.pg_function_depends (pg_function_id, relation_id_on) VALUES ($1,$2) `, id, relId); err != nil { @@ -485,12 +466,12 @@ func processDependentIds_tx(tx pgx.Tx, id uuid.UUID, body string) (string, error } idMap[atrId] = true - atrName, err := schema.GetAttributeNameById_tx(tx, atrId) + atrName, err := schema.GetAttributeNameById_tx(ctx, tx, atrId) if err != nil { return "", err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.pg_function_depends (pg_function_id, attribute_id_on) VALUES ($1,$2) `, id, atrId); err != nil { diff --git a/schema/pgIndex/pgIndex.go b/schema/pgIndex/pgIndex.go index 99d779d6..7646e351 100644 --- a/schema/pgIndex/pgIndex.go +++ b/schema/pgIndex/pgIndex.go @@ -1,10 +1,11 @@ package pgIndex import ( + "context" "errors" "fmt" - "r3/db" "r3/schema" + "r3/schema/compatible" "r3/types" "strings" @@ -12,12 +13,12 @@ import ( "github.com/jackc/pgx/v5" ) -func DelAutoFkiForAttribute_tx(tx pgx.Tx, attributeId uuid.UUID) error { +func DelAutoFkiForAttribute_tx(ctx context.Context, tx pgx.Tx, attributeId uuid.UUID) error { // get ID of automatically created FK index for relationship attribute var pgIndexId uuid.UUID - err := tx.QueryRow(db.Ctx, ` + err := tx.QueryRow(ctx, ` SELECT i.id FROM app.pg_index AS i INNER JOIN app.pg_index_attribute AS a ON a.pg_index_id = i.id @@ -36,56 +37,58 @@ func DelAutoFkiForAttribute_tx(tx pgx.Tx, attributeId uuid.UUID) error { } // delete auto FK index for attribute - return Del_tx(tx, pgIndexId) + return Del_tx(ctx, tx, pgIndexId) } -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - moduleName, _, err := schema.GetPgIndexNamesById_tx(tx, id) + moduleName, _, err := schema.GetPgIndexNamesById_tx(ctx, tx, id) if err != nil { return err } // can also be deleted by cascaded entity (relation/attribute) // drop if it still exists - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DROP INDEX IF EXISTS "%s"."%s" `, moduleName, schema.GetPgIndexName(id))); err != nil { return err } - _, err = tx.Exec(db.Ctx, `DELETE FROM app.pg_index WHERE id = $1`, id) + _, err = tx.Exec(ctx, `DELETE FROM app.pg_index WHERE id = $1`, id) return err } -func Get(relationId uuid.UUID) ([]types.PgIndex, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID) ([]types.PgIndex, error) { pgIndexes := make([]types.PgIndex, 0) - rows, err := db.Pool.Query(db.Ctx, ` - SELECT id, no_duplicates, auto_fki, primary_key + rows, err := tx.Query(ctx, ` + SELECT id, attribute_id_dict, method, no_duplicates, auto_fki, primary_key FROM app.pg_index WHERE relation_id = $1 - -- an order is required for hash comparisson (module changes) - ORDER BY auto_fki DESC, id ASC + -- an order is required for hash comparison (module changes) + ORDER BY primary_key DESC, auto_fki DESC, id ASC `, relationId) if err != nil { return pgIndexes, err } + defer rows.Close() for rows.Next() { var pgi types.PgIndex - if err := rows.Scan(&pgi.Id, &pgi.NoDuplicates, &pgi.AutoFki, &pgi.PrimaryKey); err != nil { + if err := rows.Scan(&pgi.Id, &pgi.AttributeIdDict, &pgi.Method, + &pgi.NoDuplicates, &pgi.AutoFki, &pgi.PrimaryKey); err != nil { + return pgIndexes, err } pgi.RelationId = relationId pgIndexes = append(pgIndexes, pgi) } - rows.Close() // get index attributes for i, pgi := range pgIndexes { - pgi.Attributes, err = GetAttributes(pgi.Id) + pgi.Attributes, err = getAttributes_tx(ctx, tx, pgi.Id) if err != nil { return pgIndexes, err } @@ -94,10 +97,10 @@ func Get(relationId uuid.UUID) ([]types.PgIndex, error) { return pgIndexes, nil } -func GetAttributes(pgIndexId uuid.UUID) ([]types.PgIndexAttribute, error) { +func getAttributes_tx(ctx context.Context, tx pgx.Tx, pgIndexId uuid.UUID) ([]types.PgIndexAttribute, error) { attributes := make([]types.PgIndexAttribute, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT attribute_id, order_asc FROM app.pg_index_attribute WHERE pg_index_id = $1 @@ -120,15 +123,16 @@ func GetAttributes(pgIndexId uuid.UUID) ([]types.PgIndexAttribute, error) { return attributes, nil } -func SetAutoFkiForAttribute_tx(tx pgx.Tx, relationId uuid.UUID, attributeId uuid.UUID, noDuplicates bool) error { - return Set_tx(tx, types.PgIndex{ +func SetAutoFkiForAttribute_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, attributeId uuid.UUID, noDuplicates bool) error { + return Set_tx(ctx, tx, types.PgIndex{ Id: uuid.Nil, RelationId: relationId, AutoFki: true, + Method: "BTREE", NoDuplicates: noDuplicates, PrimaryKey: false, Attributes: []types.PgIndexAttribute{ - types.PgIndexAttribute{ + { AttributeId: attributeId, Position: 0, OrderAsc: true, @@ -136,15 +140,16 @@ func SetAutoFkiForAttribute_tx(tx pgx.Tx, relationId uuid.UUID, attributeId uuid }, }) } -func SetPrimaryKeyForAttribute_tx(tx pgx.Tx, relationId uuid.UUID, attributeId uuid.UUID) error { - return Set_tx(tx, types.PgIndex{ +func SetPrimaryKeyForAttribute_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, attributeId uuid.UUID) error { + return Set_tx(ctx, tx, types.PgIndex{ Id: uuid.Nil, RelationId: relationId, AutoFki: false, + Method: "BTREE", NoDuplicates: true, PrimaryKey: true, Attributes: []types.PgIndexAttribute{ - types.PgIndexAttribute{ + { AttributeId: attributeId, Position: 0, OrderAsc: true, @@ -152,13 +157,14 @@ func SetPrimaryKeyForAttribute_tx(tx pgx.Tx, relationId uuid.UUID, attributeId u }, }) } -func Set_tx(tx pgx.Tx, pgi types.PgIndex) error { +func Set_tx(ctx context.Context, tx pgx.Tx, pgi types.PgIndex) error { if len(pgi.Attributes) == 0 { return errors.New("cannot create index without attributes") } - known, err := schema.CheckCreateId_tx(tx, &pgi.Id, "pg_index", "id") + var err error + known, err := schema.CheckCreateId_tx(ctx, tx, &pgi.Id, "pg_index", "id") if err != nil { return err } @@ -168,32 +174,38 @@ func Set_tx(tx pgx.Tx, pgi types.PgIndex) error { return nil } - // insert pg index reference - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.pg_index ( - id, relation_id, no_duplicates, auto_fki, primary_key) - VALUES ($1,$2,$3,$4,$5) - `, pgi.Id, pgi.RelationId, pgi.NoDuplicates, pgi.AutoFki, pgi.PrimaryKey); err != nil { - return err - } + pgi.Method = compatible.FixPgIndexMethod(pgi.Method) - // work out PG index columns - indexCols := make([]string, 0) - for position, atr := range pgi.Attributes { + isGin := pgi.Method == "GIN" + isBtree := pgi.Method == "BTREE" - name, err := schema.GetAttributeNameById_tx(tx, atr.AttributeId) - if err != nil { - return err - } + if !isGin && !isBtree { + return fmt.Errorf("unsupported index type '%s'", pgi.Method) + } - order := "ASC" - if !atr.OrderAsc { - order = "DESC" - } - indexCols = append(indexCols, fmt.Sprintf(`"%s" %s`, name, order)) + if isGin && len(pgi.Attributes) != 1 { + // we currently use GIN exclusively with to_tsvector on a single column + // reason: doing any regular lookup (such as quick filters) checks attributes individually + // the same with complex filters where each line is a single attribute + return fmt.Errorf("text index must have a single attribute") + } - // insert index attribute references - if _, err := tx.Exec(db.Ctx, ` + if isGin { + // no unique constraints on GIN + pgi.NoDuplicates = false + } + + // insert pg index references + if _, err := tx.Exec(ctx, ` + INSERT INTO app.pg_index (id, relation_id, attribute_id_dict, + method, no_duplicates, auto_fki, primary_key) + VALUES ($1,$2,$3,$4,$5,$6,$7) + `, pgi.Id, pgi.RelationId, pgi.AttributeIdDict, pgi.Method, + pgi.NoDuplicates, pgi.AutoFki, pgi.PrimaryKey); err != nil { + return err + } + for position, atr := range pgi.Attributes { + if _, err := tx.Exec(ctx, ` INSERT INTO app.pg_index_attribute ( pg_index_id, attribute_id, position, order_asc) VALUES ($1,$2,$3,$4) @@ -208,20 +220,59 @@ func Set_tx(tx pgx.Tx, pgi types.PgIndex) error { } // create index in module - moduleName, relationName, err := schema.GetRelationNamesById_tx(tx, pgi.RelationId) + indexDef := "" + if isBtree { + indexCols := make([]string, 0) + for _, atr := range pgi.Attributes { + name, err := schema.GetAttributeNameById_tx(ctx, tx, atr.AttributeId) + if err != nil { + return err + } + order := "ASC" + if !atr.OrderAsc { + order = "DESC" + } + indexCols = append(indexCols, fmt.Sprintf(`"%s" %s`, name, order)) + } + indexDef = fmt.Sprintf("BTREE (%s)", strings.Join(indexCols, ",")) + } + + if isGin { + nameDict := "" + if pgi.AttributeIdDict.Valid { + nameDict, err = schema.GetAttributeNameById_tx(ctx, tx, pgi.AttributeIdDict.Bytes) + if err != nil { + return err + } + } + + name, err := schema.GetAttributeNameById_tx(ctx, tx, pgi.Attributes[0].AttributeId) + if err != nil { + return err + } + + if nameDict == "" { + indexDef = fmt.Sprintf("GIN (TO_TSVECTOR('simple'::REGCONFIG,%s))", name) + } else { + indexDef = fmt.Sprintf("GIN (TO_TSVECTOR(CASE WHEN %s IS NULL THEN 'simple'::REGCONFIG ELSE %s END,%s))", + nameDict, nameDict, name) + } + + } + + modName, relName, err := schema.GetRelationNamesById_tx(ctx, tx, pgi.RelationId) if err != nil { return err } - options := "INDEX" + indexType := "INDEX" if pgi.NoDuplicates { - options = "UNIQUE INDEX" + indexType = "UNIQUE INDEX" } - _, err = tx.Exec(db.Ctx, fmt.Sprintf(` - CREATE %s "%s" ON "%s"."%s" (%s) - `, options, schema.GetPgIndexName(pgi.Id), moduleName, relationName, - strings.Join(indexCols, ","))) + _, err = tx.Exec(ctx, fmt.Sprintf(` + CREATE %s "%s" ON "%s"."%s" USING %s + `, indexType, schema.GetPgIndexName(pgi.Id), modName, relName, indexDef)) return err } diff --git a/schema/pgTrigger/pgTrigger.go b/schema/pgTrigger/pgTrigger.go index 77e00f64..19adcd24 100644 --- a/schema/pgTrigger/pgTrigger.go +++ b/schema/pgTrigger/pgTrigger.go @@ -1,32 +1,32 @@ package pgTrigger import ( + "context" "errors" "fmt" - "r3/db" "r3/schema" - "r3/tools" "r3/types" + "slices" "strings" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - nameMod, nameRel, err := schema.GetPgTriggerNamesById_tx(tx, id) + nameMod, nameRel, err := schema.GetPgTriggerNamesById_tx(ctx, tx, id) if err != nil { return err } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DROP TRIGGER "%s" ON "%s"."%s" `, getName(id), nameMod, nameRel)); err != nil { return err } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.pg_trigger WHERE id = $1 `, id); err != nil { @@ -35,18 +35,17 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { return nil } -func Get(relationId uuid.UUID) ([]types.PgTrigger, error) { - +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.PgTrigger, error) { triggers := make([]types.PgTrigger, 0) - rows, err := db.Pool.Query(db.Ctx, ` - SELECT id, pg_function_id, on_insert, on_update, on_delete, + rows, err := tx.Query(ctx, ` + SELECT id, relation_id, pg_function_id, on_insert, on_update, on_delete, is_constraint, is_deferrable, is_deferred, per_row, fires, code_condition FROM app.pg_trigger - WHERE relation_id = $1 - ORDER BY id ASC -- an order is required for hash comparisson (module changes) - `, relationId) + WHERE module_id = $1 + ORDER BY id ASC -- an order is required for hash comparison (module changes) + `, moduleId) if err != nil { return triggers, err } @@ -55,76 +54,75 @@ func Get(relationId uuid.UUID) ([]types.PgTrigger, error) { for rows.Next() { var t types.PgTrigger - if err := rows.Scan(&t.Id, &t.PgFunctionId, &t.OnInsert, &t.OnUpdate, - &t.OnDelete, &t.IsConstraint, &t.IsDeferrable, &t.IsDeferred, - &t.PerRow, &t.Fires, &t.CodeCondition); err != nil { + if err := rows.Scan(&t.Id, &t.RelationId, &t.PgFunctionId, &t.OnInsert, + &t.OnUpdate, &t.OnDelete, &t.IsConstraint, &t.IsDeferrable, + &t.IsDeferred, &t.PerRow, &t.Fires, &t.CodeCondition); err != nil { return triggers, err } - t.RelationId = relationId + t.ModuleId = moduleId triggers = append(triggers, t) } return triggers, nil } -func Set_tx(tx pgx.Tx, pgFunctionId uuid.UUID, id uuid.UUID, - relationId uuid.UUID, onInsert bool, onUpdate bool, onDelete bool, - isConstraint bool, isDeferrable bool, isDeferred bool, perRow bool, - fires string, codeCondition string) error { +func Set_tx(ctx context.Context, tx pgx.Tx, trg types.PgTrigger) error { - nameMod, nameRel, err := schema.GetRelationNamesById_tx(tx, relationId) + nameMod, nameRel, err := schema.GetRelationNamesById_tx(ctx, tx, trg.RelationId) if err != nil { return err } - known, err := schema.CheckCreateId_tx(tx, &id, "pg_trigger", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &trg.Id, "pg_trigger", "id") if err != nil { return err } // overwrite invalid options - if !tools.StringInSlice(fires, []string{"BEFORE", "AFTER"}) { + if !slices.Contains([]string{"BEFORE", "AFTER"}, trg.Fires) { return errors.New("invalid trigger start") } - if !perRow || fires != "AFTER" { // constraint trigger must be AFTER EACH ROW - isConstraint = false - isDeferrable = false - isDeferred = false - } else if !isConstraint { // deferrable only available for constraint triggers - isDeferrable = false - isDeferred = false - } else if !isDeferrable { // cannot defer, non-deferrable trigger< - isDeferred = false + if !trg.PerRow || trg.Fires != "AFTER" { // constraint trigger must be AFTER EACH ROW + trg.IsConstraint = false + trg.IsDeferrable = false + trg.IsDeferred = false + } else if !trg.IsConstraint { // deferrable only available for constraint triggers + trg.IsDeferrable = false + trg.IsDeferred = false + } else if !trg.IsDeferrable { // cannot defer, non-deferrable trigger< + trg.IsDeferred = false } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.pg_trigger SET pg_function_id = $1, on_insert = $2, on_update = $3, on_delete = $4, is_constraint = $5, is_deferrable = $6, is_deferred = $7, per_row = $8, fires = $9, code_condition = $10 WHERE id = $11 - `, pgFunctionId, onInsert, onUpdate, onDelete, isConstraint, isDeferrable, - isDeferred, perRow, fires, codeCondition, id); err != nil { + `, trg.PgFunctionId, trg.OnInsert, trg.OnUpdate, trg.OnDelete, + trg.IsConstraint, trg.IsDeferrable, trg.IsDeferred, trg.PerRow, + trg.Fires, trg.CodeCondition, trg.Id); err != nil { return err } // remove existing trigger - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DROP TRIGGER "%s" ON "%s"."%s" - `, getName(id), nameMod, nameRel)); err != nil { + `, getName(trg.Id), nameMod, nameRel)); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.pg_trigger (id, pg_function_id, relation_id, + if _, err := tx.Exec(ctx, ` + INSERT INTO app.pg_trigger (id, module_id, pg_function_id, relation_id, on_insert, on_update, on_delete, is_constraint, is_deferrable, is_deferred, per_row, fires, code_condition) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12) - `, id, pgFunctionId, relationId, onInsert, onUpdate, onDelete, isConstraint, - isDeferrable, isDeferred, perRow, fires, codeCondition); err != nil { + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13) + `, trg.Id, trg.ModuleId, trg.PgFunctionId, trg.RelationId, trg.OnInsert, + trg.OnUpdate, trg.OnDelete, trg.IsConstraint, trg.IsDeferrable, + trg.IsDeferred, trg.PerRow, trg.Fires, trg.CodeCondition); err != nil { return err } @@ -132,13 +130,13 @@ func Set_tx(tx pgx.Tx, pgFunctionId uuid.UUID, id uuid.UUID, // process options events := make([]string, 0) - if onInsert { + if trg.OnInsert { events = append(events, "INSERT") } - if onUpdate { + if trg.OnUpdate { events = append(events, "UPDATE") } - if onDelete { + if trg.OnDelete { events = append(events, "DELETE") } if len(events) == 0 { @@ -146,23 +144,23 @@ func Set_tx(tx pgx.Tx, pgFunctionId uuid.UUID, id uuid.UUID, } forEach := "STATEMENT" - if perRow { + if trg.PerRow { forEach = "ROW" } condition := "" - if codeCondition != "" { - condition = fmt.Sprintf("WHEN (%s)", codeCondition) + if trg.CodeCondition != "" { + condition = fmt.Sprintf("WHEN (%s)", trg.CodeCondition) } // constraint trigger options triggerType := "TRIGGER" constraint := "" - if isConstraint { + if trg.IsConstraint { triggerType = "CONSTRAINT TRIGGER" - if isDeferrable { - if !isDeferred { + if trg.IsDeferrable { + if !trg.IsDeferred { constraint = "DEFERRABLE" } else { constraint = "DEFERRABLE INITIALLY DEFERRED" @@ -171,12 +169,12 @@ func Set_tx(tx pgx.Tx, pgFunctionId uuid.UUID, id uuid.UUID, } // create trigger - _, nameFnc, argsFnc, _, err := schema.GetPgFunctionDetailsById_tx(tx, pgFunctionId) + nameModFnc, nameFnc, argsFnc, _, err := schema.GetPgFunctionDetailsById_tx(ctx, tx, trg.PgFunctionId) if err != nil { return err } - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` CREATE %s "%s" %s %s ON "%s"."%s" @@ -184,13 +182,13 @@ func Set_tx(tx pgx.Tx, pgFunctionId uuid.UUID, id uuid.UUID, FOR EACH %s %s EXECUTE FUNCTION "%s"."%s"(%s) - `, triggerType, getName(id), - fires, strings.Join(events, " OR "), + `, triggerType, getName(trg.Id), + trg.Fires, strings.Join(events, " OR "), nameMod, nameRel, constraint, forEach, condition, - nameMod, nameFnc, argsFnc)); err != nil { + nameModFnc, nameFnc, argsFnc)); err != nil { return err } diff --git a/schema/preset/preset.go b/schema/preset/preset.go index 411b0e48..f402bb8d 100644 --- a/schema/preset/preset.go +++ b/schema/preset/preset.go @@ -1,10 +1,11 @@ package preset import ( + "context" "errors" "fmt" - "r3/db" "r3/schema" + "r3/schema/compatible" "r3/types" "strings" @@ -12,18 +13,18 @@ import ( "github.com/jackc/pgx/v5" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { var recordId int64 var modName, relName string var protected bool - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT pr.record_id_wofk, r.name, m.name, p.protected FROM app.preset AS p INNER JOIN instance.preset_record AS pr ON pr.preset_id = p.id - INNER JOIN app.relation AS r ON r.id = p.relation_id - INNER JOIN app.module AS m ON m.id = r.module_id + INNER JOIN app.relation AS r ON r.id = p.relation_id + INNER JOIN app.module AS m ON m.id = r.module_id WHERE p.id = $1 `, id).Scan(&recordId, &relName, &modName, &protected); err != nil && err != pgx.ErrNoRows { return err @@ -33,7 +34,7 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { // protected records are system-relevant and are controlled by the module author, they decided when they are deleted // non-protected records are optional and can be controlled by the instance users, they might want to keep them if protected && recordId != 0 { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DELETE FROM "%s"."%s" WHERE id = $1 `, modName, relName), recordId); err != nil { @@ -41,7 +42,7 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { } } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.preset WHERE id = $1 `, id); err != nil { @@ -50,11 +51,11 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { return nil } -func Get(relationId uuid.UUID) ([]types.Preset, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID) ([]types.Preset, error) { presets := make([]types.Preset, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, name, protected FROM app.preset WHERE relation_id = $1 @@ -63,22 +64,20 @@ func Get(relationId uuid.UUID) ([]types.Preset, error) { if err != nil { return presets, err } + defer rows.Close() for rows.Next() { var p types.Preset if err := rows.Scan(&p.Id, &p.Name, &p.Protected); err != nil { - rows.Close() return presets, err } p.RelationId = relationId presets = append(presets, p) } - rows.Close() // get preset values for i, p := range presets { - - presets[i].Values, err = getValues(p.Id) + presets[i].Values, err = getValues_tx(ctx, tx, p.Id) if err != nil { return presets, err } @@ -89,26 +88,25 @@ func Get(relationId uuid.UUID) ([]types.Preset, error) { // set preset // included setting of preset values and creation/update of preset record // returns whether preset record was created/updated -func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, +func Set_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, protected bool, values []types.PresetValue) error { if len(values) == 0 { return errors.New("cannot set preset with zero values") } - // resolve dependencies - modName, relName, err := schema.GetRelationNamesById_tx(tx, relationId) + modName, relName, err := schema.GetRelationNamesById_tx(ctx, tx, relationId) if err != nil { return err } - known, err := schema.CheckCreateId_tx(tx, &id, "preset", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &id, "preset", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.preset SET name = $1, protected = $2 WHERE id = $3 @@ -116,7 +114,7 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.preset (id, relation_id, name, protected) VALUES ($1,$2,$3,$4) `, id, relationId, name, protected); err != nil { @@ -125,7 +123,7 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, // instance data reference // connects preset from schema to record from instance - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO instance.preset_record (preset_id, record_id_wofk) VALUES ($1,0) `, id); err != nil { @@ -134,7 +132,7 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, } // set new preset values - if err := setValues_tx(tx, id, values); err != nil { + if err := setValues_tx(ctx, tx, relationId, id, values); err != nil { return err } @@ -145,7 +143,7 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, var recordExists bool = false var fullRelName = fmt.Sprintf(`"%s"."%s"`, modName, relName) - if err := tx.QueryRow(db.Ctx, fmt.Sprintf(` + if err := tx.QueryRow(ctx, fmt.Sprintf(` SELECT record_id_wofk, EXISTS( SELECT FROM %s WHERE "%s" = record_id_wofk @@ -159,7 +157,7 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, if recordExists { // update preset record if available - if err := setRecord_tx(tx, relationId, id, recordId, values, fullRelName); err != nil { + if err := setRecord_tx(ctx, tx, id, recordId, values, fullRelName); err != nil { return err } @@ -168,7 +166,7 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, // * it did not exist before or // * it did exist, but not anymore and is currently a protected preset // (preset record was deleted before it was protected) - if err := setRecord_tx(tx, relationId, id, 0, values, fullRelName); err != nil { + if err := setRecord_tx(ctx, tx, id, 0, values, fullRelName); err != nil { return err } } @@ -176,14 +174,14 @@ func Set_tx(tx pgx.Tx, relationId uuid.UUID, id uuid.UUID, name string, } // preset values -func getValues(presetId uuid.UUID) ([]types.PresetValue, error) { +func getValues_tx(ctx context.Context, tx pgx.Tx, presetId uuid.UUID) ([]types.PresetValue, error) { values := make([]types.PresetValue, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, preset_id, preset_id_refer, attribute_id, protected, value FROM app.preset_value WHERE preset_id = $1 - ORDER BY attribute_id ASC -- an order is required for hash comparisson (module changes) + ORDER BY attribute_id ASC -- an order is required for hash comparison (module changes) -- we use attribute ID for better value preview in builder UI `, presetId) if err != nil { @@ -193,9 +191,7 @@ func getValues(presetId uuid.UUID) ([]types.PresetValue, error) { for rows.Next() { var v types.PresetValue - if err := rows.Scan(&v.Id, &v.PresetId, &v.PresetIdRefer, &v.AttributeId, - &v.Protected, &v.Value); err != nil { - + if err := rows.Scan(&v.Id, &v.PresetId, &v.PresetIdRefer, &v.AttributeId, &v.Protected, &v.Value); err != nil { return values, err } values = append(values, v) @@ -203,10 +199,10 @@ func getValues(presetId uuid.UUID) ([]types.PresetValue, error) { return values, nil } -func setValues_tx(tx pgx.Tx, presetId uuid.UUID, values []types.PresetValue) error { +func setValues_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, values []types.PresetValue) error { // delete old preset values - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.preset_value WHERE preset_id = $1 `, presetId); err != nil { @@ -224,7 +220,21 @@ func setValues_tx(tx pgx.Tx, presetId uuid.UUID, values []types.PresetValue) err } } - if _, err := tx.Exec(db.Ctx, ` + // make sure that preset values belong to the correct relation + var relationIdAtr uuid.UUID + if err := tx.QueryRow(ctx, ` + SELECT relation_id + FROM app.attribute + WHERE id = $1 + `, value.AttributeId).Scan(&relationIdAtr); err != nil { + return err + } + + if relationIdAtr.String() != relationId.String() { + return fmt.Errorf("cannot save preset values, at least 1 attribute value is from a different relation") + } + + if _, err := tx.Exec(ctx, ` INSERT INTO app.preset_value (id, preset_id, preset_id_refer, attribute_id, protected, value) VALUES ($1,$2,$3,$4,$5,$6) @@ -239,8 +249,7 @@ func setValues_tx(tx pgx.Tx, presetId uuid.UUID, values []types.PresetValue) err // set preset record // returns whether record could be created/updated -func setRecord_tx(tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, recordId int64, - values []types.PresetValue, fullRelName string) error { +func setRecord_tx(ctx context.Context, tx pgx.Tx, presetId uuid.UUID, recordId int64, values []types.PresetValue, fullRelName string) error { sqlRefs := make([]string, 0) sqlNames := make([]string, 0) @@ -251,43 +260,44 @@ func setRecord_tx(tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, recordId for _, value := range values { // only update existing values if they are protected - // unprotected values can be overwritten by customer - // in effect, unprotected values work as one-time-only values (pre-filled data) + // unprotected values can be overwritten by customer (one-time-only values, like pre-filled or example data) if !isNew && !value.Protected { continue } - atrName, err := schema.GetAttributeNameById_tx(tx, value.AttributeId) + _, _, atrName, atrContent, err := schema.GetAttributeDetailsById_tx(ctx, tx, value.AttributeId) if err != nil { return err } - // check for fixed value - if !value.PresetIdRefer.Valid { - - if value.Value == "" { - // no value set, ignore - continue - } - sqlNames = append(sqlNames, fmt.Sprintf(`"%s"`, atrName)) - sqlValues = append(sqlValues, value.Value) + if schema.IsContentFiles(atrContent) { + // files cannot be applied via presets continue } - // use refered preset record ID as value - recordId, exists, err := getRecordIdByReferal_tx(tx, value.PresetIdRefer.Bytes) - if err != nil { - return err - } + sqlNames = append(sqlNames, fmt.Sprintf(`"%s"`, atrName)) - // if refered record does not exist, do not set record - // otherwise potential NOT NULL constraint would be breached - if !exists { - return fmt.Errorf("referenced preset '%s' does not exist", - uuid.FromBytesOrNil(value.PresetIdRefer.Bytes[:])) + if schema.IsContentRelationship(atrContent) { + if value.PresetIdRefer.Valid { + // use referred preset record ID as value + recordIdRefer, exists, err := getRecordIdByReferal_tx(ctx, tx, value.PresetIdRefer.Bytes) + if err != nil { + return err + } + + // if referred record does not exist, do not set record + // otherwise potential NOT NULL constraint would be breached + if !exists { + return fmt.Errorf("referenced preset '%s' does not exist", value.PresetIdRefer.String()) + } + + sqlValues = append(sqlValues, recordIdRefer) + } else { + sqlValues = append(sqlValues, nil) + } + } else { + sqlValues = append(sqlValues, compatible.FixPresetNull(value.Value)) } - sqlNames = append(sqlNames, fmt.Sprintf(`"%s"`, atrName)) - sqlValues = append(sqlValues, recordId) } if isNew { @@ -295,7 +305,7 @@ func setRecord_tx(tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, recordId sqlRefs = append(sqlRefs, fmt.Sprintf(`$%d`, i+1)) } - if err := tx.QueryRow(db.Ctx, fmt.Sprintf(` + if err := tx.QueryRow(ctx, fmt.Sprintf(` INSERT INTO %s (%s) VALUES (%s) RETURNING "%s" @@ -309,7 +319,7 @@ func setRecord_tx(tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, recordId } // connect instance record ID to preset - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE instance.preset_record SET record_id_wofk = $1 WHERE preset_id = $2 @@ -325,7 +335,7 @@ func setRecord_tx(tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, recordId refId := fmt.Sprintf("$%d", len(sqlRefs)+1) sqlValues = append(sqlValues, recordId) - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` UPDATE %s SET %s WHERE "%s" = %s @@ -342,21 +352,21 @@ func setRecord_tx(tx pgx.Tx, relationId uuid.UUID, presetId uuid.UUID, recordId return nil } -// get ID of refered preset record -// returns record ID and whether refered record actually exists +// get ID of referred preset record +// returns record ID and whether referred record actually exists // (unprotected preset record can get deleted) -func getRecordIdByReferal_tx(tx pgx.Tx, presetId uuid.UUID) (int64, bool, error) { +func getRecordIdByReferal_tx(ctx context.Context, tx pgx.Tx, presetId uuid.UUID) (int64, bool, error) { var recordId int64 var relName string var modName string - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT pr.record_id_wofk, r.name, m.name FROM instance.preset_record AS pr - INNER JOIN app.preset AS p ON p.id = pr.preset_id + INNER JOIN app.preset AS p ON p.id = pr.preset_id INNER JOIN app.relation AS r ON r.id = p.relation_id - INNER JOIN app.module AS m ON m.id = r.module_id + INNER JOIN app.module AS m ON m.id = r.module_id WHERE pr.preset_id = $1 `, presetId).Scan(&recordId, &relName, &modName); err != nil && err != pgx.ErrNoRows { return 0, false, err @@ -369,7 +379,7 @@ func getRecordIdByReferal_tx(tx pgx.Tx, presetId uuid.UUID) (int64, bool, error) // check whether preset record actually exist (might have been deleted) exists := false - if err := tx.QueryRow(db.Ctx, fmt.Sprintf(` + if err := tx.QueryRow(ctx, fmt.Sprintf(` SELECT EXISTS ( SELECT FROM "%s"."%s" WHERE id = $1 diff --git a/schema/query/query.go b/schema/query/query.go index 8e108e93..36f3798a 100644 --- a/schema/query/query.go +++ b/schema/query/query.go @@ -1,13 +1,12 @@ package query import ( + "context" "errors" "fmt" - "r3/db" - "r3/schema" "r3/schema/caption" - "r3/tools" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" @@ -16,7 +15,7 @@ import ( var allowedEntities = []string{"api", "form", "field", "collection", "column", "query_filter_query"} -func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types.Query, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, entity string, id uuid.UUID, filterIndex int, filterPosition int, filterSide int) (types.Query, error) { var q types.Query q.Joins = make([]types.QueryJoin, 0) @@ -25,7 +24,7 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types q.Lookups = make([]types.QueryLookup, 0) q.Choices = make([]types.QueryChoice, 0) - if !tools.StringInSlice(entity, allowedEntities) { + if !slices.Contains(allowedEntities, entity) { return q, errors.New("bad entity") } @@ -33,12 +32,13 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types filterClause := "" if entity == "query_filter_query" { filterClause = fmt.Sprintf(` + AND query_filter_index = %d AND query_filter_position = %d - AND query_filter_side = %d - `, filterPosition, filterSide) + AND query_filter_side = %d + `, filterIndex, filterPosition, filterSide) } - err := db.Pool.QueryRow(db.Ctx, fmt.Sprintf(` + err := tx.QueryRow(ctx, fmt.Sprintf(` SELECT id, relation_id, fixed_limit FROM app.query WHERE %s_id = $1 @@ -55,7 +55,7 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types } // retrieve joins - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT relation_id, attribute_id, index_from, index, connector, apply_create, apply_update, apply_delete FROM app.query_join @@ -65,29 +65,27 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types if err != nil { return q, err } + defer rows.Close() for rows.Next() { var j types.QueryJoin - if err := rows.Scan(&j.RelationId, &j.AttributeId, &j.IndexFrom, - &j.Index, &j.Connector, &j.ApplyCreate, &j.ApplyUpdate, - &j.ApplyDelete); err != nil { + if err := rows.Scan(&j.RelationId, &j.AttributeId, &j.IndexFrom, &j.Index, + &j.Connector, &j.ApplyCreate, &j.ApplyUpdate, &j.ApplyDelete); err != nil { - rows.Close() return q, err } q.Joins = append(q.Joins, j) } - rows.Close() // retrieve filters - q.Filters, err = getFilters(q.Id, pgtype.UUID{}) + q.Filters, err = getFilters_tx(ctx, tx, q.Id, pgtype.UUID{}) if err != nil { return q, err } // retrieve orderings - rows, err = db.Pool.Query(db.Ctx, ` + rows, err = tx.Query(ctx, ` SELECT attribute_id, index, ascending FROM app.query_order WHERE query_id = $1 @@ -96,20 +94,19 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types if err != nil { return q, err } + defer rows.Close() for rows.Next() { var o types.QueryOrder if err := rows.Scan(&o.AttributeId, &o.Index, &o.Ascending); err != nil { - rows.Close() return q, err } q.Orders = append(q.Orders, o) } - rows.Close() // retrieve lookups - rows, err = db.Pool.Query(db.Ctx, ` + rows, err = tx.Query(ctx, ` SELECT pg_index_id, index FROM app.query_lookup WHERE query_id = $1 @@ -118,20 +115,19 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types if err != nil { return q, err } + defer rows.Close() for rows.Next() { var l types.QueryLookup if err := rows.Scan(&l.PgIndexId, &l.Index); err != nil { - rows.Close() return q, err } q.Lookups = append(q.Lookups, l) } - rows.Close() // retrieve choices - rows, err = db.Pool.Query(db.Ctx, ` + rows, err = tx.Query(ctx, ` SELECT id, name FROM app.query_choice WHERE query_id = $1 @@ -140,28 +136,25 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types if err != nil { return q, err } + defer rows.Close() for rows.Next() { var c types.QueryChoice if err := rows.Scan(&c.Id, &c.Name); err != nil { - rows.Close() return q, err } q.Choices = append(q.Choices, c) } - rows.Close() for i, c := range q.Choices { - c.Filters, err = getFilters(q.Id, pgtype.UUID{Bytes: c.Id, Valid: true}) + c.Filters, err = getFilters_tx(ctx, tx, q.Id, pgtype.UUID{Bytes: c.Id, Valid: true}) if err != nil { - rows.Close() return q, err } - c.Captions, err = caption.Get("query_choice", c.Id, []string{"queryChoiceTitle"}) + c.Captions, err = caption.Get_tx(ctx, tx, "query_choice", c.Id, []string{"queryChoiceTitle"}) if err != nil { - rows.Close() return q, err } q.Choices[i] = c @@ -169,79 +162,94 @@ func Get(entity string, id uuid.UUID, filterPosition int, filterSide int) (types return q, nil } -func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, - filterSide int, query types.Query) error { +func Set_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, filterIndex int, + filterPosition int, filterSide int, query types.Query) error { - if !tools.StringInSlice(entity, allowedEntities) { + if !slices.Contains(allowedEntities, entity) { return fmt.Errorf("unknown query parent entity '%s'", entity) } - // sub query (via query filter) requires second element for key var err error - known := false + createNew := false + noBaseRelation := !query.RelationId.Valid subQuery := entity == "query_filter_query" - if !subQuery { - known, err = schema.CheckCreateId_tx(tx, &entityId, "query", fmt.Sprintf("%s_id", entity)) + // check if its a new query, old query (for the same entity) still needs to be checked as it could have been remade + if query.Id == uuid.Nil { + query.Id, err = uuid.NewV4() if err != nil { return err } + createNew = true + } + + // check whether a query for the parent entity already exists + var queryIdExisting pgtype.UUID + + if !subQuery { + if err := tx.QueryRow(ctx, fmt.Sprintf(` + SELECT id + FROM app.query + WHERE %s_id = $1 + `, entity), entityId).Scan(&queryIdExisting); err != nil && err != pgx.ErrNoRows { + return err + } } else { - if err := tx.QueryRow(db.Ctx, ` - SELECT EXISTS( - SELECT id - FROM app.query - WHERE query_filter_query_id = $1 - AND query_filter_position = $2 - AND query_filter_side = $3 - ) - `, entityId, filterPosition, filterSide).Scan(&known); err != nil { + if err := tx.QueryRow(ctx, ` + SELECT id + FROM app.query + WHERE query_filter_query_id = $1 + AND query_filter_index = $2 + AND query_filter_position = $3 + AND query_filter_side = $4 + `, entityId, filterIndex, filterPosition, filterSide).Scan(&queryIdExisting); err != nil && err != pgx.ErrNoRows { return err } } - // query without a base relation is not used and therefore not needed - if !query.RelationId.Valid { - if known { - if _, err := tx.Exec(db.Ctx, ` + if !queryIdExisting.Valid { + // query does not exist, create + createNew = true + } else { + // query exists - delete if it was remade (different ID) or is not required anymore (query without a base relation) + if query.Id.String() != queryIdExisting.String() || noBaseRelation { + if _, err := tx.Exec(ctx, ` DELETE FROM app.query WHERE id = $1 - `, query.Id); err != nil { + `, queryIdExisting); err != nil { return err } + createNew = true } - return nil } - if !known { - if query.Id == uuid.Nil { - query.Id, err = uuid.NewV4() - if err != nil { - return err - } - } + if noBaseRelation { + // no query needed + return nil + } + // create or update query + if createNew { if !subQuery { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.query (id, relation_id, fixed_limit, %s_id) VALUES ($1,$2,$3,$4) `, entity), query.Id, query.RelationId, query.FixedLimit, entityId); err != nil { return err } } else { - if _, err := tx.Exec(db.Ctx, ` - INSERT INTO app.query (id, relation_id, fixed_limit, - query_filter_query_id, query_filter_position, - query_filter_side) - VALUES ($1,$2,$3,$4,$5,$6) + if _, err := tx.Exec(ctx, ` + INSERT INTO app.query (id, relation_id, fixed_limit, query_filter_query_id, + query_filter_index, query_filter_position, query_filter_side) + VALUES ($1,$2,$3,$4,$5,$6,$7) `, query.Id, query.RelationId, query.FixedLimit, entityId, - filterPosition, filterSide); err != nil { + filterIndex, filterPosition, filterSide); err != nil { return err } } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.query SET relation_id = $1, fixed_limit = $2 WHERE id = $3 @@ -251,7 +259,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, } // reset joins - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.query_join WHERE query_id = $1 `, query.Id); err != nil { @@ -260,11 +268,11 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, for position, j := range query.Joins { - if !tools.StringInSlice(j.Connector, types.QueryJoinConnectors) { + if !slices.Contains(types.QueryJoinConnectors, j.Connector) { return errors.New("invalid join connector") } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.query_join ( query_id, relation_id, attribute_id, position, index_from, index, connector, apply_create, apply_update, apply_delete @@ -279,18 +287,18 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, } // reset filters - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.query_filter WHERE query_id = $1 `, query.Id); err != nil { return err } - if err := setFilters_tx(tx, query.Id, pgtype.UUID{}, query.Filters, 0); err != nil { + if err := setFilters_tx(ctx, tx, query.Id, pgtype.UUID{}, query.Filters, 0); err != nil { return err } // reset ordering - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.query_order WHERE query_id = $1 `, query.Id); err != nil { @@ -299,7 +307,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, for position, o := range query.Orders { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.query_order ( query_id, attribute_id, position, index, ascending ) @@ -310,7 +318,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, } // reset lookups - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.query_lookup WHERE query_id = $1 `, query.Id); err != nil { @@ -319,7 +327,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, for _, l := range query.Lookups { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.query_lookup (query_id, pg_index_id, index) VALUES ($1,$2,$3) `, query.Id, l.PgIndexId, l.Index); err != nil { @@ -328,7 +336,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, } // reset choices - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.query_choice WHERE query_id = $1 `, query.Id); err != nil { @@ -344,7 +352,7 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, } } - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.query_choice (id, query_id, name, position) VALUES ($1,$2,$3,$4) `, c.Id, query.Id, c.Name, position); err != nil { @@ -356,19 +364,19 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, filterPosition int, // (necessary as query ID + position is used as PK positionOffset := (position + 1) * 100 - if err := setFilters_tx(tx, query.Id, pgtype.UUID{Bytes: c.Id, Valid: true}, + if err := setFilters_tx(ctx, tx, query.Id, pgtype.UUID{Bytes: c.Id, Valid: true}, c.Filters, positionOffset); err != nil { return err } - if err := caption.Set_tx(tx, c.Id, c.Captions); err != nil { + if err := caption.Set_tx(ctx, tx, c.Id, c.Captions); err != nil { return err } } return nil } -func getFilters(queryId uuid.UUID, queryChoiceId pgtype.UUID) ([]types.QueryFilter, error) { +func getFilters_tx(ctx context.Context, tx pgx.Tx, queryId uuid.UUID, queryChoiceId pgtype.UUID) ([]types.QueryFilter, error) { var filters = make([]types.QueryFilter, 0) params := make([]interface{}, 0) @@ -381,8 +389,14 @@ func getFilters(queryId uuid.UUID, queryChoiceId pgtype.UUID) ([]types.QueryFilt } // get filters - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` - SELECT connector, operator, position + type typeFilterPos struct { + filter types.QueryFilter + position int + } + filterPos := make([]typeFilterPos, 0) + + rows, err := tx.Query(ctx, fmt.Sprintf(` + SELECT connector, operator, index, position FROM app.query_filter WHERE query_id = $1 %s @@ -391,30 +405,24 @@ func getFilters(queryId uuid.UUID, queryChoiceId pgtype.UUID) ([]types.QueryFilt if err != nil { return filters, err } - - type typeFilterPos struct { - filter types.QueryFilter - position int - } - filterPos := make([]typeFilterPos, 0) + defer rows.Close() for rows.Next() { var fp typeFilterPos - if err := rows.Scan(&fp.filter.Connector, &fp.filter.Operator, &fp.position); err != nil { + if err := rows.Scan(&fp.filter.Connector, &fp.filter.Operator, &fp.filter.Index, &fp.position); err != nil { return filters, err } filterPos = append(filterPos, fp) } - rows.Close() for _, fp := range filterPos { - fp.filter.Side0, err = getFilterSide(queryId, fp.position, 0) + fp.filter.Side0, err = getFilterSide_tx(ctx, tx, queryId, fp.filter.Index, fp.position, 0) if err != nil { return filters, err } - fp.filter.Side1, err = getFilterSide(queryId, fp.position, 1) + fp.filter.Side1, err = getFilterSide_tx(ctx, tx, queryId, fp.filter.Index, fp.position, 1) if err != nil { return filters, err } @@ -422,28 +430,29 @@ func getFilters(queryId uuid.UUID, queryChoiceId pgtype.UUID) ([]types.QueryFilt } return filters, nil } -func getFilterSide(queryId uuid.UUID, filterPosition int, side int) (types.QueryFilterSide, error) { +func getFilterSide_tx(ctx context.Context, tx pgx.Tx, queryId uuid.UUID, filterIndex int, filterPosition int, side int) (types.QueryFilterSide, error) { var s types.QueryFilterSide var err error - if err := db.Pool.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT attribute_id, attribute_index, attribute_nested, brackets, collection_id, column_id, content, field_id, now_offset, preset_id, - role_id, query_aggregator, value + role_id, variable_id, query_aggregator, value FROM app.query_filter_side - WHERE query_id = $1 - AND query_filter_position = $2 - AND side = $3 - `, queryId, filterPosition, side).Scan(&s.AttributeId, &s.AttributeIndex, - &s.AttributeNested, &s.Brackets, &s.CollectionId, &s.ColumnId, - &s.Content, &s.FieldId, &s.NowOffset, &s.PresetId, &s.RoleId, + WHERE query_id = $1 + AND query_filter_index = $2 + AND query_filter_position = $3 + AND side = $4 + `, queryId, filterIndex, filterPosition, side).Scan(&s.AttributeId, &s.AttributeIndex, + &s.AttributeNested, &s.Brackets, &s.CollectionId, &s.ColumnId, &s.Content, + &s.FieldId, &s.NowOffset, &s.PresetId, &s.RoleId, &s.VariableId, &s.QueryAggregator, &s.Value); err != nil { return s, err } if s.Content == "subQuery" { - s.Query, err = Get("query_filter_query", queryId, filterPosition, side) + s.Query, err = Get_tx(ctx, tx, "query_filter_query", queryId, filterIndex, filterPosition, side) if err != nil { return s, err } @@ -453,59 +462,59 @@ func getFilterSide(queryId uuid.UUID, filterPosition int, side int) (types.Query return s, nil } -func setFilters_tx(tx pgx.Tx, queryId uuid.UUID, queryChoiceId pgtype.UUID, +func setFilters_tx(ctx context.Context, tx pgx.Tx, queryId uuid.UUID, queryChoiceId pgtype.UUID, filters []types.QueryFilter, positionOffset int) error { for position, f := range filters { - if !tools.StringInSlice(f.Connector, types.QueryFilterConnectors) { + if !slices.Contains(types.QueryFilterConnectors, f.Connector) { return errors.New("invalid filter connector") } - if !tools.StringInSlice(f.Operator, types.QueryFilterOperators) { + if !slices.Contains(types.QueryFilterOperators, f.Operator) { return errors.New("invalid filter operator") } position += positionOffset - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.query_filter (query_id, query_choice_id, - position, connector, operator) - VALUES ($1,$2,$3,$4,$5) - `, queryId, queryChoiceId, position, f.Connector, f.Operator); err != nil { + index, position, connector, operator) + VALUES ($1,$2,$3,$4,$5,$6) + `, queryId, queryChoiceId, f.Index, position, f.Connector, f.Operator); err != nil { return err } - if err := SetFilterSide_tx(tx, queryId, position, 0, f.Side0); err != nil { + if err := SetFilterSide_tx(ctx, tx, queryId, f.Index, position, 0, f.Side0); err != nil { return err } - if err := SetFilterSide_tx(tx, queryId, position, 1, f.Side1); err != nil { + if err := SetFilterSide_tx(ctx, tx, queryId, f.Index, position, 1, f.Side1); err != nil { return err } } return nil } -func SetFilterSide_tx(tx pgx.Tx, queryId uuid.UUID, filterPosition int, - side int, s types.QueryFilterSide) error { +func SetFilterSide_tx(ctx context.Context, tx pgx.Tx, queryId uuid.UUID, filterIndex int, + filterPosition int, side int, s types.QueryFilterSide) error { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.query_filter_side ( - query_id, query_filter_position, side, attribute_id, - attribute_index, attribute_nested, brackets, collection_id, - column_id, content, field_id, now_offset, preset_id, role_id, + query_id, query_filter_index, query_filter_position, side, attribute_id, + attribute_index, attribute_nested, brackets, collection_id, column_id, + content, field_id, now_offset, preset_id, role_id, variable_id, query_aggregator, value ) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16) - `, queryId, filterPosition, side, s.AttributeId, s.AttributeIndex, + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18) + `, queryId, filterIndex, filterPosition, side, s.AttributeId, s.AttributeIndex, s.AttributeNested, s.Brackets, s.CollectionId, s.ColumnId, s.Content, - s.FieldId, s.NowOffset, s.PresetId, s.RoleId, s.QueryAggregator, - s.Value); err != nil { + s.FieldId, s.NowOffset, s.PresetId, s.RoleId, s.VariableId, + s.QueryAggregator, s.Value); err != nil { return err } if s.Content == "subQuery" { - if err := Set_tx(tx, "query_filter_query", queryId, + if err := Set_tx(ctx, tx, "query_filter_query", queryId, filterIndex, filterPosition, side, s.Query); err != nil { return err diff --git a/schema/relation/relation.go b/schema/relation/relation.go index 0ee5d3c1..2d6f975e 100644 --- a/schema/relation/relation.go +++ b/schema/relation/relation.go @@ -1,8 +1,8 @@ package relation import ( + "context" "fmt" - "r3/db" "r3/db/check" "r3/schema" "r3/schema/attribute" @@ -14,15 +14,15 @@ import ( "github.com/jackc/pgx/v5/pgtype" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { - modName, relName, err := schema.GetRelationNamesById_tx(tx, id) + modName, relName, err := schema.GetRelationNamesById_tx(ctx, tx, id) if err != nil { return err } // drop e2e encryption relation if its there - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` DROP TABLE IF EXISTS instance_e2ee."%s" `, schema.GetEncKeyTableName(id))); err != nil { return err @@ -30,7 +30,7 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { // delete file relations for file attributes atrIdsFile := make([]uuid.UUID, 0) - if err := db.Pool.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT ARRAY_AGG(id) FROM app.attribute WHERE relation_id = $1 @@ -40,13 +40,17 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { } for _, atrId := range atrIdsFile { - if err := attribute.FileRelationsDelete_tx(tx, atrId); err != nil { + if err := attribute.FileRelationsDelete_tx(ctx, tx, atrId); err != nil { return err } } // drop relation - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(`DROP TABLE "%s"."%s"`, + // CASCADE is relevant if relation is deleted together with other elements during transfer (import) + // issue can occur if deletion order is wrong (relation deleted before referencing relationship attribute) + // CASCADE removes the foreign key from the affected attribute - then either the attribute or its relation is deleted afterwards during the transfer + // invalid CASCADE is blocked by the system as referenced relations cannot be deleted in the first place + if _, err := tx.Exec(ctx, fmt.Sprintf(`DROP TABLE "%s"."%s" CASCADE`, modName, relName)); err != nil { return err @@ -54,25 +58,25 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { // delete primary key sequence // (is not removed automatically) - if err := delPkSeq_tx(tx, modName, id); err != nil { + if err := delPkSeq_tx(ctx, tx, modName, id); err != nil { return err } // delete relation reference - _, err = tx.Exec(db.Ctx, `DELETE FROM app.relation WHERE id = $1`, id) + _, err = tx.Exec(ctx, `DELETE FROM app.relation WHERE id = $1`, id) return err } -func delPkSeq_tx(tx pgx.Tx, modName string, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` +func delPkSeq_tx(ctx context.Context, tx pgx.Tx, modName string, id uuid.UUID) error { + _, err := tx.Exec(ctx, fmt.Sprintf(` DROP SEQUENCE "%s"."%s" `, modName, schema.GetSequenceName(id))) return err } -func Get(moduleId uuid.UUID) ([]types.Relation, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Relation, error) { relations := make([]types.Relation, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT id, name, comment, encryption, retention_count, retention_days, ( SELECT id FROM app.attribute @@ -97,42 +101,44 @@ func Get(moduleId uuid.UUID) ([]types.Relation, error) { } r.ModuleId = moduleId r.Attributes = make([]types.Attribute, 0) + r.Triggers = make([]types.PgTrigger, 0) + relations = append(relations, r) + } - r.Policies, err = getPolicies(r.Id) + for i, r := range relations { + relations[i].Policies, err = getPolicies_tx(ctx, tx, r.Id) if err != nil { return relations, err } - - relations = append(relations, r) } return relations, nil } -func Set_tx(tx pgx.Tx, rel types.Relation) error { +func Set_tx(ctx context.Context, tx pgx.Tx, rel types.Relation) error { if err := check.DbIdentifier(rel.Name); err != nil { return err } - moduleName, err := schema.GetModuleNameById_tx(tx, rel.ModuleId) + moduleName, err := schema.GetModuleNameById_tx(ctx, tx, rel.ModuleId) if err != nil { return err } isNew := rel.Id == uuid.Nil - known, err := schema.CheckCreateId_tx(tx, &rel.Id, "relation", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &rel.Id, "relation", "id") if err != nil { return err } if known { - _, nameEx, err := schema.GetRelationNamesById_tx(tx, rel.Id) + _, nameEx, err := schema.GetRelationNamesById_tx(ctx, tx, rel.Id) if err != nil { return err } // update relation reference - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.relation SET name = $1, comment = $2, retention_count = $3, retention_days = $4 WHERE id = $5 @@ -142,26 +148,26 @@ func Set_tx(tx pgx.Tx, rel types.Relation) error { // if name changed, update relation and all affected entities if nameEx != rel.Name { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` ALTER TABLE "%s"."%s" RENAME TO "%s" `, moduleName, nameEx, rel.Name)); err != nil { return err } - if err := pgFunction.RecreateAffectedBy_tx(tx, "relation", rel.Id); err != nil { + if err := pgFunction.RecreateAffectedBy_tx(ctx, tx, "relation", rel.Id); err != nil { return fmt.Errorf("failed to recreate affected PG functions, %s", err) } } } else { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` CREATE TABLE "%s"."%s" () `, moduleName, rel.Name)); err != nil { return err } // insert relation reference - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.relation (id, module_id, name, comment, encryption, retention_count, retention_days) VALUES ($1,$2,$3,$4,$5,$6,$7) @@ -173,15 +179,27 @@ func Set_tx(tx pgx.Tx, rel types.Relation) error { // create primary key attribute if relation is new (e. g. not imported or updated) if isNew { - if err := attribute.Set_tx(tx, rel.Id, uuid.Nil, - pgtype.UUID{}, pgtype.UUID{}, schema.PkName, "integer", "default", - 0, false, false, "", "", "", types.CaptionMap{}); err != nil { - + if err := attribute.Set_tx(ctx, tx, types.Attribute{ + Id: uuid.Nil, + RelationId: rel.Id, + RelationshipId: pgtype.UUID{}, + IconId: pgtype.UUID{}, + Name: schema.PkName, + Content: "integer", + ContentUse: "default", + Length: 0, + Nullable: false, + Encrypted: false, + Def: "", + OnUpdate: "", + OnDelete: "", + Captions: types.CaptionMap{}, + }); err != nil { return err } } } // set policies - return setPolicies_tx(tx, rel.Id, rel.Policies) + return setPolicies_tx(ctx, tx, rel.Id, rel.Policies) } diff --git a/schema/relation/relationPolicy.go b/schema/relation/relationPolicy.go index c7cbdbcd..1061714c 100644 --- a/schema/relation/relationPolicy.go +++ b/schema/relation/relationPolicy.go @@ -1,26 +1,25 @@ package relation import ( - "r3/db" + "context" "r3/types" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" ) -func delPolicies_tx(tx pgx.Tx, relationId uuid.UUID) error { - _, err := tx.Exec(db.Ctx, ` +func delPolicies_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID) error { + _, err := tx.Exec(ctx, ` DELETE FROM app.relation_policy WHERE relation_id = $1 `, relationId) return err } -func getPolicies(relationId uuid.UUID) ([]types.RelationPolicy, error) { - +func getPolicies_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID) ([]types.RelationPolicy, error) { policies := make([]types.RelationPolicy, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT role_id, pg_function_id_excl, pg_function_id_incl, action_delete, action_select, action_update FROM app.relation_policy @@ -35,9 +34,8 @@ func getPolicies(relationId uuid.UUID) ([]types.RelationPolicy, error) { for rows.Next() { var p types.RelationPolicy - if err := rows.Scan(&p.RoleId, &p.PgFunctionIdExcl, - &p.PgFunctionIdIncl, &p.ActionDelete, &p.ActionSelect, - &p.ActionUpdate); err != nil { + if err := rows.Scan(&p.RoleId, &p.PgFunctionIdExcl, &p.PgFunctionIdIncl, + &p.ActionDelete, &p.ActionSelect, &p.ActionUpdate); err != nil { return policies, err } @@ -46,14 +44,14 @@ func getPolicies(relationId uuid.UUID) ([]types.RelationPolicy, error) { return policies, nil } -func setPolicies_tx(tx pgx.Tx, relationId uuid.UUID, policies []types.RelationPolicy) error { +func setPolicies_tx(ctx context.Context, tx pgx.Tx, relationId uuid.UUID, policies []types.RelationPolicy) error { - if err := delPolicies_tx(tx, relationId); err != nil { + if err := delPolicies_tx(ctx, tx, relationId); err != nil { return err } for i, p := range policies { - _, err := tx.Exec(db.Ctx, ` + _, err := tx.Exec(ctx, ` INSERT INTO app.relation_policy ( relation_id, position, role_id, pg_function_id_excl, pg_function_id_incl, diff --git a/schema/relation/relationPreview.go b/schema/relation/relationPreview.go index c8621bb8..d36d6017 100644 --- a/schema/relation/relationPreview.go +++ b/schema/relation/relationPreview.go @@ -1,15 +1,16 @@ package relation import ( + "context" "fmt" - "r3/db" "r3/schema" "strings" "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" ) -func GetPreview(id uuid.UUID, limit int, offset int) (interface{}, error) { +func GetPreview(ctx context.Context, tx pgx.Tx, id uuid.UUID, limit int, offset int) (interface{}, error) { var modName, relName string atrNames := make([]string, 0) @@ -23,7 +24,7 @@ func GetPreview(id uuid.UUID, limit int, offset int) (interface{}, error) { } // get relation/attribute/module details - if err := db.Pool.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT r.name, m.name, ARRAY( SELECT name FROM app.attribute @@ -38,8 +39,8 @@ func GetPreview(id uuid.UUID, limit int, offset int) (interface{}, error) { return nil, err } - // get total count of tupels from relation - if err := db.Pool.QueryRow(db.Ctx, fmt.Sprintf(` + // get total count of tuples from relation + if err := tx.QueryRow(ctx, fmt.Sprintf(` SELECT COUNT(*) FROM "%s"."%s" `, modName, relName)).Scan(&res.RowCount); err != nil { @@ -47,7 +48,7 @@ func GetPreview(id uuid.UUID, limit int, offset int) (interface{}, error) { } // get records from relation - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` + rows, err := tx.Query(ctx, fmt.Sprintf(` SELECT "%s" FROM "%s"."%s" ORDER BY "%s" ASC @@ -60,13 +61,8 @@ func GetPreview(id uuid.UUID, limit int, offset int) (interface{}, error) { defer rows.Close() for rows.Next() { - valuePointers := make([]interface{}, len(atrNames)) - valuesAll := make([]interface{}, len(atrNames)) - for i := 0; i < len(atrNames); i++ { - valuePointers[i] = &valuesAll[i] - } - - if err := rows.Scan(valuePointers...); err != nil { + valuesAll, err := rows.Values() + if err != nil { return nil, err } res.Rows = append(res.Rows, valuesAll) diff --git a/schema/role/role.go b/schema/role/role.go index 47859f11..1ed25f54 100644 --- a/schema/role/role.go +++ b/schema/role/role.go @@ -1,20 +1,21 @@ package role import ( + "context" "errors" "fmt" - "r3/db" "r3/schema" "r3/schema/caption" + "r3/schema/compatible" "r3/types" - "strings" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgtype" ) -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, ` +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, ` DELETE FROM app.role WHERE id = $1 AND content <> 'everyone' -- cannot delete default role @@ -22,10 +23,10 @@ func Del_tx(tx pgx.Tx, id uuid.UUID) error { return err } -func Get(moduleId uuid.UUID) ([]types.Role, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Role, error) { roles := make([]types.Role, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := tx.Query(ctx, ` SELECT r.id, r.name, r.content, r.assignable, ARRAY( SELECT role_id_child FROM app.role_child @@ -38,6 +39,7 @@ func Get(moduleId uuid.UUID) ([]types.Role, error) { if err != nil { return roles, err } + defer rows.Close() for rows.Next() { var r types.Role @@ -47,17 +49,16 @@ func Get(moduleId uuid.UUID) ([]types.Role, error) { r.ModuleId = moduleId roles = append(roles, r) } - rows.Close() // get access & captions for i, r := range roles { - r, err = getAccess(r) + r, err = getAccess_tx(ctx, tx, r) if err != nil { return roles, err } - r.Captions, err = caption.Get("role", r.Id, []string{"roleTitle", "roleDesc"}) + r.Captions, err = caption.Get_tx(ctx, tx, "role", r.Id, []string{"roleTitle", "roleDesc"}) if err != nil { return roles, err } @@ -66,16 +67,19 @@ func Get(moduleId uuid.UUID) ([]types.Role, error) { return roles, nil } -func getAccess(role types.Role) (types.Role, error) { +func getAccess_tx(ctx context.Context, tx pgx.Tx, role types.Role) (types.Role, error) { role.AccessApis = make(map[uuid.UUID]int) role.AccessAttributes = make(map[uuid.UUID]int) + role.AccessClientEvents = make(map[uuid.UUID]int) role.AccessCollections = make(map[uuid.UUID]int) role.AccessRelations = make(map[uuid.UUID]int) role.AccessMenus = make(map[uuid.UUID]int) + role.AccessWidgets = make(map[uuid.UUID]int) - rows, err := db.Pool.Query(db.Ctx, ` - SELECT api_id, attribute_id, collection_id, menu_id, relation_id, access + rows, err := tx.Query(ctx, ` + SELECT api_id, attribute_id, client_event_id, collection_id, + menu_id, relation_id, widget_id, access FROM app.role_access WHERE role_id = $1 `, role.Id) @@ -85,61 +89,55 @@ func getAccess(role types.Role) (types.Role, error) { defer rows.Close() for rows.Next() { - var apiId, attributeId, collectionId, menuId, relationId uuid.NullUUID + var apiId, attributeId, clientEventId, collectionId, menuId, relationId, widgetId pgtype.UUID var access int - if err := rows.Scan(&apiId, &attributeId, &collectionId, - &menuId, &relationId, &access); err != nil { + if err := rows.Scan(&apiId, &attributeId, &clientEventId, &collectionId, + &menuId, &relationId, &widgetId, &access); err != nil { return role, err } if apiId.Valid { - role.AccessApis[apiId.UUID] = access + role.AccessApis[apiId.Bytes] = access } if attributeId.Valid { - role.AccessAttributes[attributeId.UUID] = access + role.AccessAttributes[attributeId.Bytes] = access + } + if clientEventId.Valid { + role.AccessClientEvents[clientEventId.Bytes] = access } if collectionId.Valid { - role.AccessCollections[collectionId.UUID] = access + role.AccessCollections[collectionId.Bytes] = access } if menuId.Valid { - role.AccessMenus[menuId.UUID] = access + role.AccessMenus[menuId.Bytes] = access } if relationId.Valid { - role.AccessRelations[relationId.UUID] = access + role.AccessRelations[relationId.Bytes] = access + } + if widgetId.Valid { + role.AccessWidgets[widgetId.Bytes] = access } } return role, nil } -func Set_tx(tx pgx.Tx, role types.Role) error { +func Set_tx(ctx context.Context, tx pgx.Tx, role types.Role) error { if role.Name == "" { return errors.New("missing name") } // compatibility fix: missing role content <3.0 - if role.Content == "" { - if role.Name == "everyone" { - role.Content = "everyone" - } else if strings.Contains(strings.ToLower(role.Name), "admin") { - role.Content = "admin" - } else if strings.Contains(strings.ToLower(role.Name), "data") { - role.Content = "other" - } else if strings.Contains(strings.ToLower(role.Name), "csv") { - role.Content = "other" - } else { - role.Content = "user" - } - } + role = compatible.FixMissingRoleContent(role) - known, err := schema.CheckCreateId_tx(tx, &role.Id, "role", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &role.Id, "role", "id") if err != nil { return err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.role SET name = $1, content = $2, assignable = $3 WHERE id = $4 @@ -148,7 +146,7 @@ func Set_tx(tx pgx.Tx, role types.Role) error { return err } } else { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.role (id, module_id, name, content, assignable) VALUES ($1,$2,$3,$4,$5) `, role.Id, role.ModuleId, role.Name, role.Content, role.Assignable); err != nil { @@ -157,14 +155,14 @@ func Set_tx(tx pgx.Tx, role types.Role) error { } // set children - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.role_child WHERE role_id = $1 `, role.Id); err != nil { return err } for _, childId := range role.ChildrenIds { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` INSERT INTO app.role_child (role_id, role_id_child) VALUES ($1,$2) `, role.Id, childId); err != nil { @@ -173,7 +171,7 @@ func Set_tx(tx pgx.Tx, role types.Role) error { } // set access - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM app.role_access WHERE role_id = $1 `, role.Id); err != nil { @@ -181,36 +179,46 @@ func Set_tx(tx pgx.Tx, role types.Role) error { } for trgId, access := range role.AccessApis { - if err := setAccess_tx(tx, role.Id, trgId, "api", access); err != nil { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "api", access); err != nil { return err } } for trgId, access := range role.AccessAttributes { - if err := setAccess_tx(tx, role.Id, trgId, "attribute", access); err != nil { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "attribute", access); err != nil { + return err + } + } + for trgId, access := range role.AccessClientEvents { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "client_event", access); err != nil { return err } } for trgId, access := range role.AccessCollections { - if err := setAccess_tx(tx, role.Id, trgId, "collection", access); err != nil { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "collection", access); err != nil { return err } } for trgId, access := range role.AccessMenus { - if err := setAccess_tx(tx, role.Id, trgId, "menu", access); err != nil { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "menu", access); err != nil { return err } } for trgId, access := range role.AccessRelations { - if err := setAccess_tx(tx, role.Id, trgId, "relation", access); err != nil { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "relation", access); err != nil { + return err + } + } + for trgId, access := range role.AccessWidgets { + if err := setAccess_tx(ctx, tx, role.Id, trgId, "widget", access); err != nil { return err } } // set captions - return caption.Set_tx(tx, role.Id, role.Captions) + return caption.Set_tx(ctx, tx, role.Id, role.Captions) } -func setAccess_tx(tx pgx.Tx, roleId uuid.UUID, id uuid.UUID, entity string, access int) error { +func setAccess_tx(ctx context.Context, tx pgx.Tx, roleId uuid.UUID, id uuid.UUID, entity string, access int) error { // check valid access levels switch entity { @@ -222,6 +230,10 @@ func setAccess_tx(tx pgx.Tx, roleId uuid.UUID, id uuid.UUID, entity string, acce if access < -1 || access > 2 { return errors.New("invalid access level") } + case "client_event": // 1 access client event + if access < -1 || access > 1 { + return errors.New("invalid access level") + } case "collection": // 1 read collection if access < -1 || access > 1 { return errors.New("invalid access level") @@ -234,6 +246,10 @@ func setAccess_tx(tx pgx.Tx, roleId uuid.UUID, id uuid.UUID, entity string, acce if access < -1 || access > 3 { return errors.New("invalid access level") } + case "widget": // 1 access widget + if access < -1 || access > 1 { + return errors.New("invalid access level") + } default: return errors.New("invalid entity") } @@ -243,7 +259,7 @@ func setAccess_tx(tx pgx.Tx, roleId uuid.UUID, id uuid.UUID, entity string, acce return nil } - _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.role_access (role_id, %s_id, access) VALUES ($1,$2,$3) `, entity), roleId, id, access) diff --git a/schema/schema.go b/schema/schema.go index a9d6bb77..2791fdee 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -1,9 +1,9 @@ package schema import ( + "context" "database/sql" "fmt" - "r3/db" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" @@ -13,7 +13,7 @@ import ( // if nil, it is overwritten with a new one // if not nil, it is checked whether the ID is known already // returns whether the ID was already known -func CheckCreateId_tx(tx pgx.Tx, id *uuid.UUID, relName string, pkName string) (bool, error) { +func CheckCreateId_tx(ctx context.Context, tx pgx.Tx, id *uuid.UUID, relName string, pkName string) (bool, error) { var err error if *id == uuid.Nil { @@ -22,7 +22,7 @@ func CheckCreateId_tx(tx pgx.Tx, id *uuid.UUID, relName string, pkName string) ( } var known bool - err = tx.QueryRow(db.Ctx, fmt.Sprintf(` + err = tx.QueryRow(ctx, fmt.Sprintf(` SELECT EXISTS(SELECT * FROM app.%s WHERE "%s" = $1) `, relName, pkName), id).Scan(&known) @@ -46,14 +46,34 @@ func IsContentText(content string) bool { return content == "varchar" || content == "text" } -// fully validates module dependencies -func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { +// scheduler checks +func GetValidAtDay(intervalType string, atDay int) int { + switch intervalType { + case "months": + // day < 1 would go to previous month, which is undesirable on a monthly interval + if atDay < 1 || atDay > 31 { + atDay = 1 + } + case "weeks": + // 0 = Sunday, 6 = Saturday + if atDay < 0 || atDay > 6 { + atDay = 1 + } + case "years": + if atDay > 365 { + atDay = 1 + } + } + return atDay +} +// fully validates module dependencies +func ValidateDependency_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) error { var cnt int var name1, name2 sql.NullString // check parent module without dependency - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(name, ', ') FROM app.module WHERE id = ( @@ -76,7 +96,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check attribute relationships with external relations - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(CONCAT(r.name, '.', a.name), ', ') FROM app.attribute AS a INNER JOIN app.relation AS r @@ -106,7 +126,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check query relation access - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(COALESCE(f.name,lf.name), ', ') FROM app.query AS q LEFT JOIN app.form AS f ON f.id = q.form_id -- query for form @@ -143,7 +163,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check field access to external forms - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(f3.name, ', '), STRING_AGG(f1.name, ', ') FROM app.open_form AS of INNER JOIN app.form AS f1 ON f1.id = of.form_id_open -- opened form @@ -174,7 +194,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check collection access to external forms - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(f.name, ', ') FROM app.open_form AS of INNER JOIN app.form AS f ON f.id = of.form_id_open @@ -205,7 +225,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check relation policy access to external roles - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(r.name, ', ') FROM app.relation_policy AS rp INNER JOIN app.role AS r ON r.id = rp.role_id @@ -233,10 +253,37 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { name1.String) } - // check menu access to external forms - if err := tx.QueryRow(db.Ctx, ` + // check trigger access to external relations + if err := tx.QueryRow(ctx, ` + SELECT COUNT(*), STRING_AGG(r.name, ', ') + FROM app.pg_trigger AS t + INNER JOIN app.relation AS r ON r.id = t.relation_id + INNER JOIN app.module AS m ON m.id = t.module_id AND m.id = $1 + + -- dependency + WHERE r.id NOT IN ( + SELECT id + FROM app.relation + WHERE module_id = m.id + OR module_id IN ( + SELECT module_id_on + FROM app.module_depends + WHERE module_id = m.id + ) + ) + `, moduleId).Scan(&cnt, &name1); err != nil { + return err + } + + if cnt != 0 { + return fmt.Errorf("dependency check failed, trigger functions accessing relations(s) '%s' from independent module(s)", + name1.String) + } + + // check widget access to external forms + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(f.name, ', ') - FROM app.menu AS h + FROM app.widget AS h INNER JOIN app.form AS f ON f.id = h.form_id INNER JOIN app.module AS m ON m.id = h.module_id @@ -257,13 +304,43 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { return err } + if cnt != 0 { + return fmt.Errorf("dependency check failed, widgets(s) accessing form(s) '%s' from independent module(s)", + name1.String) + } + + // check menu access to external forms + if err := tx.QueryRow(ctx, ` + SELECT COUNT(*), STRING_AGG(f.name, ', ') + FROM app.menu AS h + INNER JOIN app.form AS f ON f.id = h.form_id + INNER JOIN app.menu_tab AS mt ON mt.id = h.menu_tab_id + INNER JOIN app.module AS m + ON m.id = mt.module_id + AND m.id = $1 + + -- dependency + WHERE f.id NOT IN ( + SELECT id + FROM app.form + WHERE module_id = m.id + OR module_id IN ( + SELECT module_id_on + FROM app.module_depends + WHERE module_id = m.id + ) + ) + `, moduleId).Scan(&cnt, &name1); err != nil { + return err + } + if cnt != 0 { return fmt.Errorf("dependency check failed, menu(s) accessing form(s) '%s' from independent module(s)", name1.String) } // check access to external icons - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*) FROM app.icon WHERE id IN ( @@ -318,7 +395,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check PG function access to external pgFunctions/modules/relations/attributes - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*) FROM app.module WHERE id IN ( @@ -384,7 +461,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check JS function access to external pgFunctions/jsFunctions/forms/fields/roles - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*) FROM app.module WHERE id IN ( @@ -462,7 +539,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check field (button/data) & form function access to external JS functions - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*) FROM app.module WHERE id IN ( @@ -489,6 +566,17 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { FROM app.form WHERE module_id = $2 ) + + UNION + + SELECT fv.js_function_id + FROM app.field_variable AS fv + JOIN app.field AS f ON f.id = fv.field_id + WHERE f.form_id IN ( + SELECT id + FROM app.form + WHERE module_id = $2 + ) UNION @@ -518,7 +606,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check role membership inside external parent roles - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*), STRING_AGG(r.name, ', ') FROM app.role AS r INNER JOIN app.module AS m @@ -549,7 +637,7 @@ func ValidateDependency_tx(tx pgx.Tx, moduleId uuid.UUID) error { } // check data presets without dependency - if err := tx.QueryRow(db.Ctx, ` + if err := tx.QueryRow(ctx, ` SELECT COUNT(*) FROM app.preset WHERE id IN ( diff --git a/schema/tab/tab.go b/schema/tab/tab.go index 8f2ec558..dd26bb33 100644 --- a/schema/tab/tab.go +++ b/schema/tab/tab.go @@ -1,13 +1,13 @@ package tab import ( + "context" "errors" "fmt" - "r3/db" "r3/schema" "r3/schema/caption" - "r3/tools" "r3/types" + "slices" "github.com/gofrs/uuid" "github.com/jackc/pgx/v5" @@ -15,19 +15,19 @@ import ( var allowedEntities = []string{"field"} -func Del_tx(tx pgx.Tx, id uuid.UUID) error { - _, err := tx.Exec(db.Ctx, `DELETE FROM app.tab WHERE id = $1`, id) +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.tab WHERE id = $1`, id) return err } -func Get(entity string, entityId uuid.UUID) ([]types.Tab, error) { +func Get_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID) ([]types.Tab, error) { tabs := make([]types.Tab, 0) - if !tools.StringInSlice(entity, allowedEntities) { + if !slices.Contains(allowedEntities, entity) { return tabs, errors.New("bad entity") } - rows, err := db.Pool.Query(db.Ctx, fmt.Sprintf(` + rows, err := tx.Query(ctx, fmt.Sprintf(` SELECT id, content_counter, state FROM app.tab WHERE %s_id = $1 @@ -47,27 +47,26 @@ func Get(entity string, entityId uuid.UUID) ([]types.Tab, error) { } for i, tab := range tabs { - tab.Captions, err = caption.Get("tab", tab.Id, []string{"tabTitle"}) + tabs[i].Captions, err = caption.Get_tx(ctx, tx, "tab", tab.Id, []string{"tabTitle"}) if err != nil { return tabs, err } - tabs[i] = tab } return tabs, nil } -func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, position int, tab types.Tab) (uuid.UUID, error) { - if !tools.StringInSlice(entity, allowedEntities) { +func Set_tx(ctx context.Context, tx pgx.Tx, entity string, entityId uuid.UUID, position int, tab types.Tab) (uuid.UUID, error) { + if !slices.Contains(allowedEntities, entity) { return tab.Id, errors.New("bad entity") } - known, err := schema.CheckCreateId_tx(tx, &tab.Id, "tab", "id") + known, err := schema.CheckCreateId_tx(ctx, tx, &tab.Id, "tab", "id") if err != nil { return tab.Id, err } if known { - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` UPDATE app.tab SET position = $1, content_counter = $2, state = $3 WHERE id = $4 @@ -75,12 +74,12 @@ func Set_tx(tx pgx.Tx, entity string, entityId uuid.UUID, position int, tab type return tab.Id, err } } else { - if _, err := tx.Exec(db.Ctx, fmt.Sprintf(` + if _, err := tx.Exec(ctx, fmt.Sprintf(` INSERT INTO app.tab (id, %s_id, position, content_counter, state) VALUES ($1,$2,$3,$4,$5) `, entity), tab.Id, entityId, position, tab.ContentCounter, tab.State); err != nil { return tab.Id, err } } - return tab.Id, caption.Set_tx(tx, tab.Id, tab.Captions) + return tab.Id, caption.Set_tx(ctx, tx, tab.Id, tab.Captions) } diff --git a/schema/variable/variable.go b/schema/variable/variable.go new file mode 100644 index 00000000..41c5984b --- /dev/null +++ b/schema/variable/variable.go @@ -0,0 +1,69 @@ +package variable + +import ( + "context" + "r3/schema" + "r3/types" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" +) + +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.variable WHERE id = $1`, id) + return err +} + +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Variable, error) { + + variables := make([]types.Variable, 0) + rows, err := tx.Query(ctx, ` + SELECT v.id, v.form_id, v.name, v.comment, v.content, v.content_use, v.def + FROM app.variable AS v + LEFT JOIN app.form AS f ON f.id = v.form_id + WHERE v.module_id = $1 + ORDER BY + f.name ASC NULLS FIRST, + v.name ASC + `, moduleId) + if err != nil { + return variables, err + } + defer rows.Close() + + for rows.Next() { + var v types.Variable + v.ModuleId = moduleId + if err := rows.Scan(&v.Id, &v.FormId, &v.Name, &v.Comment, &v.Content, &v.ContentUse, &v.Def); err != nil { + return variables, err + } + variables = append(variables, v) + } + return variables, nil +} + +func Set_tx(ctx context.Context, tx pgx.Tx, v types.Variable) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &v.Id, "variable", "id") + if err != nil { + return err + } + + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.variable + SET name = $1, comment = $2, content = $3, content_use = $4, def = $5 + WHERE id = $6 + `, v.Name, v.Comment, v.Content, v.ContentUse, v.Def, v.Id); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.variable (id, module_id, form_id, name, comment, content, content_use, def) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8) + `, v.Id, v.ModuleId, v.FormId, v.Name, v.Comment, v.Content, v.ContentUse, v.Def); err != nil { + return err + } + } + return nil +} diff --git a/schema/widget/widget.go b/schema/widget/widget.go new file mode 100644 index 00000000..864dd06f --- /dev/null +++ b/schema/widget/widget.go @@ -0,0 +1,89 @@ +package widget + +import ( + "context" + "r3/schema" + "r3/schema/caption" + "r3/schema/collection/consumer" + "r3/types" + + "github.com/gofrs/uuid" + "github.com/jackc/pgx/v5" +) + +func Del_tx(ctx context.Context, tx pgx.Tx, id uuid.UUID) error { + _, err := tx.Exec(ctx, `DELETE FROM app.widget WHERE id = $1`, id) + return err +} + +func Get_tx(ctx context.Context, tx pgx.Tx, moduleId uuid.UUID) ([]types.Widget, error) { + + widgets := make([]types.Widget, 0) + rows, err := tx.Query(ctx, ` + SELECT id, form_id, name, size + FROM app.widget + WHERE module_id = $1 + ORDER BY name ASC + `, moduleId) + if err != nil { + return widgets, err + } + defer rows.Close() + + for rows.Next() { + var w types.Widget + if err := rows.Scan(&w.Id, &w.FormId, &w.Name, &w.Size); err != nil { + return widgets, err + } + w.ModuleId = moduleId + widgets = append(widgets, w) + } + + // get collections & captions + for i, w := range widgets { + widgets[i].Captions, err = caption.Get_tx(ctx, tx, "widget", w.Id, []string{"widgetTitle"}) + if err != nil { + return widgets, err + } + widgets[i].Collection, err = consumer.GetOne_tx(ctx, tx, "widget", w.Id, "widgetDisplay") + if err != nil { + return widgets, err + } + } + return widgets, nil +} + +func Set_tx(ctx context.Context, tx pgx.Tx, widget types.Widget) error { + + known, err := schema.CheckCreateId_tx(ctx, tx, &widget.Id, "widget", "id") + if err != nil { + return err + } + + if known { + if _, err := tx.Exec(ctx, ` + UPDATE app.widget + SET form_id = $1, name = $2, size = $3 + WHERE id = $4 + `, widget.FormId, widget.Name, widget.Size, widget.Id); err != nil { + return err + } + } else { + if _, err := tx.Exec(ctx, ` + INSERT INTO app.widget (id,module_id,form_id,name,size) + VALUES ($1,$2,$3,$4,$5) + `, widget.Id, widget.ModuleId, widget.FormId, widget.Name, widget.Size); err != nil { + return err + } + } + + // set collection + if err := consumer.Set_tx(ctx, tx, "widget", widget.Id, "widgetDisplay", + []types.CollectionConsumer{widget.Collection}); err != nil { + + return err + } + + // set captions + return caption.Set_tx(ctx, tx, widget.Id, widget.Captions) +} diff --git a/setting/setting.go b/setting/setting.go deleted file mode 100644 index dbe49e14..00000000 --- a/setting/setting.go +++ /dev/null @@ -1,98 +0,0 @@ -package setting - -import ( - "errors" - "fmt" - "r3/db" - "r3/types" - - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgtype" -) - -func Get(loginId pgtype.Int8, loginTemplateId pgtype.Int8) (types.Settings, error) { - - var s types.Settings - if (loginId.Valid && loginTemplateId.Valid) || (!loginId.Valid && !loginTemplateId.Valid) { - return s, errors.New("settings can only be retrieved for either login or login template") - } - - entryId := loginId.Int64 - entryName := "login_id" - - if loginTemplateId.Valid { - entryId = loginTemplateId.Int64 - entryName = "login_template_id" - } - - err := db.Pool.QueryRow(db.Ctx, fmt.Sprintf(` - SELECT language_code, date_format, sunday_first_dow, font_size, borders_all, - borders_corner, page_limit, header_captions, spacing, dark, compact, - hint_update_version, mobile_scroll_form, warn_unsaved, menu_colored, - pattern, font_family, tab_remember, field_clean - FROM instance.login_setting - WHERE %s = $1 - `, entryName), entryId).Scan(&s.LanguageCode, &s.DateFormat, &s.SundayFirstDow, - &s.FontSize, &s.BordersAll, &s.BordersCorner, &s.PageLimit, - &s.HeaderCaptions, &s.Spacing, &s.Dark, &s.Compact, &s.HintUpdateVersion, - &s.MobileScrollForm, &s.WarnUnsaved, &s.MenuColored, &s.Pattern, - &s.FontFamily, &s.TabRemember, &s.FieldClean) - - return s, err -} - -func Set_tx(tx pgx.Tx, loginId pgtype.Int8, loginTemplateId pgtype.Int8, s types.Settings, isNew bool) error { - - if (loginId.Valid && loginTemplateId.Valid) || (!loginId.Valid && !loginTemplateId.Valid) { - return errors.New("settings can only be applied for either login or login template") - } - - var err error - entryId := loginId.Int64 - entryName := "login_id" - - if loginTemplateId.Valid { - entryId = loginTemplateId.Int64 - entryName = "login_template_id" - } - - if isNew { - _, err = tx.Exec(db.Ctx, fmt.Sprintf(` - INSERT INTO instance.login_setting (%s, language_code, date_format, - sunday_first_dow, font_size, borders_all, borders_corner, page_limit, - header_captions, spacing, dark, compact, hint_update_version, - mobile_scroll_form, warn_unsaved, menu_colored, pattern, font_family, - tab_remember, field_clean) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20) - `, entryName), entryId, s.LanguageCode, s.DateFormat, s.SundayFirstDow, - s.FontSize, s.BordersAll, s.BordersCorner, s.PageLimit, - s.HeaderCaptions, s.Spacing, s.Dark, s.Compact, s.HintUpdateVersion, - s.MobileScrollForm, s.WarnUnsaved, s.MenuColored, s.Pattern, - s.FontFamily, s.TabRemember, s.FieldClean) - } else { - _, err = tx.Exec(db.Ctx, fmt.Sprintf(` - UPDATE instance.login_setting - SET language_code = $1, date_format = $2, sunday_first_dow = $3, - font_size = $4, borders_all = $5, borders_corner = $6, - page_limit = $7, header_captions = $8, spacing = $9, dark = $10, - compact = $11, hint_update_version = $12, mobile_scroll_form = $13, - warn_unsaved = $14, menu_colored = $15, pattern = $16, - font_family = $17, tab_remember = $18, field_clean = $19 - WHERE %s = $20 - `, entryName), s.LanguageCode, s.DateFormat, s.SundayFirstDow, s.FontSize, s.BordersAll, - s.BordersCorner, s.PageLimit, s.HeaderCaptions, s.Spacing, s.Dark, - s.Compact, s.HintUpdateVersion, s.MobileScrollForm, s.WarnUnsaved, - s.MenuColored, s.Pattern, s.FontFamily, s.TabRemember, s.FieldClean, - entryId) - } - return err -} - -func SetLanguageCode_tx(tx pgx.Tx, id int64, languageCode string) error { - _, err := tx.Exec(db.Ctx, ` - UPDATE instance.login_setting - SET language_code = $1 - WHERE login_id = $2 - `, languageCode, id) - return err -} diff --git a/mail/attach/attach.go b/spooler/mail_attach/mail_attach.go similarity index 81% rename from mail/attach/attach.go rename to spooler/mail_attach/mail_attach.go index 539fd063..d1722309 100644 --- a/mail/attach/attach.go +++ b/spooler/mail_attach/mail_attach.go @@ -1,7 +1,8 @@ -package attach +package mail_attach import ( "bytes" + "context" "fmt" "io" "os" @@ -18,7 +19,7 @@ import ( func DoAll() error { mails := make([]types.Mail, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := db.Pool.Query(context.Background(), ` SELECT id, record_id_wofk, attribute_id FROM instance.mail_spool WHERE outgoing = FALSE @@ -28,6 +29,7 @@ func DoAll() error { if err != nil { return err } + defer rows.Close() for rows.Next() { var m types.Mail @@ -37,7 +39,6 @@ func DoAll() error { } mails = append(mails, m) } - rows.Close() for _, m := range mails { if err := do(m); err != nil { @@ -54,20 +55,18 @@ func do(mail types.Mail) error { // check validity of record and attributes to attach files to atr, exists := cache.AttributeIdMap[mail.AttributeId.Bytes] if !exists { - return fmt.Errorf("cannot attach file(s) to unknown attribute %s", - mail.AttributeId.Bytes) + return fmt.Errorf("cannot attach file(s) to unknown attribute %s", mail.AttributeId.String()) } if !schema.IsContentFiles(atr.Content) { - return fmt.Errorf("cannot attach file(s) to non-file attribute %s", - mail.AttributeId.Bytes) + return fmt.Errorf("cannot attach file(s) to non-file attribute %s", mail.AttributeId.String()) } // get files from spooler fileIds := make([]uuid.UUID, 0) filesMail := make([]types.MailFile, 0) - rows, err := db.Pool.Query(db.Ctx, ` + rows, err := db.Pool.Query(context.Background(), ` SELECT file, file_name, file_size FROM instance.mail_spool_file WHERE mail_id = $1 @@ -75,6 +74,7 @@ func do(mail types.Mail) error { if err != nil { return err } + defer rows.Close() for rows.Next() { var f types.MailFile @@ -90,11 +90,10 @@ func do(mail types.Mail) error { fileIds = append(fileIds, f.Id) filesMail = append(filesMail, f) } - rows.Close() // no attachments to process, just delete mail if len(filesMail) == 0 { - _, err = db.Pool.Exec(db.Ctx, ` + _, err = db.Pool.Exec(context.Background(), ` DELETE FROM instance.mail_spool WHERE id = $1 `, mail.Id) @@ -126,16 +125,19 @@ func do(mail types.Mail) error { // store file changes // update the database only after all files have physically been saved - tx, err := db.Pool.Begin(db.Ctx) + ctx, ctxCanc := context.WithTimeout(context.Background(), db.CtxDefTimeoutSysTask) + defer ctxCanc() + + tx, err := db.Pool.Begin(ctx) if err != nil { return err } - defer tx.Rollback(db.Ctx) + defer tx.Rollback(ctx) fileIdMapChange := make(map[uuid.UUID]types.DataSetFileChange) rel, _ := cache.RelationIdMap[atr.RelationId] for _, f := range filesMail { - if err := data.FileApplyVersion_tx(db.Ctx, tx, true, atr.Id, rel.Id, + if err := data.FileApplyVersion_tx(ctx, tx, true, atr.Id, rel.Id, f.Id, f.Hash, f.Name, f.Size, 0, []int64{mail.RecordId.Int64}, -1); err != nil { return err @@ -147,17 +149,17 @@ func do(mail types.Mail) error { Version: -1, } } - if err := data.FilesApplyAttributChanges_tx(db.Ctx, tx, mail.RecordId.Int64, + if err := data.FilesApplyAttributChanges_tx(ctx, tx, mail.RecordId.Int64, atr.Id, fileIdMapChange); err != nil { return err } // all done, delete mail - if _, err := tx.Exec(db.Ctx, ` + if _, err := tx.Exec(ctx, ` DELETE FROM instance.mail_spool WHERE id = $1 `, mail.Id); err != nil { return err } - return tx.Commit(db.Ctx) + return tx.Commit(ctx) } diff --git a/mail/receive/receive.go b/spooler/mail_receive/mail_receive.go similarity index 72% rename from mail/receive/receive.go rename to spooler/mail_receive/mail_receive.go index a9008b6b..a83ba0a5 100644 --- a/mail/receive/receive.go +++ b/spooler/mail_receive/mail_receive.go @@ -1,14 +1,17 @@ -package receive +package mail_receive import ( + "context" "crypto/tls" "encoding/base64" "errors" "fmt" "io" "r3/cache" + "r3/config" "r3/db" "r3/log" + "r3/tools" "r3/types" "regexp" "strings" @@ -52,6 +55,23 @@ func DoAll() error { func do(ma types.MailAccount) error { + // get OAuth client token if used + usesXoauth2 := ma.OauthClientId.Valid + if usesXoauth2 { + if !config.GetLicenseActive() { + return errors.New("no valid license (required for OAuth clients)") + } + c, err := cache.GetOauthClient(ma.OauthClientId.Int32) + if err != nil { + return err + } + ma.Password, err = tools.GetOAuthToken(c.ClientId, c.ClientSecret, c.Tenant, c.TokenUrl, c.Scopes) + if err != nil { + return err + } + } + + // start IMAP client var c *client.Client var err error @@ -74,8 +94,14 @@ func do(ma types.MailAccount) error { } } - if err := c.Login(ma.Username, ma.Password); err != nil { - return err + if usesXoauth2 { + if err := c.Authenticate(newXoauth2Client(ma.Username, ma.Password)); err != nil { + return err + } + } else { + if err := c.Login(ma.Username, ma.Password); err != nil { + return err + } } mbox, err := c.Select(imapFolder, false) @@ -146,8 +172,7 @@ func do(ma types.MailAccount) error { return nil } -func processMessage(mailAccountId int32, msg *imap.Message, - section *imap.BodySectionName) error { +func processMessage(mailAccountId int32, msg *imap.Message, section *imap.BodySectionName) error { if msg == nil { return errors.New("server did not return message") @@ -219,8 +244,7 @@ func processMessage(mailAccountId int32, msg *imap.Message, if strings.Contains(headerType, "text") { - // some senders include both HTML and plain text - // in these cases, we only want the HTML version + // some senders include both HTML and plain text - in these cases, we only want the HTML version if gotHtmlText { continue } @@ -229,7 +253,15 @@ func processMessage(mailAccountId int32, msg *imap.Message, if err != nil { return err } - body = string(b) + + if headerType == "text/plain" { + // replace 2 new lines with a paragraph, 1 new line with a line break + body = regexp.MustCompile(`(.*)(\r\n){2,}`).ReplaceAllString(string(b), "$1
") + body = regexp.MustCompile(`(.*)(\n){2,}`).ReplaceAllString(body, "$1
") + body = regexp.MustCompile(`[\r\n]+`).ReplaceAllString(body, "
- 
- {{ capApp.navigationConfig }}
- 
- {{ capApp.navigationLogins }}
- 
- {{ capApp.navigationRoles }}
- 
- {{ capApp.navigationLoginTemplates }}
- 
- {{ capApp.navigationLdaps }}
- 
- {{ capApp.navigationModules }}
- 
- {{ capApp.navigationRepo }}
- 
- {{ capApp.navigationMailAccounts }}
- 
- {{ capApp.navigationMails }}
- 
- {{ capApp.navigationBackups }}
- 
- {{ capApp.navigationCluster }}
- 
- {{ capApp.navigationFiles }}
- 
- {{ capApp.navigationLogs }}
- 
- {{ capApp.navigationScheduler }}
- 
- {{ capApp.navigationLicense }}
- 
+ {{ capApp.title }}
+ {{ capApp.navigationConfig }}
+
+ {{ capApp.navigationLogins }}
+ 
+ {{ capApp.navigationLoginSessions }}
+
+ {{ capApp.navigationLoginTemplates }}
+
+ {{ capApp.navigationRoles }}
+
+ {{ capApp.navigationModules }}
+
+ {{ capApp.navigationRepo }}
+
+ {{ capApp.navigationMailAccounts }}
+
+ {{ capApp.navigationMailSpooler }}
+ 
+ {{ capApp.navigationMailTraffic }}
+
+ {{ capApp.navigationBackups }}
+
+ {{ capApp.navigationFiles }}
+
+ {{ capApp.navigationLogs }}
+
+ {{ capApp.navigationScheduler }}
+ 
+ {{ capApp.navigationCaptionMap }}
+ 
+ {{ licenseTitle }}
+ {{ capApp.navigationActivation }}
+ 
+ {{ capApp.navigationSystemMsg }}
+ 
+ {{ capApp.navigationCustom }}
+
+ {{ capApp.navigationLdaps }}
+ 
+ {{ capApp.navigationOauthClients }}
+
+ {{ capApp.navigationCluster }}
+ | {{ capApp.dir }} | -- | ||
| {{ capApp.daily }} | -|||
| {{ capApp.dir }} | ++ | {{ capApp.count }} | -- - - - - |
| {{ capApp.weekly }} | -|||
| {{ capApp.daily }} | +{{ capApp.count }} | ++ + | {{ capApp.count }} | -- - - - - |
| {{ capApp.monthly }} | -|||
| {{ capApp.weekly }} | +{{ capApp.count }} | ++ + | {{ capApp.count }} | -- - + + |
| {{ capApp.monthly }} | +{{ capApp.count }} | ++ + | |
| {{ capGen.date }} | @@ -126,8 +128,12 @@ let MyAdminBackups = { mounted() { this.reset(); this.$store.commit('pageTitle',this.menuTitle); + this.$store.commit('keyDownHandlerAdd',{fnc:this.set,key:'s',keyCtrl:true}); this.ready = true; }, + unmounted() { + this.$store.commit('keyDownHandlerDel',this.set); + }, methods:{ // externals getUnixFormat, @@ -151,7 +157,9 @@ let MyAdminBackups = { this.$root.genericError ); }, - setConfig() { + set() { + if(!this.hasChanges) return; + ws.send('config','set',this.configInput,true).then( () => {}, this.$root.genericError ); diff --git a/www/comps/admin/adminCaptionMap.js b/www/comps/admin/adminCaptionMap.js new file mode 100644 index 00000000..dbdab316 --- /dev/null +++ b/www/comps/admin/adminCaptionMap.js @@ -0,0 +1,14 @@ +import MyCaptionMap from '../captionMap.js'; +export {MyAdminCaptionMap as default}; + +let MyAdminCaptionMap = { + name:'my-admin-caption-map', + components:{ MyCaptionMap }, + template:`|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ id }} | -||
| {{ capGen.name }} | -- |
- |
-
| {{ capApp.hostname }} | -{{ hostname }} | -|
| {{ capApp.dateCheckIn }} | -{{ displayDate(dateCheckIn) }} | -|
| {{ capApp.dateStarted }} | -{{ displayDate(dateStarted) }} | -|
| {{ capApp.statMemory }} | -{{ statMemory }} MB | -|
| {{ capApp.statSessions }} | -{{ statSessions }} | -|
| {{ id }} | +||
| {{ capGen.name }} | +
+
+
+
+ |
+ |
| {{ capApp.hostname }} | +{{ hostname }} | +|
| {{ capApp.dateCheckIn }} | +{{ displayDate(dateCheckIn) }} | +|
| {{ capApp.dateStarted }} | +{{ displayDate(dateStarted) }} | +|
| {{ capApp.statMemory }} | +{{ statMemory }} MB | +|
| {{ capApp.configNodeMissing }} | -- - | -
| {{ capApp.configNodeMissing }} | ++ + | +
| {{ capApp.appVersion }} | -{{ appVersion }} | -|
| {{ capApp.updateCheck }} | -- {{ updateCheckText }} - | -- {{ updateCheckText }} - | -
| {{ capApp.licenseState }} | -{{ capApp.licenseStateOk.replace('{COUNT}',this.licenseDays) }} | -{{ capApp.licenseStateNok }} | -
| {{ capApp.publicHostName }} | -- | |
| {{ capApp.defaultLanguageCode }} | -- - | -|
| {{ capApp.productionMode }} | -
- |
- |
| {{ capApp.builderMode }} | -
- |
- |
| {{ capApp.appVersion }} | +{{ appVersion }} | +|
| {{ capApp.updateCheck }} | ++ {{ updateCheckText }} + | ++ {{ updateCheckText }} + | +
| {{ capApp.licenseState }} | +{{ capApp.licenseStateOk.replace('{COUNT}',this.licenseDays) }} | +{{ capApp.licenseStateNok }} | +
| {{ capApp.publicHostName }} | +
+
+
+
+ |
+ |
| {{ capApp.proxyUrl }} | +
+
+
+
+ |
+ |
| {{ capApp.productionMode }} | +
+ |
+ |
| {{ capApp.builderMode }} | +
+ |
+ |
-
+ | {{ capApp.appName }} | -- |
| {{ capApp.appNameShort }} | -- |
| {{ capApp.companyName }} | -- |
| {{ capApp.companyColorLogin }} | -
-
-
-
-
-
- |
-
| {{ capApp.companyColorHeader }} | -
-
-
-
-
-
- |
-
| {{ capApp.companyWelcome }} | -- - | -
|
- {{ capApp.companyLogo }}
- - {{ capApp.companyLogoDesc }} - |
-
- - - |
-
| {{ capApp.companyLogoUrl }} | -- - | -
| {{ capApp.tokenExpiryHours }} | ++ |
{{ capApp.pwTitle }} |
+ |
| {{ capApp.pwLengthMin }} | ++ |
| {{ capApp.pwForceDigit }} | +|
| {{ capApp.pwForceLower }} | +|
| {{ capApp.pwForceUpper }} | +|
| {{ capApp.pwForceSpecial }} | +|
- | {{ capApp.tokenExpiryHours }} | -- |
{{ capApp.pwTitle }} |
- |
| {{ capApp.pwLengthMin }} | -- |
| {{ capApp.pwForceDigit }} | -
- |
-
| {{ capApp.pwForceLower }} | -
- |
-
| {{ capApp.pwForceUpper }} | -
- |
-
| {{ capApp.pwForceSpecial }} | -
- |
-
| {{ capApp.repoUrl }} | -- | ||||||||||||||||||
| {{ capGen.username }} | -- | ||||||||||||||||||
| {{ capGen.password }} | -- | ||||||||||||||||||
| {{ capApp.repoSkipVerify }} | -
- |
- ||||||||||||||||||
| {{ capApp.repoFeedback }} | -
- |
- ||||||||||||||||||
{{ capApp.repoKeyManagement }} |
- |||||||||||||||||||
| {{ capApp.repoPublicKeys }} | -
-
- {{ capApp.repoUrl }} |
+
+ | {{ capGen.username }} |
+
+ | {{ capGen.password }} |
+
+ | {{ capApp.repoSkipVerify }} |
+
+ |
+ {{ capApp.repoFeedback }} |
+
+ |
- |
+ {{ capApp.repoKeyManagement }}{{ capApp.repoPublicKeys }} |
+
+ |
+
+
+
+ {{ capApp.repoPublicKeyAdd }} |
+
+ |
-
+
+
+
-
-
+
{{ capApp.repoPublicKeyAdd }} |
-
- |
-
-
-
-
-
- |
+ |
| {{ capApp.dbTimeoutDataWs }} | -- |
| {{ capApp.dbTimeoutDataRest }} | -- |
| {{ capApp.dbTimeoutCsv }} | -- |
| {{ capApp.dbTimeoutIcs }} | -- |
| {{ capApp.dbTimeoutDataWs }} | ++ |
| {{ capApp.dbTimeoutDataRest }} | ++ |
| {{ capApp.dbTimeoutCsv }} | ++ |
| {{ capApp.dbTimeoutIcs }} | ++ |
| {{ capApp.icsDownload }} | -
- |
-
| {{ capApp.icsDaysPre }} | -- |
| {{ capApp.icsDaysPost }} | -- |
| {{ capApp.icsDownload }} | +
+ |
+
| {{ capApp.icsDaysPre }} | ++ |
| {{ capApp.icsDaysPost }} | ++ |
| {{ capApp.bruteforceProtection }} | -
- |
-
| {{ capApp.bruteforceAttempts }} | -- |
| {{ capApp.bruteforceCountTracked }} | -{{ bruteforceCountTracked }} | -
| {{ capApp.bruteforceCountBlocked }} | -{{ bruteforceCountBlocked }} | -
| {{ capApp.bruteforceProtection }} | +
+ |
+
| {{ capApp.bruteforceAttempts }} | ++ |
| {{ capApp.bruteforceCountTracked }} | +{{ bruteforceCountTracked }} | +
| {{ capApp.bruteforceCountBlocked }} | +{{ bruteforceCountBlocked }} | +
+ {{ capApp.adminMailsDesc }}
+
+ |
+
+
+
+ {{ capApp.titleCaptions }}+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.appName }} | ++ | {{ capApp.appNameHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.appNameShort }} | ++ | {{ capApp.appNameShortHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyName }} | ++ | {{ capApp.companyNameHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyWelcome }} | ++ + | +{{ capApp.companyWelcomeHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ +
+
+
+ {{ capApp.titleLoginPage }}+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyLoginImage }} | +
+ |
+ {{ capApp.companyLoginImageHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.tokenKeepEnable }} | +{{ capApp.tokenKeepEnableHint }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ +
+
+
+ {{ capApp.titleColors }}+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyColorLogin }} | +{{ capApp.companyColorLoginHint }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyColorHeader }} | +{{ capApp.companyColorHeaderHint }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ +
+
+ 
+ {{ capApp.titleLogos }}+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyLogo }} | +
+ |
+ {{ capApp.companyLogoHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.companyLogoUrl }} | ++ + | +{{ capApp.companyLogoUrlHint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ +
+
+
+ {{ capApp.titlePwas }}+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.iconPwa1 }} | +
+ |
+ {{ capApp.iconPwa1Hint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.iconPwa2 }} | +
+ |
+ {{ capApp.iconPwa2Hint }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.pwaDomain }} | +
+
+
+
+
+
+
+
+ + {{ capApp.pwaDomainHint2 }} + + |
+ + | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+ +
+
+ 
+ {{ capApp.titleCss }}+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fileVersionsKeepCount }} | -- |
| {{ capApp.fileVersionsKeepDays }} | -- |
| {{ capApp.filesKeepDaysDeleted }} | -- |
| {{ capApp.fileVersionsKeepCount }} | ++ |
| {{ capApp.fileVersionsKeepDays }} | ++ |
| {{ capApp.filesKeepDaysDeleted }} | ++ |
| {{ capGen.actions }} | @@ -77,13 +79,12 @@ let MyAdminFiles = { :caption="displayAttribute(atrId,files.length)" :image="attributeIdsShowDeleted.includes(atrId) ? 'triangleDown.png' : 'triangleRight.png'" :naked="true" - :tight="true" />|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
-
+
-
- {{ capGen.licenseRequired }}
-
-
@@ -37,16 +34,17 @@ let MyAdminLdaps = { {{ l.name }} |
{{ l.host+':'+l.port }} |
- |
+
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.searchDn }} | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.searchClass }} | - - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.keyAttribute }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.loginAttribute }} | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.searchClass }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.keyAttribute }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.loginAttribute }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.details }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.department }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.email }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.location }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.nameDisplay }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.nameFore }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.nameSur }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.notes }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.organization }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.phoneFax }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.phoneLandline }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppLogin.meta.phoneMobile }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.tls }} | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - - | +@@ -249,6 +286,19 @@ let MyAdminLdaps = { bindUserPw:'', keyAttribute:'', loginAttribute:'', + loginMetaAttributes:{ + department:'department', + email:'mail', + location:'physicalDeliveryOfficeName', + nameDisplay:'displayName', + nameFore:'givenName', + nameSur:'sn', + notes:'description', + organization:'company', + phoneFax:'facsimileTelephoneNumber', + phoneLandline:'telephoneNumber', + phoneMobile:'mobile' + }, loginTemplateId:'', memberAttribute:'', searchClass:'', @@ -262,10 +312,12 @@ let MyAdminLdaps = { // states idEdit:-1, // ID of LDAP connection being edited (0 = new) - inputKeys:['name','host','port','bindUserDn','bindUserPw', - 'keyAttribute','loginAttribute','loginTemplateId', - 'memberAttribute','searchClass','searchDn','assignRoles', - 'msAdExt','starttls','tls','tlsVerify','roles'], + inputKeys:[ + 'name','host','port','bindUserDn','bindUserPw', + 'keyAttribute','loginAttribute','loginMetaAttributes', + 'loginTemplateId','memberAttribute','searchClass','searchDn', + 'assignRoles','msAdExt','starttls','tls','tlsVerify','roles' + ], inputsOrg:{}, // map of original input values, key = input key ldaps:[], showExpert:false, @@ -289,17 +341,20 @@ let MyAdminLdaps = { }, // simple - isNew:(s) => s.idEdit === 0, + canSave:(s) => s.hasChanges && s.searchDn !== '', + isNew: (s) => s.idEdit === 0, // stores modules: (s) => s.$store.getters['schema/modules'], roleIdMap: (s) => s.$store.getters['schema/roleIdMap'], capApp: (s) => s.$store.getters.captions.admin.ldaps, + capAppLogin: (s) => s.$store.getters.captions.admin.login, capGen: (s) => s.$store.getters.captions.generic, licenseValid:(s) => s.$store.getters.licenseValid }, methods:{ // externals + getCaption, hasAnyAssignableRole, // actions @@ -314,6 +369,19 @@ let MyAdminLdaps = { bindUserDn:'', bindUserPw:'', keyAttribute:'objectGUID', + loginMetaAttributes:{ + department:'department', + email:'mail', + location:'physicalDeliveryOfficeName', + nameDisplay:'displayName', + nameFore:'givenName', + nameSur:'sn', + notes:'description', + organization:'company', + phoneFax:'facsimileTelephoneNumber', + phoneLandline:'telephoneNumber', + phoneMobile:'mobile' + }, loginAttribute:'sAMAccountName', loginTemplateId:null, memberAttribute:'memberOf', @@ -358,16 +426,14 @@ let MyAdminLdaps = { }, // backend calls - runImport(id) { - ws.send('ldap','import',{id:id},true).then( + runImports() { + ws.send('task','run',{ + clusterMasterOnly:true, + taskName:'importLdapLogins' + },true).then( () => { this.$store.commit('dialog',{ - captionBody:this.capApp.dialog.importDone, - buttons:[{ - caption:this.capGen.button.close, - cancel:true, - image:'cancel.png' - }] + captionBody:this.capApp.dialog.importPlanned }); }, this.$root.genericError @@ -377,12 +443,7 @@ let MyAdminLdaps = { ws.send('ldap','check',{id:this.idEdit},true).then( () => { this.$store.commit('dialog',{ - captionBody:this.capApp.dialog.testDone, - buttons:[{ - caption:this.capGen.button.close, - cancel:true, - image:'cancel.png' - }] + captionBody:this.capApp.dialog.testDone }); }, this.$root.genericError @@ -440,6 +501,7 @@ let MyAdminLdaps = { bindUserPw:this.bindUserPw, keyAttribute:this.keyAttribute, loginAttribute:this.loginAttribute, + loginMetaAttributes:this.loginMetaAttributes, loginTemplateId:this.loginTemplateId, memberAttribute:this.memberAttribute, searchClass:this.searchClass, diff --git a/www/comps/admin/adminLicense.js b/www/comps/admin/adminLicense.js index 52f7b39b..61d2970e 100644 --- a/www/comps/admin/adminLicense.js +++ b/www/comps/admin/adminLicense.js @@ -13,42 +13,88 @@ let MyAdminLicense = { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.licenseId }} | -{{ license.licenseId }} | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.clientId }} | -{{ license.clientId }} | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.registeredFor }} | -{{ license.registeredFor }} | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.validUntil }} | -{{ getUnixFormat(license.validUntil,settings.dateFormat) }} | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.licenseId }} | +{{ license.licenseId }} | +
| {{ capApp.clientId }} | +{{ license.clientId }} | +
| {{ capApp.registeredFor }} | +{{ license.registeredFor }} | +
| {{ capApp.loginCount }} | +{{ license.loginCount }} | +
| {{ capApp.validUntil }} | +{{ getUnixFormat(license.validUntil,settings.dateFormat) }} | +
+ | {{ capApp.untilDays }} | ++ {{ licenseValid ? this.licenseDays : capApp.licenseExpired }} + | +
| {{ capApp.loginCount }} | ++ {{ concurrentLogins + ' / ' + license.loginCount }} + | +
| {{ capApp.loginCountLimited }} | ++ {{ concurrentLoginsLimited + ' / ' + licenseCountLimited }} + | +
- |
-
-
-
- {{ capGen.name }}
- |
- - | {{ capApp.hint.name }} | -|
|
-
-
- 
- {{ capApp.admin }}
- |
- {{ capApp.hint.admin }} | -||
|
-
-
- |
-
-
-
-
- |
- - | |
|
-
-
- 
- {{ capGen.active }}
- |
- {{ capApp.hint.active }} | -||
|
-
-
- 
- {{ capApp.noAuth }}
- |
- {{ capApp.hint.noAuth }} | -||
|
-
-
-
- {{ capApp.template }}
- |
- - - | -{{ capApp.hint.template }} | -|
|
-
-
-
- {{ capApp.password }}
- |
- - | {{ capApp.hint.password }} | -|
|
-
-
-
- {{ capApp.ldap }}
- |
- - - | -- | |
| {{ capApp.ldapAssignActive }} | +
+
+
+
+ {{ capGen.name }}
+ |
+
+
+
+
+
+ |
+ {{ capApp.hint.name }} | |||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
-
- {{ capGen.application }}
-
+
+ |
+
-
-
+ {{ capApp.template }}
|
- |
- |
+
+
+
+ |
+ {{ capApp.hint.template }} |
- |
-
+ |
-
-
-
+
+ {{ capApp.ldap }}
+
+ |
+
| |
| {{ capApp.ldapMeta }} | +|||||||
|
+
+
+
+ {{ capGen.name }}
+ |
+
+
|
+ ||||||
|
+
+
+ 
+ {{ capApp.meta.organization }}
+ |
+ + | ||||||
|
+
+
+ 
+ {{ capApp.meta.location }}
+ |
+ + | ||||||
|
+
+
+ 
+ {{ capApp.meta.department }}
+ |
+ + | ||||||
|
+
+
+
+ {{ capApp.meta.email }}
+ |
+
+
+
+
+
+ |
+ ||||||
|
+
+
+ 
+ {{ capApp.meta.phone }}
+ |
+
+
|
+ ||||||
|
+
+
+ 
+ {{ capApp.meta.notes }}
+ |
+ + | ||||||
| {{ capApp.ldapAssignActive }} | +|||
|---|---|---|---|
|
+
+ {{ capGen.application }}
+
+
+ |
+ |||
|
+
+
+ |
+
+
+ |||
|
+
+
+
+ {{ capApp.admin }}
+ |
+ {{ capApp.hint.admin }} | +|
|
+
+
+ |
+
+
+
+
+
+ |
+ + |
|
+
+
+
+ {{ capGen.active }}
+ |
+ {{ capApp.hint.active }} | +|
|
+
+
+
+ {{ capApp.noAuth }}
+ |
+
+
+ {{ capApp.hint.noAuth }}
+
+
+
+
+ |
+ |
|
+
+
+
+ {{ capApp.tokenExpiryHours }}
+ |
+ + + | +{{ capApp.hint.tokenExpiryHours }} | +
| {{ capGen.actions }} | ||
|
+
+
+
+ {{ capApp.password }}
+ |
+ + + | +{{ capApp.hint.password }} | +
| {{ capGen.information }} | ||
|
+
+
+ 
+ {{ capApp.limited }}
+ |
+ + | |
+ |
+
+
+ |
+ |||||||||
|---|---|---|---|---|---|---|---|---|---|
| {{ getUnixFormat(s.date,settings.dateFormat+' H:i') }} | +
+
+
+ |
+ {{ s.loginDisplay }} | +
+
+
+
+ {{ s.loginDepartment }}
+ |
+ {{ s.admin ? capGen.option.yes : capGen.option.no }} | +{{ s.noAuth ? capGen.option.yes : capGen.option.no }} | +{{ s.limited ? capGen.option.yes : capGen.option.no }} | +
+
+
+
+ {{ s.nodeName }}
+ |
+
+
+
+ 
+
+ {{ capApp.option[s.device] }}
+ |
+ {{ s.address }} | +
@@ -12,7 +15,7 @@ let MyAdminLoginTemplate = {
| {{ capGen.name }}* | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.global }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.comments }} | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
- -
-
- 
- {{ capAppSet.titleDisplay }}- |
- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.headerCaptions }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.languageCode }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.dateFormat }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.sundayFirstDow }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.tabRemember }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.warnUnsaved }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.mobileScrollForm }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
- -
-
- 
- {{ capAppSet.titleTheme }}- |
- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.bordersAll }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.bordersCorners }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.fontFamily }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.fontSize }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.spacing }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.pattern }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.menuColored }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.dark }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.fieldClean }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.compact }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppSet.pageLimit }} | -
-
-
- {{ settings.pageLimit + 'px' }}
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.name }}* | ++ |
| {{ capApp.global }} | +|
| {{ capGen.comments }} | ++ |
|
+ +
+
+
+ {{ capAppSet.titleGeneral }}+ |
+ |
| {{ capAppSet.languageCode }} | ++ + | +
| {{ capAppSet.dateFormat }} | ++ + | +
| {{ capAppSet.searchDictionaries }} | +
+
+
+
+
+
+
+ {{ d }}
+
+ |
+
| {{ capAppSet.titleSubNumbers }} | +|
| {{ capAppSet.numberSepThousand }} | ++ + | +
| {{ capAppSet.numberSepDecimal }} | ++ + | +
| {{ capAppSet.titleSubMisc }} | +|
|
+ +
+
+
+ {{ capAppSet.titleTheme }}+ |
+ |
| {{ capGen.inputs }} | +
+
+
+ |
+
| {{ capAppSet.fontFamily }} | +
+
+
+
+
+
+ |
+
| {{ capAppSet.spacing }} | ++ + | +
| {{ capAppSet.formActionsAlign }} | ++ + | +
| {{ capAppSet.listRows }} | +
+
+
+ |
+
| {{ capAppSet.pattern }} | ++ + | +
| {{ capAppSet.dark }} | +|
| {{ capAppSet.titleSubHeader }} | +|
| {{ capGen.applications }} | +
+
+
+ |
+
| {{ capAppSet.colorClassicMode }} | ++ + | +
| {{ capAppSet.colorHeader }} | +|
| {{ capAppSet.colorHeaderSingle }} | +|
| {{ capAppSet.titleSubMenu }} | +|
| {{ capAppSet.colorMenu }} | +|
|
+
+
+ |
+ |||||
|---|---|---|---|---|---|
|
+
+
+ |
+ {{ l.admin ? capGen.option.yes : capGen.option.no }} | +{{ l.ldapId !== null ? capGen.option.yes : capGen.option.no }} | +{{ l.noAuth ? capGen.option.yes : capGen.option.no }} | +{{ l.limited ? capGen.option.yes : capGen.option.no }} | +{{ l.active ? capGen.option.yes : capGen.option.no }} | +
| {{ capApp.keepDays }} | ++ + | +
+ |
+ |
| {{ capApp.logLevel }} | ++ + | ++ + | +
+ |
+
| {{ capGen.button.show }} | @@ -154,6 +173,7 @@ let MyAdminLogs = { // inputs byString:'', + configInput:{}, context:'', levelContext:'logModule', limit:100, @@ -162,8 +182,10 @@ let MyAdminLogs = { unixFrom:null, unixTo:null, + // states + showOptions:false, + // data - configInput:{}, logs:[] }; }, @@ -228,12 +250,7 @@ let MyAdminLogs = { this.$store.commit('dialog',{ captionBody:this.getLineBreaksParsedToHtml(this.logs[index].message), textDisplay:'textarea', - width:800, - buttons:[{ - caption:this.capGen.button.close, - cancel:true, - image:'cancel.png' - }] + width:800 }); }, diff --git a/www/comps/admin/adminMailAccount.js b/www/comps/admin/adminMailAccount.js new file mode 100644 index 00000000..9c886a58 --- /dev/null +++ b/www/comps/admin/adminMailAccount.js @@ -0,0 +1,300 @@ +import {dialogCloseAsk} from '../shared/dialog.js'; +export {MyAdminMailAccount as default}; + +let MyAdminMailAccount = { + name:'my-admin-mail-account', + template:`|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ capGen.name }}* | ++ | + | ||
| {{ capApp.accountMode }}* | ++ + | ++ | + | |
| {{ capApp.accountAuthMethod }}* | ++ + | +{{ capApp.accountAuthMethodHintLogin }} | +{{ capApp.accountAuthMethodHintPlain }} | +{{ capApp.accountAuthMethodHintXOAuth2 }} | +
| {{ capApp.accountUser }}* | ++ | + | ||
| {{ capApp.accountPass }}* | ++ | + | ||
| {{ capApp.accountOauth }}* | +
+
+
+
+ |
+ {{ capApp.accountOauthHint }} | +||
| {{ capApp.accountSendAs }}* | ++ | + | ||
| {{ capGen.encryption }}* | ++ + | ++ | ||
| {{ capApp.accountHost }}* | ++ | + | ||
| {{ capApp.accountPort }}* | ++ | + | ||
| {{ capGen.comments }} | ++ | |||
@@ -155,15 +12,23 @@ let MyAdminMailAccounts = {
| {{ capGen.name }} | -{{ capApp.accountMode }} | -{{ capApp.accountSendAs }} | -{{ capApp.accountUser }} | -{{ capApp.accountPass }} | -{{ capApp.accountStartTls }} | -{{ capApp.accountHost }} | -{{ capApp.accountPort }} | -|
|---|---|---|---|---|---|---|---|---|
|
@@ -170,12 +174,7 @@ let MyAdminMails = {
captionTop:this.capApp.body,
image:'mail2.png',
textDisplay:'richtext',
- width:800,
- buttons:[{
- caption:this.capGen.button.close,
- cancel:true,
- image:'cancel.png'
- }]
+ width:800
});
},
startAtPageFirst() {
@@ -203,18 +202,17 @@ let MyAdminMails = {
}
},
toggleMailId(id) {
- let pos = this.mailIdsSelected.indexOf(id);
-
- if(pos === -1)
- return this.mailIdsSelected.push(id);
+ const pos = this.mailIdsSelected.indexOf(id);
- this.mailIdsSelected.splice(pos,1);
+ if(pos === -1) this.mailIdsSelected.push(id);
+ else this.mailIdsSelected.splice(pos,1);
},
// backend calls
del() {
- ws.send('mail','del',{ids:this.mailIdsSelected},true).then(
+ ws.send('mailSpooler','del',{ids:this.mailIdsSelected},true).then(
() => {
+ this.mailIdsSelected = [];
this.offset = 0;
this.get();
},
@@ -222,7 +220,7 @@ let MyAdminMails = {
);
},
get() {
- ws.send('mail','get',{
+ ws.send('mailSpooler','get',{
limit:this.limit,
offset:this.offset,
search:this.search
@@ -237,7 +235,16 @@ let MyAdminMails = {
},
getAccounts() {
ws.send('mailAccount','get',{},true).then(
- res => this.accountIdMap = res.payload.accounts,
+ res => this.accountIdMap = res.payload,
+ this.$root.genericError
+ );
+ },
+ reset() {
+ ws.send('mailSpooler','reset',{ids:this.mailIdsSelected},true).then(
+ () => {
+ this.mailIdsSelected = [];
+ this.get();
+ },
this.$root.genericError
);
}
diff --git a/www/comps/admin/adminMailTraffic.js b/www/comps/admin/adminMailTraffic.js
new file mode 100644
index 00000000..68108bcb
--- /dev/null
+++ b/www/comps/admin/adminMailTraffic.js
@@ -0,0 +1,198 @@
+import {getSizeReadable} from '../shared/generic.js';
+import {getUnixFormat} from '../shared/time.js';
+export {MyAdminMailTraffic as default};
+
+let MyAdminMailTraffic = {
+ name:'my-admin-mail-traffic',
+ template:`
+
+ `,
+ props:{
+ menuTitle:{ type:String, required:true }
+ },
+ data() {
+ return {
+ // inputs
+ configInput:{},
+ limit:50,
+ offset:0,
+ search:'',
+ showOptions:false,
+
+ // mails
+ mails:[],
+ total:0,
+
+ // mail accounts
+ accountIdMap:{}
+ };
+ },
+ mounted() {
+ this.$store.commit('pageTitle',this.menuTitle);
+ this.configInput = JSON.parse(JSON.stringify(this.config));
+
+ this.get();
+ this.getAccounts();
+ },
+ computed:{
+ // simple
+ noMails:(s) => s.total === 0,
+ pages: (s) => Math.ceil(s.total / s.limit),
+
+ // stores
+ capApp: (s) => s.$store.getters.captions.admin.mails,
+ capGen: (s) => s.$store.getters.captions.generic,
+ config: (s) => s.$store.getters.config,
+ settings:(s) => s.$store.getters.settings
+ },
+ methods:{
+ // externals
+ getSizeReadable,
+ getUnixFormat,
+
+ // actions
+ offsetSet(add) {
+ if(add) this.offset += this.limit;
+ else this.offset -= this.limit;
+ this.get();
+ },
+ showFiles(files) {
+ this.$store.commit('dialog',{
+ captionBody:files.join('
+
+
+
+
+ {{ menuTitle + ' (' + total + ')' }}+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ capApp.noMailsInTraffic }}
+
+
+ {{ capApp.trafficKeepDays }}
+
+
+
') + }); + }, + startAtPageFirst() { + this.offset = 0; + this.get(); + }, + startAtPageLast() { + this.offset = this.limit * (this.pages-1); + this.get(); + }, + + // backend calls + get() { + ws.send('mailTraffic','get',{ + limit:this.limit, + offset:this.offset, + search:this.search + },true).then( + res => { + this.mails = res.payload.mails; + this.total = res.payload.total; + }, + this.$root.genericError + ); + }, + getAccounts() { + ws.send('mailAccount','get',{},true).then( + res => this.accountIdMap = res.payload, + this.$root.genericError + ); + }, + setConfig() { + ws.send('config','set',this.configInput,true).then( + () => {}, + this.$root.genericError + ); + } + } +}; \ No newline at end of file diff --git a/www/comps/admin/adminModules.js b/www/comps/admin/adminModules.js index 674eb7be..e30a71b3 100644 --- a/www/comps/admin/adminModules.js +++ b/www/comps/admin/adminModules.js @@ -1,36 +1,12 @@ import MyArticles from '../articles.js'; import srcBase64Icon from '../shared/image.js'; import {getUnixFormat} from '../shared/time.js'; -import { - getCaptionForModule, - getValidLanguageCode -} from '../shared/language.js'; +import {getCaption} from '../shared/language.js'; export {MyAdminModules as default}; let MyAdminModulesItem = { name:'my-admin-modules-item', template:` | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
-
-
- |
|
v{{ module.releaseBuild }} | - {{ module.releaseDate === 0 ? '-' : getUnixFormat(module.releaseDate,'Y-m-d') }} + {{ module.releaseDate === 0 ? '-' : getUnixFormat(module.releaseDate,settings.dateFormat) }} |
@@ -74,7 +48,6 @@ let MyAdminModulesItem = {
@trigger="$emit('showHelp',module.id)"
:active="hasHelp"
:captionTitle="capGen.help"
- :tight="true"
/>
|
@@ -82,7 +55,6 @@ let MyAdminModulesItem = { @trigger="changeLogShow" :active="changeLog !== '' && changeLog !== null" :captionTitle="capApp.changeLog" - :tight="true" /> | @@ -96,11 +68,32 @@ let MyAdminModulesItem = { |
|
- + + | +
+
+
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
-
-
- 
- {{ capGen.actions }}
- |
@@ -432,19 +418,28 @@ let MyAdminModules = {
{{ capApp.position }}
|
+
+
+
+
+ {{ capGen.actions }}
+ |
||
|---|---|---|---|---|
+ | {{ capGen.name }}* | ++ | {{ capApp.nameHint }} | +
| {{ capApp.tenant }} | ++ | {{ capApp.tenantHint }} | +
| {{ capApp.clientId }}* | ++ | {{ capApp.clientIdHint }} | +
| {{ capApp.clientSecret }}* | ++ | {{ capApp.clientSecretHint }} | +
| {{ capApp.dateExpiry }} | +
+
+
+ |
+ {{ capApp.dateExpiryHint }} | +
| {{ capApp.template }} | ++ + | +{{ capApp.templateHint }} | +
| {{ capApp.scopes }}* | +
+
+
+
+
+
+ |
+ {{ capApp.scopesHint }} | +
| {{ capApp.tokenUrl }}* | ++ | {{ capApp.tokenUrlHint }} | +
| + | ||
+ | {{ capGen.name }} | @@ -59,13 +62,15 @@ let MyAdminScheduler = {
|
|
@@ -82,7 +87,7 @@ let MyAdminScheduler = {
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ capGen.name }} | @@ -101,7 +106,6 @@ let MyAdminScheduler = { @trigger="expandScheduler(i)" :image="schedulersExpanded.includes(i) ? 'triangleDown.png' : 'triangleRight.png'" :naked="true" - :tight="true" />{{ displayName(s.taskName) }} | @@ -143,7 +147,7 @@ let MyAdminScheduler = {||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ capGen.application }} | @@ -156,7 +160,12 @@ let MyAdminScheduler = {|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ displayModuleName(s.pgFunctionId) }} | +
+
+
+ |
{{ displayFunctionName(s.pgFunctionId) }} | {{ displaySchedule(s.pgFunctionId,s.pgFunctionScheduleId) }} | {{ displayTime(s.dateAttempt) }} | @@ -176,70 +185,66 @@ let MyAdminScheduler = { props:{ menuTitle:{ type:String, required:true } }, - data:function() { + data() { return { schedulers:[], - schedulersInput:[], - schedulersExpanded:[] // indexes of schedules that show all nodes + schedulersInput:[], // changes to schedulers + schedulersExpanded:[], // indexes of schedules that show all nodes + tasksDisabledMirrorMode:['adminMails','backupRun','mailAttach','mailRetrieve','mailSend','restExecute'] }; }, - mounted:function() { + mounted() { this.get(); this.$store.commit('pageTitle',this.menuTitle); + this.$store.commit('keyDownHandlerAdd',{fnc:this.set,key:'s',keyCtrl:true}); + }, + unmounted() { + this.$store.commit('keyDownHandlerDel',this.set); }, computed:{ - hasChanges:function() { - return JSON.stringify(this.schedulers) !== JSON.stringify(this.schedulersInput); - }, - hasAppSchedules:function() { - for(let i = 0, j = this.schedulers.length; i < j; i++) { - if(this.schedulers[i].taskName === '') + hasAppSchedules:(s) => { + for(let e of s.schedulers) { + if(e.taskName === '') return true; } return false; }, - pgFunctionSchedulers:function() { - let out = []; - for(let i = 0, j = this.schedulers.length; i < j; i++) { - let s = this.schedulers[i]; - - if(s.taskName === '' && s.intervalType !== 'once') - out.push(s); - } - return out; - }, + + // simple + hasChanges: (s) => JSON.stringify(s.schedulers) !== JSON.stringify(s.schedulersInput), + pgFunctionSchedulers:(s) => s.schedulers.filter(v => v.taskName === '' && v.intervalType !== 'once'), // stores - moduleIdMap: function() { return this.$store.getters['schema/moduleIdMap']; }, - pgFunctionIdMap:function() { return this.$store.getters['schema/pgFunctionIdMap']; }, - capApp: function() { return this.$store.getters.captions.admin.scheduler; }, - capGen: function() { return this.$store.getters.captions.generic; } + moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'], + pgFunctionIdMap:(s) => s.$store.getters['schema/pgFunctionIdMap'], + capApp: (s) => s.$store.getters.captions.admin.scheduler, + capGen: (s) => s.$store.getters.captions.generic, + mirrorMode: (s) => s.$store.getters.mirrorMode, + settings: (s) => s.$store.getters.settings }, methods:{ // externals getCaption, - getCaptionForModule, getStringFilled, getUnixFormat, + srcBase64Icon, // presentation - displayTime:function(unixTime) { - return unixTime === 0 ? '-' : this.getUnixFormat(unixTime,'Y-m-d H:i:S'); + displayTime(unixTime) { + return unixTime === 0 ? '-' : this.getUnixFormat(unixTime,`${this.settings.dateFormat} H:i:S`); }, - displayName:function(name) { - return typeof this.capApp.names[name] === 'undefined' - ? name : this.capApp.names[name]; + displayName(name) { + return this.capApp.names[name] === undefined ? name : this.capApp.names[name]; }, - displayModuleName:function(pgFunctionId) { - let m = this.moduleIdMap[this.pgFunctionIdMap[pgFunctionId].moduleId]; - return this.getCaptionForModule(m.captions.moduleTitle,m.name,m); + displayModuleName(pgFunctionId) { + const m = this.moduleIdMap[this.pgFunctionIdMap[pgFunctionId].moduleId]; + return this.getCaption('moduleTitle',m.id,m.id,m.captions,m.name); }, - displayFunctionName:function(pgFunctionId) { - let f = this.pgFunctionIdMap[pgFunctionId]; - - return this.getCaption(f.captions.pgFunctionTitle,f.name); + displayFunctionName(pgFunctionId) { + const f = this.pgFunctionIdMap[pgFunctionId]; + return this.getCaption('pgFunctionTitle',f.moduleId,f.id,f.captions,f.name); }, - displaySchedule:function(pgFunctionId,pgFunctionScheduleId) { + displaySchedule(pgFunctionId,pgFunctionScheduleId) { let f = this.pgFunctionIdMap[pgFunctionId]; let s = null; @@ -272,9 +277,9 @@ let MyAdminScheduler = { ); switch(s.intervalType) { - case 'months': parts.push(this.capApp.scheduleLineDayMonths.replace('{DAY}',s.atDay+1)); break; - case 'weeks': parts.push(this.capApp.scheduleLineDayWeeks.replace('{DAY}',s.atDay)); break; - case 'years': parts.push(this.capApp.scheduleLineDayYears.replace('{DAY}',s.atDay)); break; + case 'months': parts.push(this.capApp.scheduleLineDayMonths.replace('{DAY}',s.atDay)); break; + case 'weeks': parts.push(this.capApp.scheduleLineDayWeeks.replace('{DAY}',s.atDay)); break; + case 'years': parts.push(this.capApp.scheduleLineDayYears.replace('{DAY}',s.atDay)); break; } if(['days','weeks','months','years'].includes(s.intervalType)) @@ -286,7 +291,7 @@ let MyAdminScheduler = { return parts.join(', '); }, - expandScheduler:function(i) { + expandScheduler(i) { let pos = this.schedulersExpanded.indexOf(i); if(pos === -1) this.schedulersExpanded.push(i); @@ -294,7 +299,7 @@ let MyAdminScheduler = { }, // backend calls - get:function() { + get() { ws.send('scheduler','get',{},true).then( res => { this.schedulers = res.payload; @@ -303,7 +308,7 @@ let MyAdminScheduler = { this.$root.genericError ); }, - runPgFunction:function(pgFunctionId,pgFunctionScheduleId) { + runPgFunction(pgFunctionId,pgFunctionScheduleId) { ws.send('task','run',{ clusterMasterOnly:true, pgFunctionId:pgFunctionId, @@ -313,7 +318,7 @@ let MyAdminScheduler = { this.$root.genericError ); }, - runSystemTask:function(name,clusterMasterOnly) { + runSystemTask(name,clusterMasterOnly) { ws.send('task','run',{ clusterMasterOnly:clusterMasterOnly, taskName:name @@ -322,7 +327,10 @@ let MyAdminScheduler = { this.$root.genericError ); }, - set:function() { + set() { + if(!this.hasChanges) + return; + let requests = []; for(let i = 0, j = this.schedulersInput.length; i < j; i++) { let s = this.schedulersInput[i]; diff --git a/www/comps/admin/adminSystemMsg.js b/www/comps/admin/adminSystemMsg.js new file mode 100644 index 00000000..68db0de5 --- /dev/null +++ b/www/comps/admin/adminSystemMsg.js @@ -0,0 +1,194 @@ +import MyInputDate from '../inputDate.js'; +import MyInputRichtext from '../inputRichtext.js'; +import {getDateFormat} from '../shared/time.js'; +export {MyAdminSystemMsg as default}; + +let MyAdminSystemMsg = { + name:'my-admin-system-msg', + components:{ + MyInputDate, + MyInputRichtext + }, + template:`|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.status }} | ++ | |
| {{ capApp.text }} | +
+
+
+ |
+ |
| {{ capApp.date0 }} | +
+ |
+ |
| {{ capApp.date1 }} | +
+ |
+ |
| {{ capApp.maintenance }} | +{{ capApp.maintenanceHint }} | +|
| {{ capGen.information }} | ++ | |
+ {{ capGen.applications }}
+ 
+ {{ capGen.home }}
+ 
@@ -27,7 +30,6 @@ let MyArticles = {
+ {{ capApp.navigationStart }}
+
+ {{ capGen.module }}
+ 
+ {{ capGen.relations }}
+
+ {{ capGen.forms }}
+ 
+ {{ capGen.menus }}
+ 
+ {{ capGen.roles }}
+
+ {{ capGen.icons }}
+
+ {{ capApp.navigationCaptionMap }}
+ 
+ {{ capGen.pgFunctions }}
+ 
+ {{ capGen.jsFunctions }}
+ 
+ {{ capGen.collections }}
+
+ {{ capGen.loginForms }}
+
+ {{ capGen.articles }}
+ 
+ {{ capGen.apis }}
+
-
-
- {{ capApp.navigationStart }}
-
- {{ capApp.navigationModule }}
-
- {{ capApp.navigationRelations }}
-
- {{ capApp.navigationForms }}
-
- {{ capApp.navigationMenu }}
-
- {{ capApp.navigationRoles }}
-
- {{ capApp.navigationIcons }}
-
- {{ capApp.navigationPgFunctions }}
-
- {{ capApp.navigationJsFunctions }}
-
- {{ capApp.navigationCollections }}
-
- {{ capApp.navigationLoginForms }}
-
- {{ capApp.navigationArticles }}
-
- {{ capApp.navigationApis }}
- 
+ {{ capGen.variables }}
+
-
-
-
-
-
-
-
- 
+ {{ capGen.widgets }}
+
+ {{ capGen.forms }}
+
+ {{ capGen.roles }}
+
+ {{ capGen.relations }}
+
+ {{ capGen.collections }}
+
+ {{ capGen.apis }}
+
+ {{ capGen.pgFunctions }}
+
+ {{ capGen.jsFunctions }}
+ | {{ capApp.call }} | -- - | -{{ capAppApi.hint[call.toLowerCase()] }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.httpMethod }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Content-Type | -
-
-
-
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| URL | -
-
-
-
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.recordId }} | -- | {{ isGet ? capApp.recordIdHintGet : capApp.recordIdHintDelete }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capAppApi.warnings }} | -
-
|
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.headers }} | -
-
|
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.params }} | -
-
|
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.request }} | -
-
-
-
-
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.response }} | -
-
-
-
-
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.call }} | ++ + | +{{ capAppApi.hint[call.toLowerCase()] }} | +|||||||||
| {{ capApp.httpMethod }} | ++ + | +||||||||||
| Content-Type | +
+
+
+
+ |
+ ||||||||||
| URL | +
+
+
+
+ |
+ ||||||||||
| {{ capApp.recordId }} | ++ | {{ isGet ? capApp.recordIdHintGet : capApp.recordIdHintDelete }} | +|||||||||
| {{ capAppApi.warnings }} | +
+
|
+ ||||||||||
| {{ capApp.headers }} | +
+
|
+ ||||||||||
| {{ capApp.params }} | +
+
|
+ ||||||||||
| {{ capApp.request }} | +
+
+
+
+
+ |
+ ||||||||||
| {{ capApp.response }} | +
+
+
+
+
+ |
+ ||||||||||
| {{ capGen.name }} | -- | {{ capApp.nameHint }} | -|||||||||
| {{ capGen.version }} | -- | {{ capApp.versionHint }} | -|||||||||
| {{ capGen.comments }} | -- - | -||||||||||
| {{ capApp.content }} | -- | - | |||||||||
| {{ capApp.verboseDef }} | -{{ capApp.verboseDefHint }} | -||||||||||
| {{ capApp.warnings }} | -
-
|
- ||||||||||
| {{ capApp.httpMethods }} | -
-
-
-
|
- ||||||||||
| {{ capApp.limitDef }} | -- | {{ capApp.limitDefHint }} | -|||||||||
| {{ capApp.limitMax }} | -- | {{ capApp.limitMaxHint }} | -|||||||||
| {{ capGen.name }} | ++ | {{ capApp.nameHint }} | +|||||||||
| {{ capGen.version }} | ++ | {{ capApp.versionHint }} | +|||||||||
| {{ capGen.comments }} | ++ + | +||||||||||
| {{ capApp.content }} | ++ | + | |||||||||
| {{ capApp.verboseDef }} | +{{ capApp.verboseDefHint }} | +||||||||||
| {{ capApp.warnings }} | +
+
|
+ ||||||||||
| {{ capApp.httpMethods }} | +
+
+
+
|
+ ||||||||||
| {{ capApp.limitDef }} | ++ | {{ capApp.limitDefHint }} | +|||||||||
| {{ capApp.limitMax }} | ++ | {{ capApp.limitMaxHint }} | +|||||||||
| {{ capApp.assignTo }} | -- - | -
| {{ capGen.form }} | -- - | -
| {{ capApp.addArticle }} | -- - | -
| {{ capApp.assignTo }} | ++ + | +
| {{ capGen.form }} | ++ + | +
| {{ capApp.addArticle }} | ++ + | +
{{ articleIdMap[element].name }}
@@ -302,27 +337,27 @@ let MyBuilderArticles = {
| {{ capGen.name }} | -
-
+
+ {{ capGen.name }} |
+
- |
- {{ capApp.nameHint }} |
- {{ capGen.title }} |
-
- |
+
- {{ capApp.nameHint }} |
+ {{ capGen.title }} |
+
+ |
+
+
+ {{ capApp.titleHint }} |
+ {{ capGen.icon }} |
+
+ |
- {{ capApp.titleHint }} |
- {{ capGen.icon }} |
-
- |
- {{ capApp.iconHint }} |
- {{ capApp.usedFor }} |
-
- |
-
-
-
- {{ capApp['usedForHint'][usedFor] }} |
- {{ isDate || isDatetime ? capApp.bigintDates : capApp.bigint }} |
- |
- {{ isDate || isDatetime ? capApp.bigintDatesHint : capApp.bigintHint }} |
- {{ capApp.doublePrecision }} |
- |
- {{ capApp.doublePrecisionHint }} |
- {{ isString ? capApp.lengthText : capApp.lengthFiles }} |
-
-
- |
-
- | {{ capApp.encrypted }} |
- |
- {{ capApp.encryptedHint }} |
- {{ capApp.nullable }} |
- |
- {{ capApp.nullableHint }} |
- {{ capApp.defaults }} |
-
- |
-
-
-
-
- {{ capApp.defaultsHint }} |
- {{ capApp.relationshipId }} |
+
+ {{ capApp.iconHint }} |
+ {{ capApp.usedFor }} |
- |
+ {{ capApp.usedForHint[usedFor] }} |
+ {{ capApp.relationshipId }} |
+
+
+
+
+
+
+ |
+
+ | {{ capApp.onDelete }} |
+
+
+ |
+ {{ capApp.option.relationshipActionsHints[values.onDelete] }} |
+ {{ capApp.onUpdate }} |
+
+
+ |
+ {{ capApp.option.relationshipActionsHintsOnUpdate }} |
+ {{ isDate || isDatetime ? capApp.bigintDates : capApp.bigint }} |
+ |
+ {{ isDate || isDatetime ? capApp.bigintDatesHint : capApp.bigintHint }} |
+ {{ capApp.doublePrecision }} |
+ |
+ {{ capApp.doublePrecisionHint }} |
+ {{ lengthTitle }} |
+
+
|
| {{ capApp.onDelete }} |
+
+
+ {{ capApp.lengthNumeric }} |
-
+ |
-
{{ capApp.option.relationshipActionsHints[values.onDelete] }} |
+
+ {{ capApp.lengthFractHint.replace('{C0}','9'.repeat(values.length - values.lengthFract)).replace('{C1}','9'.repeat(values.lengthFract)) }}
+ |
+ {{ capApp.lengthFractHintMax }} |
{{ capApp.onUpdate }} |
+
+
+ {{ capApp.encrypted }} |
+ |
+ {{ capApp.encryptedHint }} |
+ {{ capApp.nullable }} |
+ |
+ {{ capApp.nullableHint }} |
+ {{ capApp.defaults }} |
-
+ |
-
+
+
+
{{ capApp.option.relationshipActionsHintsOnUpdate }} |
+ {{ capApp.defaultsHint }} |
{{ capApp.content }} |
-
- | {{ capApp.contentHint }} |
- {{ capApp.content }} |
+
+ | {{ capApp.contentHint }} |
+ |
+ | {{ capGen.title }} | +
+
+
+ |
+ {{ capApp.titleHint }} | +
| {{ capGen.event }} | ++ + | +|
| {{ capGen.hotkey }}* | +
+ |
+ {{ capApp.hotkeyHint }} | +
| {{ capGen.action }} | ++ + | +|
| {{ capGen.jsFunction }}* | ++ + | +|
| {{ capGen.pgFunction }}* | ++ + | +|
| {{ capGen.arguments }} | +
+
+
+
+
+
+
+
+ |
+ {{ capApp.argumentsHint }} | +
| {{ capGen.name }} | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.icon }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
-
- {{ capApp.inHeader }}
-
`,
- emits:['hotkeysRegister'],
props:{
builderLanguage:{ type:String, required:true },
id: { type:String, required:false, default:'' },
readonly: { type:Boolean, required:true }
},
mounted() {
- this.$emit('hotkeysRegister',[{fnc:this.set,key:'s',keyCtrl:true}]);
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.set,key:'s',keyCtrl:true});
},
unmounted() {
- this.$emit('hotkeysRegister',[]);
+ this.$store.commit('keyDownHandlerDel',this.set);
},
data() {
return {
@@ -285,7 +285,10 @@ let MyBuilderCollection = {
// state
columnIdShow:null,
- filtersDisable:['collection','field','fieldChanged','fieldValid','javascript','record','recordNew'],
+ filtersDisable:[
+ 'collection','formChanged','field','fieldChanged','fieldValid',
+ 'formState','getter','javascript','record','recordNew','variable'
+ ],
showPreview:false,
showSidebar:true,
tabTarget:'content'
diff --git a/www/comps/builder/builderCollectionInput.js b/www/comps/builder/builderCollectionInput.js
index 69766353..3349777c 100644
--- a/www/comps/builder/builderCollectionInput.js
+++ b/www/comps/builder/builderCollectionInput.js
@@ -10,84 +10,109 @@ let MyBuilderCollectionInput = {
name:'my-builder-collection-input',
components:{MyBuilderOpenFormInput},
template:`
{{ c.name }}
-
+ `,
@@ -264,11 +258,12 @@ let MyBuilderField = {
joinsIndexMap: { type:Object, required:true },
moduleId: { type:String, required:true },
noMovement: { type:Boolean, required:true },
+ showColumnsAll: { type:Boolean, required:true },
uiScale: { type:Number, required:true }
},
emits:[
- 'column-id-show','field-counter-set','field-id-show','field-remove',
- 'field-move','field-property-set','field-move-store'
+ 'column-id-show','field-counter-set','field-id-show','field-move',
+ 'field-move-store','field-property-set','field-remove'
],
data() {
return {
@@ -276,15 +271,42 @@ let MyBuilderField = {
};
},
computed:{
+ columnBatchIndexTitle:(s) => {
+ if(s.isGantt) return [s.capApp.ganttBatch];
+ if(s.isKanban) {
+ const joinsIndexMap = s.getJoinsIndexMap(s.field.query.joins);
+ const getCaption = function(relationIndex) {
+ const j = joinsIndexMap[relationIndex];
+ return `${relationIndex} ${s.relationIdMap[j.relationId].name}`;
+ };
+
+ let out = [];
+ if(s.field.relationIndexAxisX !== null)
+ out.push(s.capApp.kanban.columnBatchX.replace('{REL}',getCaption(s.field.relationIndexAxisX)));
+ if(s.field.relationIndexAxisY !== null)
+ out.push(s.capApp.kanban.columnBatchY.replace('{REL}',getCaption(s.field.relationIndexAxisY)));
+
+ return out;
+ }
+ return [];
+ },
cssClass:(s) => {
return {
container:s.isContainer,
isTemplate:s.isTemplate,
+ notData:!s.isData,
+ noGrow:s.flexDirParent === 'column' && (s.isHeader || s.isVariable || (
+ s.isData && !s.isRelationship1N && !s.isRichtext && !s.isBarcode &&
+ !s.isTextarea && !s.isDrawing && !s.isFiles && !s.isIframe)
+ ),
selected:s.isSelected,
tabs:s.isTabs
};
},
cssClassChildren:(s) => {
+ if(s.isTemplate || !s.isContainer)
+ return [];
+
// default classed
let out = [];
if(s.field.fields.length === 0) out.push('empty');
@@ -295,7 +317,7 @@ let MyBuilderField = {
if(s.field.wrap) out.push('wrap');
out.push(`style-justify-content-${s.field.justifyContent}`);
- out.push(`style-justify-content-${s.field.alignContent}`);
+ out.push(`style-align-content-${s.field.alignContent}`);
out.push(`style-align-items-${s.field.alignItems}`);
return out;
},
@@ -316,12 +338,6 @@ let MyBuilderField = {
}
return out.join(';');
},
- parentChildren:(s) => {
- if(s.isContainer)
- return s.field.fields;
-
- return s.field.tabs[s.tabIndex].fields;
- },
show:(s) => {
// filter only data fields
if(!s.filterData || !s.isData)
@@ -338,19 +354,6 @@ let MyBuilderField = {
if(s.filterDataNm && s.field.attributeIdNm !== null) return true;
return false;
},
- title:(s) => {
- switch(s.field.content) {
- case 'button': return 'Button'; break;
- case 'calendar': return 'Calendar'; break;
- case 'chart': return 'Chart'; break;
- case 'container': return 'Container'; break;
- case 'header': return 'Header'; break;
- case 'tabs': return 'Tabs'; break;
- case 'data': return s.getItemTitle(s.field.attributeId,s.field.index,s.field.outsideIn,s.field.attributeIdNm); break;
- case 'list': return s.field.query.relationId === null ? 'List' : `List: ${s.relationIdMap[s.field.query.relationId].name}`; break;
- }
- return '';
- },
warnings:(s) => {
let out = [];
if(s.hasQuery) {
@@ -372,20 +375,33 @@ let MyBuilderField = {
},
// simple
- hasQuery: (s) => s.getFieldHasQuery(s.field),
- isButton: (s) => s.field.content === 'button',
- isCalendar: (s) => s.field.content === 'calendar',
- isChart: (s) => s.field.content === 'chart',
- isContainer: (s) => s.field.content === 'container',
- isData: (s) => s.field.content === 'data',
- isHeader: (s) => s.field.content === 'header',
- isList: (s) => s.field.content === 'list',
- isTabs: (s) => s.field.content === 'tabs',
- isSelected: (s) => s.field.id === s.fieldIdShow,
- isRelationship:(s) => !s.isData ? false : s.isAttributeRelationship(s.attribute.content),
- moveActive: (s) => s.fieldMoveList !== null,
- reference: (s) => s.isTemplate ? '' : 'F' + s.entityIdMapRef.field[s.field.id],
- tabIndexShown: (s) => s.tabIndex >= s.field.tabs.length ? 0 : s.tabIndex,
+ hasQuery: (s) => s.getFieldHasQuery(s.field),
+ isBarcode: (s) => s.isData && s.attribute.contentUse === 'barcode',
+ isButton: (s) => s.field.content === 'button',
+ isCalendar: (s) => s.field.content === 'calendar',
+ isChart: (s) => s.field.content === 'chart',
+ isContainer: (s) => s.field.content === 'container',
+ isData: (s) => s.field.content === 'data',
+ isDrawing: (s) => s.isData && s.attribute.contentUse === 'drawing',
+ isFiles: (s) => s.isData && s.isAttributeFiles(s.attribute.content),
+ isGantt: (s) => s.isCalendar && s.field.gantt,
+ isHeader: (s) => s.field.content === 'header',
+ isIframe: (s) => s.isData && s.attribute.contentUse === 'iframe',
+ isKanban: (s) => s.field.content === 'kanban',
+ isList: (s) => s.field.content === 'list',
+ isRichtext: (s) => s.isData && s.attribute.contentUse === 'richtext',
+ isTabs: (s) => s.field.content === 'tabs',
+ isTextarea: (s) => s.isData && s.attribute.contentUse === 'textarea',
+ isSelected: (s) => s.field.id === s.fieldIdShow,
+ isRelationship: (s) => s.isData && s.isAttributeRelationship(s.attribute.content),
+ isRelationship1N:(s) => s.isRelationship && s.field.outsideIn === true && s.attribute.content === 'n:1',
+ isVariable: (s) => s.field.content === 'variable',
+ parentChildren: (s) => s.isContainer ? s.field.fields : (s.isTabs ? s.field.tabs[s.tabIndex].fields : []),
+ moveActive: (s) => s.fieldMoveList !== null,
+ reference: (s) => s.isTemplate ? '' : 'F' + s.entityIdMapRef.field[s.field.id],
+ showColumns: (s) => !s.isTemplate && s.hasQuery && ((s.fieldIdShow === s.field.id && s.fieldIdShowTab === 'content') || s.showColumnsAll),
+ tabIndexShown: (s) => s.isTabs && s.field.tabs.length > s.tabIndex ? s.tabIndex : 0,
+ title: (s) => s.getFieldTitle(s.field),
// stores
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
@@ -402,12 +418,11 @@ let MyBuilderField = {
// externals
getFieldHasQuery,
getFieldIcon,
+ getFieldTitle,
getFlexBasis,
getItemTitle,
getJoinsIndexMap,
- getQueryExpressions,
- getQueryFiltersProcessed,
- getRelationsJoined,
+ isAttributeFiles,
isAttributeRelationship,
// actions
@@ -418,12 +433,7 @@ let MyBuilderField = {
this.$store.commit('dialog',{
captionBody:`
-
-
diff --git a/www/comps/builder/builderField.js b/www/comps/builder/builderField.js
index 02ca0e84..b083c7c9 100644
--- a/www/comps/builder/builderField.js
+++ b/www/comps/builder/builderField.js
@@ -1,19 +1,20 @@
-import MyBuilderCaption from './builderCaption.js';
-import MyBuilderFields from './builderFields.js';
-import {MyBuilderColumns} from './builderColumns.js';
-import {isAttributeRelationship} from '../shared/attribute.js';
-import {getFieldIcon} from '../shared/field.js';
-import {getFlexBasis} from '../shared/form.js';
+import MyBuilderCaption from './builderCaption.js';
+import MyBuilderFields from './builderFields.js';
+import {MyBuilderColumns} from './builderColumns.js';
+import {getFlexBasis} from '../shared/form.js';
+import {getJoinsIndexMap} from '../shared/query.js';
import {
getFieldHasQuery,
getItemTitle
} from '../shared/builder.js';
import {
- getJoinsIndexMap,
- getQueryExpressions,
- getQueryFiltersProcessed,
- getRelationsJoined
-} from '../shared/query.js';
+ isAttributeFiles,
+ isAttributeRelationship
+} from '../shared/attribute.js';
+import {
+ getFieldIcon,
+ getFieldTitle
+} from '../shared/field.js';
export {MyBuilderField as default};
let MyBuilderField = {
@@ -56,6 +57,7 @@ let MyBuilderField = {
/>
-
-
+
`,
props:{
+ batchIndexTitle:{ type:Array, required:false, default:() => [] }, // titles by batch index (0 is for first batch)
builderLanguage:{ type:String, required:true },
columns: { type:Array, required:true },
columnIdShow: { required:false,default:null },
groupName: { type:String, required:true },
+ hasBatches: { type:Boolean, required:false, default:true },
hasCaptions: { type:Boolean, required:true },
- isTemplate: { type:Boolean, required:true },
- joins: { type:Array, required:false, default:() => [] },
- moduleId: { type:String, required:true },
- showOptions: { type:Boolean, required:true }
+ hasStyling: { type:Boolean, required:false, default:true } // display/formatting options
},
emits:['column-id-show','columns-set'],
computed:{
- columnsInput:{
- get() { return JSON.parse(JSON.stringify(this.columns)); },
- set(v) { if(!this.isTemplate) this.$emit('columns-set',v); }
+ batches:{
+ get() {
+ let out = [];
+ for(let c of this.columns) {
+ let columnAdded = false;
+
+ if(c.batch !== null) {
+ // lookup existing batch to add column to
+ for(let i = 0, j = out.length; i < j; i++) {
+ if(out[i].batch === c.batch) {
+ out[i].columns.push(c);
+ columnAdded = true;
+ break;
+ }
+ }
+ }
+
+ // column is either without batch or the first column of a batch
+ // create new batch with single column in it
+ if(!columnAdded) {
+ out.push({
+ batch:c.batch,
+ columns:[c],
+ vertical:c.styles.includes('vertical')
+ });
+ }
+ }
+ return out;
+ },
+ set(batches) {
+ let columns = [];
+ let index = 0; // unique index to separate nearby but separate batches
+
+ for(let b of batches) {
+ if(b.columns.length === 0)
+ continue; // remove empty
+
+ let sharedIndex = b.columns.length === 1 ? null : index++;
+
+ for(let c of b.columns) {
+ c.batch = sharedIndex;
+ columns.push(c);
+ }
+ }
+ this.$emit('columns-set',columns);
+ }
},
- // must be unique or else columns could be moved between separate entities
- group:(s) => {
+ // drag groups must be unique or else batches/columns could be moved between separate entities
+ groupBatches:(s) => {
+ let name = `batches_${s.groupName}`;
+ return { name:name, pull:[name], put:[name] };
+ },
+ groupColumns:(s) => {
return {
name:s.groupName,
- pull:[s.groupName],
- put:s.isTemplate ? false : [s.groupName]
+ pull:s.hasBatches ? [s.groupName] : false,
+ put:s.hasBatches ? [s.groupName] : false
};
},
// stores
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
- capApp: (s) => s.$store.getters.captions.builder.form
+ capApp: (s) => s.$store.getters.captions.builder.form,
+ capGen: (s) => s.$store.getters.captions.generic
},
methods:{
// externals
- getAttributeIcon,
+ getColumnIcon,
+ getColumnTitleForLang,
getFlexBasis,
getItemTitleColumn,
// actions
- propertySet(columnIndex,name,value) {
- this.columnsInput[columnIndex][name] = value;
- this.refreshColumnsInput();
+ batchRemove(i) {
+ let batches = JSON.parse(JSON.stringify(this.batches));
+ batches.splice(i,1);
+ this.batches = batches;
},
- toggleSize(oldVal,change) {
- if(oldVal+change < 0) return 0;
-
- return oldVal+change;
- },
- batchSet(columnIndex,valChange) {
- let c = this.columnsInput[columnIndex];
-
- if(c.batch === null)
- c.batch = 0;
-
- let newVal = c.batch + valChange <= 0 ? null : c.batch + valChange;
- this.propertySet(columnIndex,'batch',newVal);
+ columnSetBy(id,name,value) {
+ let columns = JSON.parse(JSON.stringify(this.columns));
+ for(let i = 0, j = columns.length; i < j; i++) {
+ if(columns[i].id === id) {
+ columns[i][name] = value;
+ return this.$emit('columns-set',columns);
+ }
+ }
},
- refreshColumnsInput() {
- // computed setter is not triggered unless object is set anew
- // this forces setter to trigger
- this.columnsInput = this.columnsInput;
+ toggleSize(oldVal,change) {
+ return oldVal+change < 0 ? 0 : oldVal+change;
},
- remove(i) {
- this.columnsInput.splice(i,1);
- this.refreshColumnsInput();
+ toggleVertical(column) {
+ const pos = column.styles.indexOf('vertical');
+ if(pos === -1) column.styles.push('vertical');
+ else column.styles.splice(pos,1);
}
}
};
export let MyBuilderColumnTemplates = {
name:'my-builder-column-templates',
- components:{MyBuilderColumns},
- template:`
+
+
+
+ 
-
- [{{ element.batch === null ? 'B-' : 'B'+element.batch }}]
-
-
-
- {{ getFlexBasis(element.basis) }}
-
+
+ {{ batchIndexTitle[batchIndex] }}
+
-
-
- {{ getItemTitleColumn(element,false) }}
-
- 
+
+
+
+
+
+
+ {{ getItemTitleColumn(column,false) }}
+
+
+
+
+
+ {{ getFlexBasis(column.basis) }}
+
+ 
+ 
+ 
+
+
+
+
+
+
+ 
+
+ {{ getItemTitleColumn(c,false) }}
+
+
-
-
+
+
+
-
| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.axisType }} X | @@ -174,11 +181,12 @@ let MyBuilderFieldOptionsChart = {|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
-
+
+
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.title }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldHelp }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.icon }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.state }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.onMobile }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.headerSize }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.attribute }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.title }} |
-
-
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldMin }} | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldMax }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldHelp }} | - | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.display }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.icon }} | - - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldClipboard }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldRegexCheck }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldDefault }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.collectionIdDef }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldDefaultPresetIds }} | -
-
-
- |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldAttributeIdAltRichtextFiles }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.state }} | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldAttributeIdAltDateTo }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.visibility }} |
-
+
+
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.category }} | +{{ capApp.headerRichtext }} |
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
+
+
+ |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.headerSize }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.filterQuick }} | +{{ capGen.attribute }} |
- |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldMin }} | ++ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.autoSelect }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldMax }} | - + | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.date0 }} | -- | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldRegexCheck }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldDefault }} | +
+
+
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.date1 }} | -- + + + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.collectionIdDef }} | +
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldDefaultPresetIds }} | +
+
+
+
+
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldAttributeIdAltRichtextFiles }} | ++ - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.dateColor }} | -- | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldAttributeIdAltDateTo }} | ++ + + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.autoSelect }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.options }} | +
+
+
+
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.gantt }} | + +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.alignment }} |
- |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - | {{ capApp.ganttNotes }} | +{{ capApp.date0 }} | ++ + | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.ganttSteps }} | +{{ capApp.date1 }} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.ganttStepsToggle }} | +{{ capApp.dateColor }} | ++ + | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.days }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.daysToggle }} | +
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.gantt }} | +{{ capApp.ganttNotes }} | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.ganttSteps }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.ganttStepsToggle }} | +
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.ics }} |
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.dateRange0 }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.dateRange1 }} | ++ + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.ics }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.dateRange0 }} | +{{ capApp.fieldSize }} | +
+
+
+
+ |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexSizeGrow }} | +
+
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexSizeMax }} | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.dateRange1 }} | +{{ capApp.flexSizeShrink }} | +
+
+
+
+ |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexSizeMin }} | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.containerContent }} | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldDirection }} | +
+
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexWrap }} | +
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexJustifyContent }} | +
+
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexAlignItems }} | +
+
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexAlignContent }} | +
+
+
+
+ |
+ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldDirection }} | -- - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.flexWrap }} | -
- |
- ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.fieldSize }} | -
-
-
+
+ |
+
+ {{ capApp.tabs }}
+
+
+ |
+
+
+
{{ capApp.kanban.relationIndexData }} |
+
+ |
+
+
+
+ {{ capApp.kanban.relationIndexAxisX }} |
+
+ |
+
+
+
+ {{ capApp.kanban.relationIndexAxisY }} |
+
+ |
+
+
+
+
+ |
+ |
+
+
+
+ {{ capApp.display }} |
+
+
+ |
+ {{ capApp.limit }} |
+
+
- | {{ capApp.autoRenew }} |
+
+
- |
- {{ capApp.flexSizeGrow }} |
-
- |
-
+ {{ capApp.filterQuick }} |
+
+ | {{ capApp.csvImport }} |
+
+ | {{ capApp.csvExport }} |
+
+ |
- {{ capApp.flexSizeMax }} |
-
-
- |
- {{ capApp.flexSizeShrink }} |
+
+ {{ capGen.variable }} |
|
-
+
+
+
+
+
{{ capApp.flexSizeMin }} |
-
-
- |
- {{ capApp.flexJustifyContent }} |
-
-
- |
- {{ capApp.flexAlignItems }} |
-
-
- |
- {{ capApp.flexAlignContent }} |
-
-
- |
- {{ capApp.jsFunctionButton }} |
+ {{ capApp.jsFunctionData }} |
- |
-
- {{ capApp.tabs }}
+
+
- |
-
-
-
{{ capApp.display }} |
-
-
- |
- {{ capApp.limit }} |
-
-
- |
- {{ capApp.autoRenew }} |
-
-
- |
- {{ capApp.filterQuick }} |
-
- |
{{ capApp.csvImport }} |
+
+
+ {{ capApp.openForm }} |
- |
{{ capApp.csvExport }} |
+
|
- |
{{ capApp.jsFunctionButton }} |
- {{ capApp.jsFunctionData }} |
-
-
- |
- {{ capApp.openForm }} |
-
- |
-
- |
-
- {{ capApp.collectionTitle }}
-
-
-
- |
-
+ |
+
+ {{ capApp.collectionTitle }}
+
+
+
+ |
+ | ||||||||||||||||||||||||
+ | {{ capGen.name }} | -- |
| {{ capGen.title }} | -
- |
-
| {{ capGen.icon }} | -
- |
-
| {{ capApp.noDataActions }} | -|
| {{ capApp.presetOpen }} | -- - | -
| {{ capGen.name }} | ++ |
| {{ capGen.title }} | +
+ |
+
| {{ capGen.icon }} | +
+ |
+
| {{ capApp.noDataActions }} | +|
| {{ capApp.presetOpen }} | ++ + | +
| {{ capApp.fieldIdFocus }} | ++ + | +
+ | + | {{ capGen.title }} | +{{ capGen.icon }} | +{{ capApp.jsFunctionId }}* | +{{ capAppForm.state }} | +{{ capGen.color }} | ++ |
|---|
+ {{ capApp.warning.noJsFunction }}
+
+
+ | {{ capApp.event }} | -{{ capApp.eventBefore }} | -{{ capApp.jsFunctionId }} | +{{ capApp.jsFunctionId }}* |
|---|
+ {{ capApp.warning.noJsFunction }}
+
@@ -54,15 +66,17 @@ let MyBuilderJsFunction = {
:active="hasChanges"
:caption="capGen.button.refresh"
/>
-
- {{ capApp.placeholdersFormFields }}
+
+
- {{ capApp.placeholdersCollections }}
+
- {{ capApp.titleJs }}
+
+ | - - | -- - | -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
-
- {{ capApp.titlePg }}
+
+ | - - | -- - | -
+
+
+
+
+ |
-
- {{ capApp.placeholdersInstance }}
+ | - - | -
- |
-
| {{ capGen.name }} | -- | ||||||||||||||||||
| {{ capGen.title }} | -
- |
- ||||||||||||||||||
| {{ capGen.description }} | -
- |
- ||||||||||||||||||
| {{ capApp.form }} | -
-
-
- {{ capGen.name }} |
+
+ | {{ capGen.title }} |
+
+ |
- {{ capApp.codeArgs }} |
-
-
- |
- {{ capApp.codeReturns }} |
-
-
- |
- {{ capGen.description }} |
+
+ |
+ {{ capApp.codeArgs }} |
+
+
+ |
+ {{ capApp.codeReturns }} |
+
+
+ |
+ {{ capGen.clientEvent }} |
+ |
+ {{ capApp.form }} |
+
+ |
+
+
+
+ |
${args.join(',`); + this.$store.commit('dialog',{ captionTop:top, - captionBody:text, - buttons:[{ - caption:this.capGen.button.close, - cancel:true, - image:'cancel.png' - }] + captionBody:text }); }, // placeholders are used for storing entities via ID instead of name (which can change) placeholdersSet(body) { - let that = this; - let fields = this.dataFieldMap; let uuid = '[a-z0-9\-]{36}'; let prefix = 'app'; let pat; // replace collection & column IDs with placeholders pat = new RegExp(`${prefix}\.collection_(read|update)\\('(${uuid})'(,\\[([a-z0-9\\-\\s,']*)\\])?`,'g'); - body = body.replace(pat,function(match,mode,collectionId,optional,columnArray) { - if(that.collectionIdMap[collectionId] === 'undefined') + body = body.replace(pat,(match,mode,collectionId,optional,columnArray) => { + if(this.collectionIdMap[collectionId] === 'undefined') return match; - let collection = that.collectionIdMap[collectionId]; - let module = that.moduleIdMap[collection.moduleId]; + let collection = this.collectionIdMap[collectionId]; + let module = this.moduleIdMap[collection.moduleId]; if(mode === 'update') return `${prefix}.collection_update({${module.name}.${collection.name}}`; @@ -674,66 +937,81 @@ let MyBuilderJsFunction = { }); // replace field IDs with placeholders - pat = new RegExp(`${prefix}\.(get|set)_field_(value|caption|error)\\('(${uuid})'`,'g'); - body = body.replace(pat,function(match,mode,part,id) { - - let fld = false; - for(let k in fields) { - if(fields[k].id === id) { - fld = fields[k]; - break; - } - } - if(fld === false) - return match; - - let atr = that.attributeIdMap[fld.attributeId]; - let rel = that.relationIdMap[atr.relationId]; - let mod = that.moduleIdMap[rel.moduleId]; - return `${prefix}.${mode}_field_${part}({${fld.index}:${mod.name}.${rel.name}.${atr.name}}`; - }); + pat = new RegExp(`${prefix}\.(get|set)_field_(value|value_changed|caption|chart|error|focus|order|file_links)\\('(${uuid})'`,'g'); + body = body.replace(pat,(match,mode,part,id) => this.fieldIdMap[id] !== undefined + ? `${prefix}.${mode}_field_${part}({${this.displayFieldName(id)}}` : match + ); // replace function IDs with placeholders pat = new RegExp(`${prefix}\.call_(backend|frontend)\\('(${uuid})'`,'g'); - body = body.replace(pat,function(match,fncMode,id) { + body = body.replace(pat,(match,fncMode,id) => { - let fnc = false; - if(fncMode === 'backend' && that.pgFunctionIdMap[id] !== 'undefined') { - fnc = that.pgFunctionIdMap[id]; + if(fncMode === 'backend' && this.pgFunctionIdMap[id] !== 'undefined') { + const fnc = this.pgFunctionIdMap[id]; + const mod = this.moduleIdMap[fnc.moduleId]; + return `${prefix}.call_backend({${mod.name}.${fnc.name}}`; } - else if(fncMode === 'frontend' && that.jsFunctionIdMap[id] !== 'undefined') { - fnc = that.jsFunctionIdMap[id]; + else if(fncMode === 'frontend' && this.jsFunctionIdMap[id] !== 'undefined') { + const fnc = this.jsFunctionIdMap[id]; + const mod = this.moduleIdMap[fnc.moduleId]; + + if(fnc.formId === null) + return `${prefix}.call_frontend({${mod.name}.${fnc.name}}`; + + const form = this.formIdMap[fnc.formId]; + return `${prefix}.call_${fncMode}({${mod.name}.${form.name}.${fnc.name}}`; } - if(fnc === false) + return match; + }); + + // replace variable IDs with placeholders + pat = new RegExp(`${prefix}\.(get|set)_variable\\('(${uuid})'`,'g'); + body = body.replace(pat,(match,mode,variableId) => { + if(this.variableIdMap[variableId] === 'undefined') return match; - let mod = that.moduleIdMap[fnc.moduleId]; - return `${prefix}.call_${fncMode}({${mod.name}.${fnc.name}}`; + const variable = this.variableIdMap[variableId]; + const module = this.moduleIdMap[variable.moduleId]; + const frmOpt = variable.formId === null ? '' : `.${this.formIdMap[variable.formId].name}`; + + return `${prefix}.${mode}_variable({${module.name}${frmOpt}.${variable.name}}`; + }); + + // replace presets with placeholders + // preset name may not include closed curly bracket '}' + pat = new RegExp(`${prefix}\\.get_preset_record_id\\(\\'([a-z0-9\\-]{36})\\'\\)`,'g'); + body = body.replace(pat,(match,presetId) => { + const prs = this.presetIdMap[presetId]; + const rel = this.relationIdMap[prs.relationId]; + const mod = this.moduleIdMap[rel.moduleId]; + const pat = new RegExp(`[\{\}]`,'g'); + + if(prs !== undefined && !pat.test(prs.name)) + return `${prefix}.get_preset_record_id({${mod.name}.${rel.name}.${prs.name}})`; + + return match; }); - return body; }, placeholdersUnset() { - let that = this; - let body = this.codeFunction; - let fields = this.dataFieldMap; - let prefix = 'app'; - let dbName = '[a-z0-9_]+'; // valid chars, DB entities (PG functions, modules, attributes, ...) + let body = this.codeFunction; + let dbChars = this.getValidDbCharsForRx(); + let prefix = 'app'; let pat; // replace collection & column placeholders // stored as: app.collection_read({module.collection},[column1,column2,...]) - pat = new RegExp(`${prefix}\.collection_(read|update)\\(\{(${dbName})\.(${dbName})\}(,\\[(.*)\\])?`,'g'); - body = body.replace(pat,function(match,mode,modName,colName,optional,columnArray) { - if(typeof that.moduleNameMap[modName] === 'undefined') + pat = new RegExp(`${prefix}\.collection_(read|update)\\(\{(${dbChars})\.(${dbChars})\}(,\\[(.*)\\])?`,'g'); + body = body.replace(pat,(match,mode,modName,colName,optional,columnArray) => { + if(this.moduleNameMap[modName] === undefined) return match; - let mod = that.moduleNameMap[modName]; + let mod = this.moduleNameMap[modName]; let col = false; - for(let k in that.collectionIdMap) { - if(that.collectionIdMap[k].moduleId === mod.id && that.collectionIdMap[k].name === colName) - col = that.collectionIdMap[k]; + for(let k in this.collectionIdMap) { + if(this.collectionIdMap[k].moduleId === mod.id && this.collectionIdMap[k].name === colName) + col = this.collectionIdMap[k]; } if(col === false) return false; @@ -755,58 +1033,25 @@ let MyBuilderJsFunction = { return `${prefix}\.collection_read('${col.id}',[${columnIds.join(',')}]`; }); - // replace field value/caption get/set placeholders - // stored as: app.get_field_value({0:contact.is_active}... - pat = new RegExp(`${prefix}\.(get|set)_field_(value|caption|error)\\(\{(\\d+)\:(${dbName})\.(${dbName})\.(${dbName})\}`,'g'); - body = body.replace(pat,function(match,mode,part,index,modName,relName,atrName) { - - // resolve relation inside given module - let mod = that.moduleNameMap[modName]; - let rel = false; - for(let r of mod.relations) { - if(r.name === relName) { - rel = r; - break; - } + // replace field get/set value/caption/error/focus/etc. placeholders + // stored as: app.get_field_value({F12::0 display_name... or app.get_field_value({F13: Container... + pat = new RegExp(`${prefix}\.(get|set)_field_(value|value_changed|caption|chart|error|focus|order|file_links)\\(\{F(\\d+)\\:\\:.*?\}`,'g'); + body = body.replace(pat,(match,mode,part,ref) => { + for(let fieldId in this.entityIdMapRef.field) { + if(this.entityIdMapRef.field[fieldId] === parseInt(ref)) + return `${prefix}\.${mode}_field_${part}('${fieldId}'`; } - if(rel === false) - return match; - - // resolve attribute by name - let atr = false; - for(let i = 0, j = rel.attributes.length; i < j; i++) { - if(rel.attributes[i].name !== atrName) - continue; - - atr = rel.attributes[i]; - break; - } - if(atr === false) - return match; - - // data field - let fld = false; - for(let k in fields) { - if(fields[k].index === parseInt(index) && fields[k].attributeId === atr.id) { - fld = fields[k]; - break; - } - } - if(fld === false) - return match; - - return `${prefix}\.${mode}_field_${part}('${fld.id}'`; + return match; }); // replace backend function placeholders - // stored as: app.call_backend({r3_organizations.get_name_by_id},12... - pat = new RegExp(`${prefix}\.call_backend\\(\{(${dbName})\.(${dbName})\}`,'g'); - body = body.replace(pat,function(match,modName,fncName) { - - if(typeof that.moduleNameMap[modName] === 'undefined') + // stored as: app.call_backend({module.function},12... + pat = new RegExp(`${prefix}\.call_backend\\(\{(${dbChars})\.(${dbChars})\}`,'g'); + body = body.replace(pat,(match,modName,fncName) => { + if(this.moduleNameMap[modName] === undefined) return match; - let mod = that.moduleNameMap[modName]; + let mod = this.moduleNameMap[modName]; let fnc = false; for(let i = 0, j = mod.pgFunctions.length; i < j; i++) { @@ -823,31 +1068,87 @@ let MyBuilderJsFunction = { return `${prefix}\.call_backend('${fnc.id}'`; }); - // replace frontend function placeholders - // stored as: app.call_frontend({r3_organizations.add_numbers},12... - pat = new RegExp(`${prefix}\.call_frontend\\(\{(${dbName})\.(.+)\}`,'g'); - body = body.replace(pat,function(match,modName,fncName) { - - if(typeof that.moduleNameMap[modName] === 'undefined') + // replace global frontend function placeholders + // stored as: app.call_frontend({module.function},12... + pat = new RegExp(`${prefix}\.call_frontend\\(\{(${dbChars})\.([^\.\}]+)\}`,'g'); + body = body.replace(pat,(match,modName,fncName) => { + if(this.moduleNameMap[modName] === undefined) return match; - let mod = that.moduleNameMap[modName]; - let fnc = false; + const mod = this.moduleNameMap[modName]; - for(let i = 0, j = mod.jsFunctions.length; i < j; i++) { - if(mod.jsFunctions[i].name !== fncName) - continue; - - fnc = mod.jsFunctions[i]; - break; + for(let f of mod.jsFunctions) { + if(f.formId === null && f.name === fncName) + return `${prefix}\.call_frontend('${f.id}'`; } - - if(fnc === false) + return match; + }); + + // replace form assigned frontend function placeholders + // stored as: app.call_frontend({module.form.function},12... + pat = new RegExp(`${prefix}\.call_frontend\\(\{(${dbChars})\.([^\.\}]+)\.([^\.\}]+)\}`,'g'); + body = body.replace(pat,(match,modName,frmName,fncName) => { + if(this.form === false || this.moduleNameMap[modName] === undefined) return match; - return `${prefix}\.call_frontend('${fnc.id}'`; + const mod = this.moduleNameMap[modName]; + + for(let f of mod.jsFunctions) { + if(f.formId !== null && f.formId === this.form.id && frmName === this.form.name && f.name === fncName) + return `${prefix}\.call_frontend('${f.id}'`; + } + return match; + }); + + // replace global variable placeholders + // stored as: app.get_variable({module.variable}) + pat = new RegExp(`${prefix}\.(get|set)_variable\\(\{(${dbChars})\.([^\.\}]+)\}`,'g'); + body = body.replace(pat,(match,mode,modName,vaName) => { + if(this.moduleNameMap[modName] !== undefined) { + const mod = this.moduleNameMap[modName]; + for(let k in this.variableIdMap) { + if(this.variableIdMap[k].moduleId === mod.id && this.variableIdMap[k].name === vaName) { + return `${prefix}\.${mode}_variable('${k}'`; + } + } + } + return match; }); + // replace form assigned variable placeholders + // stored as: app.get_variable({module.form.variable}) + pat = new RegExp(`${prefix}\.(get|set)_variable\\(\{(${dbChars})\.([^\.\}]+)\.([^\.\}]+)\}`,'g'); + body = body.replace(pat,(match,mode,modName,frmName,vaName) => { + if(this.form !== false && this.moduleNameMap[modName] !== undefined) { + const mod = this.moduleNameMap[modName]; + for(let k in this.variableIdMap) { + const va = this.variableIdMap[k]; + if(va.formId !== null && va.formId === this.form.id && frmName === this.form.name && va.moduleId === mod.id && va.name === vaName) { + return `${prefix}\.${mode}_variable('${k}'`; + } + } + } + return match; + }); + + // replace preset placeholders + // stored as: app.get_preset_record_id({MOD_NAME.REL_NAME.PRESET_NAME}) + pat = new RegExp(`${prefix}\.get_preset_record_id\\(\\{(${dbChars})\\.(${dbChars})\\.([^\}]*)\\}\\)`,'g'); + body = body.replace(pat,(match,modName,relName,presetName) => { + const mod = this.moduleNameMap[modName]; + if(mod !== undefined) { + for(let r of mod.relations) { + if(r.name !== relName) + continue; + + for(let p of r.presets) { + if(p.name === presetName) + return `${prefix}\.get_preset_record_id('${p.id}')`; + } + } + } + return match; + }); return body; }, @@ -885,6 +1186,7 @@ let MyBuilderJsFunction = { codeArgs:this.codeArgs, codeFunction:this.placeholdersUnset(), codeReturns:this.codeReturns, + isClientEventExec:this.isClientEventExec, captions:this.captions }), ws.prepare('schema','check',{moduleId:this.module.id}) diff --git a/www/comps/builder/builderJsFunctions.js b/www/comps/builder/builderJsFunctions.js index 0bd37bca..4c410403 100644 --- a/www/comps/builder/builderJsFunctions.js +++ b/www/comps/builder/builderJsFunctions.js @@ -1,3 +1,4 @@ +import {getJsFunctionsProcessed} from '../shared/builder.js'; export {MyBuilderJsFunctions as default}; let MyBuilderJsFunctions = { @@ -28,12 +29,13 @@ let MyBuilderJsFunctions = {
')}
| {{ capApp.showChildrenHint }} | +
+ |
+
| {{ capGen.color }} | +
+
+
+
+
+
+ |
+
|
+
+ {{ capApp.collections }}
+
+ |
+
+ |
+
| {{ capGen.title }} | +
+ |
+
| {{ capGen.icon }} | +
+ |
+
@@ -189,43 +290,92 @@ let MyBuilderMenu = {
:caption="capGen.button.refresh"
/>
| {{ capGen.name }} | -- | {{ capApp.nameHint }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capGen.title }} | -
- |
- {{ capApp.titleHint }} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| {{ capApp.dependsOn }} | -
-
-
`,
- emits:['hotkeysRegister'],
props:{
builderLanguage:{ type:String, required:true },
id: { type:String, required:true },
readonly: { type:Boolean, required:true }
},
mounted() {
- this.$emit('hotkeysRegister',[{fnc:this.set,key:'s',keyCtrl:true}]);
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.set,key:'s',keyCtrl:true});
},
unmounted() {
- this.$emit('hotkeysRegister',[]);
+ this.$store.commit('keyDownHandlerDel',this.set);
},
data() {
return {
// inputs
- parentId:null,
+ color1:'217A4D',
formId:null,
iconId:null,
+ iconIdPwa1:null,
+ iconIdPwa2:null,
+ jsFunctionIdOnLogin:null,
+ pgFunctionIdLoginSync:null,
name:'',
- color1:'217A4D',
+ namePwa:null,
+ namePwaShort:null,
+ parentId:null,
position:0,
releaseBuild:0,
releaseBuildApp:0,
@@ -329,8 +475,8 @@ let MyBuilderModule = {
},
// states
+ clientEventIdEdit:false,
moduleIdDependsOnInput:null,
- showColorPicker:false,
showDependencies:false,
showLanguages:false,
showStartForms:false
@@ -338,13 +484,19 @@ let MyBuilderModule = {
},
computed:{
hasChanges:(s) =>
- s.parentId !== s.module.parentId
- || s.formId !== s.module.formId
- || s.iconId !== s.module.iconId
- || s.name !== s.module.name
- || s.color1 !== s.module.color1
- || s.position !== s.module.position
- || s.languageMain !== s.module.languageMain
+ s.parentId !== s.module.parentId
+ || s.formId !== s.module.formId
+ || s.iconId !== s.module.iconId
+ || s.iconIdPwa1 !== s.module.iconIdPwa1
+ || s.iconIdPwa2 !== s.module.iconIdPwa2
+ || s.jsFunctionIdOnLogin !== s.module.jsFunctionIdOnLogin
+ || s.pgFunctionIdLoginSync !== s.module.pgFunctionIdLoginSync
+ || s.name !== s.module.name
+ || s.namePwa !== s.module.namePwa
+ || s.namePwaShort !== s.module.namePwaShort
+ || s.color1 !== s.module.color1
+ || s.position !== s.module.position
+ || s.languageMain !== s.module.languageMain
|| JSON.stringify(s.dependsOn) !== JSON.stringify(s.module.dependsOn)
|| JSON.stringify(s.startForms) !== JSON.stringify(s.module.startForms)
|| JSON.stringify(s.languages) !== JSON.stringify(s.module.languages)
@@ -353,14 +505,16 @@ let MyBuilderModule = {
// simple
displayReleaseDate:(s) => s.releaseDate === 0 ? '-' : s.getUnixFormat(s.releaseDate,'Y-m-d H:i'),
module: (s) => typeof s.moduleIdMap[s.id] === 'undefined' ? false : s.moduleIdMap[s.id],
- styleColorPreview: (s) => `background-color:#${s.color1};`,
// stores
modules: (s) => s.$store.getters['schema/modules'],
moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
attributeIdMap: (s) => s.$store.getters['schema/attributeIdMap'],
+ jsFunctionIdMap: (s) => s.$store.getters['schema/jsFunctionIdMap'],
+ pgFunctionIdMap: (s) => s.$store.getters['schema/pgFunctionIdMap'],
capApp: (s) => s.$store.getters.captions.builder.module,
+ capAppClientEvent: (s) => s.$store.getters.captions.builder.clientEvent,
capGen: (s) => s.$store.getters.captions.generic
},
watch:{
@@ -374,6 +528,10 @@ let MyBuilderModule = {
copyValueDialog,
getDependentModules,
getNilUuid,
+ getRandomInt,
+ getTemplateArgs,
+ getTemplateFnc,
+ getTemplateReturn,
getUnixFormat,
srcBase64Icon,
@@ -381,23 +539,26 @@ let MyBuilderModule = {
if(!this.module) return;
// values
- this.parentId = this.module.parentId;
- this.formId = this.module.formId;
- this.iconId = this.module.iconId;
- this.name = this.module.name;
- this.color1 = this.module.color1;
- this.position = this.module.position;
- this.languageMain = this.module.languageMain;
- this.releaseBuild = this.module.releaseBuild;
- this.releaseBuildApp = this.module.releaseBuildApp;
- this.releaseDate = this.module.releaseDate;
- this.dependsOn = JSON.parse(JSON.stringify(this.module.dependsOn));
- this.startForms = JSON.parse(JSON.stringify(this.module.startForms));
- this.languages = JSON.parse(JSON.stringify(this.module.languages));
- this.captions = JSON.parse(JSON.stringify(this.module.captions));
-
- // states
- this.showColorPicker = false;
+ this.parentId = this.module.parentId;
+ this.formId = this.module.formId;
+ this.iconId = this.module.iconId;
+ this.iconIdPwa1 = this.module.iconIdPwa1;
+ this.iconIdPwa2 = this.module.iconIdPwa2;
+ this.jsFunctionIdOnLogin = this.module.jsFunctionIdOnLogin;
+ this.pgFunctionIdLoginSync = this.module.pgFunctionIdLoginSync;
+ this.name = this.module.name;
+ this.namePwa = this.module.namePwa;
+ this.namePwaShort = this.module.namePwaShort;
+ this.color1 = this.module.color1;
+ this.position = this.module.position;
+ this.languageMain = this.module.languageMain;
+ this.releaseBuild = this.module.releaseBuild;
+ this.releaseBuildApp = this.module.releaseBuildApp;
+ this.releaseDate = this.module.releaseDate;
+ this.dependsOn = JSON.parse(JSON.stringify(this.module.dependsOn));
+ this.startForms = JSON.parse(JSON.stringify(this.module.startForms));
+ this.languages = JSON.parse(JSON.stringify(this.module.languages));
+ this.captions = JSON.parse(JSON.stringify(this.module.captions));
},
// actions
@@ -408,15 +569,12 @@ let MyBuilderModule = {
roleId:null
});
},
+ applyNullString(key,value) {
+ this[key] = value === '' ? null : value;
+ },
goBack() {
window.history.back();
},
- hideColorPicker() {
- this.showColorPicker = false;
- },
- setColor(newVal) {
- this.color1 = newVal.hex.substr(1);
- },
toggleDependsOn(moduleId,state) {
let pos = this.dependsOn.indexOf(moduleId);
@@ -425,10 +583,21 @@ let MyBuilderModule = {
else if(pos !== -1 && !state)
this.dependsOn.splice(pos,1);
},
+
+ // presentation
+ clientEventSubtitle(clientEvent) {
+ if(clientEvent.action === 'callJsFunction')
+ return `${this.capAppClientEvent.action.callJsFunction}: ${this.jsFunctionIdMap[clientEvent.jsFunctionId].name}()`;
+
+ if(clientEvent.action === 'callPgFunction')
+ return `${this.capAppClientEvent.action.callPgFunction}: ${this.pgFunctionIdMap[clientEvent.pgFunctionId].name}()`;
+
+ return '-';
+ },
// backend calls
set() {
- this.languages.sort(); // for change comparissons
+ this.languages.sort(); // for change comparisons
let requests = [
ws.prepare('module','set',{
@@ -436,7 +605,13 @@ let MyBuilderModule = {
parentId:this.parentId,
formId:this.formId,
iconId:this.iconId,
+ iconIdPwa1:this.iconIdPwa1,
+ iconIdPwa2:this.iconIdPwa2,
+ jsFunctionIdOnLogin:this.jsFunctionIdOnLogin,
+ pgFunctionIdLoginSync:this.pgFunctionIdLoginSync,
name:this.name,
+ namePwa:this.namePwa,
+ namePwaShort:this.namePwaShort,
color1:this.color1,
position:this.position,
languageMain:this.languageMain,
@@ -453,13 +628,39 @@ let MyBuilderModule = {
];
ws.sendMultiple(requests,true).then(
- () => {
- // reload entire schema if parent has changed
- if(this.parentId !== this.module.parentId)
- this.$root.schemaReload();
- else
- this.$root.schemaReload(this.id);
- },
+ () => this.$root.schemaReload(this.id),
+ this.$root.genericError
+ );
+ },
+ setNewLoginSync() {
+ let fncName = 'user_sync';
+ for(let fnc of this.module.pgFunctions) {
+ if(fnc.name === fncName) {
+ fncName = `user_sync_${this.getRandomInt(100000,200000)}`;
+ break;
+ }
+ }
+
+ ws.sendMultiple([
+ ws.prepare('pgFunction','set',{
+ id:this.getNilUuid(),
+ moduleId:this.id,
+ name:fncName,
+ codeArgs:this.getTemplateArgs('loginSync'),
+ codeFunction:this.getTemplateFnc('loginSync',false),
+ codeReturns:this.getTemplateReturn(false),
+ isFrontendExec:false,
+ isLoginSync:true,
+ isTrigger:false,
+ schedules:[],
+ captions:{
+ pgFunctionTitle:{},
+ pgFunctionDesc:{}
+ }
+ }),
+ ws.prepare('schema','check',{moduleId:this.id})
+ ],true).then(
+ () => this.$root.schemaReload(this.id),
this.$root.genericError
);
}
diff --git a/www/comps/builder/builderModules.js b/www/comps/builder/builderModules.js
index 86bf6582..87aa5abc 100644
--- a/www/comps/builder/builderModules.js
+++ b/www/comps/builder/builderModules.js
@@ -1,10 +1,5 @@
-import MyBuilderCaption from './builderCaption.js';
-import MyBuilderIconInput from './builderIconInput.js';
-import {MyModuleSelect} from '../input.js';
-import srcBase64Icon from '../shared/image.js';
-import {getDependentModules} from '../shared/builder.js';
-import {copyValueDialog} from '../shared/generic.js';
-import {getUnixFormat} from '../shared/time.js';
+import {MyModuleSelect} from '../input.js';
+import srcBase64Icon from '../shared/image.js';
export {MyBuilderModules as default};
let displayArrow = function(state) {
@@ -13,7 +8,7 @@ let displayArrow = function(state) {
let MyBuilderModulesKeyCreate = {
name:'my-builder-modules-key-create',
- template:`
+ template:`
@@ -86,7 +81,7 @@ let MyBuilderModulesGraph = {
components:{
echarts:VueECharts,
},
- template:`
+ template:`
@@ -95,7 +90,7 @@ let MyBuilderModulesGraph = {
+
@@ -183,22 +178,24 @@ let MyBuilderModulesExport = {
{{ moduleIdMap[moduleId].name }} |
- {{ moduleIdMapOptions[moduleId].owner ? capGen.option.yes : capGen.option.no }} |
-
+ {{ moduleIdMapMeta[moduleId].owner ? capGen.option.yes : capGen.option.no }} |
+
{{ capApp.exportStateNok }}
|
@@ -276,7 +273,7 @@ let MyBuilderModulesExport = {
return `${m.name}_${m.releaseBuild}.rei3`;
},
exportHref:(s) => {
- return `/export/${s.exportFileName}?module_id=${s.id}&token=${s.token}`;
+ return `/export/${s.exportFileName}?module_id=${s.id}&token=${s.token}&date=${Math.floor(new Date().getTime() / 1000)}`;
},
exportValid:(s) => {
if(s.moduleIdMapChanged === null)
@@ -286,19 +283,19 @@ let MyBuilderModulesExport = {
let m = s.moduleIdMapChanged[k];
// block if a dependency has changes
- if(m.id !== s.id && s.moduleIdMapOptions[k].owner && s.moduleIdMapChanged[k])
+ if(m.id !== s.id && s.moduleIdMapMeta[k].owner && s.moduleIdMapChanged[k])
return false;
}
return true;
},
// stores
- token: (s) => s.$store.getters['local/token'],
- modules: (s) => s.$store.getters['schema/modules'],
- moduleIdMap:(s) => s.$store.getters['schema/moduleIdMap'],
- moduleIdMapOptions:(s) => s.$store.getters['schema/moduleIdMapOptions'],
- capApp: (s) => s.$store.getters.captions.builder.module,
- capGen: (s) => s.$store.getters.captions.generic
+ token: (s) => s.$store.getters['local/token'],
+ modules: (s) => s.$store.getters['schema/modules'],
+ moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.module,
+ capGen: (s) => s.$store.getters.captions.generic,
+ moduleIdMapMeta:(s) => s.$store.getters.moduleIdMapMeta
},
data() {
return {
diff --git a/www/comps/builder/builderNew.js b/www/comps/builder/builderNew.js
index 06074b56..3a4eae33 100644
--- a/www/comps/builder/builderNew.js
+++ b/www/comps/builder/builderNew.js
@@ -1,12 +1,18 @@
-import {getQueryTemplate} from '../shared/query.js';
-import {getNilUuid} from '../shared/generic.js';
-import {getPgFunctionTemplate} from '../shared/builder.js';
+import {getQueryTemplate} from '../shared/query.js';
+import {getNilUuid} from '../shared/generic.js';
+import {
+ getTemplateArgs,
+ getTemplateFnc,
+ getTemplateReturn
+} from '../shared/templates.js';
+import MyBuilderFormInput from './builderFormInput.js';
export {MyBuilderNew as default};
let MyBuilderNew = {
name:'my-builder-new',
+ components:{ MyBuilderFormInput },
template:`
-
+
+
{{ capGen.name }}
-
+
-
+ `,
@@ -402,16 +547,17 @@ let MyBuilderQueryNestedJoin = {
};
},
props:{
- applyCreate: { type:Boolean,required:true },
- applyUpdate: { type:Boolean,required:true },
- applyDelete: { type:Boolean,required:true },
- connector: { type:String, required:true },
- index: { type:Number, required:true },
- joins: { type:Array, required:true },
- joinAttributeId:{ type:String, required:true },
- joinRelationId: { type:String, required:true },
- module: { type:Object, required:true },
- readonly: { type:Boolean,required:true }
+ applyCreate: { type:Boolean,required:true },
+ applyUpdate: { type:Boolean,required:true },
+ applyDelete: { type:Boolean,required:true },
+ connector: { type:String, required:true },
+ index: { type:Number, required:true },
+ joins: { type:Array, required:true },
+ joinAttributeId: { type:String, required:true },
+ joinRelationId: { type:String, required:true },
+ module: { type:Object, required:true },
+ readonly: { type:Boolean,required:true },
+ relationIdParent:{ type:String, required:false, default: null}
},
emits:[
'relation-add','relation-apply-toggle',
@@ -420,32 +566,13 @@ let MyBuilderQueryNestedJoin = {
computed:{
attributesUnused:(s) => {
let atrs = [];
-
- // get attributes of this relation and in relationship with this relation
- for(let key in s.attributeIdMap) {
- let atr = s.attributeIdMap[key];
-
+ for(const atr of s.getDependentAttributes(s.module)) {
if(!s.isAttributeRelationship(atr.content))
continue;
- // relationship attribute is from current relation, add
- if(atr.relationId === s.joinRelationId) {
+ // relationship attribute is from current relation or pointing to it
+ if(atr.relationId === s.joinRelationId || atr.relationshipId === s.joinRelationId)
atrs.push(atr);
- continue;
- }
-
- // relationship attribute is not pointing to us, ignore
- if(atr.relationshipId !== s.joinRelationId)
- continue;
-
- // if attribute is from other relation, check module dependency first
- let rel = s.relationIdMap[atr.relationId];
- let mod = s.moduleIdMap[rel.moduleId];
-
- if(mod.id !== s.module.id && !s.module.dependsOn.includes(mod.id))
- continue;
-
- atrs.push(atr);
}
return atrs;
},
@@ -477,7 +604,7 @@ let MyBuilderQueryNestedJoin = {
return '';
},
isBaseRelation: (s) => s.index === 0,
- isOutsideIn: (s) => !s.isBaseRelation && s.joinAttribute.relationId !== s.joinRelationId,
+ isOutsideIn: (s) => !s.isBaseRelation && (s.joinRelationId !== s.joinAttribute.relationId || s.joinRelationId === s.relationIdParent),
isRelation11: (s) => !s.isBaseRelation && s.isAttributeRelationship11(s.joinAttribute.content),
isRelationN1: (s) => !s.isBaseRelation && !s.isRelation11 && s.isOutsideIn,
isRelation1N: (s) => !s.isBaseRelation && !s.isRelation11 && !s.isOutsideIn,
@@ -494,6 +621,7 @@ let MyBuilderQueryNestedJoin = {
},
methods:{
// externals
+ getDependentAttributes,
isAttributeRelationship,
isAttributeRelationship11,
@@ -545,6 +673,7 @@ let MyBuilderQuery = {
name:'my-builder-query',
components:{
MyBuilderQueryChoice,
+ MyBuilderQueryFilter,
MyBuilderQueryLookups,
MyBuilderQueryNestedJoin,
MyBuilderQueryOrders
@@ -561,6 +690,12 @@ let MyBuilderQuery = {
:large="true"
:naked="true"
/>
+ {{ capGen.error.nameTaken }} +{{ capGen.error.nameTooLong.replace('{LEN}',nameMaxLength) }} + +
- `,
props:{
+ id: { required:true },
readonly:{ type:Boolean, required:true },
- relation:{ type:Object, required:true },
- preset:{
- type:Object,
- required:false,
- default:function() { return{
- id:null,
- name:'',
- presetIdRefer:null,
- protected:true,
- values:[]
- }}
- }
+ relation:{ type:Object, required:true }
},
+ emits:['close'],
data() {
return {
- showValues:false,
- name:this.preset.name,
- protected:this.preset.protected,
- values:JSON.parse(JSON.stringify(this.preset.values))
+ values:null,
+ valuesOrg:null
};
},
computed:{
- hasChanges:(s) => {
- if(s.name === '')
- return false;
-
- return (s.isNew && s.values.length !== 0)
- || s.name !== s.preset.name
- || s.protected !== s.preset.protected
- || JSON.stringify(s.values) !== JSON.stringify(s.preset.values);
- },
- previewLine:(s) => {
- let items = [];
- for(let v of s.values) {
- if(v.value !== '')
- items.push(v.value);
- }
- return items.join(', ');
- },
attributeIdMapValue:(s) => {
let map = {};
- for(let v of s.values) {
+ for(let v of s.values.values) {
map[v.attributeId] = v;
}
return map;
},
-
- // simple states
- isNew:(s) => s.preset.id === null,
+
+ // simple
+ attributesValid:(s) => s.relation.attributes.filter(v => v.name !== 'id' && !s.isAttributeFiles(v.content)),
+ canSave: (s) => s.values !== null && s.values.name !== '' && s.hasChanges,
+ hasChanges: (s) => JSON.stringify(s.values) !== JSON.stringify(s.valuesOrg),
+ isNew: (s) => s.id === null,
// stores
attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
capApp: (s) => s.$store.getters.captions.builder.preset,
capGen: (s) => s.$store.getters.captions.generic
},
+ mounted() {
+ this.reset();
+ window.addEventListener('keydown',this.handleHotkeys);
+ },
+ unmounted() {
+ window.removeEventListener('keydown',this.handleHotkeys);
+ },
methods:{
// externals
copyValueDialog,
+ getDependentModules,
getNilUuid,
+ isAttributeFiles,
isAttributeRelationship,
+ // actions
+ childAddAllMissing() {
+ for(const atr of this.attributesValid) {
+ if(this.attributeIdMapValue[atr.id] === undefined)
+ this.childSet(atr.id,null,false,null);
+ }
+ },
childGet(atrId,mode) {
- const exists = typeof this.attributeIdMapValue[atrId] !== 'undefined';
+ const exists = this.attributeIdMapValue[atrId] !== undefined;
switch(mode) {
case 'presetIdRefer':
@@ -208,40 +254,73 @@ let MyBuilderPreset = {
}
return false;
},
+ childDel(atrId) {
+ for(let i = 0, j = this.values.values.length; i < j; i++) {
+ if(this.values.values[i].attributeId === atrId)
+ return this.values.values.splice(i,1);
+ }
+ },
childSet(atrId,presetIdRefer,protec,value) {
- let atr = this.attributeIdMap[atrId];
+ const atr = this.attributeIdMap[atrId];
// no preset value yet for attribute, create one
- if(typeof this.attributeIdMapValue[atrId] === 'undefined') {
- this.values.push({
+ if(this.attributeIdMapValue[atrId] === undefined)
+ return this.values.values.push({
id:this.getNilUuid(),
attributeId:atrId,
presetIdRefer:presetIdRefer,
protected:protec,
value:value
});
- return;
- }
// update existing preset value
- for(let i = 0, j = this.values.length; i < j; i++) {
- if(this.values[i].attributeId !== atrId)
+ for(let i = 0, j = this.values.values.length; i < j; i++) {
+ if(this.values.values[i].attributeId !== atrId)
continue;
+
+ if(value === '')
+ value = null;
- // remove preset value if nothing is set
- if((this.isAttributeRelationship(atr.content) && presetIdRefer === null)
- || (!this.isAttributeRelationship(atr.content) && value === '')) {
-
- this.values.splice(i,1);
- break;
- }
-
- this.values[i].presetIdRefer = presetIdRefer;
- this.values[i].protected = protec;
- this.values[i].value = value;
+ this.values.values[i].presetIdRefer = presetIdRefer;
+ this.values.values[i].protected = protec;
+ this.values.values[i].value = value;
break;
}
},
+ closeReload() {
+ this.$root.schemaReload(this.relation.moduleId);
+ this.$emit('close');
+ },
+ handleHotkeys(e) {
+ if(e.ctrlKey && e.key === 's' && this.canSave) {
+ this.set();
+ e.preventDefault();
+ }
+ if(e.key === 'Escape') {
+ this.$emit('close');
+ e.preventDefault();
+ }
+ },
+ reset() {
+ if(this.id === null) {
+ this.values = {
+ id:null,
+ name:'',
+ relationId:this.relation.id,
+ protected:true,
+ values:[]
+ };
+ }
+ else {
+ for(const p of this.relation.presets) {
+ if(p.id === this.id) {
+ this.values = JSON.parse(JSON.stringify(p));
+ break;
+ }
+ }
+ }
+ this.valuesOrg = JSON.parse(JSON.stringify(this.values));
+ },
// backend calls
delAsk() {
@@ -259,26 +338,14 @@ let MyBuilderPreset = {
});
},
del(rel) {
- ws.send('preset','del',{id:this.preset.id},true).then(
- () => this.$root.schemaReload(this.relation.moduleId),
+ ws.send('preset','del',{id:this.id},true).then(
+ this.closeReload,
this.$root.genericError
);
},
set() {
- ws.send('preset','set',{
- id:this.preset.id,
- relationId:this.relation.id,
- name:this.name,
- protected:this.protected,
- values:this.values
- },true).then(
- () => {
- if(this.isNew) {
- this.name = '';
- this.values = [];
- }
- this.$root.schemaReload(this.relation.moduleId);
- },
+ ws.send('preset','set',this.values,true).then(
+ this.closeReload,
this.$root.genericError
);
}
diff --git a/www/comps/builder/builderPresets.js b/www/comps/builder/builderPresets.js
new file mode 100644
index 00000000..af6cecf2
--- /dev/null
+++ b/www/comps/builder/builderPresets.js
@@ -0,0 +1,70 @@
+import MyBuilderPreset from './builderPreset.js';
+export {MyBuilderPresets as default};
+
+let MyBuilderPresets = {
+ name:'my-builder-presets',
+ components:{MyBuilderPreset},
+ template:`
+
+
@@ -158,15 +166,17 @@ let MyBuilderPgFunction = {
:active="hasChanges"
:caption="capGen.button.refresh"
/>
-
+
-
-
-
-
-
-
-
+ @clicked="entityId = null"
+ :insertEntity="insertEntity"
+ :modelValueAlt="!showPreview ? '' : preview"
+ :readonly="readonly || showPreview"
+ />
+ `,
props:{
- pgTrigger:{
- type:Object,
- required:false,
- default:function() { return{
- id:null,
- relationId:null,
- pgFunctionId:null,
- fires:'BEFORE',
- onDelete:false,
- onInsert:true,
- onUpdate:false,
- isConstraint:false,
- isDeferrable:false,
- isDeferred:false,
- perRow:true,
- codeCondition:null
- }}
- },
- readonly:{ type:Boolean, required:true },
- relation:{ type:Object, required:true }
+ contextEntity:{ type:String, required:true }, // relation / pgFunction
+ contextId: { type:String, required:true }, // ID of relation or pgFunction
+ id: { required:true },
+ readonly: { type:Boolean, required:true }
},
+ emits:['close'],
data() {
return {
- pgFunctionId:this.pgTrigger.pgFunctionId,
- fires:this.pgTrigger.fires,
- onDelete:this.pgTrigger.onDelete,
- onInsert:this.pgTrigger.onInsert,
- onUpdate:this.pgTrigger.onUpdate,
- isConstraint:this.pgTrigger.isConstraint,
- isDeferrable:this.pgTrigger.isDeferrable,
- isDeferred:this.pgTrigger.isDeferred,
- perRow:this.pgTrigger.perRow,
- codeCondition:this.pgTrigger.codeCondition
+ values:null,
+ valuesOrg:null
};
},
computed:{
- hasChanges:(s) =>
- s.pgFunctionId !== s.pgTrigger.pgFunctionId
- || s.fires !== s.pgTrigger.fires
- || s.onDelete !== s.pgTrigger.onDelete
- || s.onInsert !== s.pgTrigger.onInsert
- || s.onUpdate !== s.pgTrigger.onUpdate
- || s.isConstraint !== s.pgTrigger.isConstraint
- || s.isDeferrable !== s.pgTrigger.isDeferrable
- || s.isDeferred !== s.pgTrigger.isDeferred
- || s.perRow !== s.pgTrigger.perRow
- || s.codeCondition !== s.pgTrigger.codeCondition,
-
// simple
- constraintOk:(s) => s.fires === 'AFTER' && s.perRow,
- isNew: (s) => s.pgTrigger.id === null,
+ canSave: (s) => s.values !== null && s.values.pgFunctionId !== null && s.values.relationId !== null && s.hasChanges,
+ constraintOk: (s) => s.values !== null && s.values.fires === 'AFTER' && s.values.perRow,
+ hasChanges: (s) => JSON.stringify(s.values) !== JSON.stringify(s.valuesOrg),
+ isExternal: (s) => s.isFromRelation && s.values.pgFunctionId !== null && s.module.id !== s.pgFunctionIdMap[s.values.pgFunctionId].moduleId,
+ isFromPgFunction:(s) => s.contextEntity === 'pgFunction',
+ isFromRelation: (s) => s.contextEntity === 'relation',
+ isNew: (s) => s.id === null,
// stores
- module: (s) => s.moduleIdMap[s.relation.moduleId],
- modules: (s) => s.$store.getters['schema/modules'],
- moduleIdMap:(s) => s.$store.getters['schema/moduleIdMap'],
- capApp: (s) => s.$store.getters.captions.builder.pgTrigger,
- capGen: (s) => s.$store.getters.captions.generic
+ module:(s) => {
+ if(s.isFromRelation) return s.moduleIdMap[s.relationIdMap[s.contextId].moduleId];
+ if(s.isFromPgFunction) return s.moduleIdMap[s.pgFunctionIdMap[s.contextId].moduleId];
+ return false;
+ },
+ moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
+ pgFunctionIdMap:(s) => s.$store.getters['schema/pgFunctionIdMap'],
+ relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
+ pgTriggerIdMap: (s) => s.$store.getters['schema/pgTriggerIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.pgTrigger,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ mounted() {
+ this.reset();
+ window.addEventListener('keydown',this.handleHotkeys);
+ },
+ unmounted() {
+ window.removeEventListener('keydown',this.handleHotkeys);
},
methods:{
// externals
copyValueDialog,
+ getDependentModules,
// actions
+ handleHotkeys(e) {
+ if(e.ctrlKey && e.key === 's' && this.canSave) {
+ this.set();
+ e.preventDefault();
+ }
+ if(e.key === 'Escape') {
+ this.$emit('close');
+ e.preventDefault();
+ }
+ },
open() {
- this.$router.push('/builder/pg-function/'+this.pgFunctionId);
+ if(this.isFromPgFunction)
+ this.$router.push('/builder/relation/'+this.values.relationId);
+
+ if(this.isFromRelation)
+ this.$router.push('/builder/pg-function/'+this.values.pgFunctionId);
+ },
+ reset() {
+ this.values = this.id !== null
+ ? JSON.parse(JSON.stringify(this.pgTriggerIdMap[this.id]))
+ : {
+ id:null,
+ moduleId:this.module.id,
+ relationId:this.isFromRelation ? this.contextId : null,
+ pgFunctionId:this.isFromPgFunction ? this.contextId : null,
+ fires:'BEFORE',
+ onDelete:false,
+ onInsert:true,
+ onUpdate:false,
+ isConstraint:false,
+ isDeferrable:false,
+ isDeferred:false,
+ perRow:true,
+ codeCondition:null
+ };
+
+ this.valuesOrg = JSON.parse(JSON.stringify(this.values));
},
setDeferred(state) {
- // abstract unuseful states into two options
+ // abstract useless states into two options
// either trigger is 'constraint+deferrable+initially' deferred or not all
- this.isConstraint = state;
- this.isDeferrable = state;
- this.isDeferred = state;
+ this.values.isConstraint = state;
+ this.values.isDeferrable = state;
+ this.values.isDeferred = state;
},
// backend calls
@@ -153,44 +298,31 @@ let MyBuilderPgTrigger = {
});
},
del() {
- ws.send('pgTrigger','del',{id:this.pgTrigger.id},true).then(
- () => this.$root.schemaReload(this.module.id),
+ ws.send('pgTrigger','del',{id:this.id},true).then(
+ () => {
+ this.$root.schemaReload(this.module.id);
+ this.$emit('close');
+ },
this.$root.genericError
);
},
- set(atr) {
+ set() {
// fix invalid options
- if(!this.perRow || this.fires !== 'AFTER') {
- this.isConstraint = false;
- this.isDeferrable = false;
- this.isDeferred = false;
- } else if(!this.isConstraint) {
- this.isDeferrable = false;
- this.isDeferred = false;
- } else if(!this.isDeferrable) {
- this.isDeferred = false;
+ if(!this.values.perRow || this.values.fires !== 'AFTER') {
+ this.values.isConstraint = false;
+ this.values.isDeferrable = false;
+ this.values.isDeferred = false;
+ } else if(!this.values.isConstraint) {
+ this.values.isDeferrable = false;
+ this.values.isDeferred = false;
+ } else if(!this.values.isDeferrable) {
+ this.values.isDeferred = false;
}
- ws.send('pgTrigger','set',{
- id:this.pgTrigger.id,
- relationId:this.relation.id,
- pgFunctionId:this.pgFunctionId,
- fires:this.fires,
- onDelete:this.onDelete,
- onInsert:this.onInsert,
- onUpdate:this.onUpdate,
- isConstraint:this.isConstraint,
- isDeferrable:this.isDeferrable,
- isDeferred:this.isDeferred,
- perRow:this.perRow,
- codeCondition:this.codeCondition
- },true).then(
+ ws.send('pgTrigger','set',this.values,true).then(
() => {
- if(this.isNew) {
- this.codeCondition = '';
- this.pgFunctionId = null;
- }
this.$root.schemaReload(this.module.id);
+ this.$emit('close');
},
this.$root.genericError
);
diff --git a/www/comps/builder/builderPgTriggers.js b/www/comps/builder/builderPgTriggers.js
new file mode 100644
index 00000000..78f043c8
--- /dev/null
+++ b/www/comps/builder/builderPgTriggers.js
@@ -0,0 +1,133 @@
+import {getDependentModules} from '../shared/builder.js';
+import MyBuilderPgTrigger from './builderPgTrigger.js';
+export {MyBuilderPgTriggers as default};
+
+let MyBuilderPgTriggers = {
+ name:'my-builder-pg-triggers',
+ components:{MyBuilderPgTrigger},
+ template:`{{ capGen.settings }}@@ -212,10 +213,10 @@ let MyBuilderPgFunction = { :entriesText="tabs.labels" /> -
+
-
@@ -266,12 +261,11 @@ let MyBuilderPgFunction = {
+
@@ -245,7 +241,7 @@ let MyBuilderPgFunction = {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `,
- emits:['hotkeysRegister'],
props:{
builderLanguage:{ type:String, required:true },
id: { type:String, required:true },
@@ -497,14 +575,15 @@ let MyBuilderPgFunction = {
}
},
mounted() {
- this.$emit('hotkeysRegister',[{fnc:this.set,key:'s',keyCtrl:true}]);
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.set,key:'s',keyCtrl:true});
// set defaults
- this.holderRelationModuleId = this.module.id;
this.holderFunctionModuleId = this.module.id;
+ this.holderPresetModuleId = this.module.id;
+ this.holderRelationModuleId = this.module.id;
},
unmounted() {
- this.$emit('hotkeysRegister',[]);
+ this.$store.commit('keyDownHandlerDel',this.set);
},
data() {
return {
@@ -515,7 +594,9 @@ let MyBuilderPgFunction = {
codeFunction:'',
codeReturns:'',
isFrontendExec:false,
+ isLoginSync:false,
isTrigger:false,
+ volatility:'VOLATILE',
schedules:[],
// execution
@@ -529,19 +610,22 @@ let MyBuilderPgFunction = {
entityId:null,
holderFunctionModuleId:null, // module filter for backend functions
holderFunctionText:'', // text filter for backend functions
+ holderPresetModuleId:null, // module filter for presets
+ holderPresetText:'' , // text filter for presets
holderRelationModuleId:null, // module filter for relations
holderRelationIdsOpen:[], // opened relation placeholders (shows attributes)
holderRelationText:'', // text filter for module relations
instanceFunctionIds:[
- 'abort_show_message','clean_up_e2ee_keys','file_link',
- 'files_get','get_name','get_login_id','get_login_language_code',
- 'get_preset_record_id','get_public_hostname','get_role_ids',
- 'has_role','has_role_any','log_error','log_info','log_warning',
- 'mail_delete','mail_delete_after_attach','mail_get_next',
- 'mail_send','update_collection'
+ 'abort_show_message','clean_up_e2ee_keys','file_link','file_unlink',
+ 'files_get','get_e2ee_data_key_enc','get_language_code','get_name',
+ 'get_public_hostname','get_role_ids','get_user_id','has_role','has_role_any',
+ 'log_error','log_info','log_warning','mail_delete','mail_delete_after_attach',
+ 'mail_get_next','mail_send','rest_call','update_collection','user_meta_set',
+ 'user_sync_all'
],
showHolderFncInstance:false,
showHolderFncModule:false,
+ showHolderPreset:false,
showHolderRelation:false,
showPreview:false,
showSidebar:true,
@@ -549,19 +633,66 @@ let MyBuilderPgFunction = {
};
},
computed:{
- execArgInputs:(s) => s.codeArgs.trim() === '' ? [] : s.codeArgs.split(','),
hasChanges:(s) => s.name !== s.pgFunction.name
|| s.codeArgs !== s.pgFunction.codeArgs
|| s.codeFunction !== s.placeholdersSet(s.pgFunction.codeFunction)
|| s.codeReturns !== s.pgFunction.codeReturns
|| s.isFrontendExec !== s.pgFunction.isFrontendExec
+ || s.volatility !== s.pgFunction.volatility
|| JSON.stringify(s.schedules) !== JSON.stringify(s.pgFunction.schedules)
|| JSON.stringify(s.captions) !== JSON.stringify(s.pgFunction.captions),
- modulesData:(s) => s.getDependentModules(s.module,s.modules).filter(v => v.relations.length !== 0),
- modulesFnc: (s) => s.getDependentModules(s.module,s.modules).filter(v => v.pgFunctions.length !== 0),
+ insertEntity:(s) => {
+ if(s.entityId === null)
+ return null;
+
+ let text = null;
+ let mod, rel, prs, atr, fnc, args, pat;
+
+ // build unique placeholder name
+ // relation: {module_name}.[relation_name]
+ // pg function: {module_name}.[function_name]()
+ // attribute: (module_name.relation_name.attribute_name)
+ // preset: {PRESET::module_name.relation_name.preset_name}
+ switch(s.entity) {
+ case 'relation':
+ rel = s.relationIdMap[s.entityId];
+ mod = s.moduleIdMap[rel.moduleId];
+ text = `{${mod.name}}.[${rel.name}]`;
+ break;
+ case 'preset':
+ prs = s.presetIdMap[s.entityId];
+ rel = s.relationIdMap[prs.relationId];
+ mod = s.moduleIdMap[rel.moduleId];
+ pat = new RegExp(`[\{\}]`,'g');
+
+ text = !pat.test(prs.name)
+ ? `{PRESET::${mod.name}.${rel.name}.${prs.name}}`
+ : `instance.get_preset_record_id('${s.entityId}')`;
+ break;
+ case 'pgFunction':
+ fnc = s.pgFunctionIdMap[s.entityId];
+ mod = s.moduleIdMap[fnc.moduleId];
+ text = `{${mod.name}}.[${fnc.name}](${fnc.codeArgs})`;
+ break;
+ case 'attribute':
+ atr = s.attributeIdMap[s.entityId];
+ rel = s.relationIdMap[atr.relationId];
+ mod = s.moduleIdMap[rel.moduleId];
+ text = `(${mod.name}.${rel.name}.${atr.name})`;
+
+ if(s.addNew) text = 'NEW.'+text;
+ if(s.addOld) text = 'OLD.'+text;
+ break;
+ case 'instanceFunction':
+ args = s.capApp.helpPgArgs[s.entityId] !== undefined ? s.capApp.helpPgArgs[s.entityId].join(', ') : '';
+ text = `instance.${s.entityId}(${args})`;
+ break;
+ }
+ return text;
+ },
tabs:(s) => {
let out = {
- icons:['images/database.png','images/edit.png'],
+ icons:['images/code.png','images/edit.png'],
keys:['content','properties'],
labels:[s.capApp.placeholders,s.capGen.properties]
};
@@ -574,15 +705,18 @@ let MyBuilderPgFunction = {
},
// simple
- module: (s) => s.pgFunction === false ? false : s.moduleIdMap[s.pgFunction.moduleId],
- pgFunction:(s) => typeof s.pgFunctionIdMap[s.id] === 'undefined' ? false : s.pgFunctionIdMap[s.id],
- preview: (s) => !s.showPreview ? '' : s.placeholdersUnset(true),
+ execArgInputs:(s) => s.codeArgs.trim() === '' ? [] : s.codeArgs.split(/,(?=(?:(?:[^']*'){2})*[^']*$)/),
+ module: (s) => s.pgFunction === false ? false : s.moduleIdMap[s.pgFunction.moduleId],
+ modulesData: (s) => s.getDependentModules(s.module).filter(v => v.relations.length !== 0),
+ modulesFnc: (s) => s.getDependentModules(s.module).filter(v => v.pgFunctions.length !== 0),
+ pgFunction: (s) => s.pgFunctionIdMap[s.id] === undefined ? false : s.pgFunctionIdMap[s.id],
+ preview: (s) => !s.showPreview ? '' : s.placeholdersUnset(true),
// stores
- modules: (s) => s.$store.getters['schema/modules'],
moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
moduleNameMap: (s) => s.$store.getters['schema/moduleNameMap'],
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
+ presetIdMap: (s) => s.$store.getters['schema/presetIdMap'],
attributeIdMap: (s) => s.$store.getters['schema/attributeIdMap'],
pgFunctionIdMap:(s) => s.$store.getters['schema/pgFunctionIdMap'],
capApp: (s) => s.$store.getters.captions.builder.function,
@@ -591,16 +725,21 @@ let MyBuilderPgFunction = {
methods:{
// externals
copyValueDialog,
+ getAttributeIcon,
getDependentModules,
getFunctionHelp,
getNilUuid,
- getPgFunctionTemplate,
+ getValidDbCharsForRx,
+ isAttributeFiles,
// presentation
radioIcon(entity,id) {
return this.entity === entity && this.entityId === id
? 'radio1.png' : 'radio0.png';
},
+ titleAttribute(atr) {
+ return atr.nullable ? atr.name : this.capApp.attributeNotNull.replace('{ATR}',atr.name);
+ },
// actions
addSchedule() {
@@ -614,73 +753,6 @@ let MyBuilderPgFunction = {
intervalValue:3
});
},
- addTab(evt) {
- let field = evt.target;
- let startPos = field.selectionStart;
- let endPos = field.selectionEnd;
-
- field.value = field.value.substring(0, startPos)
- + "\t"+ field.value.substring(endPos);
-
- field.selectionStart = startPos + 1;
- field.selectionEnd = startPos + 1;
- this.codeFunction = field.value;
- },
- insertEntity(evt) {
- if(this.entityId === null)
- return;
-
- let field = evt.target;
- let text = '';
- let mod, rel, atr, fnc;
-
- // build unique placeholder name
- // relation: {module_name}.[relation_name]
- // pg function: {module_name}.[function_name]()
- // attribute: (module_name.relation_name.attribute_name)
- switch(this.entity) {
- case 'relation':
- rel = this.relationIdMap[this.entityId];
- mod = this.moduleIdMap[rel.moduleId];
- text = `{${mod.name}}.[${rel.name}]`;
- break;
- case 'pgFunction':
- fnc = this.pgFunctionIdMap[this.entityId];
- mod = this.moduleIdMap[fnc.moduleId];
- text = `{${mod.name}}.[${fnc.name}]()`;
- break;
- case 'attribute':
- atr = this.attributeIdMap[this.entityId];
- rel = this.relationIdMap[atr.relationId];
- mod = this.moduleIdMap[rel.moduleId];
- text = `(${mod.name}.${rel.name}.${atr.name})`;
-
- if(this.addNew) text = 'NEW.'+text;
- if(this.addOld) text = 'OLD.'+text;
- break;
- case 'instanceFunction':
- text = `instance.${this.entityId}()`;
- break;
- }
-
- if(field.selectionStart || field.selectionStart === '0') {
-
- let startPos = field.selectionStart;
- let endPos = field.selectionEnd;
-
- field.value = field.value.substring(0,startPos)
- + text
- + field.value.substring(endPos, field.value.length);
-
- field.selectionStart = startPos + text.length;
- field.selectionEnd = startPos + text.length;
- }
- else {
- field.value += text;
- }
- this.codeFunction = field.value;
- this.entityId = null;
- },
reset() {
this.name = this.pgFunction.name;
this.captions = JSON.parse(JSON.stringify(this.pgFunction.captions));
@@ -688,7 +760,9 @@ let MyBuilderPgFunction = {
this.codeFunction = this.placeholdersSet(this.pgFunction.codeFunction);
this.codeReturns = this.pgFunction.codeReturns;
this.isFrontendExec = this.pgFunction.isFrontendExec;
+ this.isLoginSync = this.pgFunction.isLoginSync;
this.isTrigger = this.pgFunction.isTrigger;
+ this.volatility = this.pgFunction.volatility;
this.schedules = JSON.parse(JSON.stringify(this.pgFunction.schedules));
this.addNew = false;
this.addOld = false;
@@ -703,7 +777,7 @@ let MyBuilderPgFunction = {
this.execResponse = '';
for(let a of this.execArgInputs) {
- this.execArgs.push('');
+ this.execArgs.push(null);
}
},
selectEntity(entity,id) {
@@ -713,16 +787,21 @@ let MyBuilderPgFunction = {
this.entity = entity;
this.entityId = id;
},
- showHelp(top,text) {
+ showHelp(top,text,args) {
+ if(args !== undefined)
+ text = text.replace('{ARGS}',`
+
@@ -336,10 +381,9 @@ let MyBuilderPgFunction = {
:captionTitle="fnc.name"
:image="radioIcon('pgFunction',fnc.id)"
:naked="true"
- :tight="true"
/>
-
+
+
+
+
+
@@ -307,8 +353,8 @@ let MyBuilderPgFunction = {
+
+
@@ -379,10 +422,9 @@ let MyBuilderPgFunction = {
:captionTitle="fnc"
:image="radioIcon('instanceFunction',fnc)"
:naked="true"
- :tight="true"
/>
${args.join(',`); + this.$store.commit('dialog',{ captionTop:top, captionBody:text, - image:'question.png', - buttons:[{ - caption:this.capGen.button.close, - cancel:true, - image:'cancel.png' - }] + image:'question.png' + }); + }, + showHelpVolatility(top,text,args) { + this.$store.commit('dialog',{ + captionTop:this.capApp.volatility, + captionBody:this.capApp.volatilityHelp, + image:'question.png' }); }, toggleRelationShow(relationId) { @@ -736,50 +815,63 @@ let MyBuilderPgFunction = { // relation reference: {module}[relation] <-> {MOD_ID}[REL_ID] // function reference: {module}[function](... <-> {MOD_ID}[FNC_IC](... placeholdersSet(body) { - let that = this; - // replace attributes with placeholders // stored in function text as: (ATR_ID) - body = body.replace(/\(([a-z0-9\-]{36})\)/g,function(match,id) { - let atr = that.attributeIdMap[id]; - let rel = that.relationIdMap[atr.relationId]; - let mod = that.moduleIdMap[rel.moduleId]; + body = body.replace(/\(([a-z0-9\-]{36})\)/g,(match,id) => { + const atr = this.attributeIdMap[id]; + const rel = this.relationIdMap[atr.relationId]; + const mod = this.moduleIdMap[rel.moduleId]; return `(${mod.name}.${rel.name}.${atr.name})`; }); // replace functions with placeholders // stored in function text as: [FNC_ID](... - body = body.replace(/\[([a-z0-9\-]{36})\]\(/g,function(match,id) { - return `[${that.pgFunctionIdMap[id].name}](`; + body = body.replace(/\[([a-z0-9\-]{36})\]\(/g,(match,id) => { + return `[${this.pgFunctionIdMap[id].name}](`; }); // replace relations with placeholders // stored in function text as: [REL_ID] - body = body.replace(/\[([a-z0-9\-]{36})\]/g,function(match,id) { - return `[${that.relationIdMap[id].name}]`; + body = body.replace(/\[([a-z0-9\-]{36})\]/g,(match,id) => { + return `[${this.relationIdMap[id].name}]`; }); // replace modules with placeholders // stored in function text as: {MOD_ID} - body = body.replace(/\{([a-z0-9\-]{36})\}/g,function(match,id) { - return `{${that.moduleIdMap[id].name}}`; + body = body.replace(/\{([a-z0-9\-]{36})\}/g,(match,id) => { + return `{${this.moduleIdMap[id].name}}`; + }); + + // replace presets with placeholders + // stored in function text as: {PRESET::MOD_NAME.REL_NAME.PRESET_NAME} + // preset name may not include closed curly bracket '}' + body = body.replace(/instance\.get_preset_record_id\(\'([a-z0-9\-]{36})\'\)/g,(match,presetId) => { + const prs = this.presetIdMap[presetId]; + const rel = this.relationIdMap[prs.relationId]; + const mod = this.moduleIdMap[rel.moduleId]; + const pat = new RegExp(`[\{\}]`,'g'); + + if(prs !== undefined && !pat.test(prs.name)) + return `{PRESET::${mod.name}.${rel.name}.${prs.name}}`; + + return match; }); return body; }, placeholdersUnset(previewMode) { - let that = this; - let body = this.codeFunction; + let body = this.codeFunction; + let dbChars = this.getValidDbCharsForRx(); // replace attribute placeholders // stored as: (module.relation.attribute) let pat = /\(([a-z][a-z0-9\_]+)\.([a-z][a-z0-9\_]+)\.([a-z][a-z0-9\_]+)\)/g; - body = body.replace(pat,function(match,modName,relName,atrName) { + body = body.replace(pat,(match,modName,relName,atrName) => { // resolve module by name - if(typeof that.moduleNameMap[modName] === 'undefined') + if(this.moduleNameMap[modName] === undefined) return match; - let mod = that.moduleNameMap[modName]; + const mod = this.moduleNameMap[modName]; // resolve relation by name let rel = false; @@ -815,13 +907,13 @@ let MyBuilderPgFunction = { // replace function placeholders // stored as: {module}[function](... pat = /\{([a-z][a-z0-9\_]+)\}\.\[([a-z][a-z0-9\_]+)\]\(/g; - body = body.replace(pat,function(match,modName,fncName) { + body = body.replace(pat,(match,modName,fncName) => { // resolve module by name - if(typeof that.moduleNameMap[modName] === 'undefined') + if(this.moduleNameMap[modName] === undefined) return match; - let mod = that.moduleNameMap[modName]; + const mod = this.moduleNameMap[modName]; // resolve function by name let fnc = false; @@ -845,13 +937,13 @@ let MyBuilderPgFunction = { // replace relation placeholders // stored as: {module}[relation] pat = /\{([a-z][a-z0-9\_]+)\}\.\[([a-z][a-z0-9\_]+)\]/g; - body = body.replace(pat,function(match,modName,relName) { + body = body.replace(pat,(match,modName,relName) => { // resolve module by name - if(typeof that.moduleNameMap[modName] === 'undefined') + if(this.moduleNameMap[modName] === undefined) return match; - let mod = that.moduleNameMap[modName]; + const mod = this.moduleNameMap[modName]; // resolve relation by name let rel = false; @@ -871,6 +963,25 @@ let MyBuilderPgFunction = { return `{${mod.id}}.[${rel.id}]`; }); + + // replace preset placeholders + // stored as: {PRESET::MOD_NAME.REL_NAME.PRESET_NAME}) + pat = new RegExp(`\\{PRESET\\:\\:(${dbChars})\\.(${dbChars})\\.([^\}]*)\\}`,'g'); + body = body.replace(pat,(match,modName,relName,presetName) => { + const mod = this.moduleNameMap[modName]; + if(mod !== undefined) { + for(let r of mod.relations) { + if(r.name !== relName) + continue; + + for(let p of r.presets) { + if(p.name === presetName) + return `instance\.get_preset_record_id('${p.id}')`; + } + } + } + return match; + }); return body; }, @@ -899,11 +1010,18 @@ let MyBuilderPgFunction = { ); }, exec() { + // convert to NULL if inputs are empty + let args = JSON.parse(JSON.stringify(this.execArgs)); + for(let i = 0, j = args.length; i < j; i++) { + if(args[i] === '') + args[i] = null + } + ws.send('pgFunction','execAny',{ id:this.pgFunction.id, - args:this.execArgs + args:args },true).then( - res => this.execResponse = res.payload, + res => this.execResponse = res.payload === null ? '[NULL]' : res.payload, this.$root.genericError ); }, @@ -914,12 +1032,13 @@ let MyBuilderPgFunction = { moduleId:this.pgFunction.moduleId, isTrigger:this.pgFunction.isTrigger, - // changable + // changeable name:this.name, codeArgs:this.codeArgs, codeFunction:this.placeholdersUnset(false), codeReturns:this.codeReturns, isFrontendExec:this.isFrontendExec, + volatility:this.volatility, schedules:this.schedules, captions:this.captions }), diff --git a/www/comps/builder/builderPgFunctions.js b/www/comps/builder/builderPgFunctions.js index edc5240e..8437ffaa 100644 --- a/www/comps/builder/builderPgFunctions.js +++ b/www/comps/builder/builderPgFunctions.js @@ -39,26 +39,29 @@ let MyBuilderPgFunctions = {
-
diff --git a/www/comps/builder/builderPgIndex.js b/www/comps/builder/builderPgIndex.js
index a02f66d3..0e8c1eee 100644
--- a/www/comps/builder/builderPgIndex.js
+++ b/www/comps/builder/builderPgIndex.js
@@ -2,126 +2,230 @@ export {MyBuilderPgIndex as default};
let MyBuilderPgIndex = {
name:'my-builder-pg-index',
- template:`
- |
-
- {{ pgIndexAttributesCaption }}
+ template:` |
-
+
+
+
+
+
+ 
+ {{ isNew ? capApp.titleNew : capApp.title }}+
+
+
+
-
-
+
+
+
+ |
- |
- |
-
+
+
- |
-
-
+
+
+
-
+
+ 
+ {{ isNew ? capApp.titleNew : capApp.title }}+
+
-
- |
-
- |
- |
- |
- |
- |
-
- |
-
- |
-
-
+
-
+
+
+
+
+
+ `,
+ props:{
+ contextEntity:{ type:String, required:true }, // relation / pgFunction
+ contextId: { type:String, required:true }, // ID of relation or pgFunction
+ readonly: { type:Boolean, required:true },
+ singleColumn: { type:Boolean, required:false, default:false }
+ },
+ data() {
+ return {
+ idEdit:false
+ };
+ },
+ computed:{
+ module:(s) => {
+ if(s.isFromRelation) return s.moduleIdMap[s.relationIdMap[s.contextId].moduleId];
+ if(s.isFromPgFunction) return s.moduleIdMap[s.pgFunctionIdMap[s.contextId].moduleId];
+ return false;
+ },
+ triggers:(s) => {
+ if(s.module === false) return [];
+
+ let out = [];
+
+ // check relevant modules
+ const modules = s.isFromPgFunction ? s.getDependentModules(s.module) : s.modules;
+ for(const mod of modules) {
+ for(const trg of mod.pgTriggers) {
+ if(
+ (s.isFromRelation && trg.relationId === s.contextId) ||
+ (s.isFromPgFunction && trg.pgFunctionId === s.contextId)
+ ) out.push(trg);
+ }
+ }
+
+ // sort by execution event & deferred
+ // BEFORE trigger first, then AFTER trigger, then AFTER DEFERRED trigger
+ out.sort((a,b) => {
+ const calcPrio = (e) => (e.fires === 'BEFORE' ? 0 : 10) + (!e.isDeferred ? 0 : 1);
+ return calcPrio(a) - calcPrio(b);
+ });
+ return out;
+ },
+
+ // simple
+ isFromPgFunction:(s) => s.contextEntity === 'pgFunction',
+ isFromRelation: (s) => s.contextEntity === 'relation',
+
+ // stores
+ modules: (s) => s.$store.getters['schema/modules'],
+ moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
+ pgFunctionIdMap:(s) => s.$store.getters['schema/pgFunctionIdMap'],
+ relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.pgTrigger,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ methods:{
+ // external
+ getDependentModules
+ }
+};
\ No newline at end of file
diff --git a/www/comps/builder/builderPreset.js b/www/comps/builder/builderPreset.js
index c3068cd6..896acb61 100644
--- a/www/comps/builder/builderPreset.js
+++ b/www/comps/builder/builderPreset.js
@@ -1,4 +1,8 @@
-import {isAttributeRelationship} from '../shared/attribute.js';
+import {getDependentModules} from '../shared/builder.js';
+import {
+ isAttributeFiles,
+ isAttributeRelationship
+} from '../shared/attribute.js';
import {
copyValueDialog,
getNilUuid
@@ -8,32 +12,55 @@ export {MyBuilderPreset as default};
let MyBuilderPresetValue = {
name:'my-builder-preset-value',
template:`
+
+
+
+
+
+ {{ capGen.button.new }}
+
+
+
+
+ {{ trg.fires }}
+
+ {{ isFromRelation ? pgFunctionIdMap[trg.pgFunctionId].name + '()' : relationIdMap[trg.relationId].name }}
+
+
+ {{ attribute.name }} |
-
-
-
-
+ | {{ attribute.name + (attribute.nullable ? '' : '*') }} |
+
+ |
+
+
+
+ |
+
+
+
+
+
+
+
+ |
-
- |
-
+ components:{ MyBuilderPresetValue },
+ template:`
+
+
+
+
+
+ 
+ {{ isNew ? capApp.titleNew : capApp.title.replace('{NAME}',values.name) }}+
+
+
+
+
-
-
- |
-
- |
- |
-
- |
-
-
- |
-
- |
-
-
-
+
+
+ `,
+ props:{
+ filter: { type:String, required:true },
+ readonly:{ type:Boolean, required:true },
+ relation:{ type:Object, required:true }
+ },
+ data() {
+ return {
+ idEdit:false
+ };
+ },
+ computed:{
+ // stores
+ capApp:(s) => s.$store.getters.captions.builder.preset,
+ capGen:(s) => s.$store.getters.captions.generic
+ },
+ methods:{
+ // presentation
+ getPreview(preset) {
+ let items = [];
+ for(let v of preset.values) {
+ if(v.value !== null && v.value !== '')
+ items.push(v.protected ? `[${v.value}]` : v.value);
+ }
+ const line = items.join(', ');
+
+ return line.length < 50 ? line : `${line.substring(0,50)}...`;
+ }
+ }
+};
\ No newline at end of file
diff --git a/www/comps/builder/builderQuery.js b/www/comps/builder/builderQuery.js
index 505f527d..42057d2f 100644
--- a/www/comps/builder/builderQuery.js
+++ b/www/comps/builder/builderQuery.js
@@ -1,18 +1,166 @@
-import MyBuilderCaption from './builderCaption.js';
-import {getDependentModules} from '../shared/builder.js';
-import {getNilUuid} from '../shared/generic.js';
-import {getCaptionByIndexAttributeId} from '../shared/query.js';
+import MyBuilderCaption from './builderCaption.js';
+import {getNilUuid} from '../shared/generic.js';
+import {
+ builderOptionGet,
+ builderOptionSet,
+ getItemTitleRelation
+} from '../shared/builder.js';
+import {
+ getCaptionByIndexAttributeId,
+ getQueryFilterNew
+} from '../shared/query.js';
import {
getIndexAttributeIdsByJoins,
isAttributeRelationship,
isAttributeRelationship11
} from '../shared/attribute.js';
+import {
+ getDependentModules,
+ getDependentAttributes
+} from '../shared/builder.js';
export {MyBuilderQuery as default};
+let MyBuilderQueryFilter = {
+ name:'my-builder-query-filter',
+ template:`
+
+
+
+
+
+ {{ capGen.button.new }}
+
+
+
+
+ {{ p.name }}
+ {{ getPreview(p) }}
+
+
+
+
+
+
+
+
+
+ `,
+ props:{
+ entityIdMapRef: { type:Object, required:true },
+ expertMode: { type:Boolean, required:true },
+ fieldIdMap: { type:Object, required:true },
+ filtersDisable: { type:Array, required:false, default:() => [] },
+ formId: { type:String, required:true },
+ joins: { type:Array, required:true },
+ joinsParents: { type:Array, required:true },
+ modelValue: { type:Array, required:true },
+ moduleId: { type:String, required:true }
+ },
+ data() {
+ return {
+ indexTarget:0,
+ show:false
+ };
+ },
+ emits:['update:modelValue'],
+ computed:{
+ filtersByIndexMap:(s) => {
+ let out = {};
+ for(const f of s.modelValue) {
+ if(out[f.index] === undefined)
+ out[f.index] = []
+
+ out[f.index].push(f);
+ }
+ return out;
+ },
+ indexTargets:(s) => {
+ let out = [];
+ for(const j of s.joins.filter(v => v.index !== 0)) {
+ out.push(j.index);
+ }
+ return out;
+ },
+
+ // simple
+ visible:(s) => s.show && s.modelValue.length !== 0,
+
+ // stores
+ capApp:(s) => s.$store.getters.captions.builder.query,
+ capGen:(s) => s.$store.getters.captions.generic
+ },
+ methods:{
+ // externals
+ getQueryFilterNew,
+ getItemTitleRelation,
+
+ // presentation
+ displayArrow(state,count) {
+ return state && count !== 0 ? 'triangleDown.png' : 'triangleRight.png';
+ },
+ relationLabel(index) {
+ for(const j of this.joins) {
+ if(j.index === index)
+ return this.getItemTitleRelation(j.relationId,index);
+ }
+ return '';
+ },
+
+ // actions
+ add(indexTarget) {
+ let f = this.getQueryFilterNew();
+ f.index = indexTarget;
+
+ let v = JSON.parse(JSON.stringify(this.modelValue));
+ v.push(f);
+ this.$emit('update:modelValue',v);
+ this.show = true;
+ },
+ set(filters,index) {
+ const filtersOtherIndexes = this.modelValue.filter(v => v.index !== index);
+ this.$emit('update:modelValue',filtersOtherIndexes.concat(filters));
+ },
+ showHelp() {
+ this.$store.commit('dialog',{
+ captionBody:this.capApp.filterJoinHelp,
+ captionTop:this.capGen.help
+ });
+ },
+ }
+};
+
let MyBuilderQueryChoice = {
name:'my-builder-query-choice',
components:{
- MyBuilderCaption
+ MyBuilderCaption,
+ MyBuilderQueryFilter
},
template:`
@@ -47,28 +195,24 @@ let MyBuilderQueryChoice = {
/>
-
- {{ capGen.filters }}
-
-
-
+ template:`
{{ capApp.titleOne.replace('{NAME}',name) }}
-
+
-
-
-
-
-
-
-
-
- {{ capApp.attributes.replace('{CNT}',relation.attributes.length) }}-
-
-
-
-
-
-
+
+
+
- {{ capGen.button.new }}
-
+
+
+
-
-
-
+
-
-
+ {{ capGen.properties }}
-
-
-
-
- {{ atr.name }}
-
- [{{ atr.captions.attributeTitle[builderLanguage] }}]
-
-
-
-
+
+
-
-
-
-
-
-
-
- {{ capGen.properties }}
+
+
-
-
-
-
-
-
-
-
-
- {{ capApp.indexes.replace('{CNT}',relation.indexes.length) }}-
-
-
-
-
-
-
- {{ capApp.triggers.replace('{CNT}',relation.triggers.length) }}-
-
-
-
-
{{ capApp.policies.replace('{CNT}',relation.policies.length) }}+
- {{ capApp.policyExplanation }} - - -
-
-
+
+
-
-
-
- {{ capApp.presets.replace('{CNT}',relation.presets.length) }}+ +
+
+
+
+
+
-
+
+ {{ capGen.button.new }}
+
-
- {{ capApp.graph }}+ +
+
-
-
+
-
+
+ {{ capGen.button.new }}
+
-
+
+
+ {{ displayIndexName(ind) }}
+
-
-
+
+ {{ capApp.preview }}-
+
+
+
+
+
+
+
+
+
+ {{ capApp.policyExplanation }} + -
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ capApp.previewLimit }}
-
- {{ capApp.previewRowCount }}
-
+
-
-
+ {{ r.name }}
+ {{ r.comment }}
+ {{ api.name + ' (v' + api.version + ')' }} |
-
- |
-
+ {{ api.name + ' (v' + api.version + ')' }}
+ |
+
+ |
+
+ |
+
+ {{ clientEvent.captions.clientEventTitle[builderLanguage] }}
+
+ |
+
+ |
+
+ | {{ collection.name }} |
-
- |
-
+ {{ collection.name }}
+ |
+
+ |
+
+ |
- |
-
- {{ title }}
- |
-
- |
-
- |
- |
-
+ {{ title }}
+ |
+
+ |
+
+ |
+
+ |
- |
-
-
- |
-
- | {{ attributeIdMap[atr.id].name }} |
-
-
- |
-
+ {{ relation.name + (brokenInheritance ? '*' : '') }}
+ |
+
+ |
+
+ |
+ |
+
+ |
+
+ |
+
+ |
+ | {{ attributeIdMap[atr.id].name }} |
+
+ |
+
+ |
+
+ |
+
+ |
+ |
+ {{ widget.name }}
+ |
+
+ |
+
+ |
@@ -253,7 +351,7 @@ let MyBuilderRole = {
-
-
-
-
-
-
- {{ capApp.data }}-
{{ capApp.legend }} -
-
-
+
+
- {{ capApp.menus }}-
+
+
+
-
-
-
- {{ capApp.collections }}-
-
-
-
- {{ capApp.apis }}-
-
+
{{ isVisible ? capApp.appVisible : capApp.appVisibleOff }}
+ `,
+ props:{
+ module: { type:Object, required:true },
+ readonly: { type:Boolean, required:true },
+ variableId:{ required:true }
+ },
+ emits:['close'],
+ data() {
+ return {
+ values:null,
+ valuesOrg:null
+ };
+ },
+ computed:{
+ nameTaken:(s) => {
+ for(let v of s.module.variables) {
+ if(v.id !== s.variableId && v.name === s.values.name && v.formId === s.values.formId)
+ return true;
+ }
+ return false;
+ },
+ usedFor:{
+ get() { return this.getAttributeContentUse(this.values.content, this.values.contentUse); },
+ set(v) {
+ const p = this.getAttributeContentsByUse(v,0,true);
+ this.values.content = p.content;
+ this.values.contentUse = p.contentUse;
+ }
+ },
+
+ // simple
+ canSave: (s) => !s.readonly && s.hasChanges && !s.nameTaken,
+ hasChanges:(s) => s.values.name !== '' && JSON.stringify(s.values) !== JSON.stringify(s.valuesOrg),
+ preview: (s) => s.variableValueGet(s.variableId),
+ title: (s) => s.capApp.edit.replace('{NAME}',s.values.name),
+
+ // stores
+ formIdMap: (s) => s.$store.getters['schema/formIdMap'],
+ moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
+ variableIdMap: (s) => s.$store.getters['schema/variableIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.variable,
+ capAppAtr: (s) => s.$store.getters.captions.builder.attribute,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ mounted() {
+ this.reset();
+ window.addEventListener('keydown',this.handleHotkeys);
+ },
+ unmounted() {
+ window.removeEventListener('keydown',this.handleHotkeys);
+ },
+ methods:{
+ // external
+ copyValueDialog,
+ getAttributeContentUse,
+ getAttributeContentsByUse,
+ getAttributeIcon,
+ variableValueGet,
+
+ // actions
+ handleHotkeys(e) {
+ if(e.ctrlKey && e.key === 's' && this.canSave) {
+ this.set();
+ e.preventDefault();
+ }
+ if(e.key === 'Escape') {
+ this.$emit('close');
+ e.preventDefault();
+ }
+ },
+ reset() {
+ this.values = JSON.parse(JSON.stringify(this.variableIdMap[this.variableId]));
+ this.valuesOrg = JSON.parse(JSON.stringify(this.values));
+ },
+
+ // backend calls
+ delAsk() {
+ this.$store.commit('dialog',{
+ captionBody:this.capApp.dialog.delete,
+ buttons:[{
+ cancel:true,
+ caption:this.capGen.button.delete,
+ exec:this.del,
+ image:'delete.png'
+ },{
+ caption:this.capGen.button.cancel,
+ image:'cancel.png'
+ }]
+ });
+ },
+ del() {
+ ws.send('variable','del',this.variableId,true).then(
+ () => {
+ this.$root.schemaReload(this.module.id);
+ this.$emit('close');
+ },
+ this.$root.genericError
+ );
+ },
+ set() {
+ ws.sendMultiple([
+ ws.prepare('variable','set',this.values),
+ ws.prepare('schema','check',{ moduleId:this.module.id })
+ ],true).then(
+ () => {
+ this.$root.schemaReload(this.module.id);
+ this.$emit('close');
+ },
+ this.$root.genericError
+ );
+ }
+ }
+};
\ No newline at end of file
diff --git a/www/comps/builder/builderVariables.js b/www/comps/builder/builderVariables.js
new file mode 100644
index 00000000..f449d828
--- /dev/null
+++ b/www/comps/builder/builderVariables.js
@@ -0,0 +1,97 @@
+import MyBuilderVariable from './builderVariable.js';
+import {getAttributeIcon} from '../shared/attribute.js';
+import {routeParseParams} from '../shared/router.js';
+export {MyBuilderVariables as default};
+
+let MyBuilderVariables = {
+ name:'my-builder-variables',
+ components:{MyBuilderVariable},
+ template:`
+
+
+
+
+
+
+ {{ title }}+
+
+
+
+
+
+
+
+
+
+
+
+
+ `,
+ emits:['createNew'],
+ props:{
+ id: { type:String, required:true },
+ readonly:{ type:Boolean, required:true }
+ },
+ data() {
+ return {
+ filter:'',
+ variableIdEdit:false
+ };
+ },
+ mounted() {
+ let params = { variableIdEdit:{ parse:'string', value:null } };
+ this.routeParseParams(params);
+
+ if(params.variableIdEdit.value !== null)
+ this.variableIdEdit = params.variableIdEdit.value;
+ },
+ computed:{
+ // stores
+ module: (s) => s.moduleIdMap[s.id] === undefined ? false : s.moduleIdMap[s.id],
+ moduleIdMap:(s) => s.$store.getters['schema/moduleIdMap'],
+ formIdMap: (s) => s.$store.getters['schema/formIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.variable,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ methods:{
+ // externals
+ getAttributeIcon,
+ routeParseParams
+ }
+};
\ No newline at end of file
diff --git a/www/comps/builder/builderWidget.js b/www/comps/builder/builderWidget.js
new file mode 100644
index 00000000..e78e40eb
--- /dev/null
+++ b/www/comps/builder/builderWidget.js
@@ -0,0 +1,246 @@
+import MyBuilderCaption from './builderCaption.js';
+import MyBuilderCollectionInput from './builderCollectionInput.js';
+import MyBuilderFormInput from './builderFormInput.js';
+import {copyValueDialog} from '../shared/generic.js';
+export {MyBuilderWidget as default};
+
+let MyBuilderWidget = {
+ name:'my-builder-widget',
+ components:{
+ MyBuilderCaption,
+ MyBuilderCollectionInput,
+ MyBuilderFormInput
+ },
+ template:`
+
+
+
+
+
+ {{ capApp.title }}+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ capGen.button.new }}
+
+
+
+ {{ v.name }}
+ {{ formIdMap[v.formId].name }}: {{ v.name }}
+
+
+ `,
+ props:{
+ builderLanguage:{ type:String, required:true },
+ module: { type:Object, required:true },
+ readonly: { type:Boolean, required:true },
+ widgetId: { required:true }
+ },
+ emits:['close','next-language'],
+ data() {
+ return {
+ // widget values
+ values:null,
+ valuesOrg:null
+ };
+ },
+ computed:{
+ nameTaken:(s) => {
+ for(let w of s.module.widgets) {
+ if(w.id !== s.widgetId && w.name === s.values.name)
+ return true;
+ }
+ return false;
+ },
+
+ // simple
+ canSave: (s) => !s.readonly && s.hasChanges && !s.nameTaken,
+ hasChanges:(s) => s.values.name !== '' && JSON.stringify(s.values) !== JSON.stringify(s.valuesOrg),
+ title: (s) => s.capApp.edit.replace('{NAME}',s.values.name),
+
+ // stores
+ collectionIdMap:(s) => s.$store.getters['schema/collectionIdMap'],
+ formIdMap: (s) => s.$store.getters['schema/formIdMap'],
+ moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
+ widgetIdMap: (s) => s.$store.getters['schema/widgetIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.widget,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ mounted() {
+ this.reset();
+ window.addEventListener('keydown',this.handleHotkeys);
+ },
+ unmounted() {
+ window.removeEventListener('keydown',this.handleHotkeys);
+ },
+ methods:{
+ // external
+ copyValueDialog,
+
+ // actions
+ handleHotkeys(e) {
+ if(e.ctrlKey && e.key === 's' && this.canSave) {
+ this.set();
+ e.preventDefault();
+ }
+ if(e.key === 'Escape') {
+ this.$emit('close');
+ e.preventDefault();
+ }
+ },
+ reset() {
+ this.values = this.widgetId !== null
+ ? JSON.parse(JSON.stringify(this.widgetIdMap[this.widgetId]))
+ : {
+ id:null,
+ moduleId:this.module.id,
+ formId:null,
+ name:'',
+ size:1,
+ captions:{
+ widgetTitle:{}
+ }
+ };
+
+ this.resetOrg();
+ },
+ resetOrg() {
+ this.valuesOrg = JSON.parse(JSON.stringify(this.values));
+ },
+
+ // backend calls
+ delAsk() {
+ this.$store.commit('dialog',{
+ captionBody:this.capApp.dialog.delete,
+ buttons:[{
+ cancel:true,
+ caption:this.capGen.button.delete,
+ exec:this.del,
+ image:'delete.png'
+ },{
+ caption:this.capGen.button.cancel,
+ image:'cancel.png'
+ }]
+ });
+ },
+ del() {
+ ws.send('widget','del',{id:this.widgetId},true).then(
+ () => {
+ this.$root.schemaReload(this.module.id);
+ this.$emit('close');
+ },
+ this.$root.genericError
+ );
+ },
+ set() {
+ ws.sendMultiple([
+ ws.prepare('widget','set',this.values),
+ ws.prepare('schema','check',{ moduleId:this.module.id })
+ ],true).then(
+ () => {
+ this.$root.schemaReload(this.module.id);
+ this.$emit('close');
+ },
+ this.$root.genericError
+ );
+ }
+ }
+};
\ No newline at end of file
diff --git a/www/comps/builder/builderWidgets.js b/www/comps/builder/builderWidgets.js
new file mode 100644
index 00000000..7055edf5
--- /dev/null
+++ b/www/comps/builder/builderWidgets.js
@@ -0,0 +1,107 @@
+import MyBuilderWidget from './builderWidget.js';
+import {routeParseParams} from '../shared/router.js';
+export {MyBuilderWidgets as default};
+
+let MyBuilderWidgets = {
+ name:'my-builder-widgets',
+ components:{ MyBuilderWidget },
+ template:`
+
+
+
+
+
+
+ {{ title }}+
+
+
+
+
+
+
+
+
+
+
+
+ `,
+ props:{
+ builderLanguage:{ type:String, required:true },
+ id: { type:String, required:true },
+ readonly: { type:Boolean, required:true }
+ },
+ data() {
+ return {
+ filter:'',
+ widgetIdEdit:false
+ };
+ },
+ computed:{
+ module:(s) => s.moduleIdMap[s.id] === undefined ? false : s.moduleIdMap[s.id],
+
+ // stores
+ moduleIdMap:(s) => s.$store.getters['schema/moduleIdMap'],
+ capApp: (s) => s.$store.getters.captions.builder.widget,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ mounted() {
+ let params = { widgetIdEdit:{ parse:'string', value:null } };
+ this.routeParseParams(params);
+
+ if(params.widgetIdEdit.value !== null)
+ this.widgetIdEdit = params.widgetIdEdit.value;
+ },
+ methods:{
+ // external
+ routeParseParams
+ }
+};
\ No newline at end of file
diff --git a/www/comps/button.css b/www/comps/button.css
index 5486088c..35f83be6 100644
--- a/www/comps/button.css
+++ b/www/comps/button.css
@@ -1,72 +1,72 @@
.button{
height:30px;
- margin:0px var(--spacing-button-horz-outside) 0px 0px;
- padding:4px var(--spacing-button-horz-inside);
+ margin:0px;
+ padding:4px calc(var(--spacing) / 1.5) 5px;
font-size:inherit;
- color:var(--color-bg-font);
+ color:inherit;
display:flex;
- flex-direction:row;
+ flex-flow:row nowrap;
+ gap:calc(var(--spacing) / 2);
align-items:center;
float:left;
outline:none;
- background-color:var(--color-action);
box-sizing:border-box;
- box-shadow:1px 1px 3px var(--color-shade);
- border-radius:4px;
- transition:height 0.1s, margin 0.1s, padding 0.1s, box-shadow 0.1s, border-bottom 0.1s, filter 0.1s;
+ border-radius:var(--border-input-radius);
+ transition:box-shadow 0.1s, border-bottom 0.1s, filter 0.1s, padding 0.1s, height 0.1s, margin 0.1s;
+ user-select:none;
}
.button.adjusts{
flex:1 0 auto;
}
-.button.cancel{
- background-color:var(--color-cancel);
+.button.background{
+ box-shadow:var(--shadow-input);
+ color:var(--color-font-bright);
+ background-color:var(--color-action-disable);
+ border:1px solid var(--color-border);
}
-.button.naked{
- padding:4px 6px;
- color:inherit;
- background-color:transparent;
- box-shadow:unset;
+.button.background.clickable{
+ background-color:var(--color-action);
+ border:1px solid var(--color-action-border);
}
-
-/* regular button styles */
-.button.inactive:not(.naked){
- background-color:var(--color-action-disable);
+.button.background.clickable.cancel{
+ background-color:var(--color-cancel);
+ border:1px solid var(--color-cancel-border);
}
-.button:focus:not(.naked):not(.inactive),
-.button:hover:not(.naked):not(.inactive){
+.button.background.clickable:focus,
+.button.background.clickable:hover{
filter:brightness(120%);
- box-shadow:1px 2px 6px var(--color-shade);
- border-bottom:2px solid var(--color-border-bg);
+ box-shadow:var(--shadow-input-focus);
+ border-bottom:3px solid var(--color-action-border);
}
-.button:active:hover:not(.naked):not(.inactive){
- height:28px;
- margin:1px calc(var(--spacing-button-horz-outside) + 2px) 1px 2px;
- padding-left:calc(var(--spacing-button-horz-inside) - 2px);
- padding-right:calc(var(--spacing-button-horz-inside) - 2px);
- box-shadow:1px 1px 3px var(--color-shade);
- filter:brightness(90%);
+.button.background.clickable.cancel:focus,
+.button.background.clickable.cancel:hover{
+ border-bottom:3px solid var(--color-cancel-border);
}
-.button.noMargin:active:hover:not(.naked):not(.inactive){
- margin:1px 2px;
+.button.background.clickable:active{
+ height:26px;
+ margin:2px;
+ padding:2px calc((var(--spacing) / 1.5) - 2px) 3px;
}
-.button.large:active:hover:not(.naked):not(.noMargin):not(.inactive){
- height:38px;
+.button.large{
+ height:40px;
+ font-size:120%;
}
-
-/* naked button styles */
-.button.naked.inactive{
- color:var(--color-font-alt);
+.button.large.background.clickable:active{
+ height:36px;
}
-.button.naked:focus:not(.inactive),
-.button.naked:hover:not(.inactive){
+.button.naked{
+ color:var(--color-font-disabled);
+ padding:4px 0px;
+}
+.button.naked.clickable{
+ color:inherit;
+}
+.button.naked.clickable:focus,
+.button.naked.clickable:hover{
text-decoration:underline;
}
-
/* button content */
-.button *:not(*:last-child){
- padding-right:var(--spacing-button-horz-inside);
-}
.button span{
white-space:nowrap;
}
@@ -82,42 +82,30 @@
width:20px;
height:20px;
filter:var(--image-filter-bg);
- transition:height 0.2s, width 0.2s, margin 0.2s;
}
.button.naked img{
- filter:var(--image-filter);
-}
-.button.naked.inactive img{
filter:var(--image-filter-alt);
}
-.button.naked:focus:not(.inactive) img,
-.button.naked:hover:not(.inactive) img{
+.button.naked.clickable img{
+ filter:var(--image-filter);
+}
+.button.naked.clickable:focus img,
+.button.naked.clickable:hover img{
width:24px;
height:24px;
margin-left:-2px;
margin-right:-2px;
+ transition:height 0.2s, width 0.2s, margin 0.2s;
}
-.button.naked:active:not(.inactive) img{
- width:22px;
- height:22px;
- margin-left:-1px;
- margin-right:-1px;
-}
-
-
-/* layout overwrites */
-.button.large{
- height:40px;
- font-size:120%;
-}
-.button.right{
- float:right;
-}
-.button.noMargin{
- margin:0px;
+.button .alt{
+ display:flex;
+ flex-flow:row nowrap;
+ align-items:center;
+ padding-left:calc(var(--spacing) / 2);
+ gap:calc(var(--spacing) / 2);
+ border-left:2px solid var(--color-bright);
}
-
/* user overwrites */
.user-dark .button.background.inactive{
filter:grayscale(100%) brightness(85%);
diff --git a/www/comps/button.js b/www/comps/button.js
index 023513b0..3f214ac3 100644
--- a/www/comps/button.js
+++ b/www/comps/button.js
@@ -1,10 +1,12 @@
+export {MyButtonCheck};
export {MyButton as default};
let MyButton = {
name:'my-button',
- template:`
+
+
+
+
+
+ {{ capApp.title }}+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ capGen.button.new }}
+
+
+
+ {{ w.name }}
+
+ [{{ w.captions.widgetTitle[builderLanguage] }}]
+
+
+
+
+ `,
+ props:{
+ daysShow: { type:Number, required:true },
+ modelValue:{ type:Date, required:true },
+ useHotkeys:{ type:Boolean, required:false, default:false }
+ },
+ computed:{
+ dayInput:{
+ get() { return this.modelValue.getDate(); },
+ set(v) {
+ let d = new Date(this.modelValue.valueOf());
+ d.setDate(v);
+ this.$emit('update:modelValue',d);
+ }
+ },
+ monthInput:{
+ get() { return this.modelValue.getMonth(); },
+ set(v) {
+ let d = new Date(this.modelValue.valueOf());
+
+ if(this.isMonth)
+ d.setDate(1); // set to 1st to add month correctly
+
+ d.setMonth(v);
+ this.$emit('update:modelValue',d);
+ }
+ },
+ weekInput:{
+ get() { return this.getWeek(this.modelValue); },
+ set(v) {
+ let d = new Date(this.modelValue.valueOf());
+ d = this.getDateFromWeek(v,d.getFullYear());
+ this.$emit('update:modelValue',d);
+ }
+ },
+ yearInput:{
+ get() { return this.modelValue.getFullYear(); },
+ set(v) {
+ if(v.length !== 4) return;
+
+ let d = new Date(this.modelValue.valueOf());
+ d.setFullYear(v);
+ this.$emit('update:modelValue',d);
+ }
+ },
+
+ // simple
+ isDays: (s) => s.daysShow === 1 || s.daysShow === 3,
+ isMonth: (s) => s.daysShow === 42,
+ isWeek: (s) => s.daysShow === 5 || s.daysShow === 7,
+ weeksInYear:(s) => s.isWeek ? s.getWeeksInYear(s.modelValue.getFullYear()) : 0,
+
+ // stores
+ capApp:(s) => s.$store.getters.captions.calendar
+ },
+ emits:['update:modelValue'],
+ mounted() {
+ if(this.useHotkeys)
+ window.addEventListener('keydown',this.handleHotkeys);
+ },
+ unmounted() {
+ if(this.useHotkeys)
+ window.removeEventListener('keydown',this.handleHotkeys);
+ },
+ methods:{
+ // external
+ getDateFromWeek,
+ getWeek,
+ getWeeksInYear,
+
+ // actions
+ handleHotkeys(e) {
+ switch(e.key) {
+ case 'ArrowLeft': this.pageMove(false); break;
+ case 'ArrowRight': this.pageMove(true); break;
+ }
+ },
+ pageMove(forward) {
+ if(this.isMonth)
+ return this.monthInput = forward ? this.monthInput + 1 : this.monthInput - 1;
+
+ let d = new Date(this.modelValue.valueOf());
+
+ // 5-days view (Mo-Fr) moves full week
+ let dOffset = this.daysShow !== 5 ? this.daysShow : 7;
+
+ d.setDate(d.getDate() + (forward ? dOffset : dOffset - (dOffset * 2)));
+ this.$emit('update:modelValue',d);
+ }
+ }
+};
-let MyCalendarMonth = {
- name:'my-calendar-month',
+let MyCalendar = {
+ name:'my-calendar',
components:{
- MyInputCollection,
- MyValueRich
+ MyCalendarDays,
+ MyCalendarMonth,
+ MyCalendarDateSelect,
+ MyInputCollection
},
- template:`
+ template:` `,
props:{
- choices: { type:Array, required:false, default:() => [] },
- columns: { type:Array, required:true },
- filters: { type:Array, required:true },
- formLoading:{ type:Boolean, required:true },
- limit: { type:Number, required:true },
- needsHeader:{ type:Boolean, required:true },
- optionJson: { type:String, required:true },
- query: { type:Object, required:true }
+ choices: { type:Array, required:false, default:() => [] },
+ columns: { type:Array, required:true },
+ filters: { type:Array, required:true },
+ formLoading: { type:Boolean, required:true },
+ isHidden: { type:Boolean, required:true },
+ limit: { type:Number, required:true },
+ moduleId: { type:String, required:true },
+ needsHeader: { type:Boolean, required:true },
+ optionJson: { type:String, required:true }, // general chart options object, as JSON
+ optionOverwrite:{ required:false, default:null }, // overwrite entire echarts option object (incl. data)
+ query: { type:Object, required:true }
},
data() {
return {
@@ -68,20 +71,29 @@ let MyChart = {
// simple
choiceFilters:(s) => s.getChoiceFilters(s.choices,s.choiceId),
- hasChoices: (s) => s.choices.length > 1,
+ hasChoices: (s) => s.choices.length > 1 && !s.hasOverwrite,
+ hasOverwrite: (s) => s.optionOverwrite !== null,
// stores
attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
+ appResized: (s) => s.$store.getters.appResized,
settings: (s) => s.$store.getters.settings
},
- created() {
- window.addEventListener('resize',this.resize);
- },
mounted() {
// setup watchers
- this.$watch('formLoading',(val) => {
+ this.$watch('appResized',this.resized);
+ this.$watch('formLoading',val => {
if(!val) this.get();
});
+ this.$watch('isHidden',val => {
+ if(!val) this.$nextTick(this.resized);
+ });
+ this.$watch('optionOverwrite',val => {
+ if(val !== null) {
+ this.option = this.optionOverwrite;
+ this.ready = true;
+ }
+ });
this.$watch(() => [this.columns,this.filters],(newVals,oldVals) => {
for(let i = 0, j = newVals.length; i < j; i++) {
if(JSON.stringify(newVals[i]) !== JSON.stringify(oldVals[i]))
@@ -92,9 +104,6 @@ let MyChart = {
// set default choice
this.choiceId = this.choices.length > 0 ? this.choices[0].id : null;
},
- unmounted() {
- window.removeEventListener('resize',this.resize);
- },
methods:{
// externals
getCaption,
@@ -108,12 +117,17 @@ let MyChart = {
choiceIdSet() {
this.get();
},
- resize() {
- this.$refs.chart.resize();
+ resized() {
+ if(typeof this.$refs.chart !== 'undefined')
+ this.$refs.chart.resize();
},
// backend calls
get() {
+ // no need to fetch data if entire options object (incl. data) is overwritten
+ if(this.hasOverwrite)
+ return;
+
ws.send('data','get',{
relationId:this.query.relationId,
joins:this.getRelationsJoined(this.query.joins),
@@ -139,7 +153,7 @@ let MyChart = {
// set dataset defaults if empty
// source header is false, otherwise first column will be used as dimension name
- if(typeof this.option.dataset === 'undefined')
+ if(typeof this.option.dataset === 'undefined')
this.option.dataset = {
source:[],
sourceHeader:false
diff --git a/www/comps/codeEditor.js b/www/comps/codeEditor.js
new file mode 100644
index 00000000..1918348d
--- /dev/null
+++ b/www/comps/codeEditor.js
@@ -0,0 +1,136 @@
+import {
+ builderOptionGet,
+ builderOptionSet
+} from './shared/builder.js';
+export {MyCodeEditor as default};
+
+let MyCodeEditor = {
+ name:'my-code-editor',
+ template:`
+
+
@@ -39,14 +39,17 @@ let MyChart = {
/>
+
+
+
+
+
+
+ 
+ {{ capApp.button.icsHint }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ capApp.icsDesc }}
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ capApp.icsDesc }} - -
- `,
- props:{
- choiceId: { required:false, default:null },
- choices: { type:Array, required:false, default:() => [] },
- columns: { type:Array, required:false, default:() => [] },
- collections:{ type:Array, required:false, default:() => [] },
- collectionIdMapIndexes:{ type:Object, required:false, default:() => {return {}} },
- date: { type:Date, required:true }, // selected date to work around
- date0: { type:Date, required:true }, // start date of calendar
- date1: { type:Date, required:true }, // end date of calendar
- dateSelect0:{ required:false, default:null },
- dateSelect1:{ required:false, default:null },
- iconId: { required:false, default:null },
- fieldId: { type:String, required:false, default:'' },
- filters: { type:Array, required:false, default:() => [] },
- formLoading:{ type:Boolean, required:false, default:false },
- ics: { type:Boolean, required:false, default:false },
- inputTime: { type:Boolean, required:false, default:false },
- isInput: { type:Boolean, required:false, default:false },
- hasColor: { type:Boolean, required:false, default:false }, // color attribute exists
- hasCreate: { type:Boolean, required:false, default:false }, // has action for creating new record
- rows: { type:Array, required:false, default:() => [] },
- rowSelect: { type:Boolean, required:false, default:false }
- },
- emits:[
- 'day-selected','open-form','record-selected','set-choice-id',
- 'set-collection-indexes','set-date'
- ],
- data() {
- return {
- icsToken:'',
- icsTokenName:'',
- showIcs:false
- };
- },
- computed:{
- // inputs
- choiceIdInput:{
- get() { return this.choiceId; },
- set(v) { this.$emit('set-choice-id',v); }
- },
- monthInput:{
- get() { return this.date.getMonth(); },
- set(v) {
- let d = new Date(this.date.valueOf());
- d.setDate(1); // set to 1st to add month correctly
- d.setMonth(v);
- this.$emit('set-date',d);
- }
- },
- yearInput:{
- get() { return this.date.getFullYear(); },
- set(v) {
- if(v.length !== 4) return;
-
- let d = new Date(this.date.valueOf());
- d.setFullYear(v);
- this.$emit('set-date',d);
- }
- },
-
- // event values arrive sorted by start date
- // they are processed for display on each day of the calendar
- eventsByDay:(s) => {
- let days = [];
-
- for(let i = 0; i < 42; i++) {
- days.push({ events:[] });
- }
-
- // each row is one event (partial day, full day or spanning multiple days)
- for(let i = 0, j = s.rows.length; i < j; i++) {
-
- let ev = {
- color:s.hasColor ? s.rows[i].values[2] : null,
- date0:s.rows[i].values[0],
- date1:s.rows[i].values[1],
- entryFirst:true,
- entryLast:false,
- fullDay:false,
- fullDaysLeft:0,
- indexRecordIds:s.rows[i].indexRecordIds,
- placeholder:false,
- recordId:s.rows[i].indexRecordIds['0'],
- values:[]
- };
-
- // add non-hidden values
- let values = s.hasColor ? s.rows[i].values.slice(3) : s.rows[i].values.slice(2);
- for(let x = 0, y = values.length; x < y; x++) {
- if(!s.columnIndexesHidden.includes(x))
- ev.values.push(values[x]);
- }
-
- // check for full day event (stored as UTC zero)
- // add timezone offset to display correctly on calendar
- // because DST can be different for each date, we must use their individual offsets
- if(s.isUnixUtcZero(ev.date0) && s.isUnixUtcZero(ev.date1)) {
- ev.date0 += new Date(ev.date0 * 1000).getTimezoneOffset() * 60;
- ev.date1 += new Date(ev.date1 * 1000).getTimezoneOffset() * 60;
- ev.fullDay = true;
- ev.fullDaysLeft = ((ev.date1 - ev.date0) / 86400)+1;
- }
-
- // calculate position from start of calendar
- let dEvent = new Date(ev.date0 * 1000);
- dEvent.setHours(0,0,0); // use midnight
-
- let fullDaysLeft = ev.fullDaysLeft;
- let daysFromStart = s.getDaysBetween(s.date0,dEvent)+1;
-
- // show first event only if within calendar bounds
- // store position in case we have a multi day event
- let eventPosition;
-
- if(s.dayOffsetWithinBounds(daysFromStart)) {
- eventPosition = days[daysFromStart].events.length;
- days[daysFromStart].events.push(ev);
- }
- else {
- // if event started outside of calendar bounds, use position from first day
- eventPosition = days[0].events.length;
- }
-
- // event is less than 1 day, is only shown once
- if(!ev.fullDay)
- continue;
-
- // place following days
- while(true) {
-
- // check if event reaches into next day
- dEvent.setDate(dEvent.getDate()+1);
- if(dEvent.getTime() / 1000 > ev.date1)
- break;
-
- // get to next day
- daysFromStart++;
- fullDaysLeft--;
-
- // event is outside of bounds, skip
- if(!s.dayOffsetWithinBounds(daysFromStart))
- continue;
-
- // reset event position if it reaches into next week
- if(daysFromStart !== 0 && daysFromStart % 7 === 0)
- eventPosition = days[daysFromStart].events.length;
-
- // add placeholder events to fill empty line space
- while(days[daysFromStart].events.length < eventPosition) {
- days[daysFromStart].events.push({
- placeholder:true
- });
- }
-
- let evNext = JSON.parse(JSON.stringify(ev));
- evNext.entryFirst = false;
- evNext.fullDaysLeft = fullDaysLeft;
- days[daysFromStart].events.push(evNext);
- }
-
- // retroactively mark last day
- if(s.dayOffsetWithinBounds(daysFromStart))
- days[daysFromStart].events[days[daysFromStart].events.length-1].entryLast = true;
- }
- return days;
- },
-
- // helpers
- daysBefore:(s) => {
- let d = new Date(s.date.valueOf());
- d.setDate(1);
- return s.getDaysBetween(s.date0,d);
- },
- icsUrl:(s) => `${location.protocol}//${location.host}/ics/download/cal.ics`
- + `?field_id=${s.fieldId}&login_id=${s.loginId}&token_fixed=${s.icsToken}`,
-
- // simple
- columnIndexesHidden:(s) => s.getColumnIndexesHidden(s.columns),
- daysAfter: (s) => s.date1.getDate(),
- month: (s) => s.date.getMonth(), // active month (0-11)
- hasChoices: (s) => s.choices.length > 1,
-
- // stores
- attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
- iconIdMap: (s) => s.$store.getters['schema/iconIdMap'],
- capApp: (s) => s.$store.getters.captions.calendar,
- capGen: (s) => s.$store.getters.captions.generic,
- isMobile: (s) => s.$store.getters.isMobile,
- loginId: (s) => s.$store.getters.loginId,
- settings: (s) => s.$store.getters.settings
- },
- methods:{
- // externals
- getCaption,
- getColumnIndexesHidden,
- getDateAtUtcZero,
- getDaysBetween,
- getStringFilled,
- getUnixFromDate,
- isUnixUtcZero,
- srcBase64,
-
- // actions
- clickDay(dayOffset,shift,middleClick) {
- if(!this.rowSelect) return;
-
- let d = new Date(this.date0.valueOf());
- d.setDate(d.getDate() + dayOffset);
-
- // dates are stored as UTC zero
- this.$emit('day-selected',this.getDateAtUtcZero(d),shift,middleClick);
- },
- clickRecord(recordId,middleClick) {
- if(this.rowSelect)
- this.$emit('record-selected',recordId,[],middleClick);
- },
- goToToday() {
- // switch to current month if not there (to show 'today')
- let now = new Date();
- if(now.getMonth() !== this.date.getMonth()
- || now.getFullYear() !== this.date.getFullYear()) {
-
- return this.$emit('set-date',now);
- }
-
- // if already on current month, select 'today'
- if(this.rowSelect)
- this.$emit('day-selected',this.getDateAtUtcZero(now),false,false);
- },
- icsCopyToClipboard() {
- navigator.clipboard.writeText(this.icsUrl);
- },
-
- // presentation
- dayOffsetWithinBounds(day) {
- // currently, calendar is always 42 days
- return day >= 0 && day <= 41;
- },
- getPartCaption(date0) {
- let d = new Date(date0 * 1000);
- let h = this.getStringFilled(d.getHours(),2,"0");
- let m = this.getStringFilled(d.getMinutes(),2,"0");
- return `${h}:${m}`;
- },
- getColor(styleName,color) {
- if(color !== null) return `${styleName}:#${color};`;
- return '';
- },
- getDayClasses(dayOffset,day) {
- let cls = {};
-
- if(this.rowSelect)
- cls.clickable = true;
-
- // today
- let now = new Date();
- cls.today = now.getMonth() === this.date.getMonth()
- && now.getFullYear() === this.date.getFullYear()
- && now.getDate() === dayOffset-this.daysBefore+1;
-
- // weekend day?
- if((this.settings.sundayFirstDow && (day === 1 || day === 7))
- || (!this.settings.sundayFirstDow && (day === 6 || day === 7))) {
-
- cls.weekend = true;
- }
-
- // day outside of current month?
- if(dayOffset < this.daysBefore || dayOffset >= (42-this.daysAfter))
- cls.outside = true;
-
- // day selected
- if(this.dateSelect0 !== null && this.dateSelect1 !== null) {
-
- let dDay = new Date(this.date0.valueOf());
- dDay.setDate(dDay.getDate() + dayOffset);
-
- // use calendar day at UTC zero
- dDay = this.getDateAtUtcZero(dDay);
-
- // date selections are UTC zero, can be compared directly
- // datetime selections are not UTC zero, must be converted (also to remove DST issues)
- let dSelIsFullDay = this.isUnixUtcZero(this.getUnixFromDate(this.dateSelect0))
- && this.isUnixUtcZero(this.getUnixFromDate(this.dateSelect1));
-
- let dSel0 = dSelIsFullDay ? this.dateSelect0 : this.getDateAtUtcZero(this.dateSelect0);
- let dSel1 = dSelIsFullDay ? this.dateSelect1 : this.getDateAtUtcZero(this.dateSelect1);
-
- if(dDay.valueOf() >= dSel0.valueOf() && dDay.valueOf() <= dSel1.valueOf())
- cls.selected = true;
- }
- return cls;
- },
- getFullDayTextStyles(dayInWeek,event) {
- // get maximum length of full day text
- // can span multiple days, if event has multiple days
- let days = event.fullDaysLeft;
-
- // week has 7 days, event can start on any of these days
- // can show text only until last day of week
- let maxDaysAvailable = 7 - dayInWeek + 1;
-
- if(maxDaysAvailable < days)
- days = maxDaysAvailable;
-
- // remove 10% for right padding
- return `max-width:${(days*100)-10}%;`;
- },
- getDayNumber(dayOffset) {
- let d = new Date(this.date0.valueOf());
- d.setDate(d.getDate()+(dayOffset));
- return d.getDate();
- },
- getWeekDayCaption(dayOffset) {
-
- if(!this.settings.sundayFirstDow) {
- dayOffset++;
-
- if(dayOffset === 7)
- dayOffset = 0;
- }
-
- if(this.isMobile || this.isInput)
- return this.capApp['weekDayShort'+dayOffset];
-
- return this.capApp['weekDay'+dayOffset];
- },
-
- // backend calls
- setIcsTokenFixed() {
- ws.send('login','setTokenFixed',{
- name:this.icsTokenName,
- context:'ics'
- },true).then(
- res => this.icsToken = res.payload.tokenFixed,
- this.$root.genericError
- );
- }
- }
-};
-
-let MyCalendar = {
- name:'my-calendar',
- components:{MyCalendarMonth},
- template:`{{ getWeekDayCaption(day-1) }}
+
+
-
-
-
-
-
-
-
-
- {{ getDayNumber(((week-1)*7)+day-1) }}- - -
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getPartCaption(e.date0) }}
-
-
-
-
-
- `,
props:{
attributeIdColor:{ required:true },
@@ -613,21 +375,28 @@ let MyCalendar = {
columns: { type:Array, required:true },
collections: { type:Array, required:true },
collectionIdMapIndexes:{ type:Object, required:false, default:() => {return {}} },
+ dataOptions: { type:Number, required:false, default:0 },
+ daysShowDef: { type:Number, required:true },
+ daysShowToggle: { type:Boolean, required:true },
+ favoriteId: { required:false, default:null },
fieldId: { type:String, required:false, default:'' },
filters: { type:Array, required:true },
formLoading: { type:Boolean, required:false, default:false },
- iconId: { required:false,default:null },
+ hasOpenForm: { type:Boolean, required:false, default:false },
+ iconId: { required:false, default:null },
ics: { type:Boolean, required:false, default:false },
indexColor: { required:true },
indexDate0: { type:Number, required:true },
indexDate1: { type:Number, required:true },
isHidden: { type:Boolean, required:false, default:false },
isSingleField: { type:Boolean, required:false, default:false },
+ loadWhileHidden: { type:Boolean, required:false, default:false },
+ moduleId: { type:String, required:true },
+ popUpFormInline: { required:true },
query: { type:Object, required:true },
- rowSelect: { type:Boolean, required:false, default:false },
usesPageHistory: { type:Boolean, required:true }
},
- emits:['open-form','record-count-change','record-selected','set-args','set-collection-indexes'],
+ emits:['close-inline','open-form','record-count-change','set-args','set-collection-indexes'],
data() {
return {
// calendar state
@@ -635,14 +404,27 @@ let MyCalendar = {
date:null, // date base that the calendar moves around (by default now(), at 00:00:00)
dateSelect0:null, // for date range selection, start date
dateSelect1:null, // for date range selection, end date
+ daysShow:42,
ready:false,
- view:'month',
+ showIcs:false,
+ zoom:5,
+ zoomDefault:5,
+
+ // ICS access
+ icsToken:'',
+ icsTokenName:'',
// calendar data
rows:[]
};
},
computed:{
+ // inputs
+ choiceIdInput:{
+ get() { return this.choiceId; },
+ set(v) { this.choiceIdSet(v); }
+ },
+
// special date range expressions + regular column expressions
expressions:(s) => s.getQueryExpressionsDateRange(
s.attributeIdDate0,s.indexDate0,
@@ -650,35 +432,53 @@ let MyCalendar = {
s.attributeIdColor,s.indexColor
).concat(s.getQueryExpressions(s.columns)),
- // default is user field option, fallback is first choice in list
- choiceIdDefault:(s) => s.fieldOptionGet(s.fieldId,'choiceId',s.choices.length === 0 ? null : s.choices[0].id),
-
// simple
choiceFilters:(s) => s.getChoiceFilters(s.choices,s.choiceId),
- hasCreate: (s) => s.query.joins.length === 0 ? false : s.query.joins[0].applyCreate && s.rowSelect,
+ hasChoices: (s) => s.choices.length > 1,
+ hasCreate: (s) => s.checkDataOptions(4,s.dataOptions) && s.query.joins.length !== 0 && s.query.joins[0].applyCreate && s.hasOpenForm,
+ hasUpdate: (s) => s.checkDataOptions(2,s.dataOptions) && s.query.joins.length !== 0 && s.query.joins[0].applyUpdate && s.hasOpenForm,
+ isDays: (s) => s.daysShow === 1 || s.daysShow === 3,
+ isMonth: (s) => s.daysShow === 42,
+ isWeek: (s) => s.daysShow === 5 || s.daysShow === 7,
+ icsUrl: (s) => `${location.protocol}//${location.host}/ics/download/cal.ics`
+ + `?field_id=${s.fieldId}&login_id=${s.loginId}&token_fixed=${s.icsToken}`,
// start/end date of calendar
- date0:(s) => s.getCalendarCutOff0(s.view,new Date(s.date.valueOf())),
- date1:(s) => s.getCalendarCutOff1(s.view,new Date(s.date.valueOf()),s.date0),
+ date0:(s) => s.getCalendarCutOff0(s.daysShow,new Date(s.date.valueOf())),
+ date1:(s) => s.getCalendarCutOff1(s.daysShow,new Date(s.date.valueOf()),s.date0),
// stores
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
+ iconIdMap: (s) => s.$store.getters['schema/iconIdMap'],
capApp: (s) => s.$store.getters.captions.calendar,
+ capGen: (s) => s.$store.getters.captions.generic,
+ isMobile: (s) => s.$store.getters.isMobile,
+ loginId: (s) => s.$store.getters.loginId,
settings: (s) => s.$store.getters.settings
},
+ beforeCreate() {
+ // import at runtime due to circular dependencies
+ this.$options.components.MyForm = MyForm;
+ },
mounted() {
- this.date = new Date();
- this.date.setHours(0,0,0);
-
// setup watchers
+ this.$watch('columns',(valOld,valNew) => {
+ if(JSON.stringify(valOld) !== JSON.stringify(valNew)) {
+ this.rows = [];
+ this.reloadOutside();
+ }
+ });
+ this.$watch('favoriteId',(val) => {
+ this.reloadOptions();
+ });
this.$watch('formLoading',(val) => {
if(!val) this.reloadOutside();
});
this.$watch('isHidden',(val) => {
if(!val) this.reloadOutside();
});
- this.$watch(() => [this.choices,this.columns,this.filters],(newVals, oldVals) => {
+ this.$watch(() => [this.choices,this.filters],(newVals, oldVals) => {
for(let i = 0, j = newVals.length; i < j; i++) {
if(JSON.stringify(newVals[i]) !== JSON.stringify(oldVals[i]))
return this.reloadOutside();
@@ -692,38 +492,35 @@ let MyCalendar = {
}
});
}
-
- if(this.usesPageHistory) {
- // set initial states via route parameters
- this.paramsUpdated(); // load existing parameters from route query
- this.paramsUpdate(false); // overwrite parameters (in case defaults are set)
- } else {
- this.choiceId = this.choiceIdDefault;
- }
-
+ this.reloadOptions();
this.ready = true;
},
methods:{
// externals
+ checkDataOptions,
fieldOptionGet,
fieldOptionSet,
getCalendarCutOff0,
getCalendarCutOff1,
+ getCaption,
getChoiceFilters,
- getDaysBetween,
+ getDateAtUtcZero,
+ getDateFromWeek,
getQueryExpressions,
getQueryExpressionsDateRange,
getQueryFiltersDateRange,
getRelationsJoined,
getUnixFromDate,
+ getWeek,
routeChangeFieldReload,
routeParseParams,
+ srcBase64,
// actions
choiceIdSet(choiceId) {
if(choiceId === this.choiceId) return;
- this.fieldOptionSet(this.fieldId,'choiceId',choiceId);
+ this.fieldOptionSet(this.favoriteId,this.fieldId,'choiceId',choiceId);
this.choiceId = choiceId;
this.reloadInside();
},
@@ -734,28 +531,62 @@ let MyCalendar = {
this.reloadInside();
}
},
- daySelected(d,shift,middleClick) {
- if(!shift) {
- this.dateSelect0 = d;
- this.dateSelect1 = d;
- }
- else {
- if(this.dateSelect0 === null)
- return this.dateSelect0 = d;
+ dateSelected(unix0,unix1,middleClick) {
+ let attributes = [
+ `${this.attributeIdDate0}_${unix0}`,
+ `${this.attributeIdDate1}_${unix1}`
+ ];
+ this.$emit('open-form',[],[`attributes=${attributes.join(',')}`],middleClick);
+ },
+ daysShowSet(v) {
+ this.daysShow = v;
+ this.fieldOptionSet(this.favoriteId,this.fieldId,'daysShow',v);
+ this.reloadInside();
+ },
+ goToToday() {
+ let now = new Date();
+ if(!this.isMonth) {
+ if(now < this.date0 || now > this.date1)
+ return this.dateSet(now);
- this.dateSelect1 = d;
+ } else {
+ if(now.getMonth() !== this.date.getMonth()
+ || now.getFullYear() !== this.date.getFullYear()) {
+
+ return this.dateSet(now);
+ }
}
- let attributes = [
- `${this.attributeIdDate0}_${this.getUnixFromDate(this.dateSelect0)}`,
- `${this.attributeIdDate1}_${this.getUnixFromDate(this.dateSelect1)}`
- ];
- this.$emit('open-form',0,[`attributes=${attributes.join(',')}`],middleClick);
- this.dateSelect0 = null;
- this.dateSelect1 = null;
+ // if today is already visible, open 'today'
+ if(this.hasCreate) {
+ const u = this.getUnixFromDate(this.getDateAtUtcZero(now));
+ this.dateSelected(u,u,false);
+ }
+ },
+ icsCopyToClipboard() {
+ navigator.clipboard.writeText(this.icsUrl);
},
// reloads
+ reloadOptions() {
+ this.date = new Date();
+ this.date.setHours(0,0,0);
+ this.daysShow = this.daysShowDef;
+
+ // apply field options (before paramsUpdated to apply calendar view)
+ if(this.daysShowToggle)
+ this.daysShow = parseInt(this.fieldOptionGet(this.favoriteId,this.fieldId,'daysShow',this.daysShowDef));
+
+
+ this.choiceId = this.fieldOptionGet(this.favoriteId,this.fieldId,'choiceId',this.choices.length === 0 ? null : this.choices[0].id);
+ this.zoom = parseInt(this.fieldOptionGet(this.favoriteId,this.fieldId,'zoom',this.zoomDefault));
+
+ if(this.usesPageHistory) {
+ // set initial states via route parameters
+ this.paramsUpdated(); // load existing parameters from route query
+ this.paramsUpdate(false); // overwrite parameters (in case defaults are set)
+ }
+ },
reloadOutside() {
this.get();
},
@@ -771,10 +602,14 @@ let MyCalendar = {
// page routing
paramsUpdate(pushHistory) {
let args = [
- `month=${this.date.getMonth()}`,
+ `daysShow=${this.daysShow}`,
`year=${this.date.getFullYear()}`
];
+ if(this.isMonth || this.isDays) args.push(`month=${this.date.getMonth()}`);
+ if(this.isWeek) args.push(`week=${this.getWeek(this.date)}`);
+ if(this.isDays) args.push(`day=${this.date.getDate()}`);
+
if(this.choiceId !== null)
args.push(`choice=${this.choiceId}`);
@@ -782,29 +617,31 @@ let MyCalendar = {
},
paramsUpdated() {
let params = {
- choice:{ parse:'string', value:this.choiceIdDefault },
- month: { parse:'int', value:this.date.getMonth() },
- year: { parse:'int', value:this.date.getFullYear() }
+ choice: { parse:'string', value:this.choiceId },
+ daysShow:{ parse:'int', value:this.daysShow },
+ day: { parse:'int', value:this.date.getDate() },
+ month: { parse:'int', value:this.date.getMonth() },
+ week: { parse:'int', value:this.getWeek(this.date) },
+ year: { parse:'int', value:this.date.getFullYear() }
};
-
this.routeParseParams(params);
- if(this.choiceId !== params['choice'].value)
- this.choiceId = params['choice'].value;
+ if(this.choiceId !== params.choice.value) this.choiceId = params.choice.value;
+ if(this.daysShow !== params.daysShow.value) this.daysShow = params.daysShow.value;
- if(this.date.getMonth() !== params['month'].value
- || this.date.getFullYear() !== params['year'].value) {
-
- let d = new Date(this.date.getTime());
- d.setMonth(params['month'].value);
- d.setFullYear(params['year'].value);
- this.date = d;
- }
+ let d = new Date(this.date.getTime());
+ d.setFullYear(params.year.value);
+
+ if(this.isDays || this.isMonth) d.setMonth(params.month.value);
+ if(this.isDays) d.setDate(params.day.value);
+ if(this.isWeek) d = this.getDateFromWeek(params.week.value,d.getFullYear());
+
+ this.date = d;
},
// backend calls
get() {
- if(this.query.relationId === null || this.isHidden)
+ if(this.query.relationId === null || (this.isHidden && !this.loadWhileHidden))
return;
let dateStart = this.getUnixFromDate(this.date0);
@@ -850,6 +687,15 @@ let MyCalendar = {
},
this.$root.genericError
);
+ },
+ setIcsTokenFixed() {
+ ws.send('login','setTokenFixed',{
+ name:this.icsTokenName,
+ context:'ics'
+ },true).then(
+ res => this.icsToken = res.payload.tokenFixed,
+ this.$root.genericError
+ );
}
}
};
\ No newline at end of file
diff --git a/www/comps/calendarDays.js b/www/comps/calendarDays.js
new file mode 100644
index 00000000..acc85450
--- /dev/null
+++ b/www/comps/calendarDays.js
@@ -0,0 +1,465 @@
+import MyValueRich from './valueRich.js';
+import {getColumnBatches} from './shared/column.js';
+import {
+ colorAdjustBg,
+ colorMakeContrastFont,
+ getStringFilled
+} from './shared/generic.js';
+import {
+ getDateFormatNoYear,
+ getDaysBetween,
+ isUnixUtcZero
+} from './shared/time.js';
+export {MyCalendarDays as default};
+
+let MyCalendarDaysEvent = {
+ name:'my-calendar-days-event',
+ components:{ MyValueRich },
+ template:`
+ `,
+ props:{
+ columns: { type:Array, required:true },
+ columnBatches:{ type:Array, required:true },
+ hasUpdate: { type:Boolean, required:true },
+ row: { type:Object, required:true },
+ style: { type:String, required:true },
+ styleCard: { type:String, required:true },
+ values: { type:Array, required:true }
+ },
+ emits:['click','click-middle','clipboard']
+};
+
+let MyCalendarDays = {
+ name:'my-calendar-days',
+ components:{ MyCalendarDaysEvent },
+ template:`
+
+
+
+
+ `,
+ props:{
+ columns: { type:Array, required:false, default:() => [] },
+ date: { type:Date, required:true }, // selected date to work around
+ date0: { type:Date, required:true }, // start date of calendar
+ date1: { type:Date, required:true }, // end date of calendar
+ dateSelect0:{ required:false, default:null },
+ dateSelect1:{ required:false, default:null },
+ daysShow: { type:Number, required:true },
+ isInput: { type:Boolean, required:false, default:false },
+ isRange: { type:Boolean, required:false, default:false },
+ hasColor: { type:Boolean, required:false, default:false }, // color attribute exists
+ hasCreate: { type:Boolean, required:false, default:false },
+ hasUpdate: { type:Boolean, required:false, default:false },
+ rows: { type:Array, required:false, default:() => [] },
+ zoom: { type:Number, required:false, default:5 }
+ },
+ emits:['clipboard','date-selected','open-form'],
+ data() {
+ return {
+ refHourLabel:'hourLabel',
+ unixInput0:null, // dates being hovered over for event input, start
+ unixInput1:null, // dates being hovered over for event input, end
+ unixInputActive:false, // activated on first mousedown over an empty date input
+ unixInputDay:false
+ };
+ },
+ computed:{
+ events:(s) => {
+ const unix0Cal = Math.floor(s.date0.getTime() / 1000); // unix start of calendar
+ const unix0CalDay = Math.floor(s.date0.getTime() / 1000) - s.date0.getTimezoneOffset()*60;
+ const dayLabel = s.isMobile || s.isInput ? 'weekDayShort' : 'weekDay';
+ const dayLabelBr = s.isMobile || s.isInput ? '
+
+
+
+ {{ capApp.fullDay }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getStringFilled(i-1,2,'0')+':00' }}
+
+
+
+
+
+
+
+
+ ' : ' '; + let events = { + fullDays:[], // 1 day per column in calendar + fullDaysEvents:[], // full day events + fullDaysLanes:[], // full day event lanes (event indexes per lane, to calculate overlaps) + fullDaysHeight:'', // total height of all full day events + partDays:[] // partial day events (each day has their own event blocks/lanes to manage) + }; + + for(let i = 0; i < s.daysShow; i++) { + let d = new Date(s.date0.getTime()); + d.setDate(d.getDate() + i); + + events.fullDays.push({ + caption:`${s.capApp[dayLabel+d.getDay()]},${dayLabelBr + s.getDateFormatNoYear(d,s.settings.dateFormat)}`, + eventIndexes:[], + unix:unix0CalDay + (i * 86400), + weekend:[0,6].includes(d.getDay()) + }); + + let hours = []; + for(let x = 0; x < 24; x++) { + hours.push(unix0Cal + (i * 86400) + (x * 3600)); + } + + events.partDays.push({ + blocks:[], // blocks of event lanes, used to separate events with overlapping times + events:[], + hours:hours, + weekend:[0,6].includes(d.getDay()) + }); + } + + // each row is one event (partial day, full day or spanning multiple days) + for(const row of s.rows) { + let ev = { + row:row, + style:'', + styleCard:'', + unix0:row.values[0], + unix1:row.values[1], + values:[] + }; + + if(s.hasColor && row.values[2] !== null) { + const bg = s.colorAdjustBg(row.values[2]); + const font = s.colorMakeContrastFont(bg); + ev.styleCard = `background-color:${bg};color:${font};`; + } + + // add non-hidden values + const values = s.hasColor ? row.values.slice(3) : row.values.slice(2); + for(let x = 0, y = values.length; x < y; x++) { + ev.values.push(values[x]); + } + + // check for full day event (stored as UTC zero) + const isFullDay = s.isUnixUtcZero(ev.unix0) && s.isUnixUtcZero(ev.unix1); + + if(isFullDay) { + let unix0EvCal = ev.unix0 < unix0CalDay ? unix0CalDay : ev.unix0; // start of event within calendar + let eventDays = ((ev.unix1 - unix0EvCal) / 86400) + 1; // event day count from start of calendar + let dayIndex = Math.floor((unix0EvCal - unix0CalDay) / 86400); // day in which event starts + + // cut off event length, if it goes over calendar + if(dayIndex + eventDays > s.daysShow) + eventDays = s.daysShow - dayIndex; + + if(dayIndex < 0 || dayIndex >= events.fullDays.length) + continue; + + const eventIndexNew = events.fullDaysEvents.length; + events.fullDays[dayIndex].eventIndexes.push(eventIndexNew); + events.fullDaysEvents.push(ev); + + const laneIndex = s.addToFreeLane( + events.fullDaysLanes,events.fullDaysEvents,ev,eventIndexNew,true); + + ev.style = + `width:${100 * eventDays}%;`+ + `height:${s.heightHourPxFull}px;`+ + `top:${s.heightHourPxFull * laneIndex}px;` + + continue; + } + + // partial day event - like Monday 19:00 to Tuesday 03:00 + const processEvent = function(evPart) { + const d0 = new Date(evPart.unix0 * 1000); + const d1 = new Date(evPart.unix1 * 1000); + + const hoursStart = d0.getHours() + (d0.getMinutes() / 60); + const hoursLength = (d1.getTime() - d0.getTime()) / 1000 / 3600; + const intoNextDay = hoursStart + hoursLength > 24; + + const hoursLengthThisDay = !intoNextDay + ? hoursLength : hoursLength - (hoursStart + hoursLength - 24); + + evPart.style = + `height:${hoursLengthThisDay * s.heightHourPx}px;`+ + `top:${hoursStart * s.heightHourPx}px;`; + + // add event if it starts within calendar + const dayIndex = s.getDaysBetween(s.date0,d0); + if(dayIndex >= 0 && dayIndex < events.partDays.length) { + // add event + const day = events.partDays[dayIndex]; + const eventIndexNew = day.events.length; + day.events.push(evPart); + + // check if a block with overlapping time already exists + let blockFound = false; + for(let block of day.blocks) { + if(evPart.unix0 >= block.unix1 || block.unix0 >= evPart.unix1) + continue; + + // add event to next free lane + s.addToFreeLane(block.lanes,day.events,evPart,eventIndexNew,false); + + // if events did fit in block, extend block time range + if(block.unix0 > evPart.unix0) block.unix0 = evPart.unix0; + if(block.unix1 < evPart.unix1) block.unix1 = evPart.unix1; + blockFound = true; + break; + } + + if(!blockFound) { + // no block found, create new one and add event to first lane + day.blocks.push({ + lanes:[[eventIndexNew]], + unix0:evPart.unix0, + unix1:evPart.unix1 + }); + } + } + + // if event goes into next day, duplicate event entry for next day + if(intoNextDay) { + let evPartCopy = JSON.parse(JSON.stringify(evPart)); + evPartCopy.unix0 += hoursLengthThisDay * 3600; // set to 00:00 + processEvent(evPartCopy); + } + }; + processEvent(ev); + } + + // calculate total full day event height (add 1 lane for date input) + events.fullDaysHeight = s.isInput ? '0px' : `height:${(events.fullDaysLanes.length + 1) * s.heightHourPxFull}px;`; + + // calculate part day event widths and positions + for(let day of events.partDays) { + for(let block of day.blocks) { + const laneCount = block.lanes.length; + + for(let laneIndex = 0; laneIndex < laneCount; laneIndex++) { + for(let eventIndex of block.lanes[laneIndex]) { + + // check if adjacent lanes have free space for current event to take + const ev = day.events[eventIndex]; + let lanesAvailable = 1; + for(let laneIndexNext = laneIndex + 1; laneIndexNext < laneCount; laneIndexNext++) { + let eventsOverlap = false; + for(let i of block.lanes[laneIndexNext]) { + if(ev.unix0 < day.events[i].unix1 && day.events[i].unix0 < ev.unix1) { + eventsOverlap = true; + break; + } + } + + // no need to check further lanes if current one already overlaps + if(eventsOverlap) + break; + + lanesAvailable++; + } + // leave some percent free for mouse-hover inputs + const percLane = 94 / laneCount; + const percWidth = percLane * lanesAvailable; + const percLeft = percLane * laneIndex; + + day.events[eventIndex].style += `width:${ percWidth }%;left:${ percLeft }%;`; + } + } + } + } + return events; + }, + + // simple + columnBatches: (s) => s.getColumnBatches(null,s.columns,[],[],[],false), + heightHourPx: (s) => (s.isInput ? 3 : 11) * s.zoom, + heightHourPxFull:(s) => 9 * s.zoom, + heightHourStyle: (s) => `height:${s.heightHourPx}px;`, + unixSelect0: (s) => s.dateSelect0 !== null ? Math.floor(s.dateSelect0.getTime() / 1000) : 0, + unixSelect1: (s) => s.dateSelect1 !== null ? Math.floor(s.dateSelect1.getTime() / 1000) : 0, + + // stores + attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'], + capApp: (s) => s.$store.getters.captions.calendar, + capGen: (s) => s.$store.getters.captions.generic, + isMobile: (s) => s.$store.getters.isMobile, + settings: (s) => s.$store.getters.settings + }, + mounted() { + if(!this.isInput) { + // scroll to 07:00 + const el = this.$refs[this.refHourLabel + 8]; + + if(typeof el !== 'undefined') + el[0].scrollIntoView(); + } + }, + methods:{ + // externals + colorAdjustBg, + colorMakeContrastFont, + getColumnBatches, + getDateFormatNoYear, + getDaysBetween, + getStringFilled, + isUnixUtcZero, + + // actions + dateClick(unix,mousedown,isDay) { + if(!this.hasCreate && !this.isInput) return; + + this.unixInputActive = mousedown; + if(mousedown) { + this.unixInput0 = unix; + this.unixInput1 = unix; + this.unixInputDay = isDay; + return; + } + + if(this.unixInput0 !== null && this.unixInput1 !== null) + this.$emit('date-selected',this.unixInput0,this.unixInput1+(isDay ? 0 : 3600),false); + + this.unixInput0 = null; + this.unixInput1 = null; + }, + dateHover(unix) { + if(!this.isRange || !this.unixInputActive) return; + + if(unix < this.unixInput0) this.unixInput0 = unix; + else this.unixInput1 = unix; + }, + eventClick(row,middleClick) { + if(this.hasUpdate) + this.$emit('open-form',[row],[],middleClick); + }, + + // presentation + dateInputActive(unix,dayInput) { + return ( // hour is selected as new input + this.unixInputActive && dayInput === this.unixInputDay && + unix >= this.unixInput0 && unix <= this.unixInput1 + ) || ( // hour is part of date range selection + !this.unixInputActive && + unix >= this.unixSelect0 && unix < this.unixSelect1 + ) || ( // hour represents single date selection + this.isInput && !this.isRange && + unix === this.unixSelect0 + ); + }, + + // processing + addToFreeLane(lanes,events,event,eventIndexNew,touchMatch) { + let laneIndex = 0; + + // if lanes are empty, add first one + if(lanes.length === 0) + lanes.push([]); + + while(true) { + let eventsOverlap = false; + + // check whether event can fit in current lane (no overlaps) + for(let eventIndex of lanes[laneIndex]) { + const ev = events[eventIndex]; + if( + (!touchMatch && event.unix0 < ev.unix1 && ev.unix0 < event.unix1) || + (touchMatch && event.unix0 <= ev.unix1 && ev.unix0 <= event.unix1) + ) { + eventsOverlap = true; + break; + } + } + + if(eventsOverlap) { + laneIndex++; + + if(lanes.length <= laneIndex) + lanes.push([]); + } else { + lanes[laneIndex].push(eventIndexNew); + break; + } + } + return laneIndex; + } + } +}; \ No newline at end of file diff --git a/www/comps/calendarMonth.js b/www/comps/calendarMonth.js new file mode 100644 index 00000000..6fb28b60 --- /dev/null +++ b/www/comps/calendarMonth.js @@ -0,0 +1,405 @@ +import MyValueRich from './valueRich.js'; +import { + colorAdjustBg, + colorMakeContrastFont, + getStringFilled +} from './shared/generic.js'; +import { + getDateAtUtcZero, + getDaysBetween, + getUnixFromDate, + isUnixUtcZero +} from './shared/time.js'; +export {MyCalendarMonth as default}; + +let MyCalendarMonth = { + name:'my-calendar-month', + components:{MyValueRich}, + template:`
+
+
+ `,
+ props:{
+ columns: { type:Array, required:false, default:() => [] },
+ date: { type:Date, required:true }, // selected date to work around
+ date0: { type:Date, required:true }, // start date of calendar
+ date1: { type:Date, required:true }, // end date of calendar
+ dateSelect0:{ required:false, default:null },
+ dateSelect1:{ required:false, default:null },
+ isInput: { type:Boolean, required:false, default:false },
+ isRange: { type:Boolean, required:false, default:false },
+ hasColor: { type:Boolean, required:false, default:false }, // color attribute exists
+ hasCreate: { type:Boolean, required:false, default:false },
+ hasUpdate: { type:Boolean, required:false, default:false },
+ rows: { type:Array, required:false, default:() => [] }
+ },
+ emits:['date-selected','open-form'],
+ data() {
+ return {
+ unixInputActive:false,
+ unixInput0:null,
+ unixInput1:null
+ };
+ },
+ computed:{
+ // event values arrive sorted by start date
+ // they are processed for display on each day of the calendar
+ eventsByDay:(s) => {
+ let days = [];
+ for(let i = 0; i < 42; i++) {
+ days.push({
+ events:[],
+ unix:s.getUnixFromDate(s.getDateAtUtcZero(s.date0)) + (i * 86400)
+ });
+ }
+
+ const getFullDayPosInDay = function(events) {
+ let cnt = 0;
+ for(let e of events) {
+ if(e.fullDay) cnt++;
+ }
+ return cnt;
+ };
+
+ // each row is one event (partial day, full day or spanning multiple days)
+ for(let i = 0, j = s.rows.length; i < j; i++) {
+
+ const colorThere = s.hasColor && s.rows[i].values[2] !== null;
+ const colorBg = colorThere ? s.colorAdjustBg(s.rows[i].values[2]) : null;
+ const colorFont = colorThere ? s.colorMakeContrastFont(colorBg) : null;
+
+ let ev = {
+ entryFirst:true,
+ entryLast:false,
+ fullDay:false,
+ fullDaysLeft:0,
+ placeholder:false,
+ row:s.rows[i],
+ style:colorBg === null ? '' : `background-color:${colorBg};color:${colorFont};`,
+ unix0:s.rows[i].values[0],
+ unix1:s.rows[i].values[1],
+ values:[]
+ };
+
+ // add non-hidden values
+ let values = s.hasColor ? s.rows[i].values.slice(3) : s.rows[i].values.slice(2);
+ for(let x = 0, y = values.length; x < y; x++) {
+ ev.values.push(values[x]);
+ }
+
+ // check for full day event (stored as UTC zero)
+ // add timezone offset to display correctly on calendar
+ // because DST can be different for each date, we must use their individual offsets
+ if(s.isUnixUtcZero(ev.unix0) && s.isUnixUtcZero(ev.unix1)) {
+ ev.unix0 += new Date(ev.unix0 * 1000).getTimezoneOffset() * 60;
+ ev.unix1 += new Date(ev.unix1 * 1000).getTimezoneOffset() * 60;
+ ev.fullDay = true;
+ ev.fullDaysLeft = ((ev.unix1 - ev.unix0) / 86400)+1;
+ }
+
+ // calculate position from start of calendar
+ let dEvent = new Date(ev.unix0 * 1000);
+ dEvent.setHours(0,0,0); // use midnight
+
+ let daysFromStart = s.getDaysBetween(s.date0,dEvent);
+
+ // show first event only if within calendar bounds
+ // store position in case we have a multi day event
+ let eventPosition;
+
+ if(s.dayOffsetWithinBounds(daysFromStart)) {
+ eventPosition = getFullDayPosInDay(days[daysFromStart].events);
+ days[daysFromStart].events.push(ev);
+ }
+ else {
+ // if event started outside of calendar bounds, use position from first day
+ eventPosition = getFullDayPosInDay(days[0].events);
+ }
+
+ // event is less than 1 day, is only shown once
+ if(!ev.fullDay)
+ continue;
+
+ // place following days
+ let fullDaysLeft = ev.fullDaysLeft;
+ while(true) {
+
+ // check if event reaches into next day
+ dEvent.setDate(dEvent.getDate()+1);
+ if(dEvent.getTime() / 1000 > ev.unix1)
+ break;
+
+ // get to next day
+ daysFromStart++;
+ fullDaysLeft--;
+
+ // event is outside of bounds, skip
+ if(!s.dayOffsetWithinBounds(daysFromStart))
+ continue;
+
+ // reset event position if it reaches into next week
+ if(daysFromStart !== 0 && daysFromStart % 7 === 0)
+ eventPosition = getFullDayPosInDay(days[daysFromStart].events);
+
+ // add placeholder events to fill empty line space
+ while(days[daysFromStart].events.length < eventPosition) {
+ days[daysFromStart].events.push({
+ fullDay:true,
+ placeholder:true
+ });
+ }
+
+ let evNext = JSON.parse(JSON.stringify(ev));
+ evNext.entryFirst = false;
+ evNext.fullDaysLeft = fullDaysLeft;
+ days[daysFromStart].events.push(evNext);
+ }
+
+ // retroactively mark last day
+ if(s.dayOffsetWithinBounds(daysFromStart))
+ days[daysFromStart].events[days[daysFromStart].events.length-1].entryLast = true;
+ }
+ return days;
+ },
+
+ // helpers
+ daysBefore:(s) => {
+ let d = new Date(s.date.valueOf());
+ d.setDate(1);
+ return s.getDaysBetween(s.date0,d);
+ },
+
+ // simple
+ daysAfter: (s) => s.date1.getDate(),
+ daysSelectable:(s) => s.hasCreate || s.isInput,
+ month: (s) => s.date.getMonth(), // active month (0-11)
+
+ // stores
+ attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
+ capApp: (s) => s.$store.getters.captions.calendar,
+ capGen: (s) => s.$store.getters.captions.generic,
+ isMobile: (s) => s.$store.getters.isMobile,
+ settings: (s) => s.$store.getters.settings
+ },
+ methods:{
+ // externals
+ colorAdjustBg,
+ colorMakeContrastFont,
+ getDateAtUtcZero,
+ getDaysBetween,
+ getStringFilled,
+ getUnixFromDate,
+ isUnixUtcZero,
+
+ // actions
+ clickDay(unix,mousedown) {
+ if(!this.daysSelectable) return;
+
+ this.unixInputActive = mousedown;
+ if(mousedown) {
+ this.unixInput0 = unix;
+ this.unixInput1 = unix;
+ return;
+ }
+
+ if(this.unixInput0 !== null && this.unixInput1 !== null)
+ this.$emit('date-selected',this.unixInput0,this.unixInput1,false);
+
+ this.unixInput0 = null;
+ this.unixInput1 = null;
+ },
+ clickRecord(event,middleClick) {
+ if(event.placeholder) return;
+
+ if(this.hasUpdate)
+ this.$emit('open-form',[event.row],[],middleClick);
+ },
+ hoverDay(unix) {
+ if(!this.isRange || !this.unixInputActive) return;
+
+ if(unix < this.unixInput0) this.unixInput0 = unix;
+ else this.unixInput1 = unix;
+ },
+ stopBubbleIfRecord(event,isRecord) {
+ if(isRecord) event.stopPropagation();
+ },
+
+ // presentation
+ dayOffsetWithinBounds(day) {
+ // currently, calendar is always 42 days
+ return day >= 0 && day <= 41;
+ },
+ getPartCaption(unix0) {
+ let d = new Date(unix0 * 1000);
+ let h = this.getStringFilled(d.getHours(),2,"0");
+ let m = this.getStringFilled(d.getMinutes(),2,"0");
+ return `${h}:${m}`;
+ },
+ getDayClasses(dayOffset,day) {
+ let cls = {};
+
+ if(this.daysSelectable)
+ cls.clickable = true;
+
+ // today
+ let now = new Date();
+ cls.today = now.getMonth() === this.date.getMonth()
+ && now.getFullYear() === this.date.getFullYear()
+ && now.getDate() === dayOffset-this.daysBefore+1;
+
+ // weekend day?
+ if((this.settings.sundayFirstDow && (day === 1 || day === 7))
+ || (!this.settings.sundayFirstDow && (day === 6 || day === 7))) {
+
+ cls.weekend = true;
+ }
+
+ // day outside of current month?
+ if(dayOffset < this.daysBefore || dayOffset >= (42-this.daysAfter+1))
+ cls.outside = true;
+
+ // day used as active input
+ if(this.unixInput0 !== null && this.unixInput1 !== null) {
+ let dDay = new Date(this.date0.valueOf());
+ dDay.setDate(dDay.getDate() + dayOffset);
+ dDay = this.getDateAtUtcZero(dDay);
+
+ let unix = this.getUnixFromDate(dDay);
+ if(unix >= this.unixInput0 && unix <= this.unixInput1)
+ cls.selected = true;
+ }
+
+ // day selected
+ if(!this.unixInputActive && this.dateSelect0 !== null && this.dateSelect1 !== null) {
+ let dDay = new Date(this.date0.valueOf());
+ dDay.setDate(dDay.getDate() + dayOffset);
+
+ // use calendar day at UTC zero
+ dDay = this.getDateAtUtcZero(dDay);
+
+ // date selections are UTC zero, can be compared directly
+ // datetime selections are not UTC zero, must be converted (also to remove DST issues)
+ let dSelIsFullDay = this.isUnixUtcZero(this.getUnixFromDate(this.dateSelect0))
+ && this.isUnixUtcZero(this.getUnixFromDate(this.dateSelect1));
+
+ let dSel0 = dSelIsFullDay ? this.dateSelect0 : this.getDateAtUtcZero(this.dateSelect0);
+ let dSel1 = dSelIsFullDay ? this.dateSelect1 : this.getDateAtUtcZero(this.dateSelect1);
+
+ if(dDay.valueOf() >= dSel0.valueOf() && dDay.valueOf() <= dSel1.valueOf())
+ cls.selected = true;
+ }
+ return cls;
+ },
+ getFullDayTextStyles(dayInWeek,event) {
+ // get maximum length of full day text
+ // can span multiple days, if event has multiple days
+ let days = event.fullDaysLeft;
+
+ // week has 7 days, event can start on any of these days
+ // can show text only until last day of week
+ let maxDaysAvailable = 7 - dayInWeek + 1;
+
+ if(maxDaysAvailable < days)
+ days = maxDaysAvailable;
+
+ // remove 10% for right padding
+ return `max-width:${(days*100)-10}%;`;
+ },
+ getDayNumber(dayOffset) {
+ let d = new Date(this.date0.valueOf());
+ d.setDate(d.getDate()+(dayOffset));
+ return d.getDate();
+ },
+ getWeekDayCaption(dayOffset) {
+ if(!this.settings.sundayFirstDow) {
+ dayOffset++;
+
+ if(dayOffset === 7)
+ dayOffset = 0;
+ }
+
+ if(this.isMobile || this.isInput)
+ return this.capApp['weekDayShort'+dayOffset];
+
+ return this.capApp['weekDay'+dayOffset];
+ }
+ }
+};
\ No newline at end of file
diff --git a/www/comps/captionMap.css b/www/comps/captionMap.css
new file mode 100644
index 00000000..a1ff8b95
--- /dev/null
+++ b/www/comps/captionMap.css
@@ -0,0 +1,23 @@
+.captionMap{
+ display:flex;
+ flex-flow:column nowrap;
+ gap:6px;
+}
+
+.captionMap-richtext{
+ width:100%;
+ max-width:1400px;
+ height:90vh;
+ display:flex;
+ flex-flow:column nowrap;
+ border:1px solid var(--color-border);
+ border-radius:8px;
+ overflow:hidden;
+}
+.captionMap-richtext-content{
+ display:flex;
+ background-color:var(--color-bg);
+}
+.captionMap-new-language{
+ max-width:400px;
+}
\ No newline at end of file
diff --git a/www/comps/captionMap.js b/www/comps/captionMap.js
new file mode 100644
index 00000000..00bd3d6c
--- /dev/null
+++ b/www/comps/captionMap.js
@@ -0,0 +1,1085 @@
+import {getColumnTitle} from './shared/column.js';
+import {getFieldTitle} from './shared/field.js';
+import {getFieldMap} from './shared/form.js';
+import {objectDeepMerge} from './shared/generic.js';
+import srcBase64Icon from './shared/image.js';
+import {getCaptionMapName} from './shared/language.js';
+import {MyModuleSelect} from './input.js';
+import MyBuilderCaption from './builder/builderCaption.js';
+export {MyCaptionMap as default};
+
+let MyCaptionMapTransfer = {
+ name:'my-caption-map-transfer',
+ template:`
+
+
+
+ {{ getWeekDayCaption(day-1) }}
+
+
+
+
+
+
+ {{ getDayNumber(((week-1)*7)+day-1) }}+ + +
+
+
+
+
+
+
+
+
+ {{ getPartCaption(e.unix0) }}
+
+
+
+
+ `,
+ emits:['close','update'],
+ props:{
+ captionMap:{ type:Object, required:true },
+ isCustom: { type:Boolean, required:true },
+ isExport: { type:Boolean, required:true },
+ languages: { type:Array, required:true },
+ moduleId: { type:String, required:true }
+ },
+ data() {
+ return {
+ importData:null,
+ language:''
+ };
+ },
+ computed:{
+ // stores
+ moduleIdMap:(s) => s.$store.getters['schema/moduleIdMap'],
+ capApp: (s) => s.$store.getters.captions.captionMap,
+ capGen: (s) => s.$store.getters.captions.generic
+ },
+ mounted() {
+ this.$store.commit('keyDownHandlerSleep');
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.close,key:'Escape',keyCtrl:false});
+ },
+ unmounted() {
+ this.$store.commit('keyDownHandlerDel',this.close);
+ this.$store.commit('keyDownHandlerWake');
+ },
+ methods:{
+ // external
+ objectDeepMerge,
+
+ // actions
+ close() {
+ this.$emit('close');
+ },
+ fileExport(filename,data) {
+ const module = this.moduleIdMap[this.moduleId];
+ const fileName = `${module.name}_v${module.releaseBuild}_${this.language}_${this.isCustom ? 'custom' : 'app'}.json`;
+ const fileData = JSON.stringify(this.getContentFromMap(this.captionMap,this.language),null,4);
+
+ // download file
+ const blob = new Blob([fileData],{type:'application/json'});
+ const elem = window.document.createElement('a');
+ const url = window.URL.createObjectURL(blob);
+
+ elem.href = url;
+ elem.download = fileName;
+
+ document.body.appendChild(elem);
+ elem.click();
+ document.body.removeChild(elem);
+ window.URL.revokeObjectURL(url);
+ },
+ fileImport(event) {
+ if(event.target.files.length !== 1)
+ return;
+
+ const reader = new FileReader();
+ reader.readAsText(event.target.files[0]);
+ reader.onload = () => this.importData = JSON.parse(reader.result);
+ reader.onerror = this.$root.genericError;
+ },
+ fileImportUpdate() {
+ for(const k in this.importData) {
+ const map = this.importData[k];
+ for(const entityId in map) {
+ for(const content in map[entityId]) {
+ for(const language in map[entityId][content]) {
+ if(language !== this.language) continue;
+
+ this.$emit('update',entityId,content,language,map[entityId][content][language]);
+ }
+ }
+ }
+ }
+ },
+
+ // helper
+ getContentFromMap(captionMap,languageGet) {
+ let out = {};
+ for(const k in captionMap) {
+ const map = captionMap[k];
+ out[k] = {};
+
+ for(const entityId in map) {
+ for(const content in map[entityId]) {
+ for(const language in map[entityId][content]) {
+ if(language !== languageGet)
+ continue;
+
+ if(out[k][entityId] === undefined) out[k][entityId] = {};
+ if(out[k][entityId][content] === undefined) out[k][entityId][content] = {};
+
+ out[k][entityId][content][language] = map[entityId][content][language];
+ }
+ }
+ }
+ }
+ return out;
+ }
+ }
+};
+
+let MyCaptionMapNewLanguage = {
+ name:'my-caption-map-new-language',
+ template:`
+
+
+
+
+
+ {{ isExport ? capApp.export : capApp.import }}+
+
+
+
+
+
+
+ {{ capGen.language }}
+
+
+
+
+
+
+ `,
+ emits:['close','create'],
+ props:{
+ languages: { type:Array, required:true },
+ languagesCustom:{ type:Array, required:true },
+ moduleId: { type:String, required:true }
+ },
+ data() {
+ return {
+ input:''
+ };
+ },
+ computed:{
+ canSave:(s) =>
+ s.input !== '' &&
+ s.input.length === 5 &&
+ !s.languagesCustom.includes(s.input),
+ inputLine:{
+ get() { return this.input; },
+ set(v) { this.input = v.toLowerCase().replace('-','_').replace(/[^a-z\_]/g,''); }
+ },
+
+ // stores
+ capApp:(s) => s.$store.getters.captions.captionMap,
+ capGen:(s) => s.$store.getters.captions.generic
+ },
+ mounted() {
+ this.$store.commit('keyDownHandlerSleep');
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.create,key:'s',keyCtrl:true});
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.close,key:'Escape',keyCtrl:false});
+ },
+ unmounted() {
+ this.$store.commit('keyDownHandlerDel',this.create);
+ this.$store.commit('keyDownHandlerDel',this.close);
+ this.$store.commit('keyDownHandlerWake');
+ },
+ methods:{
+ close() { this.$emit('close'); },
+ create() { this.$emit('create',this.input); }
+ }
+};
+
+let MyCaptionMapItemValue = {
+ name:'my-caption-map-item-value',
+ components:{ MyBuilderCaption },
+ template:`
+
+
+
+
+
+
+ {{ capApp.titleNew }}+
+
+
+
+
+
+
+ {{ t }} +
+ | `,
+ data() {
+ return {
+ contentRichtext:['articleBody'],
+ showRichtextContent:null
+ };
+ },
+ emits:['update'],
+ props:{
+ captionMap:{ type:Object, required:true },
+ language: { type:String, required:true }, // language code: en_us, de_de, ...
+ readonly: { type:Boolean, required:true }
+ }
+};
+
+let MyCaptionMapItem = {
+ name:'my-caption-map-item',
+ components:{ MyCaptionMapItemValue },
+ template:`
+
+
+
+
+
+
+
+
+
+ {{ showRichtextContent }}
+
+
+
+
+
+ |
+
+
+
+ |
+
+ |
+ {{ show ? l : '-' }} |
+
+ `,
+ props:{
+ isCustom: { type:Boolean, required:false, default:false }, // if enabled, custom languages can be added
+ languageDefault:{ required:false, default:null },
+ moduleIdForce: { required:false, default:null }, // only edit the current module
+ readonly: { type:Boolean, required:false, default:false }
+ },
+ data() {
+ return {
+ // data
+ captionMap:{}, // map of all captions (combines application + custom)
+ captionMapCustom:{}, // map of all custom captions
+
+ // states
+ changes:[], // change to caption value, key = entity ID (attribute, form, field, etc.)
+ hasChanges:false,
+ isReady:false,
+ moduleId:null, // current module to show caption map for
+ showLanguageNew:false,
+ showLanguageCodes:[],
+ showTransfer:false,
+ showTransferMode:'export'
+ };
+ },
+ watch:{
+ moduleIdForce(v) {
+ this.moduleId = v;
+ this.resetDefaults();
+ }
+ },
+ computed:{
+ captionsApis:(s) => {
+ let apiIdMap = {};
+ for(const api of s.module.apis) {
+ let childCaptions = [];
+ for(const col of api.columns) {
+ if(s.captionMap.columnIdMap[col.id] !== undefined)
+ childCaptions.push(s.makeItem(col.id,s.getColumnTitle(col,s.moduleId),s.captionMap.columnIdMap[col.id],[]));
+ }
+
+ if(childCaptions.length !== 0)
+ apiIdMap[api.id] = childCaptions;
+ }
+ let out = [];
+ for(const id in apiIdMap) {
+ out.push(s.makeItem(id,s.apiIdMap[id].name,null,apiIdMap[id]));
+ }
+ return out.sort((a,b) => (a.name > b.name) ? 1 : -1);
+ },
+ captionsAttributesByRelations:(s) => {
+ let relIdMap = {};
+ for(let atrId in s.captionMap.attributeIdMap) {
+ const atr = s.attributeIdMap[atrId];
+ const relId = atr.relationId;
+ if(relIdMap[relId] === undefined)
+ relIdMap[relId] = [];
+
+ relIdMap[relId].push(s.makeItem(atrId,atr.name,s.captionMap.attributeIdMap[atrId],[]));
+ }
+
+ // return sorted by relation and attribute names
+ let out = [];
+ for(let id in relIdMap) {
+ out.push(s.makeItem(id,s.relationIdMap[id].name,null,relIdMap[id]));
+ }
+ return out.sort((a,b) => (a.name > b.name) ? 1 : -1);
+ },
+ captionsClientEvents:(s) => {
+ let out = [];
+ for(const ce of s.module.clientEvents) {
+ out.push(s.makeItem(ce.id,'-',s.captionMap.clientEventIdMap[ce.id],[]));
+ }
+ return out;
+ },
+ captionsCollections:(s) => {
+ let collectionIdMap = {};
+ for(const collection of s.module.collections) {
+ let childCaptions = [];
+ for(const col of collection.columns) {
+ if(s.captionMap.columnIdMap[col.id] !== undefined)
+ childCaptions.push(s.makeItem(col.id,s.getColumnTitle(col,s.moduleId),s.captionMap.columnIdMap[col.id],[]));
+ }
+
+ if(childCaptions.length !== 0)
+ collectionIdMap[collection.id] = childCaptions;
+ }
+ let out = [];
+ for(const id in collectionIdMap) {
+ out.push(s.makeItem(id,s.collectionIdMap[id].name,null,collectionIdMap[id]));
+ }
+ return out.sort((a,b) => (a.name > b.name) ? 1 : -1);
+ },
+ captionsFieldsByForms:(s) => {
+ let frmIdMapChildren = {};
+ for(const frm of s.module.forms) {
+ const fieldIdMap = s.getFieldMap(frm.fields);
+ let formChildren = [];
+
+ // form fields
+ for(const fldId in fieldIdMap) {
+ const fld = fieldIdMap[fldId];
+
+ // check for fields with nesting (columns, tabs)
+ let fieldChildren = [];
+ if(fld.columns !== undefined) {
+ for(const col of fld.columns) {
+ if(s.captionMap.columnIdMap[col.id] !== undefined)
+ fieldChildren.push(s.makeItem(col.id,s.getColumnTitle(col,s.moduleId),s.captionMap.columnIdMap[col.id],[]));
+ }
+ }
+ if(fld.tabs !== undefined) {
+ for(const tab of fld.tabs) {
+ if(s.captionMap.tabIdMap[tab.id] !== undefined)
+ fieldChildren.push(s.makeItem(tab.id,'-',s.captionMap.tabIdMap[tab.id],[]));
+ }
+ }
+
+ if(fieldChildren.length !== 0 || s.captionMap.fieldIdMap[fldId] !== undefined)
+ formChildren.push(s.makeItem(fldId,s.getFieldTitle(fld),s.captionMap.fieldIdMap[fldId],fieldChildren));
+ }
+
+ // form actions
+ for(const act of frm.actions) {
+ formChildren.push(s.makeItem(act.id,s.capGen.action,s.captionMap.formActionIdMap[act.id],[]));
+ }
+
+ // form has children with captions or has captions itself
+ if(formChildren.length !== 0 || s.captionMap.formIdMap[frm.id] !== undefined)
+ frmIdMapChildren[frm.id] = formChildren;
+ }
+
+ // return sorted by form and field names
+ let out = [];
+ for(const id in frmIdMapChildren) {
+ out.push(s.makeItem(id,s.formIdMap[id].name,s.captionMap.formIdMap[id],frmIdMapChildren[id]));
+ }
+ return out.sort((a,b) => (a.name > b.name) ? 1 : -1);
+ },
+ captionsMenusByMenuTabs:(s) => {
+ let out = [];
+ let menuTabIdMap = {};
+ for(const mt of s.module.menuTabs) {
+ menuTabIdMap[mt.id] = mt;
+ }
+
+ for(const id in s.captionMap.menuTabIdMap) {
+ let children = [];
+ if(menuTabIdMap[id] !== undefined) {
+ for(const m of menuTabIdMap[id].menus) {
+ children.push(s.makeItem(m.id,'-',s.captionMap.menuIdMap[m.id],[]));
+ }
+ }
+ out.push(s.makeItem(id,'-',s.captionMap.menuTabIdMap[id],children));
+ }
+ return out;
+ },
+ captionsQueryChoices:(s) => {
+ let out = [];
+ for(const id in s.captionMap.queryChoiceIdMap) {
+ out.push(s.makeItem(id,'-',s.captionMap.queryChoiceIdMap[id],[]));
+ }
+ return out;
+ },
+
+ // simple
+ captionsArticles: (s) => s.makeSortedItemList(s.captionMap.articleIdMap,s.articleIdMap),
+ captionsJsFunctions:(s) => s.makeSortedItemList(s.captionMap.jsFunctionIdMap,s.jsFunctionIdMap),
+ captionsLoginForms: (s) => s.makeSortedItemList(s.captionMap.loginFormIdMap,s.loginFormIdMap),
+ captionsPgFunctions:(s) => s.makeSortedItemList(s.captionMap.pgFunctionIdMap,s.pgFunctionIdMap),
+ captionsRoles: (s) => s.makeSortedItemList(s.captionMap.roleIdMap,s.roleIdMap),
+ captionsWidgets: (s) => s.makeSortedItemList(s.captionMap.widgetIdMap,s.widgetIdMap),
+ canSave: (s) => !s.readonly && s.hasChanges,
+ canSwitchModules: (s) => s.moduleIdForce === null && s.moduleId !== null,
+ languages: (s) => s.moduleId === null ? [] : s.moduleIdMap[s.moduleId].languages,
+ languagesCustom: (s) => s.moduleId === null ? [] : s.moduleIdMapMeta[s.moduleId].languagesCustom,
+ module: (s) => s.moduleId === null ? false : s.moduleIdMap[s.moduleId],
+
+ // stores
+ modules: (s) => s.$store.getters['schema/modules'],
+ moduleIdMap: (s) => s.$store.getters['schema/moduleIdMap'],
+ apiIdMap: (s) => s.$store.getters['schema/apiIdMap'],
+ articleIdMap: (s) => s.$store.getters['schema/articleIdMap'],
+ attributeIdMap: (s) => s.$store.getters['schema/attributeIdMap'],
+ collectionIdMap:(s) => s.$store.getters['schema/collectionIdMap'],
+ formIdMap: (s) => s.$store.getters['schema/formIdMap'],
+ jsFunctionIdMap:(s) => s.$store.getters['schema/jsFunctionIdMap'],
+ loginFormIdMap: (s) => s.$store.getters['schema/loginFormIdMap'],
+ pgFunctionIdMap:(s) => s.$store.getters['schema/pgFunctionIdMap'],
+ relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
+ roleIdMap: (s) => s.$store.getters['schema/roleIdMap'],
+ widgetIdMap: (s) => s.$store.getters['schema/widgetIdMap'],
+ capApp: (s) => s.$store.getters.captions.captionMap,
+ capGen: (s) => s.$store.getters.captions.generic,
+ moduleIdMapMeta:(s) => s.$store.getters.moduleIdMapMeta
+ },
+ mounted() {
+ this.resetDefaults();
+ this.$store.commit('keyDownHandlerAdd',{fnc:this.set,key:'s',keyCtrl:true});
+ },
+ unmounted() {
+ this.$store.commit('keyDownHandlerDel',this.set);
+ },
+ methods:{
+ // external
+ getCaptionMapName,
+ getColumnTitle,
+ getFieldMap,
+ getFieldTitle,
+ objectDeepMerge,
+ srcBase64Icon,
+
+ // actions
+ changeModule(id) {
+ this.moduleId = id;
+ this.resetDefaults();
+ },
+ reset() {
+ this.changes = {};
+ this.hasChanges = false;
+ this.get();
+ },
+ resetDefaults() {
+ if(this.modules.length === 0)
+ return;
+
+ this.showLanguageCodes = [];
+
+ if(this.moduleId === null) {
+ // apply forced or first available module
+ if(this.moduleIdForce !== null)
+ this.moduleId = this.moduleIdForce;
+ else
+ this.moduleId = this.modules[0].id;
+ }
+
+ const mod = this.moduleIdMap[this.moduleId];
+
+ if(mod.languages.length === 0)
+ return;
+
+ // choose default language
+ if(mod.languages.length < 3) {
+ this.showLanguageCodes = JSON.parse(JSON.stringify(mod.languages));
+ } else {
+ if(this.languageDefault !== null)
+ this.showLanguageCodes.push(this.languageDefault);
+ else
+ this.showLanguageCodes.push(mod.languages[0]);
+ }
+ this.reset();
+ },
+ storeChange(entityId,content,languageCode,value) {
+ const mapName = this.getCaptionMapName(content);
+ const customLang = this.isCustom && this.languagesCustom.includes(languageCode);
+
+ this.hasChanges = true;
+
+ // add to combined caption map
+ if(this.captionMap[mapName] === undefined)
+ this.captionMap[mapName] = {};
+
+ if(this.captionMap[mapName][entityId] === undefined)
+ this.captionMap[mapName][entityId] = {};
+
+ if(this.captionMap[mapName][entityId][content] === undefined)
+ this.captionMap[mapName][entityId][content] = {};
+
+ this.captionMap[mapName][entityId][content][languageCode] = value;
+
+ // add to custom caption map
+ if(customLang) {
+ if(this.captionMapCustom[mapName] === undefined)
+ this.captionMapCustom[mapName] = {};
+
+ if(this.captionMapCustom[mapName][entityId] === undefined)
+ this.captionMapCustom[mapName][entityId] = {};
+
+ if(this.captionMapCustom[mapName][entityId][content] === undefined)
+ this.captionMapCustom[mapName][entityId][content] = {};
+
+ this.captionMapCustom[mapName][entityId][content][languageCode] = value;
+ }
+
+ this.changes[`${entityId}_${content}_${languageCode}`] = {
+ content:content,
+ entityId:entityId,
+ languageCode:languageCode,
+ target:customLang ? 'instance' : 'app',
+ value:value
+ };
+ },
+ toggleDisplay(list,value) {
+ const i = list.indexOf(value);
+ if(i === -1) list.push(value);
+ else list.splice(i,1);
+ },
+
+ // helper
+ makeItem(id,name,capMap,children) {
+ return {
+ capMap:capMap !== undefined ? capMap : null,
+ children:children !== undefined ? children.sort((a,b) => (a.name > b.name) ? 1 : -1) : [],
+ id:id,
+ name:name
+ };
+ },
+ makeSortedItemList(capMap,entityMap) {
+ let out = [];
+ for(const id in capMap) {
+ out.push(this.makeItem(id,entityMap[id].name,capMap[id],[]));
+ }
+ return out.sort((a,b) => (a.name > b.name) ? 1 : -1);
+ },
+
+ // backend
+ get() {
+ // application captions from schema
+ let requests = [ws.prepare('captionMap','get',{
+ moduleId:this.moduleId, target:'app'
+ })];
+
+ // custom captions from instance
+ if(this.isCustom)
+ requests.push(ws.prepare('captionMap','get',{
+ moduleId:this.moduleId, target:'instance'
+ }));
+
+ ws.sendMultiple(requests,true).then(
+ res => {
+ this.captionMap = this.isCustom
+ ? this.objectDeepMerge(res[0].payload,res[1].payload)
+ : res[0].payload;
+
+ if(this.isCustom)
+ this.captionMapCustom = res[1].payload;
+
+ this.isReady = true;
+ },
+ this.$root.genericError
+ );
+ },
+ set() {
+ if(!this.canSave) return;
+
+ let requests = [];
+ for(let k in this.changes) {
+ requests.push(ws.prepare('captionMap','setOne',this.changes[k]));
+ }
+ ws.sendMultiple(requests,true).then(
+ () => {
+ if(this.isCustom) this.$root.schemaReload();
+ else this.$root.schemaReload(this.moduleId);
+
+ this.changes = {};
+ this.hasChanges = false;
+ },
+ this.$root.genericError
+ );
+ },
+ setLanguagesCustom(languageSet,add) {
+ let v = JSON.parse(JSON.stringify(this.languagesCustom));
+
+ if(add) v.push(languageSet);
+ else v.splice(v.indexOf(languageSet),1);
+
+ let requests = [
+ ws.prepare('moduleMeta','setLanguagesCustom',{id:this.moduleId,languages:v})
+ ];
+
+ if(!add) {
+ // delete existing custom captions
+ for(const k in this.captionMapCustom) {
+ const map = this.captionMapCustom[k];
+ for(const entityId in map) {
+ for(const content in map[entityId]) {
+ for(const language in map[entityId][content]) {
+ if(language !== languageSet)
+ continue;
+
+ requests.push(ws.prepare('captionMap','setOne',{
+ content:content,
+ entityId:entityId,
+ languageCode:language,
+ target:'instance',
+ value:''
+ }));
+ }
+ }
+ }
+ }
+ }
+
+ ws.sendMultiple(requests,true).then(
+ () => {
+ this.$root.schemaReload();
+ this.showLanguageNew = false;
+
+ if(!add) this.get();
+ },
+ this.$root.genericError
+ );
+ }
+ }
+};
\ No newline at end of file
diff --git a/www/comps/chart.js b/www/comps/chart.js
index cce4b2e0..c3a7d8cf 100644
--- a/www/comps/chart.js
+++ b/www/comps/chart.js
@@ -26,7 +26,7 @@ let MyChart = {
@change="choiceIdSet($event.target.value)"
>
+
+
+
+
+ {{ capApp.title }}+
+
+
+
+
+
+
+
+
+
+
+ {{ capApp.languagesApp }}
+
+
+ {{ capApp.languagesInstance }}
+
+
+
+
+
+
+
+
+ {{ capGen.nothingInstalled }}
+
+
+
+
+ `,
+ props:{
+ insertEntity: { required:false, default:null },
+ mode: { type:String, required:true },
+ modelValue: { required:true },
+ modelValueAlt:{ type:String, required:false, default:'' },
+ readonly: { type:Boolean, required:false, default:false }
+ },
+ data() {
+ return {
+ editor:null,
+ printMargin:true,
+ sessionLive:'',
+ sessionPreview:'',
+ theme:'monokai',
+ themesBright:['chrome','cloud9_day','eclipse','github','textmate'],
+ themesDark:[
+ 'chaos','cloud9_night','github_dark','gruvbox','gruvbox_dark_hard',
+ 'kr_theme','merbivore','mono_industrial','monokai','terminal',
+ 'tomorrow_night','twilight','vibrant_ink'
+ ],
+ wrap:false
+ };
+ },
+ emits:['clicked','update:modelValue'],
+ watch:{
+ modelValue(v) {
+ if(v !== this.sessionLive.getValue()) {
+ this.sessionLive.setValue(v);
+ this.editor.clearSelection();
+ }
+ },
+ modelValueAlt(v) {
+ if(v === '') {
+ this.sessionLive.setScrollTop(this.sessionPreview.getScrollTop());
+ this.editor.setSession(this.sessionLive);
+ return;
+ }
+
+ this.sessionPreview.setScrollTop(this.sessionLive.getScrollTop());
+ this.sessionPreview.setValue(v);
+ this.editor.setSession(this.sessionPreview);
+ this.editor.clearSelection();
+ }
+ },
+ computed:{
+ capGen: (s) => s.$store.getters.captions.generic,
+ settings:(s) => s.$store.getters.settings
+ },
+ mounted() {
+ // init ACE code editor
+ ace.require('ace/ext/searchbox');
+ this.sessionLive = ace.createEditSession(this.modelValue);
+ this.sessionPreview = ace.createEditSession('');
+
+ // disable features like JS syntax checker
+ this.sessionLive.setUseSoftTabs(false);
+ this.sessionLive.setUseWorker(false);
+ this.sessionPreview.setUseWorker(false);
+
+ this.editor = ace.edit(this.$refs.codeEditor);
+ this.editor.setSession(this.sessionLive);
+ this.editor.clearSelection(); // reset selection
+ this.editor.setHighlightActiveLine(true); // mark selected line
+ this.editor.on('change',this.change);
+ this.editor.on('click',this.click);
+ this.theme = this.builderOptionGet('codeEditorTheme',this.settings.dark ? 'cloud9_night' : 'cloud9_day');
+ this.wrap = this.builderOptionGet('codeEditorWrap',false);
+ this.setOptions();
+
+ // react to setting changes
+ this.$watch(() => [this.printMargin,this.readonly,this.settings,this.theme,this.wrap],this.setOptions);
+ },
+ unmounted() {
+ this.editor.destroy();
+ },
+ methods:{
+ // externals
+ builderOptionGet,
+ builderOptionSet,
+
+ // actions
+ change() {
+ if(!this.readonly)
+ this.$emit('update:modelValue',this.sessionLive.getValue());
+ },
+ click() {
+ if(!this.readonly && this.insertEntity !== null){
+ this.editor.insert(this.insertEntity);
+ this.$emit('clicked');
+ }
+ },
+
+ // editor functions
+ setOptions() {
+ this.editor.setOptions({
+ enableAutoIndent:true,
+ fontSize:17 * this.settings.fontSize / 100,
+ mode:`ace/mode/${this.mode}`,
+ readOnly:this.readonly,
+ theme:`ace/theme/${this.theme}`,
+ wrap:this.wrap
+ });
+ this.editor.setShowPrintMargin(this.printMargin);
+ }
+ }
+};
\ No newline at end of file
diff --git a/www/comps/columnBatch.css b/www/comps/columnBatch.css
new file mode 100644
index 00000000..ce176332
--- /dev/null
+++ b/www/comps/columnBatch.css
@@ -0,0 +1,43 @@
+.columnBatch{
+ min-height:100%;
+ padding:0px 8px;
+ margin:3px 0px;
+ display:flex;
+ flex-flow:row nowrap;
+ align-items:center;
+ gap:6px;
+
+ /* auto cutting text */
+ width:inherit;
+ overflow:hidden;
+}
+@-moz-document url-prefix() {
+ .columnBatch{
+ margin:0.3px 0px;
+ }
+}
+.columnBatch.calendarDays{
+ width:unset;
+ min-height:unset;
+ padding:0px;
+ margin:0px;
+ overflow:initial;
+}
+.columnBatch.kanbanCards{
+ margin:0px 0px;
+}
+.columnBatch.listCards{
+ max-width:250px;
+}
+.columnBatch.ganttGroup{
+ margin:0px;
+}
+.columnBatch.vertical{
+ flex-flow:column nowrap;
+ justify-content:center;
+ align-items:flex-start;
+ gap:4px;
+}
+.columnBatch.ganttGroup.vertical{
+ gap:0px;
+}
\ No newline at end of file
diff --git a/www/comps/dialog.js b/www/comps/dialog.js
index 96b465e5..38f84456 100644
--- a/www/comps/dialog.js
+++ b/www/comps/dialog.js
@@ -5,19 +5,16 @@ let MyDialog = {
name:'my-dialog',
components:{MyInputRichtext},
template:`
- `,
mounted() {
window.addEventListener('keydown',this.handleHotkeys);
+
+ // place focus on first available button
+ if(this.buttons.length !== 0)
+ this.$refs['btn0'][0].$el.focus();
},
unmounted() {
window.removeEventListener('keydown',this.handleHotkeys);
@@ -89,9 +91,7 @@ let MyDialog = {
}
// search for a button with this particular action key assigned
- for(let i = 0, j = this.buttons.length; i < j; i++) {
- let btn = this.buttons[i];
-
+ for(let btn of this.buttons) {
if(typeof btn[search] !== 'undefined' && btn[search]) {
this.executeButton(btn);
e.preventDefault();
@@ -119,7 +119,7 @@ let MyDialog = {
// remove before fade out occurs
this.richtextClosing = true;
- this.$nextTick(function() {
+ this.$nextTick(() => {
this.executeButton(this.buttons[i]);
});
}
diff --git a/www/comps/feedback.js b/www/comps/feedback.js
index 597420bd..7d49efa9 100644
--- a/www/comps/feedback.js
+++ b/www/comps/feedback.js
@@ -1,10 +1,11 @@
-import {getCaptionForModule} from './shared/language.js';
+import {dialogCloseAsk} from './shared/dialog.js';
+import {getCaption} from './shared/language.js';
export {MyFeedback as default};
let MyFeedback = {
name:'my-feedback',
- template:`
+
@@ -55,6 +53,10 @@ let MyDialog = {
-
{{ captionTop }}
-
-
+ template:`
+ 
@@ -12,13 +13,13 @@ let MyFeedback = {
+
-
+
-
-
-
+
+
- {{ caption }}
+
+ {{ caption }}
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+ {{ tabIndexesTitle[i] }}
+
+
-
-
-
-
-
-
-
+
@@ -287,6 +587,11 @@ let MyField = {
{{ captionHelp }}
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ capApp.bulkTouched }}
+
+
{{ captionError }}
@@ -304,180 +609,15 @@ let MyField = {
/>
-
-
-
-
-
- `,
props:{
- dataFieldMap: { type:Object, required:true },
- entityIdMapState: { type:Object, required:false, default:() => {return {}} }, // overwritten states
- field: { type:Object, required:true },
- fieldIdsChanged: { type:Array, required:false, default:() => {return []} },
- fieldIdsInvalid: { type:Array, required:false, default:() => {return []} },
- fieldIdMapCaption:{ type:Object, required:false, default:() => {return {}} }, // overwritten captions
- fieldIdMapError: { type:Object, required:false, default:() => {return {}} }, // overwritten error messages
- formBadSave: { type:Boolean, required:true }, // attempted save with invalid inputs
- formIsPopUp: { type:Boolean, required:true }, // parent form is a pop-up form
- formLoading: { type:Boolean, required:true },
- formReadonly: { type:Boolean, required:true }, // form is read only, disable all inputs
- flexDirParent: { type:String, required:true }, // flex direction (row/column) of parent
- joinsIndexMap: { type:Object, required:true },
- isAloneInForm: { type:Boolean, required:true }, // parent form contains only this field
- isAloneInTab: { type:Boolean, required:false, default:false }, // only field in a tab
- isHiddenInParent: { type:Boolean, required:false, default:false }, // field is hidden in parent (tab/container)
- logViewer: { type:Boolean, required:false, default:false }, // is part of log viewer
- values: { type:Object, required:true }
+ dataFieldMap: { type:Object, required:true },
+ entityIdMapEffect: { type:Object, required:false, default:() => {return {}} }, // overwritten states
+ favoriteId: { required:false, default:null },
+ field: { type:Object, required:true },
+ fieldIdsChanged: { type:Array, required:false, default:() => {return []} },
+ fieldIdsInvalid: { type:Array, required:false, default:() => {return []} },
+ fieldIdsTouched: { type:Array, required:false, default:() => {return []} },
+ fieldIdMapOverwrite:{ type:Object, required:true },
+ formBadSave: { type:Boolean, required:true }, // attempted save with invalid inputs
+ formIsEmbedded: { type:Boolean, required:true }, // parent form is embedded (pop-up, inline, widget)
+ formLoading: { type:Boolean, required:true },
+ formReadonly: { type:Boolean, required:true }, // form is read only
+ flexDirParent: { type:String, required:true }, // flex direction (row/column) of parent
+ isAloneInForm: { type:Boolean, required:true }, // parent form contains only this field
+ isAloneInTab: { type:Boolean, required:false, default:false }, // parent tab only contains this field
+ isBulkUpdate: { type:Boolean, required:false, default:false }, // form is in bulk update mode
+ joinsIndexMap: { type:Object, required:true },
+ logViewer: { type:Boolean, required:false, default:false }, // is part of log viewer
+ moduleId: { type:String, required:true },
+ parentIsCounting: { type:Boolean, required:false, default:false }, // field parent is counting records (tab counter)
+ parentIsHidden: { type:Boolean, required:false, default:false }, // field parent has its content hidden (tab/container)
+ values: { type:Object, required:true },
+ variableIdMapLocal: { type:Object, required:true } // variable values by ID (variables assigned to form)
},
emits:[
'clipboard','execute-function','hotkey','open-form','set-form-args',
- 'set-counter','set-valid','set-value','set-value-init'
+ 'set-counter','set-touched','set-valid','set-value'
],
data() {
return {
collectionIdMapIndexes:{}, // selected record indexes of collection, used to filter with
- focused:false,
- notTouched:true, // data field was not touched by user
- showColorPickerInput:false, // for color picker fields
+ columnIdsByUser:[], // column IDs, selected by user to be shown inside field (primarily for list fields)
+ dropdownShow:false, // for inputs with dropdowns (relationship, date, color picker)
+ loaded:false,
+ popUpFormInline:null, // inline form for some field types (list)
+ regconfigInput:'',
showPassword:false, // for password fields
tabIndexFieldIdMapCounter:{}, // tabs only: counter (by tab index + field ID) of child values (like combined list row counts)
tabIndexShow:0 // tabs only: which tab is shown
};
},
watch:{
- formLoading(val) {
- if(!val) this.notTouched = true;
- },
+ favoriteId(v) { this.reloadOptions(); },
isValid:{ // inform parent form about field validity
handler(v) { this.$emit('set-valid',v,this.field.id); },
immediate:true
},
tabIndexesHidden:{
handler(v) {
- if(!this.isTabs) return;
-
- // use remembered tab if enabled and available
- if(this.settings.tabRemember) {
- let tabIndex = this.fieldOptionGet(this.field.id,'tabIndex',0);
- if(this.field.tabs.length > tabIndex && !v.includes(tabIndex))
- return this.tabIndexShow = tabIndex;
- }
- // use first valid tab
- for(let i = 0, j = this.field.tabs.length; i < j; i++) {
- if(!v.includes(i))
- return this.tabIndexShow = i;
- }
+ if(this.isTabs && v.includes(this.tabIndexShow))
+ this.setTabToValid();
},
immediate:true
}
@@ -579,26 +718,35 @@ let MyField = {
value:{
get() {
if(!this.isData) return false;
+
+ if(this.isVariable)
+ return this.variable === false ? null : this.variableValueGet(this.variable.id,this.variableIdMapLocal);
// if only alt attribute is set, field still needs primary attribute value (form log)
- return typeof this.values[this.fieldAttributeId] !== 'undefined'
- ? this.values[this.fieldAttributeId] : null;
+ if(this.values[this.fieldAttributeId] === undefined)
+ return null;
+
+ // apply fixed decimal length to newly loaded decimal numbers
+ if(!this.isTouched && this.isDecimal && typeof this.values[this.fieldAttributeId] === 'number' && (
+ this.attribute.length !== 0 || this.attribute.lengthFract !== 0
+ )) {
+ return this.values[this.fieldAttributeId].toFixed(this.attribute.lengthFract);
+ }
+ return this.values[this.fieldAttributeId];
},
set(val,valOld) {
- if(this.isDecimal)
- val = val.replace(',','.');
-
this.setValue(val,valOld,this.fieldAttributeId);
}
},
- // field value for alternative data attribute
+ // field value for alternative data attribute (not available for variables)
valueAlt:{
get() {
- if(!this.isData) return false;
+ if(!this.isData) return false;
+ if(this.isVariable) return false;
// if only primary attribute is set, field still needs alt attribute value (form log)
- return typeof this.values[this.fieldAttributeIdAlt] !== 'undefined'
+ return this.values[this.fieldAttributeIdAlt] !== undefined
? this.values[this.fieldAttributeIdAlt] : null;
},
set(val,valOld) {
@@ -609,32 +757,19 @@ let MyField = {
caption:(s) => {
let out = '';
-
- if(typeof s.fieldIdMapCaption[s.field.id] !== 'undefined') {
- // 1st preference: field caption overwrite
- out = s.fieldIdMapCaption[s.field.id];
- }
- else if(typeof s.field.captions !== 'undefined' && typeof s.field.captions.fieldTitle[s.moduleLanguage] !== 'undefined') {
- // 2nd preference: field caption
- out = s.field.captions.fieldTitle[s.moduleLanguage];
+ if(s.fieldIdMapOverwrite.caption[s.field.id] !== undefined) {
+ out = s.fieldIdMapOverwrite.caption[s.field.id];
}
- else if(s.attribute) {
- // 3rd / 4th preference: dedicated attribute title / name
- if(typeof s.attribute.captions.attributeTitle[s.moduleLanguage] !== 'undefined')
- out = s.attribute.captions.attributeTitle[s.moduleLanguage];
- else
- out = s.attribute.name;
+ else {
+ const title = s.getCaption('fieldTitle',s.moduleId,s.field.id,s.field.captions);
+ if(title !== '') {
+ out = title;
+ }
+ else if(s.attribute) {
+ out = s.getCaption('attributeTitle',s.moduleId,s.attribute.id,s.attribute.captions,s.attribute.name);
+ }
}
-
- // if empty: mark as missing
- if(out === '')
- out = s.capGen.missingCaption;
-
- // required marker
- if(s.isRequired)
- out += '*';
-
- return out;
+ return s.isRequired ? out + '*' : out;
},
captionError:(s) => {
if(s.customErr !== null) return s.customErr; // custom error is always shown
@@ -646,58 +781,60 @@ let MyField = {
return s.capGen.inputSmall.replace('{MIN}',s.field.min);
}
if(!s.isValidMax) {
- if(s.isString) return s.capGen.inputLong.replace('{MAX}',s.field.max);
- if(s.isFiles) return s.capGen.inputTooManyFiles;
+ if(s.isString) {
+ if(s.field.max !== null) return s.capGen.inputLong.replace('{MAX}',s.field.max);
+ if(s.attribute !== false) return s.capGen.inputLong.replace('{MAX}',s.attribute.length);
+ return s.capGen.inputInvalid;
+ }
+ if(s.isFiles) return s.capGen.inputTooManyFiles;
return s.capGen.inputLarge.replace('{MAX}',s.field.max);
}
if(s.isDecimal) return s.capGen.inputDecimal;
- if(s.isRequired) return s.capGen.inputRequired;
if(!s.isValidValue) return s.capGen.inputInvalid; // generic error
return '';
},
- captionHelp:(s) => typeof s.field.captions !== 'undefined'
- && typeof s.field.captions.fieldHelp[s.moduleLanguage] !== 'undefined'
- ? s.field.captions.fieldHelp[s.moduleLanguage] : '',
+ captionHelp:(s) => s.getCaption('fieldHelp',s.moduleId,s.field.id,s.field.captions),
domClass:(s) => {
let out = [];
+ if(s.isHidden) out.push('hidden');
+ if(s.isIframe) out.push('iframe');
+ if(s.isReadonly) out.push('readonly');
+ if(s.isRichtext) out.push('richtext');
+
+ for(const flag of s.field.flags) out.push(`flag-${flag}`);
+ if(s.isHeader && s.field.richtext) out.push('headerRichtext');
+ if(s.isContainer) out.push('container', s.field.direction);
- if(s.isHidden)
- out.push('hidden');
+ if(s.flexDirParent === 'column' && (s.isHeader || s.isLineSingle))
+ out.push('noGrow');
+ return out;
+ },
+ domStyle:(s) => {
+ let out = [];
if(s.isContainer) {
- out.push('container');
- out.push(s.field.direction);
+ out.push(s.getFlexStyle(
+ s.flexDirParent,s.field.justifyContent,s.field.alignItems,
+ s.field.alignContent,s.field.wrap,s.field.grow,s.field.shrink,
+ s.field.basis,s.field.perMax,s.field.perMin));
}
+ if(s.fieldIdMapOverwrite.order[s.field.id] !== undefined)
+ out.push(`order:${s.fieldIdMapOverwrite.order[s.field.id]}`);
- if(s.isReadonly)
- out.push('readonly');
-
- if(s.isTextarea || s.isRichtext || s.isFiles)
- out.push('top-aligned');
-
- if(s.isRichtext)
- out.push('richtext');
-
- return out;
+ return out.join(';');
},
- domStyle:(s) => !s.isContainer ? '' : s.getFlexStyle(
- s.flexDirParent,s.field.justifyContent,s.field.alignItems,
- s.field.alignContent,s.field.wrap,s.field.grow,s.field.shrink,
- s.field.basis,s.field.perMax,s.field.perMin),
fieldAttributeId:(s) => {
- if(!s.isData) return false;
-
- let atrIdNm = typeof s.field.attributeIdNm !== 'undefined' ?
- s.field.attributeIdNm : null;
+ if(!s.isData || s.isVariable) return false;
+ const atrIdNm = s.field.attributeIdNm !== undefined ? s.field.attributeIdNm : null;
return s.getIndexAttributeId(s.field.index,
s.field.attributeId,s.field.outsideIn === true,atrIdNm);
},
- fieldAttributeIdAlt:(s) => !s.isData || s.field.attributeIdAlt === null ? false
+ fieldAttributeIdAlt:(s) => !s.isData || s.isVariable || s.field.attributeIdAlt === null ? false
: s.getIndexAttributeId(s.field.index,s.field.attributeIdAlt,false,null),
- columnsProcessed:(s) => !s.isQuery ? [] : s.getQueryColumnsProcessed(
- s.field.columns,s.joinsIndexMap,s.dataFieldMap,
+ columnsProcessed:(s) => !s.isQuery ? [] : s.getColumnsProcessed(
+ s.field.columns,s.columnIdsByUser,s.joinsIndexMap,s.dataFieldMap,
s.fieldIdsChanged,s.fieldIdsInvalid,s.values),
choicesProcessed:(s) => {
if(!s.isQuery) return [];
@@ -707,36 +844,49 @@ let MyField = {
choices[i].filters = s.getQueryFiltersProcessed(
choices[i].filters,s.joinsIndexMap,s.dataFieldMap,
s.fieldIdsChanged,s.fieldIdsInvalid,s.values,
- s.collectionIdMapIndexes
+ s.collectionIdMapIndexes,s.variableIdMapLocal
);
}
return choices;
},
filtersProcessed:(s) => !s.isQuery ? [] : s.getQueryFiltersProcessed(
s.field.query.filters,s.joinsIndexMap,s.dataFieldMap,
- s.fieldIdsChanged,s.fieldIdsInvalid,s.values,s.collectionIdMapIndexes
+ s.fieldIdsChanged,s.fieldIdsInvalid,s.values,
+ s.collectionIdMapIndexes,s.variableIdMapLocal
),
iconId:(s) => {
- if(s.field.iconId !== null) return s.field.iconId;
- if(s.isData && s.attribute.iconId !== null) return s.attribute.iconId;
- return false;
+ if(s.field.iconId !== null) return s.field.iconId;
+
+ return s.isData && !s.isVariable && s.attribute.iconId !== null ? s.attribute.iconId : false;
+ },
+ lineInputType:(s) => {
+ if(s.isMobile && (s.isDecimal || s.isInteger)) return 'number';
+ return !s.isPassword || s.showPassword ? 'text' : 'password';
},
presetValue:(s) => {
if(!s.isData) return false;
- let join = s.joinsIndexMap[s.field.index];
- let rel = s.relationIdMap[join.relationId];
+ const join = s.joinsIndexMap[s.field.index];
+ const rel = s.relationIdMap[join.relationId];
for(let preset of rel.presets) {
if(s.presetIdMapRecordId[preset.id] !== join.recordId)
continue;
- for(let i = 0, j = preset.values.length; i < j; i++) {
- if(preset.values[i].attributeId === s.attribute.id)
- return preset.values[i];
+ for(let value of preset.values) {
+ if(value.attributeId === s.attribute.id)
+ return value;
}
}
return false;
},
+ regconfigOptions:(s) => {
+ let out = [];
+ for(let d of s.searchDictionaries) {
+ if((s.regconfigInput === '' || d.includes(s.regconfigInput.toLowerCase())) && d !== 'simple' && s.value !== d && out.length < 10)
+ out.push({id:d,name:d});
+ }
+ return out;
+ },
relationshipRecordIds:(s) => {
if(!s.isData || s.value === null) return [];
if(!s.isRelationship1N) return [s.value];
@@ -757,28 +907,30 @@ let MyField = {
let state = s.field.state;
// apply form state if available
- if(typeof s.entityIdMapState.field[s.field.id] !== 'undefined')
- state = s.entityIdMapState.field[s.field.id];
+ if(s.entityIdMapEffect.field[s.field.id]?.state !== undefined)
+ state = s.entityIdMapEffect.field[s.field.id].state;
// overwrites for 'default' state for data fields
- if(s.isData && state === 'default') {
+ if(s.isData && !s.isVariable && state === 'default') {
if(!s.inputCanWrite) state = 'readonly';
if(s.inputCanWrite // can write
+ && !s.isBulkUpdate // bulk update is always optional
&& !s.attribute.nullable // value not optional
&& !s.isRelationship1N // not 0...n partners
&& (!s.isNew || s.attribute.def === '') // existing record or new one with no defaults
) state = 'required';
}
-
- // overwrite in log viewer context, only hidden or readonly allowed
- if(s.logViewer && state !== 'hidden')
- state = 'readonly';
-
- // overwrite visible data field to readonly if form could not load record
- if(s.isData && s.formReadonly && state !== 'hidden')
- state = 'readonly';
-
+
+ if(state !== 'hidden') {
+ // overwrite in log viewer context, only hidden or readonly allowed
+ if(s.logViewer)
+ state = 'readonly';
+
+ // overwrite visible data/button/variable field to readonly if form is readonly
+ if(s.formReadonly && (s.isData || s.isButton || s.isVariable))
+ state = 'readonly';
+ }
return state;
},
tabIndexesHidden:(s) => {
@@ -786,8 +938,8 @@ let MyField = {
let out = [];
for(let i = 0, j = s.field.tabs.length; i < j; i++) {
let t = s.field.tabs[i];
- let state = typeof s.entityIdMapState.tab[t.id] !== 'undefined'
- ? s.entityIdMapState.tab[t.id] : t.state;
+ let state = s.entityIdMapEffect.tab[t.id]?.state !== undefined
+ ? s.entityIdMapEffect.tab[t.id].state : t.state;
if(state === 'hidden')
out.push(i);
@@ -821,8 +973,8 @@ let MyField = {
tabIndexesTitle:(s) => {
let out = [];
for(let i = 0, j = s.field.tabs.length; i < j; i++) {
- let tab = s.field.tabs[i];
- out.push(tab.captions.tabTitle[s.moduleLanguage]);
+ const tab = s.field.tabs[i];
+ out.push(s.getCaption('tabTitle',s.moduleId,tab.id,tab.captions,'-'));
if(typeof s.tabIndexFieldIdMapCounter[String(i)] === 'undefined')
continue;
@@ -839,7 +991,8 @@ let MyField = {
// data input states
inputCanWrite:(s) => {
- if(!s.isData) return false;
+ if(!s.isData) return false;
+ if(s.isVariable) return true;
// if field shows preset value and it is protected (set more than once)
if(s.presetValue !== false && s.presetValue.protected)
@@ -861,8 +1014,14 @@ let MyField = {
// check join of field attribute
let join = s.joinsIndexMap[s.field.index];
- if(join.recordNoSet) return false; // SET denied on join due to relation policy
- if(join.recordId !== 0) return join.applyUpdate; // SET dependent on join allowing record update
+
+ // SET denied on join due to relation policy
+ if(join.recordNoSet)
+ return false;
+
+ // SET dependent on join allowing record update
+ if(join.recordId !== 0 || s.isBulkUpdate)
+ return join.applyUpdate;
// field attribute relation has no record ID
// collect relationship chain until source relation
@@ -889,137 +1048,162 @@ let MyField = {
// bool states
isLineInput:(s) => s.isData
- && !s.isBoolean
- && !s.isColor
- && !s.isFiles
- && !s.isDateInput
- && !s.isLogin
- && !s.isSlider
- && !s.isTextarea
- && !s.isRelationship
- && !s.isRichtext
- && !s.isUuid,
+ && !s.isBoolean && !s.isColor
+ && !s.isDateInput && !s.isDrawing
+ && !s.isFiles && !s.isIframe
+ && !s.isLogin && !s.isSlider
+ && !s.isTextarea && !s.isRegconfig
+ && !s.isRelationship && !s.isRichtext
+ && !s.isUuid && !s.isBarcode
+ && !s.isRating,
+ isLineSingle:(s) => s.isData && (
+ s.isLineInput || s.isBoolean || s.isColor || s.isDateInput || s.isSlider || s.isRating ||
+ s.isLogin || s.isRegconfig || s.isUuid || (s.isRelationship && !s.isRelationship1N)
+ ),
isValid:(s) => {
if(!s.isData || s.isReadonly) return true;
if(s.value === null) return !s.isRequired;
if(!s.isValidValue) return false;
return true;
},
- isValidValue:(s) => {
- if(!s.isData) return true;
- if(s.customErr !== null) return false;
- if(s.inputRegex !== null && !s.inputRegex.test(s.value)) return false;
- if(s.isDecimal && !/^-?\d+\.?\d*$/.test(s.value)) return false;
- if(s.isInteger && !/^-?\d+$/.test(s.value)) return false;
-
- if(s.isUuid && !/^[0-9a-f]{8}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{12}$/i.test(s.value))
- return false;
+ isValidMax:(s) => {
+ if(!s.isData || s.isVariable || s.value === null) return true;
+ if(s.isDecimal || s.isInteger) return s.field.max === null || s.value <= s.field.max;
+
+ if(s.isString) {
+ if(s.field.max !== null) return s.value.length <= s.field.max; // field max. settings count if set
+ if(s.attribute !== false && s.attribute.length !== 0) return s.value.length <= s.attribute.length; // attribute length as fallback
+ return true;
+ }
+
+ if(s.isFiles)
+ return s.field.max === null || (typeof s.value.fileCount !== 'undefined' ? s.value.fileCount <= s.field.max : s.value.length <= s.field.max);
- return s.isValidMin && s.isValidMax;
+ return true;
},
isValidMin:(s) => {
- if(!s.isData || s.value === null || s.field.min === null) return true;
- if((s.isDecimal || s.isInteger) && s.value < s.field.min) return false;
- if(s.isString && s.value.length < s.field.min) return false;
+ if(!s.isData || s.isVariable || s.value === null || s.field.min === null) return true;
+ if(s.isDecimal || s.isInteger) return s.value >= s.field.min;
+ if(s.isString) return s.value.length >= s.field.min;
if(s.isFiles) return typeof s.value.fileCount !== 'undefined'
? s.value.fileCount >= s.field.min : s.value.length >= s.field.min;
return true;
},
- isValidMax:(s) => {
- if(!s.isData || s.value === null || s.field.max === null) return true;
- if((s.isDecimal || s.isInteger) && s.value > s.field.max) return false;
- if(s.isString && s.value.length > s.field.max) return false;
+ isValidValue:(s) => {
+ if(!s.isData) return true;
+ if(s.customErr !== null) return false;
+ if(s.inputRegex !== null && !s.inputRegex.test(s.value)) return false;
+
+ if(typeof s.value === 'string') {
+ if(s.isDecimal && !/^-?\d+[\.\,]?\d*$/.test(s.value)) return false;
+ if(s.isInteger && !/^-?\d+$/.test(s.value)) return false;
+ }
- if(s.isFiles) return typeof s.value.fileCount !== 'undefined'
- ? s.value.fileCount <= s.field.max : s.value.length <= s.field.max;
+ if(s.isUuid && !/^[0-9a-f]{8}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{12}$/i.test(s.value))
+ return false;
- return true;
+ return s.isValidMin && s.isValidMax;
},
// simple
- attribute: (s) => !s.isData || typeof s.attributeIdMap[s.field.attributeId] === 'undefined'
- ? false : s.attributeIdMap[s.field.attributeId],
- customErr: (s) => typeof s.fieldIdMapError[s.field.id] !== 'undefined'
- && s.fieldIdMapError[s.field.id] !== null ? s.fieldIdMapError[s.field.id] : null,
- hasCaption: (s) => !s.isAloneInTab && (s.focused || s.value !== null || s.isCleanUi || s.isBoolean
- || s.isDateInput || s.isSlider || s.isRichtext || s.isCategory || s.isRelationship || s.isFiles || s.isUuid),
- isCleanUi: (s) => s.settings.fieldClean,
- inputRegex: (s) => !s.isData || s.field.regexCheck === null ? null : new RegExp(s.field.regexCheck),
+ attribute: (s) => s.isData && !s.isVariable ? s.attributeIdMap[s.field.attributeId] : false ,
+ content: (s) => s.isVariable ? 'data' : s.field.content,
+ contentData:(s) => s.isData && !s.isVariable ? s.attribute.content : s.variable.content,
+ contentUse: (s) => s.isData && !s.isVariable ? s.attribute.contentUse : s.variable.contentUse,
+ customErr: (s) => s.fieldIdMapOverwrite.error[s.field.id] !== undefined
+ && s.fieldIdMapOverwrite.error[s.field.id] !== null ? s.fieldIdMapOverwrite.error[s.field.id] : null,
+ dataOptions:(s) => s.entityIdMapEffect.field[s.field.id] === undefined ? 0 : s.entityIdMapEffect.field[s.field.id].data,
+ hasCaption: (s) => !s.isKanban && !s.isCalendar && !s.isAlone && s.caption !== '',
+ hasIntent: (s) => !s.isChart && !s.isKanban && !s.isCalendar && !s.isTabs && !s.isList && !s.isDrawing && !s.isFiles && !s.isBarcode && !s.isTextarea && !s.isRichtext,
+ inputRegex: (s) => !s.isData || s.isVariable || s.field.regexCheck === null ? null : new RegExp(s.field.regexCheck),
link: (s) => !s.isData ? false : s.getLinkMeta(s.field.display,s.value),
- showInvalid:(s) => !s.isValid && (s.formBadSave || !s.notTouched),
+ showInvalid:(s) => !s.isValid && (s.formBadSave || s.isTouched),
+ variable: (s) => (!s.isVariable || s.field.variableId === null) ? false : s.variableIdMap[s.field.variableId],
- // content
- isButton: (s) => s.field.content === 'button',
- isCalendar: (s) => s.field.content === 'calendar',
- isChart: (s) => s.field.content === 'chart',
- isContainer:(s) => s.field.content === 'container',
- isData: (s) => s.field.content === 'data',
- isList: (s) => s.field.content === 'list',
- isTabs: (s) => s.field.content === 'tabs',
+ // content types
+ isButton: (s) => s.content === 'button',
+ isCalendar: (s) => s.content === 'calendar',
+ isChart: (s) => s.content === 'chart',
+ isContainer:(s) => s.content === 'container',
+ isData: (s) => s.content === 'data',
+ isHeader: (s) => s.content === 'header',
+ isKanban: (s) => s.content === 'kanban',
+ isList: (s) => s.content === 'list',
+ isTabs: (s) => s.content === 'tabs',
+ isVariable: (s) => s.field.content === 'variable',
// states
- isHidden: (s) => s.stateFinal === 'hidden' || s.isHiddenInParent,
+ isAlone: (s) => s.isAloneInForm || s.isAloneInTab,
+ isHidden: (s) => s.stateFinal === 'hidden' || s.parentIsHidden,
+ isTouched: (s) => s.fieldIdsTouched.includes(s.field.id),
isReadonly:(s) => s.stateFinal === 'readonly',
isRequired:(s) => s.stateFinal === 'required',
// display options
- isLogin: (s) => s.isData && s.field.display === 'login',
- isPassword:(s) => s.isData && s.field.display === 'password',
- isSlider: (s) => s.isData && s.field.display === 'slider',
+ isLogin: (s) => s.isData && s.field.display === 'login',
+ isMonospace:(s) => s.field.flags.includes('monospace'),
+ isPassword: (s) => s.isData && s.field.display === 'password',
+ isRating: (s) => s.isData && s.field.display === 'rating',
+ isSlider: (s) => s.isData && s.field.display === 'slider',
// composite
- isActive: (s) => !s.isMobile || s.field.onMobile,
+ isActive: (s) => s.loaded && (!s.isMobile || s.field.onMobile) && (!s.isVariable || s.field.variableId !== null),
+ isBarcode: (s) => s.isData && s.contentUse === 'barcode',
isEncrypted: (s) => s.isData && s.attribute.encrypted,
- isNew: (s) => s.isData && s.joinsIndexMap[s.field.index].recordId === 0,
- isBoolean: (s) => s.isData && s.isAttributeBoolean(s.attribute.content),
+ isNew: (s) => s.isData && !s.isVariable && s.joinsIndexMap[s.field.index].recordId === 0,
+ isBoolean: (s) => s.isData && s.isAttributeBoolean(s.contentData),
isCategory: (s) => s.isData && s.isRelationship && s.field.category,
isClipboard: (s) => s.isData && s.field.clipboard && !s.isFiles && !s.isRelationship,
- isColor: (s) => s.isData && s.attribute.contentUse === 'color',
- isDate: (s) => s.isData && s.attribute.contentUse === 'date',
- isDatetime: (s) => s.isData && s.attribute.contentUse === 'datetime',
+ isColor: (s) => s.isData && s.contentUse === 'color',
+ isDate: (s) => s.isData && s.contentUse === 'date',
+ isDatetime: (s) => s.isData && s.contentUse === 'datetime',
isDateInput: (s) => s.isData && s.isDatetime || s.isDate || s.isTime,
- isDateRange: (s) => s.isDateInput && s.field.attributeIdAlt !== null,
- isDecimal: (s) => s.isData && s.isAttributeDecimal(s.attribute.content),
- isFiles: (s) => s.isData && s.isAttributeFiles(s.attribute.content),
- isInteger: (s) => s.isData && s.isAttributeInteger(s.attribute.content),
- isQuery: (s) => s.isCalendar || s.isChart || s.isList || s.isRelationship,
- isRichtext: (s) => s.isData && s.attribute.contentUse === 'richtext',
- isString: (s) => s.isData && s.isAttributeString(s.attribute.content),
- isTextarea: (s) => s.isData && s.attribute.contentUse === 'textarea',
- isTime: (s) => s.isData && s.attribute.contentUse === 'time',
- isUuid: (s) => s.isData && s.isAttributeUuid(s.attribute.content),
- isRelationship: (s) => s.isData && s.isAttributeRelationship(s.attribute.content),
- isRelationship1N:(s) => s.isRelationship && s.field.outsideIn === true && s.attribute.content === 'n:1',
+ isDateRange: (s) => s.isDateInput && !s.isVariable && s.field.attributeIdAlt !== null,
+ isDecimal: (s) => s.isData && s.isAttributeDecimal(s.contentData),
+ isDrawing: (s) => s.isData && s.contentUse === 'drawing',
+ isFiles: (s) => s.isData && s.isAttributeFiles(s.contentData),
+ isIframe: (s) => s.isData && s.contentUse === 'iframe',
+ isInteger: (s) => s.isData && s.isAttributeInteger(s.contentData),
+ isQuery: (s) => s.isCalendar || s.isChart || s.isKanban || s.isList || s.isRelationship,
+ isRegconfig: (s) => s.isData && s.isAttributeRegconfig(s.contentData),
+ isRichtext: (s) => s.isData && s.contentUse === 'richtext',
+ isString: (s) => s.isData && s.isAttributeString(s.contentData),
+ isTextarea: (s) => s.isData && s.contentUse === 'textarea',
+ isTime: (s) => s.isData && s.contentUse === 'time',
+ isUuid: (s) => s.isData && s.isAttributeUuid(s.contentData),
+ isRelationship: (s) => s.isData && s.isAttributeRelationship(s.contentData),
+ isRelationship1N:(s) => s.isRelationship && (s.contentData === '1:n' || (s.field.outsideIn === true && s.contentData === 'n:1')),
// stores
- token: (s) => s.$store.getters['local/token'],
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
attributeIdMap: (s) => s.$store.getters['schema/attributeIdMap'],
iconIdMap: (s) => s.$store.getters['schema/iconIdMap'],
presetIdMapRecordId:(s) => s.$store.getters['schema/presetIdMapRecordId'],
+ variableIdMap: (s) => s.$store.getters['schema/variableIdMap'],
access: (s) => s.$store.getters.access,
capApp: (s) => s.$store.getters.captions.form,
capGen: (s) => s.$store.getters.captions.generic,
isMobile: (s) => s.$store.getters.isMobile,
- moduleLanguage: (s) => s.$store.getters.moduleLanguage,
+ searchDictionaries: (s) => s.$store.getters.searchDictionaries,
settings: (s) => s.$store.getters.settings
},
mounted() {
- // fill stored collection row indexes
- this.collectionIdMapIndexes = this.fieldOptionGet(this.field.id,'collectionIdMapIndexes',{});
+ this.reloadOptions();
+ this.loaded = true;
},
methods:{
// externals
fieldOptionGet,
fieldOptionSet,
+ getCaption,
+ getColumnsProcessed,
getFlexStyle,
+ getFormPopUpConfig,
getIndexAttributeId,
- getInputFieldName,
getLinkMeta,
getNilUuid,
- getQueryColumnsProcessed,
getQueryFiltersProcessed,
hasAccessToAttribute,
isAttributeBoolean,
@@ -1027,87 +1211,119 @@ let MyField = {
isAttributeFiles,
isAttributeInteger,
isAttributeRelationship,
+ isAttributeRegconfig,
isAttributeString,
isAttributeUuid,
openLink,
setGetterArgs,
srcBase64,
+ variableValueGet,
+ variableValueSet,
+
+ // reloads
+ reloadOptions() {
+ if(this.isTabs)
+ this.setTabToValid();
+
+ this.columnIdsByUser = this.fieldOptionGet(this.favoriteId,this.field.id,'columnIdsByUser',[]);
+
+ // fill stored collection row indexes
+ this.collectionIdMapIndexes = this.fieldOptionGet(this.favoriteId,this.field.id,'collectionIdMapIndexes',{});
+ },
// presentation
getTabClasses(tabIndex) {
if(!this.isTabs) return {};
- let active = tabIndex === this.tabIndexShow;
- let fields = this.field.tabs[tabIndex].fields;
- let oneField = fields.length === 1;
- let readonly = false;
+ const active = tabIndex === this.tabIndexShow;
+ const fields = this.field.tabs[tabIndex].fields;
+ const oneField = fields.length === 1 ? fields[0] : false;
+ let readonly = false;
+ let drawing = false;
+ let files = false;
+
+ if(oneField && typeof this.$refs['tabField_'+oneField.id] !== 'undefined')
+ readonly = this.$refs['tabField_'+oneField.id]['0'].isReadonly;
- if(oneField && typeof this.$refs['tabField_'+fields[0].id] !== 'undefined')
- readonly = this.$refs['tabField_'+fields[0].id]['0'].isReadonly;
+ if(oneField && oneField.content === 'data') {
+ const atr = this.attributeIdMap[oneField.attributeId];
+ drawing = atr.contentUse === 'drawing';
+ files = atr.content === 'files';
+ }
return {
- active:tabIndex === this.tabIndexShow,
- error:this.formBadSave && this.tabIndexesInvalidFields.includes(tabIndex),
- readonly: active && oneField && readonly,
- showsCal: active && oneField && fields[0].content === 'calendar',
- showsChart:active && oneField && fields[0].content === 'chart',
- showsData: active && oneField && fields[0].content === 'data',
- showsList: active && oneField && fields[0].content === 'list',
- showsTabs: active && oneField && fields[0].content === 'tabs'
+ active: tabIndex === this.tabIndexShow,
+ error: this.formBadSave && this.tabIndexesInvalidFields.includes(tabIndex),
+ inputBg: active && oneField && !files && !drawing && oneField.content === 'data',
+ readonly:active && oneField && readonly
};
},
// actions
- blur() {
- this.focused = false;
- },
copyToClipboard() {
- navigator.clipboard.writeText(this.value);
+ const value = !this.isBarcode || this.value === null
+ ? this.value
+ : JSON.parse(this.value).text;
+
+ navigator.clipboard.writeText(value);
this.$emit('clipboard');
},
- focus() {
- this.focused = true;
- },
click() {
if(this.isColor && !this.isReadonly)
- this.showColorPickerInput = !this.showColorPickerInput;
+ this.dropdownShow = !this.dropdownShow;
},
clickOutside() {
- if(this.showColorPickerInput)
- this.showColorPickerInput = false;
+ if(this.dropdownShow)
+ this.dropdownShow = false;
},
- openForm(recordId,getters,middleClick) {
+ closeInline() {
+ this.popUpFormInline = null;
+ },
+ openForm(rows,getterArgs,newTab,openFormContext) {
// set defaults
- if(typeof recordId === 'undefined') recordId = 0;
- if(typeof getters === 'undefined') getters = [];
- if(typeof middleClick === 'undefined') middleClick = false;
+ if(typeof rows === 'undefined') rows = [];
+ if(typeof getterArgs === 'undefined') getterArgs = [];
+ if(typeof newTab === 'undefined') newTab = false;
+ if(typeof openFormContext === 'undefined') openFormContext = null;
+
+ // form open context
+ let openForm = JSON.parse(JSON.stringify(
+ openFormContext === 'bulk' ? this.field.openFormBulk : this.field.openForm
+ ));
- // apply record from defined relation index as attribute value via getter
- if(this.field.openForm.attributeIdApply !== null
- && typeof this.joinsIndexMap[this.field.openForm.relationIndex] !== 'undefined'
- && this.joinsIndexMap[this.field.openForm.relationIndex].recordId !== 0) {
+ let recordIds = [];
+ for(let row of rows) {
+ const id = row.indexRecordIds[openForm.relationIndexOpen];
- let atrId = this.field.openForm.attributeIdApply;
- let recordId = this.joinsIndexMap[this.field.openForm.relationIndex].recordId;
+ if(typeof id !== 'undefined' && id !== null)
+ recordIds.push(id);
+ }
+
+ // apply relationship default attribute value via getter
+ // apply for existing records also, default values are needed for parent reference when clicking 'new' after opening existing record
+ if(openForm.attributeIdApply !== null
+ && this.joinsIndexMap[openForm.relationIndexApply] !== undefined
+ && this.joinsIndexMap[openForm.relationIndexApply].recordId !== 0) {
- getters = this.setGetterArgs(getters,'attributes',`${atrId}_${recordId}`);
+ const atrId = openForm.attributeIdApply;
+ const recordId = this.joinsIndexMap[openForm.relationIndexApply].recordId;
+
+ getterArgs = this.setGetterArgs(getterArgs,'attributes',`${atrId}_${recordId}`);
}
- // apply source field ID
- let options = JSON.parse(JSON.stringify(this.field.openForm));
- options.fieldId = this.field.id;
+ // pop-up inline form (only inside none-inputs fields) and never on mobile
+ // pop-up float forms are sent upwards to the parent form to deal with
+ if(openForm.popUpType === 'inline' && !this.isMobile && !newTab)
+ return this.popUpFormInline = this.getFormPopUpConfig(
+ recordIds,openForm,getterArgs,'attributes');
- this.$emit('open-form',recordId,options,getters,middleClick);
+ this.$emit('open-form',recordIds,openForm,getterArgs,newTab,this.field.id);
},
- relationshipRecordSelected(recordId,middleClick) {
- if(recordId === null)
- return this.value = null;
+ relationshipRecordsSelected(recordIds) {
+ if(recordIds === null) return this.value = null;
+ if(!this.isRelationship1N) return this.value = recordIds[0];
+ if(this.value === null) return this.value = recordIds;
- if(!this.isRelationship1N)
- return this.value = recordId;
-
- let v = this.value === null ? [] : this.value;
- v.push(recordId);
- this.value = v;
+ this.value = this.value.concat(recordIds);
},
relationshipRecordRemoved(recordId) {
if(!this.isRelationship1N)
@@ -1120,12 +1336,18 @@ let MyField = {
}
this.value = valueNew.length !== 0 ? valueNew : null;
},
+ setColumnIdsByUser(ids) {
+ this.columnIdsByUser = ids;
+ this.fieldOptionSet(this.favoriteId,this.field.id,'columnIdsByUser',ids);
+ },
setCollectionIndexes(collectionId,indexes) {
this.collectionIdMapIndexes[collectionId] = indexes;
- this.fieldOptionSet(this.field.id,'collectionIdMapIndexes',this.collectionIdMapIndexes);
+ this.fieldOptionSet(this.favoriteId,this.field.id,'collectionIdMapIndexes',this.collectionIdMapIndexes);
},
setTab(tabIndex) {
- this.fieldOptionSet(this.field.id,'tabIndex',tabIndex);
+ if(this.settings.tabRemember)
+ this.fieldOptionSet(this.favoriteId,this.field.id,'tabIndex',tabIndex);
+
this.tabIndexShow = tabIndex;
},
setTabCounter(tabIndex,fieldId,value) {
@@ -1137,25 +1359,48 @@ let MyField = {
this.tabIndexFieldIdMapCounter[String(tabIndex)][fieldId] = value;
},
+ setTabToValid() {
+ // set tab to valid one, either last remembered or first valid
+ if(this.settings.tabRemember) {
+ const tabIndex = this.fieldOptionGet(this.favoriteId,this.field.id,'tabIndex',0);
+ if(this.field.tabs.length > tabIndex && !this.tabIndexesHidden.includes(tabIndex))
+ return this.tabIndexShow = tabIndex;
+ }
+ for(let i = 0, j = this.field.tabs.length; i < j; i++) {
+ if(!this.tabIndexesHidden.includes(i))
+ return this.tabIndexShow = i;
+ }
+ },
setValue(val,valOld,indexAttributeId) {
+ // clean inputs
if(val === '')
val = null;
+
+ if(val !== null && typeof val === 'string') {
+ if(this.isInteger && /^\-?\d+$/.test(val))
+ val = parseInt(val);
+
+ if(this.isDecimal)
+ val = val.replace(',','.');
+ }
- // parse string input to integer if integer field and valid integer value
- if(this.isInteger && val !== null && /^\-?\d+$/.test(val))
- val = parseInt(val);
-
- if(val !== valOld)
- this.notTouched = false;
-
- this.$emit('set-value',indexAttributeId,val);
+ if(!this.isVariable) {
+ // regular field, send changes up to the form
+ this.$emit('set-value',indexAttributeId,val,false,true,this.field.id);
+ } else {
+ // variable field, send changes to the variable
+ if(!this.isTouched && val !== valOld)
+ this.$emit('set-touched',this.field.id);
+
+ this.variableValueSet(this.variable.id,val,this.variableIdMapLocal);
+ }
if(this.field.jsFunctionId !== null)
this.$emit('execute-function',this.field.jsFunctionId);
},
triggerButton(middleClick) {
if(this.field.openForm !== null)
- this.openForm(0,[],middleClick);
+ this.openForm([],[],middleClick,null);
if(this.field.jsFunctionId !== null)
this.$emit('execute-function',this.field.jsFunctionId);
diff --git a/www/comps/filters.css b/www/comps/filters.css
index ef3aca5b..e1932c2a 100644
--- a/www/comps/filters.css
+++ b/www/comps/filters.css
@@ -1,17 +1,9 @@
.filters{
- max-width:850px;
+ max-width:1000px;
min-width:500px;
display:flex;
flex-flow:column nowrap;
}
-.filter-actions{
- display:flex;
- flex-flow:row wrap;
- justify-content:space-between;
-}
-.filter-actions.end{
- margin-top:6px;
-}
.filter{
flex:1 1 auto;
display:flex;
@@ -19,6 +11,7 @@
align-items:center;
margin:0px 0px 6px 0px;
position:relative;
+ gap:3px;
}
.filter img.dragAnchor{
height:24px;
@@ -49,17 +42,18 @@
flex:0 0 80px;
width:80px !important;
min-width:unset;
- margin-right:3px;
}
.filter select.operator{
flex:0.5 0.3 80px;
}
.filter-side{
+ flex:1 1 auto;
display:flex;
flex-flow:row wrap;
- flex:0 1 auto;
}
.filter-side-inputs{
+ gap:3px;
+ flex:1 1 auto;
display:flex;
flex-flow:row nowrap;
}
@@ -68,5 +62,7 @@
.filter-side-inputs>.input-custom{
min-width:unset !important;
max-width:unset !important;
- margin-right:3px !important;
+}
+.filter-side-indentation{
+ flex:0 0 auto;
}
\ No newline at end of file
diff --git a/www/comps/filters.js b/www/comps/filters.js
index 337b443e..988ed9f2 100644
--- a/www/comps/filters.js
+++ b/www/comps/filters.js
@@ -1,14 +1,13 @@
-import MyBuilderQuery from './builder/builderQuery.js';
-import MyInputDate from './inputDate.js';
+import MyBuilderQuery from './builder/builderQuery.js';
+import MyInputDate from './inputDate.js';
+import {isAttributeString} from './shared/attribute.js';
+import {getColumnIsFilterable} from './shared/column.js';
+import {getCaption} from './shared/language.js';
import {
getDependentModules,
getItemTitleColumn,
getItemTitleNoRelationship
} from './shared/builder.js';
-import {
- isAttributeFiles,
- isAttributeString
-} from './shared/attribute.js';
import {
getNestedIndexAttributeIdsByJoins,
getQueryTemplate
@@ -60,58 +59,82 @@ let MyFilterBrackets = {
}
};
-let MyFilterOperatorOption = {
- name:'my-filter-operator-option',
- template:``,
- props:{
- builderMode:{ type:Boolean, required:true },
- caption: { type:String, required:true },
- value: { type:String, required:true }
- },
- computed:{
- displayCaption:(s) => !s.builderMode ? s.caption : s.value
- }
-};
-
let MyFilterOperator = {
name:'my-filter-operator',
- components:{ MyFilterOperatorOption },
template:``,
watch:{
- onlyDates:function(v) {
+ onlyDates(v) {
if(v && (this.value === 'ILIKE' || this.value === 'LIKE'))
this.$emit('update:modelValue','=');
}
@@ -120,7 +143,7 @@ let MyFilterOperator = {
builderMode:{ type:Boolean, required:true }, // only show in Builder mode (e. g. not for regular users)
modelValue: { type:String, required:true },
onlyDates: { type:Boolean, required:false, default:false }, // only show operators that can be used for date values (e. g. unix time)
- onlyEquals: { type:Boolean, required:false, default:false }, // only show equal/non-equal operators
+ onlyFts: { type:Boolean, required:false, default:false }, // only show full text search operators
onlyString: { type:Boolean, required:false, default:false } // only show string operators
},
emits:['update:modelValue'],
@@ -156,30 +179,53 @@ let MyFilterConnector = {
let MyFilterAttribute = {
name:'my-filter-attribute',
template:``,
props:{
- columnsMode: { type:Boolean, required:true },
- groupQueries: { type:Boolean, required:false, default:false },
- modelValue: { type:String, required:true },
- nestingLevels: { type:Number, required:true },
- nestedIndexAttributeIds:{ type:Array, required:true }
+ columns: { type:Array, required:true },
+ columnBatches: { type:Array, required:true },
+ groupQueriesNested: { type:Boolean, required:false, default:false },
+ modelValue: { type:String, required:true },
+ nestedIndexAttributeIds:{ type:Array, required:true },
+ nestingLevels: { type:Number, required:true }
},
emits:['update:modelValue'],
computed:{
@@ -187,37 +233,48 @@ let MyFilterAttribute = {
get() { return this.modelValue; },
set(v) { this.$emit('update:modelValue',v); }
},
+
+ // simple
+ columnsMode:(s) => s.columns.length !== 0,
// stores
relationIdMap: (s) => s.$store.getters['schema/relationIdMap'],
attributeIdMap:(s) => s.$store.getters['schema/attributeIdMap'],
- capApp: (s) => s.$store.getters.captions.filter,
- moduleLanguage:(s) => s.$store.getters.moduleLanguage
+ capApp: (s) => s.$store.getters.captions.filter
},
methods:{
// externals
+ getCaption,
+ getColumnIsFilterable,
getItemTitleNoRelationship,
-
- // presentation
- getAttributeCaption(nestedIndexAttributeId) {
- let v = nestedIndexAttributeId.split('_');
- let atr = this.attributeIdMap[v[2]];
-
- if(this.columnsMode) {
- // 1st preference: dedicated attribute title
- if(typeof atr.captions.attributeTitle[this.moduleLanguage] !== 'undefined')
- return atr.captions.attributeTitle[this.moduleLanguage];
-
- // if nothing else is available: attribute name
- return atr.name;
+
+ getAttributeCaption(attributeId) {
+ const atr = this.attributeIdMap[attributeId];
+ const rel = this.relationIdMap[atr.relationId];
+ return this.getCaption('attributeTitle',rel.moduleId,atr.id,atr.captions,atr.name);
+ },
+ getColumnBatchIndexesValid(columnBatch) {
+ let out = [];
+ for(const columnIndex of columnBatch.columnIndexes) {
+ if(this.getColumnIsFilterable(this.columns[columnIndex]))
+ out.push(columnIndex);
}
+ return out;
+ },
+ getNestedIndexAttributeIdByColumnIndex(columnIndex) {
+ if(columnIndex >= this.columns.length) return '';
+ const column = this.columns[columnIndex];
+ return `0_${column.index}_${column.attributeId}`;
+ },
+ getNestedIndexAttributeCaption(nestedIndexAttributeId) {
+ const v = nestedIndexAttributeId.split('_');
+ const atr = this.attributeIdMap[v[2]];
return this.getItemTitleNoRelationship(atr.id,v[1]);
},
getQueryLabel(nestingLevel) {
- if(nestingLevel === 0)
- return this.capApp.nestingMain;
-
- return this.capApp.nestingSub + ' ' + nestingLevel;
+ return nestingLevel === 0
+ ? this.capApp.nestingMain
+ : this.capApp.nestingSub + ' ' + nestingLevel;
}
}
};
@@ -239,6 +296,13 @@ let MyFilterSide = {
@input="setContent"
:value="content"
>
+
-
+
-
-
-
-
- {{ tabIndexesTitle[i] }}
-
-
-
+
@@ -490,86 +630,85 @@ let MyField = {
@open-form="(...args) => $emit('open-form',...args)"
@set-counter="(...args) => $emit('set-counter',...args)"
@set-form-args="(...args) => $emit('set-form-args',...args)"
+ @set-touched="(...args) => $emit('set-touched',...args)"
@set-valid="(...args) => $emit('set-valid',...args)"
@set-value="(...args) => $emit('set-value',...args)"
- @set-value-init="(...args) => $emit('set-value-init',...args)"
+ :isBulkUpdate="isBulkUpdate"
:dataFieldMap="dataFieldMap"
- :entityIdMapState="entityIdMapState"
+ :entityIdMapEffect="entityIdMapEffect"
+ :favoriteId="favoriteId"
:field="f"
:fieldIdsChanged="fieldIdsChanged"
:fieldIdsInvalid="fieldIdsInvalid"
- :fieldIdMapCaption="fieldIdMapCaption"
- :fieldIdMapError="fieldIdMapError"
+ :fieldIdsTouched="fieldIdsTouched"
+ :fieldIdMapOverwrite="fieldIdMapOverwrite"
:formBadSave="formBadSave"
- :formIsPopUp="formIsPopUp"
+ :formIsEmbedded="formIsEmbedded"
:formLoading="formLoading"
:formReadonly="formReadonly"
:flexDirParent="field.direction"
:isAloneInForm="isAloneInForm"
- :isHiddenInParent="isHidden"
:joinsIndexMap="joinsIndexMap"
:key="f.id"
+ :moduleId="moduleId"
+ :parentIsCounting="parentIsCounting"
+ :parentIsHidden="isHidden"
:values="values"
+ :variableIdMapLocal="variableIdMapLocal"
/>
-
-
+
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
+ 
+