From 3c43bbe5ac50078057685acb629cfbcf2d11b310 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Thu, 23 Sep 2021 18:17:48 +0200 Subject: [PATCH] Update corteza-locale dep --- go.mod | 2 +- go.sum | 2 + .../cortezaproject/corteza-locale/DEV.md | 44 +- .../corteza-locale/src/en/config.yaml | 13 - .../corteza-server/auth/change-password.yaml | 11 +- .../corteza-server/auth/create-password.yaml | 14 + .../auth/password-reset-requested.yaml | 6 +- .../src/en/corteza-server/auth/profile.yaml | 2 + .../src/en/corteza-server/auth/signup.yaml | 6 +- .../en/corteza-server/compose/namespace.yaml | 3 + .../src/en/corteza-webapp-admin/admin.yaml | 167 ------- .../automation.permissions.yaml | 34 -- .../automation.scripts.yaml | 2 - .../automation.sessions.yaml | 2 - .../automation.workflows.yaml | 2 - .../en/corteza-webapp-admin/automation.yaml | 2 - .../compose.automation.yaml | 2 - .../compose.permissions.yaml | 73 --- .../compose.settings.yaml | 2 - .../src/en/corteza-webapp-admin/compose.yaml | 2 - .../en/corteza-webapp-admin/dashboard.yaml | 2 - .../federation.nodes.yaml | 2 - .../federation.permissions.yaml | 44 -- .../en/corteza-webapp-admin/federation.yaml | 2 - .../en/corteza-webapp-admin/navigation.yaml | 43 ++ .../en/corteza-webapp-admin/permissions.yaml | 458 ++++++++++++++++++ .../system.actionlog.yaml | 2 - .../en/corteza-webapp-admin/system.apigw.yaml | 7 +- .../system.applications.yaml | 2 - .../system.authclients.yaml | 6 +- .../system.permissions.yaml | 118 ----- .../corteza-webapp-admin/system.queues.yaml | 2 - .../en/corteza-webapp-admin/system.roles.yaml | 2 - .../corteza-webapp-admin/system.settings.yaml | 2 - .../en/corteza-webapp-admin/system.stats.yaml | 2 - .../system.templates.yaml | 2 - .../en/corteza-webapp-admin/system.users.yaml | 2 - .../src/en/corteza-webapp-admin/system.yaml | 2 - .../en/corteza-webapp-admin/ui.settings.yaml | 3 - .../src/en/corteza-webapp-compose/block.yaml | 78 ++- .../src/en/corteza-webapp-compose/chart.yaml | 15 + .../src/en/corteza-webapp-compose/field.yaml | 9 +- .../en/corteza-webapp-compose/general.yaml | 47 +- .../src/en/corteza-webapp-compose/module.yaml | 50 +- .../en/corteza-webapp-compose/namespace.yaml | 24 + .../en/corteza-webapp-compose/navigation.yaml | 2 - .../corteza-webapp-compose/notification.yaml | 7 - .../en/corteza-webapp-compose/onboarding.yaml | 9 + .../src/en/corteza-webapp-compose/page.yaml | 34 +- .../en/corteza-webapp-compose/permission.yaml | 131 ----- .../corteza-webapp-compose/permissions.yaml | 145 ++++++ .../en/corteza-webapp-compose/preview.yaml | 8 +- .../resource-translator.yaml | 17 + .../en/corteza-webapp-compose/sidebar.yaml | 5 + .../src/en/corteza-webapp-one/layout.yaml | 2 +- .../en/corteza-webapp-reporter/general.yaml | 2 + .../corteza-webapp-reporter/permission.yaml | 23 - .../corteza-webapp-reporter/permissions.yaml | 32 ++ .../corteza-webapp-workflow/navigation.yaml | 1 + .../corteza-webapp-workflow/permission.yaml | 35 -- .../corteza-webapp-workflow/permissions.yaml | 44 ++ vendor/modules.txt | 2 +- 62 files changed, 1054 insertions(+), 762 deletions(-) create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.permissions.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/compose.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.permissions.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/federation.yaml create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/navigation.yaml create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/permissions.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.permissions.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.stats.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/system.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permission.yaml create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/permissions.yaml create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-compose/resource-translator.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permission.yaml create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-reporter/permissions.yaml delete mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permission.yaml create mode 100644 vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-workflow/permissions.yaml diff --git a/go.mod b/go.mod index 1b6b13bef..3aaa0790e 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/SentimensRG/ctx v0.0.0-20180729130232-0bfd988c655d github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d github.com/brianvoe/gofakeit/v6 v6.5.0 - github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14 + github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7 github.com/crewjam/saml v0.4.5 github.com/crusttech/go-oidc v0.0.0-20180918092017-982855dad3e1 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index 83d25b620..1801c241e 100644 --- a/go.sum +++ b/go.sum @@ -90,6 +90,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14 h1:QMaq2KCK3t0PDwJ6i9tBfxihbUhUMB6/4UatwEAhKhg= github.com/cortezaproject/corteza-locale v0.0.0-20210902094343-6e40ca3a7d14/go.mod h1:wsI1UftEdBqTuEDKBZmx2LfNu/kZun5pRbCAi420JCg= +github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7 h1:tlx1ruaAgwzWzK8lPDglH2iMGW+sYJXlTP12hkCoYz0= +github.com/cortezaproject/corteza-locale v0.0.0-20210923111547-fb8aa18cc3b7/go.mod h1:wsI1UftEdBqTuEDKBZmx2LfNu/kZun5pRbCAi420JCg= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da h1:WXnT88cFG2davqSFqvaFfzkSMC0lqh/8/rKZ+z7tYvI= github.com/crewjam/httperr v0.0.0-20190612203328-a946449404da/go.mod h1:+rmNIXRvYMqLQeR4DHyTvs6y0MEMymTz4vyFpFkKTPs= diff --git a/vendor/github.com/cortezaproject/corteza-locale/DEV.md b/vendor/github.com/cortezaproject/corteza-locale/DEV.md index dea2f9384..cff9c2177 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/DEV.md +++ b/vendor/github.com/cortezaproject/corteza-locale/DEV.md @@ -1,17 +1,38 @@ -# Guide for frontend and backend developers +# Developer's guide to corteza-locale + +## Notes translation files + +Please note that not old translations follow these rules. +All new features and larger changes should strictly follow them + +### Translation namespaces + - In general, keep **each component** in its **own namespace**; with some exceptions + - Pass translated strings with params into smaller, reusable components + - Use namespace of the larger component when it is split into smaller, private components + - Corteza-vue as collection of reusable components must + - accept translated strings as arguments when there are few translations, or + - use a shared namespace name (like in case of `permissions.yaml`) + +### Translation keys + - keep keys in a structured format, especially when providing translations for larger component split into smaller parts and take advantage of key prefixes + - must be in **kebab-case**; using dash as a delimiter + - must be **descriptive**; + for example: if translations break or key is not translated the meaning should be clear + +## Setting up Corteza This guide is for corteza frontend and backend developers. It shows how to connect translations from corteza-locale repository to frontend web applications and backend server. -## Prerequisites +### Prerequisites Clone corteza-locale repository to a separate folder. -## Fronted developers +### Fronted developers -### Using corteza-server Docker container to support webapp development +#### Using corteza-server Docker container to support webapp development -#### Configuration with Docker Compose +##### Configuration with Docker Compose See the `docker-compose.yaml` in the root of the repository. @@ -25,7 +46,7 @@ docker-compose up -d window.CortezaAPI = `//localhost:1818/api` ``` -#### Verify the loaded languages +##### Verify the loaded languages ```shell docker-compose logs | grep locale | head @@ -34,19 +55,16 @@ docker-compose logs | grep locale | head This will show you first couple (head) filtered (grep) log lines. If some of them contain "language loaded" that reflect the setup in your `corteza-locale/src` you have successfully loaded translations into Corteza server. -#### Verify by loading translations +##### Verify by loading translations ```shell curl 'http://localhost:1818/api/system/locale/en/corteza-webapp-admin' -H "Accept: application/json" -H 'Accept-Language: en' ``` - - - -## Backend developers +### Backend developers Corteza server loads, parses and serves all languages files for all frontend web applications and server. -### Changes in configuration +#### Changes in configuration The following chapter assumes your Corteza server development env is already set-up @@ -60,7 +78,7 @@ Path can be absolute or relative and should contain subdirectories with language You can remove or comment-out LOCALE_LOG if you find the setting to verbose. -#### Verify the loaded languages +##### Verify the loaded languages When you (re)start your corteza server yu should see the following log among the first logged lines: diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml index 785a363ce..33dcc698a 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/config.yaml @@ -1,14 +1 @@ name: English - -#extends: base - - -# Language defaults, can be overwritten in the configuration -#formats: -# datetime: -# full: 'YYYY-MM-DD hh:mm:ss' -# short: 'YYYY-MM-DD' -# time: 'hh:mm' -# -# currency: '$' - diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml index 0990bb393..18575621f 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/change-password.yaml @@ -2,18 +2,15 @@ template: title: Change your password form: email: - label: E-mail * + label: E-mail placeholder: email@domain.ltd - aria-label: Email old-password: - label: Old password * + label: Old password placeholder: Enter your old password - aria-label: Old password new-password: - label: New password * + label: New password placeholder: Enter your new password - aria-label: New password button: change-password: Change your password alerts: - passw-changed: Password successfully changed. + password-change-success: Password successfully changed. diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml new file mode 100644 index 000000000..f255a35ba --- /dev/null +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/create-password.yaml @@ -0,0 +1,14 @@ +template: + title: Create your password + form: + email: + label: E-mail + password: + label: Password + placeholder: Enter your password + button: + create-password: Create your password +alerts: + invalid-expired-password-token: Invalid or expired password create token, please repeat password create request. + password-create-success: Password successfully created. + password-create-disabled: Password create disabled. diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml index dac8461e9..1b490ab93 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/password-reset-requested.yaml @@ -3,6 +3,6 @@ template: instructions: If the email you entered is found in our database, you'll receive a password reset link to your inbox in a few moments. links: Create new account or log in. alert: - inv-exp-passw-token: Invalid or expired password reset token, please repeat password reset request. - pass-reset-success: Password successfully reset. - pass-reset-disabled: Password reset disabled. + invalid-expired-password-token: Invalid or expired password reset token, please repeat password reset request. + password-reset-success: Password successfully reset. + password-reset-disabled: Password reset disabled. diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml index 5bd8e30e7..0ad43ab89 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/profile.yaml @@ -11,6 +11,8 @@ template: handle: label: Handle placeholder: Short name, nickname or handle + preferred-language: + label: Preferred language buttons: submit: Update profile alerts: diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml index a3b9db5c5..df32967f7 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/auth/signup.yaml @@ -2,10 +2,10 @@ template: title: Sign up form: email: - label: E-mail * + label: E-mail placeholder: email@domain.ltd password: - label: Password * + label: Password placeholder: Password name: label: Full name @@ -20,5 +20,5 @@ template: alerts: signup-successful: Sign-up successful. email-confirmed-logged-in: Email address confirmed, you're now logged-in. - inv-or-exp-token: Invalid or expired email confirmation token, please resend confirmation request. + invalid-expired-token: Invalid or expired email confirmation token, please resend confirmation request. signup-disabled: Signup disabled diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml index 8e5f17003..452e4b2c9 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-server/compose/namespace.yaml @@ -10,3 +10,6 @@ errors: notAllowedToUpdate: not allowed to update this namespace notFound: namespace does not exist staleData: stale data + unsupportedExportFormat: unsupported export format + unsupportedImportFormat: unsupported import format + cloneMultiple: not allowed to clone multiple namespaces at once diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml index e14b76ff0..0b80191e9 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/admin.yaml @@ -102,170 +102,3 @@ navigation: loggedInAs: Logged in as {{user}} logout: Logout profile: Profile -permission: - automationWorkflow: - all: all workflows - operations: - delete: - description: 'Default: deny' - specific: Delete this workflow - title: Delete any workflow - execute: - description: 'Default: deny' - specific: Execute this workflow - title: Execute any workflow - read: - description: 'Default: deny' - specific: Read this workflow - title: Read any workflow - sessionsManage: - description: 'Default: deny' - specific: Manage sessions for this workflow - title: Manage all sessions - triggersManage: - description: 'Default: deny' - specific: Manage triggers for this workflow - title: Manage all triggers - undelete: - description: 'Default: deny' - specific: Undelete this workflow - title: Undelete any workflow - update: - description: 'Default: deny' - specific: Update this workflow - title: Update any workflow - specific: workflow "{{target}}" - base: - compose: Compose - system: System - resetBack: Reset back to "{{current}}" - saveChanges: Save changes - setFor: Set permissions for {{target}} - systemApplication: - all: all applications - operations: - delete: - description: 'Default: deny' - specific: Delete {{target}} - title: Delete any application - read: - description: 'Default: deny' - specific: Read {{target}} - title: Read any application - update: - description: 'Default: deny' - specific: Update {{target}} - title: Update any application - specific: application "{{target}}" - systemApigwRoute: - all: all routes - operations: - delete: - description: 'Default: deny' - specific: Delete {{target}} - title: Delete any route - read: - description: 'Default: deny' - specific: Read {{target}} - title: Read any route - update: - description: 'Default: deny' - specific: Update {{target}} - title: Update any route - specific: route "{{target}}" - systemAuthClient: - all: all auth clients - operations: - authorize: - description: 'User can authorize (use) this client. Default: deny' - specific: Authorize client "{{target}} - title: Authorize any client - delete: - description: 'Default: deny' - specific: Delete client "{{target}} - title: Delete any client - read: - description: 'Default: deny' - specific: Read client "{{target}} - title: Read any client - update: - description: 'Default: deny' - specific: Update client "{{target}} - title: Update any client - specific: auth client "{{target}}" - systemRole: - all: all roles - operations: - delete: - description: 'Default: deny' - specific: Delete {{target}} - title: Delete any role - membersManage: - description: 'Default: deny' - specific: Manage members for {{target}} - title: Manage members for any role - read: - description: 'Default: deny' - specific: Read {{target}} - title: Read any role - update: - description: 'Default: deny' - specific: Update {{target}} - title: Update any role - specific: role "{{target}}" - systemTemplate: - all: all templates - operations: - delete: - description: 'Default: deny' - specific: Delete {{target}} - title: Delete any template - read: - description: 'Default: deny' - specific: Read {{target}} - title: Read any template - render: - description: 'Default: deny' - specific: Render {{target}} - title: Render any template - update: - description: 'Default: deny' - specific: Update {{target}} - title: Update any template - specific: template "{{target}}" - systemUser: - all: all users - operations: - delete: - description: 'Default: deny' - specific: Delete {{target}} - title: Delete any user - emailUnmask: - description: 'Default: deny' - specific: Show email details for {{target}} - title: Show email details for any user - impersonate: - description: 'Default: deny' - specific: Impersonate this user {{target}} - title: Impersonate any user - nameUnmask: - description: 'Default: deny' - specific: Show name details for {{target}} - title: Show name details for any user - read: - description: 'Default: deny' - specific: Read {{target}} - title: Read any user - suspend: - description: 'Default: deny' - specific: Suspend {{target}} - title: Suspend any user - unsuspend: - description: 'Default: deny' - specific: Unsuspend {{target}} - title: Unsuspend any user - update: - description: 'Default: deny' - specific: Update {{target}} - title: Update any user - specific: user "{{target}}" diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml deleted file mode 100644 index 3786519c8..000000000 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.permissions.yaml +++ /dev/null @@ -1,34 +0,0 @@ -list: - rules: - add: Add role - addRole: Add new role - component: - operations: - grant: Grant permissions on automation - sessionsSearch: Search sessions - triggersSearch: Search triggers - workflowCreate: Create new workflow - workflowsSearch: Search workflows - type: - label: Automation - loading: Loading permissions - noRole: No role selected - notAllowed: Not allowed to set permissions - submit: Submit - tip1: Click on permission/role cell to allow a specific operation - tip2: Use Alt-Click to set explicit deny on operation - title: List of rules - workflow: - operations: - delete: Delete workflow - execute: Execute workflow - read: Read workflow - sessionsManage: Manage workflow sessions - triggersManage: Manage workflow triggers - undelete: Undelete workflow - update: Update workflow - type: - label: Workflow - title: Automation permissions -navItem: - label: Permissions diff --git a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml index 94291e40f..abd65eed3 100644 --- a/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml +++ b/vendor/github.com/cortezaproject/corteza-locale/src/en/corteza-webapp-admin/automation.scripts.yaml @@ -14,5 +14,3 @@ list: triggers: Triggers labelMissing: