Skip to content

Commit 7b6c99e

Browse files
committed
UBERF-9606: Limit a number of workspaces per user (#8192)
* UBERF-9606: Limit workspaces per user Signed-off-by: Andrey Sobolev <[email protected]> * Revert limit check for system account or admin Signed-off-by: Andrey Sobolev <[email protected]> * Fix review comment Signed-off-by: Andrey Sobolev <[email protected]> --------- Signed-off-by: Andrey Sobolev <[email protected]>
1 parent 248cb26 commit 7b6c99e

File tree

18 files changed

+44
-17
lines changed

18 files changed

+44
-17
lines changed

dev/docker-compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ services:
9090
- SERVER_SECRET=secret
9191
- ADMIN_EMAILS=admin
9292
- STATS_URL=http://huly.local:4900
93+
- WORKSPACE_LIMIT_PER_USER=10000
9394
# - DB_URL=postgresql://[email protected]:26257/defaultdb?sslmode=disable
9495
- DB_URL=${MONGO_URL}
9596
# - DB_NS=account-2

dev/prod/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const devProxy = {
7474

7575
const devProxyTest = {
7676
'/account': {
77-
target: 'http://localhost:3003',
77+
target: 'http://huly.local:3003',
7878
changeOrigin: true,
7979
pathRewrite: { '^/account': '' },
8080
logLevel: 'debug'

packages/platform/lang/cs.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "Účet již byl potvrzen",
2020
"WorkspaceAlreadyExists": "Pracovní prostor již existuje",
2121
"InvalidOtp": "Neplatný kód",
22-
"InviteNotFound": "Pozvánka s email:{email} nebyla nalezena."
22+
"InviteNotFound": "Pozvánka s email:{email} nebyla nalezena.",
23+
"WorkspaceLimitReached": "Dosáhli jste limitu pracovních prostorů. Kontaktujte nás..."
2324
}
2425
}

packages/platform/lang/de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "Konto wurde bereits bestätigt",
2020
"WorkspaceAlreadyExists": "Arbeitsbereich existiert bereits",
2121
"InvalidOtp": "Ungültiger Code",
22-
"InviteNotFound": "Einladung mit E-Mail: {email} nicht gefunden."
22+
"InviteNotFound": "Einladung mit E-Mail: {email} nicht gefunden.",
23+
"WorkspaceLimitReached": "Sie haben das Arbeitsbereichslimit erreicht. Bitte kontaktieren Sie uns..."
2324
}
2425
}

packages/platform/lang/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"AccountAlreadyConfirmed": "Account already confirmed",
1919
"WorkspaceAlreadyExists": "Workspace already exists",
2020
"InvalidOtp": "Invalid code",
21-
"InviteNotFound": "Invitation with email:{email} not found."
21+
"InviteNotFound": "Invitation with email:{email} not found.",
22+
"WorkspaceLimitReached": "You have reached the workspace limit. Please contact us..."
2223
}
2324
}

packages/platform/lang/es.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "La cuenta ya está confirmada",
2020
"WorkspaceAlreadyExists": "El espacio de trabajo ya existe",
2121
"InvalidOtp": "Código no válido",
22-
"InviteNotFound": "No se encontró la invitación con email:{email}."
22+
"InviteNotFound": "No se encontró la invitación con email:{email}.",
23+
"WorkspaceLimitReached": "Ha alcanzado el límite de espacios de trabajo. Póngase en contacto con nosotros..."
2324
}
2425
}

packages/platform/lang/fr.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "Compte déjà confirmé",
2020
"WorkspaceAlreadyExists": "L'espace de travail existe déjà",
2121
"InvalidOtp": "Code invalide",
22-
"InviteNotFound": "Invitation avec l'email:{email} introuvable."
22+
"InviteNotFound": "Invitation avec l'email:{email} introuvable.",
23+
"WorkspaceLimitReached": "Vous avez atteint la limite d'espace de travail. Veuillez contacter nous..."
2324
}
2425
}

packages/platform/lang/it.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "Account già confermato",
2020
"WorkspaceAlreadyExists": "Spazio di lavoro già esistente",
2121
"InvalidOtp": "Codice non valido",
22-
"InviteNotFound": "Invito con email:{email} non trovato."
22+
"InviteNotFound": "Invito con email:{email} non trovato.",
23+
"WorkspaceLimitReached": "Hai raggiunto il limite di spazi di lavoro. Contattaci..."
2324
}
2425
}

packages/platform/lang/pt.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "Conta já confirmada",
2020
"WorkspaceAlreadyExists": "Espaço de trabalho já existe",
2121
"InvalidOtp": "Código inválido",
22-
"InviteNotFound": "Convite com email:{email} não encontrado."
22+
"InviteNotFound": "Convite com email:{email} não encontrado.",
23+
"WorkspaceLimitReached": "Você atingiu o limite de espaço de trabalho. Entre em contato conosco..."
2324
}
2425
}

packages/platform/lang/ru.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"AccountAlreadyConfirmed": "Аккаунт уже подтвержден",
2020
"WorkspaceAlreadyExists": "Рабочее пространство уже существует",
2121
"InvalidOtp": "Неверный код",
22-
"InviteNotFound": "Приглашение с email:{email} не найдено."
22+
"InviteNotFound": "Приглашение с email:{email} не найдено.",
23+
"WorkspaceLimitReached": "Вы достигли лимита рабочих пространств. Свяжитесь с нами..."
2324
}
2425
}

0 commit comments

Comments
 (0)