diff --git a/backend/src/exceptions/text/messages.ts b/backend/src/exceptions/text/messages.ts index d47adc5d6..3d25d1479 100644 --- a/backend/src/exceptions/text/messages.ts +++ b/backend/src/exceptions/text/messages.ts @@ -1,5 +1,3 @@ -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; -import { UserRoleEnum } from '../../entities/user/enums/user-role.enum.js'; import { EncryptionAlgorithmEnum, LogOperationTypeEnum, @@ -8,8 +6,11 @@ import { UserActionEnum, WidgetTypeEnum, } from '../../enums/index.js'; + +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; import { TableActionEventEnum } from '../../enums/table-action-event-enum.js'; import { TableActionMethodEnum } from '../../enums/table-action-method-enum.js'; +import { UserRoleEnum } from '../../entities/user/enums/user-role.enum.js'; import { enumToString } from '../../helpers/enum-to-string.js'; import { toPrettyErrorsMsg } from '../../helpers/index.js'; export const Messages = { @@ -161,7 +162,7 @@ export const Messages = { GOOGLE_LOGIN_FAILED: 'Google account login failed. If the problem persists, please contact our support team.', GITHUB_AUTHENTICATION_FAILED: `GitHub authentication failed. If the problem persists, please contact our support team`, GITHUB_REGISTRATION_FAILED: `GitHub registration failed. If the problem persists, please contact our support team`, - HOST_MISSING: 'Host is missing', + HOST_MISSING: 'Hostname is missing', HOST_NAME_INVALID: 'Hostname is invalid', ID_MISSING: 'Id is missing', INCORRECT_DATE_FORMAT: `Date format is incorrect.`, diff --git a/backend/src/exceptions/utils/processing-messages-replace.ts b/backend/src/exceptions/utils/processing-messages-replace.ts index fd3fd70dc..96ef7e0c1 100644 --- a/backend/src/exceptions/utils/processing-messages-replace.ts +++ b/backend/src/exceptions/utils/processing-messages-replace.ts @@ -1,6 +1,6 @@ export const PROCESSING_MESSAGES_REPLACE = { getaddrinfo_ENOTFOUND: - 'Client was not able to connect to given address. Please check the hostname and port, ' + + 'Client was not able to connect to this address. Please check the hostname and port, ' + 'and make sure our servers are able to access your database. We use IP address 18.221.81.73 for all outbound requests.', ORA_02292: 'You tried to change a record in a table that is referenced by a record in a child table ', ALLOW_CONNECTIONS: diff --git a/frontend/src/app/components/connect-db/connect-db.component.html b/frontend/src/app/components/connect-db/connect-db.component.html index bdb25484b..fb130d244 100644 --- a/frontend/src/app/components/connect-db/connect-db.component.html +++ b/frontend/src/app/components/connect-db/connect-db.component.html @@ -5,11 +5,11 @@

- {{ connectionID ? 'Edit credentials' : 'Connect a database' }} + {{ connectionID ? 'Edit credentials' : 'Connect database' }}

- Connection title + Connection name Direct connection Agent connection @@ -57,18 +57,18 @@

warning_amber
- Please make sure our servers are able to access your database.
Rocketadmin uses + Please make sure our servers are able to access your database.
Rocketadmin uses the IP address - IP address for all outbound requests. + for all outbound requests.
- Please make sure our servers are able to access your database.
Rocketadmin uses + Please make sure our servers are able to access your database.
Rocketadmin uses the IP address - IP address for all outbound requests. + for all outbound requests.
@@ -173,7 +173,7 @@

- Visit our DockerHub page to install the Rocketadmin agent via Docker. + Visit our DockerHub page to install the Rocketadmin agent.

{ })); component.testConnection(); - expect(fakeNotifications.showSuccessSnackbar).toHaveBeenCalledOnceWith('Connection exists. Your credentials are correct.') + expect(fakeNotifications.showSuccessSnackbar).toHaveBeenCalledOnceWith('Connection is live') fakeNotifications.showSuccessSnackbar.calls.reset(); }); diff --git a/frontend/src/app/components/connect-db/connect-db.component.ts b/frontend/src/app/components/connect-db/connect-db.component.ts index c701a28b0..05f48f0c3 100644 --- a/frontend/src/app/components/connect-db/connect-db.component.ts +++ b/frontend/src/app/components/connect-db/connect-db.component.ts @@ -169,7 +169,7 @@ export class ConnectDBComponent implements OnInit { }); if (credsCorrect.result) { this._notifications.dismissAlert(); - this._notifications.showSuccessSnackbar('Connection exists. Your credentials are correct.') + this._notifications.showSuccessSnackbar('Connection is live') } else { this._notifications.showAlert(AlertType.Error, credsCorrect.message, [ { diff --git a/frontend/src/app/components/connect-db/db-connection-ip-access-dialog/db-connection-ip-access-dialog.component.html b/frontend/src/app/components/connect-db/db-connection-ip-access-dialog/db-connection-ip-access-dialog.component.html index 6b79b491a..3856827fc 100644 --- a/frontend/src/app/components/connect-db/db-connection-ip-access-dialog/db-connection-ip-access-dialog.component.html +++ b/frontend/src/app/components/connect-db/db-connection-ip-access-dialog/db-connection-ip-access-dialog.component.html @@ -1,11 +1,11 @@

Give access to our IP address

- Please make sure our servers are able to access your database. Rocketadmin uses IP address for all outbound requests. + Please make sure our servers are able to access your database. Rocketadmin uses the IP address for all outbound requests.


- Setup VPC security groups. + Set up AWS's VPC security groups
  1. Open the Amazon RDS console.
  2. @@ -23,7 +23,7 @@

    Give access to our IP address

- Setup firewall rules. + Set up Azure's firewall rules
  1. Open your database overview and select Networking from the navigation pane.
  2. In the Connectivity method you have to have Public access (allowed IP addresses).
    3. @@ -36,7 +36,7 @@

    Give access to our IP address

- Setup authorized networks + Set up Google Cloud's authorized networks
  1. Open your instance overview and select Connections from the navigation pane.
  2. @@ -136,27 +136,27 @@

    Give access to our IP address

     - Learn more for AWS + Setup guide - Learn more for Azure + Setup guide - Learn more for Google Cloud + Setup guide - Learn more for MongoDB Atlas + Setup guide - Learn more for DigitalOcean + Setup guide diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/base-credentials-form/base-credentials-form.component.css b/frontend/src/app/components/connect-db/db-credentials-forms/base-credentials-form/base-credentials-form.component.css index b2f5ea8c8..7f01bfa36 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/base-credentials-form/base-credentials-form.component.css +++ b/frontend/src/app/components/connect-db/db-credentials-forms/base-credentials-form/base-credentials-form.component.css @@ -22,6 +22,7 @@ color: inherit; background: transparent; border: none; + font-size: inherit; text-decoration: underline; cursor: pointer; } diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/db2-credentials-form/db2-credentials-form.component.html b/frontend/src/app/components/connect-db/db-credentials-forms/db2-credentials-form/db2-credentials-form.component.html index f5016f42c..d18753bc1 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/db2-credentials-form/db2-credentials-form.component.html +++ b/frontend/src/app/components/connect-db/db-credentials-forms/db2-credentials-form/db2-credentials-form.component.html @@ -9,16 +9,16 @@ [disabled]="submitting" [(ngModel)]="connection.host"> - E.g. my-test-connection.cvfuxe8nltiq.us-east-2.rds.amazonaws.com. - Connections from internal IPs (e.g. localhost) are not supported. + E.g. my-test-connection.cvfuxe8nltiq.us-east-2.rds.amazonaws.com
    + Connections from internal IPs (e.g. localhost) are not supported     - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. + Hostname is invalid @@ -31,7 +31,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.port"> - Port should not be empty. + Port should not be empty @@ -44,7 +44,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -57,9 +57,9 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. - + To keep password the same keep this field blank + Password needed due to hostname/port change + @@ -72,7 +72,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.database"> - Name should not be empty. + Name should not be empty @@ -85,7 +85,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.schema"> - Name should not be empty. + Name should not be empty @@ -116,7 +116,7 @@ Private SSH key - Private SSH key should not be empty. + Private SSH key should not be empty @@ -136,7 +136,7 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshHost"> - SSH host should not be empty. + SSH host should not be empty @@ -148,20 +148,20 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshPort"> - SSH port should not be empty. + SSH port should not be empty SSH username - SSH username should not be empty. + SSH username should not be empty - SSL certificate should not be empty. + SSL certificate should not be empty
\ No newline at end of file diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component.html b/frontend/src/app/components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component.html index 0852e3d34..83d205213 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component.html +++ b/frontend/src/app/components/connect-db/db-credentials-forms/dynamodb-credentials-form/dynamodb-credentials-form.component.html @@ -9,22 +9,21 @@ [disabled]="submitting" [(ngModel)]="connection.host"> - - E.g. https://dynamodb.us-east-2.amazonaws.com. - Select the endpoint matching your database region from the - - AWS DynamoDB endpoints list - . - + E.g. https://dynamodb.us-east-2.amazonaws.com +
+ Select the endpoint matching your database region from the + + AWS DynamoDB endpoints list + - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. - Hostname must start with "https://". + Hostname is invalid + Hostname must start with "https://" @@ -37,7 +36,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -50,8 +49,8 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. + To keep password the same keep this field blank + Password needed due to hostname/port change diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/mongodb-credentials-form/mongodb-credentials-form.component.html b/frontend/src/app/components/connect-db/db-credentials-forms/mongodb-credentials-form/mongodb-credentials-form.component.html index f959ebafe..da0909c1f 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/mongodb-credentials-form/mongodb-credentials-form.component.html +++ b/frontend/src/app/components/connect-db/db-credentials-forms/mongodb-credentials-form/mongodb-credentials-form.component.html @@ -9,18 +9,16 @@ [disabled]="submitting" [(ngModel)]="connection.host"> - - E.g. mongodb+srv://my-test-db.8a8grvb.mongoconnection.net. - Connections from internal IPs (e.g. localhost) are not supported. - + E.g. mongodb+srv://my-test-db.8a8grvb.mongoconnection.net
+ Connections from internal IPs (e.g. localhost) are not supported - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. + Hostname is invalid @@ -33,7 +31,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.port"> - Port should not be empty. + Port should not be empty @@ -46,7 +44,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -59,8 +57,8 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. + To keep password the same keep this field blank + Password needed due to hostname/port change @@ -73,7 +71,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.database"> - Name should not be empty. + Name should not be empty @@ -85,7 +83,7 @@ [readonly]="(accessLevel === 'readonly' || connection.isTestConnection) && connection.id" [disabled]="submitting" [(ngModel)]="connection.authSource"> - + @@ -116,7 +114,7 @@ Private SSH key - Private SSH key should not be empty. + Private SSH key should not be empty @@ -136,7 +134,7 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshHost"> - SSH host should not be empty. + SSH host should not be empty @@ -148,20 +146,20 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshPort"> - SSH port should not be empty. + SSH port should not be empty SSH username - SSH username should not be empty. + SSH username should not be empty - SSL certificate should not be empty. + SSL certificate should not be empty
\ No newline at end of file diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component.html b/frontend/src/app/components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component.html index 4a4c6331b..697f00ba2 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component.html +++ b/frontend/src/app/components/connect-db/db-credentials-forms/mssql-credentials-form/mssql-credentials-form.component.html @@ -9,18 +9,17 @@ [disabled]="submitting" [(ngModel)]="connection.host"> - - E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com. - Connections from internal IPs (e.g. localhost) are not supported. - + E.g. my-test-db.cvfuxe8nltiq.azure.com +
+ Connections from internal IPs (e.g. localhost) are not supported - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. + Hostname is invalid @@ -33,7 +32,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.port"> - Port should not be empty. + Port should not be empty @@ -46,7 +45,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -59,12 +58,12 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. + To keep password the same keep this field blank + Password needed due to hostname/port change - Database Name + Database name - Name should not be empty. + Name should not be empty @@ -86,7 +85,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.schema"> - Name should not be empty. + Name should not be empty @@ -117,7 +116,7 @@ Private SSH key - Private SSH key should not be empty. + Private SSH key should not be empty @@ -137,7 +136,7 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshHost"> - SSH host should not be empty. + SSH host should not be empty @@ -149,20 +148,20 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshPort"> - SSH port should not be empty. + SSH port should not be empty SSH username - SSH username should not be empty. + SSH username should not be empty - SSL certificate should not be empty. + SSL certificate should not be empty - E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com. - Connections from internal IPs (e.g. localhost) are not supported. + E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com +
+ Connections from internal IPs (e.g. localhost) are not supported - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. + Hostname is invalid @@ -31,7 +32,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.port"> - Port should not be empty. + Port should not be empty @@ -44,7 +45,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -57,9 +58,9 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. - + To keep password the same keep this field blank + Password needed due to hostname/port change + @@ -72,7 +73,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.database"> - Name should not be empty. + Name should not be empty @@ -104,7 +105,7 @@ Private SSH key - Private SSH key should not be empty. + Private SSH key should not be empty @@ -124,7 +125,7 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshHost"> - SSH host should not be empty. + SSH host should not be empty @@ -136,20 +137,20 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshPort"> - SSH port should not be empty. + SSH port should not be empty SSH username - SSH username should not be empty. + SSH username should not be empty - SSL certificate should not be empty. + SSL certificate should not be empty - - - Encryption - \ No newline at end of file diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/oracledb-credentials-form/oracledb-credentials-form.component.html b/frontend/src/app/components/connect-db/db-credentials-forms/oracledb-credentials-form/oracledb-credentials-form.component.html index 9f92a7445..e7fa45707 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/oracledb-credentials-form/oracledb-credentials-form.component.html +++ b/frontend/src/app/components/connect-db/db-credentials-forms/oracledb-credentials-form/oracledb-credentials-form.component.html @@ -9,16 +9,17 @@ [disabled]="submitting" [(ngModel)]="connection.host"> - E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com. - Connections from internal IPs (e.g. localhost) are not supported. + E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com +
+ Connections from internal IPs (e.g. localhost) are not supported - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. + Hostname is invalid @@ -31,7 +32,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.port"> - Port should not be empty. + Port should not be empty @@ -44,7 +45,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -57,8 +58,8 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. + To keep password the same keep this field blank + Password needed due to hostname/port change @@ -71,7 +72,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.database"> - Name should not be empty. + Name should not be empty @@ -83,7 +84,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.schema"> - Name should not be empty. + Name should not be empty @@ -125,7 +126,7 @@ Private SSH key - Private SSH key should not be empty. + Private SSH key should not be empty @@ -145,7 +146,7 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshHost"> - SSH host should not be empty. + SSH host should not be empty @@ -157,20 +158,20 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshPort"> - SSH port should not be empty. + SSH port should not be empty SSH username - SSH username should not be empty. + SSH username should not be empty - SSL certificate should not be empty. + SSL certificate should not be empty \ No newline at end of file diff --git a/frontend/src/app/components/connect-db/db-credentials-forms/postgres-credentials-form/postgres-credentials-form.component.html b/frontend/src/app/components/connect-db/db-credentials-forms/postgres-credentials-form/postgres-credentials-form.component.html index 8c177f98a..e56e17bb9 100644 --- a/frontend/src/app/components/connect-db/db-credentials-forms/postgres-credentials-form/postgres-credentials-form.component.html +++ b/frontend/src/app/components/connect-db/db-credentials-forms/postgres-credentials-form/postgres-credentials-form.component.html @@ -10,17 +10,18 @@ [(ngModel)]="connection.host"> - E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com. - Connections from internal IPs (e.g. localhost) are not supported. + E.g. my-test-db.cvfuxe8nltiq.us-east-2.rds.amazonaws.com +
+ Connections from internal IPs (e.g. localhost) are not supported - To connect a database on internal IP use Pinggy - (how-to) - or for agent connection. + + To connect a database to an internal IP, use something like Pinggy + (here's a guide), + or to connect through an agent - Hostname is invalid. + Hostname is invalid @@ -33,7 +34,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.port"> - Port should not be empty. + Port should not be empty @@ -46,7 +47,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.username"> - Username should not be empty. + Username should not be empty @@ -59,8 +60,8 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.password"> - To keep password the same keep this field blank. - Password needed due to hostname/port change. + To keep password the same keep this field blank + Password needed due to hostname/port change @@ -73,7 +74,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.database"> - Name should not be empty. + Name should not be empty @@ -85,7 +86,7 @@ [readonly]="readonly" [disabled]="submitting" [(ngModel)]="connection.schema"> - Name should not be empty. + Name should not be empty @@ -116,7 +117,7 @@ Private SSH key - Sensitive — write only field. - Private SSH key should not be empty. + Private SSH key should not be empty @@ -137,7 +137,7 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshHost"> - SSH host should not be empty. + SSH host should not be empty @@ -149,20 +149,20 @@ [required]="connection.ssh" [readonly]="accessLevel === 'readonly' && connection.id" [disabled]="submitting" [(ngModel)]="connection.sshPort"> - SSH port should not be empty. + SSH port should not be empty SSH username - SSH username should not be empty. + SSH username should not be empty - SSL certificate should not be empty. + SSL certificate should not be empty diff --git a/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.css b/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.css index 497e28c27..b17d37157 100644 --- a/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.css +++ b/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.css @@ -13,6 +13,17 @@ width: 100%; } +.encription-password__field { + display: flex; + align-items: center; + width: 100%; +} + +.encription-password__copy-button { + margin-top: -20px; + margin-left: -40px; +} + .docs-notification { display: flex; gap: 8px; @@ -35,6 +46,11 @@ } } +.docs-notification__warning { + line-height: 1.55em; + margin-bottom: 8px; +} + .docs-link { color: #EF6C00; font-weight: 500; diff --git a/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.html b/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.html index 2fcb4281e..5eb83fb7e 100644 --- a/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.html +++ b/frontend/src/app/components/connect-db/master-encryption-password/master-encryption-password.component.html @@ -10,32 +10,36 @@ Use client-side encryption
- - Master password - - +
+ + Master password + + + +
-

- Rocketadmin does not store the key. - Please save this password in protected place. - Share this password with all users of the connection. +

+ Rocketadmin will not store your master password. +
+ To retain access, store it in a safe place. +
+ Share it only with users you want to have access to this connection.

Open docs
- -
\ No newline at end of file diff --git a/frontend/src/app/components/registration/registration.component.html b/frontend/src/app/components/registration/registration.component.html index 25ee693ca..ffa07c28c 100644 --- a/frontend/src/app/components/registration/registration.component.html +++ b/frontend/src/app/components/registration/registration.component.html @@ -51,7 +51,7 @@

{{ submitting ? 'Submitting' : 'Create account'}}

- By creating this account you agree to Rocketadmin's
+ By creating this account, you agree to Rocketadmin's
Privacy Policy and Terms and Conditions. diff --git a/frontend/src/custom-theme.scss b/frontend/src/custom-theme.scss index c4e381dc9..10de3cc9a 100644 --- a/frontend/src/custom-theme.scss +++ b/frontend/src/custom-theme.scss @@ -91,6 +91,10 @@ html { box-shadow: 0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f; } +.mat-mdc-form-field-bottom-align::before { + margin-left: -3px; +} + $button-custom-level: mat.m2-define-typography-level( $font-family: 'Noto Sans', $font-weight: 500,