Skip to content

SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.

feat(components): adopt @signozhq/ui 0.2.0 across the app (#12971)

Manika Malhotra11ae922ff7ed
diff --git a/frontend/AGENTS.md b/frontend/AGENTS.md
index 84047d103e..4109537ddf 100644
--- a/frontend/AGENTS.md
+++ b/frontend/AGENTS.md
@@ -25,6 +25,7 @@ You are operating within a constrained context window and strict system prompts.
- Never create barrel files.
- When writing new css, prefer CSS Modules
- Use ./docs/css-modules-guide.md as reference on how to write good CSS Modules.
+- Before styling a `@signozhq/ui` component, check its props in `node_modules/@signozhq/ui/dist/<component>/*.d.ts` for `className`/`style` support; some omit them. Avoid overriding the component's CSS vars unless explicitly needed.
- When writing code that could need authorization checks, read ./src/lib/authz/README.md
3. FORCED VERIFICATION: Your internal tools mark file writes as successful even if the code does not compile. You are FORBIDDEN from reporting a task as complete until you have:
diff --git a/frontend/jest.setup.ts b/frontend/jest.setup.ts
index b6918bbfbe..345fbb1182 100644
--- a/frontend/jest.setup.ts
+++ b/frontend/jest.setup.ts
@@ -41,6 +41,20 @@ if (!HTMLElement.prototype.releasePointerCapture) {
HTMLElement.prototype.releasePointerCapture = function (): void {};
}
+// jsdom has no PointerEvent; Base UI Switch constructs one on click.
+if (typeof window.PointerEvent === 'undefined') {
+ class PointerEventMock extends MouseEvent {
+ pointerId: number;
+ pointerType: string;
+ constructor(type: string, init: PointerEventInit = {}) {
+ super(type, init);
+ this.pointerId = init.pointerId ?? 0;
+ this.pointerType = init.pointerType ?? '';
+ }
+ }
+ (window as any).PointerEvent = PointerEventMock;
+}
+
if (typeof window.IntersectionObserver === 'undefined') {
class IntersectionObserverMock {
observe(): void {}
diff --git a/frontend/package.json b/frontend/package.json
index 8dfd924a20..7702b8d3fd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -53,9 +53,9 @@
"@monaco-editor/react": "^4.7.0",
"@sentry/react": "10.57.0",
"@sentry/vite-plugin": "5.3.0",
- "@signozhq/design-tokens": "2.1.6",
+ "@signozhq/design-tokens": "2.2.1",
"@signozhq/icons": "0.4.0",
- "@signozhq/ui": "0.1.0",
+ "@signozhq/ui": "0.2.0",
"@tanstack/react-table": "8.21.3",
"@tanstack/react-virtual": "3.13.22",
"@uiw/codemirror-theme-copilot": "4.23.11",
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 5ea02c4baa..bafbee9a40 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -75,14 +75,14 @@ importers:
specifier: 5.3.0
version: 5.3.0
'@signozhq/design-tokens':
- specifier: 2.1.6
- version: 2.1.6
+ specifier: 2.2.1
+ version: 2.2.1
'@signozhq/icons':
specifier: 0.4.0
version: 0.4.0
'@signozhq/ui':
- specifier: 0.1.0
+ specifier: 0.2.0
'@tanstack/react-table':
specifier: 8.21.3
@@ -1287,6 +1287,33 @@ packages:
resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
engines: {node: '>=6.9.0'}
+ '@base-ui/[email protected]':
+ resolution: {integrity: sha512-j+8QjX44C32jrXD/qyEAGpFr70FRpGL2CY61mQd9nBPWN737CK0xxD1ceJ055rW4RtdvFDT1e7otzdlfxvsYug==}
+ engines: {node: '>=14.0.0'}
+ peerDependencies:
+ '@date-fns/tz': ^1.2.0
+ '@types/react': ^17 || ^18 || ^19
+ date-fns: ^4.0.0
+ react: ^17 || ^18 || ^19
+ react-dom: ^17 || ^18 || ^19
+ peerDependenciesMeta:
+ '@date-fns/tz':
+ optional: true
+ '@types/react':
+ optional: true
+ date-fns:
+ optional: true
+
+ '@base-ui/[email protected]':
+ resolution: {integrity: sha512-oWy1aq/I2GmYjpl4PhEAhzflF8VPGKgZeq0xAWTbfD5KBWyxcN0ZP2+WHSUm/5Z6lVMBDLReLcoXwSYoRc/zNQ==}
+ peerDependencies:
+ '@types/react': ^17 || ^18 || ^19
+ react: ^17 || ^18 || ^19
+ react-dom: ^17 || ^18 || ^19
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
@@ -1729,20 +1756,20 @@ packages:
resolution: {integrity: sha512-rZAP3aVgB9ds9KOeUSL+zZ21hPmo8dh6fnIFwRQj5EAZl9gzR7wxYbYXYysAM8CTqGmUGyp2S4kUdV17MnGuWQ==}
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
- '@floating-ui/[email protected]':
- resolution: {integrity: sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==}
+ '@floating-ui/[email protected]':
+ resolution: {integrity: sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==}
- '@floating-ui/[email protected]':
- resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
+ '@floating-ui/[email protected]':
+ resolution: {integrity: sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==}
- '@floating-ui/[email protected]':
- resolution: {integrity: sha512-CF8k2rgKeh/49UrnIBs4BdxPUV6vize/Db1d/YbCLyp9GiVZ0BEwf5AiDSxJRCr6yOkGqTFHtmrULxkEfYZ7dQ==}
+ '@floating-ui/[email protected]':
+ resolution: {integrity: sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==}
peerDependencies:
react: '>=16.8.0'
react-dom: '>=16.8.0'
- '@floating-ui/[email protected]':
- resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
+ '@floating-ui/[email protected]':
+ resolution: {integrity: sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==}
'@gerrit0/[email protected]':
resolution: {integrity: sha512-bEMORlG0cqdjVyCEuU0cDQbORWX+kYCeo0kV1lbxF5bt4r7SID2l9bqsxJEM0zndaxpOUT7riCyIVEuqq/Ynxg==}
@@ -2923,19 +2950,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-Gnptr9pDDQxD3hgq2dtPbtrp/c2qH1mBwIzw3X/ivrMb2e1t0jMTi606fVEqFPaQR1ggXIVQWKj3P2WW9v7zGQ==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-9W+B9NPF0NaaPh/1NJd3+KqsnlLqU9H7T2rvww+fp+T/evVXdNAyYcnfRQZFOjkR1ajQp3yORlqnI8soawLvNA==}
peerDependencies:
@@ -2949,15 +2963,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==}
- peerDependencies:
- '@types/react': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-+48PbAAbq3didjJxa+OaWY2ZwgAKsNiRGyeHKszblZMQ+kcpd9pAaT11cMkGEie0vsOi3QdeTE6d5Fe3Gn61kA==}
peerDependencies:
@@ -3011,19 +3016,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-geq8l2rJkxvkXsT9RMgtUE3P8pITFpTsvYpbySi1IH4fZEABD/Gp85myayFgxk0ktljGMJnCbeFkyTusvSvv7g==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-RNOJjfZMTyBM6xYmV3IVGXkPjIhcBAuv48POevAXwrGJhkWZ9p1rFoIS1JFooPuT193AZmRsCPhpoVJxx6OPoQ==}
peerDependencies:
@@ -3051,15 +3043,6 @@ packages:
peerDependencies:
react: ^16.x || ^17.x || ^18.x || ^19.0.0 || ^19.0.0-rc
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
- peerDependencies:
- '@types/react': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-TMQp2llA+RYn7JcjnrMnz7wN4pcVttPZnRZo52PLQsoLVKzNlVwUeHmfePgTgRluXFvlD3GD5g5MOVVTJCO0qA==}
peerDependencies:
@@ -3069,19 +3052,6 @@ packages:
'@types/react':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-uW7RVuU6Lp/ZtfeY4b3kL32zccgEWvPv1+cf17ubYzHa9cL8AHokmk36cG/XEiH/smbQvumnieXX9j/e9RqJWA==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-mw58MrBlyHWFisTOYignD0vf/3gdcgAR+9of1s9G/38CbFiUwH1nCDkc0AUM9IrXFgN5Ue8n45j9WCgyM1sbiQ==}
peerDependencies:
@@ -3147,19 +3117,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-5XnomAsoZZCY+KNTxbIghpGqPruZvKFNlvcAljVAOdDRDsH4/OZQxhtwo5wdtoDM5R6MhJBb2sPnDuRFep3lzg==}
peerDependencies:
@@ -3225,15 +3182,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==}
- peerDependencies:
- '@types/react': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-qx7oqnYbxnK9kYI9m317qmFmEgo6ywqWvbTogdj7cL9p3/yx4M48p7Rnw5z3H890cL/ow/EeWJsuTykeZVXP5Q==}
peerDependencies:
@@ -3243,19 +3191,6 @@ packages:
'@types/react':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-48tB/4dn2UVLBCYhTu9AuR63IHl73l/qLbLgxd86noTUor4/K4LFDAcYjK+isP5313qxaFpjPVogE7+Y0/V3Kw==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-UKxJlZid7FVtsk/WTxj4i4uSEgj2Au+KBbS7SQyTlzMhhn+86Cz3tISZdTa87bfEfcuvZezf2ZsxD4xuEKtkog==}
peerDependencies:
@@ -3269,45 +3204,6 @@ packages:
'@types/react-dom':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-OtnwuSVjd1Ofi+AdnvhsjQdyuhCDwYs1w9RyB5BN/OavXOVQo42SYqQjwUnbPnaiPFBpQ9aX70dWeee+v2oBLA==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-7lonPlKfSacd20GlOBx2ltuVKz9oqWYZz+oMQyOltw6t1y2nyftj2ZmwwUHYn49kqfDWcp8dNZm5NgV+5Z+mug==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-6EamKFRRnlpdadndbZ6LMwycfwkwPte1B42hs6QA0gYhjaOKqW4PZ4pjaW9UrlDX5eVt/OjncE7BFTPL5nmZhg==}
- peerDependencies:
- '@types/react': '*'
- '@types/react-dom': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
- '@types/react-dom':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-R6OUY2e2fA6Yn6s+VSx5KBV6Nx8LQEhu+cz7LCej18rQ1HLyg9PSC9jP/ZNx0o6FAIK9c0F1kHylzSxKsdlkrQ==}
peerDependencies:
@@ -3344,15 +3240,6 @@ packages:
'@types/react':
optional: true
- '@radix-ui/[email protected]':
- resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
- peerDependencies:
- '@types/react': '*'
- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
-
'@radix-ui/[email protected]':
resolution: {integrity: sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==}
peerDependencies:
@@ -3724,14 +3611,14 @@ packages:
'@sideway/[email protected]':
resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
- '@signozhq/[email protected]':
- resolution: {integrity: sha512-n0cH4TRS1Xj7BR38HGiwIBDekIOAnDgl2JyYmAyUvws0L1nlE0txSHO5NiOBJ22Dm8uMva0v5/rOHxpKsGQbsw==}
+ '@signozhq/[email protected]':
+ resolution: {integrity: sha512-ulf6lhWUP6qxqsyemQySUMfOIKRvefvZ5rBRv+wlhOpPfYPk3uatPmPkKEhAjISpX8f9g1Gg8wgRZxUCysf20Q==}
'@signozhq/[email protected]':
resolution: {integrity: sha512-QctNvNPlQlsefFdIVmSy/P/7a1IcQ3IryKP0KPMqtoqew3q89FGUmFa5IfEJ7Z3CHhtG1zaXwBKqP72QkLyA3g==}
- '@signozhq/[email protected]':
- resolution: {integrity: sha512-FjqmQhz+WtpGl29gPGZey5YwNe4p++TCyX4jaGUhAgvlBGRmxmAKW0lFRrSOYTPbgFL5UaDCW0wR62aiGHZ+FA==}
+ '@signozhq/[email protected]':
+ resolution: {integrity: sha512-j20ldiOkR150ON0BCDhlq6fXGoPN++7w6e4t2HtM2XMM4buJO7aHzPzNKvDRZ2UUf/LGPULPAW8w6sg6gUVHyw==}
peerDependencies:
'@signozhq/icons': 0.3.0
react: ^18.2.0
@@ -8523,6 +8410,11 @@ packages:
react: ^16.8.5 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.5 || ^17.0.0 || ^18.0.0
+ resolution: {integrity: sha512-rRfjYv66HlG8896yPUDONgKzG5BxZD1nV9U6rkm+7VCuvQc903C4MjcoZR4zPw53IKSOX9wMQVpA1IAbRtzQ7w==}
+ peerDependencies:
+ react: ^17.0.0 || ^18.0.0 || ^19.0.0 || ^0.0.0-experimental
+
resolution: {integrity: sha512-NtkJbuX6cl/VaGNb3sVVhmMA6LSMnL5G3xNL+61IyoZj0mUZFWTg4hmj7PHjIQ8MXN9dHWhUHFoJWG6y60DKSg==}
engines: {node: '>=18'}
@@ -8910,6 +8802,9 @@ packages:
resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+ resolution: {integrity: sha512-XGoLeRAVzUTcJ1qkxPQhDJyIZ5d6zzZD9nT7AEZOaaU9UbWclhycElmhO+VD5bFeLuzhPBaOV2oXC8uG35ZSpg==}
+
resolution: {integrity: sha512-0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw==}
@@ -11157,6 +11052,31 @@ snapshots:
'@babel/helper-string-parser': 7.29.7
'@babel/helper-validator-identifier': 7.29.7
+ dependencies:
+ '@babel/runtime': 7.29.2
+ '@floating-ui/react-dom': 2.1.9([email protected]([email protected]))([email protected])
+ '@floating-ui/utils': 0.2.12
+ react: 18.2.0
+ react-dom: 18.2.0([email protected])
+ use-sync-external-store: 1.6.0([email protected])
+ optionalDependencies:
+ '@date-fns/tz': 1.4.1
+ '@types/react': 18.0.26
+ date-fns: 4.1.0
+
+ dependencies:
+ '@babel/runtime': 7.29.2
+ '@floating-ui/utils': 0.2.12
+ react: 18.2.0
+ react-dom: 18.2.0([email protected])
+ reselect: 5.3.0
+ use-sync-external-store: 1.6.0([email protected])
+ optionalDependencies:
+ '@types/react': 18.0.26
+
'@bcoe/[email protected]': {}
'@braintree/[email protected]': {}
@@ -11601,22 +11521,22 @@ snapshots:
'@eslint/core': 1.2.1
levn: 0.4.1
- '@floating-ui/[email protected]':
+ '@floating-ui/[email protected]':
dependencies:
- '@floating-ui/utils': 0.1.6
+ '@floating-ui/utils': 0.2.12
- '@floating-ui/[email protected]':
+ '@floating-ui/[email protected]':
dependencies:
- '@floating-ui/core': 1.5.2
- '@floating-ui/utils': 0.1.6
+ '@floating-ui/core': 1.8.0
+ '@floating-ui/utils': 0.2.12
dependencies:
- '@floating-ui/dom': 1.5.3
+ '@floating-ui/dom': 1.8.0
react: 18.2.0
react-dom: 18.2.0([email protected])
- '@floating-ui/[email protected]': {}
+ '@floating-ui/[email protected]': {}
'@gerrit0/[email protected]':
dependencies:
@@ -12766,21 +12686,6 @@ snapshots:
'@types/react': 18.0.26
'@types/react-dom': 18.0.10
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.6(@types/[email protected])([email protected])
- '@radix-ui/react-use-size': 1.1.4(@types/[email protected])([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
dependencies:
'@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
@@ -12793,12 +12698,6 @@ snapshots:
'@types/react': 18.0.26
'@types/react-dom': 18.0.10
- dependencies:
- react: 18.2.0
- optionalDependencies:
- '@types/react': 18.0.26
-
dependencies:
react: 18.2.0
@@ -12853,21 +12752,6 @@ snapshots:
'@types/react': 18.0.26
'@types/react-dom': 18.0.10
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.6(@types/[email protected])([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
dependencies:
react: 18.2.0
@@ -12889,13 +12773,6 @@ snapshots:
dependencies:
react: 18.2.0
- dependencies:
- '@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])
- react: 18.2.0
- optionalDependencies:
- '@types/react': 18.0.26
-
dependencies:
'@radix-ui/react-use-layout-effect': 1.1.4(@types/[email protected])([email protected])
@@ -12903,32 +12780,6 @@ snapshots:
optionalDependencies:
'@types/react': 18.0.26
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-collection': 1.1.15(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-direction': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.19(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-focus-guards': 1.1.6(@types/[email protected])([email protected])
- '@radix-ui/react-focus-scope': 1.1.16(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-id': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-roving-focus': 1.1.19(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-slot': 1.3.3(@types/[email protected])([email protected])
- '@radix-ui/react-use-callback-ref': 1.1.4(@types/[email protected])([email protected])
- aria-hidden: 1.2.6
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
dependencies:
'@radix-ui/primitive': 1.1.7
@@ -12954,7 +12805,7 @@ snapshots:
dependencies:
- '@floating-ui/react-dom': 2.0.4([email protected]([email protected]))([email protected])
+ '@floating-ui/react-dom': 2.1.9([email protected]([email protected]))([email protected])
'@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
@@ -12998,15 +12849,6 @@ snapshots:
'@types/react': 18.0.26
'@types/react-dom': 18.0.10
- dependencies:
- '@radix-ui/react-slot': 1.2.4(@types/[email protected])([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
dependencies:
'@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
@@ -13102,13 +12944,6 @@ snapshots:
'@types/react': 18.0.26
'@types/react-dom': 18.0.10
- dependencies:
- '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
- react: 18.2.0
- optionalDependencies:
- '@types/react': 18.0.26
-
dependencies:
'@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
@@ -13116,20 +12951,6 @@ snapshots:
optionalDependencies:
'@types/react': 18.0.26
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.6(@types/[email protected])([email protected])
- '@radix-ui/react-use-size': 1.1.4(@types/[email protected])([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
dependencies:
'@radix-ui/primitive': 1.1.7
@@ -13146,53 +12967,6 @@ snapshots:
'@types/react': 18.0.26
'@types/react-dom': 18.0.10
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-direction': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-roving-focus': 1.1.19(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.6(@types/[email protected])([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.6(@types/[email protected])([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
- dependencies:
- '@radix-ui/primitive': 1.1.7
- '@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.19(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-id': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-slot': 1.3.3(@types/[email protected])([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.6(@types/[email protected])([email protected])
- '@radix-ui/react-use-layout-effect': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.2.11(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- optionalDependencies:
- '@types/react': 18.0.26
- '@types/react-dom': 18.0.10
-
dependencies:
react: 18.2.0
@@ -13221,12 +12995,6 @@ snapshots:
optionalDependencies:
'@types/react': 18.0.26
- dependencies:
- react: 18.2.0
- optionalDependencies:
- '@types/react': 18.0.26
-
dependencies:
react: 18.2.0
@@ -13275,14 +13043,14 @@ snapshots:
dependencies:
- '@babel/runtime': 7.28.2
+ '@babel/runtime': 7.29.2
react: 18.2.0
react-dom: 18.2.0([email protected])
'@rc-component/[email protected]':
dependencies:
- '@babel/runtime': 7.28.2
+ '@babel/runtime': 7.29.2
dependencies:
@@ -13294,7 +13062,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.28.2
+ '@babel/runtime': 7.29.2
classnames: 2.3.2
react: 18.2.0
@@ -13562,16 +13330,15 @@ snapshots:
'@sideway/[email protected]': {}
- '@signozhq/[email protected]': {}
+ '@signozhq/[email protected]': {}
'@signozhq/[email protected]': {}
dependencies:
'@chenglou/pretext': 0.0.8
- '@radix-ui/react-checkbox': 1.3.11(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-dropdown-menu': 2.1.24(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-icons': 1.3.2([email protected])
@@ -13579,11 +13346,7 @@ snapshots:
'@radix-ui/react-slot': 1.3.3(@types/[email protected])([email protected])
- '@radix-ui/react-toggle-group': 1.1.19(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
'@signozhq/icons': 0.4.0
'@tanstack/react-table': 8.21.3([email protected]([email protected]))([email protected])
'@tanstack/react-virtual': 3.14.9([email protected]([email protected]))([email protected])
@@ -13597,16 +13360,19 @@ snapshots:
react: 18.2.0
+ react-compiler-runtime: 1.0.0([email protected])
react-day-picker: 9.9.0([email protected])
react-dom: 18.2.0([email protected])
react-resizable-panels: 4.12.3([email protected]([email protected]))([email protected])
transitivePeerDependencies:
+ - '@date-fns/tz'
- '@emotion/is-prop-valid'
- '@remix-run/react'
- '@tanstack/react-router'
- '@types/react'
- '@types/react-dom'
+ - date-fns
- next
- react-router
- react-router-dom
@@ -15132,10 +14898,10 @@ snapshots:
dependencies:
- '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.5(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 2.1.4(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-id': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-primitive': 2.1.10(@types/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])
react: 18.2.0
react-dom: 18.2.0([email protected])
transitivePeerDependencies:
@@ -19280,6 +19046,10 @@ snapshots:
transitivePeerDependencies:
- react-native
+ dependencies:
+ react: 18.2.0
+
dependencies:
'@date-fns/tz': 1.4.1
@@ -19765,6 +19535,8 @@ snapshots:
+
@@ -19870,7 +19642,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.28.2
+ '@babel/runtime': 7.29.2
@@ -20682,7 +20454,7 @@ snapshots:
dependencies:
- '@babel/runtime': 7.28.2
+ '@babel/runtime': 7.29.2
detect-node: 2.1.0
diff --git a/frontend/src/api/ErrorResponseHandler.ts b/frontend/src/api/ErrorResponseHandler.ts
index 7ad38192b9..ccf44199fe 100644
--- a/frontend/src/api/ErrorResponseHandler.ts
+++ b/frontend/src/api/ErrorResponseHandler.ts
@@ -41,17 +41,16 @@ export function ErrorResponseHandler(error: AxiosError): ErrorResponse {
message: data?.error,
};
}
+ // Avoid logging error when the request was just cancelled for whatever reason
+ if (isCancel(error)) {
+ return {
+ statusCode: 500,
+ payload: null,
+ error: 'Something went wrong',
+ message: null,
+ };
+ }
if (request) {
- // Avoid logging error when the request was just cancelled for whatever reason
- if (isCancel(error)) {
- return {
- statusCode: 500,
- payload: null,
- error: 'Something went wrong',
- message: null,
- };
- }
-
// client never received a response, or request never left
console.error('client never received a response, or request never left');
diff --git a/frontend/src/api/__tests__/ErrorResponseHandler.test.ts b/frontend/src/api/__tests__/ErrorResponseHandler.test.ts
new file mode 100644
index 0000000000..ee417d112f
--- /dev/null
+++ b/frontend/src/api/__tests__/ErrorResponseHandler.test.ts
@@ -0,0 +1,22 @@
+import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
+import { AxiosError, CanceledError } from 'axios';
+
+describe('ErrorResponseHandler', () => {
+ // axios aborts a request whose signal fired before it was sent without ever
+ // creating one, so the error carries neither `response` nor `request`.
+ it('treats a request cancelled before it was sent as a cancellation', () => {
+ const consoleError = jest
+ .spyOn(console, 'error')
+ .mockImplementation(() => undefined);
+
+ expect(ErrorResponseHandler(new CanceledError() as AxiosError)).toEqual({
+ statusCode: 500,
+ payload: null,
+ error: 'Something went wrong',
+ message: null,
+ });
+ expect(consoleError).not.toHaveBeenCalled();
+
+ consoleError.mockRestore();
+ });
+});
diff --git a/frontend/src/components/AddCreditCardModal/stories/AddCreditCardModal.stories.tsx b/frontend/src/components/AddCreditCardModal/stories/AddCreditCardModal.stories.tsx
index ea17856ea3..22b17299e4 100644
--- a/frontend/src/components/AddCreditCardModal/stories/AddCreditCardModal.stories.tsx
+++ b/frontend/src/components/AddCreditCardModal/stories/AddCreditCardModal.stories.tsx
@@ -17,7 +17,10 @@ function ModalFixture(): JSX.Element {
return (
<>
<Button
- data-testid="open-add-credit-card"
+ variant="solid"
+ color="primary"
+ size="md"
+ testId="open-add-credit-card"
onClick={(): void => setOpen(true)}
>
Contact support
diff --git a/frontend/src/components/AlertBreadcrumb/AlertBreadcrumb.module.scss b/frontend/src/components/AlertBreadcrumb/AlertBreadcrumb.module.scss
index 3b6d05d802..54a37f0742 100644
--- a/frontend/src/components/AlertBreadcrumb/AlertBreadcrumb.module.scss
+++ b/frontend/src/components/AlertBreadcrumb/AlertBreadcrumb.module.scss
@@ -8,6 +8,10 @@
:global(.ant-breadcrumb-separator) {
color: var(--muted-foreground);
}
+
+ [data-slot='button'] {
+ padding: 0px;
+ }
}
.divider {
diff --git a/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.module.scss b/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.module.scss
index 1709824bcf..2894e98b96 100644
--- a/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.module.scss
+++ b/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.module.scss
@@ -1,9 +1,5 @@
-.item {
- --button-padding: 0;
- --button-font-size: var(--periscope-font-size-base);
-}
-
.itemLast {
- color: var(--muted-foreground);
- font-size: var(--periscope-font-size-base);
+ color: var(--button-secondary-label);
+ font-size: var(--button-font-size, var(--periscope-font-size-base));
+ line-height: var(--button-size-line-height, 16px);
}
diff --git a/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.tsx b/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.tsx
index f40dd1bd8c..8114f8c64d 100644
--- a/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.tsx
+++ b/frontend/src/components/AlertBreadcrumb/BreadcrumbItem.tsx
@@ -26,9 +26,9 @@ function BreadcrumbItem({
return (
<Button
- variant="ghost"
+ size="md"
+ variant="link"
color="secondary"
- className={styles.item}
onClick={(e: React.MouseEvent): void => {
if (!('route' in props) || !props.route) {
return;
diff --git a/frontend/src/components/Alerts/ErrorEmptyState/ErrorEmptyState.tsx b/frontend/src/components/Alerts/ErrorEmptyState/ErrorEmptyState.tsx
index f2c70010e8..73ee8a7600 100644
--- a/frontend/src/components/Alerts/ErrorEmptyState/ErrorEmptyState.tsx
+++ b/frontend/src/components/Alerts/ErrorEmptyState/ErrorEmptyState.tsx
@@ -34,21 +34,23 @@ function ErrorEmptyState({
</div>
<div className={styles.actions}>
<Button
+ size="md"
variant="solid"
color="secondary"
prefix={<LifeBuoy size={14} />}
onClick={onContactSupport}
- data-testid="error-contact-support-button"
+ testId="error-contact-support-button"
>
Contact Support
</Button>
{onRefresh && (
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={<RefreshCw size={14} />}
onClick={onRefresh}
- data-testid="error-refresh-button"
+ testId="error-refresh-button"
>
Refresh
</Button>
diff --git a/frontend/src/components/Alerts/LabelColumn/LabelColumn.module.scss b/frontend/src/components/Alerts/LabelColumn/LabelColumn.module.scss
index d74c8fcaf2..f315e3f6f4 100644
--- a/frontend/src/components/Alerts/LabelColumn/LabelColumn.module.scss
+++ b/frontend/src/components/Alerts/LabelColumn/LabelColumn.module.scss
@@ -1,20 +1,32 @@
.labelColumn {
+ // Badges fill their wrapper; the wrapper, as the flex item, owns the cap.
+ --badge-max-width: 100%;
+
+ position: relative;
display: flex;
gap: 4px;
align-items: center;
overflow: hidden;
max-width: 100%;
width: 100%;
-}
-.labelBadge {
- cursor: default;
- font-size: 12px;
+ > * {
+ flex-shrink: 0;
+ max-width: 180px;
+ }
+}
- --badge-display: inline;
+// Kept mounted so its width can still be measured.
+.overflowed {
+ position: absolute;
+ visibility: hidden;
+ pointer-events: none;
+}
- max-width: 180px;
- text-overflow: ellipsis;
+// The only visible label truncates instead of pushing `+N` out of view.
+.labelColumn > .shrinkable {
+ flex-shrink: 1;
+ min-width: 0;
}
.overflowTrigger {
@@ -22,11 +34,6 @@
cursor: pointer;
}
-.overflowBadge {
- cursor: pointer;
- font-size: 12px;
-}
-
.labelPopover {
display: flex;
flex-direction: column;
diff --git a/frontend/src/components/Alerts/LabelColumn/LabelColumn.test.tsx b/frontend/src/components/Alerts/LabelColumn/LabelColumn.test.tsx
index 5435e13ae8..bd89b1c1c7 100644
--- a/frontend/src/components/Alerts/LabelColumn/LabelColumn.test.tsx
+++ b/frontend/src/components/Alerts/LabelColumn/LabelColumn.test.tsx
@@ -1,13 +1,14 @@
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { act, render, screen } from '@testing-library/react';
import LabelColumn from './LabelColumn';
-let resizeCallback: ResizeObserverCallback | null = null;
+const BADGE_WIDTH = 60;
+
+let resizeCallbacks: ResizeObserverCallback[] = [];
class MockResizeObserver {
constructor(callback: ResizeObserverCallback) {
- resizeCallback = callback;
+ resizeCallbacks.push(callback);
}
observe = jest.fn();
@@ -15,15 +16,23 @@ class MockResizeObserver {
disconnect = jest.fn();
}
-function triggerResize(width: number): void {
- if (resizeCallback) {
- act(() => {
- resizeCallback?.(
- [{ contentRect: { width } } as ResizeObserverEntry],
- {} as ResizeObserver,
- );
+// jsdom has no layout: every badge measures BADGE_WIDTH, the column `containerWidth`.
+function mockLayout(containerWidth: number): void {
+ jest
+ .spyOn(HTMLElement.prototype, 'clientWidth', 'get')
+ .mockImplementation(function getClientWidth(this: HTMLElement) {
+ return this.dataset.testid === 'label-column' ? containerWidth : 0;
});
- }
+ jest
+ .spyOn(HTMLElement.prototype, 'getBoundingClientRect')
+ .mockReturnValue({ width: BADGE_WIDTH } as DOMRect);
+}
+
+function triggerResize(containerWidth: number): void {
+ mockLayout(containerWidth);
+ act(() => {
+ resizeCallbacks.forEach((callback) => callback([], {} as ResizeObserver));
+ });
}
beforeAll(() => {
@@ -31,13 +40,14 @@ beforeAll(() => {
});
afterEach(() => {
- resizeCallback = null;
+ resizeCallbacks = [];
+ jest.restoreAllMocks();
});
function renderWithProviders(
ui: React.ReactElement,
): ReturnType<typeof render> {
- return render(<TooltipProvider>{ui}</TooltipProvider>);
+ return render(ui);
}
describe('LabelColumn', () => {
@@ -54,13 +64,10 @@ describe('LabelColumn', () => {
it('should truncate labels and show +N badge when container is narrow', () => {
const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
+ // 3 badges (180px) + overflow reserve (40px)
+ mockLayout(220);
renderWithProviders(<LabelColumn labels={labels} />);
- // Simulate narrow container that fits ~3 badges
- // Badge widths: env=37, service=65, region=58, team=44, owner=51, version=65
- // 220px available = 3 badges (160px) + gaps (8px) + overflow (44px)
- triggerResize(220);
-
// First 3 visible
expect(screen.getByTestId('label-tag-env')).toBeInTheDocument();
expect(screen.getByTestId('label-tag-service')).toBeInTheDocument();
@@ -93,19 +100,37 @@ describe('LabelColumn', () => {
expect(screen.getByTestId('label-tag-service')).toHaveTextContent('service');
});
- it('should show overflow badge with remaining count when container is narrow', () => {
+ it('should update the overflow count when the container resizes', () => {
+ const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
+
+ mockLayout(220);
+ renderWithProviders(<LabelColumn labels={labels} />);
+ expect(screen.getByTestId('label-overflow-badge')).toHaveTextContent('+3');
+
+ // 2 badges (120px) + overflow reserve (40px)
+ triggerResize(160);
+ expect(screen.getByTestId('label-overflow-badge')).toHaveTextContent('+4');
+
+ triggerResize(1000);
+ expect(screen.queryByTestId('label-overflow-badge')).not.toBeInTheDocument();
+ });
+
+ it('should skip the overflow reserve when every label fits', () => {
const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
+ mockLayout(labels.length * BADGE_WIDTH);
renderWithProviders(<LabelColumn labels={labels} />);
- // Simulate narrow container to trigger overflow (shows 3 labels)
- // 220px fits first 3 badges before overflow
- triggerResize(220);
+ expect(screen.queryByTestId('label-overflow-badge')).not.toBeInTheDocument();
+ });
+
+ it('should keep one label visible when even that one does not fit', () => {
+ const labels = ['env', 'service'];
+
+ mockLayout(50);
+ renderWithProviders(<LabelColumn labels={labels} />);
- // Overflow badge shows +3 (remaining labels)
- const overflowBadge = screen.getByTestId('label-overflow-badge');
- expect(overflowBadge).toBeInTheDocument();
- expect(overflowBadge).toHaveTextContent('+3');
+ expect(screen.getByTestId('label-overflow-badge')).toHaveTextContent('+1');
});
it('should render empty when no labels provided', () => {
@@ -126,11 +151,9 @@ describe('LabelColumn', () => {
it('should show all labels when container is wide enough', () => {
const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
+ mockLayout(1000);
renderWithProviders(<LabelColumn labels={labels} />);
- // Simulate wide container
- triggerResize(1000);
-
// All labels visible
labels.forEach((label) => {
expect(screen.getByTestId(`label-tag-${label}`)).toBeInTheDocument();
diff --git a/frontend/src/components/Alerts/LabelColumn/LabelColumn.tsx b/frontend/src/components/Alerts/LabelColumn/LabelColumn.tsx
index 1add509f97..3ed6250d87 100644
--- a/frontend/src/components/Alerts/LabelColumn/LabelColumn.tsx
+++ b/frontend/src/components/Alerts/LabelColumn/LabelColumn.tsx
@@ -1,35 +1,19 @@
import { Copy } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
import { toast } from '@signozhq/ui/sonner';
-import {
- TooltipContent,
- TooltipRoot,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { Tooltip } from '@signozhq/ui/tooltip';
+import cx from 'classnames';
+import { useLayoutEffect, useRef, useState } from 'react';
import { useCopyToClipboard } from 'react-use';
import LabelTag from './LabelTag';
import styles from './LabelColumn.module.scss';
-import { BADGE_GAP, estimateBadgeWidth, OVERFLOW_BADGE_WIDTH } from './utils';
+import { getVisibleCount } from './utils';
export interface LabelColumnProps {
labels: string[];
- color?:
- | 'primary'
- | 'secondary'
- | 'success'
- | 'error'
- | 'warning'
- | 'robin'
- | 'forest'
- | 'amber'
- | 'sienna'
- | 'cherry'
- | 'sakura'
- | 'aqua'
- | 'vanilla';
+ color?: BadgeColorType;
value?: { [key: string]: string };
}
@@ -39,60 +23,37 @@ function LabelColumn({
color = 'primary',
}: LabelColumnProps): JSX.Element {
const containerRef = useRef<HTMLDivElement>(null);
- const [maxVisibleCount, setMaxVisibleCount] = useState(labels.length);
+ const [visibleCount, setVisibleCount] = useState(labels.length);
const [, copyToClipboard] = useCopyToClipboard();
- const calculateMaxVisible = useCallback(
- (width: number): number => {
- if (width <= 0) {
- return 1;
- }
-
- const availableWidth = width - OVERFLOW_BADGE_WIDTH - BADGE_GAP;
- let usedWidth = 0;
- let count = 0;
-
- for (const label of labels) {
- const badgeWidth = estimateBadgeWidth(label, value?.[label]) + BADGE_GAP;
- if (usedWidth + badgeWidth > availableWidth && count > 0) {
- break;
- }
- usedWidth += badgeWidth;
- count++;
- }
-
- return Math.max(1, count);
- },
- [labels, value],
- );
-
- useEffect(() => {
+ useLayoutEffect(() => {
const container = containerRef.current;
if (!container) {
return;
}
- const observer = new ResizeObserver((entries) => {
- const entry = entries[0];
- if (entry && entry.contentRect.width > 0) {
- setMaxVisibleCount(calculateMaxVisible(entry.contentRect.width));
+ const measure = (): void => {
+ const available = container.clientWidth;
+ if (available <= 0) {
+ return;
}
- });
- observer.observe(container);
+ const widths = Array.from(container.children)
+ .slice(0, labels.length)
+ .map((item) => item.getBoundingClientRect().width);
+ const gap = parseFloat(getComputedStyle(container).columnGap) || 0;
- if (container.clientWidth > 0) {
- setMaxVisibleCount(calculateMaxVisible(container.clientWidth));
- }
+ setVisibleCount(getVisibleCount(widths, available, gap));
+ };
+
+ const observer = new ResizeObserver(measure);
+ observer.observe(container);
+ measure();
return (): void => observer.disconnect();
- }, [calculateMaxVisible]);
+ }, [labels, value]);
- const needsOverflow = labels.length > maxVisibleCount;
- const visibleLabels = needsOverflow
- ? labels.slice(0, maxVisibleCount)
- : labels;
- const remainingLabels = needsOverflow ? labels.slice(maxVisibleCount) : [];
+ const remainingLabels = labels.slice(visibleCount);
return (
<div
@@ -100,24 +61,23 @@ function LabelColumn({
className={styles.labelColumn}
data-testid="label-column"
>
- {visibleLabels.map((label) => (
- <LabelTag key={label} label={label} color={color} value={value?.[label]} />
+ {labels.map((label, index) => (
+ <LabelTag
+ key={label}
+ label={label}
+ color={color}
+ value={value?.[label]}
+ className={cx({
+ [styles.overflowed]: index >= visibleCount,
+ [styles.shrinkable]: index === 0 && visibleCount === 1,
+ })}
+ />
))}
{remainingLabels.length > 0 && (
- <TooltipRoot>
- <TooltipTrigger asChild>
- <span>
- <Badge
- color={color}
- className={styles.overflowBadge}
- variant="outline"
- data-testid="label-overflow-badge"
- >
- +{remainingLabels.length}
- </Badge>
- </span>
- </TooltipTrigger>
- <TooltipContent side="bottom" align="end">
+ <Tooltip
+ side="bottom"
+ align="end"
+ title={
<div className={styles.tooltipContent}>
<span>
{remainingLabels
@@ -140,8 +100,14 @@ function LabelColumn({
<Copy size={12} />
</button>
</div>
- </TooltipContent>
- </TooltipRoot>
+ }
+ >
+ <span>
+ <Badge color={color} variant="outlined" testId="label-overflow-badge">
+ +{remainingLabels.length}
+ </Badge>
+ </span>
+ </Tooltip>
)}
</div>
);
diff --git a/frontend/src/components/Alerts/LabelColumn/LabelTag.module.scss b/frontend/src/components/Alerts/LabelColumn/LabelTag.module.scss
index 226c35fda1..6f487fa4b5 100644
--- a/frontend/src/components/Alerts/LabelColumn/LabelTag.module.scss
+++ b/frontend/src/components/Alerts/LabelColumn/LabelTag.module.scss
@@ -1,11 +1,3 @@
-.labelBadge {
- cursor: default;
- font-size: 12px;
-
- max-width: 180px;
- text-overflow: ellipsis;
-}
-
.labelValue {
text-overflow: ellipsis;
overflow: hidden;
diff --git a/frontend/src/components/Alerts/LabelColumn/LabelTag.tsx b/frontend/src/components/Alerts/LabelColumn/LabelTag.tsx
index 49f0b036ff..f5d877d748 100644
--- a/frontend/src/components/Alerts/LabelColumn/LabelTag.tsx
+++ b/frontend/src/components/Alerts/LabelColumn/LabelTag.tsx
@@ -1,35 +1,24 @@
import { Copy } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
import { toast } from '@signozhq/ui/sonner';
-import {
- TooltipContent,
- TooltipRoot,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { useCopyToClipboard } from 'react-use';
import styles from './LabelTag.module.scss';
export interface LabelTagProps {
label: string;
- color?:
- | 'primary'
- | 'secondary'
- | 'success'
- | 'error'
- | 'warning'
- | 'robin'
- | 'forest'
- | 'amber'
- | 'sienna'
- | 'cherry'
- | 'sakura'
- | 'aqua'
- | 'vanilla';
+ color?: BadgeColorType;
value?: string;
+ className?: string;
}
-function LabelTag({ label, value, color }: LabelTagProps): JSX.Element {
+function LabelTag({
+ label,
+ value,
+ color,
+ className,
+}: LabelTagProps): JSX.Element {
const [, copyToClipboard] = useCopyToClipboard();
const displayText = value ? `${label}: ${value}` : label;
const searchFormat = value ? `${label} ${value}` : label;
@@ -41,20 +30,8 @@ function LabelTag({ label, value, color }: LabelTagProps): JSX.Element {
};
return (
- <TooltipRoot>
- <TooltipTrigger asChild>
- <span>
- <Badge
- color={color}
- className={styles.labelBadge}
- variant="outline"
- data-testid={`label-tag-${label}`}
- >
- <span className={styles.labelValue}>{displayText}</span>
- </Badge>
- </span>
- </TooltipTrigger>
- <TooltipContent>
+ <Tooltip
+ title={
<div className={styles.tooltipContent}>
<span>{displayText}</span>
<button
@@ -66,8 +43,19 @@ function LabelTag({ label, value, color }: LabelTagProps): JSX.Element {
<Copy size={12} />
</button>
</div>
- </TooltipContent>
- </TooltipRoot>
+ }
+ >
+ <span className={className}>
+ <Badge
+ textTransform="none"
+ color={color ?? 'secondary'}
+ variant="outlined"
+ testId={`label-tag-${label}`}
+ >
+ <span className={styles.labelValue}>{displayText}</span>
+ </Badge>
+ </span>
+ </Tooltip>
);
}
diff --git a/frontend/src/components/Alerts/LabelColumn/utils.ts b/frontend/src/components/Alerts/LabelColumn/utils.ts
index 1b1d19f280..7bb77bc6ea 100644
--- a/frontend/src/components/Alerts/LabelColumn/utils.ts
+++ b/frontend/src/components/Alerts/LabelColumn/utils.ts
@@ -1,14 +1,33 @@
-export const BADGE_GAP = 4;
export const OVERFLOW_BADGE_WIDTH = 40;
-export const BADGE_MAX_WIDTH = 180;
-export const BADGE_PADDING = 16;
-export const CHAR_WIDTH = 7;
-
-export function estimateBadgeWidth(label: string, value?: string): number {
- const displayText = value ? `${label}: ${value}` : label;
- return Math.min(
- displayText.length * CHAR_WIDTH + BADGE_PADDING,
- BADGE_MAX_WIDTH,
+/**
+ * How many leading labels fit in `available` px, reserving room for the `+N` badge
+ * whenever some are left out. At least one label is always shown.
+ */
+export function getVisibleCount(
+ widths: number[],
+ available: number,
+ gap: number,
+): number {
+ const total = widths.reduce(
+ (sum, width, index) => sum + width + (index > 0 ? gap : 0),
+ 0,
);
+ if (total <= available) {
+ return widths.length;
+ }
+
+ const limit = available - OVERFLOW_BADGE_WIDTH - gap;
+ let used = 0;
+ let count = 0;
+
+ for (const width of widths) {
+ used += width + (count > 0 ? gap : 0);
+ if (used > limit) {
+ break;
+ }
+ count++;
+ }
+
+ return Math.max(1, count);
}
diff --git a/frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.tsx b/frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.tsx
index 98a8ecd76f..42e36294d4 100644
--- a/frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.tsx
+++ b/frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.tsx
@@ -30,21 +30,23 @@ function NoResultsEmptyState({
<div className={styles.actions}>
{onClear && (
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={onClear}
- data-testid="no-results-clear-button"
+ testId="no-results-clear-button"
>
{clearButtonText}
</Button>
)}
{onRefresh && (
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={<RefreshCw size={14} />}
onClick={onRefresh}
- data-testid="no-results-refresh-button"
+ testId="no-results-refresh-button"
>
Refresh
</Button>
diff --git a/frontend/src/components/Alerts/constants.ts b/frontend/src/components/Alerts/constants.ts
index efc7dc97c5..18ea0f904c 100644
--- a/frontend/src/components/Alerts/constants.ts
+++ b/frontend/src/components/Alerts/constants.ts
@@ -1,4 +1,4 @@
-import type { BadgeColor } from '@signozhq/ui/badge';
+import type { BadgeColorType } from '@signozhq/ui/badge';
export const STATE_ORDER = ['firing', 'pending', 'inactive', 'disabled'];
export const SEVERITY_ORDER = ['critical', 'error', 'warning', 'info'];
@@ -24,9 +24,9 @@ export const SEVERITY_COLORS: Record<string, string> = {
info: 'var(--bg-robin-500)',
};
-export const SEVERITY_BADGE_COLORS: Record<string, BadgeColor> = {
- critical: 'error',
- error: 'error',
+export const SEVERITY_BADGE_COLORS: Record<string, BadgeColorType> = {
+ critical: 'danger',
+ error: 'danger',
warning: 'warning',
info: 'primary',
};
diff --git a/frontend/src/components/AuthPageContainer/AuthHeader.styles.scss b/frontend/src/components/AuthPageContainer/AuthHeader.styles.scss
index cace2eded2..54441ade2a 100644
--- a/frontend/src/components/AuthPageContainer/AuthHeader.styles.scss
+++ b/frontend/src/components/AuthPageContainer/AuthHeader.styles.scss
@@ -33,36 +33,3 @@
color: var(--l1-foreground);
white-space: nowrap;
}
-
-.auth-header-help-button {
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 8px;
- height: 32px;
- padding: 10px 16px;
- background: var(--l2-background);
- color: var(--l2-foreground);
- border: none;
- border-radius: 2px;
- cursor: pointer;
- transition: opacity 0.2s ease;
-
- span {
- font-family: var(--font-family-inter, Inter, sans-serif);
- font-size: 11px;
- font-weight: 500;
- line-height: 1;
- color: var(--l2-foreground);
- text-align: center;
- }
-
- svg {
- flex-shrink: 0;
- color: var(--l2-foreground);
- }
-
- &:hover {
- opacity: 0.8;
- }
-}
diff --git a/frontend/src/components/AuthPageContainer/AuthHeader.tsx b/frontend/src/components/AuthPageContainer/AuthHeader.tsx
index 03e54d8128..fe22b8fcdb 100644
--- a/frontend/src/components/AuthPageContainer/AuthHeader.tsx
+++ b/frontend/src/components/AuthPageContainer/AuthHeader.tsx
@@ -22,11 +22,11 @@ function AuthHeader(): JSX.Element {
<span className="auth-header-logo-text">SigNoz</span>
</div>
<Button
- className="auth-header-help-button"
+ size="md"
prefix={<LifeBuoy size={12} />}
onClick={handleGetHelp}
variant="solid"
- color="none"
+ color="secondary"
>
Get Help
</Button>
diff --git a/frontend/src/components/Badges/Badges.tsx b/frontend/src/components/Badges/Badges.tsx
index ffe57b2ee2..351e293e32 100644
--- a/frontend/src/components/Badges/Badges.tsx
+++ b/frontend/src/components/Badges/Badges.tsx
@@ -1,7 +1,7 @@
import React, { Dispatch, SetStateAction, useState } from 'react';
import { Check, Plus, X } from '@signozhq/icons';
import { Button, Flex } from 'antd';
-import { Badge } from '@signozhq/ui/badge';
+import { Pill } from '@signozhq/ui/pill';
import Input from 'components/Input';
import './Badges.styles.scss';
@@ -47,18 +47,13 @@ function Badges({ tags, setTags }: AddTagsProps): JSX.Element {
return (
<div className="tags-container">
{tags.map<React.ReactNode>((tag) => (
- <Badge
+ <Pill.Closeable
+ textTransform="none"
key={tag}
- color="vanilla"
- style={{ userSelect: 'none' }}
- closable
- onClose={(e): void => {
- e.preventDefault();
- handleClose(tag);
- }}
+ onClose={() => handleClose(tag)}
>
{tag}
- </Badge>
+ </Pill.Closeable>
))}
{inputVisible && (
diff --git a/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.styles.scss b/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.styles.scss
index eafa811814..3fd234f794 100644
--- a/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.styles.scss
+++ b/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.styles.scss
@@ -39,9 +39,3 @@
}
}
}
-
-.cloud-service-data-collected-table-tooltip {
- max-width: 280px;
- white-space: normal;
- word-break: break-word;
-}
diff --git a/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.tsx b/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.tsx
index 98d0541c01..33fd536728 100644
--- a/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.tsx
+++ b/frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.tsx
@@ -4,7 +4,7 @@ import {
CloudintegrationtypesCollectedMetricDTO,
} from 'api/generated/services/sigNoz.schemas';
import { BarChart, Info, ScrollText } from '@signozhq/icons';
-import { TooltipProvider, TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import './CloudServiceDataCollected.styles.scss';
@@ -88,23 +88,15 @@ function CloudServiceDataCollected({
<BarChart size={14} />
Metrics
{metricsInfoTooltip && (
- <TooltipProvider>
- <TooltipSimple
- title={metricsInfoTooltip}
- side="top"
- tooltipContentProps={{
- className: 'cloud-service-data-collected-table-tooltip',
- }}
+ <Tooltip title={metricsInfoTooltip} side="top">
+ <span
+ className="cloud-service-data-collected-table-heading-info"
+ aria-label="About the metrics listed below"
+ data-testid="data-collected-metrics-info"
>
- <span
- className="cloud-service-data-collected-table-heading-info"
- aria-label="About the metrics listed below"
- data-testid="data-collected-metrics-info"
- >
- <Info size={12} />
- </span>
- </TooltipSimple>
- </TooltipProvider>
+ <Info size={12} />
+ </span>
+ </Tooltip>
)}
</div>
<Table
diff --git a/frontend/src/components/CodeBlock/CodeBlock.module.scss b/frontend/src/components/CodeBlock/CodeBlock.module.scss
index d871b29e87..b94f637608 100644
--- a/frontend/src/components/CodeBlock/CodeBlock.module.scss
+++ b/frontend/src/components/CodeBlock/CodeBlock.module.scss
@@ -2,6 +2,13 @@
position: relative;
}
+.copyButton {
+ position: absolute;
+ right: 8px;
+ top: 8px;
+ z-index: 1;
+}
+
.codeBlockSyntaxHighlighter {
background-color: var(--l2-background) !important;
border-radius: 4px !important;
diff --git a/frontend/src/components/CodeBlock/CodeBlock.tsx b/frontend/src/components/CodeBlock/CodeBlock.tsx
index b7484dc32e..d58504786c 100644
--- a/frontend/src/components/CodeBlock/CodeBlock.tsx
+++ b/frontend/src/components/CodeBlock/CodeBlock.tsx
@@ -2,6 +2,7 @@ import { useMemo, useState } from 'react';
import { useCopyToClipboard } from 'react-use';
import { Check, Copy } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
+import { Tooltip } from '@signozhq/ui/tooltip';
import SyntaxHighlighter, {
a11yDark,
} from 'components/MarkdownRenderer/syntaxHighlighter';
@@ -52,16 +53,20 @@ function CodeBlock({
data-testid="code-block-container"
>
{showCopyButton ? (
- <Button
- variant="ghost"
- color="secondary"
- size="sm"
- onClick={handleCopy}
- prefix={isCopied ? <Check size={14} /> : <Copy size={14} />}
- aria-label="Copy code"
- title={isCopied ? 'Copied' : 'Copy'}
- style={{ position: 'absolute', right: 8, top: 8, zIndex: 1 }}
- />
+ <div className={styles.copyButton}>
+ <Tooltip title={isCopied ? 'Copied' : 'Copy'}>
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ onClick={handleCopy}
+ aria-label="Copy code"
+ >
+ {isCopied ? <Check size={14} /> : <Copy size={14} />}
+ </Button>
+ </Tooltip>
+ </div>
) : null}
<SyntaxHighlighter
style={a11yDark}
diff --git a/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx b/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx
index 83e9807ffb..86a3dfacdb 100644
--- a/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx
+++ b/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx
@@ -134,26 +134,27 @@ function CreateServiceAccountModal(): JSX.Element {
<DialogFooter className="create-sa-modal__footer">
<Button
+ size="md"
type="button"
variant="solid"
color="secondary"
onClick={handleClose}
- data-testid="create-sa-cancel-btn"
+ testId="create-sa-cancel-btn"
+ prefix={<X size={12} />}
>
- <X size={12} />
Cancel
</Button>
<AuthZButton
+ size="md"
checks={[SACreatePermission]}
- withPortal={false}
type="submit"
form="create-sa-form"
variant="solid"
color="primary"
loading={isSubmitting}
disabled={!isValid}
- data-testid="create-sa-submit-btn"
+ testId="create-sa-submit-btn"
>
Create Service Account
</AuthZButton>
diff --git a/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx b/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx
index 8d216839bd..fa13efbb5a 100644
--- a/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx
+++ b/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx
@@ -5,6 +5,7 @@ import {
} from 'lib/authz/utils/authz-test-utils';
import { rest, server } from 'mocks-server/server';
import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { submitImplicitly } from 'tests/submitImplicitly';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import CreateServiceAccountModal from '../CreateServiceAccountModal';
@@ -60,7 +61,10 @@ describe('CreateServiceAccountModal', () => {
await screen.findByTestId('create-sa-name-input');
await waitFor(() =>
- expect(screen.getByTestId('create-sa-submit-btn')).toBeDisabled(),
+ expect(screen.getByTestId('create-sa-submit-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ ),
);
});
@@ -72,10 +76,14 @@ describe('CreateServiceAccountModal', () => {
const submitBtn = await screen.findByTestId('create-sa-submit-btn');
await user.type(nameInput, 'test');
- await waitFor(() => expect(submitBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.clear(nameInput);
- await waitFor(() => expect(submitBtn).toBeDisabled());
+ await waitFor(() =>
+ expect(submitBtn).toHaveAttribute('aria-disabled', 'true'),
+ );
});
it('successful submit shows toast.success and closes modal', async () => {
@@ -86,7 +94,9 @@ describe('CreateServiceAccountModal', () => {
await user.type(nameInput, 'Deploy Bot');
const submitBtn = screen.getByTestId('create-sa-submit-btn');
- await waitFor(() => expect(submitBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(submitBtn);
await waitFor(() => {
@@ -102,6 +112,40 @@ describe('CreateServiceAccountModal', () => {
});
});
+ it('pressing Enter again while creating sends one request', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ let requests = 0;
+ server.use(
+ rest.post(SERVICE_ACCOUNTS_ENDPOINT, (_, res, ctx) => {
+ requests += 1;
+ return res(
+ ctx.delay(100),
+ ctx.status(201),
+ ctx.json({ status: 'success', data: {} }),
+ );
+ }),
+ );
+ renderModal();
+
+ const nameInput = await screen.findByTestId<HTMLInputElement>(
+ 'create-sa-name-input',
+ );
+ await user.type(nameInput, 'Deploy Bot');
+ const submitBtn = screen.getByTestId('create-sa-submit-btn');
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
+
+ submitImplicitly(nameInput);
+ await waitFor(() => expect(submitBtn).toHaveAttribute('aria-busy', 'true'));
+ submitImplicitly(nameInput);
+
+ await waitFor(() => {
+ expect(mockToast.success).toHaveBeenCalled();
+ });
+ expect(requests).toBe(1);
+ });
+
it('shows toast.error on API error and keeps modal open', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
@@ -120,7 +164,9 @@ describe('CreateServiceAccountModal', () => {
await user.type(nameInput, 'Dupe Bot');
const submitBtn = screen.getByTestId('create-sa-submit-btn');
- await waitFor(() => expect(submitBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(submitBtn);
await waitFor(() => {
@@ -180,7 +226,10 @@ describe('CreateServiceAccountModal', () => {
).resolves.toBeInTheDocument();
// The footer lives outside the guard: submit is gated, Cancel still works.
- expect(screen.getByTestId('create-sa-submit-btn')).toBeDisabled();
+ expect(screen.getByTestId('create-sa-submit-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.click(screen.getByTestId('create-sa-cancel-btn'));
diff --git a/frontend/src/components/CustomTimePicker/CustomTimePicker.styles.scss b/frontend/src/components/CustomTimePicker/CustomTimePicker.styles.scss
index 3547d44db1..f548529824 100644
--- a/frontend/src/components/CustomTimePicker/CustomTimePicker.styles.scss
+++ b/frontend/src/components/CustomTimePicker/CustomTimePicker.styles.scss
@@ -4,30 +4,6 @@
align-items: center;
gap: 4px;
- .zoom-out-btn {
- display: flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- color: var(--secondary-foreground);
- background-color: var(--secondary-background);
- border: 1px solid var(--secondary-border);
- border-radius: 2px;
- box-shadow: none;
- padding: 10px;
- height: 33px;
-
- &:hover:not(:disabled) {
- color: var(--primary-foreground);
- background: var(--primary-background);
- }
-
- &:disabled {
- opacity: 0.5;
- cursor: not-allowed;
- }
- }
-
.timeSelection-input {
&:hover {
border-color: var(--l1-border) !important;
diff --git a/frontend/src/components/CustomTimePicker/CustomTimePicker.tsx b/frontend/src/components/CustomTimePicker/CustomTimePicker.tsx
index 0b4a4bdc7b..3b17ea985f 100644
--- a/frontend/src/components/CustomTimePicker/CustomTimePicker.tsx
+++ b/frontend/src/components/CustomTimePicker/CustomTimePicker.tsx
@@ -650,20 +650,20 @@ function CustomTimePicker({
</Popover>
</Tooltip>
{!showLiveLogs && !isModalTimeSelection && (
- <Tooltip
- title={
- zoomOutDisabled ? 'Zoom out time range is limited to 1 month' : 'Zoom out'
- }
- >
+ <Tooltip title={zoomOutDisabled ? undefined : 'Zoom out'}>
<Button
- className="zoom-out-btn"
+ disabledTooltip="Zoom out time range is limited to 1 month"
+ size="md"
onClick={handleZoomOut}
disabled={zoomOutDisabled}
- data-testid="zoom-out-btn"
- prefix={<ZoomOut size={14} />}
+ testId="zoom-out-btn"
+ icon
+ aria-label="Zoom out"
variant="solid"
- color="none"
- />
+ color="secondary"
+ >
+ <ZoomOut size={14} />
+ </Button>
</Tooltip>
)}
</div>
diff --git a/frontend/src/components/CustomTimePicker/__tests__/customTimePickerZoomOut.test.tsx b/frontend/src/components/CustomTimePicker/__tests__/customTimePickerZoomOut.test.tsx
index a73c0e47d6..258aed21a3 100644
--- a/frontend/src/components/CustomTimePicker/__tests__/customTimePickerZoomOut.test.tsx
+++ b/frontend/src/components/CustomTimePicker/__tests__/customTimePickerZoomOut.test.tsx
@@ -164,6 +164,6 @@ describe('CustomTimePicker - zoom out button', () => {
);
const zoomOutBtn = screen.getByTestId('zoom-out-btn');
- expect(zoomOutBtn).toBeDisabled();
+ expect(zoomOutBtn).toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/components/DetailsPanel/DetailsHeader/DetailsHeader.tsx b/frontend/src/components/DetailsPanel/DetailsHeader/DetailsHeader.tsx
index ba8b1c5406..dc349bacac 100644
--- a/frontend/src/components/DetailsPanel/DetailsHeader/DetailsHeader.tsx
+++ b/frontend/src/components/DetailsPanel/DetailsHeader/DetailsHeader.tsx
@@ -27,12 +27,14 @@ function DetailsHeader({
const closeButton = (
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={onClose}
aria-label="Close"
- prefix={<X size={14} />}
- ></Button>
+ >
+ <X size={14} />
+ </Button>
);
return (
diff --git a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.styles.scss b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.styles.scss
index c0f8c9eac9..d4b052e1cb 100644
--- a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.styles.scss
+++ b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.styles.scss
@@ -42,12 +42,5 @@
height: 1px;
background: var(--l1-border);
}
-
- .export-button {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- }
}
}
diff --git a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx
index 4c65fc6eda..535c8b37c0 100644
--- a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx
+++ b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.test.tsx
@@ -308,13 +308,16 @@ describe.each([
fireEvent.click(screen.getByText('Export'));
- expect(screen.getByTestId(testId)).toBeDisabled();
+ expect(screen.getByTestId(testId)).toHaveAttribute('aria-disabled', 'true');
expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
resolveDownload!();
await waitFor(() => {
- expect(screen.getByTestId(testId)).not.toBeDisabled();
+ expect(screen.getByTestId(testId)).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx
index e2d464c930..d8aba903bc 100644
--- a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx
+++ b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx
@@ -1,7 +1,7 @@
import { useCallback, useMemo, useState } from 'react';
import { Popover, Tooltip } from 'antd';
import { Button } from '@signozhq/ui/button';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
import { Typography } from '@signozhq/ui/typography';
import { TelemetryFieldKey } from 'api/v5/v5';
import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -69,10 +69,15 @@ export default function DownloadOptionsMenu({
>
<div className="export-format">
<Typography.Text className="title">FORMAT</Typography.Text>
- <RadioGroup value={exportFormat} onChange={setExportFormat}>
- <RadioGroupItem value={DownloadFormats.CSV}>csv</RadioGroupItem>
- <RadioGroupItem value={DownloadFormats.JSONL}>jsonl</RadioGroupItem>
- </RadioGroup>
+ <RadioGroup
+ color="primary"
+ value={exportFormat}
+ onChange={setExportFormat}
+ items={[
+ { value: DownloadFormats.CSV, label: 'csv' },
+ { value: DownloadFormats.JSONL, label: 'jsonl' },
+ ]}
+ />
</div>
<div className="horizontal-line" />
@@ -80,19 +85,15 @@ export default function DownloadOptionsMenu({
<div className="row-limit">
<Typography.Text className="title">Number of Rows</Typography.Text>
<RadioGroup
+ color="primary"
value={String(rowLimit)}
onChange={(value): void => setRowLimit(Number(value))}
- >
- <RadioGroupItem value={String(DownloadRowCounts.TEN_K)}>
- 10k
- </RadioGroupItem>
- <RadioGroupItem value={String(DownloadRowCounts.THIRTY_K)}>
- 30k
- </RadioGroupItem>
- <RadioGroupItem value={String(DownloadRowCounts.FIFTY_K)}>
- 50k
- </RadioGroupItem>
- </RadioGroup>
+ items={[
+ { value: String(DownloadRowCounts.TEN_K), label: '10k' },
+ { value: String(DownloadRowCounts.THIRTY_K), label: '30k' },
+ { value: String(DownloadRowCounts.FIFTY_K), label: '50k' },
+ ]}
+ />
</div>
{dataSource !== DataSource.TRACES && (
@@ -101,12 +102,15 @@ export default function DownloadOptionsMenu({
<div className="columns-scope">
<Typography.Text className="title">Columns</Typography.Text>
- <RadioGroup value={columnsScope} onChange={setColumnsScope}>
- <RadioGroupItem value={DownloadColumnsScopes.ALL}>All</RadioGroupItem>
- <RadioGroupItem value={DownloadColumnsScopes.SELECTED}>
- Selected
- </RadioGroupItem>
- </RadioGroup>
+ <RadioGroup
+ color="primary"
+ value={columnsScope}
+ onChange={setColumnsScope}
+ items={[
+ { value: DownloadColumnsScopes.ALL, label: 'All' },
+ { value: DownloadColumnsScopes.SELECTED, label: 'Selected' },
+ ]}
+ />
</div>
</>
)}
@@ -115,9 +119,9 @@ export default function DownloadOptionsMenu({
variant="solid"
color="primary"
prefix={<Download size={16} />}
+ size="md"
+ width="100%"
onClick={handleExport}
- className="export-button"
- disabled={isDownloading}
loading={isDownloading}
>
Export
@@ -148,13 +152,14 @@ export default function DownloadOptionsMenu({
<Button
variant="ghost"
color="secondary"
- size="icon"
- prefix={<Download size={14} />}
+ size="sm"
+ icon
aria-label="Download"
- data-testid={`periscope-btn-download-${dataSource}`}
- disabled={isDownloading}
+ testId={`periscope-btn-download-${dataSource}`}
loading={isDownloading}
- />
+ >
+ <Download size={14} />
+ </Button>
</Tooltip>
</Popover>
);
diff --git a/frontend/src/components/EditMemberDrawer/DeleteMemberDialog.tsx b/frontend/src/components/EditMemberDrawer/DeleteMemberDialog.tsx
index fa537d5dd6..c95e4d9bbd 100644
--- a/frontend/src/components/EditMemberDrawer/DeleteMemberDialog.tsx
+++ b/frontend/src/components/EditMemberDrawer/DeleteMemberDialog.tsx
@@ -38,18 +38,23 @@ function DeleteMemberDialog({
const footer = (
<>
- <Button variant="solid" color="secondary" onClick={onClose}>
- <X size={12} />
+ <Button
+ size="md"
+ variant="solid"
+ color="secondary"
+ onClick={onClose}
+ prefix={<X size={12} />}
+ >
Cancel
</Button>
<Button
+ size="md"
variant="solid"
- color="destructive"
- disabled={isDeleting}
+ color="danger"
onClick={onConfirm}
loading={isDeleting}
+ prefix={<Trash2 size={12} />}
>
- <Trash2 size={12} />
{isDeleting ? 'Processing...' : title}
</Button>
</>
diff --git a/frontend/src/components/EditMemberDrawer/EditMemberDrawer.styles.scss b/frontend/src/components/EditMemberDrawer/EditMemberDrawer.styles.scss
index dc720d5953..f30bd8527c 100644
--- a/frontend/src/components/EditMemberDrawer/EditMemberDrawer.styles.scss
+++ b/frontend/src/components/EditMemberDrawer/EditMemberDrawer.styles.scss
@@ -90,7 +90,6 @@
font-weight: var(--uppercase-small-500-font-weight);
line-height: 100%;
letter-spacing: 0.44px;
- text-transform: uppercase;
}
}
@@ -113,6 +112,7 @@
&__footer-left {
display: flex;
align-items: center;
+ gap: var(--spacing-4);
}
&__footer-right {
@@ -128,10 +128,6 @@
flex-shrink: 0;
}
- &__tooltip-wrapper {
- display: inline-flex;
- }
-
&__footer-btn {
display: inline-flex;
align-items: center;
@@ -200,6 +196,7 @@
background: var(--l2-background);
border: 1px solid var(--l1-border);
border-radius: 2px;
+ padding-right: var(--spacing-4);
}
&__link-text-wrap {
@@ -220,8 +217,4 @@
line-height: var(--line-height-18);
letter-spacing: -0.07px;
}
-
- &__copy-btn {
- border-left: 1px solid var(--l1-border);
- }
}
diff --git a/frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx b/frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx
index b8ab9d1b13..36fb0bc8ee 100644
--- a/frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx
+++ b/frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx
@@ -519,7 +519,12 @@ function EditMemberDrawer({
localRoles.map((roleId) => {
const role = availableRoles.find((r) => r.id === roleId);
return (
- <Badge key={roleId} color="vanilla">
+ <Badge
+ textTransform="none"
+ variant="solid"
+ key={roleId}
+ color="secondary"
+ >
{role?.name ?? roleId}
</Badge>
);
@@ -559,15 +564,15 @@ function EditMemberDrawer({
<div className="edit-member-drawer__meta-item">
<span className="edit-member-drawer__meta-label">Status</span>
{member?.status === MemberStatus.Active ? (
- <Badge color="forest" variant="outline">
+ <Badge color="success" variant="outlined">
ACTIVE
</Badge>
) : member?.status === MemberStatus.Deleted ? (
- <Badge color="cherry" variant="outline">
+ <Badge color="danger" variant="outlined">
DELETED
</Badge>
) : (
- <Badge color="amber" variant="outline">
+ <Badge color="warning" variant="outlined">
INVITED
</Badge>
)}
@@ -575,12 +580,16 @@ function EditMemberDrawer({
<div className="edit-member-drawer__meta-item">
<span className="edit-member-drawer__meta-label">{joinedOnLabel}</span>
- <Badge color="vanilla">{formatTimestamp(member?.joinedOn)}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {formatTimestamp(member?.joinedOn)}
+ </Badge>
</div>
{!isInvited && (
<div className="edit-member-drawer__meta-item">
<span className="edit-member-drawer__meta-label">Last Modified</span>
- <Badge color="vanilla">{formatTimestamp(member?.updatedAt)}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {formatTimestamp(member?.updatedAt)}
+ </Badge>
</div>
)}
</div>
@@ -611,55 +620,59 @@ function EditMemberDrawer({
{!isDeleted && (
<>
<div className="edit-member-drawer__footer-left">
- <Tooltip title={getDeleteTooltip(isRootUser, isSelf)}>
- <span className="edit-member-drawer__tooltip-wrapper">
- <Button
- onClick={(): void => setShowDeleteConfirm(true)}
- disabled={isRootUser || isSelf}
- variant="link"
- color="destructive"
- >
- <Trash2 size={12} />
- {isInvited ? 'Revoke Invite' : 'Delete Member'}
- </Button>
- </span>
- </Tooltip>
+ <Button
+ disabledTooltip={getDeleteTooltip(isRootUser, isSelf)}
+ size="md"
+ onClick={(): void => setShowDeleteConfirm(true)}
+ disabled={isRootUser || isSelf}
+ variant="link"
+ color="danger"
+ prefix={<Trash2 size={12} />}
+ >
+ {isInvited ? 'Revoke Invite' : 'Delete Member'}
+ </Button>
<div className="edit-member-drawer__footer-divider" />
- <Tooltip title={isRootUser ? ROOT_USER_TOOLTIP : undefined}>
- <span className="edit-member-drawer__tooltip-wrapper">
- <Button
- onClick={handleGenerateResetLink}
- disabled={isGeneratingLink || isRootUser || isLoadingTokenStatus}
- variant="link"
- color="warning"
- >
- <RefreshCw size={12} />
- {isGeneratingLink
- ? 'Generating...'
- : isInvited
- ? getInviteButtonLabel(
- isLoadingTokenStatus,
- existingToken,
- isTokenExpired,
- tokenNotFound,
- )
- : 'Generate Password Reset Link'}
- </Button>
- </span>
- </Tooltip>
+ <Button
+ disabledTooltip={ROOT_USER_TOOLTIP}
+ size="md"
+ onClick={handleGenerateResetLink}
+ disabled={isRootUser}
+ loading={isGeneratingLink || isLoadingTokenStatus}
+ variant="link"
+ color="warning"
+ prefix={<RefreshCw size={12} />}
+ >
+ {isGeneratingLink
+ ? 'Generating...'
+ : isInvited
+ ? getInviteButtonLabel(
+ isLoadingTokenStatus,
+ existingToken,
+ isTokenExpired,
+ tokenNotFound,
+ )
+ : 'Generate Password Reset Link'}
+ </Button>
</div>
<div className="edit-member-drawer__footer-right">
- <Button variant="outlined" color="secondary" onClick={handleClose}>
- <X size={14} />
+ <Button
+ size="md"
+ variant="outlined"
+ color="secondary"
+ onClick={handleClose}
+ prefix={<X size={14} />}
+ >
Cancel
</Button>
<Button
+ disabledTooltip={isRootUser ? ROOT_USER_TOOLTIP : 'No changes to save'}
+ size="md"
variant="solid"
color="primary"
- disabled={!isDirty || isSaving || isRootUser}
+ disabled={!isDirty || isRootUser}
onClick={handleSave}
loading={isSaving}
>
diff --git a/frontend/src/components/EditMemberDrawer/ResetLinkDialog.tsx b/frontend/src/components/EditMemberDrawer/ResetLinkDialog.tsx
index ed954f553a..516d55868a 100644
--- a/frontend/src/components/EditMemberDrawer/ResetLinkDialog.tsx
+++ b/frontend/src/components/EditMemberDrawer/ResetLinkDialog.tsx
@@ -45,11 +45,11 @@ function ResetLinkDialog({
<span className="reset-link-dialog__link-text">{resetLink}</span>
</div>
<Button
+ size="md"
variant="link"
color="secondary"
onClick={onCopy}
prefix={hasCopied ? <Check size={12} /> : <Copy size={12} />}
- className="reset-link-dialog__copy-btn"
>
{hasCopied ? 'Copied!' : 'Copy'}
</Button>
diff --git a/frontend/src/components/EditMemberDrawer/__tests__/EditMemberDrawer.test.tsx b/frontend/src/components/EditMemberDrawer/__tests__/EditMemberDrawer.test.tsx
index ed02f2941c..a20617616c 100644
--- a/frontend/src/components/EditMemberDrawer/__tests__/EditMemberDrawer.test.tsx
+++ b/frontend/src/components/EditMemberDrawer/__tests__/EditMemberDrawer.test.tsx
@@ -251,7 +251,7 @@ describe('EditMemberDrawer', () => {
expect(screen.getByText('ACTIVE')).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /save member details/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('enables Save after editing name and calls updateUser on confirm', async () => {
@@ -271,7 +271,9 @@ describe('EditMemberDrawer', () => {
await user.type(nameInput, 'Alice Updated');
const saveBtn = screen.getByRole('button', { name: /save member details/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
@@ -295,7 +297,9 @@ describe('EditMemberDrawer', () => {
await user.type(nameInput, 'Alice Updated');
const saveBtn = screen.getByRole('button', { name: /save member details/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -323,7 +327,9 @@ describe('EditMemberDrawer', () => {
await user.click(await screen.findByTitle('signoz-editor'));
const saveBtn = screen.getByRole('button', { name: /save member details/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -349,7 +355,9 @@ describe('EditMemberDrawer', () => {
await user.click(removeBtn);
const saveBtn = screen.getByRole('button', { name: /save member details/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -505,7 +513,9 @@ describe('EditMemberDrawer', () => {
await user.type(nameInput, 'Bob Updated');
const saveBtn = screen.getByRole('button', { name: /save member details/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -541,7 +551,9 @@ describe('EditMemberDrawer', () => {
await user.type(nameInput, 'Alice Updated');
const saveBtn = screen.getByRole('button', { name: /save member details/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -619,7 +631,7 @@ describe('EditMemberDrawer', () => {
renderDrawer({ member: selfMember });
expect(
screen.getByRole('button', { name: /delete member/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('does not open delete confirm dialog when Delete is clicked while disabled (isSelf)', async () => {
@@ -642,7 +654,7 @@ describe('EditMemberDrawer', () => {
renderDrawer({ member: selfMember });
expect(
screen.getByRole('button', { name: /generate password reset link/i }),
- ).not.toBeDisabled();
+ ).not.toHaveAttribute('aria-disabled', 'true');
});
});
@@ -664,21 +676,21 @@ describe('EditMemberDrawer', () => {
renderDrawer();
expect(
screen.getByRole('button', { name: /delete member/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('disables Reset Link button for root user', () => {
renderDrawer();
expect(
screen.getByRole('button', { name: /generate password reset link/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('disables Save button for root user', () => {
renderDrawer();
expect(
screen.getByRole('button', { name: /save member details/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('does not open delete confirm dialog when Delete is clicked while disabled (root)', async () => {
diff --git a/frontend/src/components/ErrorModal/ErrorModal.tsx b/frontend/src/components/ErrorModal/ErrorModal.tsx
index f2682fc934..5e0b1da13e 100644
--- a/frontend/src/components/ErrorModal/ErrorModal.tsx
+++ b/frontend/src/components/ErrorModal/ErrorModal.tsx
@@ -53,7 +53,7 @@ function ErrorModal({
onClick={(): void => setVisible(true)}
onKeyDown={undefined}
>
- <Badge color="error">
+ <Badge variant="solid" color="danger">
<CircleAlert size={14} color={Color.BG_CHERRY_500} /> error
</Badge>
</span>
diff --git a/frontend/src/components/ExplorerCard/ExplorerCard.tsx b/frontend/src/components/ExplorerCard/ExplorerCard.tsx
index e04af8feda..73f7c10735 100644
--- a/frontend/src/components/ExplorerCard/ExplorerCard.tsx
+++ b/frontend/src/components/ExplorerCard/ExplorerCard.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { useCopyToClipboard } from 'react-use';
import { Button, Col, Popover, Row, Select, Space } from 'antd';
-import { DropdownMenuSimple, type MenuProps } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Typography } from '@signozhq/ui/typography';
import axios from 'axios';
import TextToolTip from 'components/TextToolTip';
@@ -137,16 +137,15 @@ function ExplorerCard({
);
};
- const moreOptionMenu: MenuProps = {
- items: [
- {
- key: 'delete',
- label: <Typography.Text strong>Delete</Typography.Text>,
- onClick: onDeleteHandler,
- icon: <Trash2 size="md" />,
- },
- ],
- };
+ const moreOptionItems: DropdownItemType[] = [
+ {
+ type: 'item',
+ value: 'delete',
+ label: <Typography.Text strong>Delete</Typography.Text>,
+ onClick: onDeleteHandler,
+ prefix: <Trash2 size="md" />,
+ },
+ ];
const saveButtonType = isQueryUpdated ? 'default' : 'primary';
const saveButtonIcon = isQueryUpdated ? null : <Save size="md" />;
@@ -230,9 +229,14 @@ function ExplorerCard({
</Popover>
<Share2 onClick={onCopyUrlHandler} size="md" />
{viewKey && (
- <DropdownMenuSimple menu={moreOptionMenu}>
+ <Dropdown
+ items={moreOptionItems}
+ nativeButton
+ align="end"
+ side="bottom"
+ >
<Button type="text" size="small" icon={<Ellipsis size="md" />} />
- </DropdownMenuSimple>
+ </Dropdown>
)}
</Space>
</OffSetCol>
diff --git a/frontend/src/components/ExportMenu/ExportMenu.styles.scss b/frontend/src/components/ExportMenu/ExportMenu.styles.scss
index 0bae603b3f..fdaa3dca84 100644
--- a/frontend/src/components/ExportMenu/ExportMenu.styles.scss
+++ b/frontend/src/components/ExportMenu/ExportMenu.styles.scss
@@ -26,8 +26,4 @@
font-size: var(--periscope-font-size-base);
}
}
-
- .export-button {
- width: 100%;
- }
}
diff --git a/frontend/src/components/ExportMenu/ExportMenu.tsx b/frontend/src/components/ExportMenu/ExportMenu.tsx
index 4889fbfc7a..f92ebb9c25 100644
--- a/frontend/src/components/ExportMenu/ExportMenu.tsx
+++ b/frontend/src/components/ExportMenu/ExportMenu.tsx
@@ -1,8 +1,8 @@
import { Download } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { RadioGroup } from '@signozhq/ui/radio-group';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import {
ClientExportData,
@@ -51,36 +51,41 @@ export default function ExportMenu({
return (
<Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
- <TooltipSimple title="Download">
+ <Tooltip title="Download">
<PopoverTrigger asChild>
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Download"
- data-testid={`export-menu-${dataSource}`}
- disabled={isExporting}
+ testId={`export-menu-${dataSource}`}
loading={isExporting}
>
<Download size={14} />
</Button>
</PopoverTrigger>
- </TooltipSimple>
+ </Tooltip>
<PopoverContent align="end" className="export-menu-popover">
<div className="export-format">
<Typography.Text className="title">FORMAT</Typography.Text>
- <RadioGroup value={exportFormat} onChange={setExportFormat}>
- <RadioGroupItem value={ExportFormat.Csv}>csv</RadioGroupItem>
- <RadioGroupItem value={ExportFormat.Jsonl}>jsonl</RadioGroupItem>
- </RadioGroup>
+ <RadioGroup
+ color="primary"
+ value={exportFormat}
+ onChange={setExportFormat}
+ items={[
+ { value: ExportFormat.Csv, label: 'csv' },
+ { value: ExportFormat.Jsonl, label: 'jsonl' },
+ ]}
+ />
</div>
<Button
+ size="md"
variant="solid"
color="primary"
- className="export-button"
+ width="100%"
onClick={handleExport}
- disabled={isExporting}
loading={isExporting}
prefix={<Download size={16} />}
>
diff --git a/frontend/src/components/ExportMenu/__tests__/ExportMenu.test.tsx b/frontend/src/components/ExportMenu/__tests__/ExportMenu.test.tsx
index d5577ecf3a..f0fa07371a 100644
--- a/frontend/src/components/ExportMenu/__tests__/ExportMenu.test.tsx
+++ b/frontend/src/components/ExportMenu/__tests__/ExportMenu.test.tsx
@@ -80,6 +80,6 @@ describe('ExportMenu', () => {
mockIsExporting = true;
renderMenu();
- expect(screen.getByTestId(TEST_ID)).toBeDisabled();
+ expect(screen.getByTestId(TEST_ID)).toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/components/FieldsSelector/AddedFields.tsx b/frontend/src/components/FieldsSelector/AddedFields.tsx
index 6b9c3a33ba..34a3e7909f 100644
--- a/frontend/src/components/FieldsSelector/AddedFields.tsx
+++ b/frontend/src/components/FieldsSelector/AddedFields.tsx
@@ -57,9 +57,8 @@ function SortableField({
</div>
{!isRequired && (
<Button
- className={cx(styles.removeBtn, 'periscope-btn')}
- variant="outlined"
- color="destructive"
+ variant="solid"
+ color="danger"
size="sm"
onClick={(): void => onRemove(field)}
>
diff --git a/frontend/src/components/FieldsSelector/FieldsSelector.module.scss b/frontend/src/components/FieldsSelector/FieldsSelector.module.scss
index 75af11ffcf..5397259b76 100644
--- a/frontend/src/components/FieldsSelector/FieldsSelector.module.scss
+++ b/frontend/src/components/FieldsSelector/FieldsSelector.module.scss
@@ -98,11 +98,15 @@
user-select: none;
font-size: 13px;
+ > [data-slot='button'] {
+ opacity: 0;
+ transition: opacity 0.15s ease-in-out;
+ }
+
&:hover {
background-color: var(--l2-background);
- .removeBtn,
- .addBtn {
+ > [data-slot='button'] {
opacity: 1;
}
}
@@ -137,14 +141,6 @@
height: 32px;
}
-.removeBtn,
-.addBtn {
- padding: 4px 10px;
- opacity: 0;
- transition: opacity 0.15s ease-in-out;
- flex-shrink: 0;
-}
-
.footer {
display: flex;
gap: 12px;
diff --git a/frontend/src/components/FieldsSelector/FieldsSelector.tsx b/frontend/src/components/FieldsSelector/FieldsSelector.tsx
index afcbee25a3..532b6e2879 100644
--- a/frontend/src/components/FieldsSelector/FieldsSelector.tsx
+++ b/frontend/src/components/FieldsSelector/FieldsSelector.tsx
@@ -173,6 +173,7 @@ function FieldsSelectorContent({
{hasUnsavedChanges && (
<div className={styles.footer}>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={handleDiscard}
@@ -181,6 +182,7 @@ function FieldsSelectorContent({
Discard
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={handleSave}
diff --git a/frontend/src/components/FieldsSelector/OtherFields.tsx b/frontend/src/components/FieldsSelector/OtherFields.tsx
index e758567f1f..06de264b6e 100644
--- a/frontend/src/components/FieldsSelector/OtherFields.tsx
+++ b/frontend/src/components/FieldsSelector/OtherFields.tsx
@@ -138,7 +138,6 @@ function OtherFields({
<span className={styles.fieldKey}>{attr.name}</span>
{!isAtLimit && (
<Button
- className={cx(styles.addBtn, 'periscope-btn')}
variant="outlined"
color="secondary"
size="sm"
diff --git a/frontend/src/components/HeaderRightSection/FeedbackModal.tsx b/frontend/src/components/HeaderRightSection/FeedbackModal.tsx
index 66119d1777..96bd0441dd 100644
--- a/frontend/src/components/HeaderRightSection/FeedbackModal.tsx
+++ b/frontend/src/components/HeaderRightSection/FeedbackModal.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
import { useLocation } from 'react-router-dom';
import { toast } from '@signozhq/ui/sonner';
import { Button, Input } from 'antd';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
import { handleContactSupport } from 'container/Integrations/utils';
@@ -102,10 +102,12 @@ function FeedbackModal({ onClose }: { onClose: () => void }): JSX.Element {
return (
<div className="feedback-modal-container">
<div className="feedback-modal-header">
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
value={activeTab}
- className="feedback-modal-tabs"
onChange={setActiveTab}
items={items}
/>
diff --git a/frontend/src/components/HeaderRightSection/HeaderRightSection.styles.scss b/frontend/src/components/HeaderRightSection/HeaderRightSection.styles.scss
index e9e1b9058b..b098fb175f 100644
--- a/frontend/src/components/HeaderRightSection/HeaderRightSection.styles.scss
+++ b/frontend/src/components/HeaderRightSection/HeaderRightSection.styles.scss
@@ -1,7 +1,8 @@
.header-right-section-container {
display: flex;
align-items: center;
- gap: 8px;
+ gap: var(--spacing-8);
+ padding-right: var(--spacing-8);
}
.header-ai-assistant-btn-container {
@@ -121,78 +122,26 @@
}
.feedback-modal-container {
- .feedback-modal-tabs {
- width: 100%;
+ .feedback-modal-tab-label {
display: flex;
+ align-items: center;
+ gap: 8px;
- .ant-radio-button-wrapper {
- flex: 1;
- margin: 0px !important;
-
- border: 1px solid var(--l1-border);
-
- &:before {
- display: none;
- }
-
- .ant-radio-button-checked {
- background-color: var(--l3-background);
- }
+ .tab-icon {
+ width: 6px;
+ height: 6px;
}
- .feedback-modal-tab-label {
- display: flex;
- align-items: center;
- gap: 8px;
-
- .tab-icon {
- width: 6px;
- height: 6px;
- }
-
- .feedback-tab {
- background-color: var(--danger-background);
- }
-
- .bug-tab {
- background-color: var(--warning-background);
- }
-
- .feature-tab {
- background-color: var(--primary-background);
- }
+ .feedback-tab {
+ background-color: var(--danger-background);
}
- .ant-tabs-nav-list {
- .ant-tabs-tab {
- padding: 6px 16px;
-
- border-radius: 2px;
- background: var(--l2-background);
- box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.1);
- border: 1px solid var(--l1-border);
-
- margin: 0 !important;
-
- .ant-tabs-tab-btn {
- font-size: 12px;
- font-style: normal;
- font-weight: 400;
- line-height: 20px; /* 166.667% */
- letter-spacing: -0.06px;
- }
-
- &-active {
- background: var(--l3-background);
- color: var(--l1-foreground);
-
- border-bottom: none !important;
+ .bug-tab {
+ background-color: var(--warning-background);
+ }
- .ant-tabs-tab-btn {
- color: var(--l1-foreground);
- }
- }
- }
+ .feature-tab {
+ background-color: var(--primary-background);
}
}
diff --git a/frontend/src/components/HeaderRightSection/HeaderRightSection.tsx b/frontend/src/components/HeaderRightSection/HeaderRightSection.tsx
index 5037c0ef1a..39179eb665 100644
--- a/frontend/src/components/HeaderRightSection/HeaderRightSection.tsx
+++ b/frontend/src/components/HeaderRightSection/HeaderRightSection.tsx
@@ -2,7 +2,7 @@ import { useCallback, useState } from 'react';
import { useLocation } from 'react-router-dom';
import { Dot } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import Noz from 'components/Noz/Noz';
import { NOZ_TOOLTIP_TITLE } from 'components/Noz/Noz.constants';
import { Popover } from 'antd';
@@ -113,24 +113,26 @@ function HeaderRightSection({
</span>
) : null}
- <TooltipSimple title={NOZ_TOOLTIP_TITLE}>
- <Button
- variant="solid"
- color="secondary"
- className="noz-wave"
- onClick={handleOpenAIAssistant}
- aria-label={
- showHeaderPendingBadge
- ? pendingUserInputCount === 1
- ? 'Open Noz, 1 action needs your response'
- : `Open Noz, ${pendingUserInputCount} actions need your response`
- : 'Open Noz'
- }
- prefix={<Noz size={20} />}
- >
- <Typography.Text>Noz</Typography.Text>
- </Button>
- </TooltipSimple>
+ <span className="noz-wave">
+ <Tooltip title={NOZ_TOOLTIP_TITLE}>
+ <Button
+ size="md"
+ variant="ghost"
+ color="secondary"
+ onClick={handleOpenAIAssistant}
+ aria-label={
+ showHeaderPendingBadge
+ ? pendingUserInputCount === 1
+ ? 'Open Noz, 1 action needs your response'
+ : `Open Noz, ${pendingUserInputCount} actions need your response`
+ : 'Open Noz'
+ }
+ prefix={<Noz size={20} />}
+ >
+ <Typography.Text>Noz</Typography.Text>
+ </Button>
+ </Tooltip>
+ </span>
</div>
)}
@@ -147,13 +149,15 @@ function HeaderRightSection({
onOpenChange={handleOpenFeedbackModalChange}
>
<Button
- variant="ghost"
- size="icon"
- className="share-feedback-btn"
+ color="primary"
+ variant="link"
+ size="md"
+ icon
aria-label="Feedback"
- prefix={<SquarePen size={14} />}
onClick={handleOpenFeedbackModal}
- />
+ >
+ <SquarePen size={14} />
+ </Button>
</Popover>
)}
@@ -170,16 +174,19 @@ function HeaderRightSection({
onOpenChange={handleOpenAnnouncementsModalChange}
>
<Button
- variant="ghost"
- size="icon"
+ color="primary"
+ variant="link"
+ size="md"
+ icon
aria-label="Announcements"
- prefix={<Inbox size={14} />}
onClick={(): void => {
logEvent('Announcements: Clicked', {
page: location.pathname,
});
}}
- />
+ >
+ <Inbox size={14} />
+ </Button>
</Popover>
)}
@@ -196,12 +203,15 @@ function HeaderRightSection({
onOpenChange={handleOpenShareURLModalChange}
>
<Button
- variant="ghost"
- size="icon"
+ color="primary"
+ variant="link"
+ size="md"
+ icon
aria-label="Share"
- prefix={<Globe size={14} />}
onClick={handleOpenShareURLModal}
- />
+ >
+ <Globe size={14} />
+ </Button>
</Popover>
)}
</div>
diff --git a/frontend/src/components/HeaderRightSection/ShareURLModal.tsx b/frontend/src/components/HeaderRightSection/ShareURLModal.tsx
index 3edc201f3a..88e3036cf5 100644
--- a/frontend/src/components/HeaderRightSection/ShareURLModal.tsx
+++ b/frontend/src/components/HeaderRightSection/ShareURLModal.tsx
@@ -149,6 +149,9 @@ function ShareURLModal({ extraOption }: ShareURLModalProps): JSX.Element {
<Info size={14} color={Color.BG_AMBER_600} />
)}
<Switch
+ color="primary"
+ textPlacement="right"
+ disabledTooltip="Please select / enter valid relative time to toggle."
value={enableAbsoluteTime}
disabled={!isValidateRelativeTime}
onChange={(): void => {
@@ -173,6 +176,8 @@ function ShareURLModal({ extraOption }: ShareURLModalProps): JSX.Element {
</Typography.Text>
<div className="absolute-relative-time-toggler">
<Switch
+ color="primary"
+ textPlacement="right"
value={enableExtraOption}
onChange={(): void => setEnableExtraOption((prev) => !prev)}
/>
diff --git a/frontend/src/components/HeaderRightSection/__tests__/FeedbackModal.test.tsx b/frontend/src/components/HeaderRightSection/__tests__/FeedbackModal.test.tsx
index 098e3e239c..926ced79fc 100644
--- a/frontend/src/components/HeaderRightSection/__tests__/FeedbackModal.test.tsx
+++ b/frontend/src/components/HeaderRightSection/__tests__/FeedbackModal.test.tsx
@@ -69,23 +69,23 @@ describe('FeedbackModal', () => {
const user = userEvent.setup();
render(<FeedbackModal onClose={mockOnClose} />);
- // Initially, feedback radio should be active
- const feedbackRadio = screen.getByRole('radio', { name: 'Feedback' });
- expect(feedbackRadio).toBeChecked();
+ // Initially, feedback button should be active
+ const feedbackButton = screen.getByRole('button', { name: 'Feedback' });
+ expect(feedbackButton).toHaveAttribute('aria-pressed', 'true');
const bugTab = screen.getByText('Report a bug');
await user.click(bugTab);
- // Bug radio should now be active
- const bugRadio = screen.getByRole('radio', { name: 'Report a bug' });
- expect(bugRadio).toBeChecked();
+ // Bug button should now be active
+ const bugButton = screen.getByRole('button', { name: 'Report a bug' });
+ expect(bugButton).toHaveAttribute('aria-pressed', 'true');
const featureTab = screen.getByText('Feature request');
await user.click(featureTab);
- // Feature radio should now be active
- const featureRadio = screen.getByRole('radio', { name: 'Feature request' });
- expect(featureRadio).toBeChecked();
+ // Feature button should now be active
+ const featureButton = screen.getByRole('button', { name: 'Feature request' });
+ expect(featureButton).toHaveAttribute('aria-pressed', 'true');
});
it('should update feedback text when typing in textarea', async () => {
@@ -133,9 +133,9 @@ describe('FeedbackModal', () => {
const bugTab = screen.getByText('Report a bug');
await user.click(bugTab);
- // Verify bug report radio is now active
- const bugRadio = screen.getByRole('radio', { name: 'Report a bug' });
- expect(bugRadio).toBeChecked();
+ // Verify bug report button is now active
+ const bugButton = screen.getByRole('button', { name: 'Report a bug' });
+ expect(bugButton).toHaveAttribute('aria-pressed', 'true');
const textarea = screen.getByPlaceholderText('Write your feedback here...');
const submitButton = screen.getByRole('button', { name: /submit/i });
@@ -166,9 +166,9 @@ describe('FeedbackModal', () => {
const featureTab = screen.getByText('Feature request');
await user.click(featureTab);
- // Verify feature request radio is now active
- const featureRadio = screen.getByRole('radio', { name: 'Feature request' });
- expect(featureRadio).toBeChecked();
+ // Verify feature request button is now active
+ const featureButton = screen.getByRole('button', { name: 'Feature request' });
+ expect(featureButton).toHaveAttribute('aria-pressed', 'true');
const textarea = screen.getByPlaceholderText('Write your feedback here...');
const submitButton = screen.getByRole('button', { name: /submit/i });
@@ -262,8 +262,8 @@ describe('FeedbackModal', () => {
);
expect(newTextArea).toHaveValue(''); // Should be empty
- // Verify active radio is reset to default (Feedback radio)
- const feedbackRadio = screen.getByRole('radio', { name: 'Feedback' });
- expect(feedbackRadio).toBeChecked();
+ // Verify active button is reset to default (Feedback button)
+ const feedbackButton = screen.getByRole('button', { name: 'Feedback' });
+ expect(feedbackButton).toHaveAttribute('aria-pressed', 'true');
});
});
diff --git a/frontend/src/components/HeaderRightSection/__tests__/ShareURLModal.test.tsx b/frontend/src/components/HeaderRightSection/__tests__/ShareURLModal.test.tsx
index 5c58da48e0..47506edd41 100644
--- a/frontend/src/components/HeaderRightSection/__tests__/ShareURLModal.test.tsx
+++ b/frontend/src/components/HeaderRightSection/__tests__/ShareURLModal.test.tsx
@@ -176,7 +176,7 @@ describe('ShareURLModal', () => {
expect(
screen.getByText('Please select / enter valid relative time to toggle.'),
).toBeInTheDocument();
- expect(screen.getByRole('switch')).toBeDisabled();
+ expect(screen.getByRole('switch')).toHaveAttribute('aria-disabled', 'true');
});
it('should process URL with absolute time for non-custom time', async () => {
diff --git a/frontend/src/components/HttpStatusBadge/HttpStatusBadge.tsx b/frontend/src/components/HttpStatusBadge/HttpStatusBadge.tsx
index 9a06e5bb72..f219611379 100644
--- a/frontend/src/components/HttpStatusBadge/HttpStatusBadge.tsx
+++ b/frontend/src/components/HttpStatusBadge/HttpStatusBadge.tsx
@@ -1,44 +1,32 @@
-import { Badge } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
-type BadgeColor =
- | 'vanilla'
- | 'robin'
- | 'forest'
- | 'amber'
- | 'sienna'
- | 'cherry'
- | 'sakura'
- | 'aqua';
-
-interface HttpStatusBadgeProps {
- statusCode: string | number;
- testId?: string;
- className?: string;
-}
-
-function getStatusCodeColor(statusCode: number): BadgeColor {
+function getStatusCodeColor(statusCode: number): BadgeColorType {
if (statusCode >= 200 && statusCode < 300) {
- return 'forest'; // Success - green
+ return 'success';
}
if (statusCode >= 300 && statusCode < 400) {
- return 'robin'; // Redirect - blue
+ return 'primary';
}
if (statusCode >= 400 && statusCode < 500) {
- return 'amber'; // Client error - amber
+ return 'warning';
}
if (statusCode >= 500) {
- return 'cherry'; // Server error - red
+ return 'danger';
}
if (statusCode >= 100 && statusCode < 200) {
- return 'vanilla'; // Informational - neutral
+ return 'secondary';
}
- return 'robin'; // Default fallback
+ return 'primary';
+}
+
+interface HttpStatusBadgeProps {
+ statusCode: string | number;
+ testId?: string;
}
function HttpStatusBadge({
statusCode,
testId,
- className,
}: HttpStatusBadgeProps): JSX.Element | null {
const numericStatusCode = Number(statusCode);
@@ -49,12 +37,7 @@ function HttpStatusBadge({
const color = getStatusCodeColor(numericStatusCode);
return (
- <Badge
- color={color}
- variant="outline"
- data-testid={testId}
- className={className}
- >
+ <Badge color={color} variant="outlined" testId={testId}>
{statusCode}
</Badge>
);
diff --git a/frontend/src/components/InviteMembers/InviteMembers.tsx b/frontend/src/components/InviteMembers/InviteMembers.tsx
index 1f973356be..841a09b6e6 100644
--- a/frontend/src/components/InviteMembers/InviteMembers.tsx
+++ b/frontend/src/components/InviteMembers/InviteMembers.tsx
@@ -119,11 +119,13 @@ function InviteMembers({
<div className={styles.cellAction}>
{canRemoveRow && (
<Button
- variant="ghost"
- color="destructive"
+ size="md"
+ variant="solid"
+ color="danger"
onClick={(): void => removeRow(row.id)}
aria-label="Remove row"
- data-testid={`invite-remove-${row.id}`}
+ testId={`invite-remove-${row.id}`}
+ icon
>
<Trash2 size={12} />
</Button>
@@ -136,11 +138,12 @@ function InviteMembers({
{showAddButton && (
<div className={styles.addRow}>
<Button
+ size="md"
variant="dashed"
color="secondary"
prefix={<Plus size={12} />}
onClick={addRow}
- data-testid="invite-add-row"
+ testId="invite-add-row"
>
Add another
</Button>
diff --git a/frontend/src/components/LogDetail/LogDetails.styles.scss b/frontend/src/components/LogDetail/LogDetails.styles.scss
index 5cdd1b51a4..ab8cbc8020 100644
--- a/frontend/src/components/LogDetail/LogDetails.styles.scss
+++ b/frontend/src/components/LogDetail/LogDetails.styles.scss
@@ -161,37 +161,14 @@
}
}
- .views-tabs {
- color: var(--l2-foreground);
-
- .view-title {
- display: flex;
- gap: var(--margin-2);
- align-items: center;
- justify-content: center;
- font-size: var(--font-size-xs);
- font-style: normal;
- font-weight: var(--font-weight-normal);
- }
-
- > button {
- border: 1px solid var(--l1-border);
- width: 114px;
-
- &::before {
- background: var(--l1-border);
- }
-
- &[data-state='on'] {
- background: var(--l3-background);
- color: var(--l1-foreground);
- border: 1px solid var(--l1-border);
-
- &::before {
- background: var(--l1-border);
- }
- }
- }
+ .view-title {
+ display: flex;
+ gap: var(--margin-2);
+ align-items: center;
+ justify-content: center;
+ font-size: var(--font-size-xs);
+ font-style: normal;
+ font-weight: var(--font-weight-normal);
}
.search-input {
@@ -242,42 +219,4 @@
align-items: center;
margin-left: 8px;
}
-
- .log-arrow-btn {
- padding: 0;
- min-width: 28px;
- height: 28px;
- border-radius: 4px;
- background: var(--l2-background);
- color: var(--l2-foreground);
- border: 1px solid var(--l1-border);
- box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.08);
- display: flex;
- align-items: center;
- justify-content: center;
- transition: background-color 0.2s ease-in-out;
- }
-
- .log-arrow-btn-up,
- .log-arrow-btn-down {
- background: var(--l2-background);
- }
-
- .log-arrow-btn:active,
- .log-arrow-btn:focus {
- background: var(--l3-background);
- color: var(--l1-foreground);
- }
-
- .log-arrow-btn[disabled] {
- opacity: 0.5;
- cursor: not-allowed;
- background: var(--l1-background);
- color: var(--l3-foreground);
-
- .log-arrow-btn:hover:not([disabled]) {
- background: var(--l3-background);
- color: var(--l1-foreground);
- }
- }
}
diff --git a/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.module.scss b/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.module.scss
index 3f6613b6ec..d42b171bd5 100644
--- a/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.module.scss
+++ b/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.module.scss
@@ -6,14 +6,6 @@
gap: 8px;
}
-.tooltipContent {
- --tooltip-z-index: 2100;
-}
-
-.dropdownContent {
- --dropdown-menu-content-z-index: 2100;
-}
-
.leftSection {
display: flex;
align-items: center;
diff --git a/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.tsx b/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.tsx
index de7697fd72..3f6545acfd 100644
--- a/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.tsx
+++ b/frontend/src/components/LogDetail/LogDetailsHeader/LogDetailsHeader.tsx
@@ -1,8 +1,8 @@
import { Button } from '@signozhq/ui/button';
import { Divider } from '@signozhq/ui/divider';
-import { DropdownMenuSimple as Dropdown } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Typography } from '@signozhq/ui/typography';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
import { aggregateAttributesResourcesToString } from 'container/LogDetailedView/utils';
import { toast } from '@signozhq/ui/sonner';
@@ -23,8 +23,6 @@ import { useCopyToClipboard } from 'react-use';
import styles from './LogDetailsHeader.module.scss';
-const TOOLTIP_CONTENT_PROPS = { className: styles.tooltipContent };
-
interface LogDetailsHeaderProps {
log: ILog;
onNavigatePrev: () => void;
@@ -53,17 +51,19 @@ function LogDetailsHeader({
toast.success('Copied to clipboard', { position: 'bottom-right' });
};
- const menuItems = [
+ const menuItems: DropdownItemType[] = [
{
- key: 'copy-log',
+ type: 'item',
+ value: 'copy-log',
label: 'Copy log',
- icon: <Copy size={14} />,
+ prefix: <Copy size={14} />,
onClick: handleCopyLog,
},
{
- key: 'copy-link',
+ type: 'item',
+ value: 'copy-link',
label: 'Copy link to log',
- icon: <Link size={14} />,
+ prefix: <Link size={14} />,
onClick: (): void => onLogCopy(),
},
];
@@ -91,6 +91,7 @@ function LogDetailsHeader({
<div className={styles.actions}>
{showOpenInExplorer && (
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={<Compass size={16} />}
@@ -100,51 +101,57 @@ function LogDetailsHeader({
</Button>
)}
- <Dropdown
- menu={{ items: menuItems }}
- align="end"
- className={styles.dropdownContent}
- onClick={(e: MouseEvent): void => e.stopPropagation()}
- >
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
+ size="md"
variant="link"
color="secondary"
- prefix={<Ellipsis size={16} />}
- data-testid="log-details-header-menu"
- />
+ icon
+ aria-label="Log actions"
+ testId="log-details-header-menu"
+ onClick={(e: MouseEvent): void => e.stopPropagation()}
+ >
+ <Ellipsis size={16} />
+ </Button>
</Dropdown>
<div className={styles.arrows}>
- <TooltipSimple
- title="Move to previous log"
+ <Tooltip
+ title={isPrevDisabled ? undefined : 'Move to previous log'}
side="top"
- open={isPrevDisabled ? false : undefined}
- tooltipContentProps={TOOLTIP_CONTENT_PROPS}
>
<Button
+ disabledTooltip="No previous log"
+ size="md"
variant="outlined"
color="secondary"
- prefix={<ChevronUp size={14} />}
+ icon
+ aria-label="Move to previous log"
disabled={isPrevDisabled}
onClick={onNavigatePrev}
- data-testid="log-details-header-prev"
- />
- </TooltipSimple>
- <TooltipSimple
- title="Move to next log"
+ testId="log-details-header-prev"
+ >
+ <ChevronUp size={14} />
+ </Button>
+ </Tooltip>
+ <Tooltip
+ title={isNextDisabled ? undefined : 'Move to next log'}
side="top"
- open={isNextDisabled ? false : undefined}
- tooltipContentProps={TOOLTIP_CONTENT_PROPS}
>
<Button
+ disabledTooltip="No next log"
+ size="md"
variant="outlined"
color="secondary"
- prefix={<ChevronDown size={14} />}
+ icon
+ aria-label="Move to next log"
disabled={isNextDisabled}
onClick={onNavigateNext}
- data-testid="log-details-header-next"
- />
- </TooltipSimple>
+ testId="log-details-header-next"
+ >
+ <ChevronDown size={14} />
+ </Button>
+ </Tooltip>
</div>
</div>
</div>
diff --git a/frontend/src/components/LogDetail/LogHighlights/LogHighlights.module.scss b/frontend/src/components/LogDetail/LogHighlights/LogHighlights.module.scss
index 2e24698dec..f2b8dc5c90 100644
--- a/frontend/src/components/LogDetail/LogHighlights/LogHighlights.module.scss
+++ b/frontend/src/components/LogDetail/LogHighlights/LogHighlights.module.scss
@@ -12,13 +12,6 @@
}
}
-.valueBadge {
- --badge-font-size: 13px;
- box-sizing: border-box;
- max-width: 100%;
- min-width: 0;
-}
-
// Truncating text inside a badge
.badgeText {
min-width: 0;
@@ -29,11 +22,14 @@
.serviceDot {
width: 6px;
+ min-width: 6px;
height: 6px;
+ min-height: 6px;
border-radius: 50%;
background: var(--accent-forest);
flex-shrink: 0;
margin-right: 4px;
+ display: inline-block;
}
.traceLink {
diff --git a/frontend/src/components/LogDetail/LogHighlights/config.tsx b/frontend/src/components/LogDetail/LogHighlights/config.tsx
index 7fd6ca3bab..17aab26559 100644
--- a/frontend/src/components/LogDetail/LogHighlights/config.tsx
+++ b/frontend/src/components/LogDetail/LogHighlights/config.tsx
@@ -1,5 +1,5 @@
import { ReactNode } from 'react';
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
import { LogType } from 'components/Logs/LogStateIndicator/LogStateIndicator';
import { getLogIndicatorType } from 'components/Logs/LogStateIndicator/utils';
import { ILog } from 'types/api/logs/log';
@@ -8,13 +8,13 @@ import styles from './LogHighlights.module.scss';
import TraceIdField from './TraceIdField';
// Severity badge color mirrors the LogStateIndicator bar
-const SEVERITY_COLOR: Record<string, BadgeColor> = {
- [LogType.TRACE]: 'forest',
- [LogType.DEBUG]: 'aqua',
- [LogType.INFO]: 'robin',
- [LogType.WARN]: 'amber',
- [LogType.ERROR]: 'cherry',
- [LogType.FATAL]: 'sakura',
+const SEVERITY_COLOR: Record<string, BadgeColorType> = {
+ [LogType.TRACE]: 'success',
+ [LogType.DEBUG]: 'info',
+ [LogType.INFO]: 'primary',
+ [LogType.WARN]: 'warning',
+ [LogType.ERROR]: 'danger',
+ [LogType.FATAL]: 'highlight-danger',
};
export interface LogHighlightConfig {
@@ -32,9 +32,13 @@ const getAttr = (log: ILog, key: string): string =>
const valueBadge = (
value: string,
- options?: { prefix?: ReactNode; color?: BadgeColor },
+ options?: { prefix?: ReactNode; color?: BadgeColorType },
): ReactNode => (
- <Badge color={options?.color ?? 'vanilla'} className={styles.valueBadge}>
+ <Badge
+ variant="solid"
+ color={options?.color ?? 'secondary'}
+ textTransform="none"
+ >
{options?.prefix}
<span className={styles.badgeText} title={value}>
{value}
diff --git a/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx b/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx
index 5010748ea2..520ee6353a 100644
--- a/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx
+++ b/frontend/src/components/LogDetail/__tests__/LogDetail.test.tsx
@@ -129,6 +129,18 @@ describe('LogDetail drawer — header', () => {
});
});
+ it('keeps the drawer open when a ⋯ menu item is clicked', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ const onClose = jest.fn();
+
+ renderDrawer({ onClose });
+
+ await user.click(screen.getByTestId('log-details-header-menu'));
+ await user.click(await screen.findByText('Copy log'));
+
+ expect(onClose).not.toHaveBeenCalled();
+ });
+
it('shows "Open in Explorer" when a handleOpenInExplorer handler is provided', () => {
renderDrawer({ handleOpenInExplorer: jest.fn() });
@@ -217,8 +229,14 @@ describe('LogDetail drawer — header', () => {
// Active log is the first one.
renderDrawer({ log: logs[0], logs, onNavigateLog });
- expect(screen.getByTestId('log-details-header-prev')).toBeDisabled();
- expect(screen.getByTestId('log-details-header-next')).toBeEnabled();
+ expect(screen.getByTestId('log-details-header-prev')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(screen.getByTestId('log-details-header-next')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.click(screen.getByTestId('log-details-header-next'));
expect(onNavigateLog).toHaveBeenLastCalledWith(logs[1]);
diff --git a/frontend/src/components/LogDetail/index.tsx b/frontend/src/components/LogDetail/index.tsx
index 9fb68b503b..eb373c5a2b 100644
--- a/frontend/src/components/LogDetail/index.tsx
+++ b/frontend/src/components/LogDetail/index.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Color, Spacing } from '@signozhq/design-tokens';
import { Button } from '@signozhq/ui/button';
import { Drawer, Tooltip } from 'antd';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Typography } from '@signozhq/ui/typography';
import LogStateIndicator from 'components/Logs/LogStateIndicator/LogStateIndicator';
import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
@@ -87,7 +87,8 @@ function LogDetailInner({
target.closest('.cm-tooltip-autocomplete') ||
target.closest('.drawer-popover') ||
target.closest('.query-status-popover') ||
- target.closest('[data-radix-popper-content-wrapper]')
+ target.closest('[data-radix-popper-content-wrapper]') ||
+ target.closest('[data-base-ui-portal]')
) {
return;
}
@@ -317,9 +318,12 @@ function LogDetailInner({
<div className="log-detail-drawer__section-divider" />
<div className="tabs-and-search">
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
- className="views-tabs"
+ testId="log-detail-views-tabs"
onChange={handleModeChange}
value={selectedView}
items={[
@@ -365,9 +369,12 @@ function LogDetailInner({
variant="link"
color="secondary"
size="sm"
- prefix={<Filter size="lg" />}
+ icon
+ aria-label="Show Filters"
onClick={handleFilterVisible}
- />
+ >
+ <Filter size="lg" />
+ </Button>
</Tooltip>
)}
</div>
diff --git a/frontend/src/components/MarkdownEditor/EditorToolbar.tsx b/frontend/src/components/MarkdownEditor/EditorToolbar.tsx
index 88eacbbb62..2cd9f4cdf7 100644
--- a/frontend/src/components/MarkdownEditor/EditorToolbar.tsx
+++ b/frontend/src/components/MarkdownEditor/EditorToolbar.tsx
@@ -1,4 +1,4 @@
-import type { ReactNode } from 'react';
+import type { ReactElement, ReactNode } from 'react';
import {
Bold,
CodeXml,
@@ -11,16 +11,17 @@ import {
Type,
} from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
+import { READ_ONLY_TOOLTIP } from './constants';
import InsertVariableMenu from './InsertVariableMenu';
import MarkdownHelp from './MarkdownHelp';
import type { EditorCommand, EditorVariable } from './types';
import styles from './MarkdownEditor.module.scss';
-const COMMAND_ICONS: Record<string, ReactNode> = {
+const COMMAND_ICONS: Record<string, ReactElement> = {
heading: <Heading size={14} />,
bold: <Bold size={14} />,
italic: <Italic size={14} />,
@@ -61,20 +62,22 @@ function EditorToolbar({
<span className={styles.toolbarDivider} />
<div className={styles.commands}>
{commands.map((command) => (
- <TooltipSimple key={command.id} title={command.label}>
+ <Tooltip key={command.id} title={disabled ? undefined : command.label}>
<Button
+ disabledTooltip={READ_ONLY_TOOLTIP}
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
disabled={disabled}
aria-label={command.label}
- data-testid={`markdown-command-${command.id}`}
+ testId={`markdown-command-${command.id}`}
onClick={(): void => onRunCommand(command)}
>
{COMMAND_ICONS[command.id]}
</Button>
- </TooltipSimple>
+ </Tooltip>
))}
</div>
<div className={styles.toolbarEnd}>
diff --git a/frontend/src/components/MarkdownEditor/InsertVariableMenu.tsx b/frontend/src/components/MarkdownEditor/InsertVariableMenu.tsx
index e040dcc37a..52099291cf 100644
--- a/frontend/src/components/MarkdownEditor/InsertVariableMenu.tsx
+++ b/frontend/src/components/MarkdownEditor/InsertVariableMenu.tsx
@@ -1,8 +1,9 @@
import { useMemo, useState } from 'react';
-import { ChevronDown, DollarSign, Search } from '@signozhq/icons';
+import { ChevronDown, DollarSign } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownActionItemType } from '@signozhq/ui/dropdown';
+import { READ_ONLY_TOOLTIP } from './constants';
import type { EditorVariable } from './types';
import styles from './MarkdownEditor.module.scss';
@@ -17,9 +18,10 @@ interface InsertVariableMenuProps {
function toMenuItems(
variables: EditorVariable[],
onSelect: (name: string) => void,
-): MenuItem[] {
+): DropdownActionItemType[] {
return variables.map((variable) => ({
- key: variable.name,
+ type: 'item',
+ value: variable.name,
label: (
<span
className={styles.variableRow}
@@ -60,15 +62,17 @@ function InsertVariableMenu({
}
return (
- <DropdownMenuSimple
- className={styles.variableMenu}
- menu={{
- items,
- search: {
- placeholder: 'Search variables',
- searchIcon: <Search size={14} />,
- onSearchChange: setSearch,
- },
+ <Dropdown
+ items={items}
+ nativeButton
+ align="end"
+ side="bottom"
+ contentMaxWidth={320}
+ disabled={disabled}
+ disabledTooltip={READ_ONLY_TOOLTIP}
+ searchInputProps={{
+ placeholder: 'Search variables',
+ onChange: setSearch,
}}
>
<Button
@@ -76,15 +80,13 @@ function InsertVariableMenu({
variant="outlined"
color="secondary"
size="sm"
- disabled={disabled}
prefix={<DollarSign size={14} className={styles.insertVariableIcon} />}
suffix={<ChevronDown size={14} />}
- className={styles.insertVariable}
- data-testid="markdown-insert-variable"
+ testId="markdown-insert-variable"
>
Insert variable
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/components/MarkdownEditor/MarkdownEditor.module.scss b/frontend/src/components/MarkdownEditor/MarkdownEditor.module.scss
index c62fe13960..770cb83b20 100644
--- a/frontend/src/components/MarkdownEditor/MarkdownEditor.module.scss
+++ b/frontend/src/components/MarkdownEditor/MarkdownEditor.module.scss
@@ -74,27 +74,10 @@
margin-left: auto;
}
-.insertVariable {
- white-space: nowrap;
-}
-
.insertVariableIcon {
color: var(--text-amber-400);
}
-// The ui library's dropdown assumes a global border-box reset this app doesn't
-// have (`box-sizing` is set on `body` only and doesn't inherit): its items are
-// `width: 100%` + padding, so in the portal they lay out content-box and
-// overflow the popup by the padding — clipping the flush-right badge.
-.variableMenu,
-.variableMenu * {
- box-sizing: border-box;
-}
-
-.variableMenu {
- width: 320px;
-}
-
// Shrinkable, so a clamped popup truncates the name instead of clipping the
// badge at the content's `overflow: hidden` edge.
.variableRow {
diff --git a/frontend/src/components/MarkdownEditor/MarkdownHelp.tsx b/frontend/src/components/MarkdownEditor/MarkdownHelp.tsx
index 44b62a7c16..6a21654698 100644
--- a/frontend/src/components/MarkdownEditor/MarkdownHelp.tsx
+++ b/frontend/src/components/MarkdownEditor/MarkdownHelp.tsx
@@ -15,9 +15,10 @@ function MarkdownHelp(): JSX.Element {
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Markdown syntax help"
- data-testid="markdown-help-trigger"
+ testId="markdown-help-trigger"
>
<CircleHelp size={14} />
</Button>
diff --git a/frontend/src/components/MarkdownEditor/__tests__/MarkdownEditor.test.tsx b/frontend/src/components/MarkdownEditor/__tests__/MarkdownEditor.test.tsx
index 700ad5a4e1..d6afa467e6 100644
--- a/frontend/src/components/MarkdownEditor/__tests__/MarkdownEditor.test.tsx
+++ b/frontend/src/components/MarkdownEditor/__tests__/MarkdownEditor.test.tsx
@@ -256,8 +256,14 @@ describe('MarkdownEditor', () => {
/>,
);
- expect(screen.getByTestId('markdown-command-bold')).toBeDisabled();
- expect(screen.getByTestId('markdown-insert-variable')).toBeDisabled();
+ expect(screen.getByTestId('markdown-command-bold')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(screen.getByTestId('markdown-insert-variable')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('hides the insert-variable control when none are available', () => {
diff --git a/frontend/src/components/MarkdownEditor/constants.ts b/frontend/src/components/MarkdownEditor/constants.ts
index 64a38dba9c..a6738f88e1 100644
--- a/frontend/src/components/MarkdownEditor/constants.ts
+++ b/frontend/src/components/MarkdownEditor/constants.ts
@@ -1,6 +1,8 @@
// The body is persisted inline in the dashboard JSON, so its length is capped.
export const MARKDOWN_MAX_LENGTH = 16000;
+export const READ_ONLY_TOOLTIP = 'The editor is read-only';
+
/** The canonical syntax; the renderer resolves the other three too. */
export const formatVariableToken = (name: string): string => `$${name}`;
diff --git a/frontend/src/components/MembersTable/MembersTable.styles.scss b/frontend/src/components/MembersTable/MembersTable.styles.scss
index f6d4425134..551d7a59c4 100644
--- a/frontend/src/components/MembersTable/MembersTable.styles.scss
+++ b/frontend/src/components/MembersTable/MembersTable.styles.scss
@@ -95,7 +95,6 @@
font-weight: var(--uppercase-small-500-font-weight);
line-height: 100%;
letter-spacing: 0.44px;
- text-transform: uppercase;
}
}
}
diff --git a/frontend/src/components/MembersTable/MembersTable.tsx b/frontend/src/components/MembersTable/MembersTable.tsx
index b2894e5424..65e4c84ed1 100644
--- a/frontend/src/components/MembersTable/MembersTable.tsx
+++ b/frontend/src/components/MembersTable/MembersTable.tsx
@@ -55,14 +55,14 @@ function NameEmailCell({
function StatusBadge({ status }: { status: MemberRow['status'] }): JSX.Element {
if (status === MemberStatus.Active) {
return (
- <Badge color="forest" variant="outline">
+ <Badge color="success" variant="outlined">
ACTIVE
</Badge>
);
}
if (status === MemberStatus.Deleted) {
return (
- <Badge color="cherry" variant="outline">
+ <Badge color="danger" variant="outlined">
DELETED
</Badge>
);
@@ -70,13 +70,17 @@ function StatusBadge({ status }: { status: MemberRow['status'] }): JSX.Element {
if (status === MemberStatus.Invited) {
return (
- <Badge color="amber" variant="outline">
+ <Badge color="warning" variant="outlined">
INVITED
</Badge>
);
}
- return <Badge color="vanilla">⎯</Badge>;
+ return (
+ <Badge variant="solid" color="secondary">
+ ⎯
+ </Badge>
+ );
}
function MembersEmptyState({
diff --git a/frontend/src/components/NewSelect/CustomMultiSelect.tsx b/frontend/src/components/NewSelect/CustomMultiSelect.tsx
index 79a453a0db..0f3ac3b172 100644
--- a/frontend/src/components/NewSelect/CustomMultiSelect.tsx
+++ b/frontend/src/components/NewSelect/CustomMultiSelect.tsx
@@ -20,7 +20,7 @@ import {
import { Color } from '@signozhq/design-tokens';
import { Button, Select } from 'antd';
import { Checkbox } from '@signozhq/ui/checkbox';
-import { TooltipProvider, TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import cx from 'classnames';
import TextToolTip from 'components/TextToolTip/TextToolTip';
import { SOMETHING_WENT_WRONG } from 'constants/api';
@@ -764,9 +764,14 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
tabIndex={isActive ? 0 : -1}
>
<Checkbox
+ color="primary"
value={isSelected}
- className="option-checkbox"
- onClick={(e): void => selectFromButton(e, 'checkbox')}
+ width="100%"
+ onChange={(): void => {
+ handleItemSelection('checkbox');
+ setActiveChipIndex(-1);
+ setActiveIndex(-1);
+ }}
>
<div className="option-content">
<span ref={textRef} className="option-label-text">
@@ -1604,7 +1609,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
}}
>
<div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
- <Checkbox value={allOptionsSelected} className="option-checkbox">
+ <Checkbox color="primary" value={allOptionsSelected} width="100%">
<div className="option-content">
<div className="all-option-text">ALL</div>
</div>
@@ -1983,13 +1988,9 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
// `label` arrives already cut to maxTagTextLength, so the reveal reads the
// option's own text (falling back to the raw value for freeform tags).
return (
- <TooltipSimple
- side="top"
- delayDuration={300}
- title={findOptionLabelText(options, value)}
- >
+ <Tooltip side="top" title={findOptionLabelText(options, value)}>
{tag}
- </TooltipSimple>
+ </Tooltip>
);
}
@@ -2025,56 +2026,51 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
return (
// Self-provided so the per-tag tooltips work wherever this select is rendered,
// without every consumer having to sit under an app-level provider.
- <TooltipProvider>
- <div
- className={cx('custom-multiselect-wrapper', {
- 'all-selected': allOptionShown || isAllSelected,
+ <div
+ className={cx('custom-multiselect-wrapper', {
+ 'all-selected': allOptionShown || isAllSelected,
+ })}
+ >
+ {(allOptionShown || isAllSelected) && !searchText && (
+ <div className="all-text">ALL</div>
+ )}
+ <Select
+ ref={selectRef}
+ className={cx('custom-multiselect', className, {
+ 'has-selection': selectedChips.length > 0 && !isAllSelected,
+ 'is-all-selected': isAllSelected,
})}
- >
- {(allOptionShown || isAllSelected) && !searchText && (
- <div className="all-text">ALL</div>
- )}
- <Select
- ref={selectRef}
- className={cx('custom-multiselect', className, {
- 'has-selection': selectedChips.length > 0 && !isAllSelected,
- 'is-all-selected': isAllSelected,
- })}
- placeholder={placeholder}
- mode="multiple"
- showSearch
- filterOption={false}
- onSearch={handleSearch}
- value={displayValue}
- onChange={(newValue): void => {
- handleInternalChange(newValue, false);
- }}
- onClear={onClearHandler}
- onDropdownVisibleChange={handleDropdownVisibleChange}
- open={isOpen}
- defaultActiveFirstOption={defaultActiveFirstOption}
- popupMatchSelectWidth={dropdownMatchSelectWidth}
- allowClear={allowClear}
- getPopupContainer={getPopupContainer ?? popupContainer}
- suffixIcon={<ChevronDown style={{ cursor: 'default' }} size="md" />}
- dropdownRender={customDropdownRender}
- menuItemSelectedIcon={null}
- popupClassName={cx(
- 'custom-multiselect-dropdown-container',
- popupClassName,
- )}
- notFoundContent={<div className="empty-message">{noDataMessage}</div>}
- onKeyDown={handleKeyDown}
- tagRender={tagRender as any}
- placement={placement}
- listHeight={300}
- searchValue={searchText}
- maxTagTextLength={maxTagTextLength}
- maxTagCount={isAllSelected ? undefined : maxTagCount}
- {...rest}
- />
- </div>
- </TooltipProvider>
+ placeholder={placeholder}
+ mode="multiple"
+ showSearch
+ filterOption={false}
+ onSearch={handleSearch}
+ value={displayValue}
+ onChange={(newValue): void => {
+ handleInternalChange(newValue, false);
+ }}
+ onClear={onClearHandler}
+ onDropdownVisibleChange={handleDropdownVisibleChange}
+ open={isOpen}
+ defaultActiveFirstOption={defaultActiveFirstOption}
+ popupMatchSelectWidth={dropdownMatchSelectWidth}
+ allowClear={allowClear}
+ getPopupContainer={getPopupContainer ?? popupContainer}
+ suffixIcon={<ChevronDown style={{ cursor: 'default' }} size="md" />}
+ dropdownRender={customDropdownRender}
+ menuItemSelectedIcon={null}
+ popupClassName={cx('custom-multiselect-dropdown-container', popupClassName)}
+ notFoundContent={<div className="empty-message">{noDataMessage}</div>}
+ onKeyDown={handleKeyDown}
+ tagRender={tagRender as any}
+ placement={placement}
+ listHeight={300}
+ searchValue={searchText}
+ maxTagTextLength={maxTagTextLength}
+ maxTagCount={isAllSelected ? undefined : maxTagCount}
+ {...rest}
+ />
+ </div>
);
};
diff --git a/frontend/src/components/NewSelect/CustomSelect.tsx b/frontend/src/components/NewSelect/CustomSelect.tsx
index bed0e7feac..819d9880ec 100644
--- a/frontend/src/components/NewSelect/CustomSelect.tsx
+++ b/frontend/src/components/NewSelect/CustomSelect.tsx
@@ -16,7 +16,6 @@ import {
X,
} from '@signozhq/icons';
import { Color } from '@signozhq/design-tokens';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { Select } from 'antd';
import cx from 'classnames';
import TextToolTip from 'components/TextToolTip';
@@ -740,36 +739,33 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
// ===== Component Rendering =====
return (
- // Self-provided so label tooltips work wherever this select is rendered.
- <TooltipProvider>
- <Select
- ref={selectRef}
- className={cx('custom-select', className)}
- placeholder={placeholder}
- showSearch
- filterOption={false}
- onSearch={handleSearch}
- value={value}
- onChange={onChange}
- onDropdownVisibleChange={handleDropdownVisibleChange}
- open={isOpen}
- options={optionsWithHighlight}
- defaultActiveFirstOption={defaultActiveFirstOption}
- popupMatchSelectWidth={popupMatchSelectWidth}
- allowClear={allowClear ? { clearIcon } : false}
- getPopupContainer={getPopupContainer ?? popupContainer}
- suffixIcon={<ChevronDown style={{ cursor: 'default' }} size="md" />}
- dropdownRender={customDropdownRender}
- menuItemSelectedIcon={null}
- popupClassName={cx('custom-select-dropdown-container', popupClassName)}
- listHeight={300}
- placement={placement}
- optionFilterProp="label"
- notFoundContent={<div className="empty-message">{noDataMessage}</div>}
- onKeyDown={handleKeyDown}
- {...rest}
- />
- </TooltipProvider>
+ <Select
+ ref={selectRef}
+ className={cx('custom-select', className)}
+ placeholder={placeholder}
+ showSearch
+ filterOption={false}
+ onSearch={handleSearch}
+ value={value}
+ onChange={onChange}
+ onDropdownVisibleChange={handleDropdownVisibleChange}
+ open={isOpen}
+ options={optionsWithHighlight}
+ defaultActiveFirstOption={defaultActiveFirstOption}
+ popupMatchSelectWidth={popupMatchSelectWidth}
+ allowClear={allowClear ? { clearIcon } : false}
+ getPopupContainer={getPopupContainer ?? popupContainer}
+ suffixIcon={<ChevronDown style={{ cursor: 'default' }} size="md" />}
+ dropdownRender={customDropdownRender}
+ menuItemSelectedIcon={null}
+ popupClassName={cx('custom-select-dropdown-container', popupClassName)}
+ listHeight={300}
+ placement={placement}
+ optionFilterProp="label"
+ notFoundContent={<div className="empty-message">{noDataMessage}</div>}
+ onKeyDown={handleKeyDown}
+ {...rest}
+ />
);
};
diff --git a/frontend/src/components/NewSelect/TruncatedTooltip.module.scss b/frontend/src/components/NewSelect/TruncatedTooltip.module.scss
deleted file mode 100644
index dd80b908f8..0000000000
--- a/frontend/src/components/NewSelect/TruncatedTooltip.module.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// Above the antd select popup it is shown from.
-.tooltipContent {
- --tooltip-z-index: 2100;
-}
diff --git a/frontend/src/components/NewSelect/TruncatedTooltip.tsx b/frontend/src/components/NewSelect/TruncatedTooltip.tsx
index 0b51c7b4c6..004c2ef87f 100644
--- a/frontend/src/components/NewSelect/TruncatedTooltip.tsx
+++ b/frontend/src/components/NewSelect/TruncatedTooltip.tsx
@@ -1,11 +1,17 @@
-import { ReactElement, RefObject, useRef, useState } from 'react';
-import { TooltipSimple, TooltipSimpleProps } from '@signozhq/ui/tooltip';
-
-import styles from './TruncatedTooltip.module.scss';
+import {
+ cloneElement,
+ FocusEvent,
+ PointerEvent,
+ ReactElement,
+ RefObject,
+ useRef,
+ useState,
+} from 'react';
+import { Tooltip, TooltipProps } from '@signozhq/ui/tooltip';
interface TruncatedTooltipProps {
title: string;
- side?: TooltipSimpleProps['side'];
+ side?: TooltipProps['side'];
/** Renders the trigger; attach the ref to the element that may truncate. */
children: (textRef: RefObject<HTMLSpanElement>) => ReactElement;
}
@@ -16,25 +22,28 @@ function TruncatedTooltip({
children,
}: TruncatedTooltipProps): JSX.Element {
const textRef = useRef<HTMLSpanElement>(null);
- const [open, setOpen] = useState(false);
+ const [truncated, setTruncated] = useState(false);
- const handleOpenChange = (next: boolean): void => {
+ const measure = (): void => {
const el = textRef.current;
- setOpen(next && !!el && el.scrollWidth > el.clientWidth);
+ setTruncated(!!el && el.scrollWidth > el.clientWidth);
};
+ const trigger = children(textRef);
+
return (
- <TooltipSimple
- title={title}
- side={side}
- arrow
- delayDuration={300}
- open={open}
- onOpenChange={handleOpenChange}
- tooltipContentProps={{ className: styles.tooltipContent }}
- >
- {children(textRef)}
- </TooltipSimple>
+ <Tooltip title={truncated ? title : undefined} side={side}>
+ {cloneElement(trigger, {
+ onPointerEnter: (event: PointerEvent<HTMLElement>): void => {
+ measure();
+ trigger.props.onPointerEnter?.(event);
+ },
+ onFocus: (event: FocusEvent<HTMLElement>): void => {
+ measure();
+ trigger.props.onFocus?.(event);
+ },
+ })}
+ </Tooltip>
);
}
diff --git a/frontend/src/components/NewSelect/__test__/CustomMultiSelect.tagTooltip.test.tsx b/frontend/src/components/NewSelect/__test__/CustomMultiSelect.tagTooltip.test.tsx
index b746e9f523..22a378ce53 100644
--- a/frontend/src/components/NewSelect/__test__/CustomMultiSelect.tagTooltip.test.tsx
+++ b/frontend/src/components/NewSelect/__test__/CustomMultiSelect.tagTooltip.test.tsx
@@ -1,6 +1,5 @@
import { act, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import CustomMultiSelect from '../CustomMultiSelect';
@@ -14,15 +13,13 @@ const SELECTED = ['checkout-service-prod', 'payments-service-prod'];
function renderSelect(): void {
render(
- <TooltipProvider>
- <CustomMultiSelect
- options={OPTIONS}
- value={SELECTED}
- maxTagCount={1}
- maxTagTextLength={10}
- maxTagPlaceholder={(omitted): string => `+${omitted.length}`}
- />
- </TooltipProvider>,
+ <CustomMultiSelect
+ options={OPTIONS}
+ value={SELECTED}
+ maxTagCount={1}
+ maxTagTextLength={10}
+ maxTagPlaceholder={(omitted): string => `+${omitted.length}`}
+ />,
);
}
diff --git a/frontend/src/components/NewSelect/__test__/TruncatedTooltip.test.tsx b/frontend/src/components/NewSelect/__test__/TruncatedTooltip.test.tsx
index f14c558dec..732e00f39e 100644
--- a/frontend/src/components/NewSelect/__test__/TruncatedTooltip.test.tsx
+++ b/frontend/src/components/NewSelect/__test__/TruncatedTooltip.test.tsx
@@ -1,6 +1,5 @@
import { act, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import TruncatedTooltip from '../TruncatedTooltip';
@@ -15,15 +14,13 @@ function renderRow(scrollWidth: number, clientWidth: number): void {
.mockReturnValue(clientWidth);
render(
- <TooltipProvider>
- <TruncatedTooltip title={LABEL}>
- {(textRef): JSX.Element => (
- <div data-testid="row">
- <span ref={textRef}>{LABEL}</span>
- </div>
- )}
- </TruncatedTooltip>
- </TooltipProvider>,
+ <TruncatedTooltip title={LABEL}>
+ {(textRef): JSX.Element => (
+ <div data-testid="row">
+ <span ref={textRef}>{LABEL}</span>
+ </div>
+ )}
+ </TruncatedTooltip>,
);
}
diff --git a/frontend/src/components/NewSelect/styles.scss b/frontend/src/components/NewSelect/styles.scss
index 258fe126b3..23e91819fb 100644
--- a/frontend/src/components/NewSelect/styles.scss
+++ b/frontend/src/components/NewSelect/styles.scss
@@ -532,114 +532,95 @@ $custom-border-color: #2c3044;
margin-bottom: 8px;
}
- .option-checkbox {
+ .all-option-text {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
width: 100%;
- cursor: default;
+ }
- // The checkbox button is the only pointer target on the left; the label
- // still toggles on click but keeps a default cursor.
- > button {
- cursor: pointer;
- }
+ .option-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
- // @signozhq/ui Checkbox renders children inside a <label> that is
- // content-sized by default. Make it fill the row (min-width: 0 lets it
- // shrink) so the option text below can truncate instead of overflowing.
- > label {
+ .option-label-text {
flex: 1 1 auto;
min-width: 0;
+ margin-bottom: 0;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
- .all-option-text {
- display: flex;
- align-items: center;
- justify-content: space-between;
- width: 100%;
+ .option-badge {
+ font-size: 12px;
+ padding: 2px 6px;
+ border-radius: 4px;
+ background-color: $custom-border-color;
+ color: var(--l2-foreground);
+ margin-left: 8px;
}
+ }
- .option-content {
- display: flex;
- justify-content: space-between;
- align-items: center;
- width: 100%;
-
- .option-label-text {
- flex: 1 1 auto;
- min-width: 0;
- margin-bottom: 0;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
+ // "Only"/"All" is the primary action — a filled pill that reads as a
+ // button; "Toggle" is a secondary hint in plain text. Sized to the row's
+ // resting height so revealing them on hover never shifts it.
+ .only-btn,
+ .toggle-btn {
+ display: none;
+ align-items: center;
+ justify-content: center;
+ height: 18px;
+ min-height: 0;
+ font-size: 12px;
+ line-height: 1;
+ box-shadow: none;
+ }
+
+ .only-btn {
+ padding: 4px 8px;
+ // Black interior + a visible border so the pill stands out clearly
+ // against the near-black row when revealed on hover.
+ border: 1px solid var(--l3-border);
+ border-radius: 3px;
+ background-color: var(--bg-ink-500, #0b0c0e);
+ color: var(--l1-foreground);
+ cursor: pointer;
+ }
- .option-badge {
- font-size: 12px;
- padding: 2px 6px;
- border-radius: 4px;
- background-color: $custom-border-color;
- color: var(--l2-foreground);
- margin-left: 8px;
- }
- }
+ .toggle-btn {
+ padding: 0 6px;
+ border: none;
+ background-color: transparent;
+ color: var(--l2-foreground);
+ cursor: pointer;
+ }
- // "Only"/"All" is the primary action — a filled pill that reads as a
- // button; "Toggle" is a secondary hint in plain text. Sized to the row's
- // resting height so revealing them on hover never shifts it.
- .only-btn,
+ // Toggle appears over the checkbox area; "Only/All" takes over the row
+ // content and hides Toggle there (higher specificity wins).
+ &:hover {
.toggle-btn {
+ display: flex;
+ }
+
+ .option-badge {
display: none;
- align-items: center;
- justify-content: center;
- height: 18px;
- min-height: 0;
- font-size: 12px;
- line-height: 1;
- box-shadow: none;
}
+ }
+ .option-content:hover {
.only-btn {
- padding: 4px 8px;
- // Black interior + a visible border so the pill stands out clearly
- // against the near-black row when revealed on hover.
- border: 1px solid var(--l3-border);
- border-radius: 3px;
- background-color: var(--bg-ink-500, #0b0c0e);
- color: var(--l1-foreground);
- cursor: pointer;
+ display: flex;
}
.toggle-btn {
- padding: 0 6px;
- border: none;
- background-color: transparent;
- color: var(--l2-foreground);
- cursor: pointer;
- }
-
- // Toggle appears over the checkbox area; "Only/All" takes over the row
- // content and hides Toggle there (higher specificity wins).
- &:hover {
- .toggle-btn {
- display: flex;
- }
-
- .option-badge {
- display: none;
- }
+ display: none;
}
- .option-content:hover {
- .only-btn {
- display: flex;
- }
-
- .toggle-btn {
- display: none;
- }
-
- .option-badge {
- display: none;
- }
+ .option-badge {
+ display: none;
}
}
}
diff --git a/frontend/src/components/OverflowValuesTooltip/OverflowValuesTooltip.tsx b/frontend/src/components/OverflowValuesTooltip/OverflowValuesTooltip.tsx
index 2e5d024c1a..e5b3ee653d 100644
--- a/frontend/src/components/OverflowValuesTooltip/OverflowValuesTooltip.tsx
+++ b/frontend/src/components/OverflowValuesTooltip/OverflowValuesTooltip.tsx
@@ -1,7 +1,5 @@
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-import TooltipScrollArea, {
- TOOLTIP_SCROLL_CONTENT_CLASS,
-} from 'components/TooltipScrollArea/TooltipScrollArea';
+import { Tooltip } from '@signozhq/ui/tooltip';
+import TooltipScrollArea from 'components/TooltipScrollArea/TooltipScrollArea';
import styles from './OverflowValuesTooltip.module.scss';
@@ -19,10 +17,8 @@ function OverflowValuesTooltip({
values,
}: OverflowValuesTooltipProps): JSX.Element {
return (
- <TooltipSimple
+ <Tooltip
side="top"
- delayDuration={300}
- tooltipContentProps={{ className: TOOLTIP_SCROLL_CONTENT_CLASS }}
title={
<TooltipScrollArea>
<ul className={styles.overflowValues}>
@@ -36,7 +32,7 @@ function OverflowValuesTooltip({
{/* rc-select copies this node into the overflow wrapper's `title`; an empty
one keeps the browser's own "[object Object]" tooltip out of the way. */}
<span title="">+{values.length}</span>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss b/frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss
index 01647b2aea..cd76b0c9d3 100644
--- a/frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss
+++ b/frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss
@@ -513,8 +513,4 @@
color: var(--l2-foreground) !important;
}
}
-
- .query-actions-dropdown {
- cursor: pointer;
- }
}
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.module.scss b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.module.scss
index 3bffc42e42..f26c170269 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.module.scss
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.module.scss
@@ -4,27 +4,28 @@
* `--query-builder-v2-*` surface the selects above this row already paint on.
*/
.bucketOptions {
- --toggle-group-radius: var(--radius-1);
- --toggle-group-item-size: 36px;
- --toggle-group-item-font-size: 13px;
- --toggle-group-item-padding-left: var(--spacing-6);
- --toggle-group-item-padding-right: var(--spacing-6);
+ --toggle-group-border-radius: var(--radius-1);
+ --toggle-group-button-block-size: calc(
+ 36px - 2 * var(--toggle-group-border-width, 1px)
+ );
+ --toggle-group-button-font-size: 13px;
+ --toggle-group-button-padding-inline: var(--spacing-6);
// Repeated from `.query-add-ons` rather than inherited: the section also renders on a
// formula, which has no add-ons ancestor to pick the toggle palette up from.
- --toggle-group-secondary-bg: var(
+ --toggle-group-secondary-outlined-background: var(
--query-builder-v2-toggle-group-background-color,
var(--l1-background-hover)
);
- --toggle-group-secondary-border: var(
+ --toggle-group-border: var(
--query-builder-v2-toggle-group-border-color,
var(--l2-border)
);
- --toggle-group-secondary-active-bg: var(
+ --toggle-group-secondary-outlined-background-active: var(
--query-builder-v2-toggle-group-active-background-color,
var(--l1-background)
);
- --toggle-group-secondary-bg-hover: var(
+ --toggle-group-secondary-outlined-background-hover: var(
--query-builder-v2-toggle-group-background-color-hover,
var(--l2-background)
);
@@ -55,6 +56,10 @@
flex-wrap: wrap;
align-items: center;
gap: var(--spacing-8);
+
+ > [data-slot='button'] {
+ margin-left: auto;
+ }
}
/** One label paired with its control, at the same 10px rhythm as the aggregate rows. */
@@ -134,9 +139,3 @@
cursor: help;
color: var(--l3-foreground);
}
-
-.closeButton {
- margin-left: auto;
- width: 24px;
- height: 24px;
-}
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.tsx
index f263db8acf..086ce94d9b 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/BucketOptions/BucketOptions.tsx
@@ -3,7 +3,7 @@ import { Tooltip } from 'antd';
import cx from 'classnames';
import { Button } from '@signozhq/ui/button';
import { InputNumber } from '@signozhq/ui/input-number';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { ChevronUp, Info } from '@signozhq/icons';
import {
Querybuildertypesv5BucketOptionsDTO,
@@ -177,7 +177,10 @@ function BucketOptions({
<div className={styles.controls}>
<div className={styles.field}>
<span className={styles.label}>Bucket by</span>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
value={kind}
items={kindItems}
@@ -189,7 +192,10 @@ function BucketOptions({
{kind === Querybuildertypesv5BucketsKindDTO.log && (
<div className={styles.field}>
<span className={styles.label}>Scale</span>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
value={String(logScale)}
items={scaleItems}
@@ -233,13 +239,14 @@ function BucketOptions({
<Button
color="secondary"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
aria-label="Close bucket options"
- className={styles.closeButton}
- prefix={<ChevronUp size={16} />}
onClick={onClose}
- data-testid="bucket-options-close"
- />
+ testId="bucket-options-close"
+ >
+ <ChevronUp size={16} />
+ </Button>
)}
</div>
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss
index 05cb3036ec..a8073e203d 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss
@@ -1,19 +1,19 @@
.query-add-ons {
width: 100%;
- --toggle-group-secondary-bg: var(
+ --toggle-group-secondary-outlined-background: var(
--query-builder-v2-toggle-group-background-color,
var(--l1-background-hover)
);
- --toggle-group-secondary-border: var(
+ --toggle-group-border: var(
--query-builder-v2-toggle-group-border-color,
var(--l2-border)
);
- --toggle-group-secondary-active-bg: var(
+ --toggle-group-secondary-outlined-background-active: var(
--query-builder-v2-toggle-group-active-background-color,
var(--l1-background)
);
- --toggle-group-secondary-bg-hover: var(
+ --toggle-group-secondary-outlined-background-hover: var(
--query-builder-v2-toggle-group-background-color-hover,
var(--l2-background)
);
@@ -36,51 +36,6 @@
align-items: center;
gap: 16px;
- .add-ons-tabs {
- display: flex;
- flex-wrap: wrap;
-
- .add-on-tab-title {
- display: flex;
- gap: var(--margin-2);
- align-items: center;
- justify-content: center;
- font-size: var(--font-size-xs);
- font-style: normal;
- font-weight: var(--font-weight-normal);
-
- color: var(--query-builder-v2-color, var(--l2-foreground));
- }
-
- > button {
- border: 1px solid var(--query-builder-v2-border-color, var(--l2-border));
- border-left: none;
- min-width: 120px;
- height: 36px;
- line-height: 36px;
-
- &:first-child {
- border-left: 1px solid
- var(--query-builder-v2-border-color, var(--l2-border));
- }
-
- &::before {
- background: var(--query-builder-v2-border-color, var(--l2-border));
- }
-
- &[data-state='on'] {
- color: var(--text-robin-500);
- border: 1px solid var(--query-builder-v2-border-color, var(--l2-border));
-
- display: none;
-
- &::before {
- background: var(--query-builder-v2-border-color, var(--l2-border));
- }
- }
- }
- }
-
.compass-button {
width: 30px;
height: 30px;
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
index af892f2a8d..a2427453d2 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Button } from 'antd';
import cx from 'classnames';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
+import { Tooltip, TooltipProvider } from '@signozhq/ui/tooltip';
import InputWithLabel from 'components/InputWithLabel/InputWithLabel';
import { PANEL_TYPES } from 'constants/queryBuilder';
import { GroupByFilter } from 'container/QueryBuilder/filters/GroupByFilter/GroupByFilter';
@@ -31,6 +31,7 @@ import BucketOptions from './BucketOptions/BucketOptions';
import HavingFilter from './HavingFilter/HavingFilter';
import {
ADD_ON_DEFINITIONS,
+ ADD_ON_TOOLTIP_DELAY_MS,
BASE_ADD_ONS,
BUCKET_OPTIONS,
HISTOGRAM_ATTRIBUTE_TYPES,
@@ -299,241 +300,236 @@ function QueryAddOns({
);
return (
- <div className="query-add-ons" data-testid="query-add-ons">
- {selectedViews.length > 0 && (
- <div className="selected-add-ons-content">
- {selectedViews.find((view) => view.key === QueryBuilderField.GroupBy) && (
- <div className="add-on-content" data-testid="group-by-content">
- <div className="periscope-input-with-label">
- <TooltipSimple
- title={
- <TooltipContent
- label="Group By"
- description="Break down data by attributes like service name, endpoint, status code, or region. Essential for spotting patterns and comparing performance across different segments."
- docLink="https://signoz.io/docs/querying/aggregation-grouping/#grouping"
- />
- }
- arrow
- delayDuration={500}
- >
- <div className="label" style={{ cursor: 'help' }}>
- Group By
- </div>
- </TooltipSimple>
- <div className="input">
- <GroupByFilter
- disabled={
- query.dataSource === DataSource.METRICS &&
- !(query.aggregations?.[0] as MetricAggregation)?.metricName
+ <TooltipProvider delay={ADD_ON_TOOLTIP_DELAY_MS}>
+ <div className="query-add-ons" data-testid="query-add-ons">
+ {selectedViews.length > 0 && (
+ <div className="selected-add-ons-content">
+ {selectedViews.find((view) => view.key === QueryBuilderField.GroupBy) && (
+ <div className="add-on-content" data-testid="group-by-content">
+ <div className="periscope-input-with-label">
+ <Tooltip
+ title={
+ <TooltipContent
+ label="Group By"
+ description="Break down data by attributes like service name, endpoint, status code, or region. Essential for spotting patterns and comparing performance across different segments."
+ docLink="https://signoz.io/docs/querying/aggregation-grouping/#grouping"
+ />
}
- query={query}
- onChange={handleChangeGroupByKeys}
- placeholder={placeholderOf(QueryBuilderField.GroupBy)}
- />
- </div>
- {!isPinned(QueryBuilderField.GroupBy) && (
- <Button
- className="close-btn periscope-btn ghost"
- icon={<ChevronUp size={16} />}
- onClick={(): void => handleRemoveView(QueryBuilderField.GroupBy)}
- />
- )}
- </div>
- </div>
- )}
- {selectedViews.find((view) => view.key === QueryBuilderField.Having) && (
- <div className="add-on-content" data-testid="having-content">
- <div className="periscope-input-with-label">
- <TooltipSimple
- title={
- <TooltipContent
- label="Having"
- description="Filter grouped results based on aggregate conditions. Show only groups meeting specific criteria, like error rates > 5% or p99 latency > 500"
- docLink="https://signoz.io/docs/querying/result-manipulation/#conditional-filtering-with-having"
+ >
+ <div className="label" style={{ cursor: 'help' }}>
+ Group By
+ </div>
+ </Tooltip>
+ <div className="input">
+ <GroupByFilter
+ disabled={
+ query.dataSource === DataSource.METRICS &&
+ !(query.aggregations?.[0] as MetricAggregation)?.metricName
+ }
+ query={query}
+ onChange={handleChangeGroupByKeys}
+ placeholder={placeholderOf(QueryBuilderField.GroupBy)}
/>
- }
- arrow
- delayDuration={500}
- >
- <div className="label" style={{ cursor: 'help' }}>
- Having
</div>
- </TooltipSimple>
- <div className="input">
- <HavingFilter
- onClose={(): void => handleRemoveView(QueryBuilderField.Having)}
- onChange={handleChangeHaving}
- queryData={query}
- placeholder={placeholderOf(QueryBuilderField.Having)}
- />
+ {!isPinned(QueryBuilderField.GroupBy) && (
+ <Button
+ className="close-btn periscope-btn ghost"
+ icon={<ChevronUp size={16} />}
+ onClick={(): void => handleRemoveView(QueryBuilderField.GroupBy)}
+ />
+ )}
</div>
</div>
- </div>
- )}
- {selectedViews.find((view) => view.key === QueryBuilderField.Limit) && (
- <div className="add-on-content" data-testid="limit-content">
- <InputWithLabel
- label="Limit"
- type="number"
- onChange={handleChangeLimit}
- initialValue={query?.limit ?? undefined}
- placeholder={placeholderOf(QueryBuilderField.Limit)}
- onClose={(): void => handleRemoveView(QueryBuilderField.Limit)}
- closeIcon={<ChevronUp size={16} />}
- />
- </div>
- )}
- {selectedViews.find((view) => view.key === QueryBuilderField.OrderBy) && (
- <div className="add-on-content" data-testid="order-by-content">
- <div className="periscope-input-with-label">
- <TooltipSimple
- title={
- <TooltipContent
- label="Order By"
- description="Sort results to surface what matters most. Quickly identify slowest operations, most frequent errors, or highest resource consumers."
- docLink="https://signoz.io/docs/querying/result-manipulation/#sorting--limiting"
+ )}
+ {selectedViews.find((view) => view.key === QueryBuilderField.Having) && (
+ <div className="add-on-content" data-testid="having-content">
+ <div className="periscope-input-with-label">
+ <Tooltip
+ title={
+ <TooltipContent
+ label="Having"
+ description="Filter grouped results based on aggregate conditions. Show only groups meeting specific criteria, like error rates > 5% or p99 latency > 500"
+ docLink="https://signoz.io/docs/querying/result-manipulation/#conditional-filtering-with-having"
+ />
+ }
+ >
+ <div className="label" style={{ cursor: 'help' }}>
+ Having
+ </div>
+ </Tooltip>
+ <div className="input">
+ <HavingFilter
+ onClose={(): void => handleRemoveView(QueryBuilderField.Having)}
+ onChange={handleChangeHaving}
+ queryData={query}
+ placeholder={placeholderOf(QueryBuilderField.Having)}
/>
- }
- arrow
- delayDuration={500}
- >
- <div className="label" style={{ cursor: 'help' }}>
- Order By
</div>
- </TooltipSimple>
- <div className="input">
- <OrderByFilter
- entityVersion={version}
- query={query}
- onChange={handleChangeOrderByKeys}
- isRawQuery={isRawQuery}
- isNewQueryV2
- placeholder={placeholderOf(QueryBuilderField.OrderBy)}
- />
</div>
- {!isPinned(QueryBuilderField.OrderBy) && (
- <Button
- className="close-btn periscope-btn ghost"
- icon={<ChevronUp size={16} />}
- onClick={(): void => handleRemoveView(QueryBuilderField.OrderBy)}
- />
- )}
</div>
- </div>
- )}
-
- {selectedViews.find((view) => view.key === QueryBuilderField.ReduceTo) &&
- showReduceTo && (
- <div className="add-on-content" data-testid="reduce-to-content">
+ )}
+ {selectedViews.find((view) => view.key === QueryBuilderField.Limit) && (
+ <div className="add-on-content" data-testid="limit-content">
+ <InputWithLabel
+ label="Limit"
+ type="number"
+ onChange={handleChangeLimit}
+ initialValue={query?.limit ?? undefined}
+ placeholder={placeholderOf(QueryBuilderField.Limit)}
+ onClose={(): void => handleRemoveView(QueryBuilderField.Limit)}
+ closeIcon={<ChevronUp size={16} />}
+ />
+ </div>
+ )}
+ {selectedViews.find((view) => view.key === QueryBuilderField.OrderBy) && (
+ <div className="add-on-content" data-testid="order-by-content">
<div className="periscope-input-with-label">
- <TooltipSimple
+ <Tooltip
title={
<TooltipContent
- label="Reduce to"
- description="Apply mathematical operations like sum, average, min, max, or percentiles to reduce multiple time series into a single value."
- docLink="https://signoz.io/docs/userguide/query-builder-v5/#result-manipulation"
+ label="Order By"
+ description="Sort results to surface what matters most. Quickly identify slowest operations, most frequent errors, or highest resource consumers."
+ docLink="https://signoz.io/docs/querying/result-manipulation/#sorting--limiting"
/>
}
- arrow
- delayDuration={500}
>
<div className="label" style={{ cursor: 'help' }}>
- Reduce to
+ Order By
</div>
- </TooltipSimple>
+ </Tooltip>
<div className="input">
- <ReduceToFilter query={query} onChange={handleChangeReduceToV5} />
+ <OrderByFilter
+ entityVersion={version}
+ query={query}
+ onChange={handleChangeOrderByKeys}
+ isRawQuery={isRawQuery}
+ isNewQueryV2
+ placeholder={placeholderOf(QueryBuilderField.OrderBy)}
+ />
</div>
-
- {!isPinned(QueryBuilderField.ReduceTo) && (
+ {!isPinned(QueryBuilderField.OrderBy) && (
<Button
className="close-btn periscope-btn ghost"
icon={<ChevronUp size={16} />}
- onClick={(): void => handleRemoveView(QueryBuilderField.ReduceTo)}
+ onClick={(): void => handleRemoveView(QueryBuilderField.OrderBy)}
/>
)}
</div>
</div>
)}
- {selectedViews.find((view) => view.key === QueryBuilderField.Legend) && (
- <div className="add-on-content" data-testid="legend-format-content">
- <InputWithLabel
- label="Legend format"
- placeholder={placeholderOf(QueryBuilderField.Legend)}
- onChange={handleChangeQueryLegend}
- initialValue={isEmpty(query?.legend) ? undefined : query?.legend}
- onClose={(): void => handleRemoveView(QueryBuilderField.Legend)}
- closeIcon={<ChevronUp size={16} />}
- />
- </div>
- )}
-
- {selectedViews.find(
- (view) => view.key === QueryBuilderField.BucketOptions,
- ) && (
- <div className="add-on-content" data-testid="bucket-options-content">
- <BucketOptions
- bucketOptions={query.bucketOptions}
- unit={currentQuery.unit}
- onChange={handleChangeBucketOptions}
- onClose={(): void => handleRemoveView(QueryBuilderField.BucketOptions)}
- />
- </div>
- )}
- </div>
- )}
-
- <ToggleGroupSimple
- type="multiple"
- className="add-ons-tabs"
- value={selectedViews.map((view) => view.key)}
- onChange={(newKeys: string[]): void => {
- const oldKeys: string[] = selectedViews.map((view) => view.key);
- const toggledKey =
- newKeys.find((key) => !oldKeys.includes(key)) ??
- oldKeys.find((key) => !newKeys.includes(key));
- if (!toggledKey) {
- return;
- }
- const clickedAddOn = togglableAddOns.find((a) => a.key === toggledKey);
- if (clickedAddOn) {
- handleOptionClick(clickedAddOn);
- }
- }}
- items={togglableAddOns.map((addOn) => {
- const resolved = resolvedFields.get(addOn.key);
+ {selectedViews.find((view) => view.key === QueryBuilderField.ReduceTo) &&
+ showReduceTo && (
+ <div className="add-on-content" data-testid="reduce-to-content">
+ <div className="periscope-input-with-label">
+ <Tooltip
+ title={
+ <TooltipContent
+ label="Reduce to"
+ description="Apply mathematical operations like sum, average, min, max, or percentiles to reduce multiple time series into a single value."
+ docLink="https://signoz.io/docs/userguide/query-builder-v5/#result-manipulation"
+ />
+ }
+ >
+ <div className="label" style={{ cursor: 'help' }}>
+ Reduce to
+ </div>
+ </Tooltip>
+ <div className="input">
+ <ReduceToFilter query={query} onChange={handleChangeReduceToV5} />
+ </div>
+
+ {!isPinned(QueryBuilderField.ReduceTo) && (
+ <Button
+ className="close-btn periscope-btn ghost"
+ icon={<ChevronUp size={16} />}
+ onClick={(): void => handleRemoveView(QueryBuilderField.ReduceTo)}
+ />
+ )}
+ </div>
+ </div>
+ )}
+
+ {selectedViews.find((view) => view.key === QueryBuilderField.Legend) && (
+ <div className="add-on-content" data-testid="legend-format-content">
+ <InputWithLabel
+ label="Legend format"
+ placeholder={placeholderOf(QueryBuilderField.Legend)}
+ onChange={handleChangeQueryLegend}
+ initialValue={isEmpty(query?.legend) ? undefined : query?.legend}
+ onClose={(): void => handleRemoveView(QueryBuilderField.Legend)}
+ closeIcon={<ChevronUp size={16} />}
+ />
+ </div>
+ )}
- return {
- value: addOn.key,
- label: (
- <TooltipSimple
- title={
- <TooltipContent
- label={addOn.label}
- description={resolved?.reason ?? addOn.description}
- docLink={resolved?.disabled ? undefined : addOn.docLink}
- />
- }
- arrow
- delayDuration={500}
- >
- <span
- className={cx('add-on-tab-title', {
- 'add-on-tab-title--disabled': resolved?.disabled,
- })}
- aria-disabled={resolved?.disabled}
- data-testid={`query-add-on-${addOn.key}`}
+ {selectedViews.find(
+ (view) => view.key === QueryBuilderField.BucketOptions,
+ ) && (
+ <div className="add-on-content" data-testid="bucket-options-content">
+ <BucketOptions
+ bucketOptions={query.bucketOptions}
+ unit={currentQuery.unit}
+ onChange={handleChangeBucketOptions}
+ onClose={(): void => handleRemoveView(QueryBuilderField.BucketOptions)}
+ />
+ </div>
+ )}
+ </div>
+ )}
+
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
+ type="multiple"
+ allowClear
+ value={selectedViews.map((view) => view.key)}
+ onChange={(newKeys: string[]): void => {
+ const oldKeys: string[] = selectedViews.map((view) => view.key);
+ const toggledKey =
+ newKeys.find((key) => !oldKeys.includes(key)) ??
+ oldKeys.find((key) => !newKeys.includes(key));
+ if (!toggledKey) {
+ return;
+ }
+ const clickedAddOn = togglableAddOns.find((a) => a.key === toggledKey);
+ if (clickedAddOn) {
+ handleOptionClick(clickedAddOn);
+ }
+ }}
+ items={togglableAddOns.map((addOn) => {
+ const resolved = resolvedFields.get(addOn.key);
+
+ return {
+ value: addOn.key,
+ label: (
+ <Tooltip
+ title={
+ <TooltipContent
+ label={addOn.label}
+ description={resolved?.reason ?? addOn.description}
+ docLink={resolved?.disabled ? undefined : addOn.docLink}
+ />
+ }
>
- {addOn.icon}
- {addOn.label}
- </span>
- </TooltipSimple>
- ),
- };
- })}
- />
- </div>
+ <span
+ className={cx('add-on-tab-title', {
+ 'add-on-tab-title--disabled': resolved?.disabled,
+ })}
+ aria-disabled={resolved?.disabled}
+ data-testid={`query-add-on-${addOn.key}`}
+ >
+ {addOn.icon}
+ {addOn.label}
+ </span>
+ </Tooltip>
+ ),
+ };
+ })}
+ />
+ </div>
+ </TooltipProvider>
);
}
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/constants.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/constants.tsx
index 5c404472e7..0411c18cfd 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/constants.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/constants.tsx
@@ -5,6 +5,8 @@ import { QueryBuilderField } from '../../queryBuilderFields.types';
import type { AddOn, AddOnDefinition, AddOnField } from './types';
+export const ADD_ON_TOOLTIP_DELAY_MS = 500;
+
// A Record, so a field added to the enum has to be placed here or in `NonAddOnField`.
export const ADD_ON_DEFINITIONS = {
[QueryBuilderField.GroupBy]: {
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
index 9962321d4f..705e07f97e 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
@@ -724,26 +724,62 @@ function QuerySearch({
// Helper function to render a badge for the current context mode
const renderContextBadge = (): JSX.Element => {
if (!editingMode) {
- return <Badge color="vanilla">Unknown</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="secondary">
+ Unknown
+ </Badge>
+ );
}
switch (editingMode) {
case 'key':
- return <Badge color="robin">Key</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="primary">
+ Key
+ </Badge>
+ );
case 'operator':
- return <Badge color="sakura">Operator</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="highlight-danger">
+ Operator
+ </Badge>
+ );
case 'value':
- return <Badge color="forest">Value</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="success">
+ Value
+ </Badge>
+ );
case 'conjunction':
- return <Badge color="amber">Conjunction</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="warning">
+ Conjunction
+ </Badge>
+ );
case 'function':
- return <Badge color="aqua">Function</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="info">
+ Function
+ </Badge>
+ );
case 'parenthesis':
- return <Badge color="sakura">Parenthesis</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="highlight-danger">
+ Parenthesis
+ </Badge>
+ );
case 'bracketList':
- return <Badge color="cherry">Bracket List</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="danger">
+ Bracket List
+ </Badge>
+ );
default:
- return <Badge color="vanilla">Unknown</Badge>;
+ return (
+ <Badge textTransform="none" variant="solid" color="secondary">
+ Unknown
+ </Badge>
+ );
}
};
@@ -1465,27 +1501,45 @@ function QuerySearch({
Currently editing: {renderContextBadge()}
{queryContext?.keyToken && (
<span className="triplet-info">
- Key: <Badge color="vanilla">{queryContext.keyToken}</Badge>
+ Key:{' '}
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {queryContext.keyToken}
+ </Badge>
</span>
)}
{queryContext?.operatorToken && (
<span className="triplet-info">
- Operator: <Badge color="vanilla">{queryContext.operatorToken}</Badge>
+ Operator:{' '}
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {queryContext.operatorToken}
+ </Badge>
</span>
)}
{queryContext?.valueToken && (
<span className="triplet-info">
- Value: <Badge color="vanilla">{queryContext.valueToken}</Badge>
+ Value:{' '}
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {queryContext.valueToken}
+ </Badge>
</span>
)}
{queryContext?.currentPair && (
<span className="triplet-info query-pair-info">
- Current pair: <Badge color="robin">{queryContext.currentPair.key}</Badge>
- <Badge color="sakura">{queryContext.currentPair.operator}</Badge>
+ Current pair:{' '}
+ <Badge textTransform="none" variant="solid" color="primary">
+ {queryContext.currentPair.key}
+ </Badge>
+ <Badge textTransform="none" variant="solid" color="highlight-danger">
+ {queryContext.currentPair.operator}
+ </Badge>
{queryContext.currentPair.value && (
- <Badge color="forest">{queryContext.currentPair.value}</Badge>
+ <Badge textTransform="none" variant="solid" color="success">
+ {queryContext.currentPair.value}
+ </Badge>
)}
<Badge
+ textTransform="none"
+ variant="solid"
color={queryContext.currentPair.isComplete ? 'success' : 'warning'}
>
{queryContext.currentPair.isComplete ? 'Complete' : 'Incomplete'}
@@ -1495,7 +1549,9 @@ function QuerySearch({
{queryContext?.queryPairs && queryContext.queryPairs.length > 0 && (
<span className="triplet-info">
Total pairs:{' '}
- <Badge color="robin">{queryContext.queryPairs.length}</Badge>
+ <Badge variant="solid" color="primary">
+ {queryContext.queryPairs.length}
+ </Badge>
</span>
)}
</div>
diff --git a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
index 1fc029cefd..23c42398a5 100644
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx
@@ -6,7 +6,7 @@ import {
useMemo,
useState,
} from 'react';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import cx from 'classnames';
import { ENTITY_VERSION_V4, ENTITY_VERSION_V5 } from 'constants/app';
import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -91,6 +91,26 @@ export const QueryV2 = forwardRef(function QueryV2(
cloneQuery('query', query);
};
+ const queryActionItems: DropdownItemType[] = [
+ {
+ type: 'item',
+ label: 'Clone',
+ value: 'clone-query',
+ prefix: <Copy size={14} />,
+ onClick: handleCloneEntity,
+ },
+ ];
+
+ if (queriesCount && queriesCount > 1) {
+ queryActionItems.push({
+ type: 'item',
+ label: 'Delete',
+ value: 'delete-query',
+ prefix: <Trash size={14} />,
+ onClick: handleDeleteQuery,
+ });
+ }
+
const showReduceTo = useMemo(
() =>
dataSource === DataSource.METRICS &&
@@ -224,32 +244,14 @@ export const QueryV2 = forwardRef(function QueryV2(
)}
{isMultiQueryAllowed && (
- <DropdownMenuSimple
- className="query-actions-dropdown"
- menu={{
- items: [
- {
- label: 'Clone',
- key: 'clone-query',
- icon: <Copy size={14} />,
- onClick: handleCloneEntity,
- },
- ...(queriesCount && queriesCount > 1
- ? [
- {
- label: 'Delete',
- key: 'delete-query',
- icon: <Trash size={14} />,
- onClick: handleDeleteQuery,
- },
- ]
- : []),
- ],
- }}
+ <Dropdown
+ items={queryActionItems}
+ nativeButton={false}
align="end"
+ side="bottom"
>
<Ellipsis size={16} />
- </DropdownMenuSimple>
+ </Dropdown>
)}
</div>
</div>
diff --git a/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx b/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
index 391e96c1fb..d0ed433223 100644
--- a/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
+++ b/frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx
@@ -358,6 +358,29 @@ describe('QueryAddOns', () => {
);
});
+ it('closes the only open add-on when its tab is clicked again', async () => {
+ const user = userEvent.setup();
+
+ render(
+ <QueryAddOns
+ query={baseQuery()}
+ version="v5"
+ isRawQuery={false}
+ showReduceTo={false}
+ panelType={PANEL_TYPES.TIME_SERIES}
+ index={0}
+ isForTraceOperator={false}
+ />,
+ );
+
+ const legendTab = screen.getByTestId('query-add-on-legend_format');
+ await user.click(legendTab);
+ expect(screen.getByTestId('legend-format-content')).toBeInTheDocument();
+
+ await user.click(legendTab);
+ expect(screen.queryByTestId('legend-format-content')).not.toBeInTheDocument();
+ });
+
it('does not override existing legend when enabling Legend format', async () => {
const user = userEvent.setup();
const query = baseQuery({
@@ -461,8 +484,14 @@ describe('QueryAddOns', () => {
renderHeatmap({ bucketOptions: { kind: 'log', spec: { scale: 0 } } });
expect(screen.getByTestId('bucket-options-content')).toBeInTheDocument();
- expect(screen.getByRole('radio', { name: 'Log' })).toBeChecked();
- expect(screen.getByRole('radio', { name: '0' })).toBeChecked();
+ expect(screen.getByRole('button', { name: 'Log' })).toHaveAttribute(
+ 'aria-pressed',
+ 'true',
+ );
+ expect(screen.getByRole('button', { name: '0' })).toHaveAttribute(
+ 'aria-pressed',
+ 'true',
+ );
});
it('shows the server default, log at scale 4, without sending it', async () => {
@@ -471,10 +500,16 @@ describe('QueryAddOns', () => {
await user.click(screen.getByTestId('query-add-on-bucket_options'));
- expect(screen.getByRole('radio', { name: 'Log' })).toBeChecked();
- expect(screen.getByRole('radio', { name: '4' })).toBeChecked();
+ expect(screen.getByRole('button', { name: 'Log' })).toHaveAttribute(
+ 'aria-pressed',
+ 'true',
+ );
+ expect(screen.getByRole('button', { name: '4' })).toHaveAttribute(
+ 'aria-pressed',
+ 'true',
+ );
expect(
- screen.queryByRole('radio', { name: 'Auto' }),
+ screen.queryByRole('button', { name: 'Auto' }),
).not.toBeInTheDocument();
expect(mockHandleChangeQueryData).not.toHaveBeenCalledWith(
'bucketOptions',
@@ -486,7 +521,7 @@ describe('QueryAddOns', () => {
const user = userEvent.setup();
renderHeatmap({ bucketOptions: { kind: 'log', spec: { scale: 4 } } });
- await user.click(screen.getByRole('radio', { name: '0' }));
+ await user.click(screen.getByRole('button', { name: '0' }));
expect(mockHandleChangeQueryData).toHaveBeenCalledWith('bucketOptions', {
kind: 'log',
@@ -498,7 +533,7 @@ describe('QueryAddOns', () => {
const user = userEvent.setup();
renderHeatmap({ bucketOptions: { kind: 'log', spec: { scale: 0 } } });
- await user.click(screen.getByRole('radio', { name: '-4' }));
+ await user.click(screen.getByRole('button', { name: '-4' }));
expect(mockHandleChangeQueryData).toHaveBeenCalledWith('bucketOptions', {
kind: 'log',
@@ -519,7 +554,7 @@ describe('QueryAddOns', () => {
const user = userEvent.setup();
renderHeatmap({ bucketOptions: { kind: 'log', spec: { scale: 0 } } });
- await user.click(screen.getByRole('radio', { name: 'Linear' }));
+ await user.click(screen.getByRole('button', { name: 'Linear' }));
expect(mockHandleChangeQueryData).toHaveBeenLastCalledWith(
'bucketOptions',
@@ -534,7 +569,7 @@ describe('QueryAddOns', () => {
const user = userEvent.setup();
renderHeatmap({ bucketOptions: { kind: 'log', spec: { scale: 0 } } });
- await user.click(screen.getByRole('radio', { name: 'Linear' }));
+ await user.click(screen.getByRole('button', { name: 'Linear' }));
await user.type(screen.getByTestId('bucket-options-max-value'), '500');
await waitFor(() => {
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss
index 8a503d2546..090c50c5f9 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss
@@ -146,7 +146,7 @@
}
// Hovering the checkbox reveals the "Toggle" action.
- .check-box:hover ~ .checkbox-value-section .toggle-btn {
+ [data-slot='checkbox']:hover ~ .checkbox-value-section .toggle-btn {
display: flex;
opacity: 1;
transform: translateX(0);
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx
index 21d0c073da..c41154ef08 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx
@@ -18,7 +18,9 @@ import LogsQuickFilterEmptyState from './LogsQuickFilterEmptyState';
import useActiveQueryIndex from 'components/QuickFilters/hooks/useActiveQueryIndex';
import useCheckboxDisclosure from './useCheckboxDisclosure';
import useCheckboxFilterActions from './useCheckboxFilterActions';
-import useCheckboxFilterState from './useCheckboxFilterState';
+import useCheckboxFilterState, {
+ FILTER_DISABLED_REASON,
+} from './useCheckboxFilterState';
import useCheckboxFilterValues from './useCheckboxFilterValues';
import './Checkbox.styles.scss';
@@ -132,6 +134,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
value={value}
checked={currentFilterState[value]}
disabled={isFilterDisabled}
+ disabledTooltip={FILTER_DISABLED_REASON}
title={filter.title}
onlyButtonLabel={
isSomeFilterPresentForCurrentAttribute
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx
index 58701bca51..9dbf768eed 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx
@@ -2,12 +2,13 @@ import { Button } from 'antd';
import { Checkbox } from '@signozhq/ui/checkbox';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
interface CheckboxValueRowProps {
value: string;
checked: boolean;
disabled: boolean;
+ disabledTooltip?: string;
title: string;
onlyButtonLabel: string;
customRendererForValue?: (value: string) => JSX.Element;
@@ -19,6 +20,7 @@ function CheckboxValueRow({
value,
checked,
disabled,
+ disabledTooltip,
title,
onlyButtonLabel,
customRendererForValue,
@@ -28,10 +30,11 @@ function CheckboxValueRow({
return (
<div className="value">
<Checkbox
+ color="primary"
+ disabledTooltip={disabledTooltip}
onChange={(isChecked): void => onCheckboxChange(isChecked === true)}
value={checked}
disabled={disabled}
- className="check-box"
/>
<div
@@ -47,11 +50,11 @@ function CheckboxValueRow({
{customRendererForValue ? (
customRendererForValue(value)
) : (
- <TooltipSimple title={String(value)} side="top" align="start">
+ <Tooltip title={String(value)} side="top" align="start">
<Typography.Text className="value-string" truncate={1}>
{String(value)}
</Typography.Text>
- </TooltipSimple>
+ </Tooltip>
)}
<div className="value-actions">
<Button type="text" className="only-btn">
@@ -67,6 +70,7 @@ function CheckboxValueRow({
}
CheckboxValueRow.defaultProps = {
+ disabledTooltip: undefined,
customRendererForValue: undefined,
};
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterState.ts b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterState.ts
index dd2de4e96a..2faf26a858 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterState.ts
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/useCheckboxFilterState.ts
@@ -17,6 +17,9 @@ interface UseCheckboxFilterStateReturn {
isMultipleValuesTrueForTheKey: boolean;
}
+export const FILTER_DISABLED_REASON =
+ 'This attribute is used more than once in the filter bar';
+
/**
* Reads the active query and derives the per-value checked state for this
* attribute, whether the filter is disabled (same key used more than once in
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.module.scss b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.module.scss
index 2087677afd..46d29ec1b9 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.module.scss
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.module.scss
@@ -38,6 +38,6 @@
.rightAction {
display: flex;
align-items: center;
- gap: var(--spacing-1);
+ gap: var(--spacing-4);
flex-shrink: 0;
}
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.tsx
index f56b871203..0361288536 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Header.tsx
@@ -1,5 +1,5 @@
import { useState } from 'react';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { ChevronDown, ChevronRight, Search, Undo2 } from '@signozhq/icons';
@@ -62,13 +62,7 @@ export function CheckboxFilterV2Header({
) : (
<ChevronRight size={13} cursor="pointer" />
)}
- {isTitleTruncated ? (
- <TooltipSimple title={title} delayDuration={400}>
- {titleText}
- </TooltipSimple>
- ) : (
- titleText
- )}
+ <Tooltip title={isTitleTruncated ? title : undefined}>{titleText}</Tooltip>
</section>
{isOpen && (
<section className={classNames(styles.rightAction, actionsClassName)}>
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Section.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Section.tsx
index 02673afd6d..85ce61ab35 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Section.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2Section.tsx
@@ -3,6 +3,7 @@ import {
CheckedState,
} from 'components/QuickFilters/types';
+import { FILTER_DISABLED_REASON } from '../useCheckboxFilterState';
import { CheckboxFilterV2ValueRow } from './CheckboxFilterV2ValueRow';
import { SectionDivider } from './SectionDivider';
import { Section } from './useSectionedValues';
@@ -84,6 +85,7 @@ export function CheckboxFilterV2Section(
value={value}
checkedState={checkedState}
disabled={isFilterDisabled}
+ disabledTooltip={FILTER_DISABLED_REASON}
title={filter.title}
badge={badge}
onlyButtonLabel={
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.module.scss b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.module.scss
index 8a6c369f64..c61382444c 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.module.scss
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.module.scss
@@ -37,53 +37,31 @@
align-items: center;
justify-items: end;
+ --button-height: 21px;
+ --button-padding: var(--spacing-5);
+
// Stack badge / only / toggle in a single cell so the crossfade overlaps
// instead of laying them side-by-side mid-transition.
> * {
grid-area: 1 / 1;
}
-}
-
-.badge {
- opacity: 1;
- transition:
- opacity 0.16s ease,
- display 0.16s allow-discrete;
-}
-.onlyButton {
- display: none;
- align-items: center;
- justify-content: center;
- opacity: 0;
- transform: translateX(4px);
- transition:
- opacity 0.16s ease,
- transform 0.16s ease,
- display 0.16s allow-discrete;
- --button-height: 21px;
- --button-padding: var(--spacing-5);
-
- &:hover {
- background-color: unset;
+ > [data-action='badge'] {
+ opacity: 1;
+ transition:
+ opacity 0.16s ease,
+ display 0.16s allow-discrete;
}
-}
-
-.toggleButton {
- display: none;
- align-items: center;
- justify-content: center;
- opacity: 0;
- transform: translateX(4px);
- transition:
- opacity 0.16s ease,
- transform 0.16s ease,
- display 0.16s allow-discrete;
- --button-height: 21px;
- --button-padding: var(--spacing-5);
- &:hover {
- background-color: unset;
+ > [data-action='only'],
+ > [data-action='toggle'] {
+ display: none;
+ opacity: 0;
+ transform: translateX(4px);
+ transition:
+ opacity 0.16s ease,
+ transform 0.16s ease,
+ display 0.16s allow-discrete;
}
}
@@ -94,19 +72,15 @@
color: var(--l3-foreground);
}
- .onlyButton {
- cursor: not-allowed;
- color: var(--l3-foreground);
- }
-
- .toggleButton {
+ [data-action='only'],
+ [data-action='toggle'] {
cursor: not-allowed;
color: var(--l3-foreground);
}
}
.valueButton:hover {
- .onlyButton {
+ [data-action='only'] {
display: flex;
opacity: 1;
transform: translateX(0);
@@ -117,14 +91,14 @@
}
}
- .badge {
+ [data-action='badge'] {
display: none;
opacity: 0;
}
}
.checkbox:hover ~ .valueButton {
- .toggleButton {
+ [data-action='toggle'] {
display: flex;
opacity: 1;
transform: translateX(0);
@@ -135,16 +109,14 @@
}
}
- .badge {
+ [data-action='badge'] {
display: none;
opacity: 0;
}
}
@media (prefers-reduced-motion: reduce) {
- .badge,
- .onlyButton,
- .toggleButton {
+ .actions > * {
transition: none;
}
}
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.tsx
index cbeb7f08f7..7789cc652f 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/CheckboxFilterV2ValueRow.tsx
@@ -12,6 +12,7 @@ interface ValueRowProps {
value: string;
checkedState: CheckedState;
disabled: boolean;
+ disabledTooltip?: string;
title: string;
onlyButtonLabel: string;
customRendererForValue?: (value: string) => JSX.Element;
@@ -36,6 +37,7 @@ export function CheckboxFilterV2ValueRow({
value,
checkedState,
disabled,
+ disabledTooltip,
title,
onlyButtonLabel,
customRendererForValue,
@@ -54,6 +56,7 @@ export function CheckboxFilterV2ValueRow({
>
<div className={styles.checkbox}>
<Checkbox
+ disabledTooltip={disabledTooltip}
onChange={(isChecked): void =>
onCheckboxChange(isChecked === true, checkedState)
}
@@ -97,18 +100,18 @@ export function CheckboxFilterV2ValueRow({
<div className={styles.actions}>
{badge && (
<Badge
- variant="outline"
+ variant="outlined"
color={badge.color}
- className={styles.badge}
+ data-action="badge"
testId={`badge-${badge.key}`}
>
{badge.label}
</Badge>
)}
- <Button variant="ghost" color="secondary" className={styles.onlyButton}>
+ <Button size="md" variant="ghost" color="secondary" data-action="only">
{onlyButtonLabel}
</Button>
- <Button variant="ghost" color="secondary" className={styles.toggleButton}>
+ <Button size="md" variant="ghost" color="secondary" data-action="toggle">
Toggle
</Button>
</div>
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2Header.test.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2Header.test.tsx
index 7895c18455..5d1316234d 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2Header.test.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2Header.test.tsx
@@ -1,6 +1,5 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { CheckboxFilterV2Header } from '../CheckboxFilterV2Header';
@@ -158,11 +157,7 @@ describe('CheckboxFilterV2Header', () => {
it('shows the full name on hover when the title is truncated', async () => {
mockTitleWidths(200, 100);
const user = userEvent.setup();
- render(
- <TooltipProvider>
- <CheckboxFilterV2Header {...defaultProps} />
- </TooltipProvider>,
- );
+ render(<CheckboxFilterV2Header {...defaultProps} />);
await user.hover(screen.getByText(defaultProps.title));
@@ -174,11 +169,7 @@ describe('CheckboxFilterV2Header', () => {
it('shows no tooltip when the title fits', async () => {
mockTitleWidths(100, 100);
const user = userEvent.setup();
- render(
- <TooltipProvider>
- <CheckboxFilterV2Header {...defaultProps} />
- </TooltipProvider>,
- );
+ render(<CheckboxFilterV2Header {...defaultProps} />);
await user.hover(screen.getByText(defaultProps.title));
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2ValueRow.test.tsx b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2ValueRow.test.tsx
index 989a5682f0..d841f80f08 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2ValueRow.test.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/__tests__/CheckboxFilterV2ValueRow.test.tsx
@@ -64,7 +64,7 @@ describe('CheckboxFilterV2ValueRow', () => {
render(
<CheckboxFilterV2ValueRow
{...defaultProps}
- badge={{ key: 'related', label: 'Related', color: 'robin' }}
+ badge={{ key: 'related', label: 'Related', color: 'primary' }}
/>,
);
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/itemRules.ts b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/itemRules.ts
index 1d3ecbf995..12cb9f7361 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/itemRules.ts
+++ b/frontend/src/components/QuickFilters/FilterRenderers/Checkbox/v2/itemRules.ts
@@ -9,7 +9,7 @@ export enum SectionType {
export interface BadgeConfig {
key: string;
label: string;
- color: 'robin' | 'warning' | 'secondary';
+ color: 'primary' | 'warning' | 'secondary';
}
export interface ItemConfig {
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.module.scss b/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.module.scss
deleted file mode 100644
index 0d39c8b167..0000000000
--- a/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.module.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.iconBtn {
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 2px;
- min-width: 24px;
- height: 24px;
-}
diff --git a/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.tsx b/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.tsx
index 10ad9bce91..4b0c7d07dd 100644
--- a/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.tsx
+++ b/frontend/src/components/QuickFilters/FilterRenderers/shared/SectionActionButton/SectionActionButton.tsx
@@ -2,10 +2,6 @@ import { ReactNode } from 'react';
import { Button } from '@signozhq/ui/button';
import { Tooltip } from 'antd';
-import classNames from 'classnames';
-
-import styles from './SectionActionButton.module.scss';
-
interface SectionActionButtonProps {
icon: ReactNode;
tooltip: string;
@@ -23,21 +19,21 @@ export function SectionActionButton({
}: SectionActionButtonProps): JSX.Element {
return (
<Tooltip title={tooltip}>
- <Button
- variant="link"
- color="secondary"
- size="sm"
- className={classNames(styles.iconBtn, className)}
- onMouseDown={(e): void => e.preventDefault()}
- onClick={(e): void => {
- e.stopPropagation();
- e.preventDefault();
- onClick();
- }}
- data-testid={testId}
- >
- {icon}
- </Button>
+ <span className={className} onMouseDown={(e): void => e.preventDefault()}>
+ <Button
+ variant="link"
+ color="secondary"
+ size="sm"
+ onClick={(e): void => {
+ e.stopPropagation();
+ e.preventDefault();
+ onClick();
+ }}
+ testId={testId}
+ >
+ {icon}
+ </Button>
+ </span>
</Tooltip>
);
}
diff --git a/frontend/src/components/QuickFilters/QuickFilters.styles.scss b/frontend/src/components/QuickFilters/QuickFilters.styles.scss
index 190af2f2cc..98a42e4be4 100644
--- a/frontend/src/components/QuickFilters/QuickFilters.styles.scss
+++ b/frontend/src/components/QuickFilters/QuickFilters.styles.scss
@@ -110,8 +110,8 @@
background: var(--l1-background);
}
- .active {
- background: var(--l2-background);
+ > [aria-expanded='true'] {
+ --button-variant-ghost-background-color: var(--l2-background);
}
}
}
diff --git a/frontend/src/components/QuickFilters/QuickFilters.tsx b/frontend/src/components/QuickFilters/QuickFilters.tsx
index 58bb7809e2..58176cdf1f 100644
--- a/frontend/src/components/QuickFilters/QuickFilters.tsx
+++ b/frontend/src/components/QuickFilters/QuickFilters.tsx
@@ -15,7 +15,7 @@ import {
} from '@signozhq/ui/combobox';
import { Skeleton } from 'antd';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Switch } from '@signozhq/ui/switch';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
@@ -216,13 +216,13 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
</Combobox>
) : (
displayedQueryName && (
- <TooltipSimple
+ <Tooltip
title={`Filter currently in sync with query ${displayedQueryName}`}
>
<Typography.Text className="sync-tag">
{displayedQueryName}
</Typography.Text>
- </TooltipSimple>
+ </Tooltip>
)
)}
</section>
@@ -230,27 +230,31 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
const renderRightActions = (): JSX.Element => (
<section className="right-actions">
- <TooltipSimple title="Reset All">
+ <Tooltip title="Reset All">
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Reset All"
onClick={handleReset}
- prefix={<RefreshCw size={14} />}
- />
- </TooltipSimple>
+ >
+ <RefreshCw size={14} />
+ </Button>
+ </Tooltip>
{showFilterCollapse && handleFilterVisibilityChange && (
- <TooltipSimple title="Collapse Filters">
+ <Tooltip title="Collapse Filters">
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Collapse Filters"
onClick={handleFilterVisibilityChange}
- prefix={<ArrowUpToLine style={{ rotate: '270deg' }} size={14} />}
- />
- </TooltipSimple>
+ >
+ <ArrowUpToLine style={{ rotate: '270deg' }} size={14} />
+ </Button>
+ </Tooltip>
)}
{isDynamicFilters &&
(isSettingsDisabled ? (
@@ -258,25 +262,29 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
checks={QuickFilterManagePermissions}
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Settings"
onClick={(): void => setIsSettingsOpen(true)}
testId="settings-icon-container"
- prefix={<SettingsIcon data-testid="settings-icon" size={14} />}
- />
+ >
+ <SettingsIcon data-testid="settings-icon" size={14} />
+ </AuthZButton>
) : (
- <TooltipSimple title="Settings">
+ <Tooltip title="Settings">
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Settings"
- className={classNames({ active: isSettingsOpen })}
+ aria-expanded={isSettingsOpen}
onClick={(): void => setIsSettingsOpen(true)}
- data-testid="settings-icon-container"
- prefix={<SettingsIcon data-testid="settings-icon" size={14} />}
- />
- </TooltipSimple>
+ testId="settings-icon-container"
+ >
+ <SettingsIcon data-testid="settings-icon" size={14} />
+ </Button>
+ </Tooltip>
))}
</section>
);
@@ -287,7 +295,8 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
<div className="api-quick-filters-header">
<Typography.Text>Show IP addresses</Typography.Text>
<Switch
- style={{ marginLeft: 'auto' }}
+ color="primary"
+ textPlacement="right"
value={showIP ?? true}
onChange={(checked): void => {
logEvent('API Monitoring: Show IP addresses clicked', {
diff --git a/frontend/src/components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout.tsx b/frontend/src/components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout.tsx
index 7ae46aaf2b..3082ebaf6c 100644
--- a/frontend/src/components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout.tsx
+++ b/frontend/src/components/QuickFilters/QuickFiltersLayout/QuickFiltersLayout.tsx
@@ -79,7 +79,7 @@ function QuickFiltersLayout({
className={cx(styles.sidebar, { [styles.isStatic]: !hasQuickFilters })}
data-testid="quick-filters-layout-filters"
>
- <TooltipProvider delayDuration={SIDEBAR_TOOLTIP_DELAY_MS}>
+ <TooltipProvider delay={SIDEBAR_TOOLTIP_DELAY_MS}>
<div
className={cx(styles.quickFilters, { [styles.isOpen]: isSliding })}
data-testid="quick-filters-layout-drawer"
diff --git a/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx b/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx
index 146cf89bc7..8fc9f2df3b 100644
--- a/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx
+++ b/frontend/src/components/QuickFilters/QuickFiltersLayout/__tests__/QuickFiltersLayout.test.tsx
@@ -47,10 +47,15 @@ jest.mock('../../QuickFilters', () => ({
{source}
{handleFilterVisibilityChange && (
<Button
+ size="md"
+ variant="solid"
+ color="primary"
aria-label="Collapse Filters"
- data-testid="quick-filters-collapse"
+ testId="quick-filters-collapse"
onClick={handleFilterVisibilityChange}
- />
+ >
+ Collapse
+ </Button>
)}
</div>
),
diff --git a/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/AnnouncementTooltip.styles.scss b/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/AnnouncementTooltip.styles.scss
index 8d19370432..e36fd0eaba 100644
--- a/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/AnnouncementTooltip.styles.scss
+++ b/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/AnnouncementTooltip.styles.scss
@@ -45,23 +45,6 @@
&__footer {
display: flex;
justify-content: flex-end;
-
- // TODO: Need to override the button styles for this component due to container styles.
- // Fix - @aks07
-
- &__button {
- margin-top: 12px;
- color: var(--base-black);
- background-color: var(--base-white);
- border: none;
- padding: 6px 12px;
- border-radius: 4px;
- cursor: pointer;
-
- &:hover {
- background-color: var(--base-white);
- color: var(--bg-robin-500);
- }
- }
+ margin-top: 12px;
}
}
diff --git a/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/index.tsx b/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/index.tsx
index e7acbb3221..c05d63cfdd 100644
--- a/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/index.tsx
+++ b/frontend/src/components/QuickFilters/QuickFiltersSettings/AnnouncementTooltip/index.tsx
@@ -61,11 +61,11 @@ function AnnouncementTooltip({
<p className="announcement-tooltip__message">{message}</p>
<div className="announcement-tooltip__footer">
<Button
+ size="md"
variant="solid"
color="primary"
onClick={closeTooltip}
prefix={<Check size={16} />}
- className="announcement-tooltip__footer__button"
>
Okay
</Button>
diff --git a/frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.tsx b/frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.tsx
index 1ff15f2e45..945ab45457 100644
--- a/frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.tsx
+++ b/frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.tsx
@@ -50,12 +50,14 @@ function QuickFiltersSettings({
<SignozButton
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Close"
- prefix={<X size={14} />}
onClick={handleSettingsClose}
- data-testid="quick-filters-settings-close"
- />
+ testId="quick-filters-settings-close"
+ >
+ <X size={14} />
+ </SignozButton>
</div>
<section className="search">
<Input
diff --git a/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx b/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx
index 90e4eb1a35..5807c152da 100644
--- a/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx
+++ b/frontend/src/components/QuickFilters/stories/QuickFilters.stories.tsx
@@ -59,7 +59,7 @@ const settingsControl = (canvasElement: HTMLElement): Promise<HTMLElement> =>
waitFor(() => {
const control = within(canvasElement).getByTestId('settings-icon-container');
- expect(control).toBeEnabled();
+ expect(control).not.toHaveAttribute('aria-disabled', 'true');
return control;
});
diff --git a/frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx b/frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx
index 4205efbb6a..2f5e3e1fee 100644
--- a/frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx
+++ b/frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx
@@ -2,19 +2,18 @@ import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { refreshLicense } from 'api/generated/services/licenses';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
import { RefreshCcw } from '@signozhq/icons';
import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
import { buildLicenseUpdatePermission } from 'lib/authz/hooks/useAuthZ/permissions/license.permissions';
import { useAppContext } from 'providers/App/App';
+export type RefreshPaymentStatusType = 'button' | 'text';
+
function RefreshPaymentStatus({
type,
- className,
withPortal,
}: {
- type?: 'button' | 'text' | 'tooltip';
- className?: string;
+ type?: RefreshPaymentStatusType;
withPortal?: false;
}): JSX.Element {
const { t } = useTranslation(['failedPayment']);
@@ -39,6 +38,21 @@ function RefreshPaymentStatus({
setIsLoading(false);
};
+ const buttonTypes = {
+ button: {
+ variant: 'link',
+ color: 'secondary',
+ size: 'md',
+ children: t('refreshPaymentStatus'),
+ },
+ text: {
+ variant: 'solid',
+ color: 'warning',
+ size: 'sm',
+ children: t('refreshPaymentStatus'),
+ },
+ } as const satisfies Record<RefreshPaymentStatusType, unknown>;
+
const button = (
<AuthZTooltip
checks={
@@ -48,32 +62,18 @@ function RefreshPaymentStatus({
withPortal={withPortal}
>
<Button
- variant="link"
- color={type === 'text' ? 'none' : 'secondary'}
- size="md"
- className={className}
onClick={handleRefreshPaymentStatus}
prefix={<RefreshCcw size={14} />}
loading={isLoading}
- >
- {type !== 'tooltip' ? t('refreshPaymentStatus') : ''}
- </Button>
+ {...buttonTypes[type || 'button']}
+ />
</AuthZTooltip>
);
- return (
- <span className="refresh-payment-status-btn-wrapper">
- {type === 'tooltip' ? (
- <TooltipSimple title={t('refreshPaymentStatus')}>{button}</TooltipSimple>
- ) : (
- button
- )}
- </span>
- );
+ return <span className="refresh-payment-status-btn-wrapper">{button}</span>;
}
RefreshPaymentStatus.defaultProps = {
type: 'button',
- className: undefined,
withPortal: undefined,
};
diff --git a/frontend/src/components/ResizeTable/DynamicColumnTable.tsx b/frontend/src/components/ResizeTable/DynamicColumnTable.tsx
index b72737b6bf..970e0ff387 100644
--- a/frontend/src/components/ResizeTable/DynamicColumnTable.tsx
+++ b/frontend/src/components/ResizeTable/DynamicColumnTable.tsx
@@ -5,7 +5,7 @@ import type {
TableColumnType as ColumnType,
} from 'antd';
import { Button, Flex } from 'antd';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Switch } from '@signozhq/ui/switch';
import logEvent from 'api/common/logEvent';
import LaunchChatSupport from 'components/LaunchChatSupport/LaunchChatSupport';
@@ -84,9 +84,10 @@ function DynamicColumnTable({
);
};
- const items: MenuItem[] =
+ const items: DropdownItemType[] =
dynamicColumns?.map((column, index) => ({
- key: String(index),
+ type: 'item',
+ value: String(index),
label: (
<div
className="dynamicColumnsTable-items"
@@ -95,6 +96,8 @@ function DynamicColumnTable({
>
<div>{column.title?.toString()}</div>
<Switch
+ color="primary"
+ textPlacement="right"
value={columnsData?.findIndex((c) => c.key === column.key) !== -1}
onChange={onToggleHandler(index, column)}
/>
@@ -128,14 +131,14 @@ function DynamicColumnTable({
<Flex justify="flex-end" align="center" gap={8}>
{facingIssueBtn && <LaunchChatSupport {...facingIssueBtn} />}
{dynamicColumns && (
- <DropdownMenuSimple menu={{ items }}>
+ <Dropdown items={items} nativeButton align="end" side="bottom">
<Button
className="dynamicColumnTable-button filter-btn"
size="middle"
icon={<SlidersHorizontal size={14} />}
data-testid="additional-filters-button"
/>
- </DropdownMenuSimple>
+ </Dropdown>
)}
</Flex>
diff --git a/frontend/src/components/RolesSelect/RolesSelect.tsx b/frontend/src/components/RolesSelect/RolesSelect.tsx
index 3f056a9bc5..b60521ea23 100644
--- a/frontend/src/components/RolesSelect/RolesSelect.tsx
+++ b/frontend/src/components/RolesSelect/RolesSelect.tsx
@@ -152,7 +152,7 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
optionFilterProp="label"
optionRender={(option): JSX.Element => (
<div style={{ pointerEvents: 'none' }}>
- <Checkbox value={value.includes(option.value as string)}>
+ <Checkbox color="primary" value={value.includes(option.value as string)}>
{option.label}
</Checkbox>
</div>
diff --git a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/AddKeyModal.styles.scss b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/AddKeyModal.styles.scss
index 88cb4b64c5..5acb5cb0d2 100644
--- a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/AddKeyModal.styles.scss
+++ b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/AddKeyModal.styles.scss
@@ -36,44 +36,6 @@
}
}
- &__expiry-toggle {
- width: 60%;
- display: flex;
- border: 1px solid var(--l1-border);
- border-radius: 2px;
- overflow: hidden;
- padding: 0;
- gap: 0;
-
- [data-slot='toggle-group'] {
- width: 100%;
- display: flex;
- }
-
- &-btn {
- flex: 1;
- height: 32px;
- border-radius: 0;
- font-size: var(--label-small-400-font-size);
- font-weight: var(--label-small-400-font-weight);
- line-height: var(--label-small-400-line-height);
- justify-content: center;
- background: transparent;
- border: none;
- border-right: 1px solid var(--l1-border);
- color: var(--foreground);
-
- &:last-child {
- border-right: none;
- }
-
- &[data-state='on'] {
- background: var(--l2-background);
- color: var(--l1-foreground);
- }
- }
- }
-
&__datepicker {
width: 100%;
height: 32px;
@@ -125,11 +87,6 @@
font-family: monospace;
}
- &__copy-btn {
- border-left: 1px solid var(--l1-border);
- min-width: 40px;
- }
-
&__expiry-meta {
display: flex;
flex-direction: column;
diff --git a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyCreatedPhase.tsx b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyCreatedPhase.tsx
index 55b26f3285..db7f9b34c3 100644
--- a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyCreatedPhase.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyCreatedPhase.tsx
@@ -24,10 +24,12 @@ function KeyCreatedPhase({
<div className="add-key-modal__key-display">
<span className="add-key-modal__key-text">{createdKey.key}</span>
<Button
+ size="md"
variant="link"
color="secondary"
onClick={onCopy}
- className="add-key-modal__copy-btn"
+ icon
+ aria-label={hasCopied ? 'Copied' : 'Copy key'}
>
{hasCopied ? <Check size={12} /> : <Copy size={12} />}
</Button>
@@ -36,7 +38,9 @@ function KeyCreatedPhase({
<div className="add-key-modal__expiry-meta">
<span className="add-key-modal__expiry-label">Expiration</span>
- <Badge color="vanilla">{expiryLabel}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {expiryLabel}
+ </Badge>
</div>
<div className="add-key-modal__callout-wrapper">
diff --git a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx
index fccc74341f..d47ae9a789 100644
--- a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx
@@ -2,7 +2,7 @@ import type { Control, UseFormRegister } from 'react-hook-form';
import { Controller } from 'react-hook-form';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { DatePicker } from 'antd';
import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
import { AuthZGuardContent } from 'lib/authz/components/AuthZGuard/AuthZGuardContent';
@@ -68,7 +68,9 @@ function KeyFormPhase({
name="expiryMode"
control={control}
render={({ field }): JSX.Element => (
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
value={field.value}
onChange={(val: string): void => {
@@ -77,7 +79,7 @@ function KeyFormPhase({
}
}}
size="sm"
- className="add-key-modal__expiry-toggle"
+ width="60%"
items={[
{ value: ExpiryMode.NONE, label: 'No Expiration' },
{ value: ExpiryMode.DATE, label: 'Set Expiration Date' },
@@ -117,6 +119,7 @@ function KeyFormPhase({
<div className="add-key-modal__footer">
<div className="add-key-modal__footer-right">
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={onClose}
@@ -125,9 +128,9 @@ function KeyFormPhase({
Cancel
</Button>
<AuthZButton
+ size="md"
checks={checks}
authZEnabled={!!accountId}
- withPortal={false}
type="submit"
form={FORM_ID}
variant="solid"
diff --git a/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx b/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx
index bb607b83fc..f349c88605 100644
--- a/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx
@@ -80,21 +80,26 @@ function DeleteAccountModal(): JSX.Element {
const footer = (
<div className="sa-delete-dialog__footer">
- <Button variant="solid" color="secondary" onClick={handleCancel}>
- <X size={12} />
+ <Button
+ size="md"
+ variant="solid"
+ color="secondary"
+ onClick={handleCancel}
+ prefix={<X size={12} />}
+ >
Cancel
</Button>
<AuthZButton
+ size="md"
checks={[buildSADeletePermission(accountId ?? '')]}
authZEnabled={!!accountId}
variant="solid"
- color="destructive"
+ color="danger"
loading={isDeleting}
onClick={handleConfirm}
data-testid="confirm-delete-btn"
- withPortal={false}
+ prefix={<Trash2 size={12} />}
>
- <Trash2 size={12} />
Delete
</AuthZButton>
</div>
diff --git a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx
index 7b8ca5775e..457ae13626 100644
--- a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx
@@ -4,7 +4,7 @@ import { LockKeyhole, Trash2, X } from '@signozhq/icons';
import { Badge } from '@signozhq/ui/badge';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { DatePicker } from 'antd';
import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
@@ -32,6 +32,7 @@ export interface EditKeyFormProps {
onRevokeClick: () => void;
formatTimezoneAdjustedTimestamp: (ts: string, format: string) => string;
canUpdate?: boolean;
+ isUpdateDenied?: boolean;
accountId?: string;
}
@@ -47,6 +48,7 @@ function EditKeyForm({
onRevokeClick,
formatTimezoneAdjustedTimestamp,
canUpdate = true,
+ isUpdateDenied = false,
accountId = '',
}: EditKeyFormProps): JSX.Element {
return (
@@ -103,7 +105,9 @@ function EditKeyForm({
name="expiryMode"
control={control}
render={({ field }): JSX.Element => (
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
value={field.value}
onChange={(val: string): void => {
@@ -113,7 +117,12 @@ function EditKeyForm({
}}
size="sm"
disabled={!canUpdate}
- className="edit-key-modal__expiry-toggle"
+ disabledTooltip={
+ isUpdateDenied
+ ? 'You do not have permission to update this key'
+ : undefined
+ }
+ width="60%"
items={[
{ value: ExpiryMode.NONE, label: 'No Expiration' },
{ value: ExpiryMode.DATE, label: 'Set Expiration Date' },
@@ -150,7 +159,7 @@ function EditKeyForm({
<div className="edit-key-modal__meta">
<span className="edit-key-modal__meta-label">Last Observed At</span>
- <Badge color="vanilla">
+ <Badge textTransform="none" variant="solid" color="secondary">
{formatLastObservedAt(
keyItem?.lastObservedAt ?? null,
formatTimezoneAdjustedTimestamp,
@@ -161,25 +170,31 @@ function EditKeyForm({
<div className="edit-key-modal__footer">
<AuthZButton
+ size="md"
checks={[
buildAPIKeyDeletePermission(keyItem?.id ?? ''),
buildSADetachPermission(accountId ?? ''),
]}
authZEnabled={!!accountId && !!keyItem?.id}
variant="link"
- color="destructive"
+ color="danger"
onClick={onRevokeClick}
- withPortal={false}
+ prefix={<Trash2 size={12} />}
>
- <Trash2 size={12} />
Revoke Key
</AuthZButton>
<div className="edit-key-modal__footer-right">
- <Button variant="solid" color="secondary" onClick={onClose}>
- <X size={12} />
+ <Button
+ size="md"
+ variant="solid"
+ color="secondary"
+ onClick={onClose}
+ prefix={<X size={12} />}
+ >
Cancel
</Button>
<AuthZButton
+ size="md"
checks={[buildAPIKeyUpdatePermission(keyItem?.id ?? '')]}
authZEnabled={!!accountId && !!keyItem?.id}
type="submit"
@@ -188,7 +203,6 @@ function EditKeyForm({
color="primary"
loading={isSaving}
disabled={!isDirty}
- withPortal={false}
>
Save Changes
</AuthZButton>
diff --git a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyModal.styles.scss b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyModal.styles.scss
index a3974a9f42..82a3a1a3a3 100644
--- a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyModal.styles.scss
+++ b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyModal.styles.scss
@@ -77,45 +77,6 @@
opacity: 0.6;
}
- &__expiry-toggle {
- width: 60%;
- display: flex;
- border: 1px solid var(--l1-border);
- border-radius: 2px;
- overflow: hidden;
- padding: 0;
- gap: 0;
-
- [data-slot='toggle-group'] {
- width: 100%;
- display: flex;
- }
-
- &-btn {
- flex: 1;
- height: 32px;
- border-radius: 0;
- font-size: var(--label-small-400-font-size);
- font-weight: var(--label-small-400-font-weight);
- line-height: var(--label-small-400-line-height);
- justify-content: center;
- background: transparent;
- border: none;
- border-right: 1px solid var(--l1-border);
- color: var(--foreground);
- white-space: nowrap;
-
- &:last-child {
- border-right: none;
- }
-
- &[data-state='on'] {
- background: var(--l2-background);
- color: var(--l1-foreground);
- }
- }
- }
-
&__datepicker {
width: 100%;
height: 32px;
diff --git a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx
index c840ffdf47..001604eef8 100644
--- a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx
@@ -76,10 +76,11 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
{ enabled: !!editKeyId },
);
- const canUpdate = isAuthZLoading
- ? false
- : (editPermissions?.[buildAPIKeyUpdatePermission(editKeyId ?? '')]
- ?.isGranted ?? true);
+ const isUpdateDenied =
+ !isAuthZLoading &&
+ editPermissions?.[buildAPIKeyUpdatePermission(editKeyId ?? '')]?.isGranted ===
+ false;
+ const canUpdate = !isAuthZLoading && !isUpdateDenied;
const { mutate: updateKey, isLoading: isSaving } = useUpdateServiceAccountKey({
mutation: {
@@ -206,6 +207,7 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
onRevokeClick={(): void => setIsRevokeConfirmOpen(true)}
formatTimezoneAdjustedTimestamp={formatTimezoneAdjustedTimestamp}
canUpdate={canUpdate}
+ isUpdateDenied={isUpdateDenied}
accountId={selectedAccountId ?? ''}
/>
)}
diff --git a/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx b/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx
index 3cf1815a01..891928ab7f 100644
--- a/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx
@@ -112,25 +112,26 @@ function buildColumns({
style: { cursor: 'default' },
}),
render: (_, record): JSX.Element => {
- const tooltipTitle = isDisabled ? 'Service account disabled' : 'Revoke Key';
return (
- <Tooltip title={tooltipTitle} placement="bottom">
+ <Tooltip title={isDisabled ? undefined : 'Revoke Key'} placement="bottom">
<AuthZButton
checks={[
buildAPIKeyDeletePermission(record.id),
buildSADetachPermission(accountId),
]}
authZEnabled={!isDisabled && !!accountId}
- withPortal={false}
- variant="ghost"
+ variant="solid"
size="sm"
- color="destructive"
+ color="danger"
+ icon
+ aria-label="Revoke Key"
disabled={isDisabled}
+ disabledTooltip={isDisabled ? 'Service account disabled' : undefined}
onClick={(e): void => {
e.stopPropagation();
onRevokeClick(record.id);
}}
- className="keys-tab__revoke-btn"
+ testId="keys-tab-revoke-btn"
>
<X size={12} />
</AuthZButton>
@@ -213,9 +214,9 @@ function KeysTab({
</a>
</p>
<AuthZButton
+ size="md"
checks={[APIKeyCreatePermission, buildSAAttachPermission(accountId)]}
authZEnabled={!isDisabled && !!accountId}
- withPortal={false}
variant="link"
color="primary"
onClick={async (): Promise<void> => {
diff --git a/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx b/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx
index 195dab91df..ec9f5737c3 100644
--- a/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx
@@ -122,11 +122,13 @@ function OverviewTab({
<span className="sa-drawer__input-text">{account.id || '—'}</span>
{account.id && (
<Button
+ size="md"
variant="link"
color="secondary"
onClick={handleCopyId}
- className="sa-drawer__copy-btn"
- data-testid="copy-id-btn"
+ testId="copy-id-btn"
+ icon
+ aria-label={hasCopiedId ? 'Copied' : 'Copy ID'}
>
{hasCopiedId ? <Check size={14} /> : <Copy size={14} />}
</Button>
@@ -156,7 +158,12 @@ function OverviewTab({
localRoles.map((roleId) => {
const role = availableRoles.find((r) => r.id === roleId);
return (
- <Badge key={roleId} color="vanilla">
+ <Badge
+ textTransform="none"
+ variant="solid"
+ key={roleId}
+ color="secondary"
+ >
{role?.name ?? roleId}
</Badge>
);
@@ -187,28 +194,32 @@ function OverviewTab({
<div className="sa-drawer__meta-item">
<span className="sa-drawer__meta-label">Status</span>
{account.status?.toUpperCase() === 'ACTIVE' ? (
- <Badge color="forest" variant="outline">
+ <Badge color="success" variant="outlined">
ACTIVE
</Badge>
) : account.status?.toUpperCase() === 'DELETED' ? (
- <Badge color="cherry" variant="outline">
+ <Badge color="danger" variant="outlined">
DELETED
</Badge>
) : (
- <Badge color="vanilla" variant="outline" className="sa-status-badge">
- {account.status ? account.status.toUpperCase() : 'UNKNOWN'}
+ <Badge color="secondary" variant="outlined">
+ {account.status || 'UNKNOWN'}
</Badge>
)}
</div>
<div className="sa-drawer__meta-item">
<span className="sa-drawer__meta-label">Created At</span>
- <Badge color="vanilla">{formatTimestamp(account.createdAt)}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {formatTimestamp(account.createdAt)}
+ </Badge>
</div>
<div className="sa-drawer__meta-item">
<span className="sa-drawer__meta-label">Updated At</span>
- <Badge color="vanilla">{formatTimestamp(account.updatedAt)}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {formatTimestamp(account.updatedAt)}
+ </Badge>
</div>
</div>
diff --git a/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx b/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx
index 52529f8539..1a3917b7c4 100644
--- a/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx
@@ -41,23 +41,28 @@ export function RevokeKeyFooter({
}: RevokeKeyFooterProps): JSX.Element {
return (
<>
- <Button variant="solid" color="secondary" onClick={onCancel}>
- <X size={12} />
+ <Button
+ size="md"
+ variant="solid"
+ color="secondary"
+ onClick={onCancel}
+ prefix={<X size={12} />}
+ >
Cancel
</Button>
<AuthZButton
+ size="md"
checks={[
buildAPIKeyDeletePermission(keyId ?? ''),
buildSADetachPermission(accountId ?? ''),
]}
authZEnabled={!!accountId && !!keyId}
variant="solid"
- color="destructive"
+ color="danger"
loading={isRevoking}
onClick={onConfirm}
- withPortal={false}
+ prefix={<Trash2 size={12} />}
>
- <Trash2 size={12} />
Revoke Key
</AuthZButton>
</>
diff --git a/frontend/src/components/ServiceAccountDrawer/SaveErrorItem.tsx b/frontend/src/components/ServiceAccountDrawer/SaveErrorItem.tsx
index 8c14e7cdf8..d00ccbe0d0 100644
--- a/frontend/src/components/ServiceAccountDrawer/SaveErrorItem.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/SaveErrorItem.tsx
@@ -40,8 +40,9 @@ function SaveErrorItem({
</span>
{onRetry && !isRetrying && (
<Button
+ size="md"
variant="link"
- color="none"
+ color="secondary"
aria-label="Retry"
onClick={async (e): Promise<void> => {
e.stopPropagation();
@@ -53,6 +54,7 @@ function SaveErrorItem({
setIsRetrying(false);
}
}}
+ icon
>
<RotateCw size={12} color={Color.BG_CHERRY_400} />
</Button>
diff --git a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.styles.scss b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.styles.scss
index fb4db6f1f2..9e6e990601 100644
--- a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.styles.scss
+++ b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.styles.scss
@@ -18,49 +18,6 @@
height: 100%;
}
- &__tab-group {
- [data-slot='toggle-group'] {
- border-radius: 2px;
- background: var(--l2-background);
- gap: 0;
- }
-
- [data-slot='toggle-group-item'] {
- border-radius: 0;
- border-left: 1px solid var(--l1-border);
- background: transparent;
- color: var(--l2-foreground);
- font-size: var(--font-size-xs);
- font-weight: var(--font-weight-normal);
- font-family: Inter, sans-serif;
- padding: 0 var(--padding-7);
- gap: var(--spacing-3);
- box-shadow: none;
- border: none;
-
- &:first-child {
- border-left: none;
- border-radius: 2px 0 0 2px;
- }
-
- &:last-child {
- border-radius: 0 2px 2px 0;
- }
-
- &:hover {
- background: color-mix(in srgb, var(--bg-robin-200) 4%, transparent);
- color: var(--l1-foreground);
- }
-
- &[data-state='on'] {
- background: var(--l1-border);
- color: var(--l1-foreground);
- }
- }
-
- min-width: 220px;
- }
-
&__tab {
display: inline-flex;
align-items: center;
@@ -203,19 +160,6 @@
opacity: 0.6;
}
- &__copy-btn {
- flex-shrink: 0;
- padding: 0;
- height: auto;
- min-height: auto;
- color: var(--foreground);
- opacity: 0.6;
-
- &:hover {
- opacity: 1;
- }
- }
-
&__disabled-roles {
display: flex;
flex-wrap: wrap;
@@ -241,7 +185,6 @@
font-weight: var(--uppercase-small-500-font-weight);
line-height: 100%;
letter-spacing: 0.44px;
- text-transform: uppercase;
}
}
@@ -547,15 +490,6 @@
&__expiry--expired {
color: var(--l3-foreground);
}
-
- &__revoke-btn {
- width: 32px;
- height: 32px;
- padding: 0;
- display: inline-flex;
- align-items: center;
- justify-content: center;
- }
}
.sa-delete-dialog {
diff --git a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx
index 106f763f0e..cf2b8845b0 100644
--- a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx
@@ -10,7 +10,7 @@ import { Key, LayoutGrid, Plus, Trash2, X } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { DrawerWrapper } from '@signozhq/ui/drawer';
import { toast } from '@signozhq/ui/sonner';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Skeleton } from 'antd';
import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
import {
@@ -375,30 +375,35 @@ function ServiceAccountDrawer({
activeTab === ServiceAccountDrawerTab.Overview && !isDeleted && open ? (
<div className="sa-drawer__footer">
<AuthZButton
+ size="md"
checks={[buildSADeletePermission(selectedAccountId ?? '')]}
authZEnabled={!!selectedAccountId}
- withPortal={false}
variant="link"
- color="destructive"
+ color="danger"
onClick={(): void => {
void setIsDeleteOpen(true);
}}
+ prefix={<Trash2 size={12} />}
>
- <Trash2 size={12} />
Delete Service Account
</AuthZButton>
<div className="sa-drawer__footer-right">
- <Button variant="outlined" color="secondary" onClick={handleClose}>
- <X size={14} />
+ <Button
+ size="md"
+ variant="outlined"
+ color="secondary"
+ onClick={handleClose}
+ prefix={<X size={14} />}
+ >
Cancel
</Button>
<AuthZButton
+ size="md"
checks={[
buildSAReadPermission(selectedAccountId ?? ''),
buildSAUpdatePermission(selectedAccountId ?? ''),
]}
authZEnabled={!!selectedAccountId}
- withPortal={false}
variant="solid"
color="primary"
loading={isSaving}
@@ -426,7 +431,9 @@ function ServiceAccountDrawer({
const body = (
<div className="sa-drawer__layout">
<div className="sa-drawer__tabs">
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
value={activeTab}
size="sm"
@@ -439,28 +446,20 @@ function ServiceAccountDrawer({
}
}
}}
- className="sa-drawer__tab-group"
items={[
{
value: ServiceAccountDrawerTab.Overview,
- label: (
- <>
- <LayoutGrid size={14} />
- Overview
- </>
- ),
+ label: 'Overview',
+ prefix: <LayoutGrid size={14} />,
},
{
value: ServiceAccountDrawerTab.Keys,
- label: (
- <>
- <Key size={14} />
- Keys
- {keys.length > 0 && (
- <span className="sa-drawer__tab-count">{keys.length}</span>
- )}
- </>
- ),
+ label: 'Keys',
+ prefix: <Key size={14} />,
+ suffix:
+ keys.length > 0 ? (
+ <span className="sa-drawer__tab-count">{keys.length}</span>
+ ) : undefined,
},
]}
/>
@@ -471,7 +470,6 @@ function ServiceAccountDrawer({
buildSAAttachPermission(selectedAccountId ?? ''),
]}
authZEnabled={!isDeleted && !!selectedAccountId}
- withPortal={false}
variant="outlined"
size="sm"
color="secondary"
@@ -479,8 +477,8 @@ function ServiceAccountDrawer({
onClick={(): void => {
void setIsAddKeyOpen(true);
}}
+ prefix={<Plus size={12} />}
>
- <Plus size={12} />
Add Key
</AuthZButton>
)}
diff --git a/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx b/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx
index 5047e1d0b9..3dba32a261 100644
--- a/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx
@@ -7,6 +7,7 @@ import {
} from 'lib/authz/utils/authz-test-utils';
import { rest, server } from 'mocks-server/server';
import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { submitImplicitly } from 'tests/submitImplicitly';
import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import AddKeyModal from '../AddKeyModal';
@@ -76,13 +77,17 @@ describe('AddKeyModal', () => {
const nameInput = await screen.findByTestId('add-key-name-input');
const createBtn = await screen.findByTestId('add-key-submit-btn');
- expect(createBtn).toBeDisabled();
+ expect(createBtn).toHaveAttribute('aria-disabled', 'true');
await user.type(nameInput, 'My Key');
- await waitFor(() => expect(createBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(createBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.clear(nameInput);
- await waitFor(() => expect(createBtn).toBeDisabled());
+ await waitFor(() =>
+ expect(createBtn).toHaveAttribute('aria-disabled', 'true'),
+ );
});
it('successful creation transitions to phase 2 with key displayed and security callout', async () => {
@@ -92,7 +97,9 @@ describe('AddKeyModal', () => {
const nameInput = await screen.findByTestId('add-key-name-input');
const submitBtn = await screen.findByTestId('add-key-submit-btn');
await user.type(nameInput, 'Deploy Key');
- await waitFor(() => expect(submitBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(submitBtn);
await screen.findByText('snz_abc123xyz456secret');
@@ -100,6 +107,33 @@ describe('AddKeyModal', () => {
expect(screen.getByTestId('add-key-modal')).toBeInTheDocument();
});
+ it('pressing Enter again while creating sends one request', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ let requests = 0;
+ server.use(
+ rest.post(SA_KEYS_ENDPOINT, (_, res, ctx) => {
+ requests += 1;
+ return res(ctx.delay(100), ctx.status(201), ctx.json(createdKeyResponse));
+ }),
+ );
+ renderModal();
+
+ const nameInput =
+ await screen.findByTestId<HTMLInputElement>('add-key-name-input');
+ const submitBtn = await screen.findByTestId('add-key-submit-btn');
+ await user.type(nameInput, 'Deploy Key');
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
+
+ submitImplicitly(nameInput);
+ await waitFor(() => expect(submitBtn).toHaveAttribute('aria-busy', 'true'));
+ submitImplicitly(nameInput);
+
+ await screen.findByText('snz_abc123xyz456secret');
+ expect(requests).toBe(1);
+ });
+
it('copy button writes key to clipboard and shows toast.success', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
@@ -108,7 +142,9 @@ describe('AddKeyModal', () => {
const nameInput = await screen.findByTestId('add-key-name-input');
const submitBtn = await screen.findByTestId('add-key-submit-btn');
await user.type(nameInput, 'Deploy Key');
- await waitFor(() => expect(submitBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(submitBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(submitBtn);
await screen.findByText('snz_abc123xyz456secret');
@@ -151,7 +187,10 @@ describe('AddKeyModal', () => {
).resolves.toBeInTheDocument();
// The footer lives outside the guard: submit is gated, Cancel still works.
- expect(screen.getByTestId('add-key-submit-btn')).toBeDisabled();
+ expect(screen.getByTestId('add-key-submit-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.click(screen.getByTestId('add-key-cancel-btn'));
diff --git a/frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx b/frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx
index bcbe46c57d..b728331a40 100644
--- a/frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx
@@ -1,9 +1,13 @@
import { toast } from '@signozhq/ui/sonner';
import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
+import {
+ AUTHZ_CHECK_URL,
+ setupAuthzAdmin,
+} from 'lib/authz/utils/authz-test-utils';
import { rest, server } from 'mocks-server/server';
import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
+import { submitImplicitly } from 'tests/submitImplicitly';
+import { act, render, screen, userEvent, waitFor } from 'tests/test-utils';
import EditKeyModal from '../EditKeyModal';
@@ -82,7 +86,23 @@ describe('EditKeyModal (URL-controlled)', () => {
await expect(
screen.findByDisplayValue('Original Key Name'),
).resolves.toBeInTheDocument();
- expect(screen.getByRole('button', { name: /Save Changes/i })).toBeDisabled();
+ expect(screen.getByRole('button', { name: /Save Changes/i })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ });
+
+ it('does not show the denial tooltip while the permission check is pending', async () => {
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.delay('infinite'))),
+ );
+ renderModal();
+
+ await screen.findByText('key-1');
+
+ expect(
+ screen.queryByText('You do not have permission to update this key'),
+ ).not.toBeInTheDocument();
});
it('save calls update API, shows toast, and closes modal', async () => {
@@ -104,6 +124,56 @@ describe('EditKeyModal (URL-controlled)', () => {
});
});
+ it('pressing Enter again while saving sends one request', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ let requests = 0;
+ server.use(
+ rest.put(SA_KEY_ENDPOINT, (_, res, ctx) => {
+ requests += 1;
+ return res(
+ ctx.delay(100),
+ ctx.status(200),
+ ctx.json({ status: 'success', data: {} }),
+ );
+ }),
+ );
+ renderModal();
+
+ const nameInput =
+ await screen.findByPlaceholderText<HTMLInputElement>(/Enter key name/i);
+ await user.clear(nameInput);
+ await user.type(nameInput, 'Updated Key Name');
+ const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
+
+ submitImplicitly(nameInput);
+ await waitFor(() => expect(saveBtn).toHaveAttribute('aria-busy', 'true'));
+ submitImplicitly(nameInput);
+
+ await waitFor(() => {
+ expect(mockToast.success).toHaveBeenCalledWith('Key updated successfully');
+ });
+ expect(requests).toBe(1);
+ });
+
+ it('pressing Enter without changes does not save', async () => {
+ let requests = 0;
+ server.use(
+ rest.put(SA_KEY_ENDPOINT, (_, res, ctx) => {
+ requests += 1;
+ return res(ctx.status(200), ctx.json({ status: 'success', data: {} }));
+ }),
+ );
+ renderModal();
+
+ const nameInput =
+ await screen.findByDisplayValue<HTMLInputElement>('Original Key Name');
+ submitImplicitly(nameInput);
+
+ await act(() => new Promise((resolve) => setTimeout(resolve, 200)));
+ expect(requests).toBe(0);
+ expect(screen.getByTestId('edit-key-modal')).toBeInTheDocument();
+ });
+
it('cancel clears edit-key param and closes modal', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
const onUrlUpdate = jest.fn();
diff --git a/frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx b/frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx
index e88db848f9..f1268d513e 100644
--- a/frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx
@@ -156,9 +156,7 @@ describe('KeysTab', () => {
// Wait for authz to complete and table to render
await screen.findByText('Production Key');
- const revokeBtns = screen
- .getAllByRole('button')
- .filter((btn) => btn.className.includes('keys-tab__revoke-btn'));
+ const revokeBtns = screen.getAllByTestId('keys-tab-revoke-btn');
await user.click(revokeBtns[0]);
expect(onUrlUpdate).toHaveBeenCalledWith(
@@ -175,9 +173,7 @@ describe('KeysTab', () => {
// Wait for authz to complete and table to render
await screen.findByText('Production Key');
- const revokeBtns = screen
- .getAllByRole('button')
- .filter((btn) => btn.className.includes('keys-tab__revoke-btn'));
+ const revokeBtns = screen.getAllByTestId('keys-tab-revoke-btn');
await user.click(revokeBtns[0]);
const confirmBtn = await screen.findByRole('button', { name: /Revoke Key/i });
@@ -193,9 +189,9 @@ describe('KeysTab', () => {
// Wait for authz to complete and table to render
await screen.findByText('Production Key');
- const revokeBtns = screen
- .getAllByRole('button')
- .filter((btn) => btn.className.includes('keys-tab__revoke-btn'));
- revokeBtns.forEach((btn) => expect(btn).toBeDisabled());
+ const revokeBtns = screen.getAllByTestId('keys-tab-revoke-btn');
+ revokeBtns.forEach((btn) =>
+ expect(btn).toHaveAttribute('aria-disabled', 'true'),
+ );
});
});
diff --git a/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.authz.test.tsx b/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.authz.test.tsx
index f8fef2dc1a..91798d1eed 100644
--- a/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.authz.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.authz.test.tsx
@@ -126,6 +126,8 @@ describe('ServiceAccountDrawer — permissions', () => {
const deleteBtn = screen.getByRole('button', {
name: /Delete Service Account/i,
});
- await waitFor(() => expect(deleteBtn).toBeDisabled());
+ await waitFor(() =>
+ expect(deleteBtn).toHaveAttribute('aria-disabled', 'true'),
+ );
});
});
diff --git a/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.test.tsx b/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.test.tsx
index 18efebf2a0..264933855b 100644
--- a/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.test.tsx
@@ -93,7 +93,10 @@ describe('ServiceAccountDrawer', () => {
screen.findByDisplayValue('CI Bot'),
).resolves.toBeInTheDocument();
expect(screen.getByText('[email protected]')).toBeInTheDocument();
- expect(screen.getByRole('button', { name: /Save Changes/i })).toBeDisabled();
+ expect(screen.getByRole('button', { name: /Save Changes/i })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('editing name enables Save; clicking Save sends correct payload and calls onSuccess', async () => {
@@ -119,7 +122,9 @@ describe('ServiceAccountDrawer', () => {
await user.type(nameInput, 'CI Bot Updated');
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -160,7 +165,9 @@ describe('ServiceAccountDrawer', () => {
await user.click(await screen.findByTitle('signoz-viewer'));
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -205,7 +212,9 @@ describe('ServiceAccountDrawer', () => {
await user.click(removeBtn);
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await waitFor(() => {
@@ -279,9 +288,9 @@ describe('ServiceAccountDrawer', () => {
await screen.findByDisplayValue('CI Bot');
- await user.click(screen.getByRole('radio', { name: /Keys/i }));
+ await user.click(screen.getByRole('button', { name: /Keys/i }));
- await screen.findByText(/No keys/i);
+ await expect(screen.findByText(/No keys/i)).resolves.toBeInTheDocument();
});
it('shows error state when account fetch fails', async () => {
@@ -359,7 +368,9 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.type(nameInput, 'New Name');
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await expect(
@@ -395,7 +406,9 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.click(await screen.findByTitle('signoz-viewer'));
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await expect(
@@ -431,7 +444,9 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.click(await screen.findByTitle('signoz-viewer'));
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
// Retried after 429 — at least 2 calls, no error shown
@@ -469,7 +484,9 @@ describe('ServiceAccountDrawer – save-error UX', () => {
await user.type(nameInput, 'Retry Test');
const saveBtn = screen.getByRole('button', { name: /Save Changes/i });
- await waitFor(() => expect(saveBtn).not.toBeDisabled());
+ await waitFor(() =>
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(saveBtn);
await screen.findByText(/Name update.*name update failed/i, undefined, {
diff --git a/frontend/src/components/ServiceAccountsTable/ServiceAccountsTable.styles.scss b/frontend/src/components/ServiceAccountsTable/ServiceAccountsTable.styles.scss
index 1a22b4dc09..e04212324f 100644
--- a/frontend/src/components/ServiceAccountsTable/ServiceAccountsTable.styles.scss
+++ b/frontend/src/components/ServiceAccountsTable/ServiceAccountsTable.styles.scss
@@ -77,18 +77,6 @@
flex: none;
}
}
-
- .sa-status-cell {
- [data-slot='badge'] {
- padding: var(--padding-1) var(--padding-2);
- align-items: center;
- font-size: var(--uppercase-small-500-font-size);
- font-weight: var(--uppercase-small-500-font-weight);
- line-height: 100%;
- letter-spacing: 0.44px;
- text-transform: uppercase;
- }
- }
}
.sa-name-email-cell {
diff --git a/frontend/src/components/ServiceAccountsTable/utils.tsx b/frontend/src/components/ServiceAccountsTable/utils.tsx
index 71d2bb1da3..efc24a40db 100644
--- a/frontend/src/components/ServiceAccountsTable/utils.tsx
+++ b/frontend/src/components/ServiceAccountsTable/utils.tsx
@@ -28,21 +28,21 @@ export function NameEmailCell({
export function StatusBadge({ status }: { status: string }): JSX.Element {
if (status?.toUpperCase() === 'ACTIVE') {
return (
- <Badge color="forest" variant="outline">
+ <Badge color="success" variant="outlined">
ACTIVE
</Badge>
);
}
if (status?.toUpperCase() === 'DELETED') {
return (
- <Badge color="cherry" variant="outline">
+ <Badge color="danger" variant="outlined">
DELETED
</Badge>
);
}
return (
- <Badge color="vanilla" variant="outline" className="sa-status-badge">
- {status ? status.toUpperCase() : 'UNKNOWN'}
+ <Badge color="secondary" variant="outlined">
+ {status || 'UNKNOWN'}
</Badge>
);
}
diff --git a/frontend/src/components/SignozModal/stories/SignozModal.stories.tsx b/frontend/src/components/SignozModal/stories/SignozModal.stories.tsx
index 8b18b8c510..68203131d9 100644
--- a/frontend/src/components/SignozModal/stories/SignozModal.stories.tsx
+++ b/frontend/src/components/SignozModal/stories/SignozModal.stories.tsx
@@ -13,7 +13,13 @@ function ModalFixture(): JSX.Element {
return (
<>
- <Button data-testid="open-signoz-modal" onClick={(): void => setOpen(true)}>
+ <Button
+ size="md"
+ variant="solid"
+ color="primary"
+ testId="open-signoz-modal"
+ onClick={(): void => setOpen(true)}
+ >
Open modal
</Button>
<SignozModal
diff --git a/frontend/src/components/SignozRadioGroup/SignozRadioGroup.styles.scss b/frontend/src/components/SignozRadioGroup/SignozRadioGroup.styles.scss
index f6077858c3..f2c4359392 100644
--- a/frontend/src/components/SignozRadioGroup/SignozRadioGroup.styles.scss
+++ b/frontend/src/components/SignozRadioGroup/SignozRadioGroup.styles.scss
@@ -1,64 +1,6 @@
-.signoz-radio-group {
- color: var(--l2-foreground);
-
- .view-title {
- display: flex;
- gap: var(--margin-2);
- align-items: center;
- justify-content: center;
- font-size: var(--font-size-xs);
- font-style: normal;
- font-weight: var(--font-weight-normal);
- }
-
- .view-title-container {
- display: flex;
- align-items: center;
- gap: 6px;
- justify-content: center;
-
- .icon-container {
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- > button {
- border: 1px solid var(--l1-border);
- background: var(--l1-background);
-
- &:hover {
- color: var(--l1-foreground);
- }
- &::before {
- background: var(--l1-border);
- }
-
- &[data-state='on'] {
- &,
- &:hover {
- background: var(--l3-background);
- color: var(--l1-foreground);
- border: 1px solid var(--l1-border);
- }
- &::before {
- background: var(--l3-background);
- border-left: 1px solid var(--l1-border);
- }
- }
-
- &[disabled],
- &[data-disabled] {
- background: var(--l2-background) !important;
- border-color: var(--l1-border) !important;
- color: var(--l1-foreground) !important;
-
- &:hover {
- background: var(--l2-background) !important;
- border-color: var(--l1-border) !important;
- color: var(--l1-foreground) !important;
- }
- }
- }
+.view-title-container {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ justify-content: center;
}
diff --git a/frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx b/frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx
index ed9a6a80c9..46c7b7b6f5 100644
--- a/frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx
+++ b/frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx
@@ -1,4 +1,4 @@
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import './SignozRadioGroup.styles.scss';
@@ -12,40 +12,39 @@ interface SignozRadioGroupProps {
value: string;
options: Option[];
onChange: (value: string) => void;
- className?: string;
disabled?: boolean;
+ disabledTooltip?: string;
}
function SignozRadioGroup({
value,
options,
onChange,
- className = '',
disabled = false,
+ disabledTooltip,
}: SignozRadioGroupProps): JSX.Element {
return (
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
value={value}
- className={`signoz-radio-group ${className}`}
onChange={onChange}
disabled={disabled}
+ disabledTooltip={disabledTooltip}
items={options.map((option) => ({
value: option.value,
- label: (
- <div className="view-title-container">
- {option.icon && <div className="icon-container">{option.icon}</div>}
- {option.label}
- </div>
- ),
+ label: <div className="view-title-container">{option.label}</div>,
+ prefix: option.icon ? <>{option.icon}</> : undefined,
}))}
/>
);
}
SignozRadioGroup.defaultProps = {
- className: '',
disabled: false,
+ disabledTooltip: undefined,
};
export default SignozRadioGroup;
diff --git a/frontend/src/components/TableRenderer/BadgeWithTooltip.tsx b/frontend/src/components/TableRenderer/BadgeWithTooltip.tsx
index fee7d590dc..37b431eea3 100644
--- a/frontend/src/components/TableRenderer/BadgeWithTooltip.tsx
+++ b/frontend/src/components/TableRenderer/BadgeWithTooltip.tsx
@@ -12,7 +12,7 @@ function BadgeWithTooltip({
return (
<div key={label}>
<Tooltip title={tooltipTitle}>
- <Badge className="label-column--tag" color="vanilla">
+ <Badge textTransform="none" variant="solid" color="secondary">
{getLabelRenderingValue(label, value && value[label])}
</Badge>
</Tooltip>
diff --git a/frontend/src/components/TableRenderer/LabelColumn.styles.scss b/frontend/src/components/TableRenderer/LabelColumn.styles.scss
index 7edcca9e1b..c1d1e7ab74 100644
--- a/frontend/src/components/TableRenderer/LabelColumn.styles.scss
+++ b/frontend/src/components/TableRenderer/LabelColumn.styles.scss
@@ -1,9 +1,5 @@
.label-column {
display: flex;
flex-wrap: wrap;
-
- .label-column--tag {
- white-space: normal;
- margin: 0.2rem 0.2rem;
- }
+ gap: 0.4rem;
}
diff --git a/frontend/src/components/TableRenderer/LabelColumn.tsx b/frontend/src/components/TableRenderer/LabelColumn.tsx
index 74a544c3fa..65cd8006b0 100644
--- a/frontend/src/components/TableRenderer/LabelColumn.tsx
+++ b/frontend/src/components/TableRenderer/LabelColumn.tsx
@@ -27,7 +27,7 @@ function LabelColumn({ labels, value }: LabelColumnProps): JSX.Element {
{labels.map(
(label: string): JSX.Element => (
<div key={label}>
- <Badge className="label-column--tag" color="vanilla">
+ <Badge textTransform="none" variant="solid" color="secondary">
{getLabelAndValueContent(label, value && value[label])}
</Badge>
</div>
@@ -37,7 +37,7 @@ function LabelColumn({ labels, value }: LabelColumnProps): JSX.Element {
}
trigger="hover"
>
- <Badge className="label-column--tag" color="vanilla">
+ <Badge variant="solid" color="secondary">
+{remainingLabels.length}
</Badge>
</Popover>
diff --git a/frontend/src/components/TagBadge/TagBadge.module.scss b/frontend/src/components/TagBadge/TagBadge.module.scss
deleted file mode 100644
index b840854aa0..0000000000
--- a/frontend/src/components/TagBadge/TagBadge.module.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.static {
- // Tag chips are not interactive, but the @signozhq Badge darkens outline
- // variants on hover — which reads as clickable. Pin the hover background to the
- // resting background so hovering a plain tag produces no change.
- --badge-outline-hover-background-color: var(
- --badge-outline-background-color,
- color-mix(in oklab, var(--badge-background) 10%, transparent)
- );
-
- cursor: default;
-}
diff --git a/frontend/src/components/TagBadge/TagBadge.tsx b/frontend/src/components/TagBadge/TagBadge.tsx
index 8b31ee0d76..018996ba11 100644
--- a/frontend/src/components/TagBadge/TagBadge.tsx
+++ b/frontend/src/components/TagBadge/TagBadge.tsx
@@ -1,33 +1,21 @@
-import { type MouseEvent, type ReactNode } from 'react';
-import { Badge } from '@signozhq/ui/badge';
-import cx from 'classnames';
-
-import styles from './TagBadge.module.scss';
+import { type ReactNode } from 'react';
+import { Badge, type BadgeProps } from '@signozhq/ui/badge';
interface TagBadgeProps {
children: ReactNode;
- // Show a remove button (editable contexts: create modal, settings drawer).
- closable?: boolean;
- onClose?: (event: MouseEvent<HTMLButtonElement>) => void;
- className?: string;
+ maxWidth?: BadgeProps['maxWidth'];
}
-// The single sienna tag chip used everywhere dashboards render tags — list rows,
-// the details header, and the tag editors. Kept as one component so the tag
+// The single sienna tag chip used wherever dashboards display tags — list rows
+// and the details header. Kept as one component so the tag
// styling stays identical across all of them.
-function TagBadge({
- children,
- closable,
- onClose,
- className,
-}: TagBadgeProps): JSX.Element {
+function TagBadge({ children, maxWidth }: TagBadgeProps): JSX.Element {
return (
<Badge
- color="sienna"
- variant="outline"
- className={cx(styles.static, className)}
- closable={closable}
- onClose={onClose}
+ textTransform="none"
+ color="archive"
+ variant="outlined"
+ maxWidth={maxWidth}
>
{children}
</Badge>
diff --git a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.module.scss b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.module.scss
index e0b5b1bbdf..3b5e314819 100644
--- a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.module.scss
+++ b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.module.scss
@@ -15,28 +15,6 @@
border: 1px solid var(--l2-border);
}
-// Sienna chip via the @signozhq Badge; this only constrains its width.
-.tag {
- max-width: 240px;
-}
-
-// The tag label is a bare, chrome-less button inside the Badge (double-click to
-// edit); strip its Button styling and let it ellipsize.
-.tagLabel {
- --button-height: auto;
- --button-padding: 0;
- --button-gap: 0;
- --button-variant-ghost-background-color: transparent;
- --button-variant-ghost-hover-background-color: transparent;
- --button-variant-ghost-color: currentColor;
- --button-variant-ghost-hover-color: currentColor;
- overflow: hidden;
- max-width: 200px;
- text-overflow: ellipsis;
- white-space: nowrap;
- cursor: text;
-}
-
.input {
flex: 1;
min-width: 120px;
diff --git a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.test.tsx b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.test.tsx
index 75d09d4688..4918b739a0 100644
--- a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.test.tsx
+++ b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.test.tsx
@@ -8,7 +8,7 @@ const TID = 'tag-key-value-input';
type User = ReturnType<typeof userEvent.setup>;
const startEditingFirstChip = async (user: User): Promise<HTMLElement> => {
- await user.dblClick(screen.getAllByTestId(`${TID}-chip`)[0]);
+ await user.click(screen.getAllByTestId(`${TID}-chip`)[0]);
return screen.getByTestId(`${TID}-edit`);
};
diff --git a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.tsx b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.tsx
index 873746be92..337ec21af6 100644
--- a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.tsx
+++ b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.tsx
@@ -1,10 +1,9 @@
import { type ChangeEvent, type KeyboardEvent, useState } from 'react';
-import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
+import { Pill } from '@signozhq/ui/pill';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
-import TagBadge from '../TagBadge/TagBadge';
import { validateTag } from './utils';
import styles from './TagKeyValueInput.module.scss';
@@ -21,7 +20,7 @@ interface TagKeyValueInputProps {
// Strict key:value tag editor. A tag is committed only on Enter and only when
// it parses to a valid `key:value` pair — bare values are rejected with an
-// inline error. Existing chips can be edited inline (double-click), and removed.
+// inline error. Existing chips can be edited inline (click), and removed.
function TagKeyValueInput({
tags,
onTagsChange,
@@ -132,23 +131,15 @@ function TagKeyValueInput({
onBlur={(): void => commitEdit(true)}
/>
) : (
- <TagBadge
+ <Pill.Closeable
key={tag}
- className={styles.tag}
- closable
+ maxWidth={240}
+ testId={`${testId}-chip`}
+ onClick={(): void => startEdit(index)}
onClose={(): void => removeTag(tag)}
>
- <Button
- variant="ghost"
- color="secondary"
- className={styles.tagLabel}
- title="Double-click to edit"
- testId={`${testId}-chip`}
- onDoubleClick={(): void => startEdit(index)}
- >
- {tag}
- </Button>
- </TagBadge>
+ {tag}
+ </Pill.Closeable>
),
)}
<Input
diff --git a/frontend/src/components/TanStackTableView/TanStackHoverTooltip.tsx b/frontend/src/components/TanStackTableView/TanStackHoverTooltip.tsx
index 819a46f6e2..7a09add626 100644
--- a/frontend/src/components/TanStackTableView/TanStackHoverTooltip.tsx
+++ b/frontend/src/components/TanStackTableView/TanStackHoverTooltip.tsx
@@ -1,14 +1,10 @@
-import { type ReactNode, useLayoutEffect, useMemo } from 'react';
+import { type ReactNode, useLayoutEffect } from 'react';
import { chromePerformanceTanstackTableEndHover } from './perfDevtools';
import { useIsRowHovered } from './TanStackTableStateContext';
-import {
- TooltipContentProps,
- TooltipSimple,
- TooltipSimpleProps,
-} from '@signozhq/ui/tooltip';
+import { Tooltip, TooltipProps } from '@signozhq/ui/tooltip';
-export type HoverTooltipProps = Omit<TooltipSimpleProps, 'open'> & {
+export type HoverTooltipProps = Omit<TooltipProps, 'open'> & {
rowId: string;
children: ReactNode;
};
@@ -26,28 +22,9 @@ export function TanStackHoverTooltip({
}
}, [isHovered, rowId]);
- const tooltipContentProps = useMemo(
- () =>
- ({
- onPointerDownOutside: (e): void => {
- e.preventDefault();
- e.stopPropagation();
- },
- }) satisfies TooltipContentProps,
- [],
- );
-
if (!isHovered) {
return <>{children}</>;
}
- return (
- <TooltipSimple
- delayDuration={700}
- tooltipContentProps={tooltipContentProps}
- {...tooltipProps}
- >
- {children}
- </TooltipSimple>
- );
+ return <Tooltip {...tooltipProps}>{children}</Tooltip>;
}
diff --git a/frontend/src/components/TanStackTableView/TanStackTable.tsx b/frontend/src/components/TanStackTableView/TanStackTable.tsx
index 768b24bb1b..36ca78aee3 100644
--- a/frontend/src/components/TanStackTableView/TanStackTable.tsx
+++ b/frontend/src/components/TanStackTableView/TanStackTable.tsx
@@ -18,7 +18,6 @@ import {
SortableContext,
} from '@dnd-kit/sortable';
import { ComboboxSimple } from '@signozhq/ui/combobox';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { Pagination } from '@signozhq/ui/pagination';
import type { Row } from '@tanstack/react-table';
import {
@@ -587,110 +586,108 @@ function TanStackTableInner<TData, TItemKey = string>(
isInfiniteScrollMode={isInfiniteScrollMode}
/>
<ColumnVisibilitySync visibility={effectiveVisibility} />
- <TooltipProvider>
- {disableVirtualScroll ? (
- <div
- className={virtuosoClassName}
- {...restTableScrollerProps}
- data-testid={testId}
- >
- <table className={tableStyles.tanStackTable} style={virtuosoTableStyle}>
- <VirtuosoTableColGroup columns={effectiveColumns} table={table} />
- <thead>{tableHeader()}</thead>
- <tbody>
- {(isLoading && data.length === 0
- ? flatItems.slice(0, skeletonRowCount)
- : flatItems
- ).map((item, index) => (
- <TanStackCustomTableRow
- key={
- item.kind === 'expansion' ? `${item.row.id}-expansion` : item.row.id
- }
- item={item}
- context={virtuosoContext}
- data-index={index}
- data-item-index={index}
- data-known-size={0}
- />
- ))}
- </tbody>
- </table>
- </div>
- ) : (
- <TableVirtuoso<FlatItem<TData>, TableRowContext<TData, TItemKey>>
- className={virtuosoClassName}
- ref={virtuosoRef}
- {...restTableScrollerProps}
- data={flatItems}
- totalCount={flatItems.length}
- context={virtuosoContext}
- increaseViewportBy={INCREASE_VIEWPORT_BY}
- initialTopMostItemIndex={
- flatIndexForActiveRow >= 0 ? flatIndexForActiveRow : 0
- }
- fixedHeaderContent={tableHeader}
- style={virtuosoTableStyle}
- components={virtuosoComponents}
- endReached={onEndReached ? handleEndReached : undefined}
- data-testid={testId}
- />
- )}
- {showInfiniteScrollLoader && (
- <div
- className={viewStyles.tanstackLoadingOverlay}
- data-testid="tanstack-infinite-loader"
- >
- <Spin
- indicator={<Loader className="animate-spin" />}
- tip="Loading more..."
- />
- </div>
- )}
- {showPagination && pagination && (
- <div className={cx(viewStyles.paginationContainer, paginationClassname)}>
- {prefixPaginationContent}
- {pagination.showTotalCount && effectiveTotalCount > 0 && (
- <span
- className={viewStyles.paginationTotalCount}
- data-testid="pagination-total-count"
- >
- Showing {(page - 1) * limit + 1} -{' '}
- {Math.min(page * limit, effectiveTotalCount)} of {effectiveTotalCount}
- {pagination.totalCountLabel ? ` ${pagination.totalCountLabel}` : ''}
- </span>
- )}
- <Pagination
- current={page}
- pageSize={limit}
- total={effectiveTotalCount}
- onPageChange={(p): void => {
- setPage(p);
- pagination.onPageChange?.(p);
- }}
- />
- {pagination.showPageSize !== false && (
- <div className={viewStyles.paginationPageSize}>
- <ComboboxSimple
- testId="pagination-page-size"
- value={limit?.toString()}
- defaultValue="10"
- onChange={(value): void => {
- value ??= '10';
- setLimit(+value);
- pagination.onLimitChange?.(+value);
- if (page !== 1) {
- setPage(1);
- pagination.onPageChange?.(1);
- }
- }}
- items={pageSizeItems}
+ {disableVirtualScroll ? (
+ <div
+ className={virtuosoClassName}
+ {...restTableScrollerProps}
+ data-testid={testId}
+ >
+ <table className={tableStyles.tanStackTable} style={virtuosoTableStyle}>
+ <VirtuosoTableColGroup columns={effectiveColumns} table={table} />
+ <thead>{tableHeader()}</thead>
+ <tbody>
+ {(isLoading && data.length === 0
+ ? flatItems.slice(0, skeletonRowCount)
+ : flatItems
+ ).map((item, index) => (
+ <TanStackCustomTableRow
+ key={
+ item.kind === 'expansion' ? `${item.row.id}-expansion` : item.row.id
+ }
+ item={item}
+ context={virtuosoContext}
+ data-index={index}
+ data-item-index={index}
+ data-known-size={0}
/>
- </div>
- )}
- {suffixPaginationContent}
- </div>
- )}
- </TooltipProvider>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ ) : (
+ <TableVirtuoso<FlatItem<TData>, TableRowContext<TData, TItemKey>>
+ className={virtuosoClassName}
+ ref={virtuosoRef}
+ {...restTableScrollerProps}
+ data={flatItems}
+ totalCount={flatItems.length}
+ context={virtuosoContext}
+ increaseViewportBy={INCREASE_VIEWPORT_BY}
+ initialTopMostItemIndex={
+ flatIndexForActiveRow >= 0 ? flatIndexForActiveRow : 0
+ }
+ fixedHeaderContent={tableHeader}
+ style={virtuosoTableStyle}
+ components={virtuosoComponents}
+ endReached={onEndReached ? handleEndReached : undefined}
+ data-testid={testId}
+ />
+ )}
+ {showInfiniteScrollLoader && (
+ <div
+ className={viewStyles.tanstackLoadingOverlay}
+ data-testid="tanstack-infinite-loader"
+ >
+ <Spin
+ indicator={<Loader className="animate-spin" />}
+ tip="Loading more..."
+ />
+ </div>
+ )}
+ {showPagination && pagination && (
+ <div className={cx(viewStyles.paginationContainer, paginationClassname)}>
+ {prefixPaginationContent}
+ {pagination.showTotalCount && effectiveTotalCount > 0 && (
+ <span
+ className={viewStyles.paginationTotalCount}
+ data-testid="pagination-total-count"
+ >
+ Showing {(page - 1) * limit + 1} -{' '}
+ {Math.min(page * limit, effectiveTotalCount)} of {effectiveTotalCount}
+ {pagination.totalCountLabel ? ` ${pagination.totalCountLabel}` : ''}
+ </span>
+ )}
+ <Pagination
+ current={page}
+ pageSize={limit}
+ total={effectiveTotalCount}
+ onPageChange={(p): void => {
+ setPage(p);
+ pagination.onPageChange?.(p);
+ }}
+ />
+ {pagination.showPageSize !== false && (
+ <div className={viewStyles.paginationPageSize}>
+ <ComboboxSimple
+ testId="pagination-page-size"
+ value={limit?.toString()}
+ defaultValue="10"
+ onChange={(value): void => {
+ value ??= '10';
+ setLimit(+value);
+ pagination.onLimitChange?.(+value);
+ if (page !== 1) {
+ setPage(1);
+ pagination.onPageChange?.(1);
+ }
+ }}
+ items={pageSizeItems}
+ />
+ </div>
+ )}
+ {suffixPaginationContent}
+ </div>
+ )}
</TanStackTableStateProvider>
</div>
);
diff --git a/frontend/src/components/TanStackTableView/__tests__/testUtils.tsx b/frontend/src/components/TanStackTableView/__tests__/testUtils.tsx
index 58f2460de6..5e936dfdca 100644
--- a/frontend/src/components/TanStackTableView/__tests__/testUtils.tsx
+++ b/frontend/src/components/TanStackTableView/__tests__/testUtils.tsx
@@ -1,6 +1,5 @@
import { ReactNode } from 'react';
import { VirtuosoMockContext } from 'react-virtuoso';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { render, RenderResult } from '@testing-library/react';
import { NuqsTestingAdapter, OnUrlUpdateFunction } from 'nuqs/adapters/testing';
@@ -64,9 +63,7 @@ export function renderTanStackTable<T = TestRow, TItemKey = string>(
<VirtuosoMockContext.Provider
value={{ viewportHeight: 500, itemHeight: 50 }}
>
- <TooltipProvider>
- <TanStackTable<T, TItemKey> {...mergedProps} />
- </TooltipProvider>
+ <TanStackTable<T, TItemKey> {...mergedProps} />
</VirtuosoMockContext.Provider>
</NuqsTestingAdapter>,
);
@@ -87,7 +84,7 @@ export function renderWithProviders(
<VirtuosoMockContext.Provider
value={{ viewportHeight: 500, itemHeight: 50 }}
>
- <TooltipProvider>{ui}</TooltipProvider>
+ {ui}
</VirtuosoMockContext.Provider>
</NuqsTestingAdapter>,
);
diff --git a/frontend/src/components/TanStackTableView/stories/TanStackTableView.stories.tsx b/frontend/src/components/TanStackTableView/stories/TanStackTableView.stories.tsx
index d13627e6ac..a048213212 100644
--- a/frontend/src/components/TanStackTableView/stories/TanStackTableView.stories.tsx
+++ b/frontend/src/components/TanStackTableView/stories/TanStackTableView.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite';
import { Color } from '@signozhq/design-tokens';
import { Ellipsis } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown } from '@signozhq/ui/dropdown';
import { GroupedStatusCounts } from 'container/InfraMonitoringK8sV2/components/GroupedStatusCounts';
import type { StatusCountItem } from 'container/InfraMonitoringK8sV2/components/GroupedStatusCounts';
import { ValidateColumnValueWrapper } from 'container/InfraMonitoringK8sV2/components/ValidateColumnValueWrapper';
@@ -92,24 +92,25 @@ const columns: TableColumnDef<ServiceRow>[] = [
];
const rowActions = (): JSX.Element => (
- <DropdownMenuSimple
+ <Dropdown
+ nativeButton
align="end"
- menu={{
- items: [
- { key: 'open', label: 'Open service details' },
- { key: 'copy', label: 'Copy service link' },
- ],
- }}
+ side="bottom"
+ items={[
+ { type: 'item', value: 'open', label: 'Open service details' },
+ { type: 'item', value: 'copy', label: 'Copy service link' },
+ ]}
>
<Button
aria-label="Service actions"
color="secondary"
- size="icon"
+ size="sm"
+ icon
variant="outlined"
>
<Ellipsis size={16} />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
const meta = {
diff --git a/frontend/src/components/TimePreferenceDropDown/config.tsx b/frontend/src/components/TimePreferenceDropDown/config.tsx
index d32e8a8fdd..bcf326a06e 100644
--- a/frontend/src/components/TimePreferenceDropDown/config.tsx
+++ b/frontend/src/components/TimePreferenceDropDown/config.tsx
@@ -2,6 +2,6 @@ import { Typography } from '@signozhq/ui/typography';
import { timeItems } from 'constants/timePreference';
export const menuItems = timeItems.map((item) => ({
- key: item.enum,
+ value: item.enum,
label: <Typography>{item.name}</Typography>,
}));
diff --git a/frontend/src/components/TimePreferenceDropDown/index.tsx b/frontend/src/components/TimePreferenceDropDown/index.tsx
index 95817c0a00..162710b53e 100644
--- a/frontend/src/components/TimePreferenceDropDown/index.tsx
+++ b/frontend/src/components/TimePreferenceDropDown/index.tsx
@@ -1,6 +1,6 @@
import { Dispatch, SetStateAction, useCallback, useMemo } from 'react';
import { ChevronDown, Globe } from '@signozhq/icons';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Button } from 'antd';
import { Typography } from '@signozhq/ui/typography';
import TimeItems, {
@@ -17,8 +17,8 @@ function TimePreference({
selectedTime,
}: TimePreferenceDropDownProps): JSX.Element {
const timeMenuItemOnChangeHandler = useCallback(
- (event: TimeMenuItemOnChangeHandlerEvent) => {
- const selectedTime = TimeItems.find((e) => e.enum === event.key);
+ (key: timePreferenceType) => {
+ const selectedTime = TimeItems.find((e) => e.enum === key);
if (selectedTime !== undefined) {
setSelectedTime(selectedTime);
}
@@ -26,18 +26,18 @@ function TimePreference({
[setSelectedTime],
);
- const menu = useMemo(
- () => ({
- items: menuItems.map((item) => ({
+ const items = useMemo<DropdownItemType[]>(
+ () =>
+ menuItems.map((item) => ({
...item,
- onClick: timeMenuItemOnChangeHandler,
+ type: 'item',
+ onClick: (): void => timeMenuItemOnChangeHandler(item.value),
})),
- }),
[timeMenuItemOnChangeHandler],
);
return (
- <DropdownMenuSimple menu={menu} className="time-selection-menu">
+ <Dropdown items={items} nativeButton align="end" side="bottom">
<Button className="time-selection-target">
<div className="button-selected-text">
<Globe size={14} />
@@ -47,14 +47,10 @@ function TimePreference({
</div>
<ChevronDown size="md" />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
-interface TimeMenuItemOnChangeHandlerEvent {
- key: timePreferenceType | string;
-}
-
interface TimePreferenceDropDownProps {
setSelectedTime: Dispatch<SetStateAction<timePreferance>>;
selectedTime: timePreferance;
diff --git a/frontend/src/components/TooltipScrollArea/TooltipScrollArea.module.scss b/frontend/src/components/TooltipScrollArea/TooltipScrollArea.module.scss
index c5f2456391..dcc65e3bb1 100644
--- a/frontend/src/components/TooltipScrollArea/TooltipScrollArea.module.scss
+++ b/frontend/src/components/TooltipScrollArea/TooltipScrollArea.module.scss
@@ -1,12 +1,5 @@
@use '../../styles/scrollbar' as *;
-// Padding for the tooltip body that hosts a scroll area: the right side is given
-// up so the scrollbar can sit flush against the tooltip's edge instead of floating
-// inset from it. `.scrollArea` puts that spacing back between the text and the bar.
-.tooltipContent {
- --tooltip-padding: var(--spacing-2) 0 var(--spacing-2) var(--spacing-4);
-}
-
// How tall a hover reveal grows before its content starts scrolling.
.scrollArea {
max-height: 480px;
diff --git a/frontend/src/components/TooltipScrollArea/TooltipScrollArea.tsx b/frontend/src/components/TooltipScrollArea/TooltipScrollArea.tsx
index 5aa95807dd..4a175c0695 100644
--- a/frontend/src/components/TooltipScrollArea/TooltipScrollArea.tsx
+++ b/frontend/src/components/TooltipScrollArea/TooltipScrollArea.tsx
@@ -6,12 +6,6 @@ interface TooltipScrollAreaProps {
children: ReactNode;
}
-/**
- * Pass as the hosting tooltip's content class (`tooltipContentProps`) so its
- * padding makes room for the scroll area's own edge handling.
- */
-export const TOOLTIP_SCROLL_CONTENT_CLASS = styles.tooltipContent;
-
/**
* Scroll container for hover reveals that list an unbounded number of items (tag
* chips, variable values): caps the tooltip's height and scrolls past it. Plain CSS
diff --git a/frontend/src/container/AIAssistant/AIAssistantDrawer/AIAssistantDrawer.tsx b/frontend/src/container/AIAssistant/AIAssistantDrawer/AIAssistantDrawer.tsx
index 3f66a9fae2..1bb3cd293a 100644
--- a/frontend/src/container/AIAssistant/AIAssistantDrawer/AIAssistantDrawer.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantDrawer/AIAssistantDrawer.tsx
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { useHistory } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Drawer } from 'antd';
import ROUTES from 'constants/routes';
import { Maximize2, Plus, X } from '@signozhq/icons';
@@ -53,22 +53,25 @@ export default function AIAssistantDrawer(): JSX.Element {
</div>
<div>
- <TooltipSimple title="New conversation">
+ <Tooltip title="New conversation">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleNewConversation}
aria-label="New conversation"
>
<Plus size={16} />
</Button>
- </TooltipSimple>
+ </Tooltip>
- <TooltipSimple title="Open full screen">
+ <Tooltip title="Open full screen">
<Button
+ disabledTooltip="Start a conversation first"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleExpand}
disabled={!activeConversationId}
@@ -76,19 +79,20 @@ export default function AIAssistantDrawer(): JSX.Element {
>
<Maximize2 size={16} />
</Button>
- </TooltipSimple>
+ </Tooltip>
- <TooltipSimple title="Close">
+ <Tooltip title="Close">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={closeDrawer}
aria-label="Close drawer"
>
<X size={16} />
</Button>
- </TooltipSimple>
+ </Tooltip>
</div>
</div>
}
diff --git a/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.module.scss b/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.module.scss
index 95d8085b09..3539f71653 100644
--- a/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.module.scss
+++ b/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.module.scss
@@ -83,6 +83,13 @@
display: flex;
align-items: center;
gap: 2px;
+
+ > [aria-pressed='true'] {
+ --button-variant-ghost-background-color: var(--l2-background);
+ --button-variant-ghost-color: var(--accent-primary);
+ --button-variant-ghost-hover-background-color: var(--l2-background);
+ --button-variant-ghost-hover-color: var(--accent-primary);
+ }
}
.body {
@@ -91,8 +98,3 @@
display: flex;
flex-direction: column;
}
-
-.toggleBtnActive {
- background: var(--l2-background) !important;
- color: var(--accent-primary) !important;
-}
diff --git a/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx b/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx
index fbd0ddbe4e..73bb4bb04a 100644
--- a/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
import { createPortal } from 'react-dom';
import { useHistory, useLocation } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import ROUTES from 'constants/routes';
import { History, Maximize2, Minus, Plus, X } from '@signozhq/icons';
import Noz from 'components/Noz/Noz';
@@ -159,62 +159,73 @@ export default function AIAssistantModal(): JSX.Element | null {
</div>
<div className={styles.actions}>
- <TooltipSimple title={showHistory ? 'Back to chat' : 'Conversations'}>
+ <Tooltip title={showHistory ? 'Back to chat' : 'Conversations'}>
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={(): void => setShowHistory((v) => !v)}
aria-label="Toggle conversations"
- className={showHistory ? styles.toggleBtnActive : ''}
- prefix={<History size={14} />}
- />
- </TooltipSimple>
+ aria-pressed={showHistory}
+ >
+ <History size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="New conversation">
+ <Tooltip title="New conversation">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleNew}
aria-label="New conversation"
- prefix={<Plus size={14} />}
- />
- </TooltipSimple>
+ >
+ <Plus size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="Open full screen">
+ <Tooltip title="Open full screen">
<Button
+ disabledTooltip="Start a conversation first"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleExpand}
disabled={!activeConversationId}
aria-label="Open full screen"
- prefix={<Maximize2 size={14} />}
- />
- </TooltipSimple>
+ >
+ <Maximize2 size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="Minimize to side panel">
+ <Tooltip title="Minimize to side panel">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleMinimize}
aria-label="Minimize to side panel"
- prefix={<Minus size={14} />}
- />
- </TooltipSimple>
+ >
+ <Minus size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="Close">
+ <Tooltip title="Close">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={closeModal}
aria-label="Close"
- prefix={<X size={14} />}
- />
- </TooltipSimple>
+ >
+ <X size={14} />
+ </Button>
+ </Tooltip>
</div>
</div>
diff --git a/frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx b/frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx
index 2da6492b16..f6dc50980a 100644
--- a/frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx
@@ -1,7 +1,7 @@
import { useCallback, useLayoutEffect, useRef, useState } from 'react';
import { matchPath, useHistory, useLocation } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import ROUTES from 'constants/routes';
import { History, Maximize2, Plus, X } from '@signozhq/icons';
import Noz from 'components/Noz/Noz';
@@ -144,50 +144,59 @@ export default function AIAssistantPanel(): JSX.Element | null {
</div>
<div className={styles.actions}>
- <TooltipSimple title={showHistory ? 'Back to chat' : 'Conversations'}>
+ <Tooltip title={showHistory ? 'Back to chat' : 'Conversations'}>
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={(): void => setShowHistory((v) => !v)}
aria-label="Toggle conversations"
- prefix={<History size={14} />}
- />
- </TooltipSimple>
+ >
+ <History size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="New conversation">
+ <Tooltip title="New conversation">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleNew}
aria-label="New conversation"
- prefix={<Plus size={14} />}
- />
- </TooltipSimple>
+ >
+ <Plus size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="Open full screen">
+ <Tooltip title="Open full screen">
<Button
+ disabledTooltip="Start a conversation first"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleExpand}
disabled={!activeConversationId}
aria-label="Open full screen"
- prefix={<Maximize2 size={14} />}
- />
- </TooltipSimple>
+ >
+ <Maximize2 size={14} />
+ </Button>
+ </Tooltip>
- <TooltipSimple title="Close">
+ <Tooltip title="Close">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={closeDrawer}
aria-label="Close panel"
- prefix={<X size={14} />}
- />
- </TooltipSimple>
+ >
+ <X size={14} />
+ </Button>
+ </Tooltip>
</div>
</div>
diff --git a/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.module.scss b/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.module.scss
index 5162f1e3d6..dd1c2d18d9 100644
--- a/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.module.scss
+++ b/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.module.scss
@@ -3,27 +3,10 @@
bottom: 24px;
right: 24px;
z-index: 10;
-
- width: 44px;
- height: 44px;
- border-radius: 50%;
- border: none;
- cursor: pointer;
-
- display: flex;
- align-items: center;
- justify-content: center;
-
- background: var(--accent-primary);
- color: var(--accent-primary-foreground);
- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.25);
- transition:
- transform 0.15s,
- box-shadow 0.15s;
+ transition: transform 0.15s;
&:hover {
transform: scale(1.08);
- box-shadow: 0 6px 18px rgba(0, 0, 0, 0.32);
}
&:active {
diff --git a/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx b/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx
index 401b8366f1..2952ca574e 100644
--- a/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { matchPath, useLocation } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import ROUTES from 'constants/routes';
import Noz from 'components/Noz/Noz';
@@ -43,15 +43,19 @@ export default function AIAssistantTrigger(): JSX.Element | null {
}
return (
- <TooltipSimple title={NOZ_TOOLTIP_TITLE}>
- <Button
- variant="solid"
- color="primary"
- className={`${styles.trigger} noz-wave`}
- onClick={handleOpen}
- aria-label="Open Noz"
- prefix={<Noz size={24} />}
- />
- </TooltipSimple>
+ <div className={`${styles.trigger} noz-wave`}>
+ <Tooltip title={NOZ_TOOLTIP_TITLE}>
+ <Button
+ size="md"
+ variant="solid"
+ color="primary"
+ icon
+ onClick={handleOpen}
+ aria-label="Open Noz"
+ >
+ <Noz size={24} />
+ </Button>
+ </Tooltip>
+ </div>
);
}
diff --git a/frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx b/frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx
index dca32f4890..345e256ad2 100644
--- a/frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx
+++ b/frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx
@@ -139,6 +139,16 @@ export default function ConversationView({
isLoadingThread ||
Boolean(pendingApprovalHere) ||
Boolean(pendingClarificationHere);
+ let inputDisabledTooltip: string | undefined;
+ if (isStreamingHere) {
+ inputDisabledTooltip = 'Wait for the response to finish';
+ } else if (isLoadingThread) {
+ inputDisabledTooltip = 'Wait for the conversation to load';
+ } else if (pendingApprovalHere) {
+ inputDisabledTooltip = 'Approve or reject the pending action first';
+ } else if (pendingClarificationHere) {
+ inputDisabledTooltip = 'Answer the pending question first';
+ }
const inputWrapperClass = cx(styles.inputWrapper, {
[styles.compact]: isCompact,
@@ -162,6 +172,7 @@ export default function ConversationView({
key={conversationId}
onSend={handleSend}
disabled
+ disabledTooltip="Wait for the conversation to load"
autoContexts={autoContexts}
onDismissAutoContext={handleDismissAutoContext}
/>
@@ -196,6 +207,7 @@ export default function ConversationView({
onSend={handleSend}
onCancel={handleCancel}
disabled={inputDisabled}
+ disabledTooltip={inputDisabledTooltip}
isStreaming={isStreamingHere}
autoContexts={autoContexts}
onDismissAutoContext={handleDismissAutoContext}
diff --git a/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.module.scss b/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.module.scss
index 6551e91c02..9680ffe92e 100644
--- a/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.module.scss
+++ b/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.module.scss
@@ -36,66 +36,6 @@
gap: 6px;
}
-.chip {
- display: inline-flex;
- align-items: center;
- gap: 6px;
- padding: 5px 10px;
- border: 1px solid var(--l2-border);
- border-radius: var(--radius-2);
- background: var(--l1-background);
- color: var(--l1-foreground);
- font-size: 11px;
- font-style: normal;
- font-weight: 400;
- line-height: 18px; /* 163.636% */
- letter-spacing: -0.055px;
- cursor: pointer;
- transition:
- background 0.12s ease,
- border-color 0.12s ease,
- color 0.12s ease;
-
- &:hover:not(:disabled) {
- background: var(--l2-background);
- border-color: var(--l3-border);
- }
-
- &:disabled {
- cursor: default;
- opacity: 0.55;
- }
-
- &.error {
- border-color: var(--accent-cherry);
- color: var(--accent-cherry);
- }
-
- svg {
- flex-shrink: 0;
- color: var(--l3-foreground);
- }
-
- &:hover:not(:disabled) svg {
- color: var(--accent-primary);
- }
-
- &.error svg {
- color: var(--accent-cherry);
- }
-}
-
-.spin {
- color: var(--accent-primary) !important;
- animation: spin 0.8s linear infinite;
-}
-
-@keyframes spin {
- to {
- transform: rotate(360deg);
- }
-}
-
.chipLabel {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx b/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx
index c838e58e39..9554c61f73 100644
--- a/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx
+++ b/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx
@@ -9,10 +9,9 @@ import {
Query,
TagFilter,
} from 'types/api/queryBuilder/queryBuilderData';
-import cx from 'classnames';
import { v4 as uuidv4 } from 'uuid';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import type { MessageActionDTO } from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
import {
ApplyFilterSignalDTO,
@@ -33,7 +32,6 @@ import {
ExternalLink,
Eye,
Filter,
- LoaderCircle,
MessageCircle,
RotateCcw,
Sparkles,
@@ -614,14 +612,11 @@ export default function ActionsSection({
// "applied"). Without a documented terminal vocabulary we don't auto-
// disable on it — only the local in-flight click result does. The state
// is still surfaced visually via the suffix pill below.
- const isDisabled = isLoading || isSuccess;
const tooltip = isError ? result.error : (action.tooltip ?? undefined);
let icon: JSX.Element;
- if (isLoading) {
- icon = <LoaderCircle size={12} className={styles.spin} />;
- } else if (isSuccess) {
+ if (isSuccess) {
icon = <Check size={12} />;
} else if (isError) {
icon = <TriangleAlert size={12} />;
@@ -631,12 +626,13 @@ export default function ActionsSection({
const chip = (
<Button
+ disabledTooltip="This action already ran"
variant="outlined"
color="secondary"
size="sm"
- className={cx(styles.chip, { [styles.error]: isError })}
onClick={(): void => handleClick(key, action)}
- disabled={isDisabled}
+ disabled={isSuccess}
+ loading={isLoading}
aria-label={action.label}
prefix={icon}
>
@@ -644,12 +640,10 @@ export default function ActionsSection({
</Button>
);
- return tooltip ? (
- <TooltipSimple key={key} title={tooltip}>
+ return (
+ <Tooltip key={key} title={tooltip}>
{chip}
- </TooltipSimple>
- ) : (
- <span key={key}>{chip}</span>
+ </Tooltip>
);
})}
</div>
diff --git a/frontend/src/container/AIAssistant/components/ApprovalCard/ApprovalCard.tsx b/frontend/src/container/AIAssistant/components/ApprovalCard/ApprovalCard.tsx
index 3ad4517c28..282abee9cd 100644
--- a/frontend/src/container/AIAssistant/components/ApprovalCard/ApprovalCard.tsx
+++ b/frontend/src/container/AIAssistant/components/ApprovalCard/ApprovalCard.tsx
@@ -10,8 +10,8 @@ import {
DialogSubtitle,
DialogTitle,
} from '@signozhq/ui/dialog';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
+import { Tooltip } from '@signozhq/ui/tooltip';
import type {
ApprovalEventDTO,
ApprovalEventDTODiff,
@@ -101,16 +101,18 @@ export default function ApprovalCard({
<div className={styles.diffSection}>
<div className={styles.diffHeader}>
<span className={styles.diffHeaderLabel}>Diff</span>
- <TooltipSimple title="Expand diff">
+ <Tooltip title="Expand diff">
<Button
variant="link"
size="sm"
color="secondary"
+ icon
onClick={(): void => setDiffExpanded(true)}
aria-label="Expand diff"
- prefix={<Maximize2 size={12} />}
- />
- </TooltipSimple>
+ >
+ <Maximize2 size={12} />
+ </Button>
+ </Tooltip>
</div>
<DiffView diff={approval.diff} />
</div>
@@ -132,7 +134,9 @@ export default function ApprovalCard({
<div className={styles.diffModalBody}>
<p className={styles.diffModalSummary}>{approval.summary}</p>
<div className={styles.diffToolbarRow}>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
size="sm"
value={viewMode}
@@ -156,7 +160,9 @@ export default function ApprovalCard({
},
]}
/>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="multiple"
size="sm"
value={wrapText ? ['wrap'] : []}
@@ -185,6 +191,8 @@ export default function ApprovalCard({
<div className={styles.actions}>
<Button
+ disabledTooltip="Wait for the response to finish"
+ color="primary"
variant="solid"
size="sm"
onClick={handleApprove}
@@ -194,6 +202,7 @@ export default function ApprovalCard({
Approve
</Button>
<Button
+ disabledTooltip="Wait for the response to finish"
variant="outlined"
size="sm"
color="secondary"
@@ -465,16 +474,17 @@ function CopyButton({ text, label }: CopyButtonProps): JSX.Element {
};
return (
- <TooltipSimple title={copied ? `Copied ${label}` : `Copy ${label}`}>
+ <Tooltip title={copied ? `Copied ${label}` : `Copy ${label}`}>
<Button
variant="ghost"
size="sm"
color="secondary"
onClick={handleCopy}
aria-label={copied ? `Copied ${label}` : `Copy ${label}`}
+ icon
>
{copied ? <Check size={12} /> : <Copy size={12} />}
</Button>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.module.scss b/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.module.scss
index 8dfc4e158f..736cd200fb 100644
--- a/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.module.scss
+++ b/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.module.scss
@@ -60,10 +60,6 @@
gap: 8px;
max-width: 220px;
- .contextTagCategory {
- flex-shrink: 0;
- }
-
.contextTagLabel {
overflow: hidden;
text-overflow: ellipsis;
@@ -71,23 +67,12 @@
}
}
-.contextTagCategory {
- flex-shrink: 0;
-}
-
.contextTagLabel {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
-.contextTagRemove {
- flex-shrink: 0;
- padding: 0 !important;
- height: auto !important;
- min-height: 0 !important;
-}
-
.attachmentChip {
display: inline-flex;
align-items: center;
@@ -106,13 +91,6 @@
white-space: nowrap;
}
-.attachmentRemove {
- flex-shrink: 0;
- padding: 0 !important;
- height: auto !important;
- min-height: 0 !important;
-}
-
.row {
display: flex;
align-items: center;
@@ -248,43 +226,15 @@
gap: 6px;
padding: 8px;
border-right: 1px solid var(--l2-border);
-}
-
-.contextPopoverCategoryItem {
- // Override DS Button's centered layout.
--button-justify-content: flex-start;
- display: flex;
- align-items: center;
- justify-content: flex-start;
- gap: 8px;
- width: 100%;
- height: 32px;
- padding: 0 8px;
- background: transparent;
- color: inherit;
- font: inherit;
- font-size: 12px;
- font-weight: 550;
- text-align: left;
- border: 1px solid color-mix(in srgb, var(--l1-foreground), transparent 96%);
- border-radius: var(--radius-2);
- appearance: none;
- cursor: pointer;
- transition:
- background 0.15s ease,
- border-color 0.15s ease,
- color 0.15s ease;
-
- &:hover {
- background: var(--l2-background);
- color: var(--l1-foreground);
- border-color: var(--l2-border);
- }
- &.active {
- background: color-mix(in srgb, var(--accent-primary), transparent 86%);
- color: var(--l1-foreground);
- border-color: color-mix(in srgb, var(--accent-primary), transparent 64%);
+ > [data-slot='button'][aria-selected='true'] {
+ --button-variant-ghost-background-color: color-mix(
+ in srgb,
+ var(--accent-primary),
+ transparent 86%
+ );
+ --button-variant-ghost-color: var(--l1-foreground);
}
}
@@ -321,61 +271,18 @@
padding: 8px;
min-width: 0;
@include scrollbar(0.2rem);
-}
-
-.contextPopoverEntityItem {
- // Override DS Button's centered layout.
--button-justify-content: flex-start;
- display: flex;
- align-items: center;
- justify-content: flex-start;
- gap: 10px;
- width: 100%;
- padding: 8px;
- background: transparent;
- color: var(--l1-foreground);
- font: inherit;
- font-size: 12px;
- font-weight: 500;
- line-height: 1.35;
- text-align: left;
- border: 1px solid color-mix(in srgb, var(--l1-foreground), transparent 96%);
- border-radius: var(--radius-2);
- appearance: none;
- cursor: pointer;
- // Required for the inner span's `text-overflow: ellipsis` to engage —
- // flex items default to `min-width: auto` (intrinsic width) and would
- // otherwise grow past their parent's width to fit long titles.
- min-width: 0;
- transition:
- background 0.15s ease,
- border-color 0.15s ease,
- transform 0.15s ease;
-
- &:hover {
- background: var(--l2-background);
- border-color: var(--l2-border);
- transform: translateY(-1px);
- }
-
- &.selected {
- background: color-mix(in srgb, var(--accent-primary), transparent 86%);
- border-color: color-mix(in srgb, var(--accent-primary), transparent 64%);
-
- span {
- color: var(--l1-foreground);
- font-weight: 600;
- }
+ > [data-slot='button'][aria-pressed='true'] {
+ --button-variant-ghost-background-color: color-mix(
+ in srgb,
+ var(--accent-primary),
+ transparent 86%
+ );
+ --button-variant-ghost-color: var(--l1-foreground);
}
}
-.contextPopoverEntityItemText {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
.contextPopoverEmpty {
// Fill the entity panel so the state sits centred in the dead space rather
// than clinging to the top-left corner.
@@ -421,10 +328,6 @@
overflow-wrap: anywhere;
}
-.contextPopoverEmptyCta {
- max-width: 100%;
-}
-
.contextPopoverEmptyCtaLabel {
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -436,10 +339,6 @@
text-align: center;
}
-.micBtn {
- flex-shrink: 0;
-}
-
.micRecording {
display: flex;
align-items: center;
@@ -448,33 +347,13 @@
padding: 2px;
gap: 0;
flex-shrink: 0;
-}
-
-.micDiscard,
-.micStop {
- display: flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- width: 24px;
- height: 24px;
- border-radius: 50%;
- border: none;
- cursor: pointer;
- // Reset native <button> defaults so the 24px circle isn't inflated by
- // browser-default padding / font metrics.
- padding: 0;
- font: inherit;
- appearance: none;
-}
-
-.micDiscard {
- background: var(--l2-background);
- color: var(--l2-foreground);
- transition: color 0.12s;
+ overflow: hidden;
+ --button-icon-size: 12px;
- &:hover {
- color: var(--l1-foreground);
+ > :last-child {
+ --button-icon-size: 9px;
+ --button-variant-ghost-color: var(--accent-cherry);
+ --button-variant-ghost-hover-color: var(--accent-cherry);
}
}
@@ -531,13 +410,3 @@
opacity: 1;
}
}
-
-.micStop {
- background: var(--accent-cherry);
- color: var(--accent-cherry-foreground);
- transition: opacity 0.12s;
-
- &:hover {
- opacity: 0.85;
- }
-}
diff --git a/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx b/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx
index 1e7095e072..f84df0aaa5 100644
--- a/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx
+++ b/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx
@@ -12,7 +12,7 @@ import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
import { toast } from '@signozhq/ui/sonner';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import type { UploadFile } from 'antd';
import getSessionStorage from 'api/browser/sessionstorage/get';
import setSessionStorage from 'api/browser/sessionstorage/set';
@@ -72,6 +72,7 @@ interface ChatInputProps {
) => void;
onCancel?: () => void;
disabled?: boolean;
+ disabledTooltip?: string;
isStreaming?: boolean;
/**
* URL-derived `source: 'auto'` contexts representing the page the user is
@@ -236,6 +237,7 @@ export default function ChatInput({
onSend,
onCancel,
disabled,
+ disabledTooltip,
isStreaming = false,
autoContexts,
onDismissAutoContext,
@@ -900,9 +902,10 @@ export default function ChatInput({
<div key={f.uid} className={styles.attachmentChip}>
<span className={styles.attachmentName}>{f.name}</span>
<Button
+ color="secondary"
variant="ghost"
- size="icon"
- className={styles.attachmentRemove}
+ size="sm"
+ icon
onClick={(): void => removeFile(f.uid)}
aria-label={`Remove ${f.name}`}
>
@@ -923,11 +926,7 @@ export default function ChatInput({
return (
<div key={key} className={cx(styles.contextTag, styles.auto)}>
<div className={styles.contextTagContent}>
- <Badge
- color="secondary"
- variant="outline"
- className={styles.contextTagCategory}
- >
+ <Badge textTransform="none" color="secondary" variant="outlined">
{category}
</Badge>
<span className={styles.contextTagLabel}>{label}</span>
@@ -935,13 +934,14 @@ export default function ChatInput({
{onDismissAutoContext && (
<Button
variant="link"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- className={styles.contextTagRemove}
onClick={(): void => onDismissAutoContext(key)}
aria-label={`Remove ${category}: ${label} context`}
- prefix={<X size={10} />}
- ></Button>
+ >
+ <X size={10} />
+ </Button>
)}
</div>
);
@@ -952,26 +952,23 @@ export default function ChatInput({
className={styles.contextTag}
>
<div className={styles.contextTagContent}>
- <Badge
- color="primary"
- variant="outline"
- className={styles.contextTagCategory}
- >
+ <Badge textTransform="none" color="primary" variant="outlined">
{contextItem.category}
</Badge>
<span className={styles.contextTagLabel}>{contextItem.value}</span>
</div>
<Button
variant="link"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- className={styles.contextTagRemove}
onClick={(): void =>
removeContext(contextItem.category, contextItem.entityId)
}
aria-label={`Remove ${contextItem.category}: ${contextItem.value} context`}
- prefix={<X size={10} />}
- ></Button>
+ >
+ <X size={10} />
+ </Button>
</div>
))}
</div>
@@ -1020,9 +1017,10 @@ export default function ChatInput({
>
<PopoverTrigger asChild>
<Button
+ disabledTooltip={disabledTooltip}
variant="solid"
color="secondary"
- size="sm"
+ size="md"
disabled={disabled}
onClick={(): void => {
setActiveContextCategory('Dashboards');
@@ -1059,7 +1057,6 @@ export default function ChatInput({
variant="ghost"
color="secondary"
size="sm"
- role="tab"
id={`ai-context-tab-${category}`}
// Single stable panel id shared by every tab: only the
// active category's tabpanel is rendered, so per-category
@@ -1072,9 +1069,7 @@ export default function ChatInput({
// the Tab sequence; arrow keys move between tabs.
tabIndex={isActive ? 0 : -1}
aria-selected={isActive}
- className={cx(styles.contextPopoverCategoryItem, {
- [styles.active]: isActive,
- })}
+ width="100%"
onClick={(): void => {
setActiveContextCategory(category);
setPickerSearchQuery('');
@@ -1143,9 +1138,7 @@ export default function ChatInput({
color="secondary"
size="sm"
aria-pressed={isSelected}
- className={cx(styles.contextPopoverEntityItem, {
- [styles.selected]: isSelected,
- })}
+ width="100%"
onClick={(): void =>
toggleContextSelection(
activeContextCategory,
@@ -1155,9 +1148,7 @@ export default function ChatInput({
}
onKeyDown={(e): void => handleEntityKeyDown(e, index)}
>
- <span className={styles.contextPopoverEntityItemText}>
- {option.value}
- </span>
+ {option.value}
</Button>
);
})
@@ -1178,18 +1169,19 @@ export default function ChatInput({
aria-live="polite"
aria-label="Recording voice input"
>
- <TooltipSimple title="Discard recording">
+ <Tooltip title="Discard recording">
<Button
type="button"
variant="ghost"
- size="icon"
+ size="md"
+ icon
color="secondary"
- className={cx(styles.micDiscard, styles.secondary)}
onClick={handleDiscard}
aria-label="Discard recording"
- prefix={<X size={12} />}
- />
- </TooltipSimple>
+ >
+ <X size={12} />
+ </Button>
+ </Tooltip>
<span className={styles.micWaves} aria-hidden="true">
<span />
<span />
@@ -1200,56 +1192,65 @@ export default function ChatInput({
<span />
<span />
</span>
- <TooltipSimple title="Stop and send">
+ <Tooltip title="Stop and send">
<Button
type="button"
variant="ghost"
- size="icon"
- color="destructive"
- className={cx(styles.micStop, styles.destructive)}
+ size="md"
+ icon
+ color="secondary"
onClick={handleStopAndSend}
aria-label="Stop and send"
- prefix={<Square size={9} fill="currentColor" strokeWidth={0} />}
- />
- </TooltipSimple>
+ >
+ <Square size={9} fill="currentColor" strokeWidth={0} />
+ </Button>
+ </Tooltip>
</div>
) : (
- <TooltipSimple title="Voice input">
+ <Tooltip title="Voice input">
<Button
+ disabledTooltip={disabledTooltip}
+ color="secondary"
variant="ghost"
- size="icon"
+ size="md"
+ icon
onClick={(): void => startVoiceInput(VoiceInputSource.Button)}
disabled={disabled}
aria-label="Start voice input"
- className={styles.micBtn}
- prefix={<Mic size={14} />}
- />
- </TooltipSimple>
+ >
+ <Mic size={14} />
+ </Button>
+ </Tooltip>
))}
{isStreaming && onCancel ? (
- <TooltipSimple title="Stop generating">
+ <Tooltip title="Stop generating">
<Button
variant="solid"
- size="icon"
- color="destructive"
+ size="md"
+ icon
+ color="danger"
onClick={onCancel}
aria-label="Stop generating"
- prefix={<Square size={10} fill="currentColor" strokeWidth={0} />}
- />
- </TooltipSimple>
+ >
+ <Square size={10} fill="currentColor" strokeWidth={0} />
+ </Button>
+ </Tooltip>
) : (
- <TooltipSimple title="Send message">
+ <Tooltip title="Send message">
<Button
+ disabledTooltip={disabled ? disabledTooltip : 'Type a message first'}
variant="solid"
- size="icon"
+ size="md"
+ icon
color="primary"
onClick={isListening ? handleStopAndSend : handleSend}
disabled={disabled || (!text.trim() && pendingFiles.length === 0)}
aria-label="Send message"
- prefix={<Send size={14} />}
- />
- </TooltipSimple>
+ >
+ <Send size={14} />
+ </Button>
+ </Tooltip>
)}
</div>
</div>
diff --git a/frontend/src/container/AIAssistant/components/ChatInput/ContextPickerEmptyState.tsx b/frontend/src/container/AIAssistant/components/ChatInput/ContextPickerEmptyState.tsx
index 2249a81b05..e0c441dceb 100644
--- a/frontend/src/container/AIAssistant/components/ChatInput/ContextPickerEmptyState.tsx
+++ b/frontend/src/container/AIAssistant/components/ChatInput/ContextPickerEmptyState.tsx
@@ -56,9 +56,8 @@ export default function ContextPickerEmptyState({
variant="link"
size="sm"
color="primary"
- className={styles.contextPopoverEmptyCta}
onClick={(): void => onPrefill(prefill)}
- data-testid={`ai-context-empty-cta-${category}`}
+ testId={`ai-context-empty-cta-${category}`}
prefix={<Sparkles size={14} />}
>
<span className={styles.contextPopoverEmptyCtaLabel}>{ctaLabel}</span>
diff --git a/frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.prefill.test.tsx b/frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.prefill.test.tsx
index 80f0c4f2b3..9d1704b4af 100644
--- a/frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.prefill.test.tsx
+++ b/frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.prefill.test.tsx
@@ -46,16 +46,11 @@ jest.mock('../../../hooks/useAIAssistantAnalyticsContext', () => ({
}));
// eslint-disable-next-line import/first
-import { TooltipProvider } from '@signozhq/ui/tooltip';
// eslint-disable-next-line import/first
import ChatInput from '../ChatInput';
function renderChatInput(): void {
- render(
- <TooltipProvider>
- <ChatInput onSend={jest.fn()} />
- </TooltipProvider>,
- );
+ render(<ChatInput onSend={jest.fn()} />);
}
function getComposer(): HTMLTextAreaElement {
diff --git a/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.module.scss b/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.module.scss
index 005e2f7df2..7743678c93 100644
--- a/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.module.scss
+++ b/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.module.scss
@@ -124,15 +124,6 @@
}
.radioLabel,
-.checkboxLabel {
- display: flex;
- align-items: center;
- gap: 7px;
- font-size: 13px;
- color: var(--l1-foreground);
- cursor: pointer;
-}
-
.radio,
.checkbox {
accent-color: var(--accent-primary);
diff --git a/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx b/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx
index 76f3488aa2..e71c2c9bf4 100644
--- a/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx
+++ b/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx
@@ -140,6 +140,12 @@ export default function ClarificationForm({
<div className={styles.actions}>
<Button
+ disabledTooltip={
+ isStreaming
+ ? 'Wait for the response to finish'
+ : 'Fill in the required fields first'
+ }
+ size="md"
variant="solid"
color="primary"
onClick={handleSubmit}
@@ -149,6 +155,8 @@ export default function ClarificationForm({
Submit
</Button>
<Button
+ disabledTooltip="Wait for the response to finish"
+ size="md"
variant="outlined"
color="secondary"
onClick={handleCancel}
@@ -310,7 +318,7 @@ function FieldInput({ field, value, onChange }: FieldInputProps): JSX.Element {
return (
<div className={styles.field}>
<Checkbox
- className={styles.checkboxLabel}
+ color="primary"
value={checked}
onChange={(): void => onChange(!checked)}
>
@@ -382,8 +390,8 @@ function FieldInput({ field, value, onChange }: FieldInputProps): JSX.Element {
<div className={styles.checkboxGroup}>
{options?.map((opt) => (
<Checkbox
+ color="primary"
key={opt}
- className={styles.checkboxLabel}
value={regularSelected.includes(opt)}
onChange={(): void => toggleRegular(opt)}
>
@@ -391,11 +399,7 @@ function FieldInput({ field, value, onChange }: FieldInputProps): JSX.Element {
</Checkbox>
))}
{allowCustom && (
- <Checkbox
- className={styles.checkboxLabel}
- value={isCustom}
- onChange={toggleCustom}
- >
+ <Checkbox color="primary" value={isCustom} onChange={toggleCustom}>
{CUSTOM_OPTION_LABEL}
</Checkbox>
)}
diff --git a/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.module.scss b/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.module.scss
index 4d02864911..30be14d9ab 100644
--- a/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.module.scss
+++ b/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.module.scss
@@ -100,23 +100,8 @@
--actions-pointer: auto;
}
-.btn {
- padding: 2px !important;
- height: auto !important;
- min-height: 0 !important;
-
- &.danger:hover {
- color: var(--accent-cherry) !important;
- }
-}
-
// Compact menu — narrower than the design-system default so the
// content (Rename / Copy link / Archive) doesn't dwarf the row.
-.menu {
- min-width: 160px !important;
- width: 160px !important;
-}
-
// Shared sizing for every dropdown item so the menu reads compact —
// matches the row's own 12px label scale.
.menuItem {
diff --git a/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.tsx b/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.tsx
index 49dc29b2b5..fc3845ccbe 100644
--- a/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.tsx
+++ b/frontend/src/container/AIAssistant/components/ConversationItem/ConversationItem.tsx
@@ -6,7 +6,7 @@ import { getAbsoluteUrl } from 'utils/basePath';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
import { toast } from '@signozhq/ui/sonner';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import {
Archive,
@@ -121,41 +121,41 @@ export default function ConversationItem({
// Dropdown items mirror the previous inline buttons but live in a single
// trigger so the row stays compact. Archive/Restore swap based on the
// archived state — same handler wiring as before.
- const baseItems = [
+ const baseItems: DropdownItemType[] = [
{
- key: 'rename',
+ type: 'item',
+ value: 'rename',
label: 'Rename',
- icon: <Pencil size={12} />,
- className: styles.menuItem,
+ prefix: <Pencil size={12} />,
onClick: (): void => startEditing(),
},
{
- key: 'copy-link',
+ type: 'item',
+ value: 'copy-link',
label: 'Copy link',
- icon: <Link size={12} />,
- className: styles.menuItem,
+ prefix: <Link size={12} />,
onClick: handleCopyLink,
},
- { type: 'divider' as const, key: 'divider' },
+ { type: 'separator', value: 'divider' },
];
- const menuItems = isArchived
+ const menuItems: DropdownItemType[] = isArchived
? [
...baseItems,
{
- key: 'restore',
+ type: 'item',
+ value: 'restore',
label: 'Restore',
- icon: <ArchiveRestore size={12} />,
- className: cx(styles.menuItem, styles.restoreItem),
+ prefix: <ArchiveRestore size={12} />,
onClick: (): void => onRestore(conversation.id),
},
]
: [
...baseItems,
{
- key: 'archive',
+ type: 'item',
+ value: 'archive',
label: 'Archive',
- icon: <Archive size={12} />,
- className: cx(styles.menuItem, styles.archiveItem),
+ prefix: <Archive size={12} />,
onClick: (): void => onArchive(conversation.id),
},
];
@@ -204,21 +204,17 @@ export default function ConversationItem({
// own clicks don't bubble, but the trigger button does.
onClick={(e): void => e.stopPropagation()}
>
- <DropdownMenuSimple
- menu={{ items: menuItems }}
- align="end"
- sideOffset={4}
- className={styles.menu}
- >
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
variant="link"
- size="icon"
- color="none"
- className={styles.btn}
+ size="sm"
+ icon
+ color="secondary"
aria-label="Conversation actions"
- prefix={<EllipsisVertical size={12} />}
- />
- </DropdownMenuSimple>
+ >
+ <EllipsisVertical size={12} />
+ </Button>
+ </Dropdown>
</div>
)}
</div>
diff --git a/frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx b/frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx
index 90ef46be7a..8ecdc9be59 100644
--- a/frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx
+++ b/frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react';
import cx from 'classnames';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Plus, Search } from '@signozhq/icons';
import logEvent from 'api/common/logEvent';
@@ -171,17 +171,18 @@ export default function ConversationsList({
{isLoadingThreads && <HeaderLoadingDots />}
{!isLoadingThreads && showAddNewConversation && (
- <TooltipSimple title="New conversation">
+ <Tooltip title="New conversation">
<Button
variant="solid"
size="sm"
color="secondary"
onClick={onNewConversation}
aria-label="New conversation"
+ icon
>
<Plus size={12} />
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
diff --git a/frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx b/frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx
index 9fbd03637d..e7cf2ab841 100644
--- a/frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx
+++ b/frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx
@@ -198,17 +198,18 @@ export default function MessageBubble({
</div>
{showRetry && (
- <Button
- className={styles.retryButton}
- size="sm"
- variant="ghost"
- color="secondary"
- onClick={onRetry}
- testId={`ai-message-retry-${message.id}`}
- >
- <RotateCw size={12} />
- Retry
- </Button>
+ <div className={styles.retryButton}>
+ <Button
+ size="sm"
+ variant="ghost"
+ color="secondary"
+ prefix={<RotateCw size={12} />}
+ onClick={onRetry}
+ testId={`ai-message-retry-${message.id}`}
+ >
+ Retry
+ </Button>
+ </div>
)}
{!isUser && !isError && !message.isRateLimitError && (
diff --git a/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.module.scss b/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.module.scss
index 648f84fa7f..27abac2f08 100644
--- a/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.module.scss
+++ b/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.module.scss
@@ -17,32 +17,15 @@
display: flex;
align-items: center;
gap: 2px;
-}
-
-.btn {
- width: 24px !important;
- height: 24px !important;
- min-height: 0 !important;
- padding: 0 !important;
- display: inline-flex !important;
- align-items: center !important;
- justify-content: center !important;
- color: var(--l3-foreground) !important;
-
- &:hover {
- color: var(--l1-foreground) !important;
- }
-
- &.active {
- color: var(--accent-forest) !important;
- }
- &.votedUp {
- color: var(--accent-primary) !important;
+ > [data-vote='positive'][aria-pressed='true'] {
+ --button-variant-ghost-color: var(--accent-primary);
+ --button-variant-ghost-hover-color: var(--accent-primary);
}
- &.votedDown {
- color: var(--accent-cherry) !important;
+ > [data-vote='negative'][aria-pressed='true'] {
+ --button-variant-ghost-color: var(--accent-cherry);
+ --button-variant-ghost-hover-color: var(--accent-cherry);
}
}
diff --git a/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx b/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx
index ca0ad35ef2..b9a5cee26a 100644
--- a/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx
+++ b/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx
@@ -3,7 +3,7 @@ import cx from 'classnames';
import { useCopyToClipboard } from 'react-use';
import { Button } from '@signozhq/ui/button';
import { DialogWrapper } from '@signozhq/ui/dialog';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
import { Check, Copy, RefreshCw, ThumbsDown, ThumbsUp } from '@signozhq/icons';
import { useTimezone } from 'providers/Timezone';
@@ -174,10 +174,10 @@ export default function MessageFeedback({
<>
<div className={cx(styles.feedback, { [styles.visible]: isLastAssistant })}>
<div className={styles.actions}>
- <TooltipSimple title={copied ? 'Copied!' : 'Copy'}>
+ <Tooltip title={copied ? 'Copied!' : 'Copy'}>
<Button
- className={styles.btn}
- size="icon"
+ size="sm"
+ icon
variant="ghost"
onClick={handleCopy}
color="secondary"
@@ -185,14 +185,13 @@ export default function MessageFeedback({
>
{copied ? <Check size={12} /> : <Copy size={12} />}
</Button>
- </TooltipSimple>
+ </Tooltip>
- <TooltipSimple title={VOTE_LABEL[FeedbackRatingDTO.positive].tooltip}>
+ <Tooltip title={VOTE_LABEL[FeedbackRatingDTO.positive].tooltip}>
<Button
- className={cx(styles.btn, {
- [styles.votedUp]: vote === FeedbackRatingDTO.positive,
- })}
- size="icon"
+ data-vote="positive"
+ size="sm"
+ icon
variant="ghost"
color="secondary"
onClick={(): void => handleVote(FeedbackRatingDTO.positive)}
@@ -201,14 +200,13 @@ export default function MessageFeedback({
>
<ThumbsUp size={12} />
</Button>
- </TooltipSimple>
+ </Tooltip>
- <TooltipSimple title={VOTE_LABEL[FeedbackRatingDTO.negative].tooltip}>
+ <Tooltip title={VOTE_LABEL[FeedbackRatingDTO.negative].tooltip}>
<Button
- className={cx(styles.btn, {
- [styles.votedDown]: vote === FeedbackRatingDTO.negative,
- })}
- size="icon"
+ data-vote="negative"
+ size="sm"
+ icon
variant="ghost"
color="secondary"
onClick={(): void => handleVote(FeedbackRatingDTO.negative)}
@@ -217,13 +215,13 @@ export default function MessageFeedback({
>
<ThumbsDown size={12} />
</Button>
- </TooltipSimple>
+ </Tooltip>
{onRegenerate && (
- <TooltipSimple title="Regenerate">
+ <Tooltip title="Regenerate">
<Button
- className={styles.btn}
- size="icon"
+ size="sm"
+ icon
variant="ghost"
color="secondary"
onClick={onRegenerate}
@@ -231,7 +229,7 @@ export default function MessageFeedback({
>
<RefreshCw size={12} />
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
@@ -249,13 +247,19 @@ export default function MessageFeedback({
footer={
<div className={styles.feedbackDialogFooter}>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={(): void => setIsNegativeDialogOpen(false)}
>
Cancel
</Button>
- <Button variant="solid" color="primary" onClick={handleSubmitNegative}>
+ <Button
+ size="md"
+ variant="solid"
+ color="primary"
+ onClick={handleSubmitNegative}
+ >
Send feedback
</Button>
</div>
diff --git a/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.module.scss b/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.module.scss
index 6d28e45ef7..e94bd34b5d 100644
--- a/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.module.scss
+++ b/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.module.scss
@@ -10,22 +10,3 @@
opacity: var(--feedback-opacity, 0);
transition: opacity 0.15s ease;
}
-
-.btn {
- width: 24px !important;
- height: 24px !important;
- min-height: 0 !important;
- padding: 0 !important;
- display: inline-flex !important;
- align-items: center !important;
- justify-content: center !important;
- color: var(--l3-foreground) !important;
-
- &:hover {
- color: var(--l1-foreground) !important;
- }
-
- &.active {
- color: var(--accent-forest) !important;
- }
-}
diff --git a/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx b/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx
index c0a29b71dc..21492fc343 100644
--- a/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx
+++ b/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx
@@ -1,7 +1,7 @@
import { useCallback, useState } from 'react';
import { useCopyToClipboard } from 'react-use';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Check, Copy } from '@signozhq/icons';
import logEvent from 'api/common/logEvent';
@@ -40,10 +40,10 @@ export default function UserMessageActions({
return (
<div className={styles.actions}>
- <TooltipSimple title={copied ? 'Copied!' : 'Copy'}>
+ <Tooltip title={copied ? 'Copied!' : 'Copy'}>
<Button
- className={styles.btn}
- size="icon"
+ size="sm"
+ icon
variant="ghost"
color="secondary"
onClick={handleCopy}
@@ -51,7 +51,7 @@ export default function UserMessageActions({
>
{copied ? <Check size={12} /> : <Copy size={12} />}
</Button>
- </TooltipSimple>
+ </Tooltip>
</div>
);
}
diff --git a/frontend/src/container/AIAssistant/components/blocks/ActionBlock/ActionBlock.tsx b/frontend/src/container/AIAssistant/components/blocks/ActionBlock/ActionBlock.tsx
index 220d3e9e29..41d64b607e 100644
--- a/frontend/src/container/AIAssistant/components/blocks/ActionBlock/ActionBlock.tsx
+++ b/frontend/src/container/AIAssistant/components/blocks/ActionBlock/ActionBlock.tsx
@@ -189,12 +189,22 @@ export default function ActionBlock({
)}
<div className={styles.actions}>
- <Button variant="solid" size="sm" onClick={execute}>
- <Check size={12} />
+ <Button
+ color="primary"
+ variant="solid"
+ size="sm"
+ onClick={execute}
+ prefix={<Check size={12} />}
+ >
Apply
</Button>
- <Button variant="outlined" size="sm" onClick={handleDismiss}>
- <X size={12} />
+ <Button
+ color="secondary"
+ variant="outlined"
+ size="sm"
+ onClick={handleDismiss}
+ prefix={<X size={12} />}
+ >
Dismiss
</Button>
</div>
diff --git a/frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx b/frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx
index 9c65d446a0..9fba84b803 100644
--- a/frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx
+++ b/frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx
@@ -83,16 +83,22 @@ export default function ConfirmBlock({
<div className={blockStyles.block}>
{message && <p className={styles.message}>{message}</p>}
<div className={styles.actions}>
- <Button variant="solid" size="sm" onClick={(): void => handle('accepted')}>
- <Check size={12} />
+ <Button
+ color="primary"
+ variant="solid"
+ size="sm"
+ onClick={(): void => handle('accepted')}
+ prefix={<Check size={12} />}
+ >
{acceptLabel}
</Button>
<Button
+ color="secondary"
variant="outlined"
size="sm"
onClick={(): void => handle('rejected')}
+ prefix={<X size={12} />}
>
- <X size={12} />
{rejectLabel}
</Button>
</div>
diff --git a/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.module.scss b/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.module.scss
index 5e3a1916e3..f2cb6413ca 100644
--- a/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.module.scss
+++ b/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.module.scss
@@ -20,10 +20,6 @@
align-items: flex-start !important;
}
-.submit {
- margin-top: 2px;
-}
-
.answered {
display: flex;
align-items: center;
diff --git a/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx b/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx
index 7ec6f292dc..0da8a044e5 100644
--- a/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx
+++ b/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx
@@ -3,7 +3,7 @@ import cx from 'classnames';
import { Button } from '@signozhq/ui/button';
import logEvent from 'api/common/logEvent';
import { Checkbox } from '@signozhq/ui/checkbox';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
import { AIAssistantEvents } from '../../../events';
import { useAIAssistantAnalyticsContext } from '../../../hooks/useAIAssistantAnalyticsContext';
@@ -83,27 +83,23 @@ export default function InteractiveQuestion({
{type === 'radio' ? (
<RadioGroup
- className={styles.options}
+ color="primary"
+ textOverflow="wrap"
onChange={(value): void => {
setSelected([value]);
handleSubmit([value]);
}}
- >
- {normalized.map((opt) => (
- <RadioGroupItem
- key={opt.value}
- value={opt.value}
- className={styles.option}
- >
- {opt.label}
- </RadioGroupItem>
- ))}
- </RadioGroup>
+ items={normalized.map((opt) => ({
+ value: opt.value,
+ label: <span className={styles.option}>{opt.label}</span>,
+ }))}
+ />
) : (
<>
<div className={cx(styles.options, styles.checkbox)}>
{normalized.map((opt) => (
<Checkbox
+ color="primary"
key={opt.value}
value={selected.includes(opt.value)}
onChange={(checked): void => {
@@ -113,16 +109,16 @@ export default function InteractiveQuestion({
: prev.filter((v) => v !== opt.value),
);
}}
- className={styles.option}
>
{opt.label}
</Checkbox>
))}
</div>
<Button
+ disabledTooltip="Select at least one option"
+ color="primary"
variant="solid"
size="sm"
- className={styles.submit}
disabled={selected.length === 0}
onClick={(): void => handleSubmit(selected)}
>
diff --git a/frontend/src/container/AIAssistant/components/blocks/RichCodeBlock/RichCodeBlock.tsx b/frontend/src/container/AIAssistant/components/blocks/RichCodeBlock/RichCodeBlock.tsx
index 7aea690ce7..53b716a05f 100644
--- a/frontend/src/container/AIAssistant/components/blocks/RichCodeBlock/RichCodeBlock.tsx
+++ b/frontend/src/container/AIAssistant/components/blocks/RichCodeBlock/RichCodeBlock.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useRef, useState } from 'react';
import { useCopyToClipboard } from 'react-use';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Check, Copy } from '@signozhq/icons';
import SyntaxHighlighter, {
a11yDark,
@@ -127,17 +127,19 @@ function CopyButton({ text }: { text: string }): JSX.Element {
};
return (
- <TooltipSimple title={copied ? 'Copied' : 'Copy code'}>
- <Button
- variant="ghost"
- size="sm"
- color="secondary"
- className={styles.copyBtn}
- onClick={handleCopy}
- aria-label={copied ? 'Copied' : 'Copy code'}
- >
- {copied ? <Check size={12} /> : <Copy size={12} />}
- </Button>
- </TooltipSimple>
+ <div className={styles.copyBtn}>
+ <Tooltip title={copied ? 'Copied' : 'Copy code'}>
+ <Button
+ variant="ghost"
+ size="sm"
+ color="secondary"
+ onClick={handleCopy}
+ aria-label={copied ? 'Copied' : 'Copy code'}
+ icon
+ >
+ {copied ? <Check size={12} /> : <Copy size={12} />}
+ </Button>
+ </Tooltip>
+ </div>
);
}
diff --git a/frontend/src/container/AlertHistory/Statistics/StatsCard/StatsCard.tsx b/frontend/src/container/AlertHistory/Statistics/StatsCard/StatsCard.tsx
index c8b7a6ff81..1858a4a8f0 100644
--- a/frontend/src/container/AlertHistory/Statistics/StatsCard/StatsCard.tsx
+++ b/frontend/src/container/AlertHistory/Statistics/StatsCard/StatsCard.tsx
@@ -124,15 +124,15 @@ function StatsCard({
<div className="icon">
<Calendar size={14} color={Color.BG_SLATE_200} />
</div>
- {relativeTime ? (
+ <Tooltip
+ title={
+ relativeTime
+ ? undefined
+ : `From ${formattedStartTimeForTooltip} to ${formattedEndTimeForTooltip}`
+ }
+ >
<div className="text">{displayTime}</div>
- ) : (
- <Tooltip
- title={`From ${formattedStartTimeForTooltip} to ${formattedEndTimeForTooltip}`}
- >
- <div className="text">{displayTime}</div>
- </Tooltip>
- )}
+ </Tooltip>
</div>
</div>
diff --git a/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.styles.scss b/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.styles.scss
index 32f42edf6a..935f304024 100644
--- a/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.styles.scss
+++ b/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.styles.scss
@@ -58,22 +58,14 @@
height: 100%;
overflow-y: auto;
- .anomaly-alert-evaluation-view-series-list-item {
- display: flex;
- flex-direction: row;
- gap: 8px;
-
- .anomaly-alert-evaluation-view-series-list-item-color {
- width: 6px;
- height: 6px;
- border-radius: 50%;
-
- display: inline-flex;
- margin-right: 8px;
- vertical-align: middle;
- }
-
- cursor: pointer;
+ .anomaly-alert-evaluation-view-series-list-item-color {
+ width: 6px;
+ height: 6px;
+ border-radius: 50%;
+
+ display: inline-flex;
+ margin-right: 8px;
+ vertical-align: middle;
}
&::-webkit-scrollbar {
diff --git a/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.tsx b/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.tsx
index 20427aae83..903a6cc7ee 100644
--- a/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.tsx
+++ b/frontend/src/container/AnomalyAlertEvaluationView/AnomalyAlertEvaluationView.tsx
@@ -320,7 +320,7 @@ function AnomalyAlertEvaluationView({
<div className="anomaly-alert-evaluation-view-series-list-items">
{filteredSeriesKeys.length > 0 && (
<Checkbox
- className="anomaly-alert-evaluation-view-series-list-item"
+ color="primary"
name="series"
value={selectedSeries === null}
onChange={(): void => handleSeriesChange(null)}
@@ -332,7 +332,7 @@ function AnomalyAlertEvaluationView({
{filteredSeriesKeys.map((seriesKey) => (
<div key={seriesKey}>
<Checkbox
- className="anomaly-alert-evaluation-view-series-list-item"
+ color="primary"
key={seriesKey}
name="series"
value={selectedSeries === seriesKey}
diff --git a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx
index eb0db1bffa..dedcb71441 100644
--- a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx
+++ b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { useSelector } from 'react-redux';
import { Spacing } from '@signozhq/design-tokens';
import { Button, Drawer } from 'antd';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Divider } from '@signozhq/ui/divider';
import { Typography } from '@signozhq/ui/typography';
import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
@@ -225,11 +225,13 @@ function DomainDetails({
timeRange={modalTimeRange}
/>
<div className="views-tabs-container">
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
onChange={handleTabChange}
value={selectedView}
- size="lg"
+ size="md"
items={[
{ value: VIEW_TYPES.ALL_ENDPOINTS, label: 'All Endpoints' },
{ value: VIEW_TYPES.ENDPOINT_STATS, label: 'Endpoint(s) Stats' },
diff --git a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx
index 6853d903ea..9776537f87 100644
--- a/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx
+++ b/frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx
@@ -171,7 +171,12 @@ function TopErrors({
/>
</div>
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
- <Switch value={showStatusCodeErrors} onChange={setShowStatusCodeErrors} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ value={showStatusCodeErrors}
+ onChange={setShowStatusCodeErrors}
+ />
<span style={{ color: 'white', fontSize: '14px' }}>
Status Message Exists
</span>
diff --git a/frontend/src/container/ApiMonitoring/Explorer/Explorer.styles.scss b/frontend/src/container/ApiMonitoring/Explorer/Explorer.styles.scss
index 333d619af4..72407f3d6d 100644
--- a/frontend/src/container/ApiMonitoring/Explorer/Explorer.styles.scss
+++ b/frontend/src/container/ApiMonitoring/Explorer/Explorer.styles.scss
@@ -6,6 +6,7 @@
display: flex;
align-items: center;
+ justify-content: space-between;
gap: 6px;
font-size: 14px;
diff --git a/frontend/src/container/ApiMonitoring/utils.tsx b/frontend/src/container/ApiMonitoring/utils.tsx
index a440202c4e..ea3f5118e7 100644
--- a/frontend/src/container/ApiMonitoring/utils.tsx
+++ b/frontend/src/container/ApiMonitoring/utils.tsx
@@ -973,7 +973,12 @@ export const getEndPointsColumnsConfig = (
})()}
{isGroupedByAttribute
? text.split(',').map((value) => (
- <Badge key={value} color="vanilla" className="endpoint-group-tag-item">
+ <Badge
+ textTransform="none"
+ variant="solid"
+ key={value}
+ color="secondary"
+ >
{value === '' ? '<no-value>' : value}
</Badge>
))
diff --git a/frontend/src/container/AppLayout/AppLayout.styles.scss b/frontend/src/container/AppLayout/AppLayout.styles.scss
index a6341236c5..9da434d132 100644
--- a/frontend/src/container/AppLayout/AppLayout.styles.scss
+++ b/frontend/src/container/AppLayout/AppLayout.styles.scss
@@ -139,6 +139,14 @@
}
}
+.trial-expiry-banner {
+ display: inline-flex;
+ width: 100%;
+ justify-content: center;
+ align-items: center;
+ gap: var(--spacing-4);
+}
+
.trial-expiry-banner,
.slow-api-warning-banner,
.workspace-restricted-banner {
diff --git a/frontend/src/container/BillingContainer/BillingContainer.authz.test.tsx b/frontend/src/container/BillingContainer/BillingContainer.authz.test.tsx
index 86269831a9..a42e338fcb 100644
--- a/frontend/src/container/BillingContainer/BillingContainer.authz.test.tsx
+++ b/frontend/src/container/BillingContainer/BillingContainer.authz.test.tsx
@@ -36,7 +36,10 @@ describe('BillingContainer - AuthZ', () => {
screen.findByRole('columnheader', { name: /data ingested/i }),
).resolves.toBeInTheDocument();
await waitFor(() => {
- expect(screen.getByTestId('header-billing-button')).toBeEnabled();
+ expect(screen.getByTestId('header-billing-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
expect(screen.queryByText(/not authorized/i)).not.toBeInTheDocument();
});
@@ -61,9 +64,15 @@ describe('BillingContainer - AuthZ', () => {
render(<BillingContainer />);
await waitFor(() => {
- expect(screen.getByTestId('header-billing-button')).toBeDisabled();
+ expect(screen.getByTestId('header-billing-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- expect(screen.getByTestId('upgrade-plan-button')).toBeDisabled();
+ expect(screen.getByTestId('upgrade-plan-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('disables manage billing when subscription update is denied', async () => {
@@ -82,7 +91,10 @@ describe('BillingContainer - AuthZ', () => {
);
await waitFor(() => {
- expect(screen.getByTestId('header-billing-button')).toBeDisabled();
+ expect(screen.getByTestId('header-billing-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
expect(screen.queryByTestId('upgrade-plan-button')).not.toBeInTheDocument();
});
@@ -107,7 +119,10 @@ describe('BillingContainer - AuthZ', () => {
);
await waitFor(() => {
- expect(screen.getByTestId('header-billing-button')).toBeDisabled();
+ expect(screen.getByTestId('header-billing-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/container/BillingContainer/BillingContainer.module.scss b/frontend/src/container/BillingContainer/BillingContainer.module.scss
index 0fa7fa3628..f62b577ffa 100644
--- a/frontend/src/container/BillingContainer/BillingContainer.module.scss
+++ b/frontend/src/container/BillingContainer/BillingContainer.module.scss
@@ -46,14 +46,6 @@
:global(.ant-card) {
padding: var(--padding-3);
}
-
- .billingManageBtn {
- background: var(--l3-background);
-
- &:hover {
- background: var(--l3-background-hover);
- }
- }
}
.billingSummary {
@@ -161,14 +153,7 @@
padding: var(--padding-3) var(--padding-4);
border-top: 1px solid var(--l1-border);
background: var(--l2-background);
-
- .billingFooterBtn {
- background: var(--l3-background);
-
- &:hover {
- background: var(--l3-background-hover);
- }
- }
+ align-items: center;
}
}
diff --git a/frontend/src/container/BillingContainer/BillingContainer.tsx b/frontend/src/container/BillingContainer/BillingContainer.tsx
index 7a697c9e4a..0af09e0639 100644
--- a/frontend/src/container/BillingContainer/BillingContainer.tsx
+++ b/frontend/src/container/BillingContainer/BillingContainer.tsx
@@ -436,7 +436,14 @@ export default function BillingContainer(): JSX.Element {
<Flex vertical gap={8}>
<p className={styles.pageInfoTitle}>
{isCloudUserVal ? t('teams_cloud') : t('teams')}{' '}
- {isFreeTrial ? <Badge color="success"> Free Trial </Badge> : ''}
+ {isFreeTrial ? (
+ <Badge variant="solid" color="success">
+ {' '}
+ Free Trial{' '}
+ </Badge>
+ ) : (
+ ''
+ )}
</p>
{billingData && !isFetchingBillingData && !showGracePeriodMessage ? (
@@ -455,7 +462,6 @@ export default function BillingContainer(): JSX.Element {
disabled={isLoading}
onClick={handleBilling}
prefix={<Landmark size={14} />}
- className={styles.billingManageBtn}
>
{trialInfo?.trialConvertedToSubscription
? t('manage_billing')
@@ -539,14 +545,10 @@ export default function BillingContainer(): JSX.Element {
onClick={handleCsvDownload}
prefix={<MonitorDown size={14} />}
testId="download-csv-button"
- className={styles.billingFooterBtn}
>
Download CSV
</Button>
- <RefreshPaymentStatus
- type="button"
- className={styles.billingFooterBtn}
- />
+ <RefreshPaymentStatus type="button" />
</div>
)}
</div>
diff --git a/frontend/src/container/BillingContainer/CancelSubscriptionBanner.module.scss b/frontend/src/container/BillingContainer/CancelSubscriptionBanner.module.scss
index b03281c45c..df424749f5 100644
--- a/frontend/src/container/BillingContainer/CancelSubscriptionBanner.module.scss
+++ b/frontend/src/container/BillingContainer/CancelSubscriptionBanner.module.scss
@@ -63,11 +63,6 @@
}
}
-.cancelButton {
- background: var(--secondary-background);
- border: 1px solid var(--l1-border);
-}
-
.fallbackBody {
display: flex;
flex-direction: column;
diff --git a/frontend/src/container/BillingContainer/CancelSubscriptionBanner.test.tsx b/frontend/src/container/BillingContainer/CancelSubscriptionBanner.test.tsx
index 2e5bf10351..b58b71ffbb 100644
--- a/frontend/src/container/BillingContainer/CancelSubscriptionBanner.test.tsx
+++ b/frontend/src/container/BillingContainer/CancelSubscriptionBanner.test.tsx
@@ -56,7 +56,10 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeDisabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -77,7 +80,10 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
@@ -98,19 +104,22 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
const confirmButton = screen.getByTestId('cancel-subscription-confirm-btn');
- expect(confirmButton).toBeDisabled();
+ expect(confirmButton).toHaveAttribute('aria-disabled', 'true');
const input = screen.getByTestId('cancel-confirm-input');
await user.type(input, 'canc');
- expect(confirmButton).toBeDisabled();
+ expect(confirmButton).toHaveAttribute('aria-disabled', 'true');
await user.type(input, 'el');
- expect(confirmButton).toBeEnabled();
+ expect(confirmButton).not.toHaveAttribute('aria-disabled', 'true');
});
it('closes dialog and resets input when Go back is clicked', async () => {
@@ -118,7 +127,10 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
@@ -131,7 +143,10 @@ describe('CancelSubscriptionBanner', () => {
);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
expect(screen.getByTestId('cancel-confirm-input')).toHaveValue('');
@@ -144,7 +159,10 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
@@ -177,7 +195,10 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
@@ -192,24 +213,28 @@ describe('CancelSubscriptionBanner', () => {
);
});
- it('retry link is a native anchor with correct mailto href in fallback view', async () => {
+ it('retry button opens the mailto link in fallback view', async () => {
mockMailto();
+ const openSpy = jest.spyOn(window, 'open').mockImplementation(() => null);
const user = userEvent.setup({ pointerEventsCheck: 0 });
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
await user.click(screen.getByTestId('cancel-subscription-confirm-btn'));
- const retryLink = screen.getByTestId('retry-mailto-btn');
- expect(retryLink.tagName).toBe('A');
- expect(retryLink).toHaveAttribute(
- 'href',
+ await user.click(screen.getByTestId('retry-mailto-btn'));
+ expect(openSpy).toHaveBeenCalledWith(
expect.stringContaining('mailto:[email protected]'),
+ '_blank',
+ 'noopener,noreferrer',
);
});
@@ -220,7 +245,10 @@ describe('CancelSubscriptionBanner', () => {
render(<CancelSubscriptionBanner />);
await waitFor(() => {
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled();
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('cancel-subscription-btn'));
await user.type(screen.getByTestId('cancel-confirm-input'), 'cancel');
diff --git a/frontend/src/container/BillingContainer/CancelSubscriptionBanner.tsx b/frontend/src/container/BillingContainer/CancelSubscriptionBanner.tsx
index c8126a8b56..6e8802eab0 100644
--- a/frontend/src/container/BillingContainer/CancelSubscriptionBanner.tsx
+++ b/frontend/src/container/BillingContainer/CancelSubscriptionBanner.tsx
@@ -141,6 +141,7 @@ function CancelSubscriptionBanner(): JSX.Element {
const confirmFooter = (
<>
<Button
+ size="md"
variant="solid"
color="secondary"
prefix={<Undo2 size={14} />}
@@ -149,12 +150,14 @@ function CancelSubscriptionBanner(): JSX.Element {
Go back
</Button>
<Button
+ disabledTooltip="Type cancel to confirm"
+ size="md"
variant="solid"
- color="destructive"
+ color="danger"
prefix={<X size={14} />}
disabled={confirmText !== 'cancel'}
onClick={handleContactSupport}
- data-testid="cancel-subscription-confirm-btn"
+ testId="cancel-subscription-confirm-btn"
>
Cancel subscription
</Button>
@@ -162,7 +165,7 @@ function CancelSubscriptionBanner(): JSX.Element {
);
const fallbackFooter = (
- <Button variant="solid" color="secondary" onClick={handleClose}>
+ <Button size="md" variant="solid" color="secondary" onClick={handleClose}>
Close
</Button>
);
@@ -181,12 +184,12 @@ function CancelSubscriptionBanner(): JSX.Element {
</span>
</div>
<AuthZButton
+ size="md"
checks={[SubscriptionDeletePermission]}
variant="solid"
color="secondary"
prefix={<X size={12} />}
onClick={handleOpenCancelDialog}
- className={styles.cancelButton}
testId="cancel-subscription-btn"
>
Cancel Subscription
@@ -226,30 +229,32 @@ function CancelSubscriptionBanner(): JSX.Element {
<span className={styles.fallbackEmail}>{SUPPORT_EMAIL}</span>
<div className={styles.fallbackActions}>
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={copied ? <CircleCheck size={14} /> : <Copy size={14} />}
onClick={handleCopyTemplate}
- data-testid="copy-email-template-btn"
+ testId="copy-email-template-btn"
>
{copied ? 'Copied!' : 'Copy email template'}
</Button>
<Button
- asChild
+ size="md"
variant="outlined"
color="secondary"
- data-testid="retry-mailto-btn"
+ testId="retry-mailto-btn"
+ prefix={<MailOpen size={14} />}
+ onClick={(): void => {
+ handleRetryMailto();
+ // oxlint-disable-next-line signoz/no-raw-absolute-path -- mailto is an external mail client URL, not an in-app path
+ window.open(
+ buildMailtoUri(orgName, userEmail),
+ '_blank',
+ 'noopener,noreferrer',
+ );
+ }}
>
- <a
- href={buildMailtoUri(orgName, userEmail)}
- onClick={handleRetryMailto}
- className={styles.retryLink}
- target="_blank"
- rel="noopener noreferrer"
- >
- <MailOpen size={14} />
- Reopen email client
- </a>
+ Reopen email client
</Button>
</div>
</div>
diff --git a/frontend/src/container/BottomStrip/AskNoz/AskNoz.tsx b/frontend/src/container/BottomStrip/AskNoz/AskNoz.tsx
index 2ddaa11c87..7a22352241 100644
--- a/frontend/src/container/BottomStrip/AskNoz/AskNoz.tsx
+++ b/frontend/src/container/BottomStrip/AskNoz/AskNoz.tsx
@@ -1,6 +1,6 @@
import { useLocation } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import Noz from 'components/Noz/Noz';
import { NOZ_TOOLTIP_TITLE } from 'components/Noz/Noz.constants';
import { selectPendingUserInputStreamCount } from 'container/AIAssistant/store/pendingInputSelectors';
@@ -50,25 +50,26 @@ function AskNoz(): JSX.Element | null {
</span>
</span>
)}
- <TooltipSimple title={NOZ_TOOLTIP_TITLE}>
- <Button
- variant="ghost"
- color="secondary"
- size="sm"
- className="noz-wave"
- prefix={<Noz size={16} />}
- onClick={(): void => openAIAssistant()}
- aria-label={
- showPendingBadge
- ? `Ask Noz, ${pendingUserInputCount} ${
- pendingUserInputCount === 1 ? 'action needs' : 'actions need'
- } your response`
- : 'Ask Noz'
- }
- >
- Ask Noz
- </Button>
- </TooltipSimple>
+ <span className="noz-wave">
+ <Tooltip title={NOZ_TOOLTIP_TITLE}>
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ prefix={<Noz size={16} />}
+ onClick={(): void => openAIAssistant()}
+ aria-label={
+ showPendingBadge
+ ? `Ask Noz, ${pendingUserInputCount} ${
+ pendingUserInputCount === 1 ? 'action needs' : 'actions need'
+ } your response`
+ : 'Ask Noz'
+ }
+ >
+ Ask Noz
+ </Button>
+ </Tooltip>
+ </span>
</div>
);
}
diff --git a/frontend/src/container/Controls/index.tsx b/frontend/src/container/Controls/index.tsx
index c562010fd2..8e149ea9e8 100644
--- a/frontend/src/container/Controls/index.tsx
+++ b/frontend/src/container/Controls/index.tsx
@@ -34,9 +34,21 @@ function Controls({
[countPerPage, isLogPanel, isNextAndPreviousDisabled, totalCount],
);
+ const getDisabledReason = (edgeReason: string): string => {
+ if (isLoading) {
+ return 'Wait for the results to load';
+ }
+ if (totalCount === 0) {
+ return 'There are no results';
+ }
+ return edgeReason;
+ };
+
return (
<div className={styles.container}>
<Button
+ disabledTooltip={getDisabledReason('You are on the first page')}
+ color="primary"
variant="link"
size="md"
disabled={isPreviousDisabled}
@@ -46,6 +58,8 @@ function Controls({
Previous
</Button>
<Button
+ disabledTooltip={getDisabledReason('You are on the last page')}
+ color="primary"
variant="link"
size="md"
disabled={isNextDisabled}
diff --git a/frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx b/frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx
index 16056781c6..f6d18f81e4 100644
--- a/frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx
+++ b/frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx
@@ -66,7 +66,13 @@ function SelectAlertType({ onSelect }: SelectAlertTypeProps): JSX.Element {
<AlertTypeCard
key={option.selection}
title={option.title}
- extra={option.isBeta ? <Badge color="robin">Beta</Badge> : undefined}
+ extra={
+ option.isBeta ? (
+ <Badge variant="solid" color="primary">
+ Beta
+ </Badge>
+ ) : undefined
+ }
onClick={(e): void => {
onSelect(option.selection, isModifierKeyPressed(e));
}}
diff --git a/frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx b/frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx
index b8fe066b40..819d518da9 100644
--- a/frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx
+++ b/frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx
@@ -445,6 +445,8 @@ export function RoutingPolicyBanner({
</Typography.Text>
<div className="routing-policies-info-banner-right">
<Switch
+ color="primary"
+ textPlacement="right"
value={notificationSettings.routingPolicies}
testId="routing-policies-switch"
onChange={(value): void => {
diff --git a/frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx b/frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx
index c386b7a06b..a265e45d82 100644
--- a/frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx
+++ b/frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx
@@ -50,7 +50,12 @@ function AdvancedOptionItem({
>
{input}
</div>
- <Switch onChange={handleOnToggle} value={showInput} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ onChange={handleOnToggle}
+ value={showInput}
+ />
</div>
</div>
);
diff --git a/frontend/src/container/CreateAlertV2/EvaluationSettings/__tests__/utils.test.ts b/frontend/src/container/CreateAlertV2/EvaluationSettings/__tests__/utils.test.ts
index 183d1e3ef3..c930d54f26 100644
--- a/frontend/src/container/CreateAlertV2/EvaluationSettings/__tests__/utils.test.ts
+++ b/frontend/src/container/CreateAlertV2/EvaluationSettings/__tests__/utils.test.ts
@@ -1,7 +1,7 @@
// Mock dayjs before importing any other modules
-const MOCK_DATE_STRING = '2024-01-15T00:30:00Z';
-const MOCK_DATE_STRING_NON_LEAP_YEAR = '2023-01-15T00:30:00Z';
-const MOCK_DATE_STRING_SPANS_MONTHS = '2024-01-31T00:30:00Z';
+const MOCK_DATE_STRING = '2024-01-15T00:30:00';
+const MOCK_DATE_STRING_NON_LEAP_YEAR = '2023-01-15T00:30:00';
+const MOCK_DATE_STRING_SPANS_MONTHS = '2024-01-31T00:30:00';
const FREQ_DAILY = 'FREQ=DAILY';
const TEN_THIRTY_TIME = '10:30:00';
const NINE_AM_TIME = '09:00:00';
diff --git a/frontend/src/container/CreateAlertV2/Footer/Footer.tsx b/frontend/src/container/CreateAlertV2/Footer/Footer.tsx
index 5ee3dca466..f69cc5850b 100644
--- a/frontend/src/container/CreateAlertV2/Footer/Footer.tsx
+++ b/frontend/src/container/CreateAlertV2/Footer/Footer.tsx
@@ -1,13 +1,12 @@
import { useCallback, useMemo } from 'react';
import { Button } from '@signozhq/ui/button';
import { toast } from '@signozhq/ui/sonner';
-import { Tooltip } from 'antd';
import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
import type { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
import { AxiosError } from 'axios';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { Check, Loader, Send, X } from '@signozhq/icons';
+import { Check, Send, X } from '@signozhq/icons';
import { useErrorModal } from 'providers/ErrorModalProvider';
import { toPostableRuleDTO } from 'types/api/alerts/convert';
import APIError from 'types/api/error';
@@ -176,84 +175,78 @@ function Footer(): JSX.Element {
handleApiError,
]);
- const disableButtons =
- isCreatingAlertRule || isTestingAlertRule || isUpdatingAlertRule;
+ const isSavingAlertRule = isCreatingAlertRule || isUpdatingAlertRule;
+ const disableButtons = isSavingAlertRule || isTestingAlertRule;
- const saveAlertButton = useMemo(() => {
- let button = (
+ const saveAlertButton = useMemo(
+ () => (
<Button
+ disabledTooltip={
+ alertValidationMessage || 'Wait for the test notification to finish'
+ }
+ size="md"
variant="solid"
color="primary"
onClick={handleSaveAlert}
- disabled={disableButtons || Boolean(alertValidationMessage)}
+ disabled={isTestingAlertRule || Boolean(alertValidationMessage)}
+ loading={isSavingAlertRule}
+ prefix={<Check data-testid="save-alert-rule-check-icon" size={14} />}
testId="save-alert-rule-button"
>
- {isCreatingAlertRule || isUpdatingAlertRule ? (
- <Loader data-testid="save-alert-rule-loader-icon" size={14} />
- ) : (
- <Check data-testid="save-alert-rule-check-icon" size={14} />
- )}
Save Alert Rule
</Button>
- );
- if (alertValidationMessage) {
- button = (
- <Tooltip title={alertValidationMessage}>
- <span>{button}</span>
- </Tooltip>
- );
- }
- return button;
- }, [
- alertValidationMessage,
- disableButtons,
- handleSaveAlert,
- isCreatingAlertRule,
- isUpdatingAlertRule,
- ]);
+ ),
+ [
+ alertValidationMessage,
+ handleSaveAlert,
+ isSavingAlertRule,
+ isTestingAlertRule,
+ ],
+ );
- const testAlertButton = useMemo(() => {
- let button = (
+ const testAlertButton = useMemo(
+ () => (
<Button
+ disabledTooltip={
+ alertValidationMessage || 'Wait for the alert rule to finish saving'
+ }
+ size="md"
variant="solid"
color="secondary"
onClick={handleTestNotification}
- disabled={disableButtons || Boolean(alertValidationMessage)}
+ disabled={isSavingAlertRule || Boolean(alertValidationMessage)}
+ loading={isTestingAlertRule}
+ prefix={<Send data-testid="test-notification-send-icon" size={14} />}
testId="test-notification-button"
>
- {isTestingAlertRule ? (
- <Loader data-testid="test-notification-loader-icon" size={14} />
- ) : (
- <Send data-testid="test-notification-send-icon" size={14} />
- )}
Test Notification
</Button>
- );
- if (alertValidationMessage) {
- button = (
- <Tooltip title={alertValidationMessage}>
- <span>{button}</span>
- </Tooltip>
- );
- }
- return button;
- }, [
- alertValidationMessage,
- disableButtons,
- handleTestNotification,
- isTestingAlertRule,
- ]);
+ ),
+ [
+ alertValidationMessage,
+ handleTestNotification,
+ isSavingAlertRule,
+ isTestingAlertRule,
+ ],
+ );
return (
<div className="create-alert-v2-footer">
<Button
+ disabledTooltip={
+ isTestingAlertRule
+ ? 'Wait for the test notification to finish'
+ : 'Wait for the alert rule to finish saving'
+ }
+ size="md"
variant="solid"
color="secondary"
onClick={handleDiscard}
disabled={disableButtons}
testId="discard-alert-rule-button"
+ prefix={<X size={14} />}
>
- <X size={14} /> Discard
+ Discard
</Button>
<div className="button-group">
{testAlertButton}
diff --git a/frontend/src/container/CreateAlertV2/Footer/__tests__/Footer.test.tsx b/frontend/src/container/CreateAlertV2/Footer/__tests__/Footer.test.tsx
index 78ab6f474a..2ec39ef336 100644
--- a/frontend/src/container/CreateAlertV2/Footer/__tests__/Footer.test.tsx
+++ b/frontend/src/container/CreateAlertV2/Footer/__tests__/Footer.test.tsx
@@ -79,11 +79,6 @@ const SAVE_ALERT_RULE_TEXT = 'Save Alert Rule';
const TEST_NOTIFICATION_TEXT = 'Test Notification';
const DISCARD_TEXT = 'Discard';
-const SAVE_ALERT_RULE_CHECK_ICON = 'save-alert-rule-check-icon';
-const SAVE_ALERT_RULE_LOADER_ICON = 'save-alert-rule-loader-icon';
-const TEST_NOTIFICATION_LOADER_ICON = 'test-notification-loader-icon';
-const TEST_NOTIFICATION_SEND_ICON = 'test-notification-send-icon';
-
describe('Footer', () => {
beforeEach(() => {
useQueryBuilder.mockReturnValue({
@@ -147,11 +142,14 @@ describe('Footer', () => {
expect(
screen.getByRole('button', { name: /save alert rule/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /test notification/i }),
- ).toBeDisabled();
- expect(screen.getByRole('button', { name: /discard/i })).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
+ expect(screen.getByRole('button', { name: /discard/i })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('all buttons are disabled when updating alert rule', () => {
@@ -164,11 +162,14 @@ describe('Footer', () => {
// Target the button elements directly instead of the text spans inside them
expect(
screen.getByRole('button', { name: /save alert rule/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /test notification/i }),
- ).toBeDisabled();
- expect(screen.getByRole('button', { name: /discard/i })).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
+ expect(screen.getByRole('button', { name: /discard/i })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('all buttons are disabled when testing alert rule', () => {
@@ -181,11 +182,14 @@ describe('Footer', () => {
// Target the button elements directly instead of the text spans inside them
expect(
screen.getByRole('button', { name: /save alert rule/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /test notification/i }),
- ).toBeDisabled();
- expect(screen.getByRole('button', { name: /discard/i })).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
+ expect(screen.getByRole('button', { name: /discard/i })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('create and test buttons are disabled when alert name is missing', () => {
@@ -200,10 +204,10 @@ describe('Footer', () => {
expect(
screen.getByRole('button', { name: /save alert rule/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /test notification/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('create and test buttons are disabled when notifcation channels are missing and routing policies are disabled', () => {
@@ -228,10 +232,10 @@ describe('Footer', () => {
expect(
screen.getByRole('button', { name: /save alert rule/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /test notification/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('buttons are enabled even with no notification channels when routing policies are enabled', () => {
@@ -256,55 +260,49 @@ describe('Footer', () => {
expect(
screen.getByRole('button', { name: /save alert rule/i }),
- ).toBeEnabled();
+ ).not.toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /test notification/i }),
- ).toBeEnabled();
- expect(screen.getByRole('button', { name: /discard/i })).toBeEnabled();
+ ).not.toHaveAttribute('aria-disabled', 'true');
+ expect(screen.getByRole('button', { name: /discard/i })).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- it('should show loader icon on test notification button when testing alert rule', () => {
+ it('should show loading state on test notification button when testing alert rule', () => {
jest.spyOn(createAlertState, 'useCreateAlertState').mockReturnValueOnce({
...mockAlertContextState,
isTestingAlertRule: true,
});
render(<WrappedFooter />);
- // When testing alert rule, the play icon is replaced with a loader icon
expect(
- screen.queryByTestId(TEST_NOTIFICATION_SEND_ICON),
- ).not.toBeInTheDocument();
-
- expect(screen.getByTestId(TEST_NOTIFICATION_LOADER_ICON)).toBeInTheDocument();
+ screen.getByRole('button', { name: /test notification/i }),
+ ).toHaveAttribute('aria-busy', 'true');
});
- it('should not show check icon on save alert rule button when updating alert rule', () => {
+ it('should show loading state on save alert rule button when updating alert rule', () => {
jest.spyOn(createAlertState, 'useCreateAlertState').mockReturnValueOnce({
...mockAlertContextState,
isUpdatingAlertRule: true,
});
render(<WrappedFooter />);
- // When updating alert rule, the check icon is replaced with a loader icon
expect(
- screen.queryByTestId(SAVE_ALERT_RULE_CHECK_ICON),
- ).not.toBeInTheDocument();
-
- expect(screen.getByTestId(SAVE_ALERT_RULE_LOADER_ICON)).toBeInTheDocument();
+ screen.getByRole('button', { name: /save alert rule/i }),
+ ).toHaveAttribute('aria-busy', 'true');
});
- it('should not show check icon on save alert rule button when creating alert rule', () => {
+ it('should show loading state on save alert rule button when creating alert rule', () => {
jest.spyOn(createAlertState, 'useCreateAlertState').mockReturnValueOnce({
...mockAlertContextState,
isCreatingAlertRule: true,
});
render(<WrappedFooter />);
- // When creating alert rule, the check icon is replaced with a loader icon
expect(
- screen.queryByTestId(SAVE_ALERT_RULE_CHECK_ICON),
- ).not.toBeInTheDocument();
-
- expect(screen.getByTestId(SAVE_ALERT_RULE_LOADER_ICON)).toBeInTheDocument();
+ screen.getByRole('button', { name: /save alert rule/i }),
+ ).toHaveAttribute('aria-busy', 'true');
});
});
diff --git a/frontend/src/container/CreateAlertV2/NotificationSettings/MultipleNotifications.tsx b/frontend/src/container/CreateAlertV2/NotificationSettings/MultipleNotifications.tsx
index 1f5b996208..801ea03b82 100644
--- a/frontend/src/container/CreateAlertV2/NotificationSettings/MultipleNotifications.tsx
+++ b/frontend/src/container/CreateAlertV2/NotificationSettings/MultipleNotifications.tsx
@@ -85,34 +85,34 @@ function MultipleNotifications(): JSX.Element {
const placeholder = isMultipleNotificationsEnabled
? 'Select fields to group by (optional)'
: 'No grouping fields available';
- let input = (
- <div>
- <Select
- options={spaceAggregationOptions}
- onChange={onSelectChange}
- value={notificationSettings.multipleNotifications}
- mode="multiple"
- placeholder={placeholder}
- disabled={!isMultipleNotificationsEnabled}
- aria-disabled={!isMultipleNotificationsEnabled}
- maxTagCount={3}
- data-testid="multiple-notifications-select"
- />
- {isMultipleNotificationsEnabled && (
- <Typography.Text className="multiple-notifications-select-description">
- {groupByDescription}
- </Typography.Text>
- )}
- </div>
+ return (
+ <Tooltip
+ title={
+ isMultipleNotificationsEnabled
+ ? undefined
+ : "Add 'Group by' fields to your query to enable alert grouping"
+ }
+ >
+ <div>
+ <Select
+ options={spaceAggregationOptions}
+ onChange={onSelectChange}
+ value={notificationSettings.multipleNotifications}
+ mode="multiple"
+ placeholder={placeholder}
+ disabled={!isMultipleNotificationsEnabled}
+ aria-disabled={!isMultipleNotificationsEnabled}
+ maxTagCount={3}
+ data-testid="multiple-notifications-select"
+ />
+ {isMultipleNotificationsEnabled && (
+ <Typography.Text className="multiple-notifications-select-description">
+ {groupByDescription}
+ </Typography.Text>
+ )}
+ </div>
+ </Tooltip>
);
- if (!isMultipleNotificationsEnabled) {
- input = (
- <Tooltip title="Add 'Group by' fields to your query to enable alert grouping">
- {input}
- </Tooltip>
- );
- }
- return input;
}, [
groupByDescription,
isMultipleNotificationsEnabled,
diff --git a/frontend/src/container/CustomDomainSettings/CustomDomainEditModal.tsx b/frontend/src/container/CustomDomainSettings/CustomDomainEditModal.tsx
index 15e0a7226d..b9250505ba 100644
--- a/frontend/src/container/CustomDomainSettings/CustomDomainEditModal.tsx
+++ b/frontend/src/container/CustomDomainSettings/CustomDomainEditModal.tsx
@@ -192,12 +192,13 @@ export default function CustomDomainEditModal({
/>
) : (
<Button
+ disabledTooltip="Change the workspace URL first"
variant="solid"
size="md"
color="primary"
- className="edit-modal-apply-btn"
+ width="100%"
onClick={handleSubmit}
- disabled={isLoading || value === initialSubdomain}
+ disabled={value === initialSubdomain}
loading={isLoading}
>
Apply Changes
diff --git a/frontend/src/container/CustomDomainSettings/CustomDomainSettings.styles.scss b/frontend/src/container/CustomDomainSettings/CustomDomainSettings.styles.scss
index 8de19ab0de..9bf45950bf 100644
--- a/frontend/src/container/CustomDomainSettings/CustomDomainSettings.styles.scss
+++ b/frontend/src/container/CustomDomainSettings/CustomDomainSettings.styles.scss
@@ -362,10 +362,6 @@
}
}
-.edit-modal-apply-btn {
- width: 100%;
-}
-
.custom-domain-toast {
display: flex;
align-items: center;
@@ -392,24 +388,6 @@
align-items: center;
gap: var(--spacing-4);
flex-shrink: 0;
- }
-
- .custom-domain-toast-visit-btn {
- text-decoration: none;
- background: var(--bg-robin-600);
-
- &:hover {
- background: var(--primary-background-hover);
- }
- }
-
- .custom-domain-toast-dismiss-btn {
- color: var(--callout-primary-icon);
- height: 24px;
- width: 24px;
-
- &:hover {
- background: var(--primary-background-hover);
- }
+ --button-variant-ghost-color: var(--bg-base-white);
}
}
diff --git a/frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx b/frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx
index cd905f165b..8654e0f0d8 100644
--- a/frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx
+++ b/frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx
@@ -11,11 +11,7 @@ import {
} from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { Callout } from '@signozhq/ui/callout';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { toast } from '@signozhq/ui/sonner';
import { Skeleton } from 'antd';
import {
@@ -48,9 +44,9 @@ function DomainUpdateToast({
</span>
<div className="custom-domain-toast-actions">
<Button
+ color="secondary"
variant="ghost"
size="sm"
- className="custom-domain-toast-visit-btn"
suffix={<ExternalLink size={12} />}
onClick={(): void => {
// oxlint-disable-next-line signoz/no-raw-absolute-path
@@ -60,15 +56,17 @@ function DomainUpdateToast({
Visit new URL
</Button>
<Button
+ color="secondary"
variant="ghost"
- size="icon"
- className="custom-domain-toast-dismiss-btn"
+ size="sm"
+ icon
onClick={(): void => {
toast.dismiss(toastId);
}}
aria-label="Dismiss"
- prefix={<X size={14} />}
- />
+ >
+ <X size={14} />
+ </Button>
</div>
</div>
);
@@ -181,6 +179,33 @@ export default function CustomDomainSettings(): JSX.Element {
const workspaceName =
org?.[0]?.displayName || customDomainSubdomain || activeHost?.name;
+ const workspaceUrlItems: DropdownItemType[] = [
+ {
+ type: 'group',
+ value: 'all-workspace-urls',
+ label: 'All Workspace URLs',
+ items: sortedHosts.map((host) => ({
+ type: 'link',
+ value: host.name,
+ label: stripProtocol(host.url),
+ suffix:
+ host.name === activeHost?.name ? (
+ <Check size={14} />
+ ) : (
+ <ExternalLink size={12} />
+ ),
+ render: (
+ <a
+ href={host.url}
+ target="_blank"
+ rel="noopener noreferrer"
+ aria-label={stripProtocol(host.url)}
+ />
+ ),
+ })),
+ },
+ ];
+
if (isLoadingHosts) {
return (
<div className="custom-domain-card custom-domain-card--loading">
@@ -205,54 +230,24 @@ export default function CustomDomainSettings(): JSX.Element {
!workspaceName ? 'workspace-name-hidden' : ''
}`}
>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="link"
- color="none"
- data-testid="custom-domain-menu-trigger"
- disabled={isFetchingHosts}
- >
- <Link2 size={12} />
- <span>{stripProtocol(activeHost?.url ?? '')}</span>
- <ChevronDown size={12} />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start">
- <div className="workspace-url-dropdown">
- <span className="workspace-url-dropdown-header">
- All Workspace URLs
- </span>
- <div className="workspace-url-dropdown-divider" />
- {sortedHosts.map((host) => {
- const isActive = host.name === activeHost?.name;
- return (
- <a
- key={host.name}
- href={host.url}
- target="_blank"
- rel="noopener noreferrer"
- className={`workspace-url-dropdown-item${
- isActive ? ' workspace-url-dropdown-item--active' : ''
- }`}
- >
- <span className="workspace-url-dropdown-item-label">
- {stripProtocol(host.url ?? '')}
- </span>
- {isActive ? (
- <Check size={14} className="workspace-url-dropdown-item-check" />
- ) : (
- <ExternalLink
- size={12}
- className="workspace-url-dropdown-item-external"
- />
- )}
- </a>
- );
- })}
- </div>
- </DropdownMenuContent>
- </DropdownMenu>
+ <Dropdown
+ items={workspaceUrlItems}
+ nativeButton
+ align="start"
+ side="bottom"
+ >
+ <Button
+ size="md"
+ variant="link"
+ color="secondary"
+ testId="custom-domain-menu-trigger"
+ loading={isFetchingHosts}
+ prefix={<Link2 size={12} />}
+ suffix={<ChevronDown size={12} />}
+ >
+ <span>{stripProtocol(activeHost?.url ?? '')}</span>
+ </Button>
+ </Dropdown>
<span className="custom-domain-card-meta-timezone">
<Clock size={11} />
{timezone.offset}
@@ -261,10 +256,13 @@ export default function CustomDomainSettings(): JSX.Element {
</div>
<Button
+ disabledTooltip="Wait for the URL update to finish"
+ size="md"
variant="solid"
color="secondary"
prefix={<FilePenLine size={12} />}
- disabled={isFetchingHosts || isPollingEnabled}
+ disabled={isPollingEnabled}
+ loading={isFetchingHosts}
onClick={(): void => setIsEditModalOpen(true)}
>
Edit workspace link
diff --git a/frontend/src/container/CustomDomainSettings/__tests__/CustomDomainSettings.test.tsx b/frontend/src/container/CustomDomainSettings/__tests__/CustomDomainSettings.test.tsx
index e26aa98736..b4691346fa 100644
--- a/frontend/src/container/CustomDomainSettings/__tests__/CustomDomainSettings.test.tsx
+++ b/frontend/src/container/CustomDomainSettings/__tests__/CustomDomainSettings.test.tsx
@@ -154,7 +154,7 @@ describe('CustomDomainSettings', () => {
);
// Both host URLs should appear as links in the dropdown
- const links = await screen.findAllByRole('link');
+ const links = await screen.findAllByRole('menuitem');
const hostLinks = links.filter(
(link) =>
link.getAttribute('href')?.includes('test.cloud') &&
diff --git a/frontend/src/container/Download/Download.tsx b/frontend/src/container/Download/Download.tsx
index 5cfa3b79fe..d5983bd2c0 100644
--- a/frontend/src/container/Download/Download.tsx
+++ b/frontend/src/container/Download/Download.tsx
@@ -1,6 +1,6 @@
import { useState } from 'react';
import { CloudDownload } from '@signozhq/icons';
-import { DropdownMenuSimple, type MenuProps } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Button, Flex } from 'antd';
import { unparse } from 'papaparse';
@@ -52,23 +52,23 @@ function Download({ data, isLoading, fileName }: DownloadProps): JSX.Element {
downloadLink.remove();
};
- const menu: MenuProps = {
- items: [
- {
- key: 'download-as-excel',
- label: 'Excel',
- onClick: downloadExcelFile,
- },
- {
- key: 'download-as-csv',
- label: 'CSV',
- onClick: downloadCsvFile,
- },
- ],
- };
+ const items: DropdownItemType[] = [
+ {
+ type: 'item',
+ value: 'download-as-excel',
+ label: 'Excel',
+ onClick: downloadExcelFile,
+ },
+ {
+ type: 'item',
+ value: 'download-as-csv',
+ label: 'CSV',
+ onClick: downloadCsvFile,
+ },
+ ];
return (
- <DropdownMenuSimple menu={menu}>
+ <Dropdown items={items} nativeButton align="end" side="bottom">
<Button
className="download-button"
data-testid="download-menu-trigger"
@@ -81,7 +81,7 @@ function Download({ data, isLoading, fileName }: DownloadProps): JSX.Element {
Download
</Flex>
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/container/ExplorerActions/AddToDashboardButton.tsx b/frontend/src/container/ExplorerActions/AddToDashboardButton.tsx
index e62eece8e2..5aad3150a4 100644
--- a/frontend/src/container/ExplorerActions/AddToDashboardButton.tsx
+++ b/frontend/src/container/ExplorerActions/AddToDashboardButton.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { Grid2X2 } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { PANEL_TYPES } from 'constants/queryBuilder';
import ExportPanelContainer from 'container/ExportPanel/ExportPanelContainer';
@@ -80,22 +80,23 @@ function AddToDashboardButton({
}
};
- const button = (
- <Button
- variant="ghost"
- color="secondary"
- size="icon"
- disabled={!query}
- onClick={open}
- prefix={<Grid2X2 size={16} />}
- aria-label="Add to dashboard"
- data-testid="explorer-add-to-dashboard"
- />
- );
-
return (
<>
- <TooltipSimple title="Add to dashboard">{button}</TooltipSimple>
+ <Tooltip title="Add to dashboard">
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ disabled={!query}
+ disabledTooltip="Run a query first"
+ onClick={open}
+ aria-label="Add to dashboard"
+ testId="explorer-add-to-dashboard"
+ >
+ <Grid2X2 size={16} />
+ </Button>
+ </Tooltip>
<ExportPanelContainer
open={queryToExport !== null}
onClose={(): void => setQueryToExport(null)}
diff --git a/frontend/src/container/ExplorerActions/CreateAlertButton.tsx b/frontend/src/container/ExplorerActions/CreateAlertButton.tsx
index e970346ef3..23163d2a95 100644
--- a/frontend/src/container/ExplorerActions/CreateAlertButton.tsx
+++ b/frontend/src/container/ExplorerActions/CreateAlertButton.tsx
@@ -1,7 +1,7 @@
import { useHistory } from 'react-router-dom';
import { ConciergeBell } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { Query } from 'types/api/queryBuilder/queryBuilderData';
@@ -36,26 +36,36 @@ function CreateAlertButton({
history.push(getCreateAlertLink({ query, panelType }));
};
- const button = (
+ return isOneChartPerQuery ? (
+ <Tooltip title="Create an alert">
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ disabled={!query}
+ disabledTooltip="Run a query first"
+ onClick={createAlert}
+ aria-label="Create an alert"
+ testId="explorer-create-alert"
+ >
+ <ConciergeBell size={16} />
+ </Button>
+ </Tooltip>
+ ) : (
<Button
variant="ghost"
color="secondary"
- size={isOneChartPerQuery ? 'icon' : 'md'}
+ size="md"
disabled={!query}
+ disabledTooltip="Run a query first"
onClick={createAlert}
prefix={<ConciergeBell size={16} />}
- aria-label="Create an alert"
- data-testid="explorer-create-alert"
+ testId="explorer-create-alert"
>
- {!isOneChartPerQuery && 'Create an alert'}
+ Create an alert
</Button>
);
-
- return isOneChartPerQuery ? (
- <TooltipSimple title="Create an alert">{button}</TooltipSimple>
- ) : (
- button
- );
}
export default CreateAlertButton;
diff --git a/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx b/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx
index 8cbf01bcc2..fb26e0c5d5 100644
--- a/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx
+++ b/frontend/src/container/ExplorerActions/__tests__/AddToDashboardButton.test.tsx
@@ -130,7 +130,10 @@ describe('AddToDashboardButton', () => {
setPanelType(PANEL_TYPES.LIST);
render(<AddToDashboardButton query={null} sourcepage={DataSource.LOGS} />);
- expect(screen.getByTestId('explorer-add-to-dashboard')).toBeDisabled();
+ expect(screen.getByTestId('explorer-add-to-dashboard')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
expect(screen.queryByTestId('export-stub')).not.toBeInTheDocument();
});
diff --git a/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx b/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx
index 36d7a2c78a..0d7ac00255 100644
--- a/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx
+++ b/frontend/src/container/ExplorerActions/__tests__/CreateAlertButton.test.tsx
@@ -96,7 +96,10 @@ describe('CreateAlertButton', () => {
it('is disabled and does nothing without a query', async () => {
await clickCreateAlert(null, DataSource.LOGS, PANEL_TYPES.LIST);
- expect(screen.getByTestId('explorer-create-alert')).toBeDisabled();
+ expect(screen.getByTestId('explorer-create-alert')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
expect(mockPush).not.toHaveBeenCalled();
});
diff --git a/frontend/src/container/ExplorerOptions/__tests__/ExplorerOptionWrapper.test.tsx b/frontend/src/container/ExplorerOptions/__tests__/ExplorerOptionWrapper.test.tsx
index e4e377872d..3d6daa22ed 100644
--- a/frontend/src/container/ExplorerOptions/__tests__/ExplorerOptionWrapper.test.tsx
+++ b/frontend/src/container/ExplorerOptions/__tests__/ExplorerOptionWrapper.test.tsx
@@ -258,7 +258,10 @@ describe('ExplorerOptionWrapper', () => {
// Wait for the selection to be made and the export button to be enabled
await waitFor(() => {
- expect(screen.getByTestId('export-panel-export')).not.toBeDisabled();
+ expect(screen.getByTestId('export-panel-export')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
// Click the export button
@@ -345,7 +348,10 @@ describe('ExplorerOptionWrapper', () => {
// Wait for the selection to be made and the export button to be enabled
await waitFor(() => {
- expect(screen.getByTestId('export-panel-export')).not.toBeDisabled();
+ expect(screen.getByTestId('export-panel-export')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
// Click the export button
diff --git a/frontend/src/container/ExportPanel/ExportPanelContainer.tsx b/frontend/src/container/ExportPanel/ExportPanelContainer.tsx
index 2d86b6a5a0..356153a2c7 100644
--- a/frontend/src/container/ExportPanel/ExportPanelContainer.tsx
+++ b/frontend/src/container/ExportPanel/ExportPanelContainer.tsx
@@ -77,8 +77,7 @@ function ExportPanelContainer({
onExport(selectedDashboard, false);
}, [selectedDashboard, onExport]);
- const isExportDisabled =
- isAllDashboardsLoading || !selectedDashboard || isLoading;
+ const isExportDisabled = isAllDashboardsLoading || !selectedDashboard;
return (
<DialogWrapper
@@ -102,6 +101,12 @@ function ExportPanelContainer({
Cancel
</Button>
<Button
+ disabledTooltip={
+ isAllDashboardsLoading
+ ? 'Wait for the dashboards to load'
+ : 'Select a dashboard first'
+ }
+ variant="solid"
color="primary"
size="md"
loading={isLoading}
@@ -140,7 +145,6 @@ function ExportPanelContainer({
size="md"
prefix={<Plus size={14} />}
loading={createDashboardLoading}
- disabled={createDashboardLoading}
onClick={createNewDashboard}
testId="export-panel-new-dashboard"
>
diff --git a/frontend/src/container/ForgotPassword/ForgotPassword.styles.scss b/frontend/src/container/ForgotPassword/ForgotPassword.styles.scss
index 5b0a909999..ee90536420 100644
--- a/frontend/src/container/ForgotPassword/ForgotPassword.styles.scss
+++ b/frontend/src/container/ForgotPassword/ForgotPassword.styles.scss
@@ -58,32 +58,4 @@
display: flex;
gap: 12px;
width: 100%;
-
- > .forgot-password-back-button,
- > .login-submit-btn {
- flex: 1 1 0%;
- }
-}
-
-.forgot-password-back-button {
- height: 32px;
- padding: 10px 16px;
- border-radius: 2px;
- font-family: Inter, sans-serif;
- font-size: 11px;
- font-weight: 500;
- line-height: 1;
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 8px;
- background: var(--l3-background);
- border: 1px solid var(--l1-border);
- color: var(--l1-foreground);
-
- &:hover:not(:disabled) {
- background: var(--l1-border);
- border-color: var(--l1-border);
- opacity: 0.9;
- }
}
diff --git a/frontend/src/container/ForgotPassword/SuccessScreen.tsx b/frontend/src/container/ForgotPassword/SuccessScreen.tsx
index 588cd19e22..63711555aa 100644
--- a/frontend/src/container/ForgotPassword/SuccessScreen.tsx
+++ b/frontend/src/container/ForgotPassword/SuccessScreen.tsx
@@ -22,11 +22,12 @@ function SuccessScreen({ onBackToLogin }: SuccessScreenProps): JSX.Element {
<div className="login-form-actions forgot-password-actions">
<Button
+ size="md"
variant="solid"
color="primary"
type="button"
- data-testid="back-to-login"
- className="login-submit-btn"
+ testId="back-to-login"
+ width="100%"
onClick={onBackToLogin}
prefix={<ArrowLeft size={12} />}
>
diff --git a/frontend/src/container/ForgotPassword/__tests__/ForgotPassword.test.tsx b/frontend/src/container/ForgotPassword/__tests__/ForgotPassword.test.tsx
index ed25b1dd51..b3d9309ac1 100644
--- a/frontend/src/container/ForgotPassword/__tests__/ForgotPassword.test.tsx
+++ b/frontend/src/container/ForgotPassword/__tests__/ForgotPassword.test.tsx
@@ -118,7 +118,7 @@ describe('ForgotPassword Component', () => {
render(<ForgotPassword {...defaultProps} />);
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
});
@@ -139,7 +139,7 @@ describe('ForgotPassword Component', () => {
render(<ForgotPassword {...propsWithoutOrgId} />);
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('enables submit button after selecting an organization', async () => {
@@ -148,14 +148,14 @@ describe('ForgotPassword Component', () => {
render(<ForgotPassword {...multiOrgProps} />);
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
// Click on the dropdown to reveal the options
await user.click(screen.getByRole('combobox'));
await user.click(screen.getByText('Organization One'));
await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
});
@@ -169,7 +169,7 @@ describe('ForgotPassword Component', () => {
render(<ForgotPassword {...propsWithOrgId} />);
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
});
@@ -368,7 +368,7 @@ describe('ForgotPassword Component', () => {
await user.click(submitButton);
await waitFor(() => {
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
});
});
@@ -383,7 +383,7 @@ describe('ForgotPassword Component', () => {
render(<ForgotPassword {...propsWithEmptyEmail} />);
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('handles whitespace-only email', () => {
@@ -395,7 +395,7 @@ describe('ForgotPassword Component', () => {
render(<ForgotPassword {...propsWithWhitespaceEmail} />);
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('handles empty orgs array by disabling submission', () => {
@@ -410,7 +410,7 @@ describe('ForgotPassword Component', () => {
expect(screen.queryByTestId('orgId')).not.toBeInTheDocument();
// Submit should be disabled because no orgId can be determined
const submitButton = screen.getByTestId('forgot-password-submit');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
});
});
diff --git a/frontend/src/container/ForgotPassword/index.tsx b/frontend/src/container/ForgotPassword/index.tsx
index 8edb0db14f..1fb2913efb 100644
--- a/frontend/src/container/ForgotPassword/index.tsx
+++ b/frontend/src/container/ForgotPassword/index.tsx
@@ -79,19 +79,15 @@ function ForgotPassword({
const hasMultipleOrgs = orgs.length > 1;
- const isSubmitEnabled = useMemo((): boolean => {
- if (isLoading) {
- return false;
- }
-
+ const submitDisabledReason = useMemo((): string | undefined => {
if (!watchedEmail?.trim()) {
- return false;
+ return 'Enter your email first';
}
// Ensure we have an orgId (either selected from dropdown or the initial one)
const currentOrgId = hasMultipleOrgs ? selectedOrgId : initialOrgId;
- return Boolean(currentOrgId);
- }, [watchedEmail, selectedOrgId, isLoading, initialOrgId, hasMultipleOrgs]);
+ return currentOrgId ? undefined : 'Select an organization first';
+ }, [watchedEmail, selectedOrgId, initialOrgId, hasMultipleOrgs]);
const handleSubmit = useCallback((): void => {
const values = form.getFieldsValue();
@@ -187,10 +183,12 @@ function ForgotPassword({
<div className="login-form-actions forgot-password-actions">
<Button
+ size="md"
+ color="secondary"
variant="solid"
type="button"
- data-testid="forgot-password-back"
- className="forgot-password-back-button"
+ testId="forgot-password-back"
+ width="100%"
onClick={handleBackToLogin}
prefix={<ArrowLeft size={12} />}
>
@@ -198,13 +196,15 @@ function ForgotPassword({
</Button>
<Button
- disabled={!isSubmitEnabled}
+ disabledTooltip={submitDisabledReason}
+ size="md"
+ disabled={Boolean(submitDisabledReason)}
loading={isLoading}
variant="solid"
color="primary"
type="submit"
- data-testid="forgot-password-submit"
- className="login-submit-btn"
+ testId="forgot-password-submit"
+ width="100%"
suffix={<ArrowRight size={12} />}
>
{isLoading ? 'Sending...' : 'Send reset link'}
diff --git a/frontend/src/container/FormAlertChannels/__tests__/FormAlertChannels.test.tsx b/frontend/src/container/FormAlertChannels/__tests__/FormAlertChannels.test.tsx
new file mode 100644
index 0000000000..f13ae8c07d
--- /dev/null
+++ b/frontend/src/container/FormAlertChannels/__tests__/FormAlertChannels.test.tsx
@@ -0,0 +1,42 @@
+import { Form } from 'antd';
+import { ChannelType } from 'container/CreateAlertChannels/config';
+import { act, render, renderHook, screen } from 'tests/test-utils';
+
+import FormAlertChannels from '..';
+
+jest.mock('components/MarkdownRenderer/MarkdownRenderer', () => ({
+ MarkdownRenderer: jest.fn(() => <div>Mocked MarkdownRenderer</div>),
+}));
+
+describe('FormAlertChannels', () => {
+ it('keeps the send resolved switch in sync when the value arrives after mount', () => {
+ const {
+ result: {
+ current: [formInstance],
+ },
+ } = renderHook(() => Form.useForm());
+ render(
+ <FormAlertChannels
+ formInstance={formInstance}
+ type={ChannelType.Slack}
+ setSelectedConfig={jest.fn()}
+ onTypeChangeHandler={jest.fn()}
+ onSaveHandler={jest.fn()}
+ onTestHandler={jest.fn()}
+ testingState={false}
+ savingState={false}
+ title="Edit"
+ initialValue={{ name: 'Dummy-Channel', type: ChannelType.Slack }}
+ editing
+ />,
+ );
+ const sendResolvedSwitch = screen.getByTestId('field-send-resolved-checkbox');
+ expect(sendResolvedSwitch).not.toBeChecked();
+
+ act(() => {
+ formInstance.setFieldsValue({ send_resolved: true });
+ });
+
+ expect(sendResolvedSwitch).toBeChecked();
+ });
+});
diff --git a/frontend/src/container/FormAlertChannels/index.tsx b/frontend/src/container/FormAlertChannels/index.tsx
index c0a2d6d1ee..09cd277818 100644
--- a/frontend/src/container/FormAlertChannels/index.tsx
+++ b/frontend/src/container/FormAlertChannels/index.tsx
@@ -103,9 +103,11 @@ function FormAlertChannels({
label={t('field_send_resolved')}
labelAlign="left"
name="send_resolved"
+ getValueProps={(value): { value: boolean } => ({ value: !!value })}
>
<Switch
- defaultValue={initialValue?.send_resolved}
+ color="primary"
+ textPlacement="right"
testId="field-send-resolved-checkbox"
onChange={(value): void => {
setSelectedConfig((state) => ({
diff --git a/frontend/src/container/FormAlertRules/BasicInfo.tsx b/frontend/src/container/FormAlertRules/BasicInfo.tsx
index 406ff6eadc..38788f93a5 100644
--- a/frontend/src/container/FormAlertRules/BasicInfo.tsx
+++ b/frontend/src/container/FormAlertRules/BasicInfo.tsx
@@ -193,21 +193,19 @@ function BasicInfo({
name="alert_all_configured_channels"
label="Alert all the configured channels"
>
- <Tooltip
- title={
- noChannels
- ? 'No channels. Ask an admin to create a notification channel'
- : undefined
+ <Switch
+ color="primary"
+ textPlacement="right"
+ disabledTooltip={
+ isLoading
+ ? 'Wait for the channels to load'
+ : 'No channels. Ask an admin to create a notification channel'
}
- placement="right"
- >
- <Switch
- value={shouldBroadCastToAllChannels}
- onChange={handleBroadcastToAllChannels}
- disabled={noChannels || !!isLoading}
- testId="alert-broadcast-to-all-channels"
- />
- </Tooltip>
+ value={shouldBroadCastToAllChannels}
+ onChange={handleBroadcastToAllChannels}
+ disabled={noChannels || !!isLoading}
+ testId="alert-broadcast-to-all-channels"
+ />
</FormItemMedium>
{!shouldBroadCastToAllChannels && (
diff --git a/frontend/src/container/FormAlertRules/labels/index.tsx b/frontend/src/container/FormAlertRules/labels/index.tsx
index e0bd15562a..8c4caceb9a 100644
--- a/frontend/src/container/FormAlertRules/labels/index.tsx
+++ b/frontend/src/container/FormAlertRules/labels/index.tsx
@@ -8,6 +8,7 @@ import { Labels } from 'types/api/alerts/def';
import { v4 as uuid } from 'uuid';
import { Badge } from '@signozhq/ui/badge';
+import { Pill } from '@signozhq/ui/pill';
import { QueryChipContainer, QueryChipItem, SearchContainer } from './styles';
import { ILabelRecord } from './types';
import { createQuery, flattenLabels, prepareLabels } from './utils';
@@ -152,16 +153,18 @@ function LabelSelect({
query.key !== 'severity' && query.key !== 'description';
return (
<QueryChipContainer key={query.key}>
- <Badge
- color="vanilla"
- closable={isClosable}
- onClose={(e): void => {
- e.preventDefault();
- handleClose(query.key);
- }}
- >
- {query.key}: {query.value}
- </Badge>
+ {isClosable ? (
+ <Pill.Closeable
+ closeAriaLabel={`Remove ${query.key}`}
+ onClose={(): void => handleClose(query.key)}
+ >
+ {query.key}: {query.value}
+ </Pill.Closeable>
+ ) : (
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {query.key}: {query.value}
+ </Badge>
+ )}
</QueryChipContainer>
);
})}
diff --git a/frontend/src/container/FormAlertRules/labels/styles.ts b/frontend/src/container/FormAlertRules/labels/styles.ts
index 1395959ace..b09431d591 100644
--- a/frontend/src/container/FormAlertRules/labels/styles.ts
+++ b/frontend/src/container/FormAlertRules/labels/styles.ts
@@ -32,6 +32,10 @@ export const QueryChipContainer = styled.span`
}
`;
-export const QueryChipItem = styled(Badge)`
+export const QueryChipItem = styled(Badge).attrs({
+ color: 'secondary' as const,
+ variant: 'solid' as const,
+ textTransform: 'none' as const,
+})`
margin-right: 0.1rem;
`;
diff --git a/frontend/src/container/GeneralSettings/GeneralSettings.tsx b/frontend/src/container/GeneralSettings/GeneralSettings.tsx
index a6fac2fdd1..b080f60b61 100644
--- a/frontend/src/container/GeneralSettings/GeneralSettings.tsx
+++ b/frontend/src/container/GeneralSettings/GeneralSettings.tsx
@@ -2,9 +2,9 @@ import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { UseQueryResult } from 'react-query';
import { useInterval } from 'react-use';
-import { BarChart, Compass, Loader, ScrollText } from '@signozhq/icons';
+import { BarChart, Compass, ScrollText } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { Modal, Spin } from 'antd';
+import { Modal } from 'antd';
import setRetentionApi from 'api/settings/setRetention';
import setRetentionApiV2 from 'api/settings/setRetentionV2';
import TextToolTip from 'components/TextToolTip';
@@ -455,6 +455,28 @@ function GeneralSettings({
const isAdmin = user.role === USER_ROLES.ADMIN;
const showCustomDomainSettings = isCloudUserVal && isAdmin;
+ const getSaveDisabledReason = (
+ name: string,
+ totalRetentionPeriod: NumberOrNull,
+ s3RetentionPeriod: NumberOrNull,
+ ): string => {
+ if (
+ s3Enabled &&
+ (totalRetentionPeriod || s3RetentionPeriod) &&
+ Number(totalRetentionPeriod) <= Number(s3RetentionPeriod)
+ ) {
+ return t('retention_comparison_error', { name });
+ }
+ if (
+ !metricsTotalRetentionPeriod ||
+ !tracesTotalRetentionPeriod ||
+ !logsTotalRetentionPeriod
+ ) {
+ return errorText;
+ }
+ return 'Change the retention period first';
+ };
+
const renderConfig = [
{
name: 'Metrics',
@@ -479,19 +501,17 @@ function GeneralSettings({
apiLoading: postApiLoadingMetrics,
saveButtonText:
metricsTtlValuesPayload.status === 'pending' ? (
- <span>
- <Spin
- spinning
- size="small"
- indicator={<Loader className="animate-spin" />}
- />{' '}
- {t('retention_save_button.pending', { name: 'metrics' })}
- </span>
+ <span>{t('retention_save_button.pending', { name: 'metrics' })}</span>
) : (
<span>{t('retention_save_button.success')}</span>
),
- isDisabled:
- metricsTtlValuesPayload.status === 'pending' || isMetricsSaveDisabled,
+ isLoading: metricsTtlValuesPayload.status === 'pending',
+ isDisabled: isMetricsSaveDisabled,
+ disabledReason: getSaveDisabledReason(
+ 'metrics',
+ metricsTotalRetentionPeriod,
+ metricsS3RetentionPeriod,
+ ),
},
statusComponent: (
<StatusMessage
@@ -526,19 +546,17 @@ function GeneralSettings({
apiLoading: postApiLoadingTraces,
saveButtonText:
tracesTtlValuesPayload.status === 'pending' ? (
- <span>
- <Spin
- spinning
- size="small"
- indicator={<Loader className="animate-spin" />}
- />{' '}
- {t('retention_save_button.pending', { name: 'traces' })}
- </span>
+ <span>{t('retention_save_button.pending', { name: 'traces' })}</span>
) : (
<span>{t('retention_save_button.success')}</span>
),
- isDisabled:
- tracesTtlValuesPayload.status === 'pending' || isTracesSaveDisabled,
+ isLoading: tracesTtlValuesPayload.status === 'pending',
+ isDisabled: isTracesSaveDisabled,
+ disabledReason: getSaveDisabledReason(
+ 'traces',
+ tracesTotalRetentionPeriod,
+ tracesS3RetentionPeriod,
+ ),
},
statusComponent: (
<StatusMessage
@@ -572,18 +590,17 @@ function GeneralSettings({
apiLoading: postApiLoadingLogs,
saveButtonText:
logsTtlValuesPayload.status === 'pending' ? (
- <span>
- <Spin
- spinning
- size="small"
- indicator={<Loader className="animate-spin" />}
- />{' '}
- {t('retention_save_button.pending', { name: 'logs' })}
- </span>
+ <span>{t('retention_save_button.pending', { name: 'logs' })}</span>
) : (
<span>{t('retention_save_button.success')}</span>
),
- isDisabled: logsTtlValuesPayload.status === 'pending' || isLogsSaveDisabled,
+ isLoading: logsTtlValuesPayload.status === 'pending',
+ isDisabled: isLogsSaveDisabled,
+ disabledReason: getSaveDisabledReason(
+ 'logs',
+ logsTotalRetentionPeriod,
+ logsS3RetentionPeriod,
+ ),
},
statusComponent: (
<StatusMessage
@@ -620,11 +637,13 @@ function GeneralSettings({
))}
{!isCloudUserVal && (
<Button
+ disabledTooltip={category.save.disabledReason}
variant="solid"
size="sm"
color="primary"
onClick={category.save.modalOpen}
disabled={category.save.isDisabled}
+ loading={category.save.isLoading}
>
{category.save.saveButtonText}
</Button>
diff --git a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.styles.scss b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.styles.scss
index 18d97a9c72..632c484f05 100644
--- a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.styles.scss
+++ b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.styles.scss
@@ -35,31 +35,13 @@
padding: 1px 2px;
border-radius: 2px 0 0 2px;
background: var(--l3-background);
- border: 1px solid var(--l1-border);
color: var(--l2-foreground);
font-family: 'SF Mono', 'Fira Code', 'Fira Mono', monospace;
font-size: var(--paragraph-base-400-font-size);
line-height: var(--line-height-20);
white-space: nowrap;
margin-right: -1px;
- }
-
- &__copy-btn {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- width: 26px;
- padding: 1px 2px;
- border-radius: 0 2px 2px 0;
- background: var(--l3-background);
- border: 1px solid var(--l1-border);
- color: var(--l2-foreground);
- cursor: pointer;
- flex-shrink: 0;
height: 24px;
-
- &:hover {
- background: var(--l3-background-hover);
- }
+ border: 1px solid var(--l3-border);
}
}
diff --git a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.tsx b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.tsx
index 0d20b3a2a3..2e0310b58c 100644
--- a/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.tsx
+++ b/frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.tsx
@@ -29,12 +29,14 @@ function LicenseKeyRow(): JSX.Element | null {
<span className="license-key-row__value">
<code className="license-key-row__code">{getMaskedKey(licenseKey)}</code>
<Button
+ variant="outlined"
+ color="secondary"
type="button"
size="sm"
aria-label="Copy license key"
- data-testid="license-key-row-copy-btn"
- className="license-key-row__copy-btn"
+ testId="license-key-row-copy-btn"
onClick={(): void => handleCopyLicenseKey(licenseKey)}
+ icon
>
<Copy size={12} />
</Button>
diff --git a/frontend/src/container/GeneralSettings/__tests__/GeneralSettings.test.tsx b/frontend/src/container/GeneralSettings/__tests__/GeneralSettings.test.tsx
index e80dd7fb10..6477074267 100644
--- a/frontend/src/container/GeneralSettings/__tests__/GeneralSettings.test.tsx
+++ b/frontend/src/container/GeneralSettings/__tests__/GeneralSettings.test.tsx
@@ -161,7 +161,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
// Wait for button to be enabled
await waitFor(() => {
- expect(saveButton).not.toBeDisabled();
+ expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
});
fireEvent.click(saveButton);
@@ -261,7 +261,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
// Wait for button to be enabled
await waitFor(() => {
- expect(saveButton).not.toBeDisabled();
+ expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
});
// Click save button
@@ -344,7 +344,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
expect(saveButton).toBeInTheDocument();
// Verify save button is disabled on initial load
- expect(saveButton).toBeDisabled();
+ expect(saveButton).toHaveAttribute('aria-disabled', 'true');
// Find the total retention input
const inputs = logsRow.querySelectorAll('input[type="number"]');
@@ -355,7 +355,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
// Button should now be enabled after change
await waitFor(() => {
- expect(saveButton).not.toBeDisabled();
+ expect(saveButton).not.toHaveAttribute('aria-disabled', 'true');
});
// Revert to original value (30 days displays as 1 Month)
@@ -363,7 +363,7 @@ describe('GeneralSettings - S3 Logs Retention', () => {
// Button should be disabled again (back to original state)
await waitFor(() => {
- expect(saveButton).toBeDisabled();
+ expect(saveButton).toHaveAttribute('aria-disabled', 'true');
});
});
});
diff --git a/frontend/src/container/Home/AlertRules/AlertRules.tsx b/frontend/src/container/Home/AlertRules/AlertRules.tsx
index da7cf51c23..7d71fbe930 100644
--- a/frontend/src/container/Home/AlertRules/AlertRules.tsx
+++ b/frontend/src/container/Home/AlertRules/AlertRules.tsx
@@ -178,12 +178,12 @@ export default function AlertRules({
</div>
<div className="alert-rule-item-description home-data-item-tag">
- <Badge color="sienna" variant="outline">
+ <Badge textTransform="uppercase" color="archive" variant="outlined">
{rule?.labels?.severity}
</Badge>
{rule.state === 'firing' && (
- <Badge color="cherry" variant="outline" className="firing-tag">
+ <Badge color="danger" variant="outlined" textTransform="uppercase">
{rule.state}
</Badge>
)}
diff --git a/frontend/src/container/Home/Dashboards/Dashboards.tsx b/frontend/src/container/Home/Dashboards/Dashboards.tsx
index 8d89537f7d..1acf8917d5 100644
--- a/frontend/src/container/Home/Dashboards/Dashboards.tsx
+++ b/frontend/src/container/Home/Dashboards/Dashboards.tsx
@@ -159,7 +159,12 @@ export default function Dashboards({
<div className="alert-rule-item-description home-data-item-tag">
{dashboard.tags.map((tag) => (
- <Badge color="sienna" variant="outline" key={tag}>
+ <Badge
+ textTransform="none"
+ color="archive"
+ variant="outlined"
+ key={tag}
+ >
{tag}
</Badge>
))}
diff --git a/frontend/src/container/Home/DataSourceInfo/DataSourceInfo.tsx b/frontend/src/container/Home/DataSourceInfo/DataSourceInfo.tsx
index ec1ecf7982..a8f71372ef 100644
--- a/frontend/src/container/Home/DataSourceInfo/DataSourceInfo.tsx
+++ b/frontend/src/container/Home/DataSourceInfo/DataSourceInfo.tsx
@@ -82,7 +82,6 @@ function DataSourceInfo({
variant="solid"
color="primary"
size="sm"
- className="periscope-btn primary"
prefix={<img src={containerPlusUrl} alt="plus" />}
onClick={handleConnect}
// TODO - Support tabindex, keyboard events - @H4ad
diff --git a/frontend/src/container/Home/Home.styles.scss b/frontend/src/container/Home/Home.styles.scss
index 89e60c13b0..1f3bacb26c 100644
--- a/frontend/src/container/Home/Home.styles.scss
+++ b/frontend/src/container/Home/Home.styles.scss
@@ -433,12 +433,6 @@
background-color: var(--l1-background-hover) !important;
}
}
-
- .periscope-btn.secondary {
- border-radius: 2px;
- border: 1px solid var(--l1-border);
- background: var(--l2-background);
- }
}
}
}
diff --git a/frontend/src/container/Home/Home.tsx b/frontend/src/container/Home/Home.tsx
index 514dc60bf7..18e172b217 100644
--- a/frontend/src/container/Home/Home.tsx
+++ b/frontend/src/container/Home/Home.tsx
@@ -313,6 +313,7 @@ export default function Home(): JSX.Element {
rootClassName="welcome-checklist-popover"
>
<Button
+ size="md"
variant="solid"
color="secondary"
prefix={<ClipboardList size={14} />}
@@ -496,9 +497,9 @@ export default function Home(): JSX.Element {
<div className="section-actions">
<Button
+ size="md"
variant="solid"
color="secondary"
- className="periscope-btn secondary"
prefix={<Wrench size={14} />}
onClick={(e: React.MouseEvent): void => {
void logEvent('Homepage: Explore clicked', {
@@ -513,9 +514,9 @@ export default function Home(): JSX.Element {
</Button>
<Button
+ size="md"
variant="solid"
color="secondary"
- className="periscope-btn secondary"
prefix={<Wrench size={14} />}
onClick={(e: React.MouseEvent): void => {
void logEvent('Homepage: Explore clicked', {
@@ -530,9 +531,9 @@ export default function Home(): JSX.Element {
</Button>
<Button
+ size="md"
variant="solid"
color="secondary"
- className="periscope-btn secondary"
prefix={<Wrench size={14} />}
onClick={(e: React.MouseEvent): void => {
void logEvent('Homepage: Explore clicked', {
@@ -569,9 +570,9 @@ export default function Home(): JSX.Element {
<div className="section-actions">
<Button
+ size="md"
variant="solid"
color="secondary"
- className="periscope-btn secondary"
prefix={<Plus size={14} />}
onClick={(e: React.MouseEvent): void => {
void logEvent('Homepage: Explore clicked', {
@@ -614,9 +615,9 @@ export default function Home(): JSX.Element {
<div className="section-actions">
<Button
+ size="md"
variant="solid"
color="secondary"
- className="periscope-btn secondary"
prefix={<Plus size={14} />}
onClick={(e: React.MouseEvent): void => {
void logEvent('Homepage: Explore clicked', {
@@ -696,6 +697,7 @@ export default function Home(): JSX.Element {
<Card.Footer>
<div className="checklist-footer-container">
<Button
+ size="md"
variant="link"
color="secondary"
onClick={handleWillDoThisLater}
diff --git a/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss b/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
index 8de5fb1d28..29ee798b60 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
@@ -94,28 +94,3 @@
.quickFiltersToggleContainer {
grid-area: quickFilters;
}
-
-.infraMonitoringTags {
- width: fit-content;
- font-family: Inter;
- font-size: 11px;
- font-style: normal;
- font-weight: 500;
- line-height: 18px;
- letter-spacing: 0.44px;
- text-transform: uppercase;
- border-radius: 50px;
- padding: 2px 8px;
-}
-
-.tagsActive {
- color: var(--bg-forest-500, #25e192);
- border: 1px solid rgba(37, 225, 146, 0.2);
- background: rgba(37, 225, 146, 0.1);
-}
-
-.tagsInactive {
- color: var(--bg-slate-50, #62687c);
- border: 1px solid rgba(98, 104, 124, 0.2);
- background: rgba(98, 104, 124, 0.1);
-}
diff --git a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.module.scss b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.module.scss
index fb96aa8379..dac60e211e 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.module.scss
@@ -2,9 +2,8 @@
display: flex;
align-items: center;
- --toggle-group-item-size: 100%;
- --toggle-group-radius: 0px 2px 2px 0px;
- --toggle-group-item-font-size: var(--periscope-font-size-base);
+ --toggle-group-border-radius: 0px 2px 2px 0px;
+ --toggle-group-button-font-size: var(--periscope-font-size-base);
}
.statusLabel {
@@ -25,10 +24,6 @@
gap: var(--spacing-2);
}
-.statusToggleGroup {
- height: 32px;
-}
-
.statusToggleItem {
flex: unset;
}
diff --git a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.test.tsx b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.test.tsx
index 4492b72980..d9f1ea98ae 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.test.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.test.tsx
@@ -58,37 +58,37 @@ describe('StatusFilter', () => {
renderStatusFilter({});
expect(screen.getByText('Status')).toBeInTheDocument();
- expect(screen.getByRole('radio', { name: 'All' })).toBeInTheDocument();
- expect(screen.getByRole('radio', { name: 'Active' })).toBeInTheDocument();
- expect(screen.getByRole('radio', { name: 'Inactive' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'All' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Active' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Inactive' })).toBeInTheDocument();
});
it('selects "All" by default when no URL param', () => {
renderStatusFilter({});
- const allButton = screen.getByRole('radio', { name: 'All' });
- expect(allButton).toHaveAttribute('aria-checked', 'true');
+ const allButton = screen.getByRole('button', { name: 'All' });
+ expect(allButton).toHaveAttribute('aria-pressed', 'true');
});
it('reads "active" from URL and shows Active selected', () => {
renderStatusFilter({ searchParams: { statusFilter: 'active' } });
- const activeButton = screen.getByRole('radio', { name: 'Active' });
- expect(activeButton).toHaveAttribute('aria-checked', 'true');
+ const activeButton = screen.getByRole('button', { name: 'Active' });
+ expect(activeButton).toHaveAttribute('aria-pressed', 'true');
});
it('reads "inactive" from URL and shows Inactive selected', () => {
renderStatusFilter({ searchParams: { statusFilter: 'inactive' } });
- const inactiveButton = screen.getByRole('radio', { name: 'Inactive' });
- expect(inactiveButton).toHaveAttribute('aria-checked', 'true');
+ const inactiveButton = screen.getByRole('button', { name: 'Inactive' });
+ expect(inactiveButton).toHaveAttribute('aria-pressed', 'true');
});
it('updates URL to "active" when Active clicked', async () => {
const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
renderStatusFilter({ onUrlUpdate });
- const activeButton = screen.getByRole('radio', { name: 'Active' });
+ const activeButton = screen.getByRole('button', { name: 'Active' });
fireEvent.click(activeButton);
await waitFor(() => {
@@ -104,7 +104,7 @@ describe('StatusFilter', () => {
const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
renderStatusFilter({ onUrlUpdate });
- const inactiveButton = screen.getByRole('radio', { name: 'Inactive' });
+ const inactiveButton = screen.getByRole('button', { name: 'Inactive' });
fireEvent.click(inactiveButton);
await waitFor(() => {
@@ -123,7 +123,7 @@ describe('StatusFilter', () => {
onUrlUpdate,
});
- const allButton = screen.getByRole('radio', { name: 'All' });
+ const allButton = screen.getByRole('button', { name: 'All' });
fireEvent.click(allButton);
await waitFor(() => {
@@ -139,7 +139,7 @@ describe('StatusFilter', () => {
onUrlUpdate,
});
- const activeButton = screen.getByRole('radio', { name: 'Active' });
+ const activeButton = screen.getByRole('button', { name: 'Active' });
fireEvent.click(activeButton);
await waitFor(() => {
diff --git a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.tsx b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.tsx
index 6307abc01b..9c572dfb77 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.tsx
@@ -1,4 +1,4 @@
-import { ToggleGroup, ToggleGroupItem } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
import {
StatusFilterValue,
@@ -45,17 +45,15 @@ function StatusFilter(): JSX.Element {
<div className={styles.statusLabel}>Status</div>
<ToggleGroup
type="single"
+ variant="outlined"
+ color="secondary"
+ size="sm"
value={statusFilter === '' ? 'all' : statusFilter}
onChange={handleChange}
- className={styles.statusToggleGroup}
- >
- {statusOptions.map((option) => (
- <ToggleGroupItem
- key={option.value}
- value={option.value}
- aria-label={option.label}
- className={styles.statusToggleItem}
- >
+ items={statusOptions.map((option) => ({
+ value: option.value,
+ label: option.label,
+ prefix: (
<span
className={`${styles.statusDot} ${
option.value === 'active'
@@ -65,10 +63,9 @@ function StatusFilter(): JSX.Element {
: styles.allDot
}`}
/>
- {option.label}
- </ToggleGroupItem>
- ))}
- </ToggleGroup>
+ ),
+ }))}
+ />
</div>
);
}
diff --git a/frontend/src/container/InfraMonitoringHostsV2/constants.tsx b/frontend/src/container/InfraMonitoringHostsV2/constants.tsx
index 3b278bc6d5..d004fb1635 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/constants.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/constants.tsx
@@ -16,8 +16,6 @@ import {
hostWidgetInfo,
} from 'container/LogDetailedView/InfraMetrics/constants';
-import infraHostsStyles from './InfraMonitoringHosts.module.scss';
-
export type HostDetailMetadataConfigType =
K8sDetailsMetadataConfig<InframonitoringtypesHostRecordDTO>;
export const hostDetailsMetadataConfig: HostDetailMetadataConfigType[] = [
@@ -30,12 +28,7 @@ export const hostDetailsMetadataConfig: HostDetailMetadataConfigType[] = [
render: (value, h): React.ReactNode => {
const isActive = h.status === InframonitoringtypesHostStatusDTO.active;
return (
- <Badge
- variant="outline"
- className={`${infraHostsStyles.infraMonitoringTags} ${
- isActive ? infraHostsStyles.tagsActive : infraHostsStyles.tagsInactive
- }`}
- >
+ <Badge color={isActive ? 'success' : 'secondary'} variant="outlined">
{value}
</Badge>
);
@@ -46,7 +39,7 @@ export const hostDetailsMetadataConfig: HostDetailMetadataConfigType[] = [
getValue: (h): string => h.meta?.[INFRA_MONITORING_ATTR_KEYS.OS_TYPE] || '-',
render: (value): React.ReactNode =>
value !== '-' ? (
- <Badge variant="outline" className={infraHostsStyles.infraMonitoringTags}>
+ <Badge textTransform="none" color="primary" variant="outlined">
{value}
</Badge>
) : (
diff --git a/frontend/src/container/InfraMonitoringHostsV2/table.config.tsx b/frontend/src/container/InfraMonitoringHostsV2/table.config.tsx
index 2bf42d08d4..b229c5eee2 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/table.config.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/table.config.tsx
@@ -25,22 +25,22 @@ import EntityGroupHeader from 'container/InfraMonitoringK8sV2/Base/EntityGroupHe
import { HostnameCell } from './utils';
import styles from './table.module.scss';
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
const statusMap: Record<
InframonitoringtypesHostStatusDTO,
{
label: string;
- color: BadgeColor;
+ color: BadgeColorType;
}
> = {
[InframonitoringtypesHostStatusDTO.active]: {
label: 'ACTIVE',
- color: 'forest',
+ color: 'success',
},
[InframonitoringtypesHostStatusDTO.inactive]: {
label: 'INACTIVE',
- color: 'amber',
+ color: 'warning',
},
['']: {
label: 'UNKNOWN',
@@ -156,11 +156,7 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
const statusDetails = statusMap[status] || statusMap[''];
return (
- <Badge
- variant="outline"
- color={statusDetails.color}
- className={`${styles.statusTag}`}
- >
+ <Badge variant="outlined" color={statusDetails.color}>
{statusDetails.label}
</Badge>
);
diff --git a/frontend/src/container/InfraMonitoringHostsV2/table.module.scss b/frontend/src/container/InfraMonitoringHostsV2/table.module.scss
index 802e3ec1a3..601afce909 100644
--- a/frontend/src/container/InfraMonitoringHostsV2/table.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/table.module.scss
@@ -13,31 +13,6 @@
text-align: right;
}
-.statusTag {
- width: fit-content;
- font-family: Inter, sans-serif;
- font-size: 11px;
- font-style: normal;
- font-weight: 500;
- line-height: 18px;
- letter-spacing: 0.44px;
- text-transform: uppercase;
- border-radius: 50px;
- padding: 2px 8px;
-}
-
-.statusTagActive {
- color: var(--Forest-500, #25e192);
- border: 1px solid rgba(37, 225, 146, 0.2);
- background: rgba(37, 225, 146, 0.1);
-}
-
-.statusTagInactive {
- color: var(--Slate-50, #62687c);
- border: 1px solid rgba(98, 104, 124, 0.2);
- background: rgba(98, 104, 124, 0.1);
-}
-
.progressContainer {
display: flex;
align-items: center;
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx
index 379254eb7e..2bb86c4f1f 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx
@@ -1,5 +1,5 @@
import { Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import styles from './ColumnHeader.module.scss';
import cx from 'classnames';
@@ -38,8 +38,7 @@ function ColumnHeader({
const isJustStringTitle = typeof tooltipTitle === 'string';
return (
- <TooltipSimple
- arrow
+ <Tooltip
title={
<div onClick={stopPropagationHandler}>
{tooltipTitle}{' '}
@@ -59,19 +58,17 @@ function ColumnHeader({
<div className={styles.infoIcon}>
<Info size="md" />
</div>
- </TooltipSimple>
+ </Tooltip>
);
}
if (tooltip) {
return (
- <TooltipSimple
- title={<div onClick={stopPropagationHandler}>{tooltip}</div>}
- >
+ <Tooltip title={<div onClick={stopPropagationHandler}>{tooltip}</div>}>
<div className={styles.infoIcon}>
<Info size="md" />
</div>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx
index 742b814796..c44b979295 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx
@@ -1,5 +1,5 @@
import { Group, Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import styles from './EntityGroupHeader.module.scss';
import { DOCS_BASE_URL } from 'constants/app';
@@ -23,8 +23,7 @@ function EntityGroupHeader({
if (docPath) {
const tooltipTitle = tooltip || 'Not sure what this means?';
return (
- <TooltipSimple
- arrow
+ <Tooltip
title={
<>
{tooltipTitle}{' '}
@@ -42,17 +41,17 @@ function EntityGroupHeader({
<span className={styles.infoIcon}>
<Info size="md" />
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
if (tooltip) {
return (
- <TooltipSimple title={tooltip}>
+ <Tooltip title={tooltip}>
<span className={styles.infoIcon}>
<Info size="md" />
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx
index fe6d7f047e..bbe78185ff 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx
@@ -253,8 +253,7 @@ export default function K8sBaseDetails<T>({
size="sm"
color="secondary"
onClick={handleBack}
- data-testid="drawer-back-button"
- className={styles.backButton}
+ testId="drawer-back-button"
aria-label={backLabel}
prefix={<ArrowLeft size={14} />}
>
@@ -265,11 +264,13 @@ export default function K8sBaseDetails<T>({
variant="ghost"
size="sm"
color="secondary"
+ icon
+ aria-label="Close"
onClick={handleClose}
- data-testid="close-drawer-button"
- className={styles.closeButton}
- prefix={<X />}
- />
+ testId="close-drawer-button"
+ >
+ <X />
+ </Button>
)}
<Divider type="vertical" />
<span className={styles.entityKind} data-testid="drawer-entity-kind">
@@ -285,7 +286,6 @@ export default function K8sBaseDetails<T>({
<CopyButton
value={entityName || selectedItem || ''}
ariaLabel={`Copy ${K8S_CATEGORY_SINGULAR_LABELS[category]} name`}
- className={styles.copyIdButton}
testId="copy-id-button"
onCopy={handleCopyId}
/>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetailsContent.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetailsContent.tsx
index 6f171c2ecd..c8e5460389 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetailsContent.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetailsContent.tsx
@@ -8,8 +8,8 @@ import {
ScrollText,
} from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
import { InfraMonitoringEvents } from 'constants/events';
@@ -294,9 +294,11 @@ export default function K8sBaseDetailsContent<T>({
{!hideDetailViewTabs && (
<div className={styles.viewsTabsContainer}>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
- className={styles.viewsTabs}
onChange={handleTabChange}
value={effectiveView}
items={[
@@ -378,30 +380,32 @@ export default function K8sBaseDetailsContent<T>({
/>
{effectiveView === VIEW_TYPES.LOGS && (
- <TooltipSimple title="Go to Logs Explorer" side="left" arrow>
+ <Tooltip title="Go to Logs Explorer" side="left">
<Button
+ aria-label="Action"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- className={styles.compassButton}
onClick={handleExplorePagesRedirect}
>
<Compass size={18} />
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
{effectiveView === VIEW_TYPES.TRACES && (
- <TooltipSimple title="Go to Traces Explorer" side="left" arrow>
+ <Tooltip title="Go to Traces Explorer" side="left">
<Button
+ aria-label="Action"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- className={styles.compassButton}
onClick={handleExplorePagesRedirect}
>
<Compass size={18} />
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
)}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.module.scss
index f65f0eabee..2a11c73c05 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.module.scss
@@ -32,10 +32,8 @@
justify-content: flex-start;
gap: var(--spacing-4);
background-color: var(--l1-background);
-}
-.viewAllButton {
- display: flex;
- align-items: center;
- margin: var(--spacing-4);
+ > [data-slot='button'] {
+ margin: var(--spacing-4);
+ }
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx
index 678a30ea4c..290d44be9b 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx
@@ -291,11 +291,11 @@ export function K8sExpandedRow<
const footerContent = hasMoreItems ? (
<Button
+ size="md"
type="button"
color="secondary"
variant="outlined"
- className={styles.viewAllButton}
- data-testid="expanded-row-view-all"
+ testId="expanded-row-view-all"
onClick={handleViewAllClick}
prefix={<CornerDownRight size={14} />}
>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.module.scss
index 6dda55b8ff..48e626bd4d 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.module.scss
@@ -19,10 +19,6 @@
width: 100%;
}
-.k8SRunButton {
- flex: 0 0 auto;
-}
-
.k8SFiltersButton {
flex: 0 0 auto;
}
@@ -45,12 +41,4 @@
border-color: var(--l2-border) !important;
}
}
-
- :global(.refresh-actions .ant-form-item-control-input) {
- &,
- :global(.ant-btn) {
- height: 30px;
- min-height: unset;
- }
- }
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx
index 1d1b4b8116..23a4a2095a 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx
@@ -141,7 +141,6 @@ function K8sHeader({
isLoadingQueries={isFetching}
onStageRunQuery={handleStageRunQuery}
handleCancelQuery={handleCancelQuery}
- className={styles.k8SRunButton}
/>
</div>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.module.scss
index 2c4b52ab86..594f22a654 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.module.scss
@@ -26,16 +26,9 @@
.fontSizeContainer {
display: flex;
- flex-direction: column;
- padding: var(--spacing-4) 0;
-}
-
-.fontSizeOption {
- width: 100%;
- --button-display: flex;
- --button-justify-content: space-between;
- --button-align-items: center;
- --button-padding: var(--spacing-4) var(--spacing-8);
+ flex-direction: row;
+ padding: var(--spacing-4);
+ gap: var(--spacing-4);
}
.fontSizeLabel {
@@ -86,10 +79,6 @@
justify-content: space-between;
padding: var(--spacing-2) var(--spacing-8);
- > span {
- width: auto !important;
- }
-
&:first-child {
padding-top: var(--spacing-8);
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.tsx
index 56ac220db1..fe9e553cf0 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sOptionsSidePanel.tsx
@@ -3,7 +3,6 @@ import { Button } from '@signozhq/ui/button';
import { DrawerWrapper } from '@signozhq/ui/drawer';
import { Input } from '@signozhq/ui/input';
import { Switch } from '@signozhq/ui/switch';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
import { Check, Minus, Plus } from '@signozhq/icons';
import {
hideColumn,
@@ -139,17 +138,20 @@ function K8sOptionsSidePanel<TData>({
<div className={styles.fontSizeContainer}>
{FONT_SIZE_OPTIONS.map((option) => (
<Button
+ size="md"
key={option.value}
variant="ghost"
- color="none"
- className={styles.fontSizeOption}
- data-testid={`font-size-${option.value}`}
+ color="secondary"
+ width="100%"
+ testId={`font-size-${option.value}`}
onClick={(): void => setFontSize(option.value)}
+ suffix={
+ fontSize === option.value ? (
+ <Check size={14} className={styles.checkIcon} />
+ ) : undefined
+ }
>
{option.label}
- {fontSize === option.value && (
- <Check size={14} className={styles.checkIcon} />
- )}
</Button>
))}
</div>
@@ -171,27 +173,33 @@ function K8sOptionsSidePanel<TData>({
type="number"
prefix={
<Button
+ disabledTooltip="Minimum is 1 line"
variant="solid"
color="primary"
size="sm"
- className={styles.lineClampButton}
- data-testid="line-clamp-decrease"
+ icon
+ aria-label="Decrease max lines"
+ testId="line-clamp-decrease"
onClick={decreaseLineClamp}
- prefix={<Minus />}
disabled={lineClamp <= 1}
- />
+ >
+ <Minus />
+ </Button>
}
suffix={
<Button
+ disabledTooltip="Maximum is 10 lines"
variant="solid"
color="primary"
size="sm"
- className={styles.lineClampButton}
- data-testid="line-clamp-increase"
+ icon
+ aria-label="Increase max lines"
+ testId="line-clamp-increase"
onClick={increaseLineClamp}
- prefix={<Plus />}
disabled={lineClamp >= 10}
- />
+ >
+ <Plus />
+ </Button>
}
/>
</div>
@@ -206,26 +214,20 @@ function K8sOptionsSidePanel<TData>({
<div className={styles.columnsList}>
{orderedVisibleColumnItems.map((column) => {
const isVisible = !hiddenColumnIds.includes(column.id);
- const switchElement = (
- <Switch
- value={isVisible}
- disabled={!column.canBeHidden}
- data-testid={`toggle-column-${column.id}`}
- onChange={(checked): void => handleToggleColumn(column.id, checked)}
- />
- );
return (
<div className={styles.columnItem} key={column.id}>
<Typography.Text as="span" size="sm" className={styles.columnLabel}>
{column.label}
</Typography.Text>
- {column.canBeHidden ? (
- switchElement
- ) : (
- <TooltipSimple title="Required column cannot be hidden" arrow>
- {switchElement}
- </TooltipSimple>
- )}
+ <Switch
+ color="primary"
+ textPlacement="right"
+ disabledTooltip="Required column cannot be hidden"
+ value={isVisible}
+ disabled={!column.canBeHidden}
+ testId={`toggle-column-${column.id}`}
+ onChange={(checked): void => handleToggleColumn(column.id, checked)}
+ />
</div>
);
})}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.module.scss
index 2223f2b468..588217319b 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.module.scss
@@ -58,8 +58,3 @@
.spacer {
flex: 1;
}
-
-.toolbarButton {
- flex-shrink: 0;
- --button-padding: 0px;
-}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.tsx
index 10e7b3ac19..cfefc8f016 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sTableToolbar.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { Button } from '@signozhq/ui/button';
import { Select } from 'antd';
import { Download, SlidersVertical } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { InfraMonitoringEvents } from 'constants/events';
@@ -99,34 +99,36 @@ function K8sTableToolbar({
{leftFilters}
{onDownload && (
- <TooltipSimple title="Download">
+ <Tooltip title="Download">
<Button
+ aria-label="Action"
type="button"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- data-testid="k8s-table-download-button"
+ testId="k8s-table-download-button"
onClick={onDownload}
- className={styles.toolbarButton}
>
<Download size={14} />
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
- <TooltipSimple title="Options">
+ <Tooltip title="Options">
<Button
+ aria-label="Action"
type="button"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- data-testid="k8s-table-options-button"
+ testId="k8s-table-options-button"
onClick={onOpenOptionsDrawer}
- className={styles.toolbarButton}
>
<SlidersVertical size={14} />
</Button>
- </TooltipSimple>
+ </Tooltip>
</div>
);
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseDetails.tabValidation.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseDetails.tabValidation.test.tsx
index 4b8c3e133d..91f30a7b30 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseDetails.tabValidation.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseDetails.tabValidation.test.tsx
@@ -102,7 +102,7 @@ function renderK8sBaseDetails({
}
function getSelectedTabText(): string | null {
- const selectedTab = document.querySelector('[aria-checked="true"]');
+ const selectedTab = document.querySelector('[aria-pressed="true"]');
return selectedTab?.textContent ?? null;
}
@@ -244,7 +244,7 @@ describe('K8sBaseDetails - Tab Validation', () => {
expect(getSelectedTabText()).toContain('Logs');
});
- const selectedTab = document.querySelector('[aria-checked="true"]');
+ const selectedTab = document.querySelector('[aria-pressed="true"]');
expect(selectedTab).not.toBeNull();
await user.click(selectedTab as Element);
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseList.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseList.test.tsx
index 727ab4b815..6547355f08 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseList.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseList.test.tsx
@@ -5,7 +5,6 @@ import { Provider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { MemoryRouter as MemoryRouterV5 } from 'react-router-dom-v5-compat';
import { VirtuosoMockContext } from 'react-virtuoso';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { InfraMonitoringEvents } from 'constants/events';
@@ -204,12 +203,10 @@ function renderComponent<
<VirtuosoMockContext.Provider
value={{ viewportHeight: 800, itemHeight: 50 }}
>
- <TooltipProvider>
- <K8sBaseList<T, TItemKey>
- {...props}
- detailsQueryKeyPrefix={detailsQueryKeyPrefix}
- />
- </TooltipProvider>
+ <K8sBaseList<T, TItemKey>
+ {...props}
+ detailsQueryKeyPrefix={detailsQueryKeyPrefix}
+ />
</VirtuosoMockContext.Provider>
</NuqsTestingAdapter>
</Provider>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.module.scss
index 83ecc245c1..22abe20477 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.module.scss
@@ -34,8 +34,4 @@
position: absolute;
top: var(--spacing-4);
right: var(--spacing-4);
-
- --button-padding: var(--spacing-1);
- --button-height: 24px;
- --button-width: 24px;
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.tsx
index b4621efe7b..1bf8a5a358 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.tsx
@@ -1,5 +1,5 @@
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { Compass } from '@signozhq/icons';
import { TextNoData } from '../../../components/TextNoData';
@@ -79,20 +79,22 @@ export function EntityCountsSection<T>({
to={buildK8sListNavigationUrl(config.targetCategory, filterExpression)}
onClick={(): void => handleCardNavigate(config.label)}
data-testid={`navigate-${config.label.toLowerCase().replace(/\s+/g, '-')}`}
+ className={styles.navigateButton}
>
- <TooltipSimple
+ <Tooltip
title={`View ${config.label.toLowerCase()} of '${selectedItem}'`}
side="top"
- arrow
>
<Button
- size="icon"
+ aria-label="Action"
+ size="sm"
+ icon
variant="ghost"
color="secondary"
- className={styles.navigateButton}
- prefix={<Compass size={14} />}
- />
- </TooltipSimple>
+ >
+ <Compass size={14} />
+ </Button>
+ </Tooltip>
</Link>
</div>
))}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.module.scss
index 012a5718f6..416099173e 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.module.scss
@@ -10,6 +10,13 @@
align-items: center;
gap: var(--spacing-1);
min-width: 0;
+
+ // Sized to the icon rather than the default 2rem tap target, so the copy
+ // button sits flush against the value instead of floating in its own block
+ // of padding.
+ --button-padding: 2px;
+ --button-height: auto;
+ --button-width: auto;
}
.label {
@@ -34,11 +41,3 @@
.valueText {
font-family: var(--periscope-font-family-mono);
}
-
-// Sized to the icon rather than the default 2rem tap target, so it sits flush
-// against the value instead of floating in its own block of padding.
-.copyButton {
- --button-padding: 2px;
- --button-height: auto;
- --button-width: auto;
-}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.tsx
index 0993b419f3..ce33cab764 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityMetadataItem/EntityMetadataItem.tsx
@@ -1,6 +1,6 @@
import { ReactNode, useCallback } from 'react';
import { toast } from '@signozhq/ui/sonner';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import CopyButton from 'periscope/components/CopyButton/CopyButton';
@@ -35,7 +35,7 @@ export function EntityMetadataItem({
{renderedValue ?? (
<div className={styles.valueRow}>
- <TooltipSimple title={value} arrow side="bottom" align="start">
+ <Tooltip title={value} side="bottom" align="start">
<span className={styles.value}>
<Typography.Text
size="small"
@@ -45,13 +45,12 @@ export function EntityMetadataItem({
{value}
</Typography.Text>
</span>
- </TooltipSimple>
+ </Tooltip>
{!!value && (
<CopyButton
value={value}
size={10}
ariaLabel={`Copy ${label}`}
- className={styles.copyButton}
testId={`copy-metadata-${label.toLowerCase().replace(/\s+/g, '-')}`}
onCopy={handleCopy}
/>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityStatusFilter/statusFilterOptions.ts b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityStatusFilter/statusFilterOptions.ts
index 85d23d8ca3..2162572ed3 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityStatusFilter/statusFilterOptions.ts
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityStatusFilter/statusFilterOptions.ts
@@ -1,4 +1,4 @@
-import { BadgeColor } from '@signozhq/ui/badge';
+import type { BadgeColorType } from '@signozhq/ui/badge';
import {
InframonitoringtypesContainerStatusDTO,
InframonitoringtypesNodeConditionDTO,
@@ -18,7 +18,7 @@ import {
} from '../../../Containers/utils';
import { NODE_CONDITION_LABELS } from '../../../Nodes/utils';
-const ERROR_BADGE_COLOR: BadgeColor = 'cherry';
+const ERROR_BADGE_COLOR: BadgeColorType = 'danger';
/**
* Splits statuses into the two sections the dropdown renders. The badge colour is
@@ -28,7 +28,7 @@ const ERROR_BADGE_COLOR: BadgeColor = 'cherry';
function toSectionedOptions<T extends string>(
values: T[],
labels: Record<T, string>,
- colors: Record<T, BadgeColor>,
+ colors: Record<T, BadgeColorType>,
): OptionData[] {
const toOption = (value: T): OptionData => ({
label: labels[value],
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout.tsx
index 046581e176..bb5906c79f 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout.tsx
@@ -88,13 +88,13 @@ export function K8sInstrumentationChecksCallout({
<div className={styles.header}>
Instrumentation checks
<Button
- variant="outlined"
+ variant="solid"
color="warning"
size="sm"
onClick={handleRecheck}
loading={isFetching}
prefix={<RefreshCw size={12} />}
- data-testid="instrumentation-checks-recheck-btn"
+ testId="instrumentation-checks-recheck-btn"
>
Recheck
</Button>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/ClickableStatusBadge.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/ClickableStatusBadge.tsx
index 71c60f2036..daeb0662e0 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/ClickableStatusBadge.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/ClickableStatusBadge.tsx
@@ -1,4 +1,4 @@
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
import TanStackTable from 'components/TanStackTableView';
import { StatusFilterKind, useStatusFilter } from './useStatusFilter';
@@ -6,7 +6,7 @@ import { StatusFilterKind, useStatusFilter } from './useStatusFilter';
import styles from './ClickableStatusBadge.module.scss';
interface ClickableStatusBadgeProps {
- color: BadgeColor;
+ color: BadgeColorType;
label: string;
/** The status this badge stands for, applied as the filter when clicked. */
status: string;
@@ -32,9 +32,7 @@ function ClickableStatusBadge({
<TanStackTable.HoverTooltip
rowId={rowId}
title={isWholeFilter ? `Clear ${label} filter` : `Filter by ${label}`}
- arrow
align="start"
- delayDuration={300}
>
<button
type="button"
@@ -46,7 +44,7 @@ function ClickableStatusBadge({
setStatusFilter(isWholeFilter ? [] : [status]);
}}
>
- <Badge color={color} variant="outline">
+ <Badge color={color} variant="outlined" textTransform="none">
{label}
</Badge>
</button>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/__tests__/ClickableStatusBadge.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/__tests__/ClickableStatusBadge.test.tsx
index 6661f48cb7..37bb86a1df 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/__tests__/ClickableStatusBadge.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/StatusFilterCells/__tests__/ClickableStatusBadge.test.tsx
@@ -11,7 +11,7 @@ function renderBadge(
render(
<NuqsTestingAdapter searchParams={searchParams} onUrlUpdate={onUrlUpdate}>
<ClickableStatusBadge
- color="cherry"
+ color="danger"
label="CrashLoopBackOff"
status="crashloopbackoff"
kind="pod"
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/utils.module.scss b/frontend/src/container/InfraMonitoringK8sV2/Base/utils.module.scss
index c6e9d30e01..301a2dfcff 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/utils.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/utils.module.scss
@@ -8,11 +8,3 @@
text-overflow: ellipsis;
white-space: nowrap;
}
-
-.itemDataGroupTagItem {
- display: block !important;
- max-width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx b/frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx
index ed9765b57b..6c54e7de04 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx
@@ -63,10 +63,12 @@ export function getGroupByEl<
<div className={styles.itemDataGroup}>
{groupByValues.map((value, index) => (
<Badge
+ textTransform="none"
+ variant="solid"
// oxlint-disable-next-line react/no-array-index-key
key={`${index}-${value}`}
color="secondary"
- className={styles.itemDataGroupTagItem}
+ maxWidth="100%"
>
{value === '' ? '<no-value>' : value}
</Badge>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Containers/table.config.tsx b/frontend/src/container/InfraMonitoringK8sV2/Containers/table.config.tsx
index 812f70b916..b209a0b783 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Containers/table.config.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Containers/table.config.tsx
@@ -237,7 +237,7 @@ export const k8sContainerColumnsConfig: ContainerTableColumnConfig[] = [
}
return (
- <Badge color={CONTAINER_READY_COLORS[row.ready]} variant="outline">
+ <Badge color={CONTAINER_READY_COLORS[row.ready]} variant="outlined">
{CONTAINER_READY_LABELS[row.ready]}
</Badge>
);
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Containers/utils.ts b/frontend/src/container/InfraMonitoringK8sV2/Containers/utils.ts
index 7085f59dd4..5e792ee946 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Containers/utils.ts
+++ b/frontend/src/container/InfraMonitoringK8sV2/Containers/utils.ts
@@ -1,5 +1,5 @@
import { Color } from '@signozhq/design-tokens';
-import { BadgeColor } from '@signozhq/ui/badge';
+import type { BadgeColorType } from '@signozhq/ui/badge';
import {
InframonitoringtypesContainerCountsByReadyDTO,
InframonitoringtypesContainerCountsByStatusDTO,
@@ -50,22 +50,22 @@ export function getContainerPodUID(
export const CONTAINER_STATUS_COLORS: Record<
InframonitoringtypesContainerStatusDTO,
- BadgeColor
+ BadgeColorType
> = {
- [InframonitoringtypesContainerStatusDTO.running]: 'forest',
- [InframonitoringtypesContainerStatusDTO.completed]: 'robin',
- [InframonitoringtypesContainerStatusDTO.waiting]: 'amber',
- [InframonitoringtypesContainerStatusDTO.containercreating]: 'amber',
- [InframonitoringtypesContainerStatusDTO.terminated]: 'sienna',
- [InframonitoringtypesContainerStatusDTO.unknown]: 'vanilla',
- [InframonitoringtypesContainerStatusDTO.no_data]: 'vanilla',
- [InframonitoringtypesContainerStatusDTO.crashloopbackoff]: 'cherry',
- [InframonitoringtypesContainerStatusDTO.imagepullbackoff]: 'cherry',
- [InframonitoringtypesContainerStatusDTO.errimagepull]: 'cherry',
- [InframonitoringtypesContainerStatusDTO.createcontainerconfigerror]: 'cherry',
- [InframonitoringtypesContainerStatusDTO.oomkilled]: 'cherry',
- [InframonitoringtypesContainerStatusDTO.error]: 'cherry',
- [InframonitoringtypesContainerStatusDTO.containercannotrun]: 'cherry',
+ [InframonitoringtypesContainerStatusDTO.running]: 'success',
+ [InframonitoringtypesContainerStatusDTO.completed]: 'primary',
+ [InframonitoringtypesContainerStatusDTO.waiting]: 'warning',
+ [InframonitoringtypesContainerStatusDTO.containercreating]: 'warning',
+ [InframonitoringtypesContainerStatusDTO.terminated]: 'archive',
+ [InframonitoringtypesContainerStatusDTO.unknown]: 'secondary',
+ [InframonitoringtypesContainerStatusDTO.no_data]: 'secondary',
+ [InframonitoringtypesContainerStatusDTO.crashloopbackoff]: 'danger',
+ [InframonitoringtypesContainerStatusDTO.imagepullbackoff]: 'danger',
+ [InframonitoringtypesContainerStatusDTO.errimagepull]: 'danger',
+ [InframonitoringtypesContainerStatusDTO.createcontainerconfigerror]: 'danger',
+ [InframonitoringtypesContainerStatusDTO.oomkilled]: 'danger',
+ [InframonitoringtypesContainerStatusDTO.error]: 'danger',
+ [InframonitoringtypesContainerStatusDTO.containercannotrun]: 'danger',
};
/** kubectl prints these as single CamelCase words, so the enum value alone is not a usable label. */
@@ -192,11 +192,11 @@ export function getContainerStatusItems(
export const CONTAINER_READY_COLORS: Record<
InframonitoringtypesContainerReadyDTO,
- BadgeColor
+ BadgeColorType
> = {
- [InframonitoringtypesContainerReadyDTO.ready]: 'forest',
- [InframonitoringtypesContainerReadyDTO.not_ready]: 'cherry',
- [InframonitoringtypesContainerReadyDTO.no_data]: 'vanilla',
+ [InframonitoringtypesContainerReadyDTO.ready]: 'success',
+ [InframonitoringtypesContainerReadyDTO.not_ready]: 'danger',
+ [InframonitoringtypesContainerReadyDTO.no_data]: 'secondary',
};
export const CONTAINER_READY_LABELS: Record<
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityDateTimeSelector/EntityDateTimeSelector.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityDateTimeSelector/EntityDateTimeSelector.tsx
index 14043ea141..503f25268b 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityDateTimeSelector/EntityDateTimeSelector.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityDateTimeSelector/EntityDateTimeSelector.tsx
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { Undo } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { InfraMonitoringEvents } from 'constants/events';
import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
@@ -53,17 +53,18 @@ function EntityDateTimeSelector({
return (
<div className={styles.container}>
{hasTimeChanged && (
- <TooltipSimple title="Reset to list time" side="bottom">
+ <Tooltip title="Reset to list time" side="bottom">
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={handleResetToParentTime}
- data-testid="reset-to-list-time-button"
+ testId="reset-to-list-time-button"
prefix={<Undo size={14} />}
>
Reset
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
<DateTimeSelectionV2
showAutoRefresh
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartHeader.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartHeader.tsx
index 4ede492430..fe44083d6b 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartHeader.tsx
@@ -1,6 +1,6 @@
import { Link } from 'react-router-dom';
import { Compass, Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import styles from './ChartHeader.module.scss';
import { DOCS_BASE_URL } from 'constants/app';
@@ -28,8 +28,7 @@ function ChartHeader({
if (docPath) {
const tooltipTitle = tooltip || 'Not sure what this represents?';
return (
- <TooltipSimple
- arrow
+ <Tooltip
title={
<>
{tooltipTitle}{' '}
@@ -47,17 +46,17 @@ function ChartHeader({
<span className={styles.infoIcon} data-testid="chart-header-info-icon">
<Info size="md" />
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
if (tooltip) {
return (
- <TooltipSimple title={tooltip} arrow>
+ <Tooltip title={tooltip}>
<span className={styles.infoIcon} data-testid="chart-header-info-icon">
<Info size="md" />
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
@@ -69,7 +68,7 @@ function ChartHeader({
<span className={styles.chartHeaderLabel}>{title}</span>
{renderInfoIcon()}
{metricsExplorerUrl && (
- <TooltipSimple title="Go to Metrics Explorer" arrow>
+ <Tooltip title="Go to Metrics Explorer">
<Link
to={metricsExplorerUrl}
className={styles.metricsExplorerLink}
@@ -78,7 +77,7 @@ function ChartHeader({
>
<Compass size={14} />
</Link>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
);
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartTooltipFooter.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartTooltipFooter.tsx
index 594d524722..a9473b2e63 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartTooltipFooter.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartTooltipFooter.tsx
@@ -71,9 +71,9 @@ export default function ChartTooltipFooter({
size="sm"
onClick={handleUnpinClick}
aria-label="Unpin tooltip"
- data-testid="entity-chart-tooltip-unpin"
+ testId="entity-chart-tooltip-unpin"
+ prefix={<X size={10} />}
>
- <X size={10} />
<span>Unpin</span>
</Button>
)}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.test.tsx
index c3f96501c7..3a9993a80f 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/__tests__/EntityMetrics.test.tsx
@@ -1,6 +1,5 @@
import { render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
import * as appContextHooks from 'providers/App/App';
import { LicenseEvent } from 'types/api/licensesV3/getActive';
@@ -292,16 +291,14 @@ const renderEntityMetrics = (overrides = {}): any => {
return render(
<MemoryRouter>
- <TooltipProvider>
- <EntityMetrics
- entity={defaultProps.entity}
- eventEntity="test"
- entityWidgetInfo={defaultProps.entityWidgetInfo}
- getEntityQueryPayload={defaultProps.getEntityQueryPayload}
- queryKey={defaultProps.queryKey}
- category={defaultProps.category}
- />
- </TooltipProvider>
+ <EntityMetrics
+ entity={defaultProps.entity}
+ eventEntity="test"
+ entityWidgetInfo={defaultProps.entityWidgetInfo}
+ getEntityQueryPayload={defaultProps.getEntityQueryPayload}
+ queryKey={defaultProps.queryKey}
+ category={defaultProps.category}
+ />
</MemoryRouter>,
);
};
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/EntityOverview.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/EntityOverview.tsx
index 56dfc3ae11..3290d4f3bc 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/EntityOverview.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/EntityOverview.tsx
@@ -8,7 +8,7 @@ import {
SelectTrigger,
SelectValue,
} from '@signozhq/ui/select';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import {
QuerySearchV2Provider,
@@ -251,20 +251,19 @@ function EntityOverviewContent({
</SelectContent>
</Select>
- <TooltipSimple
- title={`View on ${targetLabel.toLowerCase()} page`}
- side="top"
- arrow
- >
+ <Tooltip title={`View on ${targetLabel.toLowerCase()} page`} side="top">
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
+ aria-label={`View on ${targetLabel.toLowerCase()} page`}
onClick={handleNavigate}
- data-testid="overview-view-on-list-page"
- prefix={<Compass size={16} />}
- />
- </TooltipSimple>
+ testId="overview-view-on-list-page"
+ >
+ <Compass size={16} />
+ </Button>
+ </Tooltip>
</div>
}
listConfig={targetConfig.list}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/ScopeChip.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/ScopeChip.tsx
index 7f352ef162..c007c3cc13 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/ScopeChip.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/ScopeChip.tsx
@@ -1,5 +1,5 @@
import { Lock } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
import { RelatedFilterClause } from '../../Base/relations';
@@ -23,7 +23,7 @@ export function ScopeChip({
const relation = clauses[clauses.length - 1];
return (
- <TooltipSimple title={expression} side="top" arrow>
+ <Tooltip title={expression} side="top">
<span className={styles.scopeChip} data-testid="overview-locked-scope">
<Lock size={12} />
<span className={styles.scopeExpression}>
@@ -37,6 +37,6 @@ export function ScopeChip({
<span className={styles.scopeMore}>{`+${clauses.length - 1}`}</span>
)}
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/__tests__/EntityOverview.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/__tests__/EntityOverview.test.tsx
index a01d6547c6..07d05b5270 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/__tests__/EntityOverview.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityOverview/__tests__/EntityOverview.test.tsx
@@ -1,7 +1,6 @@
import { QueryClient, QueryClientProvider } from 'react-query';
import { MemoryRouter } from 'react-router-dom';
import { VirtuosoMockContext } from 'react-virtuoso';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { NuqsTestingAdapter, OnUrlUpdateFunction } from 'nuqs/adapters/testing';
@@ -87,16 +86,14 @@ function overviewTree(
<VirtuosoMockContext.Provider
value={{ viewportHeight: 800, itemHeight: 50 }}
>
- <TooltipProvider>
- <EntityOverview
- category={InfraMonitoringEntity.NODES}
- eventEntity="node"
- attributes={attributes}
- entity={{ nodeName: attributes['k8s.node.name'] }}
- entityName={attributes['k8s.node.name']}
- queryKeyPrefix="node"
- />
- </TooltipProvider>
+ <EntityOverview
+ category={InfraMonitoringEntity.NODES}
+ eventEntity="node"
+ attributes={attributes}
+ entity={{ nodeName: attributes['k8s.node.name'] }}
+ entityName={attributes['k8s.node.name']}
+ queryKeyPrefix="node"
+ />
</VirtuosoMockContext.Provider>
</NuqsTestingAdapter>
</QueryClientProvider>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.table.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.table.test.tsx
index 247e6b7d45..d19d195c07 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.table.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/__tests__/EntityTraces.table.test.tsx
@@ -72,7 +72,7 @@ describe('EntityTraces - Table Rendering', () => {
expect(screen.getByTestId('responseStatusCode')).toHaveTextContent('200');
});
- it('should render http method as robin colored outline badge', async () => {
+ it('should render http method as primary colored outlined badge', async () => {
mockQueryRangeV5WithTracesResponse({
customTraces: [{ httpMethod: 'POST', responseStatusCode: '200' }],
});
@@ -83,8 +83,8 @@ describe('EntityTraces - Table Rendering', () => {
const badge = await screen.findByTestId('httpMethod');
expect(badge).toHaveTextContent('POST');
- expect(badge).toHaveAttribute('data-color', 'robin');
- expect(badge).toHaveAttribute('data-variant', 'outline');
+ expect(badge).toHaveAttribute('data-color', 'primary');
+ expect(badge).toHaveAttribute('data-variant', 'outlined');
});
it('should render - when http method is empty', async () => {
@@ -119,11 +119,11 @@ describe('EntityTraces - Table Rendering', () => {
const badgeColors = badges.map((badge) => badge.getAttribute('data-color'));
expect(badgeColors).toStrictEqual([
- 'forest', // 2xx -> success
- 'robin', // 3xx -> redirect
- 'amber', // 4xx -> client error
- 'cherry', // 5xx -> server error
- 'vanilla', // 1xx -> informational
+ 'success', // 2xx -> success
+ 'primary', // 3xx -> redirect
+ 'warning', // 4xx -> client error
+ 'danger', // 5xx -> server error
+ 'secondary', // 1xx -> informational
]);
});
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.module.scss b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.module.scss
index 0de6ffc3af..1bc5b3be06 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.module.scss
@@ -1,7 +1,3 @@
-.pointer {
- cursor: pointer;
-}
-
.cellText {
color: var(--l2-foreground);
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx
index 4bcc8ca870..42e93329d6 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityTraces/traceListColumns.tsx
@@ -117,10 +117,10 @@ export const getTraceListColumns = (
return (
<BlockLink to={getTraceLink(itemData)} openInNewTab>
<Badge
- data-testid={key}
- color="robin"
- variant="outline"
- className={styles.pointer}
+ textTransform="none"
+ testId={key}
+ color="primary"
+ variant="outlined"
>
{httpMethod}
</Badge>
@@ -147,11 +147,7 @@ export const getTraceListColumns = (
return (
<BlockLink to={getTraceLink(itemData)} openInNewTab>
- <HttpStatusBadge
- statusCode={statusCode}
- testId={key}
- className={styles.pointer}
- />
+ <HttpStatusBadge statusCode={statusCode} testId={key} />
</BlockLink>
);
}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/entityDetails.module.scss b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/entityDetails.module.scss
index e81112e427..7aaf92f60e 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/entityDetails.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/entityDetails.module.scss
@@ -33,17 +33,6 @@
}
}
-.closeButton {
- --button-padding: var(--spacing-2);
-}
-
-.backButton {
- --button-padding: var(--spacing-2) var(--spacing-3);
-
- flex: none;
- white-space: nowrap;
-}
-
// The kind reads as a label on the name, not as part of it
.entityKind {
display: inline-flex;
@@ -66,14 +55,6 @@
--typography-margin: 0px var(--spacing-1) 0px 0px;
}
-// Sized to the icon rather than the default tap target, so it sits beside the
-// entity name instead of a gap away from it.
-.copyIdButton {
- --button-padding: 2px;
- --button-height: auto;
- --button-width: auto;
-}
-
.entityDetailsEntity {
display: flex;
flex-direction: column;
@@ -93,27 +74,14 @@
justify-content: space-between;
align-items: center;
- [data-slot='toggle-group-item'] {
+ [data-slot='toggle-group-button'] {
width: 114px;
}
}
-.viewsTabs {
- color: var(--l2-foreground);
-}
-
.viewTitle {
display: flex;
gap: var(--margin-2);
align-items: center;
justify-content: center;
}
-
-.compassButton {
- width: 30px;
- height: 30px;
- border-radius: 2px;
- border: 1px solid var(--l1-border);
- background: var(--l3-background);
- box-shadow: 0 0 8px 0 var(--l1-shadow);
-}
diff --git a/frontend/src/container/InfraMonitoringK8sV2/InfraMonitoringK8s.tsx b/frontend/src/container/InfraMonitoringK8sV2/InfraMonitoringK8s.tsx
index f3e62c91bf..4997a1d455 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/InfraMonitoringK8s.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/InfraMonitoringK8s.tsx
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import * as Sentry from '@sentry/react';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import QuickFilters from 'components/QuickFilters/QuickFilters';
import {
@@ -250,15 +250,18 @@ export default function InfraMonitoringK8s(): JSX.Element {
<>
{!showFilters && (
<div className={styles.k8SOpenQuickFilters}>
- <TooltipSimple title="Open Filters" arrow side="left">
+ <Tooltip title="Open Filters" side="left">
<Button
+ aria-label="Action"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
onClick={handleFilterVisibilityChange}
- prefix={<Filter size={14} />}
- />
- </TooltipSimple>
+ >
+ <Filter size={14} />
+ </Button>
+ </Tooltip>
</div>
)}
</>
@@ -279,13 +282,13 @@ export default function InfraMonitoringK8s(): JSX.Element {
Viewing · Resource
</Typography.Text>
<div className={styles.sectionLine} />
- <TooltipSimple title="Collapse Filters" arrow>
+ <Tooltip title="Collapse Filters">
<ArrowUpToLine
style={{ transform: 'rotate(270deg)' }}
onClick={handleFilterVisibilityChange}
size="md"
/>
- </TooltipSimple>
+ </Tooltip>
</div>
<div className={styles.categoryCard}>
<div className={styles.categoryList}>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/Nodes/utils.ts b/frontend/src/container/InfraMonitoringK8sV2/Nodes/utils.ts
index 5bdd38e6f0..c0ed968e64 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/Nodes/utils.ts
+++ b/frontend/src/container/InfraMonitoringK8sV2/Nodes/utils.ts
@@ -1,12 +1,12 @@
-import { BadgeColor } from '@signozhq/ui/badge';
+import type { BadgeColorType } from '@signozhq/ui/badge';
import { InframonitoringtypesNodeConditionDTO } from 'api/generated/services/sigNoz.schemas';
export const NODE_CONDITION_COLORS: Record<
InframonitoringtypesNodeConditionDTO,
- BadgeColor
+ BadgeColorType
> = {
- [InframonitoringtypesNodeConditionDTO.ready]: 'forest',
- [InframonitoringtypesNodeConditionDTO.not_ready]: 'amber',
+ [InframonitoringtypesNodeConditionDTO.ready]: 'success',
+ [InframonitoringtypesNodeConditionDTO.not_ready]: 'warning',
[InframonitoringtypesNodeConditionDTO.no_data]: 'secondary',
};
diff --git a/frontend/src/container/InfraMonitoringK8sV2/__tests__/InfraMonitoringK8s.test.tsx b/frontend/src/container/InfraMonitoringK8sV2/__tests__/InfraMonitoringK8s.test.tsx
index eef332744a..f78fa2a0b7 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/__tests__/InfraMonitoringK8s.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/__tests__/InfraMonitoringK8s.test.tsx
@@ -4,7 +4,6 @@ import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { MemoryRouter as MemoryRouterV5 } from 'react-router-dom-v5-compat';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { NuqsTestingAdapter, UrlUpdateEvent } from 'nuqs/adapters/testing';
import { AppProvider } from 'providers/App/App';
@@ -53,11 +52,9 @@ function renderPage(
searchParams={queryParams}
onUrlUpdate={onUrlUpdate}
>
- <TooltipProvider>
- <QueryBuilderProvider>
- <InfraMonitoringK8s />
- </QueryBuilderProvider>
- </TooltipProvider>
+ <QueryBuilderProvider>
+ <InfraMonitoringK8s />
+ </QueryBuilderProvider>
</NuqsTestingAdapter>
</Provider>
</AppProvider>
diff --git a/frontend/src/container/InfraMonitoringK8sV2/commonUtils.tsx b/frontend/src/container/InfraMonitoringK8sV2/commonUtils.tsx
index d963834e68..4238263e2f 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/commonUtils.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/commonUtils.tsx
@@ -1,5 +1,5 @@
import { Color } from '@signozhq/design-tokens';
-import { BadgeColor } from '@signozhq/ui/badge';
+import type { BadgeColorType } from '@signozhq/ui/badge';
import {
InframonitoringtypesPodCountsByStatusDTO,
InframonitoringtypesPodStatusDTO,
@@ -28,27 +28,27 @@ export function formatBytes(bytes: number, decimals = 2): string {
export const POD_STATUS_COLORS: Record<
InframonitoringtypesPodStatusDTO,
- BadgeColor
+ BadgeColorType
> = {
- [InframonitoringtypesPodStatusDTO.running]: 'forest',
- [InframonitoringtypesPodStatusDTO.completed]: 'robin',
- [InframonitoringtypesPodStatusDTO.pending]: 'amber',
- [InframonitoringtypesPodStatusDTO.unknown]: 'vanilla',
- [InframonitoringtypesPodStatusDTO.no_data]: 'vanilla',
- [InframonitoringtypesPodStatusDTO.failed]: 'cherry',
- [InframonitoringtypesPodStatusDTO.crashloopbackoff]: 'cherry',
- [InframonitoringtypesPodStatusDTO.imagepullbackoff]: 'cherry',
- [InframonitoringtypesPodStatusDTO.errimagepull]: 'cherry',
- [InframonitoringtypesPodStatusDTO.createcontainerconfigerror]: 'cherry',
- [InframonitoringtypesPodStatusDTO.containercreating]: 'amber',
- [InframonitoringtypesPodStatusDTO.oomkilled]: 'cherry',
- [InframonitoringtypesPodStatusDTO.error]: 'cherry',
- [InframonitoringtypesPodStatusDTO.containercannotrun]: 'cherry',
- [InframonitoringtypesPodStatusDTO.evicted]: 'cherry',
- [InframonitoringtypesPodStatusDTO.nodeaffinity]: 'cherry',
- [InframonitoringtypesPodStatusDTO.nodelost]: 'cherry',
- [InframonitoringtypesPodStatusDTO.shutdown]: 'cherry',
- [InframonitoringtypesPodStatusDTO.unexpectedadmissionerror]: 'cherry',
+ [InframonitoringtypesPodStatusDTO.running]: 'success',
+ [InframonitoringtypesPodStatusDTO.completed]: 'primary',
+ [InframonitoringtypesPodStatusDTO.pending]: 'warning',
+ [InframonitoringtypesPodStatusDTO.unknown]: 'secondary',
+ [InframonitoringtypesPodStatusDTO.no_data]: 'secondary',
+ [InframonitoringtypesPodStatusDTO.failed]: 'danger',
+ [InframonitoringtypesPodStatusDTO.crashloopbackoff]: 'danger',
+ [InframonitoringtypesPodStatusDTO.imagepullbackoff]: 'danger',
+ [InframonitoringtypesPodStatusDTO.errimagepull]: 'danger',
+ [InframonitoringtypesPodStatusDTO.createcontainerconfigerror]: 'danger',
+ [InframonitoringtypesPodStatusDTO.containercreating]: 'warning',
+ [InframonitoringtypesPodStatusDTO.oomkilled]: 'danger',
+ [InframonitoringtypesPodStatusDTO.error]: 'danger',
+ [InframonitoringtypesPodStatusDTO.containercannotrun]: 'danger',
+ [InframonitoringtypesPodStatusDTO.evicted]: 'danger',
+ [InframonitoringtypesPodStatusDTO.nodeaffinity]: 'danger',
+ [InframonitoringtypesPodStatusDTO.nodelost]: 'danger',
+ [InframonitoringtypesPodStatusDTO.shutdown]: 'danger',
+ [InframonitoringtypesPodStatusDTO.unexpectedadmissionerror]: 'danger',
};
/** kubectl prints these as single CamelCase words, so the enum value alone is not a usable label. */
diff --git a/frontend/src/container/InfraMonitoringK8sV2/components/ExpandButtonWrapper.tsx b/frontend/src/container/InfraMonitoringK8sV2/components/ExpandButtonWrapper.tsx
index 46c0b61394..915d6bd982 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/components/ExpandButtonWrapper.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/components/ExpandButtonWrapper.tsx
@@ -23,6 +23,7 @@ export function ExpandButtonWrapper({
return (
<div className={styles.expandButtonContainer}>
<Button
+ aria-label={localIsExpanded ? 'Collapse' : 'Expand'}
variant="ghost"
color="secondary"
onClick={(e): void => {
@@ -30,9 +31,11 @@ export function ExpandButtonWrapper({
setLocalIsExpanded((v) => !v);
toggleExpanded();
}}
- size="icon"
- prefix={localIsExpanded ? <ChevronDown /> : <ChevronRight />}
- />
+ size="sm"
+ icon
+ >
+ {localIsExpanded ? <ChevronDown /> : <ChevronRight />}
+ </Button>
{children}
</div>
);
diff --git a/frontend/src/container/InfraMonitoringK8sV2/components/GroupedStatusCounts.tsx b/frontend/src/container/InfraMonitoringK8sV2/components/GroupedStatusCounts.tsx
index 261069441e..412ce6bfcd 100644
--- a/frontend/src/container/InfraMonitoringK8sV2/components/GroupedStatusCounts.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/components/GroupedStatusCounts.tsx
@@ -117,7 +117,6 @@ export function GroupedStatusCounts({
key={item.label}
rowId={rowId}
title={buildTooltipContent(item, onSelectStatuses)}
- arrow
align="start"
>
{item.value ? (
diff --git a/frontend/src/container/IngestionSettings/IngestionSettings.styles.scss b/frontend/src/container/IngestionSettings/IngestionSettings.styles.scss
index 5a34306571..4f39abc973 100644
--- a/frontend/src/container/IngestionSettings/IngestionSettings.styles.scss
+++ b/frontend/src/container/IngestionSettings/IngestionSettings.styles.scss
@@ -43,12 +43,6 @@
gap: 12px;
padding: 16px 0;
-
- .add-new-ingestion-key-btn {
- display: flex;
- align-items: center;
- gap: 8px;
- }
}
.ant-table-row {
@@ -120,7 +114,7 @@
.action-btn {
display: flex;
align-items: center;
- gap: 4px;
+ gap: 8px;
cursor: pointer;
}
@@ -426,11 +420,6 @@
font-size: 12px;
font-weight: 600;
}
-
- .set-alert-btn {
- cursor: pointer;
- margin-left: 24px;
- }
}
}
@@ -618,28 +607,7 @@
justify-content: flex-end;
padding: 16px 16px;
margin: 0;
-
- .cancel-btn {
- display: flex;
- align-items: center;
- border: none;
- border-radius: 2px;
- background: var(--l1-border);
- }
-
- .delete-btn {
- display: flex;
- align-items: center;
- border: none;
- border-radius: 2px;
- background: var(--danger-background);
- margin-left: 12px;
- }
-
- .delete-btn:hover {
- color: var(--l1-foreground);
- background: var(--bg-cherry-600);
- }
+ gap: 12px;
}
}
diff --git a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
index 371c1b2cae..257e81de81 100644
--- a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
+++ b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
@@ -1007,20 +1007,25 @@ function MultiIngestionSettings(): JSX.Element {
</div>
<div className="action-btn">
<Button
- variant="link"
- size="icon"
+ variant="ghost"
+ size="sm"
+ icon
color="secondary"
- suffix={<PenLine size={14} />}
aria-label="Edit ingestion key"
onClick={onEditKey}
- />
+ >
+ <PenLine size={14} />
+ </Button>
<Button
- variant="link"
- size="icon"
- color="destructive"
- suffix={<Trash2 color={Color.BG_CHERRY_500} size={14} />}
+ aria-label="Delete ingestion key"
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
onClick={onDeleteKey}
- />
+ >
+ <Trash2 color={Color.BG_CHERRY_500} size={14} />
+ </Button>
</div>
</div>
),
@@ -1059,7 +1064,12 @@ function MultiIngestionSettings(): JSX.Element {
<div className="ingestion-key-tags">
{APIKey.tags.map((tag, index) => (
// eslint-disable-next-line react/no-array-index-key
- <Badge key={`${tag}-${index}`} color="vanilla">
+ <Badge
+ textTransform="none"
+ variant="solid"
+ key={`${tag}-${index}`}
+ color="secondary"
+ >
{' '}
{tag}{' '}
</Badge>
@@ -1127,30 +1137,37 @@ function MultiIngestionSettings(): JSX.Element {
{hasLimits(signalName) ? (
<>
<Button
+ disabledTooltip="Finish editing the current limit first"
variant="link"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- prefix={<PenLine size={14} />}
aria-label={`Edit ${signalName} limit`}
disabled={
!!(activeAPIKey?.id === APIKey?.id && activeSignal)
}
onClick={onEditSignalLimit}
- />
+ >
+ <PenLine size={14} />
+ </Button>
<Button
+ disabledTooltip="Finish editing the current limit first"
variant="link"
- size="icon"
- color="destructive"
- prefix={<Trash2 color={Color.BG_CHERRY_500} size={14} />}
+ size="sm"
+ icon
+ color="danger"
aria-label={`Delete ${signalName} limit`}
disabled={
!!(activeAPIKey?.id === APIKey?.id && activeSignal)
}
onClick={onDeleteSignalLimit}
- />
+ >
+ <Trash2 color={Color.BG_CHERRY_500} size={14} />
+ </Button>
</>
) : (
<Button
+ disabledTooltip="Finish editing the current limit first"
variant="outlined"
size="sm"
color="secondary"
@@ -1187,6 +1204,8 @@ function MultiIngestionSettings(): JSX.Element {
<div className="limit-enable-disable-toggle">
<Form.Item name="enableDailyLimit">
<Switch
+ color="primary"
+ textPlacement="right"
value={activeSignal?.config?.day?.enabled}
onChange={(value): void => {
setActiveSignal((prev) =>
@@ -1276,6 +1295,8 @@ function MultiIngestionSettings(): JSX.Element {
<div className="limit-enable-disable-toggle">
<Form.Item name="enableSecondLimit">
<Switch
+ color="primary"
+ textPlacement="right"
value={activeSignal?.config?.second?.enabled}
onChange={(value): void => {
setActiveSignal((prev) =>
@@ -1385,11 +1406,9 @@ function MultiIngestionSettings(): JSX.Element {
<div className="signal-limit-save-discard">
<div className="signal-limit-save-discard-actions">
<Button
+ color="primary"
variant="solid"
size="sm"
- disabled={
- isLoadingLimitForKey || isLoadingUpdatedLimitForKey
- }
loading={
isLoadingLimitForKey || isLoadingUpdatedLimitForKey
}
@@ -1398,6 +1417,7 @@ function MultiIngestionSettings(): JSX.Element {
Save
</Button>
<Button
+ disabledTooltip="Wait for the limit to save"
variant="outlined"
color="secondary"
size="sm"
@@ -1468,18 +1488,16 @@ function MultiIngestionSettings(): JSX.Element {
limit?.config?.day?.size !== undefined) ||
(signalCfg.usesCount &&
limit?.config?.day?.count !== undefined)) && (
- <Badge
- asChild
- color="cherry"
- variant="outline"
+ <Button
+ variant="solid"
+ color="primary"
+ onClick={onCreateSignalAlert}
+ size="sm"
testId={`set-alert-btn-${signalName}`}
- className="set-alert-btn"
+ prefix={<BellPlus size={12} />}
>
- <Button onClick={onCreateSignalAlert} size="sm">
- <BellPlus size={12} />
- Set alert
- </Button>
- </Badge>
+ Set alert
+ </Button>
)}
</div>
@@ -1661,11 +1679,13 @@ function MultiIngestionSettings(): JSX.Element {
>
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- prefix={<TriangleAlert size={14} />}
aria-label="Ingestion URL error details"
- />
+ >
+ <TriangleAlert size={14} />
+ </Button>
</Tooltip>
)}
</div>
@@ -1681,10 +1701,12 @@ function MultiIngestionSettings(): JSX.Element {
/>
<Button
+ size="md"
+ color="primary"
variant="solid"
- className="add-new-ingestion-key-btn"
prefix={<Plus size={14} />}
onClick={showAddModal}
+ width="200px"
>
New Ingestion key
</Button>
@@ -1718,23 +1740,23 @@ function MultiIngestionSettings(): JSX.Element {
destroyOnClose
footer={[
<Button
+ size="md"
key="cancel"
variant="ghost"
color="secondary"
prefix={<X size={16} />}
onClick={hideDeleteViewModal}
- className="cancel-btn"
>
Cancel
</Button>,
<Button
+ size="md"
key="submit"
variant="solid"
- color="destructive"
+ color="danger"
prefix={<Trash2 size={16} />}
loading={isDeleteingAPIKey}
onClick={onDeleteHandler}
- className="delete-btn"
>
Delete Ingestion Key
</Button>,
@@ -1758,23 +1780,23 @@ function MultiIngestionSettings(): JSX.Element {
destroyOnClose
footer={[
<Button
+ size="md"
key="cancel"
variant="ghost"
color="secondary"
prefix={<X size={16} />}
onClick={hideDeleteLimitModal}
- className="cancel-btn"
>
Cancel
</Button>,
<Button
+ size="md"
key="submit"
variant="solid"
- color="destructive"
+ color="danger"
prefix={<Trash2 size={16} />}
loading={isDeletingLimit}
onClick={onDeleteLimitHandler}
- className="delete-btn"
>
Delete Limit
</Button>,
@@ -1801,6 +1823,7 @@ function MultiIngestionSettings(): JSX.Element {
destroyOnClose
footer={[
<Button
+ size="md"
key="cancel"
variant="ghost"
color="secondary"
@@ -1810,6 +1833,8 @@ function MultiIngestionSettings(): JSX.Element {
Cancel
</Button>,
<Button
+ size="md"
+ color="primary"
key="submit"
variant="solid"
prefix={<Check size={14} />}
@@ -1869,6 +1894,7 @@ function MultiIngestionSettings(): JSX.Element {
destroyOnClose
footer={[
<Button
+ size="md"
key="cancel"
variant="ghost"
color="secondary"
@@ -1878,6 +1904,8 @@ function MultiIngestionSettings(): JSX.Element {
Cancel
</Button>,
<Button
+ size="md"
+ color="primary"
key="submit"
variant="solid"
testId="create-new-key"
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AccountActions/AccountActions.style.scss b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AccountActions/AccountActions.style.scss
index 823da8d4b4..dc3c046c32 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AccountActions/AccountActions.style.scss
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AccountActions/AccountActions.style.scss
@@ -69,7 +69,8 @@
&__action-buttons {
display: flex;
align-items: center;
- gap: 8px;
+ gap: 20px;
+ padding-right: 8px;
}
&__action-button {
@@ -131,6 +132,7 @@
font-size: 12px;
font-weight: 400;
line-height: 16px;
+ padding-inline-end: 24px !important;
}
&:hover {
.ant-select-selector {
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.style.scss b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.style.scss
index f8f5140220..a0095d9dc6 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.style.scss
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.style.scss
@@ -182,7 +182,7 @@
padding: 0 !important;
}
- [data-slot='tabs-trigger'] {
+ [data-slot='tabs-item'] {
padding: 4px 24px !important;
border: none !important;
background-color: transparent !important;
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.tsx b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.tsx
index 9e223a8a1a..138ee250c1 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AddNewAccount/CloudAccountSetupModal.tsx
@@ -83,16 +83,20 @@ function CloudAccountSetupModal({
const footer = (
<div className="cloud-account-setup-modal__footer">
<Button
+ disabledTooltip={
+ selectedRegions.length === 0
+ ? 'Select at least one region'
+ : 'Waiting for the account to connect'
+ }
+ size="md"
variant="solid"
color="primary"
prefix={<SquareArrowOutUpRight size={17} color={Color.BG_VANILLA_100} />}
onClick={handleSubmit}
disabled={
- selectedRegions.length === 0 ||
- isLoading ||
- isGeneratingUrl ||
- modalState === ModalStateEnum.WAITING
+ selectedRegions.length === 0 || modalState === ModalStateEnum.WAITING
}
+ loading={isLoading || isGeneratingUrl}
>
Launch Cloud Formation Template
</Button>
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/EditAccount/AccountSettingsModal.tsx b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/EditAccount/AccountSettingsModal.tsx
index a5d52ff2de..b8dc618a1e 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/EditAccount/AccountSettingsModal.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/EditAccount/AccountSettingsModal.tsx
@@ -134,6 +134,12 @@ function AccountSettingsModal({
/>
<Button
+ disabledTooltip={
+ selectedRegions.length === 0
+ ? 'Select at least one region'
+ : 'Change the regions first'
+ }
+ size="md"
variant="solid"
color="secondary"
disabled={isSaveDisabled}
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/RegionForm/RegionSelector.tsx b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/RegionForm/RegionSelector.tsx
index 5329e2de34..35d63d729f 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/RegionForm/RegionSelector.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/RegionForm/RegionSelector.tsx
@@ -31,6 +31,7 @@ export function RegionSelector({
<div className="region-selector">
<div className="select-all">
<Checkbox
+ color="primary"
value={allSelected ? true : someSelected ? 'indeterminate' : false}
onChange={(checked): void => handleSelectAll(checked === true)}
>
@@ -44,6 +45,7 @@ export function RegionSelector({
<h3>{region.name}</h3>
{region.subRegions.map((subRegion) => (
<Checkbox
+ color="primary"
key={subRegion.id}
value={selectedRegions.includes(subRegion.id)}
onChange={(): void => handleRegionSelect(subRegion.id)}
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.styles.scss b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.styles.scss
index f9ee5ada68..af4e876f33 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.styles.scss
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.styles.scss
@@ -115,14 +115,6 @@
border-top: 1px solid var(--l3-background);
background: var(--l1-background);
-
- .discard-btn {
- width: 100px;
- }
-
- .save-btn {
- width: 100px;
- }
}
.aws-service-details-overview-configuration-title-text-select-all {
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.tsx b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.tsx
index 65ad50c1df..c7f3c051b0 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.tsx
@@ -400,6 +400,13 @@ function ServiceDetails({
name="logsEnabled"
render={({ field }): JSX.Element => (
<Switch
+ color="primary"
+ textPlacement="right"
+ disabledTooltip={
+ isReadOnly
+ ? 'Connect an AWS account first'
+ : 'Wait for the changes to save'
+ }
value={field.value}
disabled={isUpdatingServiceConfig || isReadOnly}
onChange={(checked): void => {
@@ -441,6 +448,13 @@ function ServiceDetails({
name="metricsEnabled"
render={({ field }): JSX.Element => (
<Switch
+ color="primary"
+ textPlacement="right"
+ disabledTooltip={
+ isReadOnly
+ ? 'Connect an AWS account first'
+ : 'Wait for the changes to save'
+ }
value={field.value}
disabled={isUpdatingServiceConfig || isReadOnly}
onChange={field.onChange}
@@ -455,26 +469,28 @@ function ServiceDetails({
{hasUnsavedChanges && !isReadOnly && (
<div className="aws-service-details-overview-configuration-actions">
<Button
+ disabledTooltip="Wait for the changes to save"
variant="solid"
color="secondary"
onClick={handleDiscard}
disabled={isUpdatingServiceConfig}
size="sm"
prefix={<X size={14} />}
- className="discard-btn"
+ width={100}
type="button"
>
Discard
</Button>
<Button
+ disabledTooltip="Select at least one S3 bucket"
variant="solid"
color="primary"
size="sm"
- className="save-btn"
+ width={100}
prefix={<Save size={14} />}
type="submit"
loading={isUpdatingServiceConfig}
- disabled={isS3SyncBucketsMissing || isUpdatingServiceConfig}
+ disabled={isS3SyncBucketsMissing}
>
Save
</Button>
@@ -515,6 +531,8 @@ function ServiceDetails({
return (
<div className="aws-service-details-container">
<Tabs
+ orientation="horizontal"
+ alignment="start"
defaultValue="overview"
className="aws-service-details-tabs"
items={[
diff --git a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/__tests__/ServiceDetailsS3Sync.test.tsx b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/__tests__/ServiceDetailsS3Sync.test.tsx
index 12451e4c44..c51a373779 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/__tests__/ServiceDetailsS3Sync.test.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/__tests__/ServiceDetailsS3Sync.test.tsx
@@ -109,7 +109,10 @@ describe('ServiceDetails for S3 Sync service', () => {
await waitFor(() => {
expect(screen.getByLabelText(newBucketName)).toBeInTheDocument();
- expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+ expect(screen.getByRole('button', { name: /save/i })).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -141,7 +144,10 @@ describe('ServiceDetails for S3 Sync service', () => {
await waitFor(() => {
expect(screen.getByLabelText(newBucketName)).toBeInTheDocument();
- expect(screen.getByRole('button', { name: /save/i })).toBeEnabled();
+ expect(screen.getByRole('button', { name: /save/i })).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
fireEvent.click(screen.getByRole('button', { name: /save/i }));
diff --git a/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/AddNewAccount/CloudAccountSetupModal.tsx b/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/AddNewAccount/CloudAccountSetupModal.tsx
index 6f0d903b61..0fe92e25db 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/AddNewAccount/CloudAccountSetupModal.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/AddNewAccount/CloudAccountSetupModal.tsx
@@ -138,6 +138,7 @@ function CloudAccountSetupModal({
<div className="cloud-account-setup-modal__footer">
{modalState === ModalStateEnum.FORM && (
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<SquareArrowOutUpRight size={17} color={Color.BG_VANILLA_100} />}
@@ -219,11 +220,15 @@ function CloudAccountSetupModal({
}`}
>
<Button
+ size="md"
variant="link"
color="secondary"
+ icon
+ aria-label="How it works"
onClick={(): void => setIsHowItWorksOpen(!isHowItWorksOpen)}
- prefix={isHowItWorksOpen ? <ChevronDown /> : <ChevronRight />}
- />
+ >
+ {isHowItWorksOpen ? <ChevronDown /> : <ChevronRight />}
+ </Button>
<span className="cloud-account-setup-how-it-works-accordion__title-text">
How it works?
@@ -321,6 +326,8 @@ function CloudAccountSetupModal({
</div>
</div>
<Tabs
+ orientation="horizontal"
+ alignment="start"
className="cloud-account-setup-form__code-block-tabs"
items={[
{
diff --git a/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/EditAccount/AccountSettingsModal.tsx b/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/EditAccount/AccountSettingsModal.tsx
index 81b9ba9a3f..d04dc9f0eb 100644
--- a/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/EditAccount/AccountSettingsModal.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/EditAccount/AccountSettingsModal.tsx
@@ -72,6 +72,8 @@ function AccountSettingsModal({
cloudProvider={INTEGRATION_TYPES.AZURE}
/>
<Button
+ disabledTooltip="Change the resource groups first"
+ size="md"
variant="solid"
color="secondary"
disabled={isSaveDisabled}
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer.tsx b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer.tsx
index 97dbdfdaef..f227b3d303 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer.tsx
@@ -84,6 +84,7 @@ function CloudAccountSetupDrawer({
)}
<div className={styles.footer}>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={handleClose}
@@ -92,11 +93,11 @@ function CloudAccountSetupDrawer({
Cancel
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={handleSubmit(connectAccount)}
- loading={isLoading}
- disabled={isConnectionParamsLoading}
+ loading={isLoading || isConnectionParamsLoading}
testId="gcp-connect-account-btn"
>
Connect Account
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.module.scss b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.module.scss
index 6738abf3b0..406274fab0 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.module.scss
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.module.scss
@@ -14,9 +14,3 @@
color: var(--l3-foreground);
cursor: help;
}
-
-.tooltipContent {
- max-width: 240px;
- white-space: normal;
- word-break: break-word;
-}
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.tsx b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.tsx
index b7bbac95a2..a97a1b001c 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.tsx
@@ -1,5 +1,5 @@
import { Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import styles from './FieldLabel.module.scss';
@@ -20,11 +20,7 @@ function FieldLabel({
<label className={styles.fieldLabel} htmlFor={htmlFor}>
{label}
- <TooltipSimple
- title={tooltip}
- side="top"
- tooltipContentProps={{ className: styles.tooltipContent }}
- >
+ <Tooltip title={tooltip} side="top">
<span
className={styles.infoTrigger}
aria-label={`${label} help`}
@@ -32,7 +28,7 @@ function FieldLabel({
>
<Info size={12} />
</span>
- </TooltipSimple>
+ </Tooltip>
{required && (
<span className={styles.required} aria-hidden="true">
*
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.module.scss b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.module.scss
index abadc9a6ce..cf896782e7 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.module.scss
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.module.scss
@@ -10,69 +10,6 @@
composes: drawerSurfaceHead from './shared.module.scss';
}
-.flowRadioGroup {
- --radio-group-item-border-color: var(--l2-border);
-
- display: flex;
- flex-direction: column;
- gap: var(--spacing-4);
- width: 100%;
-
- .flowRadio {
- display: flex;
- flex-direction: row;
- align-items: flex-start;
- justify-content: flex-start;
- gap: var(--spacing-5);
- width: 100%;
- padding: var(--spacing-5) var(--spacing-6);
- margin: 0;
- border: 1px solid transparent;
- border-radius: var(--radius-2);
- box-sizing: border-box;
- cursor: pointer;
- transition:
- background-color 0.12s ease,
- border-color 0.12s ease;
-
- > button[role='radio'] {
- flex: 0 0 16px;
- width: 16px;
- height: 16px;
- margin-top: 3px;
- }
-
- > label {
- flex: 1 1 auto;
- min-width: 0;
- display: block;
- text-align: left;
- cursor: pointer;
- font-size: inherit;
- font-weight: inherit;
- color: inherit;
- }
-
- &.flowRadioManual:has(button[data-state='checked']) {
- background: color-mix(in srgb, var(--accent-primary) 10%, transparent);
- border-color: color-mix(in srgb, var(--accent-primary) 30%, transparent);
- }
-
- &:hover {
- background: var(--l3-background-hover);
- }
-
- &:has(button[disabled]) {
- cursor: not-allowed;
- opacity: 0.55;
-
- &:hover {
- background: var(--l3-background);
- }
- }
- }
-}
-
.flowRadioTitle {
display: flex;
gap: var(--spacing-2);
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.tsx b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.tsx
index 5d2dc63a79..113b1c3c06 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.tsx
@@ -1,5 +1,5 @@
import { Badge } from '@signozhq/ui/badge';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
@@ -21,54 +21,60 @@ function FlowSelector({ value, onChange }: FlowSelectorProps): JSX.Element {
</div>
<RadioGroup
+ color="primary"
+ textOverflow="wrap"
value={value}
onChange={(next): void => onChange(next as SetupFlow)}
- className={styles.flowRadioGroup}
- >
- <RadioGroupItem
- value="manual"
- containerClassName={cx(styles.flowRadio, styles.flowRadioManual)}
- testId="gcp-flow-manual"
- >
- <div className={styles.flowRadioTitle}>
- <Typography.Text weight="semibold" size="base">
- Connect Manually
- </Typography.Text>
- </div>
- <Typography.Text
- as="p"
- size="small"
- color="muted"
- className={styles.flowRadioDesc}
- >
- Deploy your own OTel Collector.
- </Typography.Text>
- </RadioGroupItem>
-
- <RadioGroupItem
- value="agent"
- containerClassName={styles.flowRadio}
- testId="gcp-flow-agent"
- disabled
- >
- <div className={styles.flowRadioTitle}>
- <Typography.Text weight="semibold" size="base">
- Connect via Agent
- </Typography.Text>
- <Badge color="robin" variant="default">
- Soon
- </Badge>
- </div>
- <Typography.Text
- as="p"
- size="small"
- color="muted"
- className={styles.flowRadioDesc}
- >
- SigNoz deploys and manages the collector for you.
- </Typography.Text>
- </RadioGroupItem>
- </RadioGroup>
+ items={[
+ {
+ value: 'manual',
+ testId: 'gcp-flow-manual',
+ label: (
+ <>
+ <div className={styles.flowRadioTitle}>
+ <Typography.Text weight="semibold" size="base">
+ Connect Manually
+ </Typography.Text>
+ </div>
+ <Typography.Text
+ as="p"
+ size="small"
+ color="muted"
+ className={styles.flowRadioDesc}
+ >
+ Deploy your own OTel Collector.
+ </Typography.Text>
+ </>
+ ),
+ },
+ {
+ value: 'agent',
+ testId: 'gcp-flow-agent',
+ disabled: true,
+ disabledTooltip: 'Soon',
+ label: (
+ <>
+ <div className={styles.flowRadioTitle}>
+ <Typography.Text weight="semibold" size="base">
+ Connect via Agent
+ </Typography.Text>
+ <Badge color="primary" variant="solid">
+ Soon
+ </Badge>
+ </div>
+ <Typography.Text
+ as="p"
+ size="small"
+ color="muted"
+ className={styles.flowRadioDesc}
+ >
+ SigNoz deploys and manages the collector for you.
+ </Typography.Text>
+ </>
+ ),
+ },
+ ]}
+ />
</div>
);
}
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/EditAccount/AccountSettingsDrawer.tsx b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/EditAccount/AccountSettingsDrawer.tsx
index 73c4ddaefe..f0c477070a 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/EditAccount/AccountSettingsDrawer.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/EditAccount/AccountSettingsDrawer.tsx
@@ -67,13 +67,15 @@ function AccountSettingsDrawer({
cloudProvider={INTEGRATION_TYPES.GCP}
/>
<Button
+ disabledTooltip="Change the project IDs first"
+ size="md"
variant="solid"
color="secondary"
disabled={isSaveDisabled}
onClick={handleSubmit}
loading={isLoading}
prefix={<Save size={14} />}
- data-testid="gcp-update-account-btn"
+ testId="gcp-update-account-btn"
>
Update Changes
</Button>
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/AccountSettingsDrawer.test.tsx b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/AccountSettingsDrawer.test.tsx
index 3509e75522..2a93487d1c 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/AccountSettingsDrawer.test.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/AccountSettingsDrawer.test.tsx
@@ -1,7 +1,6 @@
import { render, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { toast } from '@signozhq/ui/sonner';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { server } from 'mocks-server/server';
import { rest, RestRequest } from 'msw';
import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
@@ -38,13 +37,11 @@ const setActiveAccount = jest.fn();
const renderDrawer = (): void => {
render(
<MockQueryClientProvider>
- <TooltipProvider>
- <AccountSettingsDrawer
- onClose={onClose}
- account={gcpAccount}
- setActiveAccount={setActiveAccount}
- />
- </TooltipProvider>
+ <AccountSettingsDrawer
+ onClose={onClose}
+ account={gcpAccount}
+ setActiveAccount={setActiveAccount}
+ />
</MockQueryClientProvider>,
);
};
@@ -98,12 +95,18 @@ describe('GCP AccountSettingsDrawer', () => {
const user = userEvent.setup();
renderDrawer();
- expect(screen.getByTestId('gcp-update-account-btn')).toBeDisabled();
+ expect(screen.getByTestId('gcp-update-account-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.type(getProjectIdsInput(), 'project-c,');
await waitFor(() => {
- expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-update-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -113,7 +116,10 @@ describe('GCP AccountSettingsDrawer', () => {
await user.type(getProjectIdsInput(), 'project-c,');
await waitFor(() => {
- expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-update-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('gcp-update-account-btn'));
@@ -159,7 +165,10 @@ describe('GCP AccountSettingsDrawer', () => {
}
await waitFor(() => {
- expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-update-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('gcp-update-account-btn'));
@@ -187,7 +196,10 @@ describe('GCP AccountSettingsDrawer', () => {
await user.type(getProjectIdsInput(), 'project-c,');
await waitFor(() => {
- expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-update-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('gcp-update-account-btn'));
diff --git a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/CloudAccountSetupDrawer.test.tsx b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/CloudAccountSetupDrawer.test.tsx
index 8953881e24..e00de41647 100644
--- a/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/CloudAccountSetupDrawer.test.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/CloudAccountSetupDrawer.test.tsx
@@ -1,6 +1,5 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { server } from 'mocks-server/server';
import { rest, RestRequest } from 'msw';
import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
@@ -30,9 +29,7 @@ const onClose = jest.fn();
const renderDrawer = (): void => {
render(
<MockQueryClientProvider>
- <TooltipProvider>
- <CloudAccountSetupDrawer onClose={onClose} />
- </TooltipProvider>
+ <CloudAccountSetupDrawer onClose={onClose} />
</MockQueryClientProvider>,
);
};
@@ -88,7 +85,10 @@ describe('GCP CloudAccountSetupDrawer', () => {
renderDrawer();
await waitFor(() => {
- expect(screen.getByTestId('gcp-connect-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-connect-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await user.click(screen.getByTestId('gcp-connect-account-btn'));
@@ -113,17 +113,16 @@ describe('GCP CloudAccountSetupDrawer', () => {
renderDrawer();
await waitFor(() => {
- expect(screen.getByTestId('gcp-connect-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-connect-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- await user.type(
- screen.getByTestId('gcp-account-name-input'),
- );
- await user.type(
- screen.getByTestId('gcp-deployment-project-id-input'),
- 'my-deployment-project-123',
- );
+ await user.click(screen.getByTestId('gcp-account-name-input'));
+ await user.paste('[email protected]');
+ await user.click(screen.getByTestId('gcp-deployment-project-id-input'));
+ await user.paste('my-deployment-project-123');
await user.click(screen.getByTestId('gcp-deployment-region-select'));
await user.click(await screen.findByText('Mumbai (asia-south1)'));
@@ -162,7 +161,7 @@ describe('GCP CloudAccountSetupDrawer', () => {
await waitFor(() => {
expect(onClose).toHaveBeenCalledTimes(1);
});
- });
+ }, 15000);
it('shows the backend error inline when account creation fails', async () => {
server.use(
@@ -181,14 +180,16 @@ describe('GCP CloudAccountSetupDrawer', () => {
renderDrawer();
await waitFor(() => {
- expect(screen.getByTestId('gcp-connect-account-btn')).toBeEnabled();
+ expect(screen.getByTestId('gcp-connect-account-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- await user.type(screen.getByTestId('gcp-account-name-input'), 'my-org');
- await user.type(
- screen.getByTestId('gcp-deployment-project-id-input'),
- 'my-deployment-project-123',
- );
+ await user.click(screen.getByTestId('gcp-account-name-input'));
+ await user.paste('my-org');
+ await user.click(screen.getByTestId('gcp-deployment-project-id-input'));
+ await user.paste('my-deployment-project-123');
await user.click(screen.getByTestId('gcp-deployment-region-select'));
await user.click(await screen.findByText('Mumbai (asia-south1)'));
@@ -206,5 +207,5 @@ describe('GCP CloudAccountSetupDrawer', () => {
});
expect(checkInPayload).toBeNull();
expect(onClose).not.toHaveBeenCalled();
- });
+ }, 15000);
});
diff --git a/frontend/src/container/Integrations/CloudIntegration/RemoveAccount/RemoveIntegrationAccount.tsx b/frontend/src/container/Integrations/CloudIntegration/RemoveAccount/RemoveIntegrationAccount.tsx
index 548046fa9e..cb6753f329 100644
--- a/frontend/src/container/Integrations/CloudIntegration/RemoveAccount/RemoveIntegrationAccount.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/RemoveAccount/RemoveIntegrationAccount.tsx
@@ -101,11 +101,12 @@ function RemoveIntegrationAccount({
return (
<div className="remove-integration-account-container">
<Button
+ size="md"
variant="solid"
- color="destructive"
+ color="danger"
prefix={<Unlink size={14} />}
onClick={handleDisconnect}
- disabled={isRemoveIntegrationLoading}
+ loading={isRemoveIntegrationLoading}
>
Disconnect
</Button>
diff --git a/frontend/src/container/Integrations/CloudIntegration/ServiceDashboards/DashboardCard.tsx b/frontend/src/container/Integrations/CloudIntegration/ServiceDashboards/DashboardCard.tsx
index 970ab58d3d..5879e3f741 100644
--- a/frontend/src/container/Integrations/CloudIntegration/ServiceDashboards/DashboardCard.tsx
+++ b/frontend/src/container/Integrations/CloudIntegration/ServiceDashboards/DashboardCard.tsx
@@ -1,5 +1,5 @@
import type { KeyboardEvent, MouseEvent } from 'react';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { CloudintegrationtypesServiceDashboardDTO } from 'api/generated/services/sigNoz.schemas';
import { useSafeNavigate } from 'hooks/useSafeNavigate';
import { openInNewTab } from 'utils/navigation';
@@ -59,7 +59,7 @@ function DashboardCard({
);
if (!dashboardId) {
- return <TooltipSimple title={DISABLED_TOOLTIP}>{card}</TooltipSimple>;
+ return <Tooltip title={DISABLED_TOOLTIP}>{card}</Tooltip>;
}
return card;
diff --git a/frontend/src/container/Integrations/IntegrationDetailPage/IntegrationDetailPage.tsx b/frontend/src/container/Integrations/IntegrationDetailPage/IntegrationDetailPage.tsx
index d58824468b..3825dca41c 100644
--- a/frontend/src/container/Integrations/IntegrationDetailPage/IntegrationDetailPage.tsx
+++ b/frontend/src/container/Integrations/IntegrationDetailPage/IntegrationDetailPage.tsx
@@ -69,10 +69,10 @@ function IntegrationDetailPage(): JSX.Element {
<div className="integration-details-container">
<Flex justify="space-between" align="center">
<Button
+ size="md"
variant="link"
color="secondary"
prefix={<ArrowLeft size={14} />}
- className="all-integrations-btn"
onClick={(): void => {
history.push(ROUTES.INTEGRATIONS);
}}
@@ -90,6 +90,7 @@ function IntegrationDetailPage(): JSX.Element {
</Typography.Text>
<div className="error-btns">
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={(): Promise<any> => refetch()}
@@ -98,6 +99,7 @@ function IntegrationDetailPage(): JSX.Element {
Retry
</Button>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={(): void => handleContactSupport(isCloudUserVal)}
diff --git a/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.styles.scss b/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.styles.scss
index e3adfe4730..bf69a03c6f 100644
--- a/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.styles.scss
+++ b/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.styles.scss
@@ -36,6 +36,8 @@
input {
color: var(--l1-foreground);
+ flex: 1;
+ width: auto;
}
}
}
diff --git a/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.tsx b/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.tsx
index 090e7cd5ae..7c4c955a7c 100644
--- a/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.tsx
+++ b/frontend/src/container/Integrations/IntegrationsHeader/IntegrationsHeader.tsx
@@ -92,9 +92,10 @@ function IntegrationsHeader(props: IntegrationsHeaderProps): JSX.Element {
}
/>
<Button
+ size="md"
variant="solid"
color="secondary"
- className="request-integration-btn"
+ width="170px"
prefix={<Cable size={14} />}
onClick={(): void => setIsRequestIntegrationDialogOpen(true)}
>
@@ -128,13 +129,14 @@ function IntegrationsHeader(props: IntegrationsHeaderProps): JSX.Element {
<div className="request-integration-form-footer">
<Button
+ disabledTooltip="Enter an integration name first"
+ size="md"
variant="solid"
color="primary"
prefix={<Check size={14} />}
onClick={handleRequestIntegrationSubmit}
loading={isSubmittingRequestForIntegration}
disabled={
- isSubmittingRequestForIntegration ||
!requestedIntegrationName ||
requestedIntegrationName?.trim().length === 0
}
@@ -146,12 +148,14 @@ function IntegrationsHeader(props: IntegrationsHeaderProps): JSX.Element {
{isGetStartedWithCloudAllowed && (
<Button
+ size="md"
variant="solid"
color="primary"
onClick={(): void => history.push(ROUTES.GET_STARTED_WITH_CLOUD)}
+ suffix={<ArrowRight size={14} />}
+ width="200px"
>
- <span>View 150+ Data Sources</span>
- <ArrowRight size={14} />
+ View 150+ Data Sources
</Button>
)}
</div>
diff --git a/frontend/src/container/Integrations/IntegrationsList/IntegrationsList.tsx b/frontend/src/container/Integrations/IntegrationsList/IntegrationsList.tsx
index 5435d1d8cc..0ac9ebe6d8 100644
--- a/frontend/src/container/Integrations/IntegrationsList/IntegrationsList.tsx
+++ b/frontend/src/container/Integrations/IntegrationsList/IntegrationsList.tsx
@@ -159,9 +159,9 @@ function IntegrationsList(props: IntegrationsListProps): JSX.Element {
<div className="integrations-list-item-column">
<div className="integrations-list-item-installation-status">
<Badge
- color={integration.is_installed ? 'forest' : 'amber'}
- variant="outline"
- capitalize
+ color={integration.is_installed ? 'success' : 'warning'}
+ variant="outlined"
+ textTransform="capitalize"
>
{integration.is_installed ? 'Installed' : 'Not Installed'}
</Badge>
diff --git a/frontend/src/container/Integrations/OneClickIntegrations/OneClickIntegrations.tsx b/frontend/src/container/Integrations/OneClickIntegrations/OneClickIntegrations.tsx
index c3fc4d2c3a..4ce91645e9 100644
--- a/frontend/src/container/Integrations/OneClickIntegrations/OneClickIntegrations.tsx
+++ b/frontend/src/container/Integrations/OneClickIntegrations/OneClickIntegrations.tsx
@@ -82,7 +82,7 @@ function OneClickIntegrations(props: OneClickIntegrationsProps): JSX.Element {
</div>
{integration.is_new && (
<div className="one-click-integrations-list-item-new-tag">
- <Badge color="robin" variant="default">
+ <Badge color="primary" variant="solid">
NEW
</Badge>
</div>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx
index 1b02a41539..b04085b7bb 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx
@@ -502,7 +502,10 @@ describe('AttributeMappingsTab (integration)', () => {
await user.click(screen.getByTestId('add-mapper-group-1'));
await screen.findByTestId('mapper-form-drawer');
- expect(screen.getByTestId('mapper-form-save')).toBeDisabled();
+ expect(screen.getByTestId('mapper-form-save')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.type(
screen.getByTestId('mapper-form-target'),
@@ -511,7 +514,9 @@ describe('AttributeMappingsTab (integration)', () => {
await user.type(screen.getByTestId('mapper-form-source-0'), 'raw.model');
const create = screen.getByTestId('mapper-form-save');
- await waitFor(() => expect(create).toBeEnabled());
+ await waitFor(() =>
+ expect(create).not.toHaveAttribute('aria-disabled', 'true'),
+ );
await user.click(create);
await waitFor(() =>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx
index 8910cd18d1..b8b3fb63d6 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { EllipsisVertical, Pencil, Trash2 } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import type { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
@@ -16,19 +16,21 @@ function GroupActionsMenu({
onEdit,
onRemove,
}: GroupActionsMenuProps): JSX.Element {
- const menuItems = useMemo<MenuItem[]>(
+ const menuItems = useMemo<DropdownItemType[]>(
() => [
{
- key: 'edit',
+ type: 'item',
+ value: 'edit',
label: 'Edit',
- icon: <Pencil size={14} />,
+ prefix: <Pencil size={14} />,
onClick: (): void => onEdit(group),
},
{
- key: 'delete',
+ type: 'item',
+ value: 'delete',
label: 'Delete',
danger: true,
- icon: <Trash2 size={14} />,
+ prefix: <Trash2 size={14} />,
onClick: (): void => onRemove(group.localId),
},
],
@@ -36,17 +38,18 @@ function GroupActionsMenu({
);
return (
- <DropdownMenuSimple menu={{ items: menuItems }} align="end">
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Group actions"
- data-testid={`group-actions-${group.localId}`}
+ testId={`group-actions-${group.localId}`}
>
<EllipsisVertical size={16} />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx
index 0f55fa8932..01a5c0ea81 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx
@@ -1,5 +1,5 @@
import { Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
@@ -26,7 +26,7 @@ function GroupHeader({ group }: GroupHeaderProps): JSX.Element {
>
{group.name}
</Typography.Text>
- <TooltipSimple
+ <Tooltip
title={
<ConditionsTooltip
attributes={group.attributes}
@@ -43,7 +43,7 @@ function GroupHeader({ group }: GroupHeaderProps): JSX.Element {
· {conditionCount} {conditionCount === 1 ? 'condition' : 'conditions'}
<Info size={12} className={styles.conditionInfoIcon} />
</span>
- </TooltipSimple>
+ </Tooltip>
</div>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx
index 145ee88e3f..6594b434a1 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx
@@ -28,6 +28,8 @@ function GroupHeaderActions({
onClick={(event): void => event.stopPropagation()}
>
<Switch
+ color="primary"
+ textPlacement="right"
value={group.enabled}
onChange={(checked): void => onToggle(group.localId, checked)}
testId={`group-enabled-${group.localId}`}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx
index 9fd9d4c276..985d0f7c71 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { EllipsisVertical, Pencil, Trash2 } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import type { DraftMapper } from 'container/LLMObservability/AttributeMapping/types';
@@ -16,19 +16,21 @@ function MapperActionsMenu({
onEdit,
onRemove,
}: MapperActionsMenuProps): JSX.Element {
- const menuItems = useMemo<MenuItem[]>(
+ const menuItems = useMemo<DropdownItemType[]>(
() => [
{
- key: 'edit',
+ type: 'item',
+ value: 'edit',
label: 'Edit',
- icon: <Pencil size={14} />,
+ prefix: <Pencil size={14} />,
onClick: (): void => onEdit(mapper),
},
{
- key: 'delete',
+ type: 'item',
+ value: 'delete',
label: 'Delete',
danger: true,
- icon: <Trash2 size={14} />,
+ prefix: <Trash2 size={14} />,
onClick: (): void => onRemove(mapper.localId),
},
],
@@ -36,17 +38,18 @@ function MapperActionsMenu({
);
return (
- <DropdownMenuSimple menu={{ items: menuItems }} align="end">
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Mapping actions"
testId={`mapper-actions-${mapper.localId}`}
>
<EllipsisVertical size={16} />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss
index f12622d9ae..e3ddcf109a 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss
@@ -17,16 +17,16 @@
gap: var(--spacing-3);
min-width: 0;
padding-left: var(--spacing-12);
+
+ > [data-slot='badge'] {
+ flex-shrink: 0;
+ }
}
.targetName {
min-width: 0;
}
-.targetContextBadge {
- flex-shrink: 0;
-}
-
// Shorter vertical padding so the loading state reads as a compact placeholder.
.skeletonCell {
composes: cell;
@@ -58,10 +58,6 @@
gap: var(--spacing-3);
}
-.sourceChip {
- font-family: var(--font-mono, monospace);
-}
-
.sourceChipText {
display: block;
max-width: 220px;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx
index 8ecfbf498b..f03fb71e6d 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx
@@ -58,13 +58,13 @@ function MapperRow({
{mapper.name}
</Typography.Text>
<Badge
+ textTransform="none"
color={
mapper.fieldContext === SpantypesFieldContextDTO.resource
- ? 'amber'
- : 'robin'
+ ? 'warning'
+ : 'primary'
}
- variant="outline"
- className={styles.targetContextBadge}
+ variant="outlined"
>
{mapper.fieldContext}
</Badge>
@@ -84,9 +84,9 @@ function MapperRow({
>
{visibleSources.map((source) => (
<Badge
- variant="outline"
- color="vanilla"
- className={styles.sourceChip}
+ textTransform="none"
+ variant="outlined"
+ color="secondary"
key={`${source.context}:${source.key}`}
>
<span className={styles.sourceChipText} title={source.key}>
@@ -106,6 +106,8 @@ function MapperRow({
{canManage && (
<div className={styles.rowActions}>
<Switch
+ color="primary"
+ textPlacement="right"
value={mapper.enabled}
onChange={(checked): void => onToggle(mapper.localId, checked)}
testId={`mapper-enabled-${mapper.localId}`}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx
index 924160dc34..76e0fed85d 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx
@@ -125,12 +125,13 @@ function MappingsTable({
{canManage && (
<div className={styles.toolbar}>
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<Plus size={14} />}
onClick={onAddGroup}
testId="add-group-row"
- disabled={editor.isLoading}
+ loading={editor.isLoading}
>
Add a new group
</Button>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestResult.tsx b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestResult.tsx
index f3eb675f6d..d5d97d7829 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestResult.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestResult.tsx
@@ -21,12 +21,12 @@ interface TestResultProps {
const STATUS_BADGE: Partial<
Record<
AttrChangeStatus,
- { color: 'success' | 'robin' | 'sienna'; label: string }
+ { color: 'success' | 'primary' | 'archive'; label: string }
>
> = {
added: { color: 'success', label: 'populated' },
- changed: { color: 'robin', label: 'remapped' },
- removed: { color: 'sienna', label: 'moved out' },
+ changed: { color: 'primary', label: 'remapped' },
+ removed: { color: 'archive', label: 'moved out' },
};
const ROW_CLASS: Partial<Record<AttrChangeStatus, string>> = {
@@ -101,7 +101,7 @@ function TestResult({
{formatAttributeValue(entry.value)}
</span>
{badge ? (
- <Badge color={badge.color} variant="outline">
+ <Badge textTransform="none" color={badge.color} variant="outlined">
{badge.label}
</Badge>
) : (
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestTab.tsx b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestTab.tsx
index 6e8f7f843e..ee02ca0388 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestTab.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestTab.tsx
@@ -88,24 +88,28 @@ function TestTab({ spanTest }: TestTabProps): JSX.Element {
<div className={styles.headerActions}>
<Button
+ size="md"
testId="reset-template-button"
variant="outlined"
color="secondary"
prefix={<RotateCcw size={14} />}
onClick={resetToTemplate}
disabled={isTemplateInput}
+ disabledTooltip="Already showing the default span"
>
Reset to Default Span
</Button>
<Button
+ size="md"
testId="run-test-button"
variant="solid"
color="primary"
prefix={<Play size={14} />}
onClick={run}
loading={isRunning}
- disabled={isRunning || validationError !== null}
+ disabled={validationError !== null}
+ disabledTooltip={validationError}
>
Run Test
</Button>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/__tests__/TestTab.test.tsx b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/__tests__/TestTab.test.tsx
index 529cc8c012..e2d4a963b6 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/TestTab/__tests__/TestTab.test.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/TestTab/__tests__/TestTab.test.tsx
@@ -222,12 +222,12 @@ describe('TestTab — sample-span flow', () => {
const resetBtn = await screen.findByTestId('reset-template-button');
expect(screen.getByTestId('monaco')).toHaveValue(EDITED_SPAN_JSON);
- expect(resetBtn).toBeEnabled();
+ expect(resetBtn).not.toHaveAttribute('aria-disabled', 'true');
await user.click(resetBtn);
expect(screen.getByTestId('monaco')).toHaveValue(SAMPLE_SPAN_JSON);
expect(get(SPAN_INPUT_KEY)).toBeFalsy();
- expect(resetBtn).toBeDisabled();
+ expect(resetBtn).toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingActions/AttributeMappingActions.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingActions/AttributeMappingActions.tsx
index 2817e62335..79b147a161 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingActions/AttributeMappingActions.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingActions/AttributeMappingActions.tsx
@@ -28,20 +28,22 @@ function AttributeMappingActions({
Unsaved changes
</span>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={onDiscard}
disabled={isSaving}
+ disabledTooltip="Wait for the save to finish"
testId="discard-changes-btn"
>
Discard
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={onSave}
loading={isSaving}
- disabled={isSaving}
testId="save-changes-btn"
>
{isSaving ? 'Saving…' : 'Save changes'}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx
index 892a84bad3..5413340c2d 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx
@@ -27,6 +27,7 @@ function DiscardChangesDialog({
footer={
<>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={onCancel}
@@ -36,8 +37,9 @@ function DiscardChangesDialog({
Keep editing
</Button>
<Button
+ size="md"
variant="solid"
- color="destructive"
+ color="danger"
onClick={onConfirm}
prefix={<Trash2 size={12} />}
testId="discard-changes-confirm-btn"
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx
index 9066537d20..3b5cb5b8a4 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx
@@ -43,6 +43,7 @@ function GroupFormDrawer({
footer={
<div className={styles.groupFormFooter}>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={onClose}
@@ -51,10 +52,12 @@ function GroupFormDrawer({
Cancel
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={onSave}
disabled={!isValid}
+ disabledTooltip="Enter a group name first"
testId="group-form-save"
>
{isEdit ? 'Save group' : 'Create group'}
@@ -78,6 +81,8 @@ function GroupFormDrawer({
<div className={`${styles.groupFormField} ${styles.groupFormFieldRow}`}>
<span className={styles.groupFormLabel}>Enabled</span>
<Switch
+ color="primary"
+ textPlacement="right"
value={draft.enabled}
onChange={(checked): void => setDraft({ ...draft, enabled: checked })}
testId="group-form-enabled"
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx
index d32cc24605..bb00f47890 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx
@@ -65,7 +65,8 @@ function ConditionKeyList({
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Remove key"
onClick={(): void => removeKey(index)}
testId={`${testIdPrefix}-remove-${index}`}
@@ -78,6 +79,7 @@ function ConditionKeyList({
)}
<Button
+ size="md"
variant="dashed"
color="secondary"
prefix={<Plus size={14} />}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx
index bb99c1fe8e..8f234fcb85 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx
@@ -128,11 +128,12 @@ function MapperFormDrawer({
<div className={styles.footer}>
{isEdit && (
<Button
- variant="ghost"
- color="destructive"
+ size="md"
+ variant="solid"
+ color="danger"
prefix={<Trash2 size={14} />}
onClick={onDelete}
- disabled={isDeleting}
+ loading={isDeleting}
testId="mapper-form-delete"
>
{isDeleting ? 'Deleting…' : 'Delete'}
@@ -140,6 +141,7 @@ function MapperFormDrawer({
)}
<div className={styles.footerActions}>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={onClose}
@@ -148,10 +150,17 @@ function MapperFormDrawer({
Cancel
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={onSave}
- disabled={!isValid || isSaving}
+ loading={isSaving}
+ disabled={!isValid}
+ disabledTooltip={
+ draft.name.trim()
+ ? 'Add at least one source attribute'
+ : 'Enter a target attribute first'
+ }
testId="mapper-form-save"
>
{/* eslint-disable-next-line no-nested-ternary */}
@@ -229,6 +238,7 @@ function MapperFormDrawer({
</DndContext>
<Button
+ size="md"
variant="dashed"
color="secondary"
prefix={<Plus size={14} />}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx
index 5289f4ad85..78251bd324 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx
@@ -97,9 +97,11 @@ function SourceAttributeRow({
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Remove source"
disabled={!canRemove}
+ disabledTooltip="A mapping needs at least one source attribute"
onClick={(): void => onRemove(index)}
testId={`mapper-form-source-remove-${index}`}
>
diff --git a/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx b/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx
index 240e474e9d..d2a5ca72ac 100644
--- a/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/TracesTable/FieldCell.tsx
@@ -55,7 +55,12 @@ function FieldCell({ name, value }: FieldCellProps): JSX.Element {
if (STATUS_FIELD_NAMES.has(name)) {
return (
- <Badge data-testid={name} color="sakura" variant="outline">
+ <Badge
+ textTransform="none"
+ testId={name}
+ color="highlight-danger"
+ variant="outlined"
+ >
{text}
</Badge>
);
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss
index d57e73f454..63ca18b8e9 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss
@@ -13,7 +13,3 @@
align-items: center;
gap: 8px;
}
-
-.tabBadge {
- margin: 0;
-}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
index 61cccf4ad5..4636d6a6e0 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
@@ -48,11 +48,7 @@ function LLMObservabilityModelPricing(): JSX.Element {
<span className={styles.tabLabel}>
Unpriced models
{unpricedCount > 0 && (
- <Badge
- variant="default"
- className={styles.tabBadge}
- data-testid="unpriced-models-count"
- >
+ <Badge color="primary" variant="solid" testId="unpriced-models-count">
{unpricedCount}
</Badge>
)}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.tsx
index 18ab53aba8..437d9d6c78 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.tsx
@@ -113,12 +113,14 @@ function ModelCostTabPanel(): JSX.Element {
<Button
variant="ghost"
color="secondary"
- size="icon"
- prefix={<X size={14} />}
+ size="sm"
+ icon
onClick={clearSearch}
aria-label="Clear search"
testId="model-cost-search-clear"
- />
+ >
+ <X size={14} />
+ </Button>
) : undefined
}
testId="model-cost-search"
@@ -133,6 +135,7 @@ function ModelCostTabPanel(): JSX.Element {
</div>
{canManagePricing && (
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<Plus size={14} />}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx
index 151fd9e70b..d235b0a32d 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx
@@ -34,6 +34,7 @@ function DeleteConfirmDialog({
footer={
<>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={onCancel}
@@ -43,8 +44,9 @@ function DeleteConfirmDialog({
Cancel
</Button>
<Button
+ size="md"
variant="solid"
- color="destructive"
+ color="danger"
loading={isDeleting}
onClick={onConfirm}
prefix={<Trash2 size={12} />}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx
index 5caedaca26..8322abc850 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx
@@ -71,6 +71,7 @@ function ModelCostDrawer({
const footer = (
<div className={styles.footer}>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={onClose}
@@ -80,10 +81,12 @@ function ModelCostDrawer({
</Button>
{canManage && (
<Button
+ size="md"
variant="solid"
color="primary"
onClick={handleSubmit(onSave)}
disabled={!isDirty}
+ disabledTooltip="No changes to save"
loading={isSaving}
testId="drawer-save-btn"
>
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/__tests__/ModelCostDrawer.test.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/__tests__/ModelCostDrawer.test.tsx
index 9c4360dbbe..0fa20cead7 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/__tests__/ModelCostDrawer.test.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/__tests__/ModelCostDrawer.test.tsx
@@ -47,12 +47,18 @@ describe('ModelCostDrawer (integration)', () => {
/>,
);
- expect(screen.getByTestId('drawer-save-btn')).toBeDisabled();
+ expect(screen.getByTestId('drawer-save-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.type(screen.getByTestId('drawer-model-id-input'), 'openai:gpt-4o');
await waitFor(() =>
- expect(screen.getByTestId('drawer-save-btn')).toBeEnabled(),
+ expect(screen.getByTestId('drawer-save-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ ),
);
});
@@ -78,7 +84,10 @@ describe('ModelCostDrawer (integration)', () => {
await user.click(screen.getByTestId('drawer-pattern-add-btn'));
await waitFor(() =>
- expect(screen.getByTestId('drawer-save-btn')).toBeEnabled(),
+ expect(screen.getByTestId('drawer-save-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ ),
);
await user.click(screen.getByTestId('drawer-save-btn'));
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.module.scss
index b2b712b178..e14e6d2098 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.module.scss
@@ -38,16 +38,16 @@
flex: 1 auto auto;
min-width: 0;
}
+
+ > [data-slot='button'] {
+ margin-left: var(--spacing-4);
+ }
}
.bucketRowName {
flex: 0 0 110px;
}
-.bucketAddBtn {
- width: 100%;
-}
-
.bucketPicker {
display: flex;
flex-direction: column;
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx
index fa39fd3ee6..5797b6f114 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx
@@ -100,14 +100,16 @@ function ExtraPricingBuckets({
{!isReadOnly && (
<Button
- size="icon"
- variant="ghost"
- color="destructive"
+ size="md"
+ icon
+ variant="link"
+ color="danger"
onClick={(): void => removeBucket(bucket.key)}
aria-label={`Remove ${bucket.label}`}
- data-testid={`drawer-remove-${bucket.testId}`}
- prefix={<Trash2 size={14} />}
- />
+ testId={`drawer-remove-${bucket.testId}`}
+ >
+ <Trash2 size={14} />
+ </Button>
)}
</div>
))}
@@ -132,9 +134,10 @@ function ExtraPricingBuckets({
{!isReadOnly && !isExtraPricingBucketOpen && availableBuckets.length > 0 && (
<Button
+ size="md"
variant="dashed"
color="secondary"
- className={styles.bucketAddBtn}
+ width="100%"
prefix={<Plus size={14} />}
onClick={(): void => setIsExtraPricingBucketOpen(true)}
testId="drawer-add-bucket-btn"
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.module.scss
index 3e44ac2ea1..ff58a29ec0 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.module.scss
@@ -13,6 +13,7 @@
.patternBox {
display: flex;
flex-direction: column;
+ gap: var(--spacing-4);
padding: var(--spacing-6);
border-radius: 6px;
border: 1px solid var(--l2-border);
@@ -21,14 +22,7 @@
.patternChips {
display: flex;
flex-wrap: wrap;
- gap: var(--spacing-0) var(--spacing-3);
-}
-
-.patternChip {
- display: inline-flex;
- align-items: center;
- gap: var(--spacing-2);
- margin-bottom: var(--spacing-4);
+ gap: var(--spacing-4) var(--spacing-3);
}
.patternChipRemove {
@@ -49,4 +43,5 @@
.patternAdd {
display: flex;
gap: var(--spacing-3);
+ --button-flex-shrink: 0;
}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.tsx
index 9d9a9ee218..5b51da324d 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.tsx
@@ -44,28 +44,30 @@ function PatternEditor({
</Typography.Text>
</span>
<div className={styles.patternBox}>
- <div className={styles.patternChips}>
- {patterns.map((pattern) => (
- <Badge
- key={pattern}
- color="vanilla"
- variant="outline"
- className={styles.patternChip}
- >
- {pattern}*
- {!isReadOnly && (
- <button
- type="button"
- aria-label={`Remove pattern ${pattern}`}
- className={styles.patternChipRemove}
- onClick={(): void => removePattern(pattern)}
- >
- <X size={10} />
- </button>
- )}
- </Badge>
- ))}
- </div>
+ {patterns.length > 0 && (
+ <div className={styles.patternChips}>
+ {patterns.map((pattern) => (
+ <Badge
+ textTransform="none"
+ key={pattern}
+ color="secondary"
+ variant="outlined"
+ >
+ {pattern}*
+ {!isReadOnly && (
+ <button
+ type="button"
+ aria-label={`Remove pattern ${pattern}`}
+ className={styles.patternChipRemove}
+ onClick={(): void => removePattern(pattern)}
+ >
+ <X size={10} />
+ </button>
+ )}
+ </Badge>
+ ))}
+ </div>
+ )}
{!isReadOnly && (
<div className={styles.patternAdd}>
<Input
@@ -81,6 +83,7 @@ function PatternEditor({
testId="drawer-pattern-input"
/>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={addPattern}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.module.scss
index 1c28f9cd70..1d17885f96 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.module.scss
@@ -18,69 +18,6 @@
composes: managedLabel from '../../shared.module.scss';
}
-.sourceRadioGroup {
- --radio-group-item-border-color: var(--l2-border);
-
- display: flex;
- flex-direction: column;
- gap: var(--spacing-4);
- width: 100%;
- .sourceRadio {
- display: flex;
- flex-direction: row;
- align-items: flex-start;
- justify-content: flex-start;
- gap: var(--spacing-5);
- padding: var(--spacing-5) var(--spacing-6);
- border-radius: var(--radius-2);
- border: 1px solid transparent;
- margin: 0;
- width: 100%;
- // Include padding + border in the 100% width so the card fits inside
- // the SOURCE surface instead of overflowing its right edge.
- box-sizing: border-box;
- cursor: pointer;
- transition:
- background-color 0.12s ease,
- border-color 0.12s ease;
-
- // The radio button itself: keep it fixed-size and aligned with the title
- // baseline (margin-top compensates for align-items: flex-start vs the
- // title's line-box).
- > button[role='radio'] {
- flex: 0 0 16px;
- width: 16px;
- height: 16px;
- margin-top: 3px;
- }
-
- // The library wraps children in a <label>. Make it grow into the
- // remaining width and reset the .drawerSection label typography leak
- // (set earlier in this file) so the title/desc divs use their own styles.
- > label {
- flex: 1 1 auto;
- min-width: 0;
- display: block;
- text-align: left;
- cursor: pointer;
- font-size: inherit;
- font-weight: inherit;
- color: inherit;
- }
-
- // Radix RadioGroupItem renders <button data-state="checked|unchecked">.
- // Use :has() to highlight the wrapper card when its inner button is checked.
- &:has(button[data-state='checked']) {
- background: color-mix(in srgb, var(--accent-primary) 10%, transparent);
- border-color: color-mix(in srgb, var(--accent-primary) 30%, transparent);
- }
-
- &:hover {
- background: var(--l3-background-hover);
- }
- }
-}
-
.sourceRadioTitle {
font-weight: var(--font-weight-semibold);
font-size: var(--periscope-font-size-base);
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.tsx
index cbfb030ad3..6128999cad 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.tsx
@@ -1,6 +1,6 @@
import { useState } from 'react';
import { Button } from '@signozhq/ui/button';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
import { Lock } from '@signozhq/icons';
import cx from 'classnames';
@@ -51,34 +51,53 @@ function SourceSelector({
)}
</div>
<RadioGroup
+ color="primary"
+ textOverflow="wrap"
value={isOverride ? 'override' : 'auto'}
onChange={(value): void => handleSourceChange(value as 'auto' | 'override')}
- className={styles.sourceRadioGroup}
- >
- <RadioGroupItem
- value="auto"
- containerClassName={styles.sourceRadio}
- testId="drawer-source-auto"
- disabled={disableAuto}
- >
- <div className={styles.sourceRadioTitle}>Auto-populated</div>
- <div className={styles.sourceRadioDesc}>
- {disableAuto
- ? 'Available once SigNoz has default pricing for this model.'
- : 'Default pricing from SigNoz.'}
- </div>
- </RadioGroupItem>
- <RadioGroupItem
- value="override"
- containerClassName={styles.sourceRadio}
- testId="drawer-source-override"
- >
- <div className={styles.sourceRadioTitle}>User override</div>
- <div className={styles.sourceRadioDesc}>
- Custom pricing. Takes precedence.
- </div>
- </RadioGroupItem>
- </RadioGroup>
+ items={[
+ disableAuto
+ ? {
+ value: 'auto',
+ testId: 'drawer-source-auto',
+ disabled: true,
+ disabledTooltip:
+ 'Available once SigNoz has default pricing for this model.',
+ label: (
+ <>
+ <div className={styles.sourceRadioTitle}>Auto-populated</div>
+ <div className={styles.sourceRadioDesc}>
+ Available once SigNoz has default pricing for this model.
+ </div>
+ </>
+ ),
+ }
+ : {
+ value: 'auto',
+ testId: 'drawer-source-auto',
+ label: (
+ <>
+ <div className={styles.sourceRadioTitle}>Auto-populated</div>
+ <div className={styles.sourceRadioDesc}>
+ Default pricing from SigNoz.
+ </div>
+ </>
+ ),
+ },
+ {
+ value: 'override',
+ testId: 'drawer-source-override',
+ label: (
+ <>
+ <div className={styles.sourceRadioTitle}>User override</div>
+ <div className={styles.sourceRadioDesc}>
+ Custom pricing. Takes precedence.
+ </div>
+ </>
+ ),
+ },
+ ]}
+ />
{showResetConfirm && (
<div className={styles.resetConfirm} aria-label="Reset to default pricing">
<p>
@@ -87,6 +106,7 @@ function SourceSelector({
</p>
<div className={styles.resetConfirmActions}>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={(): void => setShowResetConfirm(false)}
@@ -95,6 +115,7 @@ function SourceSelector({
Keep
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={confirmReset}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.module.scss
deleted file mode 100644
index cbe6254451..0000000000
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.module.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.actionButton {
- opacity: 0.7;
- transition: opacity 0.15s ease;
-
- &:hover {
- opacity: 1;
- }
-}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.tsx
index 0d45966b7f..961d4acd1c 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostActionsMenu.tsx
@@ -1,11 +1,9 @@
import { useMemo } from 'react';
import { Ellipsis } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { type LlmpricingruletypesLLMPricingRuleDTO } from 'api/generated/services/sigNoz.schemas';
-import styles from './ModelCostActionsMenu.module.scss';
-
interface ModelCostActionsMenuProps {
rule: LlmpricingruletypesLLMPricingRuleDTO;
canManage: boolean;
@@ -22,15 +20,17 @@ function ModelCostActionsMenu({
onEdit,
onDelete,
}: ModelCostActionsMenuProps): JSX.Element | null {
- const menuItems = useMemo<MenuItem[]>(
+ const menuItems = useMemo<DropdownItemType[]>(
() => [
{
- key: 'edit',
+ type: 'item',
+ value: 'edit',
label: 'Edit',
onClick: (): void => onEdit(rule),
},
{
- key: 'delete',
+ type: 'item',
+ value: 'delete',
label: 'Delete',
danger: true,
onClick: (): void => onDelete(rule),
@@ -44,18 +44,18 @@ function ModelCostActionsMenu({
}
return (
- <DropdownMenuSimple menu={{ items: menuItems }} align="end">
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
variant="ghost"
color="secondary"
- size="icon"
- className={styles.actionButton}
+ size="sm"
+ icon
aria-label="Model cost actions"
testId={`model-cost-actions-${rule.id}`}
>
<Ellipsis size={16} />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx
index fac7c30ab9..96d7d658f4 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx
@@ -105,10 +105,10 @@ export function getModelCostsColumns({
<div className={styles.extraBuckets}>
{buckets.map((bucket) => (
<Badge
+ textTransform="none"
key={bucket.key}
- color="vanilla"
- variant="outline"
- className={styles.extraBucketsChip}
+ color="secondary"
+ variant="outlined"
>
<Typography.Text
as="span"
@@ -116,7 +116,7 @@ export function getModelCostsColumns({
className={styles.tableCellStyles}
>
{startCase(bucket.key)}
- </Typography.Text>
+ </Typography.Text>{' '}
<Typography.Text
as="span"
size="small"
@@ -138,10 +138,10 @@ export function getModelCostsColumns({
enableMove: false,
cell: ({ row }): JSX.Element => (
<Badge
- color={row.isOverride ? 'amber' : 'robin'}
- variant="outline"
- className={styles.sourceBadge}
- data-testid={`source-badge-${row.id}`}
+ textTransform="none"
+ color={row.isOverride ? 'warning' : 'primary'}
+ variant="outlined"
+ testId={`source-badge-${row.id}`}
>
{getSourceLabel(row)}
</Badge>
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss
index b2ba1a93ab..3a60f41b86 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss
@@ -14,17 +14,6 @@
overflow: hidden;
}
-.extraBucketsChip {
- display: inline-flex;
- align-items: center;
- gap: var(--spacing-3);
- margin: 0;
-}
-
-.sourceBadge {
- margin: 0;
-}
-
.tableCellStyles {
color: var(--l1-foreground);
}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/MapConfirmDialog/MapConfirmDialog.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/MapConfirmDialog/MapConfirmDialog.tsx
index a8dcc36486..3ffbbbf6f2 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/MapConfirmDialog/MapConfirmDialog.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/MapConfirmDialog/MapConfirmDialog.tsx
@@ -52,16 +52,19 @@ function MapConfirmDialog({
const footer = (
<div className={styles.footer}>
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={onCancel}
disabled={isSaving}
+ disabledTooltip="Wait for the mapping to finish"
prefix={<X size={12} />}
testId="unpriced-map-cancel-btn"
>
Cancel
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
loading={isSaving}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/table.config.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/table.config.tsx
index e8143d9b08..58f3099b4c 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/table.config.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/table.config.tsx
@@ -8,7 +8,6 @@ import type {
UnpricedModel,
} from 'container/LLMObservability/Settings/ModelPricing/types';
import { formatSpanCount } from 'container/LLMObservability/Settings/ModelPricing/utils';
-import styles from './tableConfig.module.scss';
export interface UnpricedColumnsConfig {
canManage: boolean;
@@ -60,10 +59,9 @@ export function getUnpricedModelsColumns({
enableMove: false,
cell: ({ row }): JSX.Element => (
<Badge
- color="cherry"
- variant="outline"
- className={styles.spansBadge}
- data-testid={`unpriced-spans-${row.modelName}`}
+ color="danger"
+ variant="outlined"
+ testId={`unpriced-spans-${row.modelName}`}
>
{formatSpanCount(row.spanCount)}
</Badge>
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/tableConfig.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/tableConfig.module.scss
deleted file mode 100644
index aad108f7ee..0000000000
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/components/UnpricedModelsTable/TableConfig/tableConfig.module.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.spansBadge {
- margin: 0;
- font-family: var(--code-font-family, monospace);
-}
diff --git a/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.module.scss b/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.module.scss
index 02e58af0d2..d315818b71 100644
--- a/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.module.scss
+++ b/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.module.scss
@@ -90,13 +90,6 @@
gap: 8px;
}
-.buttonContent {
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 4px;
-}
-
.getStartedText {
display: flex;
justify-content: center;
diff --git a/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.tsx b/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.tsx
index cb53ed759f..2ef010e008 100644
--- a/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.tsx
+++ b/frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.tsx
@@ -86,22 +86,28 @@ export function AlertsEmptyState({
<div className={styles.actionContainer}>
<div className={styles.buttonGroup}>
<Button
+ size="md"
+ variant="solid"
+ color="primary"
onClick={onClickNewAlertHandler}
disabled={!addNewAlert}
+ disabledTooltip="You need permission to create alert rules"
loading={loading}
testId="add-alert"
+ prefix={<Plus size="md" />}
+ width="150px"
>
- <span className={styles.buttonContent}>
- <Plus size="md" />
- New Alert Rule
- </span>
+ New Alert Rule
</Button>
{onRefresh && (
<Button
+ size="md"
+ variant="solid"
onClick={onRefresh}
prefix={<RefreshCw />}
color="secondary"
testId="list-alerts-empty-refresh-button"
+ width="150px"
>
Refresh
</Button>
diff --git a/frontend/src/container/ListAlertRules/__tests__/ListAlertRules.list.test.tsx b/frontend/src/container/ListAlertRules/__tests__/ListAlertRules.list.test.tsx
index 705f5ca281..d39fceb498 100644
--- a/frontend/src/container/ListAlertRules/__tests__/ListAlertRules.list.test.tsx
+++ b/frontend/src/container/ListAlertRules/__tests__/ListAlertRules.list.test.tsx
@@ -53,19 +53,19 @@ describe('ListAlertRules — list rendering', () => {
expect(screen.getByTestId('alert-row-rule-1-state')).toHaveAttribute(
'data-color',
- 'cherry',
+ 'danger',
);
expect(screen.getByTestId('alert-row-rule-2-state')).toHaveAttribute(
'data-color',
- 'amber',
+ 'warning',
);
expect(screen.getByTestId('alert-row-rule-3-state')).toHaveAttribute(
'data-color',
- 'forest',
+ 'success',
);
expect(screen.getByTestId('alert-row-rule-4-state')).toHaveAttribute(
'data-color',
- 'vanilla',
+ 'secondary',
);
});
@@ -93,11 +93,11 @@ describe('ListAlertRules — list rendering', () => {
);
expect(screen.getByTestId('alert-row-rule-1-severity')).toHaveAttribute(
'data-color',
- 'cherry',
+ 'danger',
);
expect(screen.getByTestId('alert-row-rule-2-severity')).toHaveAttribute(
'data-color',
- 'amber',
+ 'warning',
);
});
diff --git a/frontend/src/container/ListAlertRules/components/ActionsMenu.module.scss b/frontend/src/container/ListAlertRules/components/ActionsMenu.module.scss
deleted file mode 100644
index 3ed82be45d..0000000000
--- a/frontend/src/container/ListAlertRules/components/ActionsMenu.module.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.actionButton {
- opacity: 0.7;
- transition: opacity 0.15s ease;
-
- &:hover {
- opacity: 1;
- }
-}
-
-.deleteItem {
- color: var(--bg-cherry-500);
-
- &:hover {
- background: color-mix(in srgb, var(--bg-cherry-500) 10%, transparent);
- }
-}
diff --git a/frontend/src/container/ListAlertRules/components/ActionsMenu.tsx b/frontend/src/container/ListAlertRules/components/ActionsMenu.tsx
index c755f1a3b9..5ad789d799 100644
--- a/frontend/src/container/ListAlertRules/components/ActionsMenu.tsx
+++ b/frontend/src/container/ListAlertRules/components/ActionsMenu.tsx
@@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react';
import { useQueryClient } from 'react-query';
import { Ellipsis } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { toast } from '@signozhq/ui/sonner';
import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
import {
@@ -19,19 +19,13 @@ import type { AxiosError } from 'axios';
import type { AlertRule } from '../types';
import { ALERT_ACTIONS, alertActionLogEvent } from '../utils';
-import styles from './ActionsMenu.module.scss';
interface ActionsMenuProps {
rule: AlertRule;
onEdit: (rule: AlertRule, options?: { newTab?: boolean }) => void;
- isLoading?: boolean;
}
-function ActionsMenu({
- rule,
- onEdit,
- isLoading: externalLoading = false,
-}: ActionsMenuProps): JSX.Element {
+function ActionsMenu({ rule, onEdit }: ActionsMenuProps): JSX.Element {
const queryClient = useQueryClient();
const handleToggle = useCallback((): void => {
@@ -77,6 +71,7 @@ function ActionsMenu({
if (newRule) {
onEdit(newRule as AlertRule);
}
+ return newRule;
}),
{
loading: 'Cloning alert...',
@@ -112,44 +107,43 @@ function ActionsMenu({
);
}, [rule, queryClient]);
- const menuItems = useMemo(
+ const menuItems = useMemo<DropdownItemType[]>(
() => [
{
- key: 'toggle',
+ type: 'item',
+ value: 'toggle',
label: rule.disabled ? 'Enable' : 'Disable',
- disabled: externalLoading,
onClick: handleToggle,
},
{
- key: 'edit',
+ type: 'item',
+ value: 'edit',
label: 'Edit',
- disabled: externalLoading,
onClick: handleEdit,
},
{
- key: 'edit-new-tab',
+ type: 'item',
+ value: 'edit-new-tab',
label: 'Edit in New Tab',
- disabled: externalLoading,
onClick: handleEditNewTab,
},
{
- key: 'clone',
+ type: 'item',
+ value: 'clone',
label: 'Clone',
- disabled: externalLoading,
onClick: handleClone,
},
- { key: 'divider', type: 'divider' as const },
+ { type: 'separator', value: 'before-delete' },
{
- key: 'delete',
+ type: 'item',
+ value: 'delete',
label: 'Delete',
- disabled: externalLoading,
danger: true,
onClick: handleDelete,
},
],
[
rule.disabled,
- externalLoading,
handleToggle,
handleEdit,
handleEditNewTab,
@@ -165,17 +159,18 @@ function ActionsMenu({
return (
// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
<div onClick={handleClick}>
- <DropdownMenuSimple menu={{ items: menuItems }} align="end">
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
+ aria-label="Action"
variant="outlined"
color="secondary"
- size="icon"
- className={styles.actionButton}
- data-testid="alert-actions"
+ size="sm"
+ icon
+ testId="alert-actions"
>
<Ellipsis size={16} />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
</div>
);
}
diff --git a/frontend/src/container/ListAlertRules/components/ColumnSelector.tsx b/frontend/src/container/ListAlertRules/components/ColumnSelector.tsx
index 2786996bbc..0b4a8cbcd2 100644
--- a/frontend/src/container/ListAlertRules/components/ColumnSelector.tsx
+++ b/frontend/src/container/ListAlertRules/components/ColumnSelector.tsx
@@ -47,7 +47,7 @@ function ColumnSelector<TData>({
size="sm"
color="secondary"
prefix={<Columns3 size={14} />}
- data-testid="alert-columns-button"
+ testId="alert-columns-button"
>
Columns
</Button>
@@ -62,6 +62,7 @@ function ColumnSelector<TData>({
return (
<label key={col.id} className={styles.columnItem}>
<Checkbox
+ color="primary"
id={`col-${col.id}`}
value={isVisible}
onChange={(): void => handleToggle(col.id, !isVisible)}
diff --git a/frontend/src/container/ListAlertRules/table.config.tsx b/frontend/src/container/ListAlertRules/table.config.tsx
index c313cf27d8..5415cf619d 100644
--- a/frontend/src/container/ListAlertRules/table.config.tsx
+++ b/frontend/src/container/ListAlertRules/table.config.tsx
@@ -1,4 +1,4 @@
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
import { SEVERITY_BADGE_COLORS } from 'components/Alerts/constants';
import LabelColumn from 'components/Alerts/LabelColumn';
import type { TableColumnDef } from 'components/TanStackTableView';
@@ -7,8 +7,8 @@ import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
import type { AlertRule } from './types';
-const STATE_CONFIG: Record<string, { color: BadgeColor; label: string }> = {
- firing: { color: 'error', label: 'Firing' },
+const STATE_CONFIG: Record<string, { color: BadgeColorType; label: string }> = {
+ firing: { color: 'danger', label: 'Firing' },
inactive: { color: 'success', label: 'OK' },
pending: { color: 'warning', label: 'Pending' },
disabled: { color: 'secondary', label: 'Disabled' },
@@ -22,21 +22,22 @@ export function getAlertRuleColumns(
id: 'state',
header: 'Status',
accessorKey: 'state',
- width: { fixed: '100px' },
+ width: { fixed: '130px' },
enableSort: true,
enableRemove: false,
enableMove: false,
cell: ({ row, value }): JSX.Element => {
const state = String(value ?? '').toLowerCase();
const config = STATE_CONFIG[state] ?? {
- color: 'secondary' as BadgeColor,
+ color: 'secondary',
label: 'Unknown',
};
return (
<Badge
color={config.color}
- variant="outline"
+ variant="outlined"
testId={`alert-row-${row.id ?? ''}-state`}
+ width="min-content"
>
{config.label}
</Badge>
@@ -78,8 +79,9 @@ export function getAlertRuleColumns(
}
return (
<Badge
+ textTransform="none"
color={SEVERITY_BADGE_COLORS[severity] ?? 'secondary'}
- variant="outline"
+ variant="outlined"
testId={`alert-row-${row.id ?? ''}-severity`}
>
{severity}
@@ -105,7 +107,9 @@ export function getAlertRuleColumns(
return <TanStackTable.Text>-</TanStackTable.Text>;
}
- return <LabelColumn labels={tagKeys} value={labels} color="sakura" />;
+ return (
+ <LabelColumn labels={tagKeys} value={labels} color="highlight-danger" />
+ );
},
},
{
diff --git a/frontend/src/container/LiveLogs/LiveLogsContainer/index.tsx b/frontend/src/container/LiveLogs/LiveLogsContainer/index.tsx
index af865e547e..b9b0661857 100644
--- a/frontend/src/container/LiveLogs/LiveLogsContainer/index.tsx
+++ b/frontend/src/container/LiveLogs/LiveLogsContainer/index.tsx
@@ -232,8 +232,9 @@ function LiveLogsContainer({
<div className="live-logs-frequency-chart-view-controller">
<Typography>Frequency chart</Typography>
<Switch
+ color="primary"
+ textPlacement="right"
value={showLiveLogsFrequencyChart}
- defaultValue
onChange={handleToggleFrequencyChart}
/>
</div>
diff --git a/frontend/src/container/LogDetailedView/FieldRenderer.styles.scss b/frontend/src/container/LogDetailedView/FieldRenderer.styles.scss
index d01a3dd7ff..96d72cad81 100644
--- a/frontend/src/container/LogDetailedView/FieldRenderer.styles.scss
+++ b/frontend/src/container/LogDetailedView/FieldRenderer.styles.scss
@@ -22,9 +22,3 @@
gap: 8px;
}
}
-
-// FieldRenderer is used inside log/trace/metric detail drawers (z-index 1000).
-// The design-system tooltip defaults to z-index 50 and would render behind them.
-.field-renderer-tooltip-content {
- --tooltip-z-index: 1000;
-}
diff --git a/frontend/src/container/LogDetailedView/FieldRenderer.styles.ts b/frontend/src/container/LogDetailedView/FieldRenderer.styles.ts
index edbaa1e3fa..4894698d8a 100644
--- a/frontend/src/container/LogDetailedView/FieldRenderer.styles.ts
+++ b/frontend/src/container/LogDetailedView/FieldRenderer.styles.ts
@@ -1,7 +1,10 @@
import { Badge } from '@signozhq/ui/badge';
import styled from 'styled-components';
-export const TagContainer = styled(Badge)`
+export const TagContainer = styled(Badge).attrs({
+ color: 'secondary' as const,
+ variant: 'outlined' as const,
+})`
&&& {
border-color: var(--bg-slate-400);
border-radius: 0.25rem;
diff --git a/frontend/src/container/LogDetailedView/FieldRenderer.tsx b/frontend/src/container/LogDetailedView/FieldRenderer.tsx
index 7d4c2b890d..6d60489f49 100644
--- a/frontend/src/container/LogDetailedView/FieldRenderer.tsx
+++ b/frontend/src/container/LogDetailedView/FieldRenderer.tsx
@@ -1,5 +1,5 @@
import { Divider } from '@signozhq/ui/divider';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { TagContainer, TagLabel, TagValue } from './FieldRenderer.styles';
@@ -8,10 +8,6 @@ import { getFieldAttributes } from './utils';
import './FieldRenderer.styles.scss';
-const TOOLTIP_CONTENT_PROPS = {
- className: 'field-renderer-tooltip-content',
-};
-
function FieldRenderer({ field }: FieldRendererProps): JSX.Element {
const { dataType, newField, logType } = getFieldAttributes(field);
@@ -19,16 +15,11 @@ function FieldRenderer({ field }: FieldRendererProps): JSX.Element {
<span className="field-renderer-container">
{dataType && newField && logType ? (
<>
- <TooltipSimple
- title={newField}
- side="left"
- tooltipContentProps={TOOLTIP_CONTENT_PROPS}
- arrow
- >
+ <Tooltip title={newField} side="left">
<Typography.Text truncate={1} className="label">
{newField}{' '}
</Typography.Text>
- </TooltipSimple>
+ </Tooltip>
<div className="tags">
<TagContainer>
diff --git a/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.styles.scss b/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.styles.scss
index 6befcd4041..a1786172f1 100644
--- a/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.styles.scss
+++ b/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.styles.scss
@@ -5,16 +5,11 @@
height: 100%;
}
-.infra-metrics-container {
- .views-tabs {
- margin-bottom: 1rem;
- }
-}
-
.infra-metrics-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
gap: 24px;
+ padding-top: var(--spacing-8);
}
.infra-metrics-card {
diff --git a/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.tsx b/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.tsx
index 916a06ced1..cde8bc51ef 100644
--- a/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.tsx
+++ b/frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.tsx
@@ -34,24 +34,16 @@ function InfraMetrics({
const viewOptions = useMemo(() => {
const options = [
{
- label: (
- <div className="view-title">
- <Table size={14} />
- Node
- </div>
- ),
+ icon: <Table size={14} />,
+ label: 'Node',
value: VIEW_TYPES.NODE,
},
];
if (podName) {
options.push({
- label: (
- <div className="view-title">
- <History size={14} />
- Pod
- </div>
- ),
+ icon: <History size={14} />,
+ label: 'Pod',
value: VIEW_TYPES.POD,
});
}
@@ -88,7 +80,6 @@ function InfraMetrics({
<SignozRadioGroup
value={selectedView}
onChange={handleModeChange}
- className="views-tabs"
options={viewOptions}
/>
{/* TODO(Rahul): Make a common config driven component for this and other infra metrics components */}
diff --git a/frontend/src/container/LogDetailedView/Overview.styles.scss b/frontend/src/container/LogDetailedView/Overview.styles.scss
index ebf24a2a43..9df66bf140 100644
--- a/frontend/src/container/LogDetailedView/Overview.styles.scss
+++ b/frontend/src/container/LogDetailedView/Overview.styles.scss
@@ -122,17 +122,5 @@
display: flex;
align-items: center;
justify-content: space-between;
-
- .action-btn {
- border-radius: 2px;
- border: 1px solid var(--l1-border);
- display: flex;
- align-items: center;
- justify-content: center;
-
- background: none;
- border: none;
- box-shadow: none;
- }
}
}
diff --git a/frontend/src/container/Login/Login.styles.scss b/frontend/src/container/Login/Login.styles.scss
index 306bb4e5f1..2a4faffc74 100644
--- a/frontend/src/container/Login/Login.styles.scss
+++ b/frontend/src/container/Login/Login.styles.scss
@@ -291,7 +291,3 @@
width: 100%;
margin-top: 24px;
}
-
-.login-submit-btn {
- width: 100%;
-}
diff --git a/frontend/src/container/Login/__tests__/Login.test.tsx b/frontend/src/container/Login/__tests__/Login.test.tsx
index 6ad50a0d0b..2c71aecdad 100644
--- a/frontend/src/container/Login/__tests__/Login.test.tsx
+++ b/frontend/src/container/Login/__tests__/Login.test.tsx
@@ -161,7 +161,10 @@ describe('Login Component', () => {
const { getByTestId } = render(<Login />);
- expect(getByTestId('initiate_login')).toBeDisabled();
+ expect(getByTestId('initiate_login')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -229,7 +232,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -271,7 +274,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -304,7 +307,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -341,7 +344,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -383,7 +386,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = screen.getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -422,7 +425,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -459,7 +462,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -495,7 +498,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -538,7 +541,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -588,7 +591,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -645,7 +648,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -726,7 +729,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = screen.getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -778,7 +781,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -825,14 +828,14 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = screen.getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
await user.click(nextButton);
// Button should be disabled during API call
- expect(nextButton).toBeDisabled();
+ expect(nextButton).toHaveAttribute('aria-disabled', 'true');
});
it('shows correct button text for each auth method', async () => {
@@ -860,7 +863,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = screen.getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -902,7 +905,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = screen.getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
@@ -955,7 +958,7 @@ describe('Login Component', () => {
const nextButton = await waitFor(() => {
const button = screen.getByTestId('initiate_login');
- expect(button).not.toBeDisabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
});
diff --git a/frontend/src/container/Login/index.tsx b/frontend/src/container/Login/index.tsx
index 4c465af3ef..29a42a28ce 100644
--- a/frontend/src/container/Login/index.tsx
+++ b/frontend/src/container/Login/index.tsx
@@ -41,6 +41,8 @@ type FormValues = {
url: string;
};
+const ENTER_VALID_EMAIL = 'Enter a valid email address';
+
// eslint-disable-next-line sonarjs/cognitive-complexity
function Login(): JSX.Element {
const urlQueryParams = useUrlQuery();
@@ -280,27 +282,21 @@ function Login(): JSX.Element {
email?.trim() && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email),
);
- const isNextButtonEnabled =
- isEmailValid && !versionLoading && !sessionsContextLoading;
+ const isNextLoading = versionLoading || sessionsContextLoading;
- const isSubmitButtonEnabled = useMemo((): boolean => {
- if (!isEmailValid || isSubmitting) {
- return false;
+ const submitDisabledReason = useMemo((): string | undefined => {
+ if (!isEmailValid) {
+ return ENTER_VALID_EMAIL;
}
const hasMultipleOrgs = (sessionsContext?.orgs.length ?? 0) > 1;
if (hasMultipleOrgs && !orgId) {
- return false;
+ return 'Select an organization first';
}
-
- return !(isPasswordAuthN && !password?.trim());
- }, [
- isEmailValid,
- isSubmitting,
- sessionsContext,
- orgId,
- isPasswordAuthN,
- password,
- ]);
+ if (isPasswordAuthN && !password?.trim()) {
+ return 'Enter your password first';
+ }
+ return undefined;
+ }, [isEmailValid, sessionsContext, orgId, isPasswordAuthN, password]);
return (
<div className="login-form-container">
@@ -389,11 +385,15 @@ function Login(): JSX.Element {
<div className="login-form-actions">
{!sessionsContext && (
<Button
- disabled={!isNextButtonEnabled}
+ size="md"
+ color="primary"
+ loading={isNextLoading}
+ disabled={!isEmailValid}
+ disabledTooltip={ENTER_VALID_EMAIL}
variant="solid"
onClick={onNextHandler}
testId="initiate_login"
- className="login-submit-btn"
+ width="100%"
suffix={<ArrowRight />}
>
Next
@@ -402,13 +402,16 @@ function Login(): JSX.Element {
{sessionsContext && isCallbackAuthN && (
<Button
- disabled={!isSubmitButtonEnabled}
+ size="md"
+ loading={isSubmitting}
+ disabled={!!submitDisabledReason}
+ disabledTooltip={submitDisabledReason}
variant="solid"
type="submit"
color="primary"
testId="callback_authn_submit"
data-attr="signup"
- className="login-submit-btn"
+ width="100%"
suffix={<ArrowRight />}
>
Sign in with SSO
@@ -417,13 +420,16 @@ function Login(): JSX.Element {
{sessionsContext && isPasswordAuthN && (
<Button
- disabled={!isSubmitButtonEnabled}
+ size="md"
+ loading={isSubmitting}
+ disabled={!!submitDisabledReason}
+ disabledTooltip={submitDisabledReason}
variant="solid"
color="primary"
testId="password_authn_submit"
type="submit"
data-attr="signup"
- className="login-submit-btn"
+ width="100%"
suffix={<ArrowRight />}
>
Sign in with Password
diff --git a/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx b/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx
index a2efe642af..9f2fda5207 100644
--- a/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx
+++ b/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx
@@ -62,8 +62,9 @@ function LogsActionsContainer({
<div className="frequency-chart-view-controller">
<Typography>Frequency chart</Typography>
<Switch
+ color="primary"
+ textPlacement="right"
value={showFrequencyChart}
- defaultValue
onChange={handleToggleFrequencyChart}
/>
</div>
diff --git a/frontend/src/container/LogsExplorerViews/tests/LogsExplorerPagination.test.tsx b/frontend/src/container/LogsExplorerViews/tests/LogsExplorerPagination.test.tsx
index 87e90d7ca5..778550c758 100644
--- a/frontend/src/container/LogsExplorerViews/tests/LogsExplorerPagination.test.tsx
+++ b/frontend/src/container/LogsExplorerViews/tests/LogsExplorerPagination.test.tsx
@@ -548,5 +548,5 @@ describe('Logs Explorer -> stage and run query', () => {
// Verify that the IDs have changed (this confirms the Stage & Run Query button worked)
expect(currentStagedQuery.id).not.toBe(initialStagedQueryId);
expect(currentCurrentQuery.id).not.toBe(initialCurrentQueryId);
- });
+ }, 15000);
});
diff --git a/frontend/src/container/MCPServerSettings/AuthCard/AuthCard.tsx b/frontend/src/container/MCPServerSettings/AuthCard/AuthCard.tsx
index 62ec341979..d776141e0b 100644
--- a/frontend/src/container/MCPServerSettings/AuthCard/AuthCard.tsx
+++ b/frontend/src/container/MCPServerSettings/AuthCard/AuthCard.tsx
@@ -24,7 +24,7 @@ function AuthCard({
return (
<section className="mcp-auth-card">
<h3 className="mcp-auth-card__title">
- <Badge color="secondary" variant="default">
+ <Badge color="secondary" variant="solid">
2
</Badge>
Authenticate from your client
@@ -44,7 +44,6 @@ function AuthCard({
<CopyIconButton
ariaLabel="Copy SigNoz instance URL"
onCopy={onCopyInstanceUrl}
- disabled={isLoadingInstanceUrl}
/>
</div>
)}
@@ -55,6 +54,7 @@ function AuthCard({
{isAdmin ? (
<div className="mcp-auth-card__cta-row">
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<KeyRound size={14} />}
diff --git a/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.test.tsx b/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.test.tsx
index f5b52481fb..37ad1141e9 100644
--- a/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.test.tsx
+++ b/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.test.tsx
@@ -65,7 +65,7 @@ describe('ClientTabs', () => {
const installBtn = screen.getByRole('button', {
name: 'Add to Cursor',
});
- expect(installBtn).toBeEnabled();
+ expect(installBtn).not.toHaveAttribute('aria-disabled', 'true');
});
it('shows disabled install button when endpoint is missing (Cursor)', () => {
@@ -74,7 +74,7 @@ describe('ClientTabs', () => {
const installBtn = screen.getByRole('button', {
name: 'Add to Cursor',
});
- expect(installBtn).toBeDisabled();
+ expect(installBtn).toHaveAttribute('aria-disabled', 'true');
});
it('calls onCopySnippet with client key and snippet on copy', async () => {
@@ -103,6 +103,6 @@ describe('ClientTabs', () => {
name: `Copy ${cursorClient.label} config`,
});
- expect(copyBtn).toBeDisabled();
+ expect(copyBtn).toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.tsx b/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.tsx
index 8c4ed46c94..0987f9d00f 100644
--- a/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.tsx
+++ b/frontend/src/container/MCPServerSettings/ClientTabs/ClientTabs.tsx
@@ -10,6 +10,7 @@ import { docsUrl, MCP_CLIENTS, McpClient } from '../clients';
import './ClientTabs.styles.scss';
const ENDPOINT_PLACEHOLDER = 'https://mcp.<region>.signoz.cloud/mcp';
+const ENTER_REGION_FIRST = 'Enter your Cloud region first';
interface ClientTabsProps {
endpoint: string;
@@ -50,6 +51,7 @@ function ClientTabs({
<CopyIconButton
ariaLabel={`Copy ${client.label} config`}
disabled={!endpoint}
+ disabledTooltip={ENTER_REGION_FIRST}
onCopy={(): void => onCopySnippet(client.key, snippet)}
/>
</div>
@@ -62,6 +64,7 @@ function ClientTabs({
<CopyIconButton
ariaLabel="Copy MCP endpoint"
disabled={!endpoint}
+ disabledTooltip={ENTER_REGION_FIRST}
onCopy={(): void => onCopySnippet(client.key, endpoint)}
/>
</div>
@@ -75,6 +78,7 @@ function ClientTabs({
<div className="mcp-client-tabs__install-row">
{installHref ? (
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<Download size={14} />}
@@ -87,9 +91,11 @@ function ClientTabs({
</Button>
) : (
<Button
+ size="md"
variant="solid"
color="primary"
disabled
+ disabledTooltip={ENTER_REGION_FIRST}
prefix={<Download size={14} />}
>
{installLabel}
@@ -116,6 +122,9 @@ function ClientTabs({
return (
<Tabs
+ variant="primary"
+ orientation="horizontal"
+ alignment="start"
className="mcp-client-tabs-root"
value={activeTab}
onChange={onTabChange}
diff --git a/frontend/src/container/MCPServerSettings/CopyIconButton.styles.scss b/frontend/src/container/MCPServerSettings/CopyIconButton.styles.scss
deleted file mode 100644
index 941ba707e5..0000000000
--- a/frontend/src/container/MCPServerSettings/CopyIconButton.styles.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.mcp-copy-btn {
- &:hover {
- background-color: var(--l3-background-hover) !important;
- }
-}
diff --git a/frontend/src/container/MCPServerSettings/CopyIconButton.tsx b/frontend/src/container/MCPServerSettings/CopyIconButton.tsx
index b0b43d1eac..332e6ae11d 100644
--- a/frontend/src/container/MCPServerSettings/CopyIconButton.tsx
+++ b/frontend/src/container/MCPServerSettings/CopyIconButton.tsx
@@ -1,40 +1,35 @@
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple, TooltipProvider } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Copy } from '@signozhq/icons';
-import './CopyIconButton.styles.scss';
interface CopyIconButtonProps {
ariaLabel: string;
onCopy: () => void;
disabled?: boolean;
+ disabledTooltip?: string;
}
function CopyIconButton({
ariaLabel,
onCopy,
disabled = false,
+ disabledTooltip,
}: CopyIconButtonProps): JSX.Element {
- const tooltipTitle = disabled
- ? 'Enter your Cloud region first'
- : 'Copy to clipboard';
-
return (
- <TooltipProvider>
- <TooltipSimple title={tooltipTitle}>
- <span>
- <Button
- color="secondary"
- variant="ghost"
- size="icon"
- aria-label={ariaLabel}
- disabled={disabled}
- className="mcp-copy-btn"
- prefix={<Copy size={14} />}
- onClick={onCopy}
- />
- </span>
- </TooltipSimple>
- </TooltipProvider>
+ <Tooltip title={disabled ? undefined : 'Copy to clipboard'}>
+ <Button
+ color="secondary"
+ variant="ghost"
+ size="sm"
+ icon
+ aria-label={ariaLabel}
+ disabled={disabled}
+ disabledTooltip={disabledTooltip}
+ onClick={onCopy}
+ >
+ <Copy size={14} />
+ </Button>
+ </Tooltip>
);
}
diff --git a/frontend/src/container/MCPServerSettings/MCPServerSettings.tsx b/frontend/src/container/MCPServerSettings/MCPServerSettings.tsx
index c1197f874f..2386f7352b 100644
--- a/frontend/src/container/MCPServerSettings/MCPServerSettings.tsx
+++ b/frontend/src/container/MCPServerSettings/MCPServerSettings.tsx
@@ -131,7 +131,7 @@ function MCPServerSettings(): JSX.Element {
<section className="mcp-settings__card">
<h3 className="mcp-settings__card-title">
- <Badge color="secondary" variant="default">
+ <Badge color="secondary" variant="solid">
1
</Badge>
Configure your client
diff --git a/frontend/src/container/MembersSettings/MembersSettings.styles.scss b/frontend/src/container/MembersSettings/MembersSettings.styles.scss
index ef58710a84..52ed962d12 100644
--- a/frontend/src/container/MembersSettings/MembersSettings.styles.scss
+++ b/frontend/src/container/MembersSettings/MembersSettings.styles.scss
@@ -49,41 +49,9 @@
}
}
-.members-filter-trigger {
- display: flex;
- align-items: center;
- gap: var(--spacing-2);
- border: 1px solid var(--l1-border);
- border-radius: 2px;
- background-color: var(--l2-background);
-
- > span {
- color: var(--foreground);
- }
-
- &__chevron {
- flex-shrink: 0;
- color: var(--foreground);
- }
-}
-
-.members-filter-dropdown {
- .ant-dropdown-menu {
- padding: var(--padding-3) 14px;
- border-radius: 4px;
- border: 1px solid var(--l1-border);
- background: var(--l2-background);
- backdrop-filter: blur(20px);
- }
-
- .ant-dropdown-menu-item {
- background: transparent !important;
- padding: var(--padding-1) 0 !important;
-
- &:hover {
- background: transparent !important;
- }
- }
+.members-filter-trigger__chevron {
+ flex-shrink: 0;
+ color: var(--foreground);
}
.members-filter-option {
diff --git a/frontend/src/container/MembersSettings/MembersSettings.tsx b/frontend/src/container/MembersSettings/MembersSettings.tsx
index b27ca1114b..baa0159d1c 100644
--- a/frontend/src/container/MembersSettings/MembersSettings.tsx
+++ b/frontend/src/container/MembersSettings/MembersSettings.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { useHistory } from 'react-router-dom';
import { Check, ChevronDown, Plus } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Input } from '@signozhq/ui/input';
import { useListUsers } from 'api/generated/services/users';
import EditMemberDrawer from 'components/EditMemberDrawer/EditMemberDrawer';
@@ -98,9 +98,10 @@ function MembersSettings(): JSX.Element {
).length;
const totalCount = allMembers.length;
- const filterMenuItems: MenuItem[] = [
+ const filterMenuItems: DropdownItemType[] = [
{
- key: FilterMode.All,
+ type: 'item',
+ value: FilterMode.All,
label: (
<div className="members-filter-option">
<span>All members ⎯ {totalCount}</span>
@@ -113,7 +114,8 @@ function MembersSettings(): JSX.Element {
},
},
{
- key: FilterMode.Invited,
+ type: 'item',
+ value: FilterMode.Invited,
label: (
<div className="members-filter-option">
<span>Pending invites ⎯ {pendingCount}</span>
@@ -126,7 +128,8 @@ function MembersSettings(): JSX.Element {
},
},
{
- key: FilterMode.Deleted,
+ type: 'item',
+ value: FilterMode.Deleted,
label: (
<div className="members-filter-option">
<span>Deleted ⎯ {deletedCount}</span>
@@ -174,19 +177,18 @@ function MembersSettings(): JSX.Element {
</div>
<div className="members-settings__controls">
- <DropdownMenuSimple
- menu={{ items: filterMenuItems }}
- className="members-filter-dropdown"
- >
+ <Dropdown items={filterMenuItems} nativeButton align="end" side="bottom">
<Button
+ size="md"
variant="solid"
color="secondary"
- className="members-filter-trigger"
+ suffix={
+ <ChevronDown size={12} className="members-filter-trigger__chevron" />
+ }
>
<span>{filterLabel}</span>
- <ChevronDown size={12} className="members-filter-trigger__chevron" />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
<div className="members-settings__search">
<Input
@@ -203,11 +205,12 @@ function MembersSettings(): JSX.Element {
</div>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={(): void => void setIsInviteModalOpen(true)}
+ prefix={<Plus size={12} />}
>
- <Plus size={12} />
Invite member
</Button>
</div>
diff --git a/frontend/src/container/MembersSettings/components/InviteMembersModal/InviteMembersModal.tsx b/frontend/src/container/MembersSettings/components/InviteMembersModal/InviteMembersModal.tsx
index f0e45e2c69..595e2522cf 100644
--- a/frontend/src/container/MembersSettings/components/InviteMembersModal/InviteMembersModal.tsx
+++ b/frontend/src/container/MembersSettings/components/InviteMembersModal/InviteMembersModal.tsx
@@ -47,16 +47,24 @@ function InviteMembersModal({
onPartialSuccess={handlePartialSuccess}
renderFooter={({ submit, canSubmit, isSubmitting }): JSX.Element => (
<div className="invite-members-modal__footer">
- <Button type="button" variant="solid" color="secondary" onClick={onClose}>
- <X size={12} />
+ <Button
+ size="md"
+ type="button"
+ variant="solid"
+ color="secondary"
+ onClick={onClose}
+ prefix={<X size={12} />}
+ >
Cancel
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
onClick={submit}
disabled={!canSubmit}
+ disabledTooltip="Add at least one team member to invite"
loading={isSubmitting}
>
{isSubmitting ? 'Inviting...' : 'Invite Team Members'}
diff --git a/frontend/src/container/MembersSettings/components/InviteMembersModal/__tests__/InviteMembersModal.test.tsx b/frontend/src/container/MembersSettings/components/InviteMembersModal/__tests__/InviteMembersModal.test.tsx
index 9a0d596757..42157675c3 100644
--- a/frontend/src/container/MembersSettings/components/InviteMembersModal/__tests__/InviteMembersModal.test.tsx
+++ b/frontend/src/container/MembersSettings/components/InviteMembersModal/__tests__/InviteMembersModal.test.tsx
@@ -97,7 +97,9 @@ describe('InviteMembersModal', () => {
}) as JSX.Element,
);
- expect(getByRole('button', { name: /invite team members/i })).toBeDisabled();
+ expect(
+ getByRole('button', { name: /invite team members/i }),
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('shows loading state when isSubmitting=true', () => {
diff --git a/frontend/src/container/MetricsApplication/TopOperationsTable.tsx b/frontend/src/container/MetricsApplication/TopOperationsTable.tsx
index eac98f9af1..96a2a827a3 100644
--- a/frontend/src/container/MetricsApplication/TopOperationsTable.tsx
+++ b/frontend/src/container/MetricsApplication/TopOperationsTable.tsx
@@ -212,7 +212,12 @@ function TopOperationsTable({
/>
</div>
<div className="top-operation__entry-point">
- <Switch value={isEntryPoint} onChange={onEntryPointToggle} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ value={isEntryPoint}
+ onChange={onEntryPointToggle}
+ />
<span className="top-operation__entry-point-label">Entrypoint Spans</span>
<TextToolTip
text={entryPointSpanInfo.text}
diff --git a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
index d17806da15..6dc9382679 100644
--- a/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
+++ b/frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx
@@ -2,11 +2,10 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { useQueryClient } from 'react-query';
import { useSearchParams } from 'react-router-dom-v5-compat';
import * as Sentry from '@sentry/react';
-import { Tooltip } from 'antd';
import { Filter } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { Switch } from '@signozhq/ui/switch';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
import WarningPopover from 'components/WarningPopover/WarningPopover';
@@ -364,29 +363,29 @@ function Explorer(): JSX.Element {
<div className="explore-header">
<div className="explore-header-left-actions">
{!showSidebar && (
- <TooltipSimple title="Show Views">
+ <Tooltip title="Show Views">
<Button
variant="outlined"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Show Views"
- prefix={<Filter size={16} />}
onClick={(): void => setShowSidebar(true)}
- data-testid="metrics-explorer-show-sidebar"
- />
- </TooltipSimple>
+ testId="metrics-explorer-show-sidebar"
+ >
+ <Filter size={16} />
+ </Button>
+ </Tooltip>
)}
<span>1 chart/query</span>
- <Tooltip
- open={disableOneChartPerQuery ? undefined : false}
- title={oneChartPerQueryDisabledTooltip}
- >
- <Switch
- value={showOneChartPerQuery}
- onChange={handleToggleShowOneChartPerQuery}
- disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
- />
- </Tooltip>
+ <Switch
+ color="primary"
+ textPlacement="right"
+ value={showOneChartPerQuery}
+ onChange={handleToggleShowOneChartPerQuery}
+ disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
+ disabledTooltip={oneChartPerQueryDisabledTooltip}
+ />
</div>
<div className="explore-header-right-actions">
{!isEmpty(warning) && <WarningPopover warningData={warning} />}
diff --git a/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx b/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx
index 5065de9faa..4b32f35ca2 100644
--- a/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx
+++ b/frontend/src/container/MetricsExplorer/Explorer/__tests__/Explorer.test.tsx
@@ -4,7 +4,6 @@ import { Provider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { useSearchParams } from 'react-router-dom-v5-compat';
import { render, screen } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import {
MetrictypesTemporalityDTO,
MetrictypesTypeDTO,
@@ -147,11 +146,9 @@ function renderExplorer(): void {
<QueryClientProvider client={queryClient}>
<MemoryRouter>
<Provider store={store}>
- <TooltipProvider>
- <ErrorModalProvider>
- <Explorer />
- </ErrorModalProvider>
- </TooltipProvider>
+ <ErrorModalProvider>
+ <Explorer />
+ </ErrorModalProvider>
</Provider>
</MemoryRouter>
</QueryClientProvider>,
@@ -267,7 +264,7 @@ describe('Explorer', () => {
const oneChartPerQueryToggle = screen.getByRole('switch');
expect(oneChartPerQueryToggle).toBeChecked();
- expect(oneChartPerQueryToggle).toBeDisabled();
+ expect(oneChartPerQueryToggle).toHaveAttribute('aria-disabled', 'true');
});
it('should render empty y axis unit selector for a single metric with no unit', () => {
@@ -303,7 +300,7 @@ describe('Explorer', () => {
const oneChartPerQueryToggle = screen.getByRole('switch');
expect(oneChartPerQueryToggle).not.toBeChecked();
- expect(oneChartPerQueryToggle).toBeDisabled();
+ expect(oneChartPerQueryToggle).toHaveAttribute('aria-disabled', 'true');
});
it('one chart per query should enabled by default when there are multiple metrics with the same unit', () => {
diff --git a/frontend/src/container/MetricsExplorer/Inspect/GraphView.tsx b/frontend/src/container/MetricsExplorer/Inspect/GraphView.tsx
index e58f4f7c1b..8ac93a4688 100644
--- a/frontend/src/container/MetricsExplorer/Inspect/GraphView.tsx
+++ b/frontend/src/container/MetricsExplorer/Inspect/GraphView.tsx
@@ -207,6 +207,8 @@ function GraphView({
</Button.Group>
<div className="view-toggle-button">
<Switch
+ color="primary"
+ textPlacement="right"
value={viewType === 'graph'}
onChange={(checked): void => {
const newViewType = checked ? 'graph' : 'table';
diff --git a/frontend/src/container/MetricsExplorer/MetricDetails/DashboardsAndAlertsPopover.tsx b/frontend/src/container/MetricsExplorer/MetricDetails/DashboardsAndAlertsPopover.tsx
index e1045a7315..3f1c581f6c 100644
--- a/frontend/src/container/MetricsExplorer/MetricDetails/DashboardsAndAlertsPopover.tsx
+++ b/frontend/src/container/MetricsExplorer/MetricDetails/DashboardsAndAlertsPopover.tsx
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { generatePath } from 'react-router-dom';
import { Color } from '@signozhq/design-tokens';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Skeleton } from 'antd';
import { Typography } from '@signozhq/ui/typography';
import {
@@ -63,10 +63,11 @@ function DashboardsAndAlertsPopover({
);
}, [dashboardsData]);
- const alertsPopoverContent = useMemo(() => {
+ const alertsPopoverContent = useMemo((): DropdownItemType[] | null => {
if (alerts && alerts.length > 0) {
return alerts.map((alert) => ({
- key: alert.alertId,
+ type: 'item',
+ value: alert.alertId,
label: (
<Typography.Link
key={alert.alertId}
@@ -85,10 +86,11 @@ function DashboardsAndAlertsPopover({
return null;
}, [alerts]);
- const dashboardsPopoverContent = useMemo(() => {
+ const dashboardsPopoverContent = useMemo((): DropdownItemType[] | null => {
if (dashboards && dashboards.length > 0) {
return dashboards.map((dashboard) => ({
- key: dashboard.dashboardId,
+ type: 'item',
+ value: dashboard.dashboardId,
label: (
<Typography.Link
key={dashboard.dashboardId}
@@ -128,11 +130,11 @@ function DashboardsAndAlertsPopover({
return (
<div className="dashboards-and-alerts-popover-container">
{dashboardsPopoverContent && (
- <DropdownMenuSimple
- menu={{
- items: dashboardsPopoverContent,
- }}
+ <Dropdown
+ items={dashboardsPopoverContent}
+ nativeButton={false}
align="start"
+ side="bottom"
>
<div
className="dashboards-and-alerts-popover dashboards-popover"
@@ -144,14 +146,14 @@ function DashboardsAndAlertsPopover({
{pluralize(dashboards.length, 'dashboard')}
</Typography.Text>
</div>
- </DropdownMenuSimple>
+ </Dropdown>
)}
{alertsPopoverContent && (
- <DropdownMenuSimple
- menu={{
- items: alertsPopoverContent,
- }}
+ <Dropdown
+ items={alertsPopoverContent}
+ nativeButton={false}
align="start"
+ side="bottom"
>
<div
className="dashboards-and-alerts-popover alerts-popover"
@@ -163,7 +165,7 @@ function DashboardsAndAlertsPopover({
{pluralize(alerts.length, 'alert rule')}
</Typography.Text>
</div>
- </DropdownMenuSimple>
+ </Dropdown>
)}
</div>
);
diff --git a/frontend/src/container/MetricsExplorer/MetricDetails/Highlights.tsx b/frontend/src/container/MetricsExplorer/MetricDetails/Highlights.tsx
index 492ccb6806..9dc66e2c8c 100644
--- a/frontend/src/container/MetricsExplorer/MetricDetails/Highlights.tsx
+++ b/frontend/src/container/MetricsExplorer/MetricDetails/Highlights.tsx
@@ -1,6 +1,6 @@
import { Color } from '@signozhq/design-tokens';
import { Button, Spin } from 'antd';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { useGetMetricHighlights } from 'api/generated/services/metrics';
import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
@@ -14,10 +14,6 @@ import {
formatTimestampToReadableDate,
} from './utils';
-const TOOLTIP_CONTENT_PROPS = {
- className: 'metric-highlights-tooltip-content',
-};
-
function Highlights({ metricName }: HighlightsProps): JSX.Element {
const {
data: metricHighlightsData,
@@ -104,42 +100,32 @@ function Highlights({ metricName }: HighlightsProps): JSX.Element {
className="metric-details-grid-value"
data-testid="metric-highlights-data-points"
>
- <TooltipSimple
- title={metricHighlights?.dataPoints?.toLocaleString()}
- tooltipContentProps={TOOLTIP_CONTENT_PROPS}
- arrow
- >
+ <Tooltip title={metricHighlights?.dataPoints?.toLocaleString()}>
<span>
{formatNumberIntoHumanReadableFormat(
metricHighlights?.dataPoints ?? 0,
)}
</span>
- </TooltipSimple>
+ </Tooltip>
</Typography.Text>
<Typography.Text
className="metric-details-grid-value"
data-testid="metric-highlights-time-series-total"
>
- <TooltipSimple
+ <Tooltip
title="Active time series are those that have received data points in the last 1 hour."
side="top"
- tooltipContentProps={TOOLTIP_CONTENT_PROPS}
- arrow
>
<span>{`${timeSeriesTotal} total ⎯ ${timeSeriesActive} active`}</span>
- </TooltipSimple>
+ </Tooltip>
</Typography.Text>
<Typography.Text
className="metric-details-grid-value"
data-testid="metric-highlights-last-received"
>
- <TooltipSimple
- title={lastReceivedTooltipText}
- tooltipContentProps={TOOLTIP_CONTENT_PROPS}
- arrow
- >
+ <Tooltip title={lastReceivedTooltipText}>
<span>{lastReceivedText}</span>
- </TooltipSimple>
+ </Tooltip>
</Typography.Text>
</>
)}
diff --git a/frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.styles.scss b/frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.styles.scss
index 9ca315bf50..3d651fea1b 100644
--- a/frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.styles.scss
+++ b/frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.styles.scss
@@ -510,12 +510,6 @@
color: var(--bg-robin-400) !important;
}
-// The MetricDetails Drawer sits at z-index 1000; the design-system tooltip
-// defaults to z-index 50 and would otherwise render behind the drawer.
-.metric-highlights-tooltip-content {
- --tooltip-z-index: 1000;
-}
-
@keyframes fade-in-out {
0% {
opacity: 0;
diff --git a/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/DashboardsAndAlertsPopover.test.tsx b/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/DashboardsAndAlertsPopover.test.tsx
index 809c3328d6..f84703b5b4 100644
--- a/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/DashboardsAndAlertsPopover.test.tsx
+++ b/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/DashboardsAndAlertsPopover.test.tsx
@@ -98,7 +98,9 @@ describe('DashboardsAndAlertsPopover', () => {
render(<DashboardsAndAlertsPopover metricName={MOCK_METRIC_NAME} />);
await userEvent.click(screen.getByText(`1 dashboard`));
- expect(screen.getByText(MOCK_DASHBOARD_1.dashboardId)).toBeInTheDocument();
+ await expect(
+ screen.findByText(MOCK_DASHBOARD_1.dashboardId),
+ ).resolves.toBeInTheDocument();
});
it('renders popover with alert id if name is not available', async () => {
@@ -113,7 +115,9 @@ describe('DashboardsAndAlertsPopover', () => {
render(<DashboardsAndAlertsPopover metricName={MOCK_METRIC_NAME} />);
await userEvent.click(screen.getByText(`1 alert rule`));
- expect(screen.getByText(MOCK_ALERT_1.alertId)).toBeInTheDocument();
+ await expect(
+ screen.findByText(MOCK_ALERT_1.alertId),
+ ).resolves.toBeInTheDocument();
});
it('navigates to the dashboard when the dashboard is clicked', async () => {
@@ -122,7 +126,9 @@ describe('DashboardsAndAlertsPopover', () => {
// Click on 2 dashboards button
await userEvent.click(screen.getByText(`2 dashboards`));
// Popover showing list of 2 dashboards should be visible
- expect(screen.getByText(MOCK_DASHBOARD_1.dashboardName)).toBeInTheDocument();
+ await expect(
+ screen.findByText(MOCK_DASHBOARD_1.dashboardName),
+ ).resolves.toBeInTheDocument();
expect(screen.getByText(MOCK_DASHBOARD_2.dashboardName)).toBeInTheDocument();
// Click on the first dashboard
@@ -141,7 +147,9 @@ describe('DashboardsAndAlertsPopover', () => {
// Click on 2 alert rules button
await userEvent.click(screen.getByText(`2 alert rules`));
// Popover showing list of 2 alert rules should be visible
- expect(screen.getByText(MOCK_ALERT_1.alertName)).toBeInTheDocument();
+ await expect(
+ screen.findByText(MOCK_ALERT_1.alertName),
+ ).resolves.toBeInTheDocument();
expect(screen.getByText(MOCK_ALERT_2.alertName)).toBeInTheDocument();
// Click on the first alert rule
@@ -171,7 +179,9 @@ describe('DashboardsAndAlertsPopover', () => {
expect(screen.getByText('2 dashboards')).toBeInTheDocument();
await userEvent.click(screen.getByText('2 dashboards'));
- expect(screen.getByText(MOCK_DASHBOARD_1.dashboardName)).toBeInTheDocument();
+ await expect(
+ screen.findByText(MOCK_DASHBOARD_1.dashboardName),
+ ).resolves.toBeInTheDocument();
expect(screen.getByText(MOCK_DASHBOARD_2.dashboardName)).toBeInTheDocument();
});
});
diff --git a/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/Highlights.test.tsx b/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/Highlights.test.tsx
index 330042ebd4..437f9e09a5 100644
--- a/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/Highlights.test.tsx
+++ b/frontend/src/container/MetricsExplorer/MetricDetails/__tests__/Highlights.test.tsx
@@ -1,5 +1,4 @@
import { render, screen } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import * as metricsExplorerHooks from 'api/generated/services/metrics';
import TimezoneProvider from 'providers/Timezone';
@@ -10,9 +9,7 @@ import { getMockMetricHighlightsData, MOCK_METRIC_NAME } from './testUtlls';
function renderHighlights(metricName: string): ReturnType<typeof render> {
return render(
<TimezoneProvider>
- <TooltipProvider>
- <Highlights metricName={metricName} />
- </TooltipProvider>
+ <Highlights metricName={metricName} />
</TimezoneProvider>,
);
}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlBadge.tsx b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlBadge.tsx
index fe65d39be3..5e668f8864 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlBadge.tsx
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlBadge.tsx
@@ -11,11 +11,11 @@ interface VolumeControlBadgeProps {
function VolumeControlBadge({ rule }: VolumeControlBadgeProps): JSX.Element {
const badge = (
<Badge
- data-testid="vc-badge-active"
- variant="outline"
+ testId="vc-badge-active"
+ variant="outlined"
color={rule.active ? 'success' : 'warning'}
+ prefix={<Gauge size={12} />}
>
- <Gauge size={12} />
{rule.active ? 'Active' : 'Pending'}
</Badge>
);
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlChart/VolumeControlChart.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlChart/VolumeControlChart.module.scss
index cbe40d7485..d0843320fc 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlChart/VolumeControlChart.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlChart/VolumeControlChart.module.scss
@@ -2,7 +2,7 @@
display: flex;
flex-direction: column;
gap: 8px;
- border: 1px solid var(--bg-slate-400, #1d212d);
+ border: 1px solid var(--l1-border);
border-radius: 6px;
padding: 12px 16px 0 16px;
}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ImpactPanel/ImpactPanel.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ImpactPanel/ImpactPanel.module.scss
index 02b564afb3..8a82e2ab35 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ImpactPanel/ImpactPanel.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ImpactPanel/ImpactPanel.module.scss
@@ -1,7 +1,7 @@
.impactPanel {
- border: 1px solid var(--bg-slate-400, #1d212d);
+ border: 1px solid var(--l1-border);
border-radius: 6px;
- background: var(--bg-ink-300, #16181d);
+ background: var(--l2-background);
padding: 14px;
}
@@ -30,7 +30,7 @@
.meterInfo {
flex-shrink: 0;
- color: var(--bg-vanilla-400, #c0c1c3);
+ color: var(--l2-foreground);
line-height: 1;
cursor: help;
}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ModeSelector/ModeSelector.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ModeSelector/ModeSelector.module.scss
index cbb6cd0776..de92dc97ba 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ModeSelector/ModeSelector.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ModeSelector/ModeSelector.module.scss
@@ -9,9 +9,9 @@
flex-direction: column;
gap: 4px;
text-align: left;
- border: 1px solid var(--bg-slate-400, #1d212d);
+ border: 1px solid var(--l1-border);
border-radius: 6px;
- background: var(--bg-ink-300, #16181d);
+ background: var(--l2-background);
padding: 12px;
cursor: pointer;
transition:
@@ -19,7 +19,7 @@
background 0.12s ease;
&:hover {
- border-color: var(--bg-slate-200, #2c3140);
+ border-color: var(--l3-border);
}
}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/VolumeControlConfigDrawer.tsx b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/VolumeControlConfigDrawer.tsx
index ad1da496da..e2f0d6e3cb 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/VolumeControlConfigDrawer.tsx
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/VolumeControlConfigDrawer.tsx
@@ -47,31 +47,35 @@ function VolumeControlConfigDrawer({
</Typography.Text>
<div className={styles.footerSpacer} />
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={onClose}
- data-testid="volume-control-cancel"
+ testId="volume-control-cancel"
>
Cancel
</Button>
{hasExistingRule && (
<Button
- variant="ghost"
- color="destructive"
+ size="md"
+ variant="solid"
+ color="danger"
onClick={remove}
loading={isRemoving}
- data-testid="volume-control-remove"
+ testId="volume-control-remove"
>
Remove rule
</Button>
)}
<Button
+ size="md"
variant="solid"
color="primary"
onClick={save}
disabled={isSaveDisabled}
+ disabledTooltip="Select at least one attribute"
loading={isSaving}
- data-testid="volume-control-save"
+ testId="volume-control-save"
>
Save rule
</Button>
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.module.scss
index 74af8e76a1..a69adef75e 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.module.scss
@@ -2,11 +2,8 @@
display: flex;
flex-direction: column;
align-items: flex-start;
- border: 1px dashed var(--bg-slate-300, #242834);
+ gap: 12px;
+ border: 1px dashed var(--l2-border);
border-radius: 6px;
padding: 14px;
}
-
-.setupButton {
- margin-top: 12px;
-}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.tsx b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.tsx
index 2a86d7932a..c74365a529 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.tsx
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.tsx
@@ -20,11 +20,11 @@ function NoRuleEmptyState({
</Typography.Text>
{canManage && (
<Button
+ size="md"
variant="solid"
color="primary"
- className={styles.setupButton}
onClick={onSetup}
- data-testid="volume-control-setup"
+ testId="volume-control-setup"
>
Set up volume control
</Button>
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.module.scss
index 75a5ab17cd..149462eb90 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.module.scss
@@ -2,16 +2,20 @@
display: flex;
flex-direction: column;
gap: 8px;
- border: 1px solid var(--bg-slate-400, #1d212d);
+ border: 1px solid var(--l1-border);
border-radius: 6px;
padding: 12px 14px;
- background: var(--bg-ink-300, #16181d);
+ background: var(--l2-background);
}
.cardRow {
display: flex;
align-items: center;
gap: 8px;
+
+ > [data-slot='button'] {
+ margin-left: auto;
+ }
}
.statusIndicator {
@@ -29,10 +33,6 @@
background: var(--bg-amber-500, #ffcc56);
}
-.editButton {
- margin-left: auto;
-}
-
.chips {
display: flex;
flex-wrap: wrap;
@@ -43,6 +43,6 @@
font-family: 'Geist Mono', monospace;
padding: 2px 8px;
border-radius: 4px;
- background: var(--bg-ink-200, #23262e);
- border: 1px solid var(--bg-slate-400, #1d212d);
+ background: var(--l3-background);
+ border: 1px solid var(--l1-border);
}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.tsx b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.tsx
index e47352c132..2b21918a6e 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.tsx
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/RuleSummaryCard/RuleSummaryCard.tsx
@@ -33,11 +33,11 @@ function RuleSummaryCard({
</Typography.Text>
{canManage && (
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.editButton}
onClick={onEdit}
- data-testid="volume-control-edit"
+ testId="volume-control-edit"
>
Edit
</Button>
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/VolumeControlSection.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/VolumeControlSection.module.scss
index 8a4eee050c..26ed3e36ae 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/VolumeControlSection.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/VolumeControlSection.module.scss
@@ -7,7 +7,7 @@
align-items: center;
gap: 8px;
margin-bottom: 10px;
- color: var(--bg-vanilla-400, #c0c1c3);
+ color: var(--l2-foreground);
}
.title {
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlStats/VolumeControlStats.module.scss b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlStats/VolumeControlStats.module.scss
index bef6a49d21..07a7aae3d0 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlStats/VolumeControlStats.module.scss
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlStats/VolumeControlStats.module.scss
@@ -17,9 +17,9 @@
gap: 6px;
min-width: 150px;
padding: 12px 16px;
- border: 1px solid var(--bg-slate-400, #1d212d);
+ border: 1px solid var(--l1-border);
border-radius: 6px;
- background: var(--bg-ink-400, #121317);
+ background: var(--l2-background);
}
.statCardHighlighted {
@@ -40,7 +40,7 @@
.statCardInfo {
flex-shrink: 0;
- color: var(--bg-vanilla-400, #c0c1c3);
+ color: var(--l2-foreground);
line-height: 1;
cursor: help;
}
diff --git a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlTab.tsx b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlTab.tsx
index b4153c6175..3ce3ed174e 100644
--- a/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlTab.tsx
+++ b/frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlTab.tsx
@@ -271,10 +271,11 @@ function VolumeControlTab(): JSX.Element {
rule: MetricreductionruletypesGettableReductionRuleDTO,
): JSX.Element => (
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={(): void => setSelectedRule(rule)}
- data-testid={`volume-control-manage-${rule.metricName}`}
+ testId={`volume-control-manage-${rule.metricName}`}
>
Manage
</Button>
diff --git a/frontend/src/container/MySettings/LicenseSection/LicenseSection.tsx b/frontend/src/container/MySettings/LicenseSection/LicenseSection.tsx
index 38780e8ddf..7b82e7bcce 100644
--- a/frontend/src/container/MySettings/LicenseSection/LicenseSection.tsx
+++ b/frontend/src/container/MySettings/LicenseSection/LicenseSection.tsx
@@ -32,14 +32,16 @@ function LicenseSectionContent(): JSX.Element | null {
<div className="license-section-content-item">
<div className="license-section-content-item-title-action">
<span>License key</span>
- <span style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+ <span style={{ display: 'flex', alignItems: 'center' }}>
<Typography.Text code>{getMaskedKey(licenseKey)}</Typography.Text>
<Button
- variant="link"
- color="none"
+ size="sm"
+ variant="outlined"
+ color="secondary"
aria-label="Copy license key"
- data-testid="license-key-copy-btn"
+ testId="license-key-copy-btn"
onClick={(): void => handleCopyKey(licenseKey)}
+ icon
>
<Copy size={14} />
</Button>
diff --git a/frontend/src/container/MySettings/TimezoneAdaptation/TimezoneAdaptation.tsx b/frontend/src/container/MySettings/TimezoneAdaptation/TimezoneAdaptation.tsx
index a8571886d3..d9addc21d3 100644
--- a/frontend/src/container/MySettings/TimezoneAdaptation/TimezoneAdaptation.tsx
+++ b/frontend/src/container/MySettings/TimezoneAdaptation/TimezoneAdaptation.tsx
@@ -21,11 +21,6 @@ function TimezoneAdaptation(): JSX.Element {
[timezone, browserTimezone],
);
- const getSwitchStyles = (): React.CSSProperties => ({
- backgroundColor:
- isAdaptationEnabled && isTimezoneOverridden ? Color.BG_AMBER_400 : undefined,
- });
-
const handleOverrideClear = (): void => {
updateTimezone(browserTimezone);
logEvent('Account Settings: Timezone override cleared', {});
@@ -49,9 +44,10 @@ function TimezoneAdaptation(): JSX.Element {
<div className="timezone-adaption__header">
<h2 className="timezone-adaption__title">Adapt to my timezone</h2>
<Switch
+ color={isAdaptationEnabled && isTimezoneOverridden ? 'warning' : 'primary'}
+ textPlacement="right"
value={isAdaptationEnabled}
onChange={handleSwitchChange}
- style={getSwitchStyles()}
testId="timezone-adaptation-switch"
/>
</div>
diff --git a/frontend/src/container/MySettings/__tests__/MySettings.test.tsx b/frontend/src/container/MySettings/__tests__/MySettings.test.tsx
index 3c822de586..baa0c1c9aa 100644
--- a/frontend/src/container/MySettings/__tests__/MySettings.test.tsx
+++ b/frontend/src/container/MySettings/__tests__/MySettings.test.tsx
@@ -129,15 +129,15 @@ describe('MySettings Flows', () => {
it('Should have Dark theme selected by default', async () => {
const themeSelector = screen.getByTestId(THEME_SELECTOR_TEST_ID);
- const darkOption = within(themeSelector).getByRole('radio', {
+ const darkOption = within(themeSelector).getByRole('button', {
name: /Dark/,
});
- expect(darkOption).toBeChecked();
+ expect(darkOption).toHaveAttribute('aria-pressed', 'true');
});
it('Should switch theme and log event when Light theme is selected', async () => {
const themeSelector = screen.getByTestId(THEME_SELECTOR_TEST_ID);
- const lightOption = within(themeSelector).getByRole('radio', {
+ const lightOption = within(themeSelector).getByRole('button', {
name: /Light/,
});
diff --git a/frontend/src/container/MySettings/index.tsx b/frontend/src/container/MySettings/index.tsx
index e24f976164..8e2f33b8d7 100644
--- a/frontend/src/container/MySettings/index.tsx
+++ b/frontend/src/container/MySettings/index.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
import { useMutation } from 'react-query';
import { Badge } from '@signozhq/ui/badge';
import { Switch } from '@signozhq/ui/switch';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import setLocalStorageApi from 'api/browser/localstorage/set';
import logEvent from 'api/common/logEvent';
import updateUserPreference from 'api/v1/user/preferences/name/update';
@@ -65,7 +65,9 @@ function MySettings(): JSX.Element {
label: (
<div className="theme-option">
<Sun size={12} data-testid="light-theme-icon" /> Light{' '}
- <Badge color="robin">Beta</Badge>
+ <Badge variant="solid" color="primary">
+ Beta
+ </Badge>
</div>
),
value: 'light',
@@ -186,11 +188,14 @@ function MySettings(): JSX.Element {
<div className="user-preference-section-content-item theme-selector">
<div className="user-preference-section-content-item-title-action">
Select your theme
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
onChange={handleThemeChange}
value={theme}
- data-testid="theme-selector"
+ testId="theme-selector"
items={themeOptions}
/>
</div>
@@ -216,9 +221,12 @@ function MySettings(): JSX.Element {
<div className="user-preference-section-content-item-title-action">
Keep the primary sidebar always open{' '}
<Switch
+ color="primary"
+ textPlacement="right"
value={sideNavPinned}
onChange={handleSideNavPinnedChange}
disabled={isUpdatingUserPreference}
+ disabledTooltip="Saving your preference"
testId="side-nav-pinned-switch"
/>
</div>
diff --git a/frontend/src/container/OnboardingQuestionaire/AboutSigNozQuestions/AboutSigNozQuestions.tsx b/frontend/src/container/OnboardingQuestionaire/AboutSigNozQuestions/AboutSigNozQuestions.tsx
index 8a849d5ad4..6127dbbb6e 100644
--- a/frontend/src/container/OnboardingQuestionaire/AboutSigNozQuestions/AboutSigNozQuestions.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/AboutSigNozQuestions/AboutSigNozQuestions.tsx
@@ -101,6 +101,16 @@ export function AboutSigNozQuestions({
handleInterestChange(option, Boolean(checked));
};
+ const getNextDisabledReason = (): string => {
+ if (discoverSignoz === '') {
+ return 'Tell us how you first came across SigNoz';
+ }
+ if (interestInSignoz.length === 0) {
+ return 'Select what got you interested in SigNoz';
+ }
+ return 'Describe what got you interested in SigNoz';
+ };
+
const handleOnNext = (): void => {
setSignozDetails({
discoverSignoz,
@@ -145,6 +155,7 @@ export function AboutSigNozQuestions({
{shuffledOptionKeys.map((option: string) => (
<div key={option} className="checkbox-item">
<Checkbox
+ color="primary"
id={`checkbox-${option}`}
value={interestInSignoz.includes(option)}
onChange={createInterestChangeHandler(option)}
@@ -156,6 +167,7 @@ export function AboutSigNozQuestions({
<div className="checkbox-item checkbox-item-others">
<Checkbox
+ color="primary"
id="others-checkbox"
value={interestInSignoz.includes('Others')}
onChange={createInterestChangeHandler('Others')}
@@ -179,11 +191,13 @@ export function AboutSigNozQuestions({
<div className="onboarding-buttons-container">
<Button
+ size="md"
variant="solid"
color="primary"
- className={`onboarding-next-button ${isNextDisabled ? 'disabled' : ''}`}
+ width="100%"
onClick={handleOnNext}
disabled={isNextDisabled}
+ disabledTooltip={getNextDisabledReason()}
suffix={<ArrowRight size={12} />}
>
Next
diff --git a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
index c71ff68d01..26015f2481 100644
--- a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/InviteTeamMembers.tsx
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { ArrowRight, LoaderCircle } from '@signozhq/icons';
+import { ArrowRight } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import logEvent from 'api/common/logEvent';
import InviteMembers from 'components/InviteMembers/InviteMembers';
@@ -115,36 +115,33 @@ function InviteTeamMembers({
showHeader
renderFooter={({ submit, canSubmit, isSubmitting }): JSX.Element => {
const isButtonDisabled = isSubmitting || isLoading;
- const isInviteButtonDisabled = isButtonDisabled || !canSubmit;
return (
<div className="onboarding-buttons-container">
<Button
+ size="md"
variant="solid"
color="primary"
- className={`onboarding-next-button ${
- isInviteButtonDisabled ? 'disabled' : ''
- }`}
+ width="100%"
onClick={submit}
- disabled={isInviteButtonDisabled}
- data-testid="send-invites-button"
- suffix={
- isButtonDisabled ? (
- <LoaderCircle className="animate-spin" size={12} />
- ) : (
- <ArrowRight size={12} />
- )
- }
+ loading={isButtonDisabled}
+ disabled={!canSubmit}
+ disabledTooltip="Add at least one team member to invite"
+ testId="send-invites-button"
+ suffix={<ArrowRight size={12} />}
>
Send Invites
</Button>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className="onboarding-do-later-button"
+ width="100%"
onClick={handleDoLater}
- disabled={isButtonDisabled}
- data-testid="do-later-button"
+ loading={isLoading}
+ disabled={isSubmitting}
+ disabledTooltip="Wait for the invites to be sent"
+ testId="do-later-button"
>
I&apos;ll do this later
</Button>
diff --git a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx
index 7710a36b92..f37aa45ff4 100644
--- a/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/InviteTeamMembers/__tests__/InviteTeamMembers.test.tsx
@@ -114,10 +114,12 @@ describe('InviteTeamMembers', () => {
it('disables buttons when isLoading=true', () => {
renderComponent({ isLoading: true });
- expect(screen.getByRole('button', { name: /send invites/i })).toBeDisabled();
+ expect(
+ screen.getByRole('button', { name: /send invites/i }),
+ ).toHaveAttribute('aria-disabled', 'true');
expect(
screen.getByRole('button', { name: /i'll do this later/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
it('disables Send Invites when canSubmit=false from InviteMembers', () => {
@@ -134,8 +136,14 @@ describe('InviteTeamMembers', () => {
}) as JSX.Element,
);
- expect(getByTestId('send-invites-button')).toBeDisabled();
- expect(getByTestId('do-later-button')).not.toBeDisabled();
+ expect(getByTestId('send-invites-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(getByTestId('do-later-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('disables buttons when isSubmitting=true from InviteMembers', () => {
@@ -152,8 +160,14 @@ describe('InviteTeamMembers', () => {
}) as JSX.Element,
);
- expect(getByTestId('send-invites-button')).toBeDisabled();
- expect(getByTestId('do-later-button')).toBeDisabled();
+ expect(getByTestId('send-invites-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(getByTestId('do-later-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
diff --git a/frontend/src/container/OnboardingQuestionaire/OnboardingQuestionaire.styles.scss b/frontend/src/container/OnboardingQuestionaire/OnboardingQuestionaire.styles.scss
index bbc9672378..69c47e94a6 100644
--- a/frontend/src/container/OnboardingQuestionaire/OnboardingQuestionaire.styles.scss
+++ b/frontend/src/container/OnboardingQuestionaire/OnboardingQuestionaire.styles.scss
@@ -230,69 +230,17 @@
}
}
- .onboarding-next-button {
- width: 100%;
- height: 32px;
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 8px;
- border-radius: 2px;
- background: var(--primary-background);
- border: none;
- color: var(--bg-neutral-dark-50);
- font-family: Inter, sans-serif;
- font-size: 11px;
- font-weight: 500;
- line-height: 1;
- cursor: pointer;
- opacity: 1;
- transition: opacity 0.2s;
-
- &:hover {
- opacity: 0.9;
- }
-
- &.disabled {
- opacity: 0.6;
- cursor: not-allowed;
- pointer-events: none;
- }
- }
-
- .onboarding-do-later-button {
- width: 100%;
- height: 32px;
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: 2px;
- background: transparent;
- border: none;
- color: var(--l2-foreground);
- font-family: Inter, sans-serif;
- font-size: 11px;
- font-weight: 500;
- line-height: 1;
- cursor: pointer;
- transition: opacity 0.2s;
-
- &:hover {
- opacity: 0.8;
- }
-
- &:disabled {
- opacity: 0.5;
- cursor: not-allowed;
- }
- }
-
.form-group {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 12px;
align-self: stretch;
+
+ [role='radiogroup'] {
+ width: 100%;
+ grid-template-columns: 1fr 1fr;
+ }
}
.slider-container {
@@ -453,58 +401,6 @@
}
}
- .observability-tools-radio-container {
- display: flex;
- flex-wrap: wrap;
- gap: 0 12px;
- width: 528px;
-
- .observability-tool-radio-item {
- display: flex;
- align-items: center;
- gap: 8px;
- height: 32px;
- width: calc((528px - 12px) / 2);
- flex: 0 0 calc((528px - 12px) / 2);
-
- label {
- color: var(--l1-foreground);
- font-size: 13px;
- cursor: pointer;
- }
-
- &.observability-tool-others-item {
- .onboarding-questionaire-other-input {
- flex: 1;
- }
- }
- }
- }
-
- .migration-timeline-radio-container,
- .opentelemetry-radio-container {
- display: flex;
- flex-wrap: wrap;
- gap: 0 12px;
- width: 528px;
-
- .migration-timeline-radio-item,
- .opentelemetry-radio-item {
- display: flex;
- align-items: center;
- gap: 8px;
- height: 32px;
- width: calc((528px - 12px) / 2);
- flex: 0 0 calc((528px - 12px) / 2);
-
- label {
- color: var(--l1-foreground);
- font-size: 13px;
- cursor: pointer;
- }
- }
- }
-
.checkbox-grid {
display: flex;
flex-direction: column;
diff --git a/frontend/src/container/OnboardingQuestionaire/OptimiseSignozNeeds/OptimiseSignozNeeds.tsx b/frontend/src/container/OnboardingQuestionaire/OptimiseSignozNeeds/OptimiseSignozNeeds.tsx
index 8582d643b2..2217de3e2d 100644
--- a/frontend/src/container/OnboardingQuestionaire/OptimiseSignozNeeds/OptimiseSignozNeeds.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/OptimiseSignozNeeds/OptimiseSignozNeeds.tsx
@@ -3,7 +3,7 @@ import { Button } from '@signozhq/ui/button';
import { Slider } from '@signozhq/ui/slider';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
-import { ArrowRight, LoaderCircle, Minus } from '@signozhq/icons';
+import { ArrowRight, Minus } from '@signozhq/icons';
import { OnboardingQuestionHeader } from '../OnboardingQuestionHeader';
@@ -284,29 +284,25 @@ function OptimiseSignozNeeds({
<div className="onboarding-buttons-container">
<Button
+ size="md"
variant="solid"
color="primary"
- className={`onboarding-next-button ${
- isUpdatingProfile || isNextDisabled ? 'disabled' : ''
- }`}
+ width="100%"
onClick={handleOnNext}
- disabled={isUpdatingProfile || isNextDisabled}
- suffix={
- isUpdatingProfile ? (
- <LoaderCircle className="animate-spin" size={12} />
- ) : (
- <ArrowRight size={12} />
- )
- }
+ loading={isUpdatingProfile}
+ disabled={isNextDisabled}
+ disabledTooltip="Set at least one of the values above"
+ suffix={<ArrowRight size={12} />}
>
Next
</Button>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className="onboarding-do-later-button"
+ width="100%"
onClick={handleWillDoLater}
- disabled={isUpdatingProfile}
+ loading={isUpdatingProfile}
>
I&apos;ll do this later
</Button>
diff --git a/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx b/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx
index f4b25537eb..adafa000d6 100644
--- a/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/OrgQuestions/OrgQuestions.tsx
@@ -1,11 +1,7 @@
import { useEffect, useState } from 'react';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import {
- RadioGroup,
- RadioGroupItem,
- RadioGroupLabel,
-} from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
import { ArrowRight } from '@signozhq/icons';
@@ -94,6 +90,19 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
);
};
+ const getNextDisabledReason = (): string => {
+ if (!observabilityTool) {
+ return 'Select the observability tool you use';
+ }
+ if (observabilityTool === 'Others' && otherTool === '') {
+ return 'Enter the observability tool you use';
+ }
+ if (showMigrationQuestion && migrationTimeline === null) {
+ return 'Select your migration timeline';
+ }
+ return 'Tell us if you already use OpenTelemetry';
+ };
+
useEffect(() => {
const isValidObservability = isValidUsesObservability();
const isMigrationValid = !showMigrationQuestion || migrationTimeline !== null;
@@ -145,41 +154,29 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
Which observability tool do you currently use?
</label>
<RadioGroup
- value={observabilityTool || ''}
+ color="primary"
+ textOverflow="visible"
+ value={observabilityTool}
onChange={handleObservabilityToolChange}
- className="observability-tools-radio-container"
- >
- {Object.entries(observabilityTools).map(([tool, label]) => {
- if (tool === 'Others') {
- return (
- <div
- key={tool}
- className="radio-item observability-tool-radio-item observability-tool-others-item"
- >
- <RadioGroupItem value={tool} id={`radio-${tool}`} />
- {observabilityTool === 'Others' ? (
- <Input
- type="text"
- className="onboarding-questionaire-other-input"
- placeholder="What tool do you currently use?"
- value={otherTool || ''}
- autoFocus
- onChange={(e): void => setOtherTool(e.target.value)}
- />
- ) : (
- <RadioGroupLabel htmlFor={`radio-${tool}`}>{label}</RadioGroupLabel>
- )}
- </div>
- );
- }
- return (
- <div key={tool} className="radio-item observability-tool-radio-item">
- <RadioGroupItem value={tool} id={`radio-${tool}`} />
- <RadioGroupLabel htmlFor={`radio-${tool}`}>{label}</RadioGroupLabel>
- </div>
- );
- })}
- </RadioGroup>
+ items={Object.entries(observabilityTools).map(([tool, label]) => ({
+ value: tool,
+ label:
+ tool === 'Others' && observabilityTool === 'Others' ? (
+ <Input
+ type="text"
+ className="onboarding-questionaire-other-input"
+ placeholder="What tool do you currently use?"
+ value={otherTool || ''}
+ autoFocus
+ style={{ userSelect: 'text' }}
+ onKeyDown={(e): void => e.stopPropagation()}
+ onChange={(e): void => setOtherTool(e.target.value)}
+ />
+ ) : (
+ label
+ ),
+ }))}
+ />
</div>
{showMigrationQuestion && (
@@ -188,47 +185,39 @@ function OrgQuestions({ orgDetails, onNext }: OrgQuestionsProps): JSX.Element {
What is your timeline for migrating to SigNoz?
</div>
<RadioGroup
- value={migrationTimeline || ''}
+ color="primary"
+ value={migrationTimeline}
onChange={setMigrationTimeline}
- className="migration-timeline-radio-container"
- >
- {Object.entries(migrationTimelineOptions).map(([key, label]) => (
- <div key={key} className="radio-item migration-timeline-radio-item">
- <RadioGroupItem value={key} id={`radio-migration-${key}`} />
- <RadioGroupLabel htmlFor={`radio-migration-${key}`}>
- {label}
- </RadioGroupLabel>
- </div>
- ))}
- </RadioGroup>
+ items={Object.entries(migrationTimelineOptions).map(([key, label]) => ({
+ value: key,
+ label,
+ }))}
+ />
</div>
)}
<div className="form-group">
<div className="question">Do you already use OpenTelemetry?</div>
<RadioGroup
- value={usesOtel === true ? 'yes' : usesOtel === false ? 'no' : ''}
+ color="primary"
+ value={usesOtel === true ? 'yes' : usesOtel === false ? 'no' : null}
onChange={handleOtelChange}
- className="opentelemetry-radio-container"
- >
- <div className="radio-item opentelemetry-radio-item">
- <RadioGroupItem value="yes" id="radio-otel-yes" />
- <RadioGroupLabel htmlFor="radio-otel-yes">Yes</RadioGroupLabel>
- </div>
- <div className="radio-item opentelemetry-radio-item">
- <RadioGroupItem value="no" id="radio-otel-no" />
- <RadioGroupLabel htmlFor="radio-otel-no">No</RadioGroupLabel>
- </div>
- </RadioGroup>
+ items={[
+ { value: 'yes', label: 'Yes' },
+ { value: 'no', label: 'No' },
+ ]}
+ />
</div>
</div>
<Button
+ size="md"
variant="solid"
color="primary"
- className={`onboarding-next-button ${isNextDisabled ? 'disabled' : ''}`}
+ width="100%"
onClick={handleNext}
disabled={isNextDisabled}
+ disabledTooltip={getNextDisabledReason()}
suffix={<ArrowRight size={12} />}
>
Next
diff --git a/frontend/src/container/OnboardingQuestionaire/__tests__/OnboardingQuestionaire.test.tsx b/frontend/src/container/OnboardingQuestionaire/__tests__/OnboardingQuestionaire.test.tsx
index 77b1ff55e5..18732210e1 100644
--- a/frontend/src/container/OnboardingQuestionaire/__tests__/OnboardingQuestionaire.test.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/__tests__/OnboardingQuestionaire.test.tsx
@@ -83,29 +83,29 @@ describe('OnboardingQuestionaire Component', () => {
render(<OnboardingQuestionaire />);
const nextButton = screen.getByRole('button', { name: /next/i });
- expect(nextButton).toBeDisabled();
+ expect(nextButton).toHaveAttribute('aria-disabled', 'true');
});
it('enables next button when all required fields are filled', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
render(<OnboardingQuestionaire />);
- const datadogCheckbox = screen.getByLabelText(/datadog/i);
+ const datadogCheckbox = screen.getByRole('radio', { name: /datadog/i });
await user.click(datadogCheckbox);
const otelYes = screen.getByRole('radio', { name: /yes/i });
await user.click(otelYes);
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
const nextButton = await screen.findByRole('button', { name: /next/i });
- expect(nextButton).not.toBeDisabled();
+ expect(nextButton).not.toHaveAttribute('aria-disabled', 'true');
});
it('shows other tool input when Others is selected', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
render(<OnboardingQuestionaire />);
- const othersCheckbox = screen.getByLabelText(/^others$/i);
+ const othersCheckbox = screen.getByRole('radio', { name: /^others$/i });
await user.click(othersCheckbox);
await expect(
@@ -122,7 +122,7 @@ describe('OnboardingQuestionaire Component', () => {
screen.queryByText(/What is your timeline for migrating to SigNoz/i),
).not.toBeInTheDocument();
- const datadogCheckbox = screen.getByLabelText(/datadog/i);
+ const datadogCheckbox = screen.getByRole('radio', { name: /datadog/i });
await user.click(datadogCheckbox);
await expect(
@@ -130,7 +130,9 @@ describe('OnboardingQuestionaire Component', () => {
).resolves.toBeInTheDocument();
// Not visible when None is selected
- const noneCheckbox = screen.getByLabelText(/none\/starting fresh/i);
+ const noneCheckbox = screen.getByRole('radio', {
+ name: /none\/starting fresh/i,
+ });
await user.click(noneCheckbox);
expect(
@@ -142,9 +144,9 @@ describe('OnboardingQuestionaire Component', () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
render(<OnboardingQuestionaire />);
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
const nextButton = screen.getByRole('button', { name: /next/i });
await user.click(nextButton);
@@ -162,9 +164,9 @@ describe('OnboardingQuestionaire Component', () => {
// Navigate to step 2
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
@@ -181,14 +183,14 @@ describe('OnboardingQuestionaire Component', () => {
// Navigate to step 2
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await waitFor(() => {
const nextButton = screen.getByRole('button', { name: /next/i });
- expect(nextButton).toBeDisabled();
+ expect(nextButton).toHaveAttribute('aria-disabled', 'true');
});
});
@@ -198,9 +200,9 @@ describe('OnboardingQuestionaire Component', () => {
// Navigate to step 2
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
@@ -212,13 +214,13 @@ describe('OnboardingQuestionaire Component', () => {
);
await user.type(discoverInput, 'Found via Google search');
- const interestCheckbox = screen.getByLabelText(
- /lowering observability costs/i,
- );
+ const interestCheckbox = screen.getByRole('checkbox', {
+ name: /lowering observability costs/i,
+ });
await user.click(interestCheckbox);
const nextButton = await screen.findByRole('button', { name: /next/i });
- expect(nextButton).not.toBeDisabled();
+ expect(nextButton).not.toHaveAttribute('aria-disabled', 'true');
});
it('shows other interest input when Others checkbox is selected', async () => {
@@ -227,16 +229,16 @@ describe('OnboardingQuestionaire Component', () => {
// Navigate to step 2
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
screen.findByText(/what got you interested in signoz/i, {}),
).resolves.toBeInTheDocument();
- const othersCheckbox = screen.getByLabelText(/^others$/i);
+ const othersCheckbox = screen.getByRole('checkbox', { name: /^others$/i });
await user.click(othersCheckbox);
await expect(
@@ -252,9 +254,9 @@ describe('OnboardingQuestionaire Component', () => {
// Navigate through steps 1 and 2
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
@@ -265,7 +267,9 @@ describe('OnboardingQuestionaire Component', () => {
screen.getByPlaceholderText(/e\.g\., I asked ChatGPT/i),
'Found via Google',
);
- await user.click(screen.getByLabelText(/lowering observability costs/i));
+ await user.click(
+ screen.getByRole('checkbox', { name: /lowering observability costs/i }),
+ );
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
@@ -293,16 +297,18 @@ describe('OnboardingQuestionaire Component', () => {
render(<OnboardingQuestionaire />);
// Navigate to step 3
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await user.type(
await screen.findByPlaceholderText(/e\.g\., I asked ChatGPT/i),
'Found via Google',
);
- await user.click(screen.getByLabelText(/lowering observability costs/i));
+ await user.click(
+ screen.getByRole('checkbox', { name: /lowering observability costs/i }),
+ );
await user.click(screen.getByRole('button', { name: /next/i }));
// Click "I'll do this later" on step 3 — triggers PUT /zeus/profiles
@@ -325,9 +331,9 @@ describe('OnboardingQuestionaire Component', () => {
// Navigate to step 3
- await user.click(screen.getByLabelText(/datadog/i));
+ await user.click(screen.getByRole('radio', { name: /datadog/i }));
await user.click(screen.getByRole('radio', { name: /yes/i }));
- await user.click(screen.getByLabelText(/just exploring/i));
+ await user.click(screen.getByRole('radio', { name: /just exploring/i }));
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
@@ -338,7 +344,9 @@ describe('OnboardingQuestionaire Component', () => {
screen.getByPlaceholderText(/e\.g\., I asked ChatGPT/i),
'Found via Google',
);
- await user.click(screen.getByLabelText(/lowering observability costs/i));
+ await user.click(
+ screen.getByRole('checkbox', { name: /lowering observability costs/i }),
+ );
await user.click(screen.getByRole('button', { name: /next/i }));
await expect(
diff --git a/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx b/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx
index 81b4246835..119a8446d9 100644
--- a/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx
+++ b/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx
@@ -1178,6 +1178,7 @@ function OnboardingAddDataSource(): JSX.Element {
renderFooter={({ submit, canSubmit, isSubmitting }): JSX.Element => (
<div className="invite-team-member-modal-footer">
<SignozButton
+ size="md"
variant="solid"
color="secondary"
onClick={(): void => setShowInviteTeamMembersModal(false)}
@@ -1185,6 +1186,8 @@ function OnboardingAddDataSource(): JSX.Element {
Cancel
</SignozButton>
<SignozButton
+ size="md"
+ color="primary"
variant="solid"
onClick={(): void => {
void logEvent(
@@ -1194,6 +1197,7 @@ function OnboardingAddDataSource(): JSX.Element {
void submit();
}}
disabled={!canSubmit}
+ disabledTooltip="Add at least one team member to invite"
loading={isSubmitting}
suffix={<ArrowRight size={14} />}
>
diff --git a/frontend/src/container/OptionsMenu/FormatField/FormatField.styles.scss b/frontend/src/container/OptionsMenu/FormatField/FormatField.styles.scss
deleted file mode 100644
index ef0fd3a1b5..0000000000
--- a/frontend/src/container/OptionsMenu/FormatField/FormatField.styles.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.format-field-toggle-group {
- display: flex;
- text-align: center;
-
- > button {
- font-size: 0.75rem;
- flex: 1;
- }
-}
diff --git a/frontend/src/container/OptionsMenu/FormatField/index.tsx b/frontend/src/container/OptionsMenu/FormatField/index.tsx
index bd5da6818d..9d805bd9e8 100644
--- a/frontend/src/container/OptionsMenu/FormatField/index.tsx
+++ b/frontend/src/container/OptionsMenu/FormatField/index.tsx
@@ -1,8 +1,6 @@
-import './FormatField.styles.scss';
-
import { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { FieldTitle } from '../styles';
import { LogViewMode, OptionsMenuConfig } from '../types';
@@ -29,12 +27,13 @@ function FormatField({ config }: FormatFieldProps): JSX.Element | null {
return (
<FormatFieldWrapper direction="vertical">
<FieldTitle>{t('options_menu.format')}</FieldTitle>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
size="sm"
value={config.value}
onChange={onChange}
- className="format-field-toggle-group"
items={[
{ value: 'raw', label: t('options_menu.raw') },
{ value: 'list', label: t('options_menu.default') },
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/AuthDomain.styles.scss b/frontend/src/container/OrganizationSettings/AuthDomain/AuthDomain.styles.scss
index 5e1b4d78ae..b6db0577fe 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/AuthDomain.styles.scss
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/AuthDomain.styles.scss
@@ -21,25 +21,6 @@
display: flex;
flex-direction: row;
gap: 24px;
-
- .auth-domain-list-action-link {
- cursor: pointer;
- color: var(--primary);
- transition: color 0.3s;
- border: none;
- background: none;
- padding: 0;
- font-size: inherit;
-
- &:hover {
- opacity: 0.8;
- text-decoration: underline;
- }
-
- &.delete {
- color: var(--destructive);
- }
- }
}
.auth-domain-list-na {
@@ -54,3 +35,7 @@
margin: 0;
}
}
+
+.auth-domain-delete-modal .ant-modal-footer {
+ gap: 12px;
+}
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/CreateEdit.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/CreateEdit.tsx
index c779f8efe1..18b4570ccc 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/CreateEdit.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/CreateEdit.tsx
@@ -191,6 +191,7 @@ function CreateOrEdit(props: CreateOrEditProps): JSX.Element {
<section className="action-buttons">
{isCreate && (
<Button
+ size="md"
onClick={onBackHandler}
variant="solid"
color="secondary"
@@ -201,6 +202,7 @@ function CreateOrEdit(props: CreateOrEditProps): JSX.Element {
)}
{!isCreate && (
<Button
+ size="md"
onClick={onClose}
variant="solid"
color="secondary"
@@ -210,6 +212,7 @@ function CreateOrEdit(props: CreateOrEditProps): JSX.Element {
</Button>
)}
<Button
+ size="md"
onClick={onSubmitHandler}
variant="solid"
color="primary"
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnGoogleAuth.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnGoogleAuth.tsx
index f3a59925bb..a41f996854 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnGoogleAuth.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnGoogleAuth.tsx
@@ -146,6 +146,7 @@ function ConfigureGoogleAuthAuthnProvider({
noStyle
>
<Checkbox
+ color="primary"
id="google-skip-email-verification"
testId="google-auth-skip-email-verified"
onChange={(checked: boolean): void => {
@@ -228,6 +229,7 @@ function ConfigureGoogleAuthAuthnProvider({
noStyle
>
<Checkbox
+ color="primary"
id="google-fetch-groups"
testId="google-auth-fetch-groups"
onChange={(checked: boolean): void => {
@@ -279,6 +281,7 @@ function ConfigureGoogleAuthAuthnProvider({
noStyle
>
<Checkbox
+ color="primary"
id="google-transitive-membership"
testId="google-auth-transitive-membership"
onChange={(checked: boolean): void => {
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnOIDC.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnOIDC.tsx
index 8e6baf3518..d31ada1c4e 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnOIDC.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnOIDC.tsx
@@ -149,6 +149,7 @@ function ConfigureOIDCAuthnProvider({
noStyle
>
<Checkbox
+ color="primary"
id="oidc-skip-email-verification"
onChange={(checked: boolean): void => {
form.setFieldValue(
@@ -172,6 +173,7 @@ function ConfigureOIDCAuthnProvider({
noStyle
>
<Checkbox
+ color="primary"
id="oidc-get-user-info"
onChange={(checked: boolean): void => {
form.setFieldValue(['oidcConfig', 'getUserInfo'], checked);
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnSAML.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnSAML.tsx
index 1f95518b32..e5cfeb8110 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnSAML.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/AuthnSAML.tsx
@@ -146,6 +146,7 @@ function ConfigureSAMLAuthnProvider({
noStyle
>
<Checkbox
+ color="primary"
id="saml-skip-signing"
onChange={(checked: boolean): void => {
form.setFieldValue(
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/Providers.styles.scss b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/Providers.styles.scss
index 1246bfc48b..4e92321d21 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/Providers.styles.scss
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/Providers.styles.scss
@@ -136,16 +136,6 @@
}
}
- button[role='checkbox'] {
- border: 1px solid var(--l2-foreground) !important;
- border-radius: 2px;
-
- &[data-state='checked'] {
- background-color: var(--primary) !important;
- border-color: var(--primary) !important;
- }
- }
-
&__collapse {
background: transparent !important;
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.styles.scss b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.styles.scss
index 2ccdfafca5..1faec606c2 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.styles.scss
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.styles.scss
@@ -39,54 +39,4 @@
&__field {
flex: 1;
}
-
- &__remove-btn {
- flex-shrink: 0;
- width: 32px !important;
- height: 32px !important;
- min-width: 32px !important;
- padding: 0 !important;
- border: none !important;
- border-radius: 2px !important;
- background: transparent !important;
- color: var(--destructive) !important;
- opacity: 0.6 !important;
- cursor: pointer;
- transition:
- background-color 0.2s,
- opacity 0.2s;
- box-shadow: none !important;
- display: flex;
- align-items: center;
- justify-content: center;
-
- svg {
- color: var(--destructive) !important;
- width: 12px !important;
- height: 12px !important;
- }
-
- &:hover {
- background: color-mix(
- in srgb,
- var(--danger-background) 10%,
- transparent
- ) !important;
- opacity: 0.9 !important;
- color: var(--destructive) !important;
-
- svg {
- color: var(--destructive) !important;
- }
- }
-
- &:active {
- opacity: 0.7 !important;
- background: color-mix(
- in srgb,
- var(--danger-background) 15%,
- transparent
- ) !important;
- }
- }
}
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.tsx
index ebda24ebf0..d9bf908f2d 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/DomainMappingList.tsx
@@ -58,11 +58,12 @@ function DomainMappingList({
</Form.Item>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className="domain-mapping-list__remove-btn"
onClick={(): void => remove(field.name)}
aria-label="Remove mapping"
+ icon
>
<Trash2 size={12} />
</Button>
@@ -70,6 +71,7 @@ function DomainMappingList({
))}
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={(): void => add({ domain: '', adminEmail: '' })}
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.styles.scss b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.styles.scss
index 71593fec10..e6b39ed057 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.styles.scss
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.styles.scss
@@ -167,56 +167,6 @@
}
}
- &__remove-btn {
- flex-shrink: 0;
- width: 32px !important;
- height: 32px !important;
- min-width: 32px !important;
- padding: 0 !important;
- border: none !important;
- border-radius: 2px !important;
- background: transparent !important;
- color: var(--destructive) !important;
- opacity: 0.6 !important;
- cursor: pointer;
- transition:
- background-color 0.2s,
- opacity 0.2s;
- box-shadow: none !important;
- display: flex;
- align-items: center;
- justify-content: center;
-
- svg {
- color: var(--destructive) !important;
- width: 12px !important;
- height: 12px !important;
- }
-
- &:hover {
- background: color-mix(
- in srgb,
- var(--danger-background) 10%,
- transparent
- ) !important;
- opacity: 0.9 !important;
- color: var(--destructive) !important;
-
- svg {
- color: var(--destructive) !important;
- }
- }
-
- &:active {
- opacity: 0.7 !important;
- background: color-mix(
- in srgb,
- var(--danger-background) 15%,
- transparent
- ) !important;
- }
- }
-
&__add-btn {
width: 100%;
@@ -238,17 +188,6 @@
}
}
- // --- Checkbox border visibility ---
- button[role='checkbox'] {
- border: 1px solid var(--l2-foreground) !important;
- border-radius: 2px;
-
- &[data-state='checked'] {
- background-color: var(--primary) !important;
- border-color: var(--primary) !important;
- }
- }
-
// todo: https://github.com/SigNoz/components/issues/116
input:not(.ant-select-selection-search-input) {
height: 32px;
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.tsx
index d50c45d3ac..772951de6e 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/CreateEdit/Providers/components/RoleMappingSection.tsx
@@ -138,6 +138,7 @@ function RoleMappingSection({
noStyle
>
<Checkbox
+ color="primary"
id="use-role-attribute"
testId="role-mapping-use-role-attribute"
onChange={(checked: boolean): void => {
@@ -203,12 +204,13 @@ function RoleMappingSection({
</Form.Item>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className="role-mapping-section__remove-btn"
onClick={(): void => remove(field.name)}
aria-label="Remove mapping"
testId="role-mapping-remove"
+ icon
>
<Trash2 size={12} />
</Button>
@@ -216,6 +218,7 @@ function RoleMappingSection({
))}
<Button
+ size="md"
variant="outlined"
color="secondary"
onClick={(): void =>
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/SSOEnforcementToggle.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/SSOEnforcementToggle.tsx
index c8bc6e1542..fe53af05e5 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/SSOEnforcementToggle.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/SSOEnforcementToggle.tsx
@@ -61,7 +61,10 @@ function SSOEnforcementToggle({
return (
<Switch
+ color="primary"
+ textPlacement="right"
disabled={isLoading}
+ disabledTooltip="Saving the SSO enforcement setting"
value={isChecked}
onChange={onChangeHandler}
testId="auth-domain-enforce-sso"
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/__tests__/CreateEdit.test.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/__tests__/CreateEdit.test.tsx
index 402f86df01..480036908d 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/__tests__/CreateEdit.test.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/__tests__/CreateEdit.test.tsx
@@ -136,7 +136,7 @@ describe('CreateEdit Modal', () => {
await waitFor(() => {
expect(screen.getByText(/domain is required/i)).toBeInTheDocument();
});
- });
+ }, 15000);
});
describe('Google Auth Provider', () => {
diff --git a/frontend/src/container/OrganizationSettings/AuthDomain/index.tsx b/frontend/src/container/OrganizationSettings/AuthDomain/index.tsx
index f9f601e5b4..5c69952f1b 100644
--- a/frontend/src/container/OrganizationSettings/AuthDomain/index.tsx
+++ b/frontend/src/container/OrganizationSettings/AuthDomain/index.tsx
@@ -154,7 +154,8 @@ function AuthDomain(): JSX.Element {
render: (_, record: AuthtypesGettableAuthDomainDTO): JSX.Element => (
<section className="auth-domain-list-column-action">
<Button
- className="auth-domain-list-action-link"
+ size="md"
+ color="primary"
onClick={(): void => setRecord(record)}
variant="link"
testId="auth-domain-configure"
@@ -162,7 +163,8 @@ function AuthDomain(): JSX.Element {
Configure {SSOType.get(record.config?.kind || '')}
</Button>
<Button
- className="auth-domain-list-action-link delete"
+ size="md"
+ color="danger"
onClick={(): void => showDeleteModal(record)}
variant="link"
testId="auth-domain-delete"
@@ -228,7 +230,7 @@ function AuthDomain(): JSX.Element {
)}
<Modal
- className="delete-ingestion-key-modal"
+ className="delete-ingestion-key-modal auth-domain-delete-modal"
title={<span className="title">Delete Domain</span>}
open={isDeleteModalOpen}
closable
@@ -236,19 +238,23 @@ function AuthDomain(): JSX.Element {
destroyOnClose
footer={[
<Button
+ size="md"
+ variant="solid"
+ color="secondary"
key="cancel"
onClick={hideDeleteModal}
- className="cancel-btn"
prefix={<X size={16} />}
testId="auth-domain-delete-cancel"
>
Cancel
</Button>,
<Button
+ size="md"
+ variant="solid"
+ color="danger"
key="submit"
prefix={<Trash2 size={16} />}
onClick={handleDeleteDomain}
- className="delete-btn"
loading={isLoading}
testId="auth-domain-delete-confirm"
>
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewPipeline/index.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewPipeline/index.tsx
index a87f0e374e..d40daa6894 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewPipeline/index.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewPipeline/index.tsx
@@ -111,7 +111,9 @@ function AddNewPipeline({
<Form.Item>
<ModalButtonWrapper>
<Button
+ size="md"
key="submit"
+ type="submit"
variant="solid"
color="primary"
onClick={onOkModalHandler}
@@ -119,6 +121,7 @@ function AddNewPipeline({
{isEdit ? t('update') : t('create')}
</Button>
<Button
+ size="md"
key="cancel"
variant="solid"
color="secondary"
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx
index 4b4d8649b4..59a0cbb34b 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx
@@ -60,7 +60,12 @@ function JsonFlattening({
initialValue={isAdd ? true : selectedProcessorData?.enable_paths}
>
<Space>
- <Switch value={enablePaths} onChange={handleEnablePathsChange} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ value={!!enablePaths}
+ onChange={handleEnablePathsChange}
+ />
Enable Paths
</Space>
</Form.Item>
@@ -77,7 +82,12 @@ function JsonFlattening({
<Form.Item className="json-flattening-form__item">
<Space>
- <Switch value={enableMapping} onChange={handleEnableMappingChange} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ value={enableMapping}
+ onChange={handleEnableMappingChange}
+ />
<Flex gap="8px" align="center">
Enable Mapping
<Tooltip title="The order of filled keys will determine the priority of keys i.e. earlier keys have higher precedence">
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx
index b7ae608cc2..0d561c0ae0 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx
@@ -95,6 +95,8 @@ function ProcessorFieldInput({
>
<Space>
<Switch
+ color="primary"
+ textPlacement="right"
value={form.getFieldValue('enable_flattening')}
onChange={(checked: boolean): void => {
form.setFieldValue('enable_flattening', checked);
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/styles.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/styles.tsx
index 1069ca8e8f..99a90abe4c 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/styles.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/styles.tsx
@@ -8,7 +8,11 @@ export function PipelineIndexIcon({
}: {
children: ReactNode;
}): JSX.Element {
- return <Badge color="robin">{children}</Badge>;
+ return (
+ <Badge variant="solid" color="primary">
+ {children}
+ </Badge>
+ );
}
export const ProcessorTypeWrapper = styled.div`
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/DragAction.tsx b/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/DragAction.tsx
index 700c873bf1..98ffec6dc8 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/DragAction.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/DragAction.tsx
@@ -7,7 +7,12 @@ import { LastActionColumn } from '../styles';
function DragAction({ isEnabled, onChange }: DragActionProps): JSX.Element {
return (
<LastActionColumn>
- <Switch defaultValue={isEnabled} onChange={onChange} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ defaultValue={isEnabled}
+ onChange={onChange}
+ />
<GripVertical size="lg" style={holdIconStyle} />
</LastActionColumn>
);
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/Tags.tsx b/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/Tags.tsx
index cc087fbb1e..01eda1e1df 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/Tags.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/TableComponents/Tags.tsx
@@ -4,7 +4,12 @@ function Tags({ tags }: TagsProps): JSX.Element {
return (
<span>
{tags?.map((tag) => (
- <Badge color="sakura" key={tag}>
+ <Badge
+ textTransform="none"
+ variant="solid"
+ color="highlight-danger"
+ key={tag}
+ >
{tag}
</Badge>
))}
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/config.ts b/frontend/src/container/PipelinePage/PipelineListsView/config.ts
index ac87a9bcd3..138ceeb282 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/config.ts
+++ b/frontend/src/container/PipelinePage/PipelineListsView/config.ts
@@ -38,12 +38,6 @@ export const pipelineFields = [
},
];
-export const tagInputStyle: React.CSSProperties = {
- width: 78,
- verticalAlign: 'top',
- flex: 1,
-};
-
export const pipelineColumns: Array<
ColumnType<PipelineData> | ColumnGroupType<PipelineData>
> = [
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx b/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx
index e6f98cc2d3..8dc600ca32 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/styles.tsx
@@ -41,7 +41,11 @@ export function ProcessorIndexIcon({
}: {
children: ReactNode;
}): JSX.Element {
- return <Badge color="robin">{children}</Badge>;
+ return (
+ <Badge variant="solid" color="primary">
+ {children}
+ </Badge>
+ );
}
export const StyledTable: React.FC<TableProps<any> & { isDarkMode: boolean }> =
diff --git a/frontend/src/container/PipelinePage/components/TagInput.tsx b/frontend/src/container/PipelinePage/components/TagInput.tsx
deleted file mode 100644
index 7ff1d781b0..0000000000
--- a/frontend/src/container/PipelinePage/components/TagInput.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { CircleAlert, CircleX } from '@signozhq/icons';
-import { Button, Input, InputRef, message, Modal, Tooltip } from 'antd';
-import { Badge } from '@signozhq/ui/badge';
-
-import { tagInputStyle } from '../PipelineListsView/config';
-import { TagInputWrapper } from './styles';
-
-function TagInput({
- setTagsListData,
- tagsListData,
- placeHolder,
-}: TagInputProps): JSX.Element {
- const [inputVisible, setInputVisible] = useState(false);
- const [inputValue, setInputValue] = useState<string>('');
- const [editInputIndex, setEditInputIndex] = useState(-1);
- const [editInputValue, setEditInputValue] = useState('');
- const inputRef = useRef<InputRef>(null);
- const editInputRef = useRef<InputRef>(null);
- const { t } = useTranslation(['alerts']);
-
- useEffect(() => {
- if (inputVisible) {
- inputRef.current?.focus();
- }
- }, [inputVisible]);
-
- useEffect(() => {
- editInputRef.current?.focus();
- }, [inputValue]);
-
- const handleClose = (removedTag: string) => (): void => {
- const newTags = tagsListData?.filter((tag) => tag !== removedTag);
- setTagsListData(newTags);
- };
-
- const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
- setInputValue(e.target.value);
- };
-
- const handleInputConfirm = (): void => {
- if (inputValue && tagsListData?.indexOf(inputValue) === -1) {
- setTagsListData([...tagsListData, inputValue]);
- }
- setInputVisible(false);
- setInputValue('');
- };
-
- const handleEditInputChange = (
- e: React.ChangeEvent<HTMLInputElement>,
- ): void => {
- setEditInputValue(e.target.value);
- };
-
- const handleEditInputConfirm = (): void => {
- const newTags = [...tagsListData];
- newTags[editInputIndex] = editInputValue;
- setTagsListData(newTags);
- setEditInputIndex(-1);
- setInputValue('');
- };
-
- const handleClearAll = (): void => {
- Modal.confirm({
- title: 'Confirm',
- icon: <CircleAlert />,
- content: t('remove_label_confirm'),
- onOk() {
- setTagsListData([]);
- message.success(t('remove_label_success'));
- },
- okText: t('button_yes'),
- cancelText: t('button_no'),
- });
- };
-
- const showAllData = tagsListData?.map((tag: string, index: number) => {
- if (editInputIndex === index) {
- return (
- <Input
- ref={editInputRef}
- key={tag}
- style={tagInputStyle}
- value={editInputValue}
- onChange={handleEditInputChange}
- onBlur={handleEditInputConfirm}
- onPressEnter={handleEditInputConfirm}
- />
- );
- }
- const isLongTag = tag.length > 20;
- const tagElem = (
- <Badge
- key={tag}
- color="vanilla"
- style={{ userSelect: 'none' }}
- closable
- onClose={(e): void => {
- e.preventDefault();
- handleClose(tag)();
- }}
- >
- <span
- onDoubleClick={(ev): void => {
- setEditInputIndex(index);
- setEditInputValue(tag);
- ev.preventDefault();
- }}
- >
- {isLongTag ? `${tag.slice(0, 20)}...` : tag}
- </span>
- </Badge>
- );
- return isLongTag ? (
- <Tooltip title={tag} key={tag}>
- {tagElem}
- </Tooltip>
- ) : (
- tagElem
- );
- });
-
- const isButtonVisible = useMemo(
- () => tagsListData?.length || inputValue.length || inputValue,
- [inputValue, tagsListData?.length],
- );
-
- return (
- <TagInputWrapper>
- <Input
- ref={inputRef}
- type="text"
- style={tagInputStyle}
- value={inputValue}
- onChange={handleInputChange}
- onBlur={handleInputConfirm}
- onPressEnter={(e): void => {
- e.preventDefault();
- handleInputConfirm();
- }}
- placeholder={placeHolder}
- prefix={showAllData}
- />
-
- {isButtonVisible ? (
- <Button onClick={handleClearAll} icon={<CircleX />} type="text" />
- ) : null}
- </TagInputWrapper>
- );
-}
-
-interface TagInputProps {
- setTagsListData: (tags: Array<string>) => void;
- tagsListData: Array<string>;
- placeHolder: string;
-}
-
-export default TagInput;
diff --git a/frontend/src/container/PipelinePage/components/styles.ts b/frontend/src/container/PipelinePage/components/styles.ts
deleted file mode 100644
index 32b80acadb..0000000000
--- a/frontend/src/container/PipelinePage/components/styles.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import styled from 'styled-components';
-
-export const TagInputWrapper = styled.div`
- display: flex;
- width: 100%;
-`;
diff --git a/frontend/src/container/PipelinePage/tests/TagInput.test.tsx b/frontend/src/container/PipelinePage/tests/TagInput.test.tsx
deleted file mode 100644
index 826a63a903..0000000000
--- a/frontend/src/container/PipelinePage/tests/TagInput.test.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { I18nextProvider } from 'react-i18next';
-// eslint-disable-next-line no-restricted-imports
-import { Provider } from 'react-redux';
-import { MemoryRouter } from 'react-router-dom';
-import { render } from '@testing-library/react';
-import i18n from 'ReactI18';
-import store from 'store';
-
-import TagInput from '../components/TagInput';
-
-describe('Pipeline Page', () => {
- it('should render TagInput section', () => {
- const { asFragment } = render(
- <MemoryRouter>
- <Provider store={store}>
- <I18nextProvider i18n={i18n}>
- <TagInput setTagsListData={jest.fn()} tagsListData={[]} placeHolder="" />
- </I18nextProvider>
- </Provider>
- </MemoryRouter>,
- );
- expect(asFragment()).toMatchSnapshot();
- });
-});
diff --git a/frontend/src/container/PipelinePage/tests/__snapshots__/DragAction.test.tsx.snap b/frontend/src/container/PipelinePage/tests/__snapshots__/DragAction.test.tsx.snap
index 312602a3a1..0431c5c4b8 100644
--- a/frontend/src/container/PipelinePage/tests/__snapshots__/DragAction.test.tsx.snap
+++ b/frontend/src/container/PipelinePage/tests/__snapshots__/DragAction.test.tsx.snap
@@ -21,25 +21,30 @@ exports[`PipelinePage container test should render DragAction section 1`] = `
<div
class="c0"
>
- <div
- class="_switch-wrapper_1a8sn_6"
+ <span
+ aria-checked="true"
+ class="_switch_1ul3x_1"
+ data-checked=""
+ data-color="primary"
+ data-slot="switch"
+ id="base-ui-:r2:"
+ role="switch"
+ tabindex="0"
>
- <button
- aria-checked="true"
- class="_switch_1a8sn_6"
- data-color="robin"
- data-state="checked"
- id=":r0:"
- role="switch"
- type="button"
- value="on"
- >
- <span
- class="_switch__thumb_1a8sn_71"
- data-state="checked"
- />
- </button>
- </div>
+ <span
+ class="_switch__thumb_1ul3x_90"
+ data-checked=""
+ data-slot="switch-thumb"
+ />
+ </span>
+ <input
+ aria-hidden="true"
+ checked=""
+ id="base-ui-:r3:"
+ style="clip-path: inset(50%); overflow: hidden; white-space: nowrap; border: 0px; padding: 0px; width: 1px; height: 1px; margin: -1px; position: fixed; top: 0px; left: 0px;"
+ tabindex="-1"
+ type="checkbox"
+ />
<svg
style="font-size: 1rem; cursor: move;"
/>
diff --git a/frontend/src/container/PipelinePage/tests/__snapshots__/PipelineExpandView.test.tsx.snap b/frontend/src/container/PipelinePage/tests/__snapshots__/PipelineExpandView.test.tsx.snap
index 84085c24bf..33ae2f9e76 100644
--- a/frontend/src/container/PipelinePage/tests/__snapshots__/PipelineExpandView.test.tsx.snap
+++ b/frontend/src/container/PipelinePage/tests/__snapshots__/PipelineExpandView.test.tsx.snap
@@ -63,13 +63,22 @@ exports[`PipelinePage should render PipelineExpandView section 1`] = `
style="text-align: right;"
>
<span
- class="_badge_1etd5_1"
- data-capitalize="false"
- data-color="robin"
+ class="_badge_u1hg9_1"
+ data-base-ui-tooltip-trigger=""
+ data-color="primary"
+ data-single-char="true"
data-slot="badge"
- data-variant="default"
+ data-text-overflow="ellipsis"
+ data-text-transform="uppercase"
+ data-variant="solid"
+ id="base-ui-:r1:"
>
- 1
+ <span
+ class="_badge__label_u1hg9_133"
+ data-slot="badge-label"
+ >
+ 1
+ </span>
</span>
</td>
<td
@@ -93,13 +102,22 @@ exports[`PipelinePage should render PipelineExpandView section 1`] = `
style="text-align: right;"
>
<span
- class="_badge_1etd5_1"
- data-capitalize="false"
- data-color="robin"
+ class="_badge_u1hg9_1"
+ data-base-ui-tooltip-trigger=""
+ data-color="primary"
+ data-single-char="true"
data-slot="badge"
- data-variant="default"
+ data-text-overflow="ellipsis"
+ data-text-transform="uppercase"
+ data-variant="solid"
+ id="base-ui-:r3:"
>
- 2
+ <span
+ class="_badge__label_u1hg9_133"
+ data-slot="badge-label"
+ >
+ 2
+ </span>
</span>
</td>
<td
@@ -123,13 +141,22 @@ exports[`PipelinePage should render PipelineExpandView section 1`] = `
style="text-align: right;"
>
<span
- class="_badge_1etd5_1"
- data-capitalize="false"
- data-color="robin"
+ class="_badge_u1hg9_1"
+ data-base-ui-tooltip-trigger=""
+ data-color="primary"
+ data-single-char="true"
data-slot="badge"
- data-variant="default"
+ data-text-overflow="ellipsis"
+ data-text-transform="uppercase"
+ data-variant="solid"
+ id="base-ui-:r5:"
>
- 3
+ <span
+ class="_badge__label_u1hg9_133"
+ data-slot="badge-label"
+ >
+ 3
+ </span>
</span>
</td>
<td
diff --git a/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap b/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap
index cf43ddb26e..a6ea733863 100644
--- a/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap
+++ b/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap
@@ -74,7 +74,7 @@ exports[`PipelinePage container test should render PipelinePageLayout section 1`
/>
<div>
<p
- class="_typography_j4pmm_1"
+ class="_typography_i5nbo_1"
data-slot="typography"
data-variant="text"
>
diff --git a/frontend/src/container/PipelinePage/tests/__snapshots__/TagInput.test.tsx.snap b/frontend/src/container/PipelinePage/tests/__snapshots__/TagInput.test.tsx.snap
deleted file mode 100644
index 9cf15a1905..0000000000
--- a/frontend/src/container/PipelinePage/tests/__snapshots__/TagInput.test.tsx.snap
+++ /dev/null
@@ -1,32 +0,0 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-
-exports[`Pipeline Page should render TagInput section 1`] = `
-<DocumentFragment>
- .c0 {
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
- width: 100%;
-}
-
-<div
- class="c0"
- >
- <span
- class="ant-input-affix-wrapper css-dev-only-do-not-override-2i2tap"
- style="width: 78px; vertical-align: top; flex: 1;"
- >
- <span
- class="ant-input-prefix"
- />
- <input
- class="ant-input css-dev-only-do-not-override-2i2tap"
- placeholder=""
- type="text"
- value=""
- />
- </span>
- </div>
-</DocumentFragment>
-`;
diff --git a/frontend/src/container/PipelinePage/tests/__snapshots__/Tags.test.tsx.snap b/frontend/src/container/PipelinePage/tests/__snapshots__/Tags.test.tsx.snap
index cf4f31f6a2..5052ab82b6 100644
--- a/frontend/src/container/PipelinePage/tests/__snapshots__/Tags.test.tsx.snap
+++ b/frontend/src/container/PipelinePage/tests/__snapshots__/Tags.test.tsx.snap
@@ -4,22 +4,38 @@ exports[`PipelinePage container test should render Tags section 1`] = `
<DocumentFragment>
<span>
<span
- class="_badge_1etd5_1"
- data-capitalize="false"
- data-color="sakura"
+ class="_badge_u1hg9_1"
+ data-base-ui-tooltip-trigger=""
+ data-color="highlight-danger"
data-slot="badge"
- data-variant="default"
+ data-text-overflow="ellipsis"
+ data-text-transform="none"
+ data-variant="solid"
+ id="base-ui-:r1:"
>
- server
+ <span
+ class="_badge__label_u1hg9_133"
+ data-slot="badge-label"
+ >
+ server
+ </span>
</span>
<span
- class="_badge_1etd5_1"
- data-capitalize="false"
- data-color="sakura"
+ class="_badge_u1hg9_1"
+ data-base-ui-tooltip-trigger=""
+ data-color="highlight-danger"
data-slot="badge"
- data-variant="default"
+ data-text-overflow="ellipsis"
+ data-text-transform="none"
+ data-variant="solid"
+ id="base-ui-:r3:"
>
- app
+ <span
+ class="_badge__label_u1hg9_133"
+ data-slot="badge-label"
+ >
+ app
+ </span>
</span>
</span>
</DocumentFragment>
diff --git a/frontend/src/container/PlannedDowntime/PlannedDowntime.styles.scss b/frontend/src/container/PlannedDowntime/PlannedDowntime.styles.scss
index 49f52123a8..e65ec04b5b 100644
--- a/frontend/src/container/PlannedDowntime/PlannedDowntime.styles.scss
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntime.styles.scss
@@ -71,6 +71,7 @@
.alert-rule-scope {
margin-bottom: 12px;
+ margin-top: 8px;
// `.createForm label` styles field labels (font-weight 500, 14px,
// 6px bottom padding). Those bleed into the @signozhq/ui RadioGroup
@@ -81,12 +82,6 @@
font-weight: 400;
line-height: normal;
}
-
- // Loosen the design-system default (grid gap 0.5rem) between options.
- .silence-alerts-radio-group {
- margin-top: 8px;
- gap: 12px;
- }
}
.alert-rule-all-warning {
@@ -108,12 +103,6 @@
}
}
-.alert-rule-tags {
- .non-closable-tag {
- padding-right: 7px;
- }
-}
-
.datePicker {
.ant-picker-panel-container {
background: var(--l3-background) !important;
diff --git a/frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx b/frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx
index 9ec7ce7cdb..e26e2c5678 100644
--- a/frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx
@@ -54,7 +54,7 @@ import {
} from './PlannedDowntimeutils';
import './PlannedDowntime.styles.scss';
-import { RadioGroupItem, RadioGroup } from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
dayjs.locale('en');
dayjs.extend(utc);
@@ -462,16 +462,19 @@ export function PlannedDowntimeForm(
<div className="scheduleTimeInfoText">{endTimeText}</div>
)}
<div>
- <Typography style={{ marginBottom: 8 }}>Silence Alerts</Typography>
+ <Typography>Silence Alerts</Typography>
<Form.Item
name="alertRuleScope"
initialValue="specific"
className="alert-rule-scope"
>
- <RadioGroup className="silence-alerts-radio-group">
- <RadioGroupItem value="all">All alert rules</RadioGroupItem>
- <RadioGroupItem value="specific">Specific alert rules</RadioGroupItem>
- </RadioGroup>
+ <RadioGroup
+ color="primary"
+ items={[
+ { value: 'all', label: 'All alert rules' },
+ { value: 'specific', label: 'Specific alert rules' },
+ ]}
+ />
</Form.Item>
{alertRuleScope === 'specific' && (
<>
diff --git a/frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx b/frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx
index fd46d06410..8b9de16b03 100644
--- a/frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx
@@ -3,6 +3,7 @@ import { UseQueryResult } from 'react-query';
import { Color } from '@signozhq/design-tokens';
import { Collapse, Flex, Space, Table, TableProps, Tooltip } from 'antd';
import { Badge } from '@signozhq/ui/badge';
+import { Pill } from '@signozhq/ui/pill';
import { Typography } from '@signozhq/ui/typography';
import type { DefaultOptionType } from 'antd/es/select';
import type {
@@ -47,33 +48,35 @@ export function AlertRuleTags(props: AlertRuleTagsProps): JSX.Element {
className={cx('alert-rule-tags', classname)}
>
{selectedTags?.map((tag: DefaultOptionType, index: number) => {
+ if (closable) {
+ return (
+ <Pill.Closeable
+ key={tag.value}
+ maxWidth={200}
+ onClose={(): void => handleClose?.(tag.value)}
+ >
+ {tag.label}
+ </Pill.Closeable>
+ );
+ }
+
const isLongTag = (tag?.label as string)?.length > 20;
const tagElem = (
<Badge
+ textTransform="none"
key={tag.value}
- color={index % 2 ? 'sakura' : 'robin'}
- variant="outline"
- className={cx(
- { 'red-tag': index % 2 },
- { 'non-closable-tag': !closable },
- )}
- closable={closable}
- onClose={(e): void => {
- e.preventDefault();
- handleClose?.(tag?.value);
- }}
+ color={index % 2 ? 'highlight-danger' : 'primary'}
+ variant="outlined"
>
{isLongTag
? `${(tag?.label as string | null)?.slice(0, 20)}...`
: tag?.label}
</Badge>
);
- return isLongTag ? (
- <Tooltip title={tag?.label} key={tag?.value}>
+ return (
+ <Tooltip title={isLongTag ? tag?.label : undefined} key={tag?.value}>
{tagElem}
</Tooltip>
- ) : (
- tagElem
);
})}
</Space>
@@ -97,7 +100,9 @@ function HeaderComponent({
<Flex className="header-content" justify="space-between">
<Flex gap={8}>
<Typography>{name}</Typography>
- <Badge color="vanilla">{duration}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {duration}
+ </Badge>
</Flex>
{isCrudEnabled && (
@@ -158,7 +163,11 @@ export function CollapseListContent({
created_by_name ? (
<Flex gap={8}>
<Typography>{created_by_name}</Typography>
- {created_by_email && <Badge color="vanilla">{created_by_email}</Badge>}
+ {created_by_email && (
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {created_by_email}
+ </Badge>
+ )}
</Flex>
) : (
'-'
@@ -202,7 +211,7 @@ export function CollapseListContent({
selectedTags={alertOptions}
/>
) : (
- <Badge className="all-alerts-tag" color="vanilla">
+ <Badge variant="solid" color="secondary">
All alert rules
</Badge>
),
diff --git a/frontend/src/container/PlannedDowntime/__test__/AlertRuleTags.test.tsx b/frontend/src/container/PlannedDowntime/__test__/AlertRuleTags.test.tsx
new file mode 100644
index 0000000000..101d8af886
--- /dev/null
+++ b/frontend/src/container/PlannedDowntime/__test__/AlertRuleTags.test.tsx
@@ -0,0 +1,33 @@
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { render } from 'tests/test-utils';
+
+import { AlertRuleTags } from '../PlannedDowntimeList';
+
+const RULES = [
+ { label: 'Postgres connections near limit', value: 'rule-5' },
+ { label: 'Payment service error rate', value: 'rule-3' },
+];
+
+describe('AlertRuleTags', () => {
+ it('removes a selected rule from its named remove button', async () => {
+ const handleClose = jest.fn();
+ render(
+ <AlertRuleTags closable selectedTags={RULES} handleClose={handleClose} />,
+ );
+
+ await userEvent.click(
+ screen.getByRole('button', {
+ name: 'Remove Payment service error rate',
+ }),
+ );
+
+ expect(handleClose).toHaveBeenCalledWith('rule-3');
+ });
+
+ it('renders no remove button when not closable', () => {
+ render(<AlertRuleTags closable={false} selectedTags={RULES} />);
+
+ expect(screen.queryByRole('button', { name: /^Remove/ })).toBeNull();
+ });
+});
diff --git a/frontend/src/container/QueryBuilder/components/Formula/__tests__/Formula.bucketOptions.test.tsx b/frontend/src/container/QueryBuilder/components/Formula/__tests__/Formula.bucketOptions.test.tsx
index 5655381ffd..f2973cb4a4 100644
--- a/frontend/src/container/QueryBuilder/components/Formula/__tests__/Formula.bucketOptions.test.tsx
+++ b/frontend/src/container/QueryBuilder/components/Formula/__tests__/Formula.bucketOptions.test.tsx
@@ -73,15 +73,21 @@ describe('Formula bucket options', () => {
bucketOptions: { kind: 'log', spec: { scale: 0 } } as never,
});
- expect(screen.getByRole('radio', { name: 'Log' })).toBeChecked();
- expect(screen.getByRole('radio', { name: '0' })).toBeChecked();
+ expect(screen.getByRole('button', { name: 'Log' })).toHaveAttribute(
+ 'aria-pressed',
+ 'true',
+ );
+ expect(screen.getByRole('button', { name: '0' })).toHaveAttribute(
+ 'aria-pressed',
+ 'true',
+ );
});
it('writes the picked axis onto the formula', async () => {
const user = userEvent.setup();
renderFormula();
- await user.click(screen.getByRole('radio', { name: '0' }));
+ await user.click(screen.getByRole('button', { name: '0' }));
expect(mockHandleChangeFormulaData).toHaveBeenCalledWith('bucketOptions', {
kind: 'log',
diff --git a/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.styled.ts b/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.styled.ts
index 3ac7279dfa..b64db57233 100644
--- a/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.styled.ts
+++ b/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.styled.ts
@@ -5,7 +5,10 @@ export const StyledText = styled.span`
cursor: pointer;
`;
-export const StyledTag = styled(Badge)`
+export const StyledTag = styled(Badge).attrs({
+ color: 'secondary' as const,
+ variant: 'solid' as const,
+})`
margin-top: 0.125rem;
margin-bottom: 0.125rem;
padding-left: 0.5rem;
diff --git a/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.tsx b/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.tsx
index f2b36d099f..ed0535eb71 100644
--- a/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.tsx
+++ b/frontend/src/container/QueryBuilder/components/HavingFilterTag/HavingFilterTag.tsx
@@ -1,3 +1,5 @@
+import { X } from '@signozhq/icons';
+
import { HavingFilterTagProps } from './HavingFilterTag.interfaces';
import { StyledTag, StyledText } from './HavingFilterTag.styled';
@@ -13,12 +15,20 @@ export function HavingFilterTag({
return (
<StyledTag
- color="vanilla"
- closable={closable}
- onClose={(e): void => {
- e.preventDefault();
- onClose();
- }}
+ suffix={
+ closable ? (
+ <button
+ type="button"
+ aria-label="Remove"
+ onClick={(e): void => {
+ e.preventDefault();
+ onClose();
+ }}
+ >
+ <X size={12} />
+ </button>
+ ) : undefined
+ }
>
<span role="button" tabIndex={0} onClick={handleClick}>
<StyledText>{value}</StyledText>
diff --git a/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.scss b/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.scss
index faa2382ade..2098be1c45 100644
--- a/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.scss
+++ b/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.scss
@@ -1,21 +1,6 @@
-.run-query-btn {
- display: flex;
- min-width: 132px;
- align-items: center;
- gap: 6px;
-
- .ant-btn-icon {
- margin: 0 !important;
- }
-}
-
-.cancel-query-btn {
- display: flex;
- min-width: 132px;
- align-items: center;
- gap: 6px;
+[data-run-query-btn] {
+ --button-min-width: 150px;
}
-
.cmd-hint {
display: inline-flex;
align-items: center;
diff --git a/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.tsx b/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.tsx
index 46af879bc7..86cf4ecea0 100644
--- a/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.tsx
+++ b/frontend/src/container/QueryBuilder/components/RunQueryBtn/RunQueryBtn.tsx
@@ -1,5 +1,5 @@
+import { ReactNode } from 'react';
import { Button } from '@signozhq/ui/button';
-import cx from 'classnames';
import {
ChevronUp,
Command,
@@ -12,9 +12,9 @@ import { getUserOperatingSystem, UserOperatingSystem } from 'utils/getUserOS';
import './RunQueryBtn.scss';
type RunQueryBtnProps = {
- className?: string;
label?: string;
disabled?: boolean;
+ disabledTooltip?: ReactNode;
} & (
| {
onStageRunQuery: () => void;
@@ -29,44 +29,51 @@ type RunQueryBtnProps = {
);
function RunQueryBtn({
- className,
label,
isLoadingQueries,
handleCancelQuery,
onStageRunQuery,
disabled,
+ disabledTooltip,
}: RunQueryBtnProps): JSX.Element {
const isMac = getUserOperatingSystem() === UserOperatingSystem.MACOS;
const isLoading = isLoadingQueries ?? false;
return isLoading ? (
<Button
- color="destructive"
+ size="md"
+ variant="solid"
+ color="danger"
type="button"
+ data-run-query-btn
prefix={<LoaderCircle size={14} className="loading-icon animate-spin" />}
- className={cx('cancel-query-btn', className)}
onClick={handleCancelQuery}
>
Cancel
</Button>
) : (
<Button
+ size="md"
+ variant="solid"
color="primary"
type="button"
- className={cx('run-query-btn', className)}
+ data-run-query-btn
disabled={disabled}
+ disabledTooltip={disabledTooltip}
onClick={onStageRunQuery}
prefix={<Play size={14} />}
+ suffix={
+ <div className="cmd-hint">
+ {isMac ? (
+ <Command size={12} data-testid="cmd-hint-modifier-mac" />
+ ) : (
+ <ChevronUp size={12} data-testid="cmd-hint-modifier-non-mac" />
+ )}
+ <CornerDownLeft size={12} data-testid="cmd-hint-enter" />
+ </div>
+ }
>
{label || 'Run Query'}
- <div className="cmd-hint">
- {isMac ? (
- <Command size={12} data-testid="cmd-hint-modifier-mac" />
- ) : (
- <ChevronUp size={12} data-testid="cmd-hint-modifier-non-mac" />
- )}
- <CornerDownLeft size={12} data-testid="cmd-hint-enter" />
- </div>
</Button>
);
}
diff --git a/frontend/src/container/QueryBuilder/components/RunQueryBtn/__test__/RunQueryBtn.test.tsx b/frontend/src/container/QueryBuilder/components/RunQueryBtn/__test__/RunQueryBtn.test.tsx
index f3b8595557..82eae142af 100644
--- a/frontend/src/container/QueryBuilder/components/RunQueryBtn/__test__/RunQueryBtn.test.tsx
+++ b/frontend/src/container/QueryBuilder/components/RunQueryBtn/__test__/RunQueryBtn.test.tsx
@@ -30,7 +30,7 @@ describe('RunQueryBtn', () => {
/>,
);
const btn = screen.getByRole('button', { name: /run query/i });
- expect(btn).toBeEnabled();
+ expect(btn).not.toHaveAttribute('aria-disabled', 'true');
await user.click(btn);
expect(onRun).toHaveBeenCalledTimes(1);
});
@@ -53,7 +53,10 @@ describe('RunQueryBtn', () => {
it('disabled when disabled prop is true', () => {
render(<RunQueryBtn disabled />);
- expect(screen.getByRole('button', { name: /run query/i })).toBeDisabled();
+ expect(screen.getByRole('button', { name: /run query/i })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('disabled when no props provided', () => {
diff --git a/frontend/src/container/QueryBuilder/components/ToolbarActions/RightToolbarActions.tsx b/frontend/src/container/QueryBuilder/components/ToolbarActions/RightToolbarActions.tsx
index e5b194f3a1..0ae6bac524 100644
--- a/frontend/src/container/QueryBuilder/components/ToolbarActions/RightToolbarActions.tsx
+++ b/frontend/src/container/QueryBuilder/components/ToolbarActions/RightToolbarActions.tsx
@@ -37,7 +37,7 @@ export default function RightToolbarActions({
if (showLiveLogs) {
return (
<div className="right-toolbar-actions-container">
- <RunQueryBtn disabled />
+ <RunQueryBtn disabled disabledTooltip="Not available in live mode" />
</div>
);
}
diff --git a/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.ts b/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.ts
index 6bbdfbda0c..bd1e4735e7 100644
--- a/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.ts
+++ b/frontend/src/container/QueryBuilder/filters/OptionRenderer/style.ts
@@ -3,7 +3,7 @@ import styled from 'styled-components';
export const TagContainer = styled(Badge).attrs({
color: 'secondary',
- variant: 'outline',
+ variant: 'outlined',
})`
&&& {
display: flex;
diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.styles.scss b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.styles.scss
index 9cd465a93f..66aacdc76a 100644
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.styles.scss
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.styles.scss
@@ -224,80 +224,8 @@
width: 100%;
}
- .qb-search-bar-tokenised-tags {
- [data-slot='badge'] {
- display: flex;
- align-items: center;
- border-radius: 2px 0px 0px 2px;
- border: 1px solid var(--l1-border);
- background: var(--l1-background);
- box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
- padding: 0px;
- gap: 0;
- margin: 4px;
-
- .qb-tag-text {
- color: var(--l1-foreground);
- font-family: Inter;
- font-size: 14px !important;
- font-style: normal;
- font-weight: 400;
- line-height: 20px; /* 142.857% */
- padding: 2px 6px;
- }
-
- > button {
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: 0px 2px 2px 0px;
- width: 20px;
- height: 24px;
- flex-shrink: 0;
- margin-inline-start: 0px !important;
- margin-inline-end: 0px !important;
- }
-
- &.resource {
- border: 1px solid color-mix(in srgb, var(--bg-aqua-400) 13%, transparent);
-
- .qb-tag-text {
- color: var(--bg-aqua-400);
- background: color-mix(in srgb, var(--bg-aqua-400) 6%, transparent);
- font-size: 14px;
- }
-
- > button {
- background: color-mix(in srgb, var(--bg-aqua-400) 6%, transparent);
- }
- }
- &.tag {
- border: 1px solid color-mix(in srgb, var(--bg-sienna-400) 20%, transparent);
-
- .qb-tag-text {
- color: var(--bg-sienna-400);
- background: color-mix(in srgb, var(--bg-sienna-400) 10%, transparent);
- font-size: 14px;
- }
-
- > button {
- background: color-mix(in srgb, var(--bg-sienna-400) 10%, transparent);
- }
- }
-
- &.scope {
- border: 1px solid color-mix(in srgb, var(--bg-robin-400) 20%, transparent);
-
- .qb-tag-text {
- color: var(--bg-robin-400);
- background: color-mix(in srgb, var(--bg-robin-400) 10%, transparent);
- font-size: 14px;
- }
-
- > button {
- background: color-mix(in srgb, var(--bg-robin-400) 10%, transparent);
- }
- }
- }
+ // Custom tagRender drops antd's tag margins.
+ .ant-select-selection-overflow {
+ gap: var(--spacing-2);
}
}
diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
index d2fbfdd300..93a58e633f 100644
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2.tsx
@@ -8,8 +8,8 @@ import {
useRef,
useState,
} from 'react';
-import { Select, Spin, Tooltip } from 'antd';
-import { Badge } from '@signozhq/ui/badge';
+import { Select, Spin } from 'antd';
+import { Pill } from '@signozhq/ui/pill';
import cx from 'classnames';
import {
DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY,
@@ -54,7 +54,6 @@ import { v4 as uuid } from 'uuid';
import { selectStyle } from './config';
import { PLACEHOLDER } from './constant';
-import { TypographyText } from './style';
import {
checkCommaInValue,
getOperatorFromValue,
@@ -924,35 +923,15 @@ function QueryBuilderSearchV2(
setTags((prev) => prev.filter((t) => !isEqual(t, tagDetails)));
};
- const isDisabled = !!searchValue;
-
return (
- <span className="qb-search-bar-tokenised-tags">
- <Badge
- color="vanilla"
- className={tagDetails?.key?.type || ''}
- closable={!searchValue && closable}
- onClose={(e): void => {
- e.preventDefault();
- onCloseHandler();
- }}
- >
- <Tooltip title={chipValue}>
- <TypographyText
- className="qb-tag-text"
- $isInNin={isInNin}
- $isEnabled={!!searchValue}
- onClick={(): void => {
- if (!isDisabled) {
- tagEditHandler(value);
- }
- }}
- >
- {chipValue}
- </TypographyText>
- </Tooltip>
- </Badge>
- </span>
+ <Pill.Closeable
+ disabled={!!searchValue || !closable}
+ maxWidth={isInNin ? '10rem' : '100%'}
+ onClick={(): void => tagEditHandler(value)}
+ onClose={onCloseHandler}
+ >
+ {chipValue}
+ </Pill.Closeable>
);
};
diff --git a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/style.ts b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/style.ts
deleted file mode 100644
index 80557e0502..0000000000
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/style.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import styled from 'styled-components';
-
-export const TypographyText = styled.span<{
- $isInNin: boolean;
- $isEnabled: boolean;
- $disabled?: boolean;
-}>`
- width: ${({ $isInNin }): string => ($isInNin ? '10rem' : 'auto')};
- cursor: ${({ $isEnabled }): string =>
- $isEnabled ? 'not-allowed' : 'pointer'};
- pointer-events: ${({ $isEnabled }): string => ($isEnabled ? 'none' : 'auto')};
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- padding-left: 8px;
- ${({ $disabled }): string => ($disabled ? 'opacity: 0.6' : '')}
-`;
diff --git a/frontend/src/container/ResetPassword/ResetPassword.styles.scss b/frontend/src/container/ResetPassword/ResetPassword.styles.scss
index 22fc089d28..ea95a7d27e 100644
--- a/frontend/src/container/ResetPassword/ResetPassword.styles.scss
+++ b/frontend/src/container/ResetPassword/ResetPassword.styles.scss
@@ -131,10 +131,6 @@
margin-top: 24px;
display: flex;
width: 100%;
-
- .reset-password-submit-button {
- width: 100%;
- }
}
.ant-form-item {
diff --git a/frontend/src/container/ResetPassword/TokenError.tsx b/frontend/src/container/ResetPassword/TokenError.tsx
index 62673b4cce..3a1a6fdaa5 100644
--- a/frontend/src/container/ResetPassword/TokenError.tsx
+++ b/frontend/src/container/ResetPassword/TokenError.tsx
@@ -64,8 +64,10 @@ function TokenError({ error }: TokenErrorProps): JSX.Element {
{error && <AuthError error={error} />}
<div className="reset-password-back-action">
<Button
+ size="md"
+ color="primary"
variant="solid"
- data-testid="back-to-login"
+ testId="back-to-login"
prefix={<ArrowLeft size={12} />}
onClick={(): void => history.push(ROUTES.LOGIN)}
>
diff --git a/frontend/src/container/ResetPassword/__tests__/ResetPassword.test.tsx b/frontend/src/container/ResetPassword/__tests__/ResetPassword.test.tsx
index 4b5aa65872..448dae0b08 100644
--- a/frontend/src/container/ResetPassword/__tests__/ResetPassword.test.tsx
+++ b/frontend/src/container/ResetPassword/__tests__/ResetPassword.test.tsx
@@ -83,7 +83,7 @@ describe('ResetPassword Component', () => {
name: /reset password/i,
});
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password456');
@@ -91,7 +91,7 @@ describe('ResetPassword Component', () => {
await waitFor(() => {
expect(screen.getByText(/passwords don't match/i)).toBeInTheDocument();
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
});
@@ -116,7 +116,7 @@ describe('ResetPassword Component', () => {
// Wait for debounced validation
await waitFor(
() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
},
{ timeout: 200 },
);
@@ -185,7 +185,7 @@ describe('ResetPassword Component', () => {
expect(
screen.queryByText(/passwords don't match/i),
).not.toBeInTheDocument();
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
});
});
@@ -223,7 +223,7 @@ describe('ResetPassword Component', () => {
await waitFor(
() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
},
{ timeout: 200 },
);
@@ -272,7 +272,7 @@ describe('ResetPassword Component', () => {
await waitFor(
() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
},
{ timeout: 200 },
);
@@ -355,7 +355,7 @@ describe('ResetPassword Component', () => {
await user.type(confirmPasswordInput, 'weak');
await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
await user.click(submitButton);
@@ -377,7 +377,7 @@ describe('ResetPassword Component', () => {
await user.type(confirmPasswordInput, 'Er1!');
await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
});
});
@@ -416,7 +416,7 @@ describe('ResetPassword Component', () => {
await waitFor(
() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
},
{ timeout: 200 },
);
@@ -425,7 +425,7 @@ describe('ResetPassword Component', () => {
// Button should be disabled during API call
await waitFor(() => {
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
});
});
diff --git a/frontend/src/container/ResetPassword/index.tsx b/frontend/src/container/ResetPassword/index.tsx
index c20b9d6e44..f9b6c2ee4e 100644
--- a/frontend/src/container/ResetPassword/index.tsx
+++ b/frontend/src/container/ResetPassword/index.tsx
@@ -159,12 +159,15 @@ function ResetPassword({ version }: ResetPasswordProps): JSX.Element {
<div className="reset-password-form-actions">
<Button
+ size="md"
variant="solid"
color="primary"
type="submit"
data-attr="reset-password"
- disabled={!isValidPassword || isLoading}
- className="reset-password-submit-button"
+ loading={isLoading}
+ disabled={!isValidPassword}
+ disabledTooltip="Enter matching passwords in both fields"
+ width="100%"
suffix={<ArrowRight size={16} />}
>
Reset Password
diff --git a/frontend/src/container/ResourceAttributesFilter/ResourceAttributesFilter.tsx b/frontend/src/container/ResourceAttributesFilter/ResourceAttributesFilter.tsx
index b37564f14a..a6b46e0092 100644
--- a/frontend/src/container/ResourceAttributesFilter/ResourceAttributesFilter.tsx
+++ b/frontend/src/container/ResourceAttributesFilter/ResourceAttributesFilter.tsx
@@ -1,6 +1,6 @@
import { ReactNode, useEffect, useMemo, useState } from 'react';
import { SolidXCircle } from '@signozhq/icons';
-import { Button, Select, Spin } from 'antd';
+import { Button, Select, SelectProps, Spin } from 'antd';
import useResourceAttribute, {
isResourceEmpty,
} from 'hooks/useResourceAttribute';
@@ -19,6 +19,10 @@ import { QueryChipItem, SearchContainer } from './styles';
import './ResourceAttributesFilter.styles.scss';
+const renderValueTag: SelectProps['tagRender'] = ({ label }) => (
+ <QueryChipItem>{label}</QueryChipItem>
+);
+
function ResourceAttributesFilter({
suffixIcon,
}: ResourceAttributesFilterProps): JSX.Element | null {
@@ -119,6 +123,7 @@ function ResourceAttributesFilter({
style={{ flex: 1 }}
options={optionsData.options}
mode={optionsData?.mode}
+ tagRender={renderValueTag}
data-testid="resource-attributes-filter"
onClick={handleFocus}
onBlur={handleBlur}
diff --git a/frontend/src/container/ResourceAttributesFilter/components/QueryChip/QueryChip.tsx b/frontend/src/container/ResourceAttributesFilter/components/QueryChip/QueryChip.tsx
index 5cd1592dd7..feac1bd5a3 100644
--- a/frontend/src/container/ResourceAttributesFilter/components/QueryChip/QueryChip.tsx
+++ b/frontend/src/container/ResourceAttributesFilter/components/QueryChip/QueryChip.tsx
@@ -1,9 +1,14 @@
+import { X } from '@signozhq/icons';
import {
convertMetricKeyToTrace,
getResourceDeploymentKeys,
} from 'hooks/useResourceAttribute/utils';
-import { QueryChipContainer, QueryChipItem } from '../../styles';
+import {
+ QueryChipContainer,
+ QueryChipItem,
+ QueryChipRemoveButton,
+} from '../../styles';
import { IQueryChipProps } from './types';
function QueryChip({ queryData, onClose }: IQueryChipProps): JSX.Element {
@@ -15,17 +20,23 @@ function QueryChip({ queryData, onClose }: IQueryChipProps): JSX.Element {
return (
<QueryChipContainer>
- <QueryChipItem color="vanilla">
- {convertMetricKeyToTrace(queryData.tagKey)}
- </QueryChipItem>
- <QueryChipItem color="vanilla">{queryData.operator}</QueryChipItem>
+ <QueryChipItem>{convertMetricKeyToTrace(queryData.tagKey)}</QueryChipItem>
+ <QueryChipItem>{queryData.operator}</QueryChipItem>
<QueryChipItem
- color="vanilla"
- closable={isClosable}
- onClose={(e): void => {
- e.preventDefault();
- onCloseHandler();
- }}
+ suffix={
+ isClosable ? (
+ <QueryChipRemoveButton
+ type="button"
+ aria-label="Remove"
+ onClick={(e): void => {
+ e.preventDefault();
+ onCloseHandler();
+ }}
+ >
+ <X size={12} />
+ </QueryChipRemoveButton>
+ ) : undefined
+ }
>
{queryData.tagValue.join(', ')}
</QueryChipItem>
diff --git a/frontend/src/container/ResourceAttributesFilter/styles.ts b/frontend/src/container/ResourceAttributesFilter/styles.ts
index 3616eb164e..b32fd7a2b2 100644
--- a/frontend/src/container/ResourceAttributesFilter/styles.ts
+++ b/frontend/src/container/ResourceAttributesFilter/styles.ts
@@ -23,6 +23,25 @@ export const QueryChipContainer = styled.span`
}
`;
-export const QueryChipItem = styled(Badge)`
+export const QueryChipItem = styled(Badge).attrs({
+ color: 'secondary' as const,
+ variant: 'solid' as const,
+ textTransform: 'none' as const,
+})`
margin-right: 0.1rem;
`;
+
+export const QueryChipRemoveButton = styled.button`
+ display: flex;
+ align-items: center;
+ padding: 0;
+ border: none;
+ background: none;
+ color: inherit;
+ cursor: pointer;
+ opacity: 0.6;
+
+ &:hover {
+ opacity: 1;
+ }
+`;
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.module.scss b/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.module.scss
index 0fa46ab597..b959212fdf 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.module.scss
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.module.scss
@@ -23,10 +23,6 @@
gap: var(--spacing-6);
}
-.backButton {
- --button-padding: var(--spacing-3);
-}
-
.createEditRolePageActions {
display: flex;
align-items: center;
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx
index f51135aefe..dc1405dffa 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx
@@ -110,11 +110,13 @@ function CreateEditRolePageContent(): JSX.Element {
<div className={styles.createEditRolePageHeader}>
<div className={styles.createEditRolePageHeaderLeft}>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={handleCancel}
- data-testid="cancel-button"
- className={styles.backButton}
+ testId="cancel-button"
+ icon
+ aria-label="Back"
>
<ArrowLeft size={16} />
</Button>
@@ -172,12 +174,15 @@ function CreateEditRolePageContent(): JSX.Element {
<div className={styles.createEditRolePageHeader}>
<div className={styles.createEditRolePageHeaderLeft}>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={handleCancel}
disabled={isSaving}
- data-testid="cancel-button"
- className={styles.backButton}
+ disabledTooltip="Wait for the save to finish"
+ testId="cancel-button"
+ icon
+ aria-label="Back"
>
<ArrowLeft size={16} />
</Button>
@@ -194,6 +199,7 @@ function CreateEditRolePageContent(): JSX.Element {
</div>
)}
<AuthZButton
+ size="md"
checks={saveChecks}
authZEnabled={isSaveCheckEnabled}
variant="solid"
@@ -304,7 +310,7 @@ function CreateEditRolePageContent(): JSX.Element {
title="Discard unsaved changes?"
titleIcon={<SolidAlertTriangle size={14} color="#fdd600" />}
confirmText="Discard"
- confirmColor="destructive"
+ confirmColor="danger"
cancelText="Keep editing"
onConfirm={confirmNavigation}
onCancel={cancelNavigation}
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateEditRolePage.featureGate.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateEditRolePage.featureGate.test.tsx
index 805a9191c4..10133f452d 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateEditRolePage.featureGate.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateEditRolePage.featureGate.test.tsx
@@ -87,7 +87,7 @@ describe('CreateEditRolePage - Feature Gate', () => {
renderCreatePage({ activeLicense: invalidLicense });
const cancelButton = await screen.findByTestId('cancel-button');
- expect(cancelButton).not.toBeDisabled();
+ expect(cancelButton).not.toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateRolePage.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateRolePage.test.tsx
index 5fa68ce472..b882981414 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateRolePage.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/CreateRolePage.test.tsx
@@ -82,7 +82,7 @@ describe('CreateRolePage', () => {
await renderCreatePage();
const saveBtn = screen.getByTestId('save-button');
- expect(saveBtn).toBeDisabled();
+ expect(saveBtn).toHaveAttribute('aria-disabled', 'true');
});
it('does not show unsaved indicator initially', async () => {
@@ -101,7 +101,7 @@ describe('CreateRolePage', () => {
await user.type(nameInput, 'test-role');
const saveBtn = screen.getByTestId('save-button');
- expect(saveBtn).not.toBeDisabled();
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true');
});
it('shows unsaved indicator when form modified', async () => {
@@ -124,7 +124,7 @@ describe('CreateRolePage', () => {
await user.type(descInput, 'Some description');
const saveBtn = screen.getByTestId('save-button');
- expect(saveBtn).not.toBeDisabled();
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx
index 7a505c38a1..7503198546 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx
@@ -83,7 +83,10 @@ describe('EditRolePage - AuthZ', () => {
screen.findByText(`Role - ${EDIT_ROLE_NAME}`),
).resolves.toBeInTheDocument();
expect(screen.getByTestId('cancel-button')).toBeInTheDocument();
- expect(screen.getByTestId('save-button')).toBeDisabled();
+ expect(screen.getByTestId('save-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
expect(
screen.queryByTestId('role-description-input'),
@@ -101,7 +104,7 @@ describe('EditRolePage - AuthZ', () => {
).resolves.toBeInTheDocument();
const saveButton = await screen.findByTestId('save-button');
- expect(saveButton).toBeDisabled();
+ expect(saveButton).toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx
index a433db7899..7f6029fb3e 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx
@@ -203,7 +203,7 @@ describe('EditRolePage', () => {
});
const saveBtn = screen.getByTestId('save-button');
- expect(saveBtn).toBeDisabled();
+ expect(saveBtn).toHaveAttribute('aria-disabled', 'true');
});
});
@@ -217,7 +217,7 @@ describe('EditRolePage', () => {
await user.type(descInput, 'New description');
const saveBtn = screen.getByTestId('save-button');
- expect(saveBtn).not.toBeDisabled();
+ expect(saveBtn).not.toHaveAttribute('aria-disabled', 'true');
});
it('shows unsaved indicator when description modified', async () => {
@@ -241,13 +241,19 @@ describe('EditRolePage', () => {
await user.clear(descInput);
await user.type(descInput, 'Temporary change');
- expect(screen.getByTestId('save-button')).not.toBeDisabled();
+ expect(screen.getByTestId('save-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await user.clear(descInput);
await user.type(descInput, originalValue);
await waitFor(() => {
- expect(screen.getByTestId('save-button')).toBeDisabled();
+ expect(screen.getByTestId('save-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
@@ -399,7 +405,10 @@ describe('EditRolePage', () => {
await expect(
screen.findByText('Unsaved changes'),
).resolves.toBeInTheDocument();
- expect(screen.getByTestId('save-button')).not.toBeDisabled();
+ expect(screen.getByTestId('save-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/JsonEditor.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/JsonEditor.test.tsx
index 02edf36400..d20e223559 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/JsonEditor.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/JsonEditor.test.tsx
@@ -5,7 +5,6 @@ import { render, screen, userEvent, within } from 'tests/test-utils';
import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
import CreateEditRolePage from '../CreateEditRolePage';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
beforeEach(() => {
server.use(setupAuthzAdmin());
@@ -17,16 +16,14 @@ afterEach(() => {
function renderPage(): ReturnType<typeof render> {
return render(
- <TooltipProvider>
- <Switch>
- <Route path={ROUTES.ROLES_SETTINGS} exact>
- <div data-testid="roles-list-redirect" />
- </Route>
- <Route path={ROUTES.ROLE_CREATE}>
- <CreateEditRolePage />
- </Route>
- </Switch>
- </TooltipProvider>,
+ <Switch>
+ <Route path={ROUTES.ROLES_SETTINGS} exact>
+ <div data-testid="roles-list-redirect" />
+ </Route>
+ <Route path={ROUTES.ROLE_CREATE}>
+ <CreateEditRolePage />
+ </Route>
+ </Switch>,
undefined,
{ initialRoute: '/settings/roles/new' },
);
@@ -34,16 +31,16 @@ function renderPage(): ReturnType<typeof render> {
async function switchToJsonMode(): Promise<void> {
const user = userEvent.setup();
- const jsonRadio = await screen.findByTestId('permission-editor-mode-json');
- await user.click(jsonRadio);
+ const jsonToggle = await screen.findByTestId('permission-editor-mode-json');
+ await user.click(jsonToggle);
}
async function switchToInteractiveMode(): Promise<void> {
const user = userEvent.setup();
- const interactiveRadio = await screen.findByTestId(
+ const interactiveToggle = await screen.findByTestId(
'permission-editor-mode-interactive',
);
- await user.click(interactiveRadio);
+ await user.click(interactiveToggle);
}
describe('JsonEditor', () => {
@@ -109,17 +106,17 @@ describe('JsonEditor', () => {
await switchToJsonMode();
- const interactiveRadio = screen.getByTestId(
+ const interactiveToggle = screen.getByTestId(
'permission-editor-mode-interactive',
);
- await user.click(interactiveRadio);
+ await user.click(interactiveToggle);
const scopeToggle = within(
screen.getByTestId('action-toggle-factor-api-key-create'),
).getByTestId('action-toggle-scope-factor-api-key-create');
expect(
- within(scopeToggle).getByRole('radio', { name: 'All' }),
- ).toBeChecked();
+ within(scopeToggle).getByRole('button', { name: 'All' }),
+ ).toHaveAttribute('aria-pressed', 'true');
});
});
@@ -193,10 +190,10 @@ describe('JsonEditor', () => {
await screen.findByTestId('permission-editor');
await switchToJsonMode();
- const interactiveRadio = screen.getByTestId(
+ const interactiveToggle = screen.getByTestId(
'permission-editor-mode-interactive',
);
- await user.click(interactiveRadio);
+ await user.click(interactiveToggle);
const apiKeyCard = await screen.findByTestId('resource-card-factor-api-key');
const header = within(apiKeyCard).getByTestId(
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.test.tsx
index 1d7274a41a..fa44a9ec49 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.test.tsx
@@ -25,20 +25,20 @@ describe('PermissionEditor', () => {
it('defaults to interactive mode', async () => {
await renderCreateRolePage();
- const interactiveRadio = screen.getByTestId(
+ const interactiveToggle = screen.getByTestId(
'permission-editor-mode-interactive',
);
- expect(interactiveRadio).toBeChecked();
+ expect(interactiveToggle).toHaveAttribute('aria-pressed', 'true');
});
it('switches to JSON mode when clicked', async () => {
const user = userEvent.setup();
await renderCreateRolePage();
- const jsonRadio = screen.getByTestId('permission-editor-mode-json');
- await user.click(jsonRadio);
+ const jsonToggle = screen.getByTestId('permission-editor-mode-json');
+ await user.click(jsonToggle);
- expect(jsonRadio).toBeChecked();
+ expect(jsonToggle).toHaveAttribute('aria-pressed', 'true');
expect(screen.getByTestId('json-editor')).toBeInTheDocument();
});
@@ -46,15 +46,15 @@ describe('PermissionEditor', () => {
const user = userEvent.setup();
await renderCreateRolePage();
- const jsonRadio = screen.getByTestId('permission-editor-mode-json');
- await user.click(jsonRadio);
+ const jsonToggle = screen.getByTestId('permission-editor-mode-json');
+ await user.click(jsonToggle);
- const interactiveRadio = screen.getByTestId(
+ const interactiveToggle = screen.getByTestId(
'permission-editor-mode-interactive',
);
- await user.click(interactiveRadio);
+ await user.click(interactiveToggle);
- expect(interactiveRadio).toBeChecked();
+ expect(interactiveToggle).toHaveAttribute('aria-pressed', 'true');
expect(screen.queryByTestId('json-editor')).not.toBeInTheDocument();
});
});
@@ -155,8 +155,8 @@ describe('PermissionEditor', () => {
'action-toggle-scope-factor-api-key-read',
);
expect(
- within(scopeToggle).getByRole('radio', { name: 'None' }),
- ).toBeChecked();
+ within(scopeToggle).getByRole('button', { name: 'None' }),
+ ).toHaveAttribute('aria-pressed', 'true');
});
it('changes scope to All when clicked', async () => {
@@ -176,8 +176,8 @@ describe('PermissionEditor', () => {
'action-toggle-scope-factor-api-key-read',
);
expect(
- within(scopeToggle).getByRole('radio', { name: 'All' }),
- ).toBeChecked();
+ within(scopeToggle).getByRole('button', { name: 'All' }),
+ ).toHaveAttribute('aria-pressed', 'true');
});
it('updates granted count when scope changed', async () => {
@@ -485,7 +485,7 @@ describe('PermissionEditor', () => {
const addBtn = screen.getByTestId(
'item-input-selector-add-btn-factor-api-key-read',
);
- expect(addBtn).toBeDisabled();
+ expect(addBtn).toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.wizard.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.wizard.test.tsx
index e95d9e2cb5..566209b3c3 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.wizard.test.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.wizard.test.tsx
@@ -188,7 +188,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
const user = userEvent.setup();
await openLogsWizard(user);
- await user.click(screen.getByLabelText('Any value'));
+ await user.click(screen.getByRole('checkbox', { name: 'Any value' }));
expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('*');
@@ -203,7 +203,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
const user = userEvent.setup();
await openLogsWizard(user);
- const anyResource = screen.getByLabelText('Any value');
+ const anyResource = screen.getByRole('checkbox', { name: 'Any value' });
await user.click(anyResource);
expect(anyResource).toBeChecked();
@@ -219,7 +219,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.type(screen.getByTestId('wizard-value-input-logs-read'), '*');
- expect(screen.getByLabelText('Any value')).toBeChecked();
+ expect(screen.getByRole('checkbox', { name: 'Any value' })).toBeChecked();
});
it('disables value scoping for query types that do not support it', async () => {
@@ -230,7 +230,10 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.click(await screen.findByText('ClickHouse SQL'));
expect(screen.getByTestId('wizard-value-input-logs-read')).toBeDisabled();
- expect(screen.getByLabelText('Any value')).toBeDisabled();
+ expect(screen.getByRole('checkbox', { name: 'Any value' })).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('clears the value when switching to a query type without key scoping', async () => {
@@ -282,7 +285,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
await user.clear(selectorInput);
await user.type(selectorInput, 'builder_query/signoz.workspace.key.id/*');
- expect(screen.getByLabelText('Any value')).toBeChecked();
+ expect(screen.getByRole('checkbox', { name: 'Any value' })).toBeChecked();
});
it('keeps the key input hardcoded when the selector uses another key', async () => {
@@ -299,7 +302,10 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
expect(
screen.getByTestId('wizard-selector-hint-logs-read'),
).toHaveTextContent('Allow service.name=frontend for Builder Query queries.');
- expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toBeDisabled();
+ expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('restores the hardcoded key in the selector once the value changes', async () => {
@@ -315,7 +321,10 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
expect(selectorInput).toHaveValue(
'builder_query/signoz.workspace.key.id/frontend2',
);
- expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toBeDisabled();
+ expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('blocks adding when the selector has an unknown query type', async () => {
@@ -329,7 +338,10 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
expect(
screen.getByTestId('wizard-selector-hint-logs-read'),
).toHaveTextContent('"sql_query" is not a supported query type.');
- expect(screen.getByTestId('wizard-add-btn-logs-read')).toBeDisabled();
+ expect(screen.getByTestId('wizard-add-btn-logs-read')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('blocks adding when the selector is emptied', async () => {
@@ -341,7 +353,10 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
expect(
screen.getByTestId('wizard-selector-hint-logs-read'),
).toHaveTextContent('Enter a selector.');
- expect(screen.getByTestId('wizard-add-btn-logs-read')).toBeDisabled();
+ expect(screen.getByTestId('wizard-add-btn-logs-read')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('adds the hand-edited selector verbatim', async () => {
@@ -442,7 +457,7 @@ describe('PermissionEditor - TelemetrySelectorWizard', () => {
const user = userEvent.setup();
await openLogsWizard(user);
- await user.click(screen.getByLabelText('Any value'));
+ await user.click(screen.getByRole('checkbox', { name: 'Any value' }));
expect(
screen.getByTestId('wizard-selector-hint-logs-read'),
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/testUtils.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/testUtils.tsx
index db2063c5bf..13752b7704 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/testUtils.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/testUtils.tsx
@@ -1,7 +1,6 @@
import { Route, Switch } from 'react-router-dom';
import ROUTES from 'constants/routes';
import { render, screen, userEvent, within } from 'tests/test-utils';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import CreateEditRolePage from '../CreateEditRolePage';
@@ -9,16 +8,14 @@ export async function renderCreateRolePage(): Promise<
ReturnType<typeof render>
> {
const result = render(
- <TooltipProvider>
- <Switch>
- <Route path={ROUTES.ROLES_SETTINGS} exact>
- <div data-testid="roles-list-redirect" />
- </Route>
- <Route path={ROUTES.ROLE_CREATE}>
- <CreateEditRolePage />
- </Route>
- </Switch>
- </TooltipProvider>,
+ <Switch>
+ <Route path={ROUTES.ROLES_SETTINGS} exact>
+ <div data-testid="roles-list-redirect" />
+ </Route>
+ <Route path={ROUTES.ROLE_CREATE}>
+ <CreateEditRolePage />
+ </Route>
+ </Switch>,
undefined,
{ initialRoute: '/settings/roles/new' },
);
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.module.scss b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.module.scss
index 72843d28da..a3bba8b31f 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.module.scss
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.module.scss
@@ -27,35 +27,6 @@
gap: var(--spacing-8);
}
-.actionToggleScopeToggle {
- flex-shrink: 0;
- width: fit-content;
-
- --toggle-group-item-size: 1.4rem;
- --toggle-group-item-padding-right: 0.4rem;
- --toggle-group-item-border-style: none;
- --toggle-group-secondary-active-bg: var(--bg-robin-800);
- --toggle-group-item-align-items: baseline;
-
- gap: var(--spacing-2);
- padding: var(--spacing-2);
-
- button {
- min-width: 46px;
- font-weight: bold;
-
- &[data-state='on'] {
- color: var(--bg-robin-200);
- }
-
- &:focus-visible {
- outline: 2px solid var(--bg-robin-500);
- outline-offset: 2px;
- border-radius: var(--radius-2);
- }
- }
-}
-
.actionToggleSelectorWrapper {
display: flex;
flex-direction: column;
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.tsx
index e6867146b2..6943ab8eb0 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.tsx
@@ -1,7 +1,7 @@
import { useCallback, useMemo, useState } from 'react';
import { ConfirmDialog } from '@signozhq/ui/dialog';
import { Divider } from '@signozhq/ui/divider';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Typography } from '@signozhq/ui/typography';
import { PermissionScope } from '../../types';
@@ -109,13 +109,14 @@ function ActionToggle({
<Typography as="span" size="base">
{displayLabel}
</Typography>
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
size="sm"
value={scope}
onChange={handleToggleChange}
items={scopeItems}
- className={styles.actionToggleScopeToggle}
testId={`action-toggle-scope-${resource}-${action}`}
/>
</div>
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.module.scss b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.module.scss
index 2243a7534e..ce1f483a74 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.module.scss
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.module.scss
@@ -42,11 +42,6 @@
overflow-y: auto;
}
-.itemInputSelectorBadge {
- --badge-border-radius: 4px;
- --badge-hover-background: var(--l2-background) !important;
-}
-
.itemInputSelectorInfoIcon {
flex-shrink: 0;
color: var(--l2-foreground);
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.tsx
index 6ce5a15b3d..6c1d7d7c51 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.tsx
@@ -1,10 +1,10 @@
import { useCallback, useRef, useState } from 'react';
import { Info, Plus } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
+import { Pill, type PillCloseEvent } from '@signozhq/ui/pill';
import { Typography } from '@signozhq/ui/typography';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import cx from 'classnames';
import styles from './ItemInputSelector.module.scss';
@@ -93,7 +93,7 @@ function ItemInputSelector({
);
const handleBadgeClose = useCallback(
- (e: React.MouseEvent, itemId: string, index: number): void => {
+ (e: PillCloseEvent, itemId: string, index: number): void => {
e.preventDefault();
handleRemove(itemId);
@@ -135,13 +135,15 @@ function ItemInputSelector({
prefix={prefixElement}
suffix={
<Button
+ color="primary"
variant="solid"
size="sm"
onClick={handleAddClick}
disabled={!inputValue.trim()}
- data-testid={`item-input-selector-add-btn-${testId}`}
+ disabledTooltip="Enter a value first"
+ testId={`item-input-selector-add-btn-${testId}`}
+ prefix={<Plus size={14} />}
>
- <Plus size={14} />
Add
</Button>
}
@@ -151,22 +153,19 @@ function ItemInputSelector({
<div className={styles.itemInputSelectorFooter}>
<div ref={badgesRef} className={styles.itemInputSelectorBadges}>
{selectedIds.map((id, index) => (
- <Badge
+ <Pill.Closeable
key={id}
- color="secondary"
- className={styles.itemInputSelectorBadge}
testId={`item-badge-${testId}-${index}`}
- closable
closeAriaLabel={`Remove ${id}`}
onClose={(e): void => handleBadgeClose(e, id, index)}
>
<Typography as="span" size="small" truncate={1} title={id}>
{id}
</Typography>
- </Badge>
+ </Pill.Closeable>
))}
</div>
- <TooltipSimple
+ <Tooltip
title={
<Typography align="left">
Still not sure on how to add selectors? <br />
@@ -182,7 +181,7 @@ function ItemInputSelector({
}
>
<Info size={16} className={styles.itemInputSelectorInfoIcon} />
- </TooltipSimple>
+ </Tooltip>
</div>
) : (
<Typography className={styles.itemInputSelectorHint}>
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/JsonEditor.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/components/JsonEditor.tsx
index 5d540ebccd..111ec08eb8 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/JsonEditor.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/JsonEditor.tsx
@@ -11,7 +11,7 @@ import MEditor, { Monaco, OnMount } from '@monaco-editor/react';
import { Color } from '@signozhq/design-tokens';
import { Check, Copy } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import type { AuthtypesTransactionGroupDTO } from 'api/generated/services/sigNoz.schemas';
import { useIsDarkMode } from 'hooks/useDarkMode';
@@ -163,23 +163,27 @@ const JsonEditor = forwardRef<JsonEditorRef, JsonEditorProps>(
return (
<div className={styles.jsonEditor} data-testid="json-editor">
<div className={styles.jsonEditorContainer}>
- <TooltipSimple title={copied ? 'Copied!' : 'Copy JSON'}>
- <Button
- variant="ghost"
- size="sm"
- className={styles.copyButton}
- onClick={handleCopy}
- >
- {copied ? (
- <Check size={14} color={Color.BG_FOREST_400} />
- ) : (
- <Copy
- size={14}
- color={isDarkMode ? Color.BG_VANILLA_400 : Color.TEXT_INK_400}
- />
- )}
- </Button>
- </TooltipSimple>
+ <div className={styles.copyButton}>
+ <Tooltip title={copied ? 'Copied!' : 'Copy JSON'}>
+ <Button
+ color="secondary"
+ variant="ghost"
+ size="sm"
+ onClick={handleCopy}
+ icon
+ aria-label={copied ? 'Copied' : 'Copy JSON'}
+ >
+ {copied ? (
+ <Check size={14} color={Color.BG_FOREST_400} />
+ ) : (
+ <Copy
+ size={14}
+ color={isDarkMode ? Color.BG_VANILLA_400 : Color.TEXT_INK_400}
+ />
+ )}
+ </Button>
+ </Tooltip>
+ </div>
<MEditor
value={jsonBuffer}
language="json"
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.module.scss b/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.module.scss
index f45551136d..2016ccefb2 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.module.scss
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.module.scss
@@ -10,6 +10,7 @@
display: flex;
align-items: center;
justify-content: space-between;
+ --radio-group-display: flex;
}
.permissionEditorTitle {
@@ -30,61 +31,6 @@
margin: 0px var(--spacing-4);
}
-.permissionEditorModeToggle {
- display: inline-flex;
- grid-auto-flow: column;
- gap: 0;
- flex-shrink: 0;
- border: 1px solid var(--l2-border);
- border-radius: 2px;
-}
-
-.permissionEditorModeItem {
- position: relative;
- display: flex;
- align-items: center;
-
- &:not(:last-child) {
- border-right: 1px solid var(--l2-border);
- }
-
- label {
- display: flex;
- align-items: center;
- min-height: 24px;
- padding: var(--spacing-3) var(--spacing-6);
- font-family: Inter;
- font-size: var(--periscope-font-size-base);
- line-height: var(--line-height-20);
- color: var(--l2-foreground);
- white-space: nowrap;
- cursor: pointer;
- user-select: none;
- }
-}
-
-.permissionEditorModeInput {
- position: absolute;
- inset: 0;
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- border: none;
- background: transparent;
- cursor: pointer;
-
- * {
- display: none;
- }
-
- &[data-state='checked'] + label {
- background: var(--l3-background);
- color: var(--l1-foreground);
- font-weight: var(--font-weight-medium);
- }
-}
-
.permissionEditorContent {
display: flex;
flex-direction: column;
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.tsx
index ddf08bef7c..52f0464cd2 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/PermissionEditor.tsx
@@ -1,8 +1,8 @@
import { useCallback, useRef, useState } from 'react';
import { SolidAlertTriangle } from '@signozhq/icons';
-import { Button, ButtonGroup } from '@signozhq/ui/button';
+import { ButtonGroup } from '@signozhq/ui/button-group';
import { ConfirmDialog } from '@signozhq/ui/dialog';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Typography } from '@signozhq/ui/typography';
import { Skeleton } from 'antd';
import type { AuthZResource, AuthZVerb } from 'lib/authz/hooks/useAuthZ/types';
@@ -158,29 +158,27 @@ function PermissionEditor({
Transaction Groups
</Typography>
<hr className={styles.permissionEditorDivider} />
- <RadioGroup
- className={styles.permissionEditorModeToggle}
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ type="single"
+ size="sm"
value={mode}
onChange={handleModeChange}
testId="permission-editor-mode"
- >
- <RadioGroupItem
- value="interactive"
- containerClassName={styles.permissionEditorModeItem}
- className={styles.permissionEditorModeInput}
- testId="permission-editor-mode-interactive"
- >
- Interactive
- </RadioGroupItem>
- <RadioGroupItem
- value="json"
- containerClassName={styles.permissionEditorModeItem}
- className={styles.permissionEditorModeInput}
- testId="permission-editor-mode-json"
- >
- JSON
- </RadioGroupItem>
- </RadioGroup>
+ items={[
+ {
+ value: 'interactive',
+ label: 'Interactive',
+ testId: 'permission-editor-mode-interactive',
+ },
+ {
+ value: 'json',
+ label: 'JSON',
+ testId: 'permission-editor-mode-json',
+ },
+ ]}
+ />
</div>
<div className={styles.permissionEditorContent}>
@@ -192,14 +190,21 @@ function PermissionEditor({
color="secondary"
size="sm"
testId="toggle-all-group"
- >
- <Button onClick={handleExpandAll} data-testid="expand-all-button">
- Expand all
- </Button>
- <Button onClick={handleCollapseAll} data-testid="collapse-all-button">
- Collapse all
- </Button>
- </ButtonGroup>
+ items={[
+ {
+ value: 'expand-all',
+ label: 'Expand all',
+ onClick: handleExpandAll,
+ testId: 'expand-all-button',
+ },
+ {
+ value: 'collapse-all',
+ label: 'Collapse all',
+ onClick: handleCollapseAll,
+ testId: 'collapse-all-button',
+ },
+ ]}
+ />
</div>
<div className={styles.permissionEditorResourceList}>
{resources.map((resource) => (
@@ -235,7 +240,7 @@ function PermissionEditor({
title="Discard JSON changes?"
titleIcon={<SolidAlertTriangle size={14} color="#fdd600" />}
confirmText="Discard"
- confirmColor="destructive"
+ confirmColor="danger"
cancelText="Stay in JSON"
onConfirm={handleDiscardConfirm}
onCancel={handleDiscardCancel}
diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.tsx
index ee703ac25f..351a445658 100644
--- a/frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.tsx
+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.tsx
@@ -55,11 +55,12 @@ function TelemetrySelectorWizard({
const trigger = (
<Button
+ color="primary"
variant="solid"
size="sm"
- data-testid={`telemetry-wizard-trigger-${testId}`}
+ testId={`telemetry-wizard-trigger-${testId}`}
+ prefix={<Wand size={14} />}
>
- <Wand size={14} />
Wizard
</Button>
);
@@ -67,6 +68,7 @@ function TelemetrySelectorWizard({
const footer = (
<>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={(): void => handleOpenChange(false)}
@@ -74,10 +76,13 @@ function TelemetrySelectorWizard({
Cancel
</Button>
<Button
+ size="md"
+ color="primary"
variant="solid"
onClick={handleAdd}
disabled={!canAdd}
- data-testid={`wizard-add-btn-${testId}`}
+ disabledTooltip={validation.message}
+ testId={`wizard-add-btn-${testId}`}
>
Add Selector
</Button>
@@ -153,9 +158,11 @@ function TelemetrySelectorWizard({
testId={`wizard-value-input-${testId}`}
/>
<Checkbox
+ color="primary"
id={`wizard-any-resource-${testId}`}
value={isAnyResource}
disabled={!supportsKeyScoping}
+ disabledTooltip="This query type does not support key scoping"
onChange={(checked): void => handleAnyResourceChange(checked === true)}
testId={`wizard-any-resource-checkbox-${testId}`}
>
diff --git a/frontend/src/container/RolesSettings/DeleteRoleModal/DeleteRoleModal.tsx b/frontend/src/container/RolesSettings/DeleteRoleModal/DeleteRoleModal.tsx
index 5c5f16a354..e7b2360022 100644
--- a/frontend/src/container/RolesSettings/DeleteRoleModal/DeleteRoleModal.tsx
+++ b/frontend/src/container/RolesSettings/DeleteRoleModal/DeleteRoleModal.tsx
@@ -32,7 +32,7 @@ function DeleteRoleModal({
title="Delete Role"
titleIcon={<Trash2 size={14} />}
confirmText="Delete Role"
- confirmColor="destructive"
+ confirmColor="danger"
cancelText="Cancel"
onConfirm={onConfirm}
onCancel={onCancel}
diff --git a/frontend/src/container/RolesSettings/RolesSettings.module.scss b/frontend/src/container/RolesSettings/RolesSettings.module.scss
index ec4b1a5973..1bf7b50bbe 100644
--- a/frontend/src/container/RolesSettings/RolesSettings.module.scss
+++ b/frontend/src/container/RolesSettings/RolesSettings.module.scss
@@ -50,15 +50,9 @@
margin-bottom: 12px;
}
-.roleSettingsToolbarButton {
- display: flex;
- width: 156px;
- height: 32px;
- padding: 6px 12px;
- justify-content: center;
- align-items: center;
- gap: 6px;
- border-radius: 2px;
+.rolesSettingsSearch {
+ flex: 1;
+ min-width: 0;
}
.rolesDescriptionTooltip {
diff --git a/frontend/src/container/RolesSettings/RolesSettings.tsx b/frontend/src/container/RolesSettings/RolesSettings.tsx
index 0bbbae9d5e..a44edbac82 100644
--- a/frontend/src/container/RolesSettings/RolesSettings.tsx
+++ b/frontend/src/container/RolesSettings/RolesSettings.tsx
@@ -25,9 +25,11 @@ function RolesSettings(): JSX.Element {
<div className={styles.rolesSettingsHeader}>
<h3 className={styles.rolesSettingsHeaderTitle}>Roles</h3>
<p className={styles.rolesSettingsHeaderDescription}>
- {isRolesEnabled
- ? 'Create and manage custom roles for your team. '
- : 'The built-in roles of this instance.'}{' '}
+ <span className="translate-safe">
+ {isRolesEnabled
+ ? 'Create and manage custom roles for your team. '
+ : 'The built-in roles of this instance.'}
+ </span>{' '}
<a
href="https://signoz.io/docs/manage/administrator-guide/iam/roles/"
target="_blank"
@@ -40,7 +42,10 @@ function RolesSettings(): JSX.Element {
</div>
<div className={styles.rolesSettingsContent}>
<div className={styles.rolesSettingsToolbar}>
- <AuthZTooltip checks={[RoleListPermission]}>
+ <AuthZTooltip
+ checks={[RoleListPermission]}
+ triggerClassName={styles.rolesSettingsSearch}
+ >
<Input
type="search"
placeholder="Search for roles..."
@@ -50,13 +55,14 @@ function RolesSettings(): JSX.Element {
</AuthZTooltip>
{isRolesEnabled && (
<AuthZButton
+ size="md"
checks={[RoleCreatePermission]}
variant="solid"
color="primary"
- className={styles.roleSettingsToolbarButton}
+ width={156}
onClick={(): void => history.push(ROUTES.ROLE_CREATE)}
+ prefix={<Plus size={14} />}
>
- <Plus size={14} />
Custom role
</AuthZButton>
)}
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/ReadOnlyJsonViewer.tsx b/frontend/src/container/RolesSettings/ViewRolePage/ReadOnlyJsonViewer.tsx
index 54f65b9e72..c8440c24db 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/ReadOnlyJsonViewer.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/ReadOnlyJsonViewer.tsx
@@ -4,7 +4,7 @@ import MEditor from '@monaco-editor/react';
import { Color } from '@signozhq/design-tokens';
import { Check, Copy } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { useIsDarkMode } from 'hooks/useDarkMode';
import {
@@ -57,24 +57,28 @@ function ReadOnlyJsonViewer({
data-testid="read-only-json-viewer"
>
<div className={styles.editorContainer}>
- <TooltipSimple title={copied ? 'Copied!' : 'Copy JSON'}>
- <Button
- variant="ghost"
- size="sm"
- className={styles.copyButton}
- onClick={handleCopy}
- data-testid="read-only-json-viewer-copy-button"
- >
- {copied ? (
- <Check size={14} color={Color.BG_FOREST_400} />
- ) : (
- <Copy
- size={14}
- color={isDarkMode ? Color.BG_VANILLA_400 : Color.TEXT_INK_400}
- />
- )}
- </Button>
- </TooltipSimple>
+ <div className={styles.copyButton}>
+ <Tooltip title={copied ? 'Copied!' : 'Copy JSON'}>
+ <Button
+ color="secondary"
+ variant="ghost"
+ size="sm"
+ onClick={handleCopy}
+ testId="read-only-json-viewer-copy-button"
+ icon
+ aria-label={copied ? 'Copied' : 'Copy JSON'}
+ >
+ {copied ? (
+ <Check size={14} color={Color.BG_FOREST_400} />
+ ) : (
+ <Copy
+ size={14}
+ color={isDarkMode ? Color.BG_VANILLA_400 : Color.TEXT_INK_400}
+ />
+ )}
+ </Button>
+ </Tooltip>
+ </div>
<MEditor
value={jsonContent}
language="json"
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.module.scss b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.module.scss
index d8faadbb67..6ea740f456 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.module.scss
+++ b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.module.scss
@@ -23,24 +23,12 @@
gap: var(--spacing-6);
}
-.backButton {
- --button-padding: var(--spacing-3);
-}
-
.viewRolePageActions {
display: flex;
align-items: center;
gap: var(--spacing-6);
}
-.deleteButton {
- margin-right: 0px;
-
- &:disabled {
- pointer-events: auto;
- }
-}
-
.unsavedText {
font-family: Inter;
font-size: var(--periscope-font-size-base);
@@ -127,6 +115,7 @@
display: flex;
align-items: center;
justify-content: space-between;
+ --radio-group-display: flex;
}
.permissionTitle {
@@ -147,61 +136,6 @@
margin: 0px var(--spacing-4);
}
-.permissionModeToggle {
- display: inline-flex;
- grid-auto-flow: column;
- gap: 0;
- flex-shrink: 0;
- border: 1px solid var(--l2-border);
- border-radius: 2px;
-}
-
-.permissionModeItem {
- position: relative;
- display: flex;
- align-items: center;
-
- &:not(:last-child) {
- border-right: 1px solid var(--l2-border);
- }
-
- label {
- display: flex;
- align-items: center;
- min-height: 24px;
- padding: var(--spacing-3) var(--spacing-6);
- font-family: Inter;
- font-size: var(--periscope-font-size-base);
- line-height: var(--line-height-20);
- color: var(--l2-foreground);
- white-space: nowrap;
- cursor: pointer;
- user-select: none;
- }
-}
-
-.permissionModeInput {
- position: absolute;
- inset: 0;
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- border: none;
- background: transparent;
- cursor: pointer;
-
- * {
- display: none;
- }
-
- &[data-state='checked'] + label {
- background: var(--l3-background);
- color: var(--l1-foreground);
- font-weight: var(--font-weight-medium);
- }
-}
-
.permissionContent {
display: flex;
flex-direction: column;
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx
index 074d2dc428..e4b7f73663 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx
@@ -3,7 +3,7 @@ import { ArrowLeft } from '@signozhq/icons';
import { Badge } from '@signozhq/ui/badge';
import { Button } from '@signozhq/ui/button';
import { Divider } from '@signozhq/ui/divider';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Tabs } from '@signozhq/ui/tabs';
import { Typography } from '@signozhq/ui/typography';
import { Skeleton } from 'antd';
@@ -73,29 +73,27 @@ function ViewRoleContentInner({
Transaction Groups
</Typography>
<hr className={styles.permissionDivider} />
- <RadioGroup
- className={styles.permissionModeToggle}
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ type="single"
+ size="sm"
value={viewMode}
onChange={handleModeChange}
testId="permission-view-mode"
- >
- <RadioGroupItem
- value="list"
- containerClassName={styles.permissionModeItem}
- className={styles.permissionModeInput}
- testId="permission-view-mode-list"
- >
- List
- </RadioGroupItem>
- <RadioGroupItem
- value="json"
- containerClassName={styles.permissionModeItem}
- className={styles.permissionModeInput}
- testId="permission-view-mode-json"
- >
- JSON
- </RadioGroupItem>
- </RadioGroup>
+ items={[
+ {
+ value: 'list',
+ label: 'List',
+ testId: 'permission-view-mode-list',
+ },
+ {
+ value: 'json',
+ label: 'JSON',
+ testId: 'permission-view-mode-json',
+ },
+ ]}
+ />
</div>
<div className={styles.permissionContent}>
@@ -154,7 +152,7 @@ function ViewRoleContentInner({
<label htmlFor="role-created-at" className={styles.formLabel}>
Created At
</label>
- <Badge color="secondary">
+ <Badge textTransform="none" variant="solid" color="secondary">
{formatTimezoneAdjustedTimestampOptional(role.createdAt)}
</Badge>
</div>
@@ -162,7 +160,7 @@ function ViewRoleContentInner({
<label htmlFor="role-modified-at" className={styles.formLabel}>
Last Modified At
</label>
- <Badge color="secondary">
+ <Badge textTransform="none" variant="solid" color="secondary">
{formatTimezoneAdjustedTimestampOptional(role.updatedAt)}
</Badge>
</div>
@@ -172,6 +170,9 @@ function ViewRoleContentInner({
<Divider />
<Tabs
+ variant="primary"
+ orientation="horizontal"
+ alignment="start"
className={styles.roleTabs}
value={activeTab}
onChange={handleTabChange}
@@ -232,11 +233,13 @@ function ViewRolePage(): JSX.Element {
<div className={styles.viewRolePageHeader}>
<div className={styles.viewRolePageHeaderLeft}>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={handleCancel}
- data-testid="cancel-button"
- className={styles.backButton}
+ testId="cancel-button"
+ icon
+ aria-label="Back"
>
<ArrowLeft size={16} />
</Button>
@@ -276,11 +279,13 @@ function ViewRolePage(): JSX.Element {
<div className={styles.viewRolePageHeader}>
<div className={styles.viewRolePageHeaderLeft}>
<Button
+ size="md"
variant="ghost"
color="secondary"
onClick={handleCancel}
- data-testid="cancel-button"
- className={styles.backButton}
+ testId="cancel-button"
+ icon
+ aria-label="Back"
>
<ArrowLeft size={16} />
</Button>
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsx b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsx
index 2026c25d3e..80d838f863 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsx
@@ -7,7 +7,6 @@ import {
buildRoleReadPermission,
buildRoleUpdatePermission,
} from 'lib/authz/hooks/useAuthZ/permissions/role.permissions';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
export function ViewRolePageHeaderActions({
isRoleLoading,
@@ -26,11 +25,11 @@ export function ViewRolePageHeaderActions({
if (isRoleLoading) {
return (
<Button
+ size="md"
variant="link"
- color="destructive"
- disabled
- data-testid="delete-button"
- className={styles.deleteButton}
+ color="danger"
+ loading
+ testId="delete-button"
>
Delete
</Button>
@@ -39,29 +38,28 @@ export function ViewRolePageHeaderActions({
if (isManaged) {
return (
- <TooltipSimple title="Managed roles cannot be deleted">
- <Button
- variant="link"
- color="destructive"
- disabled
- data-testid="delete-button"
- className={styles.deleteButton}
- >
- Delete
- </Button>
- </TooltipSimple>
+ <Button
+ size="md"
+ variant="link"
+ color="danger"
+ disabled
+ disabledTooltip="Managed roles cannot be deleted"
+ testId="delete-button"
+ >
+ Delete
+ </Button>
);
}
return (
<AuthZButton
+ size="md"
checks={[buildRoleDeletePermission(roleName)]}
authZEnabled={!!roleName}
variant="link"
- color="destructive"
+ color="danger"
onClick={handleOpenDeleteModal}
data-testid="delete-button"
- className={styles.deleteButton}
>
Delete
</AuthZButton>
@@ -71,7 +69,13 @@ export function ViewRolePageHeaderActions({
const renderUpdateButton = (): JSX.Element => {
if (isRoleLoading) {
return (
- <Button variant="solid" color="primary" disabled data-testid="save-button">
+ <Button
+ size="md"
+ variant="solid"
+ color="primary"
+ loading
+ testId="save-button"
+ >
Update
</Button>
);
@@ -79,16 +83,22 @@ export function ViewRolePageHeaderActions({
if (isManaged) {
return (
- <TooltipSimple title="Managed roles cannot be updated">
- <Button variant="solid" color="primary" disabled data-testid="save-button">
- Update
- </Button>
- </TooltipSimple>
+ <Button
+ size="md"
+ variant="solid"
+ color="primary"
+ disabled
+ disabledTooltip="Managed roles cannot be updated"
+ testId="save-button"
+ >
+ Update
+ </Button>
);
}
return (
<AuthZButton
+ size="md"
checks={[
buildRoleReadPermission(roleName),
buildRoleUpdatePermission(roleName),
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.actions.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.actions.test.tsx
index b003bfd265..9c35eae05d 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.actions.test.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.actions.test.tsx
@@ -63,7 +63,7 @@ describe('ViewRolePage - Actions', () => {
const updateBtn = await screen.findByTestId('save-button');
await waitFor(() => {
- expect(updateBtn).not.toBeDisabled();
+ expect(updateBtn).not.toHaveAttribute('aria-disabled', 'true');
});
await user.click(updateBtn);
@@ -81,7 +81,7 @@ describe('ViewRolePage - Actions', () => {
const deleteBtn = await screen.findByTestId('delete-button');
await waitFor(() => {
- expect(deleteBtn).not.toBeDisabled();
+ expect(deleteBtn).not.toHaveAttribute('aria-disabled', 'true');
});
await user.click(deleteBtn);
@@ -113,7 +113,7 @@ describe('ViewRolePage - Actions', () => {
const deleteBtn = await screen.findByTestId('delete-button');
await waitFor(() => {
- expect(deleteBtn).not.toBeDisabled();
+ expect(deleteBtn).not.toHaveAttribute('aria-disabled', 'true');
});
await user.click(deleteBtn);
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx
index 784f066f9a..06daa3cccc 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx
@@ -1,4 +1,3 @@
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import userEvent from '@testing-library/user-event';
import * as roleApi from 'api/generated/services/role';
import {
@@ -142,17 +141,19 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- { initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}` },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,
+ });
await waitFor(() => {
- expect(screen.getByTestId('delete-button')).not.toBeDisabled();
- expect(screen.getByTestId('save-button')).not.toBeDisabled();
+ expect(screen.getByTestId('delete-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(screen.getByTestId('save-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
@@ -208,15 +209,9 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
+ });
await expect(
screen.findByTestId('save-button'),
@@ -240,18 +235,15 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
+ });
await waitFor(() => {
- expect(screen.getByTestId('save-button')).toBeDisabled();
+ expect(screen.getByTestId('save-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -276,18 +268,15 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
+ });
await waitFor(() => {
- expect(screen.getByTestId('save-button')).toBeDisabled();
+ expect(screen.getByTestId('save-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -314,15 +303,9 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
+ });
const updateButton = await screen.findByTestId('save-button');
await user.hover(updateButton);
@@ -351,19 +334,13 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
+ });
await waitFor(() => {
const updateButton = screen.getByTestId('save-button');
- expect(updateButton).toBeDisabled();
+ expect(updateButton).toHaveAttribute('aria-disabled', 'true');
expect(updateButton).toHaveAttribute('data-denied-permissions');
});
});
@@ -387,18 +364,15 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
+ });
await waitFor(() => {
- expect(screen.getByTestId('delete-button')).toBeDisabled();
+ expect(screen.getByTestId('delete-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -419,18 +393,15 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
+ });
await waitFor(() => {
- expect(screen.getByTestId('delete-button')).not.toBeDisabled();
+ expect(screen.getByTestId('delete-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -451,19 +422,13 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),
+ });
await waitFor(() => {
const deleteButton = screen.getByTestId('delete-button');
- expect(deleteButton).toBeDisabled();
+ expect(deleteButton).toHaveAttribute('aria-disabled', 'true');
expect(deleteButton).toHaveAttribute('data-denied-permissions');
});
});
@@ -491,15 +456,9 @@ describe('ViewRolePage - AuthZ', () => {
error: null,
} as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
+ });
const deleteButton = await screen.findByTestId('delete-button');
await user.hover(deleteButton);
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.featureGate.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.featureGate.test.tsx
index 2c967f7fb2..036bb13187 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.featureGate.test.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.featureGate.test.tsx
@@ -64,7 +64,10 @@ describe('ViewRolePage - Feature Gate', () => {
});
await waitFor(() => {
- expect(screen.getByTestId('cancel-button')).not.toBeDisabled();
+ expect(screen.getByTestId('cancel-button')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx
index 6efa4d841b..48d790e0cb 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx
@@ -51,7 +51,10 @@ describe('ViewRolePage - Loading State', () => {
await expect(
screen.findByTestId('delete-button'),
).resolves.toBeInTheDocument();
- expect(screen.getByTestId('delete-button')).toBeDisabled();
+ expect(screen.getByTestId('delete-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('does not fetch when roleId is missing from URL', () => {
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.managedRole.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.managedRole.test.tsx
index 82ff2ace5f..be41e3cbcd 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.managedRole.test.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.managedRole.test.tsx
@@ -1,4 +1,3 @@
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { render, screen, waitFor } from 'tests/test-utils';
import ViewRolePage from '../ViewRolePage';
@@ -20,47 +19,35 @@ describe('ViewRolePage - Managed Role', () => {
});
it('disables Delete button for managed roles', async () => {
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
+ });
await waitFor(() => {
- expect(screen.getByTestId('delete-button')).toBeDisabled();
+ expect(screen.getByTestId('delete-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
it('disables Update button for managed roles', async () => {
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
+ });
await waitFor(() => {
- expect(screen.getByTestId('save-button')).toBeDisabled();
+ expect(screen.getByTestId('save-button')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
it('still shows Cancel button for managed roles', async () => {
- render(
- <TooltipProvider>
- <ViewRolePage />
- </TooltipProvider>,
- undefined,
- {
- initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
- },
- );
+ render(<ViewRolePage />, undefined, {
+ initialRoute: buildViewRoleRoute(MANAGED_ROLE_ID, MANAGED_ROLE_NAME),
+ });
await expect(
screen.findByTestId('cancel-button'),
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx
index 266920af49..5bf847e3d6 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx
@@ -716,7 +716,7 @@ describe('ViewRolePage - JSON Viewer Copy Button', () => {
await user.click(jsonToggle);
const copyButton = screen.getByTestId('read-only-json-viewer-copy-button');
- expect(copyButton).not.toBeDisabled();
+ expect(copyButton).not.toHaveAttribute('aria-disabled', 'true');
await user.click(copyButton);
});
});
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/components/PermissionOverview.tsx b/frontend/src/container/RolesSettings/ViewRolePage/components/PermissionOverview.tsx
index 0fe9dc75a8..57ff3e7612 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/components/PermissionOverview.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/components/PermissionOverview.tsx
@@ -1,6 +1,6 @@
import { useCallback, useMemo, useState } from 'react';
import { Typography } from '@signozhq/ui/typography';
-import { Button, ButtonGroup } from '@signozhq/ui/button';
+import { ButtonGroup } from '@signozhq/ui/button-group';
import { Skeleton } from 'antd';
import { useRolePermissions } from '../../hooks/useRolePermissions';
@@ -94,14 +94,21 @@ function PermissionOverview({
color="secondary"
size="sm"
testId="toggle-all-group"
- >
- <Button onClick={handleExpandAll} data-testid="expand-all-button">
- Expand all
- </Button>
- <Button onClick={handleCollapseAll} data-testid="collapse-all-button">
- Collapse all
- </Button>
- </ButtonGroup>
+ items={[
+ {
+ value: 'expand-all',
+ label: 'Expand all',
+ onClick: handleExpandAll,
+ testId: 'expand-all-button',
+ },
+ {
+ value: 'collapse-all',
+ label: 'Collapse all',
+ onClick: handleCollapseAll,
+ testId: 'collapse-all-button',
+ },
+ ]}
+ />
</div>
<div className={styles.grid}>
{resources.map((resource) => (
diff --git a/frontend/src/container/RolesSettings/ViewRolePage/components/SelectedItemsChips.tsx b/frontend/src/container/RolesSettings/ViewRolePage/components/SelectedItemsChips.tsx
index c3e8c9e688..2120104c83 100644
--- a/frontend/src/container/RolesSettings/ViewRolePage/components/SelectedItemsChips.tsx
+++ b/frontend/src/container/RolesSettings/ViewRolePage/components/SelectedItemsChips.tsx
@@ -17,8 +17,9 @@ function SelectedItemsChips({
<ul className={styles.chips} data-testid={testId}>
{ids.map((id) => (
<Badge
+ textTransform="none"
key={`selector-badge-${componentId}-${id}`}
- variant="outline"
+ variant="outlined"
color="secondary"
>
{id}
diff --git a/frontend/src/container/RoutingPolicies/RoutingPolicyListItem.tsx b/frontend/src/container/RoutingPolicies/RoutingPolicyListItem.tsx
index 4d850366d8..2aa27b12f0 100644
--- a/frontend/src/container/RoutingPolicies/RoutingPolicyListItem.tsx
+++ b/frontend/src/container/RoutingPolicies/RoutingPolicyListItem.tsx
@@ -119,7 +119,12 @@ function PolicyListItemContent({
<Typography>Channels</Typography>
<div>
{routingPolicy.channels.map((channel) => (
- <Badge key={channel} color="vanilla">
+ <Badge
+ textTransform="none"
+ variant="solid"
+ key={channel}
+ color="secondary"
+ >
{channel}
</Badge>
))}
diff --git a/frontend/src/container/SavedViews/DeleteSavedViewDialog.tsx b/frontend/src/container/SavedViews/DeleteSavedViewDialog.tsx
index a0282e53f2..ad212545b9 100644
--- a/frontend/src/container/SavedViews/DeleteSavedViewDialog.tsx
+++ b/frontend/src/container/SavedViews/DeleteSavedViewDialog.tsx
@@ -24,6 +24,7 @@ function DeleteSavedViewDialog({
footer={
<>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={onCancel}
@@ -33,8 +34,9 @@ function DeleteSavedViewDialog({
Cancel
</Button>
<Button
+ size="md"
variant="solid"
- color="destructive"
+ color="danger"
loading={isDeleting}
onClick={onConfirm}
prefix={<Check size={12} />}
diff --git a/frontend/src/container/SavedViews/SaveChangesMenu.tsx b/frontend/src/container/SavedViews/SaveChangesMenu.tsx
index 4b8919001d..bf204bfdde 100644
--- a/frontend/src/container/SavedViews/SaveChangesMenu.tsx
+++ b/frontend/src/container/SavedViews/SaveChangesMenu.tsx
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
import { Check } from '@signozhq/icons';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import SavedViewsIconButton from './SavedViewsIconButton';
import { SaveChangesMenuProps } from './types';
@@ -10,24 +10,40 @@ function SaveChangesMenu({
onSaveAsNew,
onUpdate,
}: SaveChangesMenuProps): JSX.Element {
- const items = useMemo<MenuItem[]>(
+ const items = useMemo<DropdownItemType[]>(
() => [
- { key: 'save-as-new', label: 'Save as new view', onClick: onSaveAsNew },
- { key: 'update', label: 'Update selected view', onClick: onUpdate },
+ {
+ type: 'item',
+ value: 'save-as-new',
+ label: 'Save as new view',
+ onClick: onSaveAsNew,
+ },
+ {
+ type: 'item',
+ value: 'update',
+ label: 'Update selected view',
+ onClick: onUpdate,
+ },
],
[onSaveAsNew, onUpdate],
);
return (
- <DropdownMenuSimple menu={{ items }} align="end">
+ <Dropdown
+ items={items}
+ nativeButton
+ align="end"
+ side="bottom"
+ disabled={disabled}
+ disabledTooltip="Saving the view"
+ >
<SavedViewsIconButton
title="Save changes"
icon={<Check size={14} />}
color="warning"
- disabled={disabled}
testId="saved-views-save-changes"
/>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/container/SavedViews/SaveViewModal.tsx b/frontend/src/container/SavedViews/SaveViewModal.tsx
index 57f86dfebd..d94440bfa7 100644
--- a/frontend/src/container/SavedViews/SaveViewModal.tsx
+++ b/frontend/src/container/SavedViews/SaveViewModal.tsx
@@ -59,11 +59,13 @@ function SaveViewModal({
Cancel
</Button>
<Button
+ variant="solid"
color="primary"
size="md"
prefix={<Check size={14} />}
loading={isSaving}
disabled={!displayName}
+ disabledTooltip="Enter a view name"
onClick={(): void => {
void handleSave();
}}
diff --git a/frontend/src/container/SavedViews/SavedViewsEmptyState.tsx b/frontend/src/container/SavedViews/SavedViewsEmptyState.tsx
index 7fdb830d7a..aa0ebe5f13 100644
--- a/frontend/src/container/SavedViews/SavedViewsEmptyState.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsEmptyState.tsx
@@ -37,7 +37,7 @@ function SavedViewsEmptyState({
size="sm"
prefix={<Plus size={12} />}
onClick={(): void => setIsModalOpen(true)}
- data-testid="saved-views-list-create"
+ testId="saved-views-list-create"
>
Create view
</Button>
diff --git a/frontend/src/container/SavedViews/SavedViewsHeader.tsx b/frontend/src/container/SavedViews/SavedViewsHeader.tsx
index 86b0b60df7..2d59b00f07 100644
--- a/frontend/src/container/SavedViews/SavedViewsHeader.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsHeader.tsx
@@ -3,7 +3,7 @@ import cx from 'classnames';
import { ArrowUpToLine, List, Plus, Undo2, X } from '@signozhq/icons';
import { Skeleton } from '@signozhq/ui/skeleton';
import { toast } from '@signozhq/ui/sonner';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
import {
@@ -80,7 +80,7 @@ function SavedViewsHeader({
testId="saved-views-loading"
/>
) : (
- <TooltipSimple title={name}>
+ <Tooltip title={name}>
<span
className={cx(styles.name, {
[styles.isDirty]: isDirty,
@@ -91,7 +91,7 @@ function SavedViewsHeader({
{isDirty && <span className={styles.dot} />}
<span className={styles.nameText}>{name}</span>
</span>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
@@ -101,6 +101,7 @@ function SavedViewsHeader({
title="Create new view"
icon={<Plus size={14} />}
disabled={isLoading}
+ disabledTooltip="Loading views"
onClick={(): void => setModalMode('create')}
testId="saved-views-create"
/>
@@ -127,6 +128,7 @@ function SavedViewsHeader({
icon={<X size={14} />}
color="warning"
disabled={isSaving}
+ disabledTooltip="Saving the view"
onClick={(): void => revertView(view)}
testId="saved-views-discard"
/>
diff --git a/frontend/src/container/SavedViews/SavedViewsIconButton.tsx b/frontend/src/container/SavedViews/SavedViewsIconButton.tsx
index 609e9881af..485baa35e8 100644
--- a/frontend/src/container/SavedViews/SavedViewsIconButton.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsIconButton.tsx
@@ -1,9 +1,18 @@
import { forwardRef } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Button, type VariantColorType } from '@signozhq/ui/button';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { SavedViewsIconButtonProps } from './types';
+// Ghost buttons only come in secondary, so the warning tone is a link button.
+const VARIANT_COLORS: Record<
+ NonNullable<SavedViewsIconButtonProps['color']>,
+ VariantColorType
+> = {
+ secondary: { variant: 'ghost', color: 'secondary' },
+ warning: { variant: 'link', color: 'warning' },
+};
+
// forwardRef and rest props so a menu can use it as its trigger.
const SavedViewsIconButton = forwardRef<
HTMLButtonElement,
@@ -15,26 +24,29 @@ const SavedViewsIconButton = forwardRef<
testId,
color = 'secondary',
disabled,
+ disabledTooltip,
onClick,
...triggerProps
},
ref,
): JSX.Element {
return (
- <TooltipSimple title={title}>
+ <Tooltip title={title}>
<Button
ref={ref}
- variant="ghost"
- color={color}
- size="icon"
+ {...VARIANT_COLORS[color]}
+ size="sm"
+ icon
aria-label={title}
- prefix={icon}
disabled={disabled}
+ disabledTooltip={disabledTooltip}
onClick={onClick}
{...triggerProps}
- data-testid={testId}
- />
- </TooltipSimple>
+ testId={testId}
+ >
+ {icon}
+ </Button>
+ </Tooltip>
);
});
diff --git a/frontend/src/container/SavedViews/SavedViewsList.module.scss b/frontend/src/container/SavedViews/SavedViewsList.module.scss
index a30cbfab8d..b8f6c1e5fe 100644
--- a/frontend/src/container/SavedViews/SavedViewsList.module.scss
+++ b/frontend/src/container/SavedViews/SavedViewsList.module.scss
@@ -76,15 +76,6 @@
opacity: 1;
}
-.rowButton {
- display: flex;
- align-items: center;
- justify-content: center;
- min-width: var(--spacing-12);
- height: var(--spacing-12);
- padding: var(--spacing-1);
-}
-
.rowName {
--button-height: 100%;
--button-padding: 0 var(--spacing-6);
@@ -96,12 +87,7 @@
flex: 1;
min-width: 0;
-}
-
-.rowNameText {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ height: 100%;
}
.loading {
diff --git a/frontend/src/container/SavedViews/SavedViewsList.tsx b/frontend/src/container/SavedViews/SavedViewsList.tsx
index 29f2566f54..a7502effdb 100644
--- a/frontend/src/container/SavedViews/SavedViewsList.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsList.tsx
@@ -118,7 +118,7 @@ function SavedViewsList({
color="secondary"
size="sm"
onClick={refetch}
- data-testid="saved-views-list-retry"
+ testId="saved-views-list-retry"
>
Retry
</Button>
diff --git a/frontend/src/container/SavedViews/SavedViewsListRow.tsx b/frontend/src/container/SavedViews/SavedViewsListRow.tsx
index cfbc8f08fb..0606610e39 100644
--- a/frontend/src/container/SavedViews/SavedViewsListRow.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsListRow.tsx
@@ -26,19 +26,23 @@ function SavedViewsListRow({
onMouseEnter={(event): void => hover.onRowEnter(view, event.currentTarget)}
onMouseLeave={hover.onRowLeave}
>
- <Button
- variant="ghost"
- color="secondary"
- className={styles.rowName}
- onClick={(): void => {
- if (!isActive) {
- onSelect(view);
- }
- }}
- data-testid="saved-views-row-name"
- >
- <span className={styles.rowNameText}>{name}</span>
- </Button>
+ <div className={styles.rowName}>
+ <Button
+ size="md"
+ variant="ghost"
+ color="secondary"
+ width="100%"
+ textOverflow="ellipsis"
+ onClick={(): void => {
+ if (!isActive) {
+ onSelect(view);
+ }
+ }}
+ testId="saved-views-row-name"
+ >
+ {name}
+ </Button>
+ </div>
{isActive && (
<SavedViewsRowButton
icon={<Undo2 size={14} />}
diff --git a/frontend/src/container/SavedViews/SavedViewsRowButton.tsx b/frontend/src/container/SavedViews/SavedViewsRowButton.tsx
index 9abed468aa..6ea752ca51 100644
--- a/frontend/src/container/SavedViews/SavedViewsRowButton.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsRowButton.tsx
@@ -1,11 +1,9 @@
import { forwardRef } from 'react';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { SavedViewsRowButtonProps } from './types';
-import styles from './SavedViewsList.module.scss';
-
// forwardRef and rest props so a menu can use it as its trigger.
const SavedViewsRowButton = forwardRef<
HTMLButtonElement,
@@ -20,21 +18,17 @@ const SavedViewsRowButton = forwardRef<
variant="link"
color="secondary"
size="sm"
- className={styles.rowButton}
+ icon
aria-label={label}
onClick={onClick}
{...triggerProps}
- data-testid={testId}
+ testId={testId}
>
{icon}
</Button>
);
- return tooltip ? (
- <TooltipSimple title={tooltip}>{button}</TooltipSimple>
- ) : (
- button
- );
+ return tooltip ? <Tooltip title={tooltip}>{button}</Tooltip> : button;
});
export default SavedViewsRowButton;
diff --git a/frontend/src/container/SavedViews/SavedViewsRowMenu.tsx b/frontend/src/container/SavedViews/SavedViewsRowMenu.tsx
index d1a89afa11..fdded7f08b 100644
--- a/frontend/src/container/SavedViews/SavedViewsRowMenu.tsx
+++ b/frontend/src/container/SavedViews/SavedViewsRowMenu.tsx
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
import { Ellipsis } from '@signozhq/icons';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { SAVED_VIEW_ROW_ACTIONS } from './constants';
import SavedViewsRowButton from './SavedViewsRowButton';
@@ -10,15 +10,24 @@ function SavedViewsRowMenu({
onAction,
onOpen,
}: SavedViewsRowMenuProps): JSX.Element {
- const items = useMemo<MenuItem[]>(
+ const items = useMemo<DropdownItemType[]>(
() =>
SAVED_VIEW_ROW_ACTIONS.flatMap(
- ({ key, label, icon: Icon, danger, hasDividerBefore }): MenuItem[] => [
- ...(hasDividerBefore ? [{ type: 'divider' as const }] : []),
+ ({
+ key,
+ label,
+ icon: Icon,
+ danger,
+ hasDividerBefore,
+ }): DropdownItemType[] => [
+ ...(hasDividerBefore
+ ? [{ type: 'separator' as const, value: `separator-${key}` }]
+ : []),
{
- key,
+ type: 'item' as const,
+ value: key,
label,
- icon: <Icon size={14} />,
+ prefix: <Icon size={14} />,
danger,
onClick: (): void => onAction(key),
},
@@ -28,16 +37,24 @@ function SavedViewsRowMenu({
);
return (
- <DropdownMenuSimple menu={{ items }} side="right" align="start">
+ <Dropdown
+ items={items}
+ nativeButton
+ side="right"
+ align="start"
+ onOpenChange={(open): void => {
+ if (open) {
+ onOpen();
+ }
+ }}
+ >
<SavedViewsRowButton
icon={<Ellipsis size={14} />}
label="More options"
tooltip="More options"
testId="saved-views-row-menu"
- onPointerDown={onOpen}
- onKeyDown={onOpen}
/>
- </DropdownMenuSimple>
+ </Dropdown>
);
}
diff --git a/frontend/src/container/SavedViews/__tests__/SavedViewHoverCard.test.tsx b/frontend/src/container/SavedViews/__tests__/SavedViewHoverCard.test.tsx
index 81cdb72032..517e5b7e0a 100644
--- a/frontend/src/container/SavedViews/__tests__/SavedViewHoverCard.test.tsx
+++ b/frontend/src/container/SavedViews/__tests__/SavedViewHoverCard.test.tsx
@@ -197,9 +197,7 @@ describe('SavedViewHoverCard', () => {
await renderPanel();
openCard('Errors');
- fireEvent.pointerDown(
- within(row('Errors')).getByTestId('saved-views-row-menu'),
- );
+ fireEvent.click(within(row('Errors')).getByTestId('saved-views-row-menu'));
expect(card()).toBeNull();
});
diff --git a/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.columns.test.tsx b/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.columns.test.tsx
index 0e05ae608f..c272abba1b 100644
--- a/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.columns.test.tsx
+++ b/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.columns.test.tsx
@@ -41,15 +41,25 @@ function Harness(): JSX.Element {
{columns.map((column) => column.name).join(',')}
</span>
<Button
- data-testid="add-column"
+ size="md"
+ variant="solid"
+ color="primary"
+ testId="add-column"
onClick={(): void =>
traces.updateColumns([...columns, { name: `extra-${columns.length}` }])
}
- />
+ >
+ Add column
+ </Button>
<Button
- data-testid="remount-header"
+ size="md"
+ variant="solid"
+ color="primary"
+ testId="remount-header"
onClick={(): void => setHeaderKey((key) => key + 1)}
- />
+ >
+ Remount header
+ </Button>
</>
);
}
diff --git a/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.save.test.tsx b/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.save.test.tsx
index 9cffede4cf..3b992b37ba 100644
--- a/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.save.test.tsx
+++ b/frontend/src/container/SavedViews/__tests__/SavedViewsHeader.save.test.tsx
@@ -90,7 +90,10 @@ describe('SavedViewsHeader saving', () => {
await userEvent.click(screen.getByTestId('saved-views-create'));
expect(within(modal()).getByText('Create new view')).toBeInTheDocument();
- expect(screen.getByTestId('save-view-submit')).toBeDisabled();
+ expect(screen.getByTestId('save-view-submit')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
await submitName('Slow checkout');
diff --git a/frontend/src/container/SavedViews/__tests__/SavedViewsPanel.rowMenu.test.tsx b/frontend/src/container/SavedViews/__tests__/SavedViewsPanel.rowMenu.test.tsx
index f32b32c5a7..fed141b797 100644
--- a/frontend/src/container/SavedViews/__tests__/SavedViewsPanel.rowMenu.test.tsx
+++ b/frontend/src/container/SavedViews/__tests__/SavedViewsPanel.rowMenu.test.tsx
@@ -1,4 +1,4 @@
-import { screen, waitFor, within } from '@testing-library/react';
+import { fireEvent, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { toast } from '@signozhq/ui/sonner';
import { SavedviewtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
@@ -63,10 +63,8 @@ async function chooseFromRowMenu(
item: string,
): Promise<void> {
await screen.findByTestId('saved-views-list');
- await userEvent.click(
- within(row(viewName)).getByTestId('saved-views-row-menu'),
- );
- await userEvent.click(await screen.findByRole('menuitem', { name: item }));
+ fireEvent.click(within(row(viewName)).getByTestId('saved-views-row-menu'));
+ fireEvent.click(await screen.findByRole('menuitem', { name: item }));
}
const chip = (): HTMLElement => screen.getByTestId('saved-views-name');
@@ -83,9 +81,7 @@ describe('SavedViewsPanel row menu', () => {
renderPanelWithHeader();
await screen.findByTestId('saved-views-list');
- await userEvent.click(
- within(row('Errors')).getByTestId('saved-views-row-menu'),
- );
+ fireEvent.click(within(row('Errors')).getByTestId('saved-views-row-menu'));
const items = await screen.findAllByRole('menuitem');
expect(items.map((item) => item.textContent)).toStrictEqual([
diff --git a/frontend/src/container/SavedViews/__tests__/savedViewsTestUtils.tsx b/frontend/src/container/SavedViews/__tests__/savedViewsTestUtils.tsx
index 2324c4a129..60e86d570f 100644
--- a/frontend/src/container/SavedViews/__tests__/savedViewsTestUtils.tsx
+++ b/frontend/src/container/SavedViews/__tests__/savedViewsTestUtils.tsx
@@ -5,7 +5,6 @@ import { Provider } from 'react-redux';
import { Router } from 'react-router-dom';
import { CompatRouter } from 'react-router-dom-v5-compat';
import { render, RenderResult } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { safeNavigateMock } from '__tests__/safeNavigateMock';
import {
SavedviewtypesSavedViewDTO,
@@ -232,14 +231,12 @@ export function renderWithExplorerProviders(
<Provider store={mockStore(store.getState())}>
<AppContext.Provider value={appContext}>
<TimezoneProvider>
- <TooltipProvider>
- <PreferenceContextProvider>
- <QueryBuilderProvider>
- <ExplorerShell dataSource={dataSource} />
- {ui}
- </QueryBuilderProvider>
- </PreferenceContextProvider>
- </TooltipProvider>
+ <PreferenceContextProvider>
+ <QueryBuilderProvider>
+ <ExplorerShell dataSource={dataSource} />
+ {ui}
+ </QueryBuilderProvider>
+ </PreferenceContextProvider>
</TimezoneProvider>
</AppContext.Provider>
</Provider>
diff --git a/frontend/src/container/SavedViews/types.ts b/frontend/src/container/SavedViews/types.ts
index 5fab1644e0..d97ca53ccc 100644
--- a/frontend/src/container/SavedViews/types.ts
+++ b/frontend/src/container/SavedViews/types.ts
@@ -1,4 +1,4 @@
-import { ReactElement } from 'react';
+import { ReactElement, ReactNode } from 'react';
import type { Link } from '@signozhq/icons';
import {
SavedviewtypesSavedViewDTO,
@@ -81,6 +81,7 @@ export interface SavedViewsIconButtonProps {
testId: string;
color?: 'secondary' | 'warning';
disabled?: boolean;
+ disabledTooltip?: ReactNode;
onClick?: () => void;
}
@@ -136,8 +137,6 @@ export interface SavedViewsRowButtonProps {
tooltip?: string;
testId: string;
onClick?: () => void;
- onPointerDown?: () => void;
- onKeyDown?: () => void;
}
export interface SavedViewsRowMenuProps {
diff --git a/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.authz.test.tsx b/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.authz.test.tsx
index 56f7a8a810..de11a539b8 100644
--- a/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.authz.test.tsx
+++ b/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.authz.test.tsx
@@ -130,7 +130,7 @@ describe('ServiceAccountsSettings — FGA', () => {
await waitFor(() => {
expect(
screen.getByRole('button', { name: /New Service Account/i }),
- ).toBeDisabled();
+ ).toHaveAttribute('aria-disabled', 'true');
});
});
@@ -155,7 +155,7 @@ describe('ServiceAccountsSettings — FGA', () => {
await waitFor(() => {
expect(
screen.getByRole('button', { name: /New Service Account/i }),
- ).not.toBeDisabled();
+ ).not.toHaveAttribute('aria-disabled', 'true');
});
});
});
diff --git a/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.styles.scss b/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.styles.scss
index fde7418912..ca1c5480fa 100644
--- a/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.styles.scss
+++ b/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.styles.scss
@@ -51,48 +51,15 @@
flex: 1;
min-width: 0;
}
-}
-
-.sa-status-badge {
- color: var(--l3-foreground);
- border-color: var(--l1-border);
-}
-
-.sa-settings-filter-trigger {
- display: flex;
- align-items: center;
- gap: var(--spacing-2);
- border: 1px solid var(--l1-border);
- border-radius: 2px;
- background-color: var(--l2-background);
- > span {
- color: var(--foreground);
- }
-
- &__chevron {
- flex-shrink: 0;
- color: var(--foreground);
+ &__search-trigger {
+ width: 100%;
}
}
-.sa-settings-filter-dropdown {
- .ant-dropdown-menu {
- padding: var(--padding-3) 14px;
- border-radius: 4px;
- border: 1px solid var(--l1-border);
- background: var(--l2-background);
- backdrop-filter: blur(20px);
- }
-
- .ant-dropdown-menu-item {
- background: transparent !important;
- padding: var(--padding-1) 0 !important;
-
- &:hover {
- background: transparent !important;
- }
- }
+.sa-settings-filter-trigger__chevron {
+ flex-shrink: 0;
+ color: var(--foreground);
}
.sa-settings-filter-option {
diff --git a/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.tsx b/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.tsx
index 189311976b..c749a892f3 100644
--- a/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.tsx
+++ b/frontend/src/container/ServiceAccountsSettings/ServiceAccountsSettings.tsx
@@ -2,10 +2,12 @@ import { useCallback, useEffect, useMemo } from 'react';
import { useQueryClient } from 'react-query';
import { Check, ChevronDown, Plus } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Input } from '@signozhq/ui/input';
-import { useListServiceAccounts } from 'api/generated/services/serviceaccount';
-import { invalidateListServiceAccounts } from 'api/generated/services/serviceaccount';
+import {
+ invalidateListServiceAccounts,
+ useListServiceAccounts,
+} from 'api/generated/services/serviceaccount';
import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
import { AuthZGuardContent } from 'lib/authz/components/AuthZGuard/AuthZGuardContent';
import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
@@ -136,9 +138,10 @@ function ServiceAccountsSettings(): JSX.Element {
const totalCount = allAccounts.length;
- const filterMenuItems: MenuItem[] = [
+ const filterMenuItems: DropdownItemType[] = [
{
- key: FilterMode.All,
+ type: 'item',
+ value: FilterMode.All,
label: (
<div className="sa-settings-filter-option">
<span>All accounts ⎯ {totalCount}</span>
@@ -151,7 +154,8 @@ function ServiceAccountsSettings(): JSX.Element {
},
},
{
- key: FilterMode.Active,
+ type: 'item',
+ value: FilterMode.Active,
label: (
<div className="sa-settings-filter-option">
<span>Active ⎯ {activeCount}</span>
@@ -164,7 +168,8 @@ function ServiceAccountsSettings(): JSX.Element {
},
},
{
- key: FilterMode.Deleted,
+ type: 'item',
+ value: FilterMode.Deleted,
label: (
<div className="sa-settings-filter-option">
<span>Deleted ⎯ {deletedCount}</span>
@@ -230,28 +235,32 @@ function ServiceAccountsSettings(): JSX.Element {
<div className="sa-settings__controls">
<AuthZTooltip checks={[SAListPermission]}>
<span>
- <DropdownMenuSimple
- menu={{ items: filterMenuItems }}
- className="sa-settings-filter-dropdown"
- >
+ <Dropdown items={filterMenuItems} nativeButton align="end" side="bottom">
<Button
+ size="md"
variant="solid"
color="secondary"
- className="sa-settings-filter-trigger"
- disabled={controlsDisabled}
+ loading={isAuthZLoading}
+ disabled={!canListServiceAccounts}
+ disabledTooltip={undefined}
+ suffix={
+ <ChevronDown
+ size={12}
+ className="sa-settings-filter-trigger__chevron"
+ />
+ }
>
<span>{filterLabel}</span>
- <ChevronDown
- size={12}
- className="sa-settings-filter-trigger__chevron"
- />
</Button>
- </DropdownMenuSimple>
+ </Dropdown>
</span>
</AuthZTooltip>
<div className="sa-settings__search">
- <AuthZTooltip checks={[SAListPermission]}>
+ <AuthZTooltip
+ checks={[SAListPermission]}
+ triggerClassName="sa-settings__search-trigger"
+ >
<Input
type="search"
name="service-accounts-search"
@@ -268,14 +277,15 @@ function ServiceAccountsSettings(): JSX.Element {
</div>
<AuthZButton
+ size="md"
checks={[SACreatePermission]}
variant="solid"
color="primary"
onClick={async (): Promise<void> => {
await setIsCreateModalOpen(true);
}}
+ prefix={<Plus size={12} />}
>
- <Plus size={12} />
New Service Account
</AuthZButton>
</div>
diff --git a/frontend/src/container/ServiceAccountsSettings/__tests__/ServiceAccountsSettings.authz.integration.test.tsx b/frontend/src/container/ServiceAccountsSettings/__tests__/ServiceAccountsSettings.authz.integration.test.tsx
index 464b821538..0b24973993 100644
--- a/frontend/src/container/ServiceAccountsSettings/__tests__/ServiceAccountsSettings.authz.integration.test.tsx
+++ b/frontend/src/container/ServiceAccountsSettings/__tests__/ServiceAccountsSettings.authz.integration.test.tsx
@@ -199,7 +199,7 @@ describe('ServiceAccountsSettings (integration)', () => {
await waitFor(() =>
expect(
screen.getByRole('button', { name: /New Service Account/i }),
- ).not.toBeDisabled(),
+ ).not.toHaveAttribute('aria-disabled', 'true'),
);
fireEvent.click(screen.getByRole('button', { name: /New Service Account/i }));
diff --git a/frontend/src/container/SideNav/NavItem/NavItem.tsx b/frontend/src/container/SideNav/NavItem/NavItem.tsx
index 1be4130211..e7ac5efc17 100644
--- a/frontend/src/container/SideNav/NavItem/NavItem.tsx
+++ b/frontend/src/container/SideNav/NavItem/NavItem.tsx
@@ -62,7 +62,7 @@ export default function NavItem({
{isBeta && (
<div className="nav-item-beta">
- <Badge color="robin" className="sidenav-beta-tag">
+ <Badge variant="solid" color="primary">
Beta
</Badge>
</div>
@@ -70,7 +70,7 @@ export default function NavItem({
{isNew && (
<div className="nav-item-new">
- <Badge color="robin" className="sidenav-new-tag">
+ <Badge variant="solid" color="primary">
New
</Badge>
</div>
@@ -78,7 +78,9 @@ export default function NavItem({
{isEarlyAccess && (
<div className="nav-item-early-access">
- <Badge color="robin">Early Access</Badge>
+ <Badge variant="solid" color="primary">
+ Early Access
+ </Badge>
</div>
)}
@@ -108,12 +110,10 @@ export default function NavItem({
);
// Only non-pinnable items set `tooltip`; it would nest with the pin tooltip.
- return tooltip ? (
+ return (
<Tooltip title={tooltip} placement="right">
{navItem}
</Tooltip>
- ) : (
- navItem
);
}
diff --git a/frontend/src/container/SideNav/SideNav.styles.scss b/frontend/src/container/SideNav/SideNav.styles.scss
index 64d479bc7c..e9f0c8d614 100644
--- a/frontend/src/container/SideNav/SideNav.styles.scss
+++ b/frontend/src/container/SideNav/SideNav.styles.scss
@@ -588,46 +588,6 @@
display: none;
}
- .sidenav-new-tag {
- border-radius: 12px;
- background: var(--primary-background);
-
- color: var(--primary-foreground);
- font-variant-numeric: lining-nums tabular-nums slashed-zero;
- font-feature-settings:
- 'case' on,
- 'cpsp' on,
- 'dlig' on,
- 'salt' on;
- font-family: Inter;
- font-size: 9px;
- font-style: normal;
- font-weight: 300;
- line-height: 12px; /* 140% */
- letter-spacing: 0.3px;
- text-transform: uppercase;
- }
-
- .sidenav-beta-tag {
- color: var(--l1-foreground);
- font-variant-numeric: lining-nums tabular-nums slashed-zero;
- font-feature-settings:
- 'case' on,
- 'cpsp' on,
- 'dlig' on,
- 'salt' on;
- font-family: Inter;
- font-size: 9px;
- font-style: normal;
- font-weight: 300;
- line-height: 12px; /* 140% */
- letter-spacing: 0.3px;
- text-transform: uppercase;
-
- border-radius: 12px;
- background: var(--l3-background);
- }
-
.sidenav-early-access-tag {
font-variant-numeric: lining-nums tabular-nums slashed-zero;
font-feature-settings:
@@ -1066,78 +1026,31 @@
}
}
-.nav-dropdown-overlay {
- .ant-dropdown-menu {
- margin-left: 8px !important;
- padding: 0px !important;
- width: 360px !important;
- border-radius: 3px !important;
-
- .ant-dropdown-menu-item {
- .ant-dropdown-menu-title-content {
- color: var(--l2-foreground);
- font-family: Inter;
- font-size: 12px;
- font-style: normal;
- font-weight: 300;
- line-height: normal;
- letter-spacing: 0.14px;
- }
-
- &:hover:not(.ant-dropdown-menu-item-disabled) {
- .ant-dropdown-menu-title-content {
- color: var(--l1-foreground);
- }
- }
- }
- }
-}
-
-.settings-dropdown {
- .user-settings-dropdown-logged-in-section {
- display: flex;
- flex-direction: column;
- gap: 8px;
-
- .user-settings-dropdown-label-text {
- color: var(--l3-foreground);
- font-family: Inter;
- font-size: var(--uppercase-small-500-font-size);
- font-weight: var(--uppercase-small-500-font-weight);
- font-style: normal;
- line-height: 18px;
- letter-spacing: 0.88px;
- text-transform: uppercase;
- }
-
- .user-settings-dropdown-label-email {
- color: var(--l1-foreground);
- font-family: Inter;
- font-size: var(--font-size-xs);
- font-style: normal;
- line-height: normal;
- letter-spacing: 0.14px;
- }
- }
-
- .ant-dropdown-menu-item-divider {
- background-color: var(--secondary) !important;
- }
-
- .ant-dropdown-menu-item-disabled {
- opacity: 0.7;
- }
+.user-settings-dropdown-logged-in-section {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
- .ant-dropdown-menu {
- width: 100% !important;
+ .user-settings-dropdown-label-text {
+ color: var(--l3-foreground);
+ font-family: Inter;
+ font-size: var(--uppercase-small-500-font-size);
+ font-weight: var(--uppercase-small-500-font-weight);
+ font-style: normal;
+ line-height: 18px;
+ letter-spacing: 0.88px;
+ text-transform: uppercase;
}
-}
-.settings-dropdown,
-.help-support-dropdown {
- .user-settings-dropdown-logout-section {
- color: var(--danger-background);
- pointer-events: auto;
+ .user-settings-dropdown-label-email {
+ color: var(--l1-foreground);
+ font-family: Inter;
+ font-size: var(--font-size-xs);
+ font-style: normal;
+ font-weight: var(--font-weight-normal);
+ line-height: normal;
+ letter-spacing: 0.14px;
+ text-transform: none;
}
}
@@ -1313,10 +1226,6 @@
}
}
-.help-support-dropdown li.ant-dropdown-menu-item-divider {
- background-color: var(--secondary) !important;
-}
-
.version-tooltip-overlay {
.ant-tooltip-inner {
background-color: var(--card);
diff --git a/frontend/src/container/SideNav/SideNav.tsx b/frontend/src/container/SideNav/SideNav.tsx
index f44664761e..8c4e20a01a 100644
--- a/frontend/src/container/SideNav/SideNav.tsx
+++ b/frontend/src/container/SideNav/SideNav.tsx
@@ -1,6 +1,6 @@
import {
+ isValidElement,
MouseEvent,
- ReactNode,
useCallback,
useEffect,
useMemo,
@@ -26,14 +26,7 @@ import {
verticalListSortingStrategy,
} from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
-import { Button, MenuProps, Modal, Tooltip } from 'antd';
+import { Button, Modal, Tooltip } from 'antd';
import logEvent from 'api/common/logEvent';
import { Logout } from 'api/utils';
import updateUserPreference from 'api/v1/user/preferences/name/update';
@@ -67,6 +60,7 @@ import {
ScrollText,
X,
} from '@signozhq/icons';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { useAppContext } from 'providers/App/App';
import { AppState } from 'store/reducers';
import AppReducer from 'types/reducer/app';
@@ -88,6 +82,8 @@ import {
helpSupportMenuItem,
primaryMenuItems,
aiAssistantMenuItem,
+ USER_SETTINGS_MENU_LABELS,
+ type UserSettingsMenuKey,
} from './menuItems';
import NavItem from './NavItem/NavItem';
import {
@@ -512,22 +508,6 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
[pathname],
);
- const userSettingsDropdownMenuItems: MenuProps['items'] = useMemo(
- () =>
- getUserSettingsDropdownMenuItems({
- userEmail: user.email,
- isWorkspaceBlocked,
- isEnterpriseSelfHostedUser,
- isCommunityEnterpriseUser,
- }),
- [
- isEnterpriseSelfHostedUser,
- isCommunityEnterpriseUser,
- user.email,
- isWorkspaceBlocked,
- ],
- );
-
useEffect(() => {
if (isCloudUser) {
setLicenseTag('Cloud');
@@ -895,50 +875,39 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
};
// eslint-disable-next-line sonarjs/cognitive-complexity
- const handleSettingsMenuItemClick = (info: SidebarItem): void => {
- const item = (userSettingsDropdownMenuItems ?? []).find(
- (item) => item?.key === info.key,
- );
- let menuLabel = '';
- if (
- item &&
- !('type' in item && item.type === 'divider') &&
- typeof item.label === 'string'
- ) {
- menuLabel = item.label;
- }
-
+ const handleSettingsMenuItemClick = (
+ key: UserSettingsMenuKey,
+ event: MouseEvent,
+ ): void => {
void logEvent('Settings Popover: Item clicked', {
- menuRoute: item?.key,
- menuLabel,
+ menuRoute: key,
+ menuLabel: USER_SETTINGS_MENU_LABELS[key],
});
- const event = (info as SidebarItem & { domEvent?: MouseEvent }).domEvent;
-
- switch (info.key) {
+ switch (key) {
case 'account':
- if (event && isModifierKeyPressed(event)) {
+ if (isModifierKeyPressed(event)) {
openInNewTab(ROUTES.MY_SETTINGS);
} else {
history.push(ROUTES.MY_SETTINGS);
}
break;
case 'workspace':
- if (event && isModifierKeyPressed(event)) {
+ if (isModifierKeyPressed(event)) {
openInNewTab(ROUTES.SETTINGS);
} else {
history.push(ROUTES.SETTINGS);
}
break;
case 'license':
- if (event && isModifierKeyPressed(event)) {
+ if (isModifierKeyPressed(event)) {
openInNewTab(ROUTES.LIST_LICENSES);
} else {
history.push(ROUTES.LIST_LICENSES);
}
break;
case 'keyboard-shortcuts':
- if (event && isModifierKeyPressed(event)) {
+ if (isModifierKeyPressed(event)) {
openInNewTab(ROUTES.SHORTCUTS);
} else {
history.push(ROUTES.SHORTCUTS);
@@ -974,6 +943,36 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
isEnterpriseSelfHostedUser,
]);
+ const helpSupportItems: DropdownItemType[] = helpSupportDropdownMenuItems.map(
+ (item, idx): DropdownItemType => {
+ if ('type' in item) {
+ return { type: 'separator', value: `help-sep-${idx}` };
+ }
+
+ return {
+ type: 'item',
+ value: String(item.key),
+ label: item.label ?? '',
+ prefix: isValidElement(item.icon) ? item.icon : undefined,
+ onClick: (event: MouseEvent): void => {
+ handleHelpSupportMenuItemClick({
+ ...item,
+ key: String(item.key),
+ domEvent: event.nativeEvent,
+ } as unknown as SidebarItem);
+ },
+ };
+ },
+ );
+
+ const userSettingsItems = getUserSettingsDropdownMenuItems({
+ userEmail: user.email,
+ isWorkspaceBlocked,
+ isEnterpriseSelfHostedUser,
+ isCommunityEnterpriseUser,
+ onSelect: handleSettingsMenuItemClick,
+ });
+
return (
<div className={cx('sidenav-container', isPinned && 'pinned')}>
<div
@@ -1207,95 +1206,40 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
{isAIAssistantEnabled && renderNavItems([aiAssistantMenuItem], false)}
<div className="nav-dropdown-item">
- <DropdownMenu onOpenChange={handleDropdownOpenChange}>
- <DropdownMenuTrigger asChild>
- <div className="nav-item">
- <div className="nav-item-data" data-testid="help-support-nav-item">
- <div className="nav-item-icon">{helpSupportMenuItem.icon}</div>
+ <Dropdown
+ items={helpSupportItems}
+ nativeButton={false}
+ side="top"
+ align="start"
+ onOpenChange={handleDropdownOpenChange}
+ >
+ <div className="nav-item">
+ <div className="nav-item-data" data-testid="help-support-nav-item">
+ <div className="nav-item-icon">{helpSupportMenuItem.icon}</div>
- <div className="nav-item-label">{helpSupportMenuItem.label}</div>
- </div>
+ <div className="nav-item-label">{helpSupportMenuItem.label}</div>
</div>
- </DropdownMenuTrigger>
- <DropdownMenuContent
- side="top"
- align="start"
- className="nav-dropdown-overlay help-support-dropdown"
- >
- {helpSupportDropdownMenuItems.map((item, idx) => {
- if ('type' in item) {
- // eslint-disable-next-line react/no-array-index-key
- return <DropdownMenuSeparator key={`help-sep-${idx}`} />;
- }
- return (
- <DropdownMenuItem
- key={String(item.key)}
- leftIcon={item.icon}
- onClick={(e): void =>
- handleHelpSupportMenuItemClick({
- ...item,
- key: String(item.key),
- domEvent: e.nativeEvent,
- } as unknown as SidebarItem)
- }
- >
- {item.label}
- </DropdownMenuItem>
- );
- })}
- </DropdownMenuContent>
- </DropdownMenu>
+ </div>
+ </Dropdown>
</div>
<div className="nav-dropdown-item">
- <DropdownMenu onOpenChange={handleDropdownOpenChange}>
- <DropdownMenuTrigger asChild>
- <div className={cx('nav-item', isSettingsPage && 'active')}>
- <div className="nav-item-active-marker" />
- <div className="nav-item-data" data-testid="settings-nav-item">
- <div className="nav-item-icon">{userSettingsMenuItem.icon}</div>
-
- <div className="nav-item-label">{userSettingsMenuItem.label}</div>
- </div>
+ <Dropdown
+ items={userSettingsItems}
+ nativeButton={false}
+ side="top"
+ align="start"
+ onOpenChange={handleDropdownOpenChange}
+ >
+ <div className={cx('nav-item', isSettingsPage && 'active')}>
+ <div className="nav-item-active-marker" />
+ <div className="nav-item-data" data-testid="settings-nav-item">
+ <div className="nav-item-icon">{userSettingsMenuItem.icon}</div>
+
+ <div className="nav-item-label">{userSettingsMenuItem.label}</div>
</div>
- </DropdownMenuTrigger>
- <DropdownMenuContent
- side="top"
- align="start"
- className="nav-dropdown-overlay settings-dropdown"
- >
- {(userSettingsDropdownMenuItems ?? []).map((item, idx) => {
- if (!item) {
- return null;
- }
- if ('type' in item && item.type === 'divider') {
- // eslint-disable-next-line react/no-array-index-key
- return <DropdownMenuSeparator key={`settings-sep-${idx}`} />;
- }
- const settingsItem = item as {
- key?: string | number;
- label?: ReactNode;
- icon?: ReactNode;
- disabled?: boolean;
- };
- return (
- <DropdownMenuItem
- key={String(settingsItem.key)}
- leftIcon={settingsItem.icon}
- disabled={settingsItem.disabled}
- onClick={(e): void =>
- handleSettingsMenuItemClick({
- key: String(settingsItem.key),
- domEvent: e.nativeEvent,
- } as unknown as SidebarItem)
- }
- >
- {settingsItem.label}
- </DropdownMenuItem>
- );
- })}
- </DropdownMenuContent>
- </DropdownMenu>
+ </div>
+ </Dropdown>
</div>
</div>
</div>
diff --git a/frontend/src/container/SideNav/__tests__/menuItems.test.tsx b/frontend/src/container/SideNav/__tests__/menuItems.test.tsx
index 2da78927ba..123882af81 100644
--- a/frontend/src/container/SideNav/__tests__/menuItems.test.tsx
+++ b/frontend/src/container/SideNav/__tests__/menuItems.test.tsx
@@ -1,32 +1,58 @@
-import { getUserSettingsDropdownMenuItems } from 'container/SideNav/menuItems';
+import type { MouseEvent } from 'react';
+import type {
+ DropdownActionItemType,
+ DropdownItemType,
+} from '@signozhq/ui/dropdown';
+import {
+ getUserSettingsDropdownMenuItems,
+ WORKSPACE_LOCKED_TOOLTIP,
+} from 'container/SideNav/menuItems';
const BASE_PARAMS = {
userEmail: '[email protected]',
isWorkspaceBlocked: false,
isEnterpriseSelfHostedUser: false,
isCommunityEnterpriseUser: false,
+ onSelect: jest.fn(),
};
-describe('getUserSettingsDropdownMenuItems', () => {
- it('always includes logged-in-as label, workspace, account, keyboard shortcuts, and sign out', () => {
- const items = getUserSettingsDropdownMenuItems(BASE_PARAMS);
- const keys = items?.map((item) => item?.key);
-
- expect(keys).toContain('label');
- expect(keys).toContain('workspace');
- expect(keys).toContain('account');
- expect(keys).toContain('keyboard-shortcuts');
- expect(keys).toContain('logout');
+function settingsRows(items: DropdownItemType[]): DropdownActionItemType[] {
+ const group = items.find((item) => item.type === 'group');
+ if (group?.type !== 'group') {
+ throw new Error('No logged-in-as group');
+ }
+ return group.items.filter(
+ (row): row is DropdownActionItemType => row.type === 'item',
+ );
+}
- // workspace item is enabled when workspace is not blocked
- const workspaceItem = items?.find(
- (item: any) => item.key === 'workspace',
- ) as any;
+function settingsRow(
+ items: DropdownItemType[],
+ value: string,
+): DropdownActionItemType {
+ const row = settingsRows(items).find((r) => r.value === value);
+ if (!row) {
+ throw new Error(`No "${value}" row`);
+ }
+ return row;
+}
- expect(workspaceItem?.disabled).toBe(false);
+describe('getUserSettingsDropdownMenuItems', () => {
+ it('heads the settings rows with the logged-in user, then signs out below a separator', () => {
+ const items = getUserSettingsDropdownMenuItems(BASE_PARAMS);
- // does not include license item for regular cloud user
- expect(keys).not.toContain('license');
+ expect(items.map((item) => item.type)).toStrictEqual([
+ 'group',
+ 'separator',
+ 'item',
+ ]);
+ expect(items[0]).toHaveProperty('testId', 'logged-in-as-nav-item');
+ expect(items[2]).toMatchObject({ value: 'logout', danger: true });
+ expect(settingsRows(items).map((row) => row.value)).toStrictEqual([
+ 'workspace',
+ 'account',
+ 'keyboard-shortcuts',
+ ]);
});
it('includes manage license item for enterprise self-hosted users', () => {
@@ -34,9 +60,8 @@ describe('getUserSettingsDropdownMenuItems', () => {
...BASE_PARAMS,
isEnterpriseSelfHostedUser: true,
});
- const keys = items?.map((item) => item?.key);
- expect(keys).toContain('license');
+ expect(settingsRows(items).map((row) => row.value)).toContain('license');
});
it('includes manage license item for community enterprise users', () => {
@@ -44,31 +69,35 @@ describe('getUserSettingsDropdownMenuItems', () => {
...BASE_PARAMS,
isCommunityEnterpriseUser: true,
});
- const keys = items?.map((item) => item?.key);
- expect(keys).toContain('license');
+ expect(settingsRows(items).map((row) => row.value)).toContain('license');
});
- it('workspace item is disabled when workspace is blocked', () => {
+ it('workspace item is enabled when workspace is not blocked', () => {
+ const items = getUserSettingsDropdownMenuItems(BASE_PARAMS);
+
+ expect(settingsRow(items, 'workspace').disabled).toBe(false);
+ });
+
+ it('workspace item is disabled with the reason when workspace is blocked', () => {
const items = getUserSettingsDropdownMenuItems({
...BASE_PARAMS,
isWorkspaceBlocked: true,
});
- const workspaceItem = items?.find(
- (item: any) => item.key === 'workspace',
- ) as any;
- expect(workspaceItem?.disabled).toBe(true);
+ expect(settingsRow(items, 'workspace')).toMatchObject({
+ disabled: true,
+ disabledTooltip: WORKSPACE_LOCKED_TOOLTIP,
+ });
});
- it('returns items in correct order: label, divider, workspace, account, ..., shortcuts, divider, logout', () => {
- const items = getUserSettingsDropdownMenuItems(BASE_PARAMS) ?? [];
- const keys = items.map((item: any) => item.key ?? item.type);
+ it('reports the picked row by key', () => {
+ const onSelect = jest.fn();
+ const items = getUserSettingsDropdownMenuItems({ ...BASE_PARAMS, onSelect });
+ const event = {} as MouseEvent;
+
+ settingsRow(items, 'account').onClick?.(event);
- expect(keys[0]).toBe('label');
- expect(keys[1]).toBe('divider');
- expect(keys[2]).toBe('workspace');
- expect(keys[3]).toBe('account');
- expect(keys[keys.length - 1]).toBe('logout');
+ expect(onSelect).toHaveBeenCalledWith('account', event);
});
});
diff --git a/frontend/src/container/SideNav/menuItems.tsx b/frontend/src/container/SideNav/menuItems.tsx
index d8c244067d..05eb7aba53 100644
--- a/frontend/src/container/SideNav/menuItems.tsx
+++ b/frontend/src/container/SideNav/menuItems.tsx
@@ -1,4 +1,8 @@
-import { MenuProps } from 'antd';
+import type { MouseEvent } from 'react';
+import type {
+ DropdownActionItemType,
+ DropdownItemType,
+} from '@signozhq/ui/dropdown';
import ROUTES from 'constants/routes';
import {
ArrowUpRight,
@@ -489,11 +493,30 @@ export const helpSupportDropdownMenuItems: SidebarItem[] = [
},
];
+export type UserSettingsMenuKey =
+ | 'workspace'
+ | 'account'
+ | 'license'
+ | 'keyboard-shortcuts'
+ | 'logout';
+
+export const USER_SETTINGS_MENU_LABELS: Record<UserSettingsMenuKey, string> = {
+ workspace: 'Workspace Settings',
+ account: 'Account Settings',
+ license: 'Manage License',
+ 'keyboard-shortcuts': 'Keyboard Shortcuts',
+ logout: 'Sign out',
+};
+
+export const WORKSPACE_LOCKED_TOOLTIP =
+ 'Unavailable while the workspace is locked';
+
export interface UserSettingsMenuItemsParams {
userEmail: string;
isWorkspaceBlocked: boolean;
isEnterpriseSelfHostedUser: boolean;
isCommunityEnterpriseUser: boolean;
+ onSelect: (key: UserSettingsMenuKey, event: MouseEvent) => void;
}
export const getUserSettingsDropdownMenuItems = ({
@@ -501,65 +524,74 @@ export const getUserSettingsDropdownMenuItems = ({
isWorkspaceBlocked,
isEnterpriseSelfHostedUser,
isCommunityEnterpriseUser,
-}: UserSettingsMenuItemsParams): MenuProps['items'] =>
- [
+ onSelect,
+}: UserSettingsMenuItemsParams): DropdownItemType[] => {
+ const settingsRows: DropdownActionItemType[] = [
+ {
+ type: 'item',
+ value: 'workspace',
+ label: USER_SETTINGS_MENU_LABELS.workspace,
+ prefix: <Building2 size={14} color={Style.L1_FOREGROUND} />,
+ testId: 'workspace-settings-nav-item',
+ disabled: isWorkspaceBlocked,
+ disabledTooltip: WORKSPACE_LOCKED_TOOLTIP,
+ onClick: (event): void => onSelect('workspace', event),
+ },
+ {
+ type: 'item',
+ value: 'account',
+ label: USER_SETTINGS_MENU_LABELS.account,
+ prefix: <User size={14} color={Style.L1_FOREGROUND} />,
+ testId: 'account-settings-nav-item',
+ onClick: (event): void => onSelect('account', event),
+ },
+ ];
+
+ if (isEnterpriseSelfHostedUser || isCommunityEnterpriseUser) {
+ settingsRows.push({
+ type: 'item',
+ value: 'license',
+ label: USER_SETTINGS_MENU_LABELS.license,
+ prefix: <Shield size={14} color={Style.L1_FOREGROUND} />,
+ testId: 'manage-license-nav-item',
+ onClick: (event): void => onSelect('license', event),
+ });
+ }
+
+ settingsRows.push({
+ type: 'item',
+ value: 'keyboard-shortcuts',
+ label: USER_SETTINGS_MENU_LABELS['keyboard-shortcuts'],
+ prefix: <Keyboard size={14} color={Style.L1_FOREGROUND} />,
+ testId: 'keyboard-shortcuts-nav-item',
+ onClick: (event): void => onSelect('keyboard-shortcuts', event),
+ });
+
+ return [
{
- key: 'label',
+ type: 'group',
+ value: 'logged-in-as',
label: (
<div className="user-settings-dropdown-logged-in-section">
<span className="user-settings-dropdown-label-text">LOGGED IN AS</span>
<span className="user-settings-dropdown-label-email">{userEmail}</span>
</div>
),
- disabled: true,
- dataTestId: 'logged-in-as-nav-item',
+ testId: 'logged-in-as-nav-item',
+ items: settingsRows,
},
- { type: 'divider' as const },
+ { type: 'separator', value: 'before-logout' },
{
- key: 'workspace',
- label: 'Workspace Settings',
- icon: <Building2 size={14} color={Style.L1_FOREGROUND} />,
- disabled: isWorkspaceBlocked,
- dataTestId: 'workspace-settings-nav-item',
- },
- {
- key: 'account',
- label: 'Account Settings',
- icon: <User size={14} color={Style.L1_FOREGROUND} />,
- dataTestId: 'account-settings-nav-item',
+ type: 'item',
+ value: 'logout',
+ label: USER_SETTINGS_MENU_LABELS.logout,
+ prefix: <LogOut size={14} />,
+ testId: 'logout-nav-item',
+ danger: true,
+ onClick: (event): void => onSelect('logout', event),
},
- ...(isEnterpriseSelfHostedUser || isCommunityEnterpriseUser
- ? [
- {
- key: 'license',
- label: 'Manage License',
- icon: <Shield size={14} color={Style.L1_FOREGROUND} />,
- dataTestId: 'manage-license-nav-item',
- },
- ]
- : []),
- {
- key: 'keyboard-shortcuts',
- label: 'Keyboard Shortcuts',
- icon: <Keyboard size={14} color={Style.L1_FOREGROUND} />,
- dataTestId: 'keyboard-shortcuts-nav-item',
- },
- { type: 'divider' as const },
- {
- key: 'logout',
- label: (
- <span className="user-settings-dropdown-logout-section">Sign out</span>
- ),
- icon: (
- <LogOut
- size={14}
- className="user-settings-dropdown-logout-section"
- color={Style.DANGER_BACKGROUND}
- />
- ),
- dataTestId: 'logout-nav-item',
- },
- ].filter(Boolean);
+ ];
+};
/** Mapping of some newly added routes and their corresponding active sidebar menu key
This is used to highlight the correct menu item when the user navigates to a new route
diff --git a/frontend/src/container/TopNav/AutoRefreshV2/index.tsx b/frontend/src/container/TopNav/AutoRefreshV2/index.tsx
index bab58aad82..e49ce8f915 100644
--- a/frontend/src/container/TopNav/AutoRefreshV2/index.tsx
+++ b/frontend/src/container/TopNav/AutoRefreshV2/index.tsx
@@ -142,14 +142,17 @@ function AutoRefresh({
trigger={['click']}
content={
<div className="auto-refresh-menu">
- <Checkbox
- onChange={onChangeAutoRefreshHandler}
- value={isAutoRefreshEnabled}
- disabled={isDisabled}
- className="auto-refresh-checkbox"
- >
- Auto Refresh
- </Checkbox>
+ <div className="auto-refresh-checkbox">
+ <Checkbox
+ color="primary"
+ onChange={onChangeAutoRefreshHandler}
+ value={isAutoRefreshEnabled}
+ disabled={isDisabled}
+ disabledTooltip="Auto refresh is not available for a custom time range"
+ >
+ Auto Refresh
+ </Checkbox>
+ </div>
<Typography.Text disabled={isDisabled} className="refresh-interval-text">
Refresh Interval
</Typography.Text>
diff --git a/frontend/src/container/TopNav/DateTimeSelectionV2/DateTimeSelectionV2.styles.scss b/frontend/src/container/TopNav/DateTimeSelectionV2/DateTimeSelectionV2.styles.scss
index 30332eb56c..0ba5b78ea8 100644
--- a/frontend/src/container/TopNav/DateTimeSelectionV2/DateTimeSelectionV2.styles.scss
+++ b/frontend/src/container/TopNav/DateTimeSelectionV2/DateTimeSelectionV2.styles.scss
@@ -334,7 +334,7 @@
align-items: center;
justify-content: space-between;
- .periscope-calendar {
+ [data-slot='calendar'] {
border-radius: 4px;
border: none !important;
background: none !important;
@@ -342,13 +342,9 @@
padding-top: 8px !important;
}
- .periscope-calendar-day {
- button {
- &:hover {
- background-color: var(--primary-background) !important;
- color: var(--l1-foreground) !important;
- }
- }
+ [data-slot='calendar-button'][data-variant='day']:hover {
+ background-color: var(--primary-background) !important;
+ color: var(--l1-foreground) !important;
}
.calendar-actions {
diff --git a/frontend/src/container/TracesExplorer/ListView/utils.tsx b/frontend/src/container/TracesExplorer/ListView/utils.tsx
index 31c5239b38..27bceefb62 100644
--- a/frontend/src/container/TracesExplorer/ListView/utils.tsx
+++ b/frontend/src/container/TracesExplorer/ListView/utils.tsx
@@ -123,7 +123,12 @@ export const getListColumns = (
) {
return (
<BlockLink to={getTraceLink(item)} openInNewTab={false}>
- <Badge data-testid={name} color="sakura" variant="outline">
+ <Badge
+ textTransform="none"
+ testId={name}
+ color="highlight-danger"
+ variant="outlined"
+ >
{value}
</Badge>
</BlockLink>
diff --git a/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx b/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx
index 240e474e9d..d2a5ca72ac 100644
--- a/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx
+++ b/frontend/src/container/TracesExplorer/TracesTable/FieldCell.tsx
@@ -55,7 +55,12 @@ function FieldCell({ name, value }: FieldCellProps): JSX.Element {
if (STATUS_FIELD_NAMES.has(name)) {
return (
- <Badge data-testid={name} color="sakura" variant="outline">
+ <Badge
+ textTransform="none"
+ testId={name}
+ color="highlight-danger"
+ variant="outlined"
+ >
{text}
</Badge>
);
diff --git a/frontend/src/container/TriggeredAlerts/__tests__/TriggeredAlerts.list.test.tsx b/frontend/src/container/TriggeredAlerts/__tests__/TriggeredAlerts.list.test.tsx
index aebed65afb..a7612cd61c 100644
--- a/frontend/src/container/TriggeredAlerts/__tests__/TriggeredAlerts.list.test.tsx
+++ b/frontend/src/container/TriggeredAlerts/__tests__/TriggeredAlerts.list.test.tsx
@@ -75,18 +75,18 @@ describe('TriggeredAlerts — list rendering', () => {
expect(screen.getByTestId('alert-row-fp-critical-1-status')).toHaveAttribute(
'data-color',
- 'cherry',
+ 'danger',
);
expect(screen.getByTestId('alert-row-fp-info-1-status')).toHaveAttribute(
'data-color',
- 'forest',
+ 'success',
);
expect(
screen.getByTestId('alert-row-fp-critical-1-severity'),
- ).toHaveAttribute('data-color', 'cherry');
+ ).toHaveAttribute('data-color', 'danger');
expect(screen.getByTestId('alert-row-fp-warning-1-severity')).toHaveAttribute(
'data-color',
- 'amber',
+ 'warning',
);
});
diff --git a/frontend/src/container/TriggeredAlerts/components/AlertStatusTag.tsx b/frontend/src/container/TriggeredAlerts/components/AlertStatusTag.tsx
index 81d07df8ee..2fb9569c59 100644
--- a/frontend/src/container/TriggeredAlerts/components/AlertStatusTag.tsx
+++ b/frontend/src/container/TriggeredAlerts/components/AlertStatusTag.tsx
@@ -9,25 +9,25 @@ function AlertStatusTag({ state, testId }: AlertStatusTagProps): JSX.Element {
switch (state) {
case 'unprocessed':
return (
- <Badge color="success" variant="outline" testId={testId}>
+ <Badge color="success" variant="outlined" testId={testId}>
Unprocessed
</Badge>
);
case 'active':
return (
- <Badge color="error" variant="outline" testId={testId}>
+ <Badge color="danger" variant="outlined" testId={testId}>
Firing
</Badge>
);
case 'suppressed':
return (
- <Badge color="error" variant="outline" testId={testId}>
+ <Badge color="danger" variant="outlined" testId={testId}>
Suppressed
</Badge>
);
default:
return (
- <Badge color="secondary" variant="outline" testId={testId}>
+ <Badge color="secondary" variant="outlined" testId={testId}>
Unknown
</Badge>
);
diff --git a/frontend/src/container/TriggeredAlerts/components/EmptyStates.tsx b/frontend/src/container/TriggeredAlerts/components/EmptyStates.tsx
index 4d5759ded7..3247d85604 100644
--- a/frontend/src/container/TriggeredAlerts/components/EmptyStates.tsx
+++ b/frontend/src/container/TriggeredAlerts/components/EmptyStates.tsx
@@ -30,6 +30,7 @@ export function EmptyState({ onRefresh }: EmptyStateProps): JSX.Element {
</div>
<div className={styles.emptyStateActions}>
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<Plus size={14} />}
@@ -40,6 +41,7 @@ export function EmptyState({ onRefresh }: EmptyStateProps): JSX.Element {
</Button>
{onRefresh && (
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={<RefreshCw size={14} />}
diff --git a/frontend/src/container/TriggeredAlerts/components/GroupTagsCell.tsx b/frontend/src/container/TriggeredAlerts/components/GroupTagsCell.tsx
index 89b42eaa1c..9fe79ae10a 100644
--- a/frontend/src/container/TriggeredAlerts/components/GroupTagsCell.tsx
+++ b/frontend/src/container/TriggeredAlerts/components/GroupTagsCell.tsx
@@ -33,27 +33,28 @@ export function GroupTagsCell({
return (
<div className={styles.groupCell}>
<Button
+ aria-label={localIsExpanded ? 'Collapse' : 'Expand'}
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
onClick={(e): void => {
e.stopPropagation();
setLocalIsExpanded((v) => !v);
toggleExpanded();
}}
- prefix={
- localIsExpanded ? <ChevronDown size={14} /> : <ChevronRight size={14} />
- }
testId="group-expand-toggle"
- />
+ >
+ {localIsExpanded ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
+ </Button>
<div className={styles.tagsContainer}>
{tags.map((tag) => (
- <Badge color="error" key={tag} variant="outline">
+ <Badge textTransform="none" color="danger" key={tag} variant="outlined">
{tag}
</Badge>
))}
{tags.length === 0 ? (
- <Badge color="secondary" variant="outline">
+ <Badge textTransform="none" color="secondary" variant="outlined">
{'<no-value>'}
</Badge>
) : null}
diff --git a/frontend/src/container/TriggeredAlerts/table.config.tsx b/frontend/src/container/TriggeredAlerts/table.config.tsx
index c7da462966..ea83276c56 100644
--- a/frontend/src/container/TriggeredAlerts/table.config.tsx
+++ b/frontend/src/container/TriggeredAlerts/table.config.tsx
@@ -18,7 +18,7 @@ export function getAlertColumns(
id: 'status',
header: 'Status',
accessorFn: (row) => row.status?.state,
- width: { fixed: '100px' },
+ width: { fixed: '130px' },
enableSort: false,
enableMove: false,
cell: ({ row, value }): JSX.Element => (
@@ -59,8 +59,9 @@ export function getAlertColumns(
}
return (
<Badge
+ textTransform="none"
color={SEVERITY_BADGE_COLORS[severity] ?? 'secondary'}
- variant="outline"
+ variant="outlined"
testId={testId}
>
{severity}
@@ -100,7 +101,9 @@ export function getAlertColumns(
return <TanStackTable.Text>-</TanStackTable.Text>;
}
- return <LabelColumn labels={tagKeys} value={labels} color="sakura" />;
+ return (
+ <LabelColumn labels={tagKeys} value={labels} color="highlight-danger" />
+ );
},
},
];
diff --git a/frontend/src/container/WidgetCard/Header/WidgetHeader.styles.scss b/frontend/src/container/WidgetCard/Header/WidgetHeader.styles.scss
index 00e434a74d..c5c68e830c 100644
--- a/frontend/src/container/WidgetCard/Header/WidgetHeader.styles.scss
+++ b/frontend/src/container/WidgetCard/Header/WidgetHeader.styles.scss
@@ -54,17 +54,6 @@
visibility: visible;
}
-// currently the width of the dropdown menu is set to 100% of the parent container,
-// which is not desired. This is a workaround to unset that width and allow the dropdown menu to size based on its content.
-// This is necessary because the dropdown menu can contain items with varying widths, and setting it to 100% can cause layout issues and make the menu look unbalanced.
-// we should idealy fix this in the dropdown menu component itself, but for now this is a quick fix to ensure the dropdown menu looks correct in the widget header.
-
-[data-radix-popper-content-wrapper]
- [data-slot='dropdown-menu-content'].widget-header-dropdown
- [data-slot='dropdown-menu-item'] {
- width: unset !important;
-}
-
.widget-api-actions {
padding-right: 0.25rem;
}
diff --git a/frontend/src/container/WidgetCard/Header/contants.ts b/frontend/src/container/WidgetCard/Header/contants.ts
index 7c32a0e2c5..eb1af44ca0 100644
--- a/frontend/src/container/WidgetCard/Header/contants.ts
+++ b/frontend/src/container/WidgetCard/Header/contants.ts
@@ -15,3 +15,11 @@ export const MENUITEM_KEYS_VS_LABELS = {
[MenuItemKeys.CreateAlerts]: 'Create Alerts',
[MenuItemKeys.Download]: 'Download as CSV',
};
+
+export const VIEW_LOADING_TOOLTIP = 'Loading panel data';
+export const EDIT_DENIED_TOOLTIP =
+ 'You do not have permission to edit this panel';
+export const CLONE_DENIED_TOOLTIP =
+ 'You do not have permission to clone this panel';
+export const DELETE_DENIED_TOOLTIP =
+ 'You do not have permission to delete this panel';
diff --git a/frontend/src/container/WidgetCard/Header/index.tsx b/frontend/src/container/WidgetCard/Header/index.tsx
index 54d0f54c94..1546c59d3e 100644
--- a/frontend/src/container/WidgetCard/Header/index.tsx
+++ b/frontend/src/container/WidgetCard/Header/index.tsx
@@ -16,7 +16,7 @@ import {
} from '@signozhq/icons';
import { Color } from '@signozhq/design-tokens';
import { Button, Input, Tooltip } from 'antd';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown } from '@signozhq/ui/dropdown';
import { Typography } from '@signozhq/ui/typography';
import ErrorContent from 'components/ErrorModal/components/ErrorContent';
import ErrorPopover from 'components/ErrorPopover/ErrorPopover';
@@ -41,14 +41,15 @@ import { buildAbsolutePath } from 'utils/app';
import { errorTooltipPosition } from 'container/WidgetCard/Header/config';
import {
+ CLONE_DENIED_TOOLTIP,
+ DELETE_DENIED_TOOLTIP,
+ EDIT_DENIED_TOOLTIP,
MENUITEM_KEYS_VS_LABELS,
MenuItemKeys,
+ VIEW_LOADING_TOOLTIP,
} from 'container/WidgetCard/Header/contants';
import { MenuItem } from 'container/WidgetCard/Header/types';
-import {
- generateMenuList,
- isTWidgetOptions,
-} from 'container/WidgetCard/Header/utils';
+import { generateMenuList } from 'container/WidgetCard/Header/utils';
import 'container/WidgetCard/Header/WidgetHeader.styles.scss';
@@ -116,37 +117,6 @@ function WidgetHeader({
downloadLink.remove();
}, [tableProcessedDataRef, title]);
- const keyMethodMapping = useMemo(
- () => ({
- [MenuItemKeys.View]: onView,
- [MenuItemKeys.Edit]: onEditHandler,
- [MenuItemKeys.Delete]: onDelete,
- [MenuItemKeys.Clone]: onClone,
- [MenuItemKeys.CreateAlerts]: onCreateAlertsHandler,
- [MenuItemKeys.Download]: onDownloadHandler,
- }),
- [
- onView,
- onEditHandler,
- onDelete,
- onClone,
- onCreateAlertsHandler,
- onDownloadHandler,
- ],
- );
-
- const onMenuItemSelectHandler = useCallback(
- ({ key }: { key: string }): void => {
- if (isTWidgetOptions(key)) {
- const functionToCall = keyMethodMapping[key];
-
- if (functionToCall) {
- functionToCall();
- }
- }
- },
- [keyMethodMapping],
- );
const { user } = useAppContext();
const [deleteWidget, editWidget] = useComponentPermission(
@@ -157,48 +127,62 @@ function WidgetHeader({
const actions = useMemo(
(): MenuItem[] => [
{
- key: MenuItemKeys.View,
- icon: <Fullscreen size="md" />,
+ type: 'item',
+ value: MenuItemKeys.View,
+ prefix: <Fullscreen size="md" />,
label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.View],
isVisible: headerMenuList?.includes(MenuItemKeys.View) || false,
- disabled: queryResponse.isFetching,
+ loading: queryResponse.isFetching,
+ loadingTooltip: VIEW_LOADING_TOOLTIP,
+ onClick: onView,
},
{
- key: MenuItemKeys.Edit,
- icon: <Pencil size="md" />,
+ type: 'item',
+ value: MenuItemKeys.Edit,
+ prefix: <Pencil size="md" />,
label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.Edit],
isVisible: headerMenuList?.includes(MenuItemKeys.Edit) || false,
disabled: !editWidget,
+ disabledTooltip: EDIT_DENIED_TOOLTIP,
+ onClick: onEditHandler,
},
{
- key: MenuItemKeys.Clone,
- icon: <Copy size="md" />,
+ type: 'item',
+ value: MenuItemKeys.Clone,
+ prefix: <Copy size="md" />,
label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.Clone],
isVisible: headerMenuList?.includes(MenuItemKeys.Clone) || false,
disabled: !editWidget,
+ disabledTooltip: CLONE_DENIED_TOOLTIP,
+ onClick: onClone,
},
{
- key: MenuItemKeys.Download,
- icon: <CloudDownload size="md" />,
+ type: 'item',
+ value: MenuItemKeys.Download,
+ prefix: <CloudDownload size="md" />,
label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.Download],
isVisible: widget.panelTypes === PANEL_TYPES.TABLE,
- disabled: false,
+ onClick: onDownloadHandler,
},
{
- key: MenuItemKeys.Delete,
- icon: <Trash2 size="md" />,
+ type: 'item',
+ value: MenuItemKeys.Delete,
+ prefix: <Trash2 size="md" />,
label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.Delete],
isVisible: headerMenuList?.includes(MenuItemKeys.Delete) || false,
disabled: !deleteWidget,
+ disabledTooltip: DELETE_DENIED_TOOLTIP,
danger: true,
+ onClick: onDelete,
},
{
- key: MenuItemKeys.CreateAlerts,
- icon: <Bell size="md" />,
+ type: 'item',
+ value: MenuItemKeys.CreateAlerts,
+ prefix: <Bell size="md" />,
label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.CreateAlerts],
- rightIcon: <SquareArrowOutUpRight size="lg" />,
+ suffix: <SquareArrowOutUpRight size="lg" />,
isVisible: headerMenuList?.includes(MenuItemKeys.CreateAlerts) || false,
- disabled: false,
+ onClick: onCreateAlertsHandler,
},
],
[
@@ -207,25 +191,21 @@ function WidgetHeader({
editWidget,
deleteWidget,
widget.panelTypes,
+ onView,
+ onEditHandler,
+ onClone,
+ onDownloadHandler,
+ onDelete,
+ onCreateAlertsHandler,
],
);
- const updatedMenuList = useMemo(() => generateMenuList(actions), [actions]);
+ const menuItems = useMemo(() => generateMenuList(actions), [actions]);
const [showGlobalSearch, setShowGlobalSearch] = useState(false);
const globalSearchAvailable = widget.panelTypes === PANEL_TYPES.TABLE;
- const menu = useMemo(
- () => ({
- items: updatedMenuList.map((item) => ({
- ...item,
- onClick: onMenuItemSelectHandler,
- })),
- }),
- [updatedMenuList, onMenuItemSelectHandler],
- );
-
const { truncatedText, fullText } = useGetResolvedText({
text: widget.title as string,
maxLength: 100,
@@ -319,13 +299,8 @@ function WidgetHeader({
data-testid="widget-header-search"
/>
)}
- {menu && Array.isArray(menu.items) && menu.items.length > 0 && (
- <DropdownMenuSimple
- menu={menu}
- side="bottom"
- align="end"
- className="widget-header-dropdown"
- >
+ {menuItems.length > 0 && (
+ <Dropdown items={menuItems} nativeButton side="bottom" align="end">
<Button
data-testid="widget-header-options"
className={`widget-header-more-options ${
@@ -333,7 +308,7 @@ function WidgetHeader({
}`}
icon={<EllipsisVertical size="md" />}
/>
- </DropdownMenuSimple>
+ </Dropdown>
)}
</div>
</>
diff --git a/frontend/src/container/WidgetCard/Header/types.ts b/frontend/src/container/WidgetCard/Header/types.ts
index 56ac57a462..37a8e71816 100644
--- a/frontend/src/container/WidgetCard/Header/types.ts
+++ b/frontend/src/container/WidgetCard/Header/types.ts
@@ -1,16 +1,12 @@
import { ReactNode } from 'react';
+import type { DropdownActionItemType } from '@signozhq/ui/dropdown';
import { MenuItemKeys } from 'container/WidgetCard/Header/contants';
-export interface MenuItem {
- key: MenuItemKeys;
- icon: ReactNode;
- label: ReactNode;
- rightIcon?: ReactNode;
+export type MenuItem = DropdownActionItemType & {
+ value: MenuItemKeys;
isVisible: boolean;
- disabled: boolean;
- danger?: boolean;
-}
+};
export interface DisplayThresholdProps {
threshold: ReactNode;
diff --git a/frontend/src/container/WidgetCard/Header/utils.ts b/frontend/src/container/WidgetCard/Header/utils.ts
index ff3a3fc4cf..66ae38dab1 100644
--- a/frontend/src/container/WidgetCard/Header/utils.ts
+++ b/frontend/src/container/WidgetCard/Header/utils.ts
@@ -1,23 +1,7 @@
-import type { MenuItem as DropdownMenuItem } from '@signozhq/ui/dropdown-menu';
+import type { DropdownActionItemType } from '@signozhq/ui/dropdown';
-import { MenuItemKeys } from 'container/WidgetCard/Header/contants';
import { MenuItem } from 'container/WidgetCard/Header/types';
-export const generateMenuList = (actions: MenuItem[]): DropdownMenuItem[] =>
- actions
- .filter((action: MenuItem) => action.isVisible)
- .map(({ key, icon: Icon, label, disabled, ...rest }) => ({
- key,
- icon: Icon,
- label,
- disabled,
- ...rest,
- }));
-
-export const isTWidgetOptions = (value: string): value is MenuItemKeys =>
- value === MenuItemKeys.View ||
- value === MenuItemKeys.Edit ||
- value === MenuItemKeys.Delete ||
- value === MenuItemKeys.Clone ||
- value === MenuItemKeys.CreateAlerts ||
- value === MenuItemKeys.Download;
+export const generateMenuList = (
+ actions: MenuItem[],
+): DropdownActionItemType[] => actions.filter((action) => action.isVisible);
diff --git a/frontend/src/container/WidgetCard/Panels/__tests__/__snapshots__/ValuePanelWrapper.test.tsx.snap b/frontend/src/container/WidgetCard/Panels/__tests__/__snapshots__/ValuePanelWrapper.test.tsx.snap
index ee405cf5de..7f3b4e040d 100644
--- a/frontend/src/container/WidgetCard/Panels/__tests__/__snapshots__/ValuePanelWrapper.test.tsx.snap
+++ b/frontend/src/container/WidgetCard/Panels/__tests__/__snapshots__/ValuePanelWrapper.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`Value panel wrappper tests should render tooltip when there are conflic
class="c0"
>
<p
- class="_typography_j4pmm_1"
+ class="_typography_i5nbo_1"
data-slot="typography"
data-variant="text"
/>
@@ -50,7 +50,7 @@ exports[`Value panel wrappper tests should render tooltip when there are conflic
class="value-text-container"
>
<p
- class="_typography_j4pmm_1 value-graph-text"
+ class="_typography_i5nbo_1 value-graph-text"
data-slot="typography"
data-testid="value-graph-text"
data-variant="text"
@@ -59,7 +59,7 @@ exports[`Value panel wrappper tests should render tooltip when there are conflic
295.43
</p>
<p
- class="_typography_j4pmm_1 value-graph-unit"
+ class="_typography_i5nbo_1 value-graph-unit"
data-slot="typography"
data-testid="value-graph-suffix-unit"
data-variant="text"
diff --git a/frontend/src/lib/authz/components/AuthZButton/AuthZButton.authz.test.tsx b/frontend/src/lib/authz/components/AuthZButton/AuthZButton.authz.test.tsx
index cc07883968..50db961a5b 100644
--- a/frontend/src/lib/authz/components/AuthZButton/AuthZButton.authz.test.tsx
+++ b/frontend/src/lib/authz/components/AuthZButton/AuthZButton.authz.test.tsx
@@ -1,65 +1,138 @@
-import { ReactElement } from 'react';
-import { render, screen } from 'tests/test-utils';
-import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
+import { server } from 'mocks-server/server';
+import { rest } from 'msw';
import type { AuthZObject } from 'lib/authz/hooks/useAuthZ/types';
import { buildPermission } from 'lib/authz/hooks/useAuthZ/utils';
+import {
+ AUTHZ_CHECK_URL,
+ setupAuthzAdmin,
+ setupAuthzDeny,
+} from 'lib/authz/utils/authz-test-utils';
+import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import AuthZButton from './AuthZButton';
-
-// AuthZButton is a thin composition over AuthZTooltip + Button. The denial
-// tooltip / disabled-on-deny UX is owned and tested by AuthZTooltip; here we
-// assert AuthZButton forwards the right props and renders a Button child.
-jest.mock('lib/authz/components/AuthZTooltip/AuthZTooltip');
-const mockTooltip = AuthZTooltip as unknown as jest.Mock;
+import AuthZButton, { AuthZButtonProps } from './AuthZButton';
const createPerm = buildPermission(
'create',
'serviceaccount:*' as AuthZObject<'create'>,
);
+function renderButton(props: Partial<AuthZButtonProps> = {}): void {
+ render(
+ <AuthZButton
+ size="md"
+ variant="solid"
+ color="primary"
+ checks={[createPerm]}
+ testId="create-btn"
+ {...(props as object)}
+ >
+ Create
+ </AuthZButton>,
+ );
+}
+
describe('AuthZButton', () => {
- beforeEach(() => {
- mockTooltip.mockImplementation(
- ({ children }: { children: ReactElement }) => children,
+ afterEach(() => {
+ server.resetHandlers();
+ });
+
+ it('shows as loading while the check is pending', () => {
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.delay('infinite'))),
);
+
+ renderButton();
+
+ expect(screen.getByTestId('create-btn')).toHaveAttribute('aria-busy', 'true');
});
- afterEach(() => {
- mockTooltip.mockReset();
+ it('enables a granted button', async () => {
+ server.use(setupAuthzAdmin());
+
+ renderButton();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('create-btn')).not.toHaveAttribute('aria-busy');
+ });
+ expect(screen.getByTestId('create-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- it('renders a Button child with forwarded props', () => {
- render(
- <AuthZButton checks={[createPerm]} testId="create-btn">
- Create
- </AuthZButton>,
+ it('disables a denied button and names the permission', async () => {
+ server.use(setupAuthzDeny(createPerm));
+
+ renderButton();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('create-btn')).toHaveAttribute(
+ 'data-denied-permissions',
+ createPerm,
+ );
+ });
+ expect(screen.getByTestId('create-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
);
- expect(screen.getByTestId('create-btn')).toBeInTheDocument();
- expect(screen.getByTestId('create-btn').tagName).toBe('BUTTON');
+ await userEvent.hover(screen.getByTestId('create-btn'));
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'is not authorized to perform create:serviceaccount:*',
+ );
});
- it('forwards checks and enables the check by default', () => {
- render(
- <AuthZButton checks={[createPerm]} testId="create-btn">
- Create
- </AuthZButton>,
- );
+ it('uses tooltipMessage in place of the denial wording', async () => {
+ server.use(setupAuthzDeny(createPerm));
+
+ renderButton({ tooltipMessage: 'Ask an admin' });
- expect(mockTooltip).toHaveBeenCalledTimes(1);
- expect(mockTooltip.mock.calls[0][0]).toMatchObject({
- checks: [createPerm],
- enabled: true,
+ await waitFor(() => {
+ expect(screen.getByTestId('create-btn')).toHaveAttribute(
+ 'data-denied-permissions',
+ );
});
+ await userEvent.hover(screen.getByTestId('create-btn'));
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'Ask an admin',
+ );
});
- it('passes authZEnabled through as the tooltip enabled flag', () => {
- render(
- <AuthZButton checks={[createPerm]} authZEnabled={false} testId="create-btn">
- Create
- </AuthZButton>,
+ it('lets disabledTooltip outrank its checks', async () => {
+ const onCheck = jest.fn();
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => {
+ onCheck();
+ return res(ctx.status(200));
+ }),
);
- expect(mockTooltip.mock.calls[0][0]).toMatchObject({ enabled: false });
+ renderButton({ disabledTooltip: 'Locked' });
+
+ expect(screen.getByTestId('create-btn')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ await userEvent.hover(screen.getByTestId('create-btn'));
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'Locked',
+ );
+ expect(onCheck).not.toHaveBeenCalled();
+ });
+
+ it('skips the check when authZEnabled is false', async () => {
+ const onCheck = jest.fn();
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => {
+ onCheck();
+ return res(ctx.status(200));
+ }),
+ );
+
+ renderButton({ authZEnabled: false });
+
+ expect(screen.getByTestId('create-btn')).not.toHaveAttribute('aria-busy');
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ expect(onCheck).not.toHaveBeenCalled();
});
});
diff --git a/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx b/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx
index 1865c654a5..dbcaa1faa0 100644
--- a/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx
+++ b/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx
@@ -1,6 +1,10 @@
+import { useMemo } from 'react';
import { Button, ButtonProps } from '@signozhq/ui/button';
-import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
+import { AUTHZ_LOADING_TOOLTIP } from 'lib/authz/components/constants';
+import { deniedTooltip } from 'lib/authz/components/deniedTooltip';
import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
+import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
+import { useAppContext } from 'providers/App/App';
export type AuthZButtonProps = ButtonProps & {
/**
@@ -15,38 +19,54 @@ export type AuthZButtonProps = ButtonProps & {
tooltipMessage?: string;
/**
* A non-permission block the consumer already knows about — a lock, an
- * immutable resource. Takes precedence over `checks`, which are then skipped.
+ * immutable resource. Disables the button and takes precedence over `checks`,
+ * which are then skipped.
*/
- disabledTooltip?: string;
- /** Which side of the button to render the tooltip against. */
- side?: 'top' | 'bottom' | 'left' | 'right';
- /**
- * Set this false when this button is used inside a modal/drawer of signozhq/ui,
- * otherwise the tooltip will not have the correct z-index
- */
- withPortal?: false;
+ disabledTooltip?: ButtonProps['disabledTooltip'];
};
function AuthZButton({
checks,
authZEnabled = true,
tooltipMessage,
+ disabled,
disabledTooltip,
- side,
- withPortal,
+ loading,
+ loadingTooltip,
...buttonProps
}: AuthZButtonProps): JSX.Element {
+ const { user } = useAppContext();
+
+ const isBlocked = !!disabledTooltip;
+ const shouldCheck = authZEnabled && checks.length > 0 && !isBlocked;
+
+ const { permissions, isLoading } = useAuthZ(checks, { enabled: shouldCheck });
+
+ const deniedPermissions = useMemo(() => {
+ if (!shouldCheck || !permissions) {
+ return [];
+ }
+ return checks.filter((p) => permissions[p]?.isGranted === false);
+ }, [shouldCheck, checks, permissions]);
+
+ const isPending = shouldCheck && isLoading;
+ const isDenied = deniedPermissions.length > 0;
+
return (
- <AuthZTooltip
- checks={checks}
- enabled={authZEnabled}
- tooltipMessage={tooltipMessage}
- disabledTooltip={disabledTooltip}
- side={side}
- withPortal={withPortal}
- >
- <Button {...buttonProps} />
- </AuthZTooltip>
+ <Button
+ {...buttonProps}
+ disabled={disabled || isBlocked || isDenied}
+ disabledTooltip={
+ isDenied
+ ? deniedTooltip(deniedPermissions, user.id, tooltipMessage)
+ : disabledTooltip
+ }
+ loading={loading || isPending}
+ loadingTooltip={
+ isPending && !loading ? AUTHZ_LOADING_TOOLTIP : loadingTooltip
+ }
+ data-denied-permissions={isDenied ? deniedPermissions.join(',') : undefined}
+ />
);
}
diff --git a/frontend/src/lib/authz/components/AuthZDropdown/AuthZDropdown.authz.test.tsx b/frontend/src/lib/authz/components/AuthZDropdown/AuthZDropdown.authz.test.tsx
new file mode 100644
index 0000000000..47c75a09b7
--- /dev/null
+++ b/frontend/src/lib/authz/components/AuthZDropdown/AuthZDropdown.authz.test.tsx
@@ -0,0 +1,165 @@
+import { server } from 'mocks-server/server';
+import { rest } from 'msw';
+import { render, screen, userEvent, waitFor } from 'tests/test-utils';
+import type { AuthZObject } from 'lib/authz/hooks/useAuthZ/types';
+import { buildPermission } from 'lib/authz/hooks/useAuthZ/utils';
+import {
+ AUTHZ_CHECK_URL,
+ setupAuthzAdmin,
+ setupAuthzDeny,
+} from 'lib/authz/utils/authz-test-utils';
+
+import AuthZDropdown from './AuthZDropdown';
+import type { AuthZDropdownItemType } from './types';
+
+const createPerm = buildPermission(
+ 'create',
+ 'serviceaccount:*' as AuthZObject<'create'>,
+);
+
+const items: AuthZDropdownItemType[] = [
+ { type: 'item', value: 'open', label: 'Open', testId: 'row-open' },
+ {
+ type: 'item',
+ value: 'create',
+ label: 'Create',
+ testId: 'row-create',
+ checks: [createPerm],
+ },
+];
+
+function renderDropdown(rows = items): void {
+ render(
+ <AuthZDropdown
+ items={rows}
+ nativeButton
+ side="bottom"
+ align="end"
+ testId="menu"
+ >
+ <button type="button">Menu</button>
+ </AuthZDropdown>,
+ );
+}
+
+async function openMenu(): Promise<void> {
+ await userEvent.click(screen.getByTestId('menu'));
+ await screen.findByTestId('row-create');
+}
+
+describe('AuthZDropdown', () => {
+ afterEach(() => {
+ server.resetHandlers();
+ });
+
+ it('fires no check until the menu opens', async () => {
+ const onCheck = jest.fn();
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => {
+ onCheck();
+ return res(ctx.status(200));
+ }),
+ );
+
+ renderDropdown();
+
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ expect(onCheck).not.toHaveBeenCalled();
+ });
+
+ it('shows a gated row as loading while its check is pending', async () => {
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.delay('infinite'))),
+ );
+
+ renderDropdown();
+ await openMenu();
+
+ expect(screen.getByTestId('row-create')).toHaveAttribute('data-loading');
+ expect(screen.getByTestId('row-create')).not.toHaveAttribute('data-disabled');
+ expect(screen.getByTestId('row-open')).not.toHaveAttribute('data-loading');
+ });
+
+ it('disables a denied row and names the permission', async () => {
+ server.use(setupAuthzDeny(createPerm));
+
+ renderDropdown();
+ await openMenu();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('row-create')).toHaveAttribute('data-disabled');
+ });
+ expect(screen.getByTestId('row-open')).not.toHaveAttribute('data-disabled');
+
+ await userEvent.hover(screen.getByTestId('row-create'));
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'is not authorized to perform create:serviceaccount:*',
+ );
+ });
+
+ it('gates rows inside a group', async () => {
+ server.use(setupAuthzDeny(createPerm));
+
+ renderDropdown([
+ {
+ type: 'group',
+ value: 'section',
+ label: 'Section',
+ items: [
+ { type: 'item', value: 'open', label: 'Open', testId: 'row-open' },
+ {
+ type: 'item',
+ value: 'create',
+ label: 'Create',
+ testId: 'row-create',
+ checks: [createPerm],
+ },
+ ],
+ },
+ ]);
+ await openMenu();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('row-create')).toHaveAttribute('data-disabled');
+ });
+ expect(screen.getByTestId('row-open')).not.toHaveAttribute('data-disabled');
+ });
+
+ it('enables a granted row', async () => {
+ server.use(setupAuthzAdmin());
+
+ renderDropdown();
+ await openMenu();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('row-create')).not.toHaveAttribute('data-loading');
+ });
+ expect(screen.getByTestId('row-create')).not.toHaveAttribute('data-disabled');
+ });
+
+ it('lets a row block outrank its checks', async () => {
+ const onCheck = jest.fn();
+ server.use(
+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => {
+ onCheck();
+ return res(ctx.status(200));
+ }),
+ );
+
+ renderDropdown([
+ {
+ type: 'item',
+ value: 'create',
+ label: 'Create',
+ testId: 'row-create',
+ checks: [createPerm],
+ disabled: true,
+ disabledTooltip: 'Locked',
+ },
+ ]);
+ await openMenu();
+
+ expect(screen.getByTestId('row-create')).toHaveAttribute('data-disabled');
+ expect(onCheck).not.toHaveBeenCalled();
+ });
+});
diff --git a/frontend/src/lib/authz/components/AuthZDropdown/AuthZDropdown.tsx b/frontend/src/lib/authz/components/AuthZDropdown/AuthZDropdown.tsx
new file mode 100644
index 0000000000..9a0605d87b
--- /dev/null
+++ b/frontend/src/lib/authz/components/AuthZDropdown/AuthZDropdown.tsx
@@ -0,0 +1,58 @@
+import { useCallback, useMemo, useState } from 'react';
+import { Dropdown } from '@signozhq/ui/dropdown';
+import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
+import { useAppContext } from 'providers/App/App';
+
+import type { AuthZDropdownProps } from './types';
+import { applyAuthZ, collectChecks } from './utils';
+
+/**
+ * A Dropdown whose rows take optional `checks`. A denied row is disabled with the
+ * standard denial wording; a row still waiting on its check shows as loading.
+ *
+ * Checks run only once the menu has been opened, so a list of rows does not pay
+ * for a menu nobody looked at.
+ */
+function AuthZDropdown({
+ items,
+ onOpenChange,
+ ...dropdownProps
+}: AuthZDropdownProps): JSX.Element {
+ const { user } = useAppContext();
+ const [hasOpened, setHasOpened] = useState(false);
+
+ const checks = useMemo(() => collectChecks(items), [items]);
+ const { permissions, isLoading, error } = useAuthZ(checks, {
+ enabled: hasOpened && checks.length > 0,
+ });
+ // The query only reports loading once its fetch starts, a render after the
+ // menu opens; without this the gated rows flash enabled first.
+ const isPending =
+ isLoading || (!error && checks.some((p) => !permissions?.[p]));
+
+ const gatedItems = useMemo(
+ () =>
+ applyAuthZ(items, { permissions, isLoading: isPending, userId: user.id }),
+ [items, permissions, isPending, user.id],
+ );
+
+ const handleOpenChange = useCallback(
+ (open: boolean): void => {
+ if (open) {
+ setHasOpened(true);
+ }
+ onOpenChange?.(open);
+ },
+ [onOpenChange],
+ );
+
+ return (
+ <Dropdown
+ {...dropdownProps}
+ items={gatedItems}
+ onOpenChange={handleOpenChange}
+ />
+ );
+}
+
+export default AuthZDropdown;
diff --git a/frontend/src/lib/authz/components/AuthZDropdown/types.ts b/frontend/src/lib/authz/components/AuthZDropdown/types.ts
new file mode 100644
index 0000000000..6581deceaf
--- /dev/null
+++ b/frontend/src/lib/authz/components/AuthZDropdown/types.ts
@@ -0,0 +1,38 @@
+import type {
+ DropdownActionItemType,
+ DropdownGroupChildType,
+ DropdownGroupItemType,
+ DropdownItemType,
+ DropdownLinkItemType,
+ DropdownProps,
+ DropdownSubmenuItemType,
+} from '@signozhq/ui/dropdown';
+import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
+
+/** The row kinds that can be disabled, and so gated. */
+export type AuthZGateableItemType =
+ | DropdownActionItemType
+ | DropdownLinkItemType
+ | DropdownSubmenuItemType;
+
+type AuthZGatedItemType = AuthZGateableItemType & {
+ /**
+ * Permissions the row needs (AND semantics). A row's own `disabled` or
+ * `loading` outranks them, and they are then skipped.
+ */
+ checks?: BrandedPermission[];
+};
+
+/** What a group may hold, with `checks` on the gateable rows. */
+export type AuthZGroupChildType =
+ | AuthZGatedItemType
+ | Exclude<DropdownGroupChildType, AuthZGateableItemType>;
+
+export type AuthZDropdownItemType =
+ | AuthZGatedItemType
+ | DropdownGroupItemType<AuthZGroupChildType>
+ | Exclude<DropdownItemType, AuthZGateableItemType | DropdownGroupItemType>;
+
+export type AuthZDropdownProps = Omit<DropdownProps, 'items'> & {
+ items: AuthZDropdownItemType[];
+};
diff --git a/frontend/src/lib/authz/components/AuthZDropdown/utils.ts b/frontend/src/lib/authz/components/AuthZDropdown/utils.ts
new file mode 100644
index 0000000000..64c1d126d8
--- /dev/null
+++ b/frontend/src/lib/authz/components/AuthZDropdown/utils.ts
@@ -0,0 +1,91 @@
+import type {
+ DropdownGroupChildType,
+ DropdownItemType,
+} from '@signozhq/ui/dropdown';
+import { AUTHZ_LOADING_TOOLTIP } from 'lib/authz/components/constants';
+import { deniedTooltip } from 'lib/authz/components/deniedTooltip';
+import type {
+ AuthZCheckResponse,
+ BrandedPermission,
+} from 'lib/authz/hooks/useAuthZ/types';
+
+import type { AuthZDropdownItemType, AuthZGroupChildType } from './types';
+
+interface GateState {
+ permissions: AuthZCheckResponse | null;
+ isLoading: boolean;
+ userId: string;
+}
+
+/**
+ * A non-permission reason blocks the row; without one the row's checks decide.
+ */
+export function blockedBy(reason: string): {
+ disabled: boolean;
+ disabledTooltip: string | undefined;
+} {
+ return { disabled: !!reason, disabledTooltip: reason || undefined };
+}
+
+function getActiveChecks(item: AuthZGroupChildType): BrandedPermission[] {
+ if (!('checks' in item) || !item.checks || item.disabled || item.loading) {
+ return [];
+ }
+ return item.checks;
+}
+
+export function collectChecks(
+ items: AuthZDropdownItemType[],
+): BrandedPermission[] {
+ return [
+ ...new Set(
+ items.flatMap((item) =>
+ item.type === 'group'
+ ? item.items.flatMap(getActiveChecks)
+ : getActiveChecks(item),
+ ),
+ ),
+ ];
+}
+
+function gateRow(
+ item: AuthZGroupChildType,
+ { permissions, isLoading, userId }: GateState,
+): DropdownGroupChildType {
+ if (!('checks' in item)) {
+ return item;
+ }
+
+ const { checks: _checks, ...row } = item;
+ const checks = getActiveChecks(item);
+ if (checks.length === 0) {
+ return row;
+ }
+
+ if (isLoading) {
+ return { ...row, loading: true, loadingTooltip: AUTHZ_LOADING_TOOLTIP };
+ }
+
+ const denied = checks.filter((p) => permissions?.[p]?.isGranted === false);
+ if (denied.length === 0) {
+ return row;
+ }
+
+ return {
+ ...row,
+ disabled: true,
+ disabledTooltip: deniedTooltip(denied, userId),
+ };
+}
+
+export function applyAuthZ(
+ items: AuthZDropdownItemType[],
+ state: GateState,
+): DropdownItemType[] {
+ return items.map(
+ (item): DropdownItemType =>
+ item.type === 'group'
+ ? { ...item, items: item.items.map((child) => gateRow(child, state)) }
+ : gateRow(item, state),
+ );
+}
diff --git a/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx b/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx
index d8d5115350..cfb626cf5f 100644
--- a/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx
+++ b/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx
@@ -2,24 +2,14 @@ import {
cloneElement,
CSSProperties,
ReactElement,
- useCallback,
useMemo,
useRef,
- useState,
} from 'react';
-import {
- TooltipContent,
- TooltipProvider,
- TooltipRoot,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
-import { formatPermission } from 'lib/authz/hooks/useAuthZ/utils';
import { useAppContext } from 'providers/App/App';
-import cx from 'classnames';
-
-import styles from '../tooltipContent.module.scss';
+import { deniedTooltip } from 'lib/authz/components/deniedTooltip';
const DISABLED_STYLE: CSSProperties = {
pointerEvents: 'all',
@@ -54,18 +44,11 @@ interface AuthZTooltipProps {
* otherwise the tooltip will not have the correct z-index
*/
withPortal?: false;
-}
-
-function formatDeniedMessage(
- denied: BrandedPermission[],
- userId: string,
- override?: string,
-): string {
- if (override) {
- return override;
- }
- const permissions = denied.map(formatPermission).join(', ');
- return `user/${userId} is not authorized to perform ${permissions}`;
+ /**
+ * Class for the span that wraps the child while it is disabled. Use it when the
+ * child's layout depends on its parent, e.g. an input that fills a flex row.
+ */
+ triggerClassName?: string;
}
function AuthZTooltip({
@@ -76,10 +59,10 @@ function AuthZTooltip({
disabledTooltip,
side,
withPortal,
+ triggerClassName,
}: AuthZTooltipProps): JSX.Element {
const { user } = useAppContext();
- const isPointerOverRef = useRef(false);
- const [isOpen, setIsOpen] = useState(false);
+ const inlineContainerRef = useRef<HTMLSpanElement>(null);
// The block the consumer passed is already decisive, so the check is not run.
const isBlocked = !!disabledTooltip;
@@ -94,20 +77,6 @@ function AuthZTooltip({
return checks.filter((p) => permissions[p]?.isGranted === false);
}, [checks, permissions]);
- /**
- * Radix closes the tooltip on pointerdown and on click, and merges its own
- * handlers after the trigger's regardless of `preventDefault`, so the close is
- * filtered here. Clicking a dead control does nothing, which is exactly when
- * its reason is still wanted, so a close is ignored while the pointer remains
- * on it. Everything else stays Radix's to decide.
- */
- const handleOpenChange = useCallback((next: boolean): void => {
- if (!next && isPointerOverRef.current) {
- return;
- }
- setIsOpen(next);
- }, []);
-
if (shouldCheck && isLoading) {
return cloneElement(children, {
disabled: true,
@@ -122,47 +91,46 @@ function AuthZTooltip({
return children;
}
- const childTestId = (children.props as { testId?: string }).testId;
-
- return (
- <TooltipProvider>
- <TooltipRoot open={isOpen} onOpenChange={handleOpenChange}>
- <TooltipTrigger asChild testId={childTestId}>
- {cloneElement(children, {
- disabled: true,
- style: DISABLED_STYLE,
- onClick: noOp,
- onMouseDown: noOp,
- onPointerDown: noOp,
- onPointerEnter: (): void => {
- isPointerOverRef.current = true;
- },
- onPointerLeave: (): void => {
- isPointerOverRef.current = false;
- },
- ...(isBlocked
- ? {}
- : { 'data-denied-permissions': deniedPermissions.join(',') }),
- })}
- </TooltipTrigger>
- <TooltipContent
- side={side}
- // A denial has no arrow; a state the user can act on is not an error
- // and reads as a normal tooltip.
- arrow={isBlocked}
- className={cx(
- isBlocked ? styles.blockedContent : styles.errorContent,
- styles.aboveOverlay,
- )}
- withPortal={withPortal}
- >
- {isBlocked
- ? disabledTooltip
- : formatDeniedMessage(deniedPermissions, user.id, tooltipMessage)}
- </TooltipContent>
- </TooltipRoot>
- </TooltipProvider>
+ const tooltip = (
+ <Tooltip
+ title={
+ isBlocked
+ ? disabledTooltip
+ : deniedTooltip(deniedPermissions, user.id, tooltipMessage)
+ }
+ side={side}
+ container={withPortal === false ? inlineContainerRef : undefined}
+ >
+ {/*
+ * A natively disabled control receives no hover, so the popup never
+ * opens. The span is the trigger; the control stays disabled.
+ */}
+ <span className={triggerClassName} style={{ display: 'inline-flex' }}>
+ {cloneElement(children, {
+ disabled: true,
+ style: DISABLED_STYLE,
+ onClick: noOp,
+ onMouseDown: noOp,
+ onPointerDown: noOp,
+ ...(isBlocked
+ ? {}
+ : { 'data-denied-permissions': deniedPermissions.join(',') }),
+ })}
+ </span>
+ </Tooltip>
);
+
+ // A modal stacks above a body portal. Keep the popup in this subtree so it
+ // shares that stacking context.
+ if (withPortal === false) {
+ return (
+ <span ref={inlineContainerRef} style={{ display: 'contents' }}>
+ {tooltip}
+ </span>
+ );
+ }
+
+ return tooltip;
}
export default AuthZTooltip;
diff --git a/frontend/src/lib/authz/components/PermissionDeniedFullPage/PermissionDeniedFullPage.tsx b/frontend/src/lib/authz/components/PermissionDeniedFullPage/PermissionDeniedFullPage.tsx
index e34317aa84..f30ce587a6 100644
--- a/frontend/src/lib/authz/components/PermissionDeniedFullPage/PermissionDeniedFullPage.tsx
+++ b/frontend/src/lib/authz/components/PermissionDeniedFullPage/PermissionDeniedFullPage.tsx
@@ -31,7 +31,7 @@ function PermissionDeniedFullPage({
<div className={styles.container}>
<div className={styles.content}>
<span className={styles.icon}>
- <CircleSlash2 color={Style.CALLOUT_WARNING_TITLE} size={14} />
+ <CircleSlash2 color={Style.CALLOUT_ERROR_TITLE} size={14} />
</span>
<p className={styles.title}>Uh-oh! You are not authorized</p>
<p className={styles.subtitle}>
diff --git a/frontend/src/lib/authz/components/README.md b/frontend/src/lib/authz/components/README.md
index 0faf1aa1b7..c55dbe8be4 100644
--- a/frontend/src/lib/authz/components/README.md
+++ b/frontend/src/lib/authz/components/README.md
@@ -7,6 +7,7 @@ Quick reference for permission-gating UI. All components use AND semantics: user
```
Need to gate...
├── A button? → AuthZButton
+├── Rows of a dropdown menu? → AuthZDropdown
├── Any element with tooltip on deny? → AuthZTooltip
├── A section inside a page? → withAuthZContent (preferred)
│ └── Need JSX wrapper? → AuthZGuardContent
@@ -79,6 +80,24 @@ import { SACreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service
</AuthZButton>
```
+### AuthZDropdown
+
+`Dropdown` whose `item`, `link` and `submenu` rows take optional `checks`, at the top level or inside a `group`. A pending row shows as loading, a denied row is disabled with the denial tooltip. Checks run on first open. A row's own `disabled` or `loading` outranks its checks: spread `blockedBy(reason)` from `./AuthZDropdown/utils` for a non-permission block such as a lock.
+
+```tsx
+<AuthZDropdown
+ nativeButton
+ side="bottom"
+ align="end"
+ items={[
+ { type: 'item', value: 'view', label: 'View', onClick: onView },
+ { type: 'item', value: 'delete', label: 'Delete', danger: true, checks: [buildDashboardDeletePermission(id)], onClick: onDelete },
+ ]}
+>
+ <Button aria-label="Actions">...</Button>
+</AuthZDropdown>
+```
+
### AuthZTooltip
Wraps any element. Disables child + shows denial tooltip.
diff --git a/frontend/src/lib/authz/components/constants.ts b/frontend/src/lib/authz/components/constants.ts
new file mode 100644
index 0000000000..1da5552f8a
--- /dev/null
+++ b/frontend/src/lib/authz/components/constants.ts
@@ -0,0 +1 @@
+export const AUTHZ_LOADING_TOOLTIP = 'Checking permissions';
diff --git a/frontend/src/lib/authz/components/deniedTooltip.module.scss b/frontend/src/lib/authz/components/deniedTooltip.module.scss
new file mode 100644
index 0000000000..2357f89317
--- /dev/null
+++ b/frontend/src/lib/authz/components/deniedTooltip.module.scss
@@ -0,0 +1,9 @@
+.denied {
+ display: contents;
+}
+
+// The popup is portalled away from its trigger, so the content marks it.
+:global([data-slot='tooltip-content']):has(.denied) {
+ --tooltip-background-color: var(--callout-error-background);
+ --tooltip-border-color: var(--callout-error-border);
+}
diff --git a/frontend/src/lib/authz/components/deniedTooltip.tsx b/frontend/src/lib/authz/components/deniedTooltip.tsx
new file mode 100644
index 0000000000..6049e80dc3
--- /dev/null
+++ b/frontend/src/lib/authz/components/deniedTooltip.tsx
@@ -0,0 +1,17 @@
+import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
+
+import { formatDeniedMessage } from './formatDeniedMessage';
+
+import styles from './deniedTooltip.module.scss';
+
+export function deniedTooltip(
+ denied: BrandedPermission[],
+ userId: string,
+ override?: string,
+): JSX.Element {
+ return (
+ <span className={styles.denied}>
+ {formatDeniedMessage(denied, userId, override)}
+ </span>
+ );
+}
diff --git a/frontend/src/lib/authz/components/formatDeniedMessage.ts b/frontend/src/lib/authz/components/formatDeniedMessage.ts
new file mode 100644
index 0000000000..d64229ea19
--- /dev/null
+++ b/frontend/src/lib/authz/components/formatDeniedMessage.ts
@@ -0,0 +1,14 @@
+import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
+import { formatPermission } from 'lib/authz/hooks/useAuthZ/utils';
+
+export function formatDeniedMessage(
+ denied: BrandedPermission[],
+ userId: string,
+ override?: string,
+): string {
+ if (override) {
+ return override;
+ }
+ const permissions = denied.map(formatPermission).join(', ');
+ return `user/${userId} is not authorized to perform ${permissions}`;
+}
diff --git a/frontend/src/lib/authz/components/tooltipContent.module.scss b/frontend/src/lib/authz/components/tooltipContent.module.scss
deleted file mode 100644
index 7db2a51687..0000000000
--- a/frontend/src/lib/authz/components/tooltipContent.module.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-// Shared presentation for every "you can't use this, here's why" tooltip, so the
-// explanation looks the same wherever it surfaces.
-//
-// These drive the bubble AND the arrow: @signozhq/ui paints both from
-// --tooltip-background / --tooltip-border-color, so setting the variables keeps
-// them in step. Overriding `background`/`border-color` directly styles only the
-// bubble and leaves the arrow on the default fill.
-.errorContent {
- --tooltip-background: var(--callout-error-background);
- --tooltip-border-color: var(--callout-error-border);
- --tooltip-foreground: var(--foreground);
-
- backdrop-filter: blur(15px);
- border-radius: 4px;
- font-style: normal;
- font-weight: 400;
- // Reasons naming two permissions run long; wrap rather than stretch the
- // bubble across the viewport.
- max-width: 260px;
- white-space: normal;
-}
-
-// A block the user can act on themselves — a lock, an integration-owned or
-// legacy dashboard — reads as state, not as an access error.
-.blockedContent {
- --tooltip-background: var(--l2-background);
- --tooltip-border-color: var(--l2-border);
- --tooltip-foreground: var(--l1-foreground);
-
- backdrop-filter: blur(15px);
- border-radius: 4px;
- font-style: normal;
- font-weight: 400;
- max-width: 260px;
- white-space: normal;
-}
-
-.aboveOverlay {
- // Lift above the dropdown menu (z 50) and the antd Drawer (z 1000) so the
- // tooltip is never clipped behind them. The arrow reads this too.
- --tooltip-z-index: 1100;
-}
diff --git a/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.module.css b/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.module.css
index 052dc0689a..3641033b22 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.module.css
+++ b/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.module.css
@@ -9,20 +9,3 @@
align-items: center;
gap: 4px;
}
-
-.button {
- box-shadow:
- 0 4px 12px rgb(0 0 0 / 15%),
- 0 0 0 1px rgb(0 0 0 / 5%);
-}
-
-.badge {
- margin-left: 4px;
-}
-
-.closeButton {
- border-radius: 4px;
- box-shadow:
- 0 4px 12px rgb(0 0 0 / 15%),
- 0 0 0 1px rgb(0 0 0 / 5%);
-}
diff --git a/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.tsx b/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.tsx
index 1234a0b968..2532d7c01a 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.tsx
+++ b/frontend/src/lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator.tsx
@@ -37,11 +37,10 @@ export function AuthZDevFloatingIndicator(): JSX.Element | null {
color="warning"
size="sm"
onClick={handleOpen}
- className={styles.button}
- data-testid="authz-dev-floating-indicator"
+ testId="authz-dev-floating-indicator"
>
AuthZ Overrides
- <Badge color="warning" className={styles.badge}>
+ <Badge variant="solid" color="warning">
{overrideCount}
</Badge>
</Button>
@@ -49,12 +48,13 @@ export function AuthZDevFloatingIndicator(): JSX.Element | null {
variant="ghost"
color="secondary"
size="sm"
+ icon
onClick={handleDismiss}
- className={styles.closeButton}
aria-label="Dismiss indicator"
- data-testid="authz-dev-floating-dismiss"
- prefix={<X />}
- />
+ testId="authz-dev-floating-dismiss"
+ >
+ <X />
+ </Button>
</div>,
document.body,
);
diff --git a/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModal.module.css b/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModal.module.css
index 2229ac9082..3d71b22730 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModal.module.css
+++ b/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModal.module.css
@@ -55,6 +55,9 @@
.filter {
flex: 0 0 176px;
+ /* The inline popup must stack above the list buttons, which set `isolation: isolate`. */
+ position: relative;
+ z-index: 1;
/* Normalize the library trigger height (2.25rem) to match the input. */
--select-trigger-height: 2rem;
}
@@ -74,11 +77,6 @@
gap: var(--spacing-3);
}
-.actionButton {
- flex: 0 0 auto;
- height: 2rem;
-}
-
.list {
display: flex;
flex: 1 1 auto;
diff --git a/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModalHeader.tsx b/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModalHeader.tsx
index 1dafab6657..f8e3991aa6 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModalHeader.tsx
+++ b/frontend/src/lib/authz/devtools/AuthZDevModal/AuthZDevModalHeader.tsx
@@ -49,6 +49,13 @@ export function AuthZDevModalHeader({
clearAllOverrides(hasActiveFilter ? filteredPermissions : undefined);
}, [clearAllOverrides, hasActiveFilter, filteredPermissions]);
+ const noPermissionsReason = hasActiveFilter
+ ? 'No permissions match the filter'
+ : 'No permissions to change';
+ const noOverridesReason = hasActiveFilter
+ ? 'No filtered permission is overridden'
+ : 'No permission is overridden';
+
return (
<div className={styles.header}>
<div className={styles.searchRow}>
@@ -74,29 +81,29 @@ export function AuthZDevModalHeader({
</div>
<div className={styles.actionsRow}>
<Button
- className={styles.actionButton}
- variant="outlined"
+ disabledTooltip={noPermissionsReason}
+ variant="solid"
color="success"
size="sm"
onClick={handleGrantAll}
disabled={filteredPermissions.length === 0}
- data-testid="authz-dev-grant-all"
+ testId="authz-dev-grant-all"
>
{hasActiveFilter ? 'Grant filtered' : 'Grant all'}
</Button>
<Button
- className={styles.actionButton}
- variant="outlined"
- color="error"
+ disabledTooltip={noPermissionsReason}
+ variant="solid"
+ color="danger"
size="sm"
onClick={handleDenyAll}
disabled={filteredPermissions.length === 0}
- data-testid="authz-dev-deny-all"
+ testId="authz-dev-deny-all"
>
{hasActiveFilter ? 'Deny filtered' : 'Deny all'}
</Button>
<Button
- className={styles.actionButton}
+ disabledTooltip={noOverridesReason}
variant="outlined"
color="secondary"
size="sm"
@@ -104,7 +111,7 @@ export function AuthZDevModalHeader({
disabled={
hasActiveFilter ? filteredOverrideCount === 0 : overrideCount === 0
}
- data-testid="authz-dev-clear-all"
+ testId="authz-dev-clear-all"
>
{hasActiveFilter
? `Clear filtered (${filteredOverrideCount})`
diff --git a/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.module.css b/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.module.css
index d6c3060aba..b9b9daf280 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.module.css
+++ b/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.module.css
@@ -6,37 +6,35 @@
background: var(--l2-background);
border: 1px solid var(--l3-border);
border-radius: var(--radius-2);
-}
-.segment {
--button-height: 22px;
--button-padding: 0 var(--spacing-3);
- --button-secondary-ghost-hover-foreground: var(--l2-foreground);
+ --button-secondary-ghost-label: var(--l2-foreground);
+ --button-secondary-ghost-label-hover: var(--l2-foreground);
--button-variant-ghost-background-color: transparent;
- border: none;
--button-border-radius: calc(var(--radius-2) - 1px);
- transition:
- background 120ms ease,
- color 120ms ease;
}
-.segment:not(.segmentActive):hover {
- --button-secondary-ghost-hover-foreground: var(--l2-foreground-hover);
+.segmented [data-slot='button']:not([aria-pressed='true']):hover {
+ --button-secondary-ghost-label: var(--l2-foreground-hover);
+ --button-secondary-ghost-label-hover: var(--l2-foreground-hover);
--button-variant-ghost-background-color: var(--l2-background);
}
-.segmentIcon {
- display: inline-flex;
- align-items: center;
+/* An empty label would still take a flex gap after the icon. */
+.segmented [aria-pressed='false'] {
+ --button-label-display: none;
}
-.segment.optAuto {
- --button-secondary-ghost-hover-foreground: var(--l1-foreground);
+.segmented [aria-pressed='true'][data-option='reset'] {
+ --button-secondary-ghost-label: var(--l1-foreground);
+ --button-secondary-ghost-label-hover: var(--l1-foreground);
--button-variant-ghost-background-color: var(--l3-background);
}
-.segment.optGranted {
- --button-secondary-ghost-hover-foreground: var(--success-foreground);
+.segmented [aria-pressed='true'][data-option='granted'] {
+ --button-secondary-ghost-label: var(--success-foreground);
+ --button-secondary-ghost-label-hover: var(--success-foreground);
--button-variant-ghost-background-color: color-mix(
in srgb,
var(--accent-forest) 22%,
@@ -44,8 +42,9 @@
);
}
-.segment.optDenied {
- --button-secondary-ghost-hover-foreground: var(--danger-foreground);
+.segmented [aria-pressed='true'][data-option='denied'] {
+ --button-secondary-ghost-label: var(--danger-foreground);
+ --button-secondary-ghost-label-hover: var(--danger-foreground);
--button-variant-ghost-background-color: color-mix(
in srgb,
var(--accent-cherry) 22%,
@@ -53,8 +52,9 @@
);
}
-.segment.optDelay {
- --button-secondary-ghost-hover-foreground: var(--warning-foreground);
+.segmented [aria-pressed='true'][data-option='delay'] {
+ --button-secondary-ghost-label: var(--warning-foreground);
+ --button-secondary-ghost-label-hover: var(--warning-foreground);
--button-variant-ghost-background-color: color-mix(
in srgb,
var(--accent-amber) 22%,
@@ -62,8 +62,9 @@
);
}
-.segment.optError {
- --button-secondary-ghost-hover-foreground: var(--danger-foreground);
+.segmented [aria-pressed='true'][data-option='error'] {
+ --button-secondary-ghost-label: var(--danger-foreground);
+ --button-secondary-ghost-label-hover: var(--danger-foreground);
--button-variant-ghost-background-color: color-mix(
in srgb,
var(--accent-cherry) 22%,
diff --git a/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.tsx b/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.tsx
index a2c4966517..ce9a2dfffd 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.tsx
+++ b/frontend/src/lib/authz/devtools/AuthZDevModal/OverrideControl.tsx
@@ -1,12 +1,12 @@
import { Check, Clock, RotateCcw, X, Zap } from '@signozhq/icons';
import { Typography } from '@signozhq/ui/typography';
-import cx from 'classnames';
import type { BrandedPermission } from '../../hooks/useAuthZ/types';
import { OverrideState } from '../types';
import styles from './OverrideControl.module.css';
import { Button } from '@signozhq/ui/button';
+import { Tooltip } from '@signozhq/ui/tooltip';
type OverrideControlProps = {
permission: BrandedPermission;
@@ -17,8 +17,7 @@ type OverrideControlProps = {
type OverrideOption = {
state: OverrideState;
label: string;
- icon: React.ReactNode;
- activeClassName: string;
+ icon: React.ReactElement;
};
const OVERRIDE_OPTIONS: OverrideOption[] = [
@@ -26,31 +25,26 @@ const OVERRIDE_OPTIONS: OverrideOption[] = [
state: OverrideState.Reset,
label: 'Auto',
icon: <RotateCcw size={13} />,
- activeClassName: styles.optAuto,
},
{
state: OverrideState.Granted,
label: 'Grant',
icon: <Check size={13} />,
- activeClassName: styles.optGranted,
},
{
state: OverrideState.Denied,
label: 'Deny',
icon: <X size={13} />,
- activeClassName: styles.optDenied,
},
{
state: OverrideState.Delay,
label: 'Delay',
icon: <Clock size={13} />,
- activeClassName: styles.optDelay,
},
{
state: OverrideState.Error,
label: 'Error',
icon: <Zap size={13} />,
- activeClassName: styles.optError,
},
];
@@ -64,28 +58,26 @@ export function OverrideControl({
{OVERRIDE_OPTIONS.map((option) => {
const isActive = value === option.state;
return (
- <Button
- key={option.state}
- type="button"
- aria-pressed={isActive}
- aria-label={option.label}
- title={option.label}
- className={cx(styles.segment, {
- [styles.segmentActive]: isActive,
- [option.activeClassName]: isActive,
- })}
- variant="ghost"
- color="secondary"
- onClick={(): void => onSelect(permission, option.state)}
- data-testid={`override-${option.state}-${permission}`}
- >
- <div className={styles.segmentIcon}>{option.icon}</div>
- {isActive && (
- <Typography.Text as="span" size="small" weight="medium">
- {option.label}
- </Typography.Text>
- )}
- </Button>
+ <Tooltip key={option.state} title={option.label}>
+ <Button
+ size="md"
+ type="button"
+ aria-pressed={isActive}
+ aria-label={option.label}
+ data-option={option.state}
+ variant="ghost"
+ color="secondary"
+ onClick={(): void => onSelect(permission, option.state)}
+ testId={`override-${option.state}-${permission}`}
+ prefix={option.icon}
+ >
+ {isActive && (
+ <Typography.Text as="span" size="small" weight="medium">
+ {option.label}
+ </Typography.Text>
+ )}
+ </Button>
+ </Tooltip>
);
})}
</div>
diff --git a/frontend/src/lib/authz/devtools/AuthZDevModal/PermissionRow.tsx b/frontend/src/lib/authz/devtools/AuthZDevModal/PermissionRow.tsx
index f0caeb4712..0b0454126d 100644
--- a/frontend/src/lib/authz/devtools/AuthZDevModal/PermissionRow.tsx
+++ b/frontend/src/lib/authz/devtools/AuthZDevModal/PermissionRow.tsx
@@ -1,4 +1,4 @@
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
+import { Badge, type BadgeColorType } from '@signozhq/ui/badge';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
import { memo, useMemo } from 'react';
@@ -44,13 +44,13 @@ export const PermissionRow = memo(function PermissionRow({
};
}, [observed.permission]);
- let apiColor: BadgeColor = 'secondary';
+ let apiColor: BadgeColorType = 'secondary';
let apiLabel = 'API ?';
if (observed.apiValue === true) {
apiColor = 'success';
apiLabel = 'API ✓';
} else if (observed.apiValue === false) {
- apiColor = 'error';
+ apiColor = 'danger';
apiLabel = 'API ✗';
}
@@ -86,7 +86,7 @@ export const PermissionRow = memo(function PermissionRow({
</Typography.Text>
</div>
<div className={styles.permissionMeta}>
- <Badge variant="outline" color={apiColor}>
+ <Badge variant="outlined" color={apiColor}>
{apiLabel}
</Badge>
<OverrideControl
diff --git a/frontend/src/lib/uPlotV2/components/Legend/LegendRow.module.scss b/frontend/src/lib/uPlotV2/components/Legend/LegendRow.module.scss
index 08a63da78b..148664dd22 100644
--- a/frontend/src/lib/uPlotV2/components/Legend/LegendRow.module.scss
+++ b/frontend/src/lib/uPlotV2/components/Legend/LegendRow.module.scss
@@ -68,14 +68,6 @@
}
}
-// Series names run long and have no spaces to break on, so they need both a
-// cap and a break rule or the tooltip becomes one panel-wide line.
-.rowTooltip {
- max-width: 420px;
- white-space: normal;
- overflow-wrap: anywhere;
-}
-
.label {
flex: 1 1 auto;
box-sizing: border-box;
@@ -121,6 +113,10 @@
transition:
opacity 180ms cubic-bezier(0.08, 0.52, 0.52, 1),
transform 180ms cubic-bezier(0.08, 0.52, 0.52, 1);
+
+ --button-height: 20px;
+ --button-variant-ghost-color: var(--l3-foreground);
+ --button-variant-ghost-hover-color: var(--l1-foreground);
}
// :focus-visible, not :focus-within — the latter also matches the click that
@@ -139,32 +135,3 @@
.row:has(:focus-visible) .label {
padding-right: min(var(--legend-actions-reserve), 50%);
}
-
-.actionTrigger {
- display: inline-flex;
-}
-
-.actionButton {
- --button-height: 20px;
- --button-width: 20px;
- --button-padding: 0;
- --button-variant-ghost-color: var(--l3-foreground);
- --button-variant-ghost-hover-color: var(--l1-foreground);
-
- flex-shrink: 0;
-}
-
-.actionButton.scopeButton {
- --button-width: auto;
- --button-padding: 0 var(--spacing-4);
- --button-font-size: var(--font-size-xs);
- --button-border-radius: calc(var(--radius) * 4);
- --button-base-border-width: 1px;
- // --l2-border is the actions bar's own background: one step up reads.
- --button-base-border-color: var(--l3-border);
-
- border-style: solid;
-}
-.actionButton.scopeButton:hover {
- border-color: var(--l2-border);
-}
diff --git a/frontend/src/lib/uPlotV2/components/Legend/LegendRow.tsx b/frontend/src/lib/uPlotV2/components/Legend/LegendRow.tsx
index 30c7cfec7b..df44028570 100644
--- a/frontend/src/lib/uPlotV2/components/Legend/LegendRow.tsx
+++ b/frontend/src/lib/uPlotV2/components/Legend/LegendRow.tsx
@@ -1,13 +1,12 @@
import { KeyboardEvent, memo, MouseEvent, useCallback } from 'react';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import cx from 'classnames';
import { LegendItem } from 'lib/uPlotV2/config/types';
import CopyButton from 'periscope/components/CopyButton/CopyButton';
import { LegendAction, OnLegendAction } from '../types';
-import { LEGEND_TOOLTIP_DELAY_MS } from './constants';
import styles from './LegendRow.module.scss';
export interface LegendRowProps {
@@ -131,45 +130,26 @@ function LegendRow({
data-is-legend-marker={true}
data-testid={`legend-marker-${seriesIndex}`}
/>
- <TooltipSimple
- title={label}
- arrow
- side="top"
- delayDuration={LEGEND_TOOLTIP_DELAY_MS}
- disableHoverableContent
- tooltipContentProps={{ className: styles.rowTooltip }}
- >
+ <Tooltip title={label} side="top">
<span className={styles.label}>{label}</span>
- </TooltipSimple>
+ </Tooltip>
<div className={styles.actions}>
- <TooltipSimple
- title={scopeActionLabel}
- arrow
- side="top"
- delayDuration={LEGEND_TOOLTIP_DELAY_MS}
- disableHoverableContent
- tooltipContentProps={{ className: styles.rowTooltip }}
- >
- {/* Radix's asChild merge strips the button's own data-testid. */}
- <span className={styles.actionTrigger}>
- <Button
- variant="ghost"
- color="secondary"
- size="sm"
- className={cx(styles.actionButton, styles.scopeButton)}
- onClick={handleScopeClick}
- aria-label={scopeActionLabel}
- testId={`legend-scope-${seriesIndex}`}
- >
- {isShowAllAction ? 'All' : 'Only'}
- </Button>
- </span>
- </TooltipSimple>
+ <Tooltip title={scopeActionLabel} side="top">
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ onClick={handleScopeClick}
+ aria-label={scopeActionLabel}
+ testId={`legend-scope-${seriesIndex}`}
+ >
+ {isShowAllAction ? 'All' : 'Only'}
+ </Button>
+ </Tooltip>
{showCopy && (
<CopyButton
value={label}
size={13}
- className={styles.actionButton}
ariaLabel={`Copy ${label}`}
testId={`legend-copy-${seriesIndex}`}
/>
diff --git a/frontend/src/lib/uPlotV2/components/Legend/__tests__/UPlotLegend.test.tsx b/frontend/src/lib/uPlotV2/components/Legend/__tests__/UPlotLegend.test.tsx
index 2a25361d09..b06f4b9181 100644
--- a/frontend/src/lib/uPlotV2/components/Legend/__tests__/UPlotLegend.test.tsx
+++ b/frontend/src/lib/uPlotV2/components/Legend/__tests__/UPlotLegend.test.tsx
@@ -1,7 +1,6 @@
import React from 'react';
import { render, RenderResult, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { LegendItem } from 'lib/uPlotV2/config/types';
import useLegendsSync from 'lib/uPlotV2/hooks/useLegendsSync';
@@ -93,14 +92,12 @@ describe('UPlotLegend', () => {
showSearch = true,
): RenderResult =>
render(
- <TooltipProvider>
- <UPlotLegend
- position={position}
- showSearch={showSearch}
- // config is consumed by the mocked useLegendsSync hook, not directly
- config={{} as any}
- />
- </TooltipProvider>,
+ <UPlotLegend
+ position={position}
+ showSearch={showSearch}
+ // config is consumed by the mocked useLegendsSync hook, not directly
+ config={{} as any}
+ />,
);
describe('layout and position', () => {
diff --git a/frontend/src/lib/visualization/charts/Pie/__tests__/Pie.test.tsx b/frontend/src/lib/visualization/charts/Pie/__tests__/Pie.test.tsx
index fb8b067e59..a09e3e83f7 100644
--- a/frontend/src/lib/visualization/charts/Pie/__tests__/Pie.test.tsx
+++ b/frontend/src/lib/visualization/charts/Pie/__tests__/Pie.test.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { fireEvent, render, screen, within } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { LegendPosition } from 'lib/uPlotV2/components/types';
import { LegendItem } from 'lib/uPlotV2/config/types';
@@ -42,20 +41,12 @@ const DATA: PieSlice[] = [
function renderPie(
props: Partial<React.ComponentProps<typeof Pie>> = {},
): void {
- render(
- <TooltipProvider>
- <Pie data={DATA} isDarkMode={false} data-testid="pie" {...props} />
- </TooltipProvider>,
- );
+ render(<Pie data={DATA} isDarkMode={false} data-testid="pie" {...props} />);
}
describe('Pie', () => {
it('renders the "No data" state for empty data', () => {
- render(
- <TooltipProvider>
- <Pie data={[]} isDarkMode={false} data-testid="pie" />
- </TooltipProvider>,
- );
+ render(<Pie data={[]} isDarkMode={false} data-testid="pie" />);
expect(screen.getByText('No data')).toBeInTheDocument();
});
@@ -76,26 +67,22 @@ describe('Pie', () => {
it('lays the legend out in a row for the right position and a column for bottom', () => {
const { rerender } = render(
- <TooltipProvider>
- <Pie
- data={DATA}
- isDarkMode={false}
- position={LegendPosition.RIGHT}
- data-testid="pie"
- />
- </TooltipProvider>,
+ <Pie
+ data={DATA}
+ isDarkMode={false}
+ position={LegendPosition.RIGHT}
+ data-testid="pie"
+ />,
);
expect(screen.getByTestId('pie')).toHaveStyle({ flexDirection: 'row' });
rerender(
- <TooltipProvider>
- <Pie
- data={DATA}
- isDarkMode={false}
- position={LegendPosition.BOTTOM}
- data-testid="pie"
- />
- </TooltipProvider>,
+ <Pie
+ data={DATA}
+ isDarkMode={false}
+ position={LegendPosition.BOTTOM}
+ data-testid="pie"
+ />,
);
expect(screen.getByTestId('pie')).toHaveStyle({ flexDirection: 'column' });
});
diff --git a/frontend/src/lib/visualization/components/ChartManager/CustomCheckBox.tsx b/frontend/src/lib/visualization/components/ChartManager/CustomCheckBox.tsx
index f5cab5431c..60005be88c 100644
--- a/frontend/src/lib/visualization/components/ChartManager/CustomCheckBox.tsx
+++ b/frontend/src/lib/visualization/components/ChartManager/CustomCheckBox.tsx
@@ -13,7 +13,6 @@ interface CheckBoxProps {
checked: boolean | 'indeterminate',
index: number,
) => void;
- disabled?: boolean;
}
function CustomCheckBox({
@@ -21,7 +20,6 @@ function CustomCheckBox({
index,
graphVisibilityState = [],
checkBoxOnChangeHandler,
- disabled = false,
}: CheckBoxProps): JSX.Element {
const color = data[index]?.stroke?.toString() || grey[0];
const isChecked = graphVisibilityState[index] || false;
@@ -33,9 +31,9 @@ function CustomCheckBox({
return (
<span className={styles.wrapper} style={colorStyle}>
<Checkbox
+ color="primary"
onChange={(checked): void => checkBoxOnChangeHandler(checked, index)}
value={isChecked}
- disabled={disabled}
/>
</span>
);
diff --git a/frontend/src/lib/visualization/components/ChartManager/__tests__/getChartManagerColumns.test.tsx b/frontend/src/lib/visualization/components/ChartManager/__tests__/getChartManagerColumns.test.tsx
index 67419d6327..d6a5df3fe4 100644
--- a/frontend/src/lib/visualization/components/ChartManager/__tests__/getChartManagerColumns.test.tsx
+++ b/frontend/src/lib/visualization/components/ChartManager/__tests__/getChartManagerColumns.test.tsx
@@ -162,6 +162,6 @@ describe('getChartManagerColumns', () => {
const checkbox = container.querySelector('[role="checkbox"]');
expect(checkbox).toBeInTheDocument();
- expect(checkbox).toHaveAttribute('data-state', 'checked'); // graphVisibilityState[1] is true
+ expect(checkbox).toHaveAttribute('data-checked'); // graphVisibilityState[1] is true
});
});
diff --git a/frontend/src/lib/visualization/panels/components/TooltipFooter.tsx b/frontend/src/lib/visualization/panels/components/TooltipFooter.tsx
index a31ad5b391..daf44223f7 100644
--- a/frontend/src/lib/visualization/panels/components/TooltipFooter.tsx
+++ b/frontend/src/lib/visualization/panels/components/TooltipFooter.tsx
@@ -69,9 +69,9 @@ export default function TooltipFooter({
size="sm"
onClick={handleUnpinClick}
aria-label="Unpin tooltip"
- data-testid="uplot-tooltip-unpin"
+ testId="uplot-tooltip-unpin"
+ prefix={<X size={10} />}
>
- <X size={10} />
<span>Unpin</span>
</Button>
)}
diff --git a/frontend/src/pages/AlertDetails/AlertHeader/ActionButtons/ActionButtons.tsx b/frontend/src/pages/AlertDetails/AlertHeader/ActionButtons/ActionButtons.tsx
index 6fdd35f760..49eaadefc7 100644
--- a/frontend/src/pages/AlertDetails/AlertHeader/ActionButtons/ActionButtons.tsx
+++ b/frontend/src/pages/AlertDetails/AlertHeader/ActionButtons/ActionButtons.tsx
@@ -1,8 +1,8 @@
import { useCallback, useEffect, useState } from 'react';
import { Color } from '@signozhq/design-tokens';
import { Button, Tooltip } from 'antd';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
import { Divider } from '@signozhq/ui/divider';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Switch } from '@signozhq/ui/switch';
import { useIsDarkMode } from 'hooks/useDarkMode';
import { Copy, Ellipsis, PenLine, Trash2 } from '@signozhq/icons';
@@ -59,31 +59,33 @@ function AlertActionButtons({
const isV2Alert = alertDetails.schemaVersion === NEW_ALERT_SCHEMA_VERSION;
- const menuItems: MenuItem[] = [
- ...(!isV2Alert
- ? [
- {
- key: 'rename-rule',
- label: 'Rename',
- icon: <PenLine size={16} color={Color.BG_VANILLA_400} />,
- onClick: handleRename,
- },
- ]
- : []),
+ const menuItems: DropdownItemType[] = [];
+ if (!isV2Alert) {
+ menuItems.push({
+ type: 'item',
+ value: 'rename-rule',
+ label: 'Rename',
+ prefix: <PenLine size={16} color={Color.BG_VANILLA_400} />,
+ onClick: handleRename,
+ });
+ }
+ menuItems.push(
{
- key: 'duplicate-rule',
+ type: 'item',
+ value: 'duplicate-rule',
label: 'Duplicate',
- icon: <Copy size={16} color={Color.BG_VANILLA_400} />,
+ prefix: <Copy size={16} color={Color.BG_VANILLA_400} />,
onClick: handleAlertDuplicate,
},
{
- key: 'delete-rule',
+ type: 'item',
+ value: 'delete-rule',
label: 'Delete',
- icon: <Trash2 size={16} color={Color.BG_CHERRY_400} />,
+ prefix: <Trash2 size={16} color={Color.BG_CHERRY_400} />,
onClick: handleAlertDelete,
danger: true,
},
- ];
+ );
// state for immediate UI feedback rather than waiting for onSuccess of handleAlertStateTiggle to updating the alertRuleState
const [isAlertRuleDisabled, setIsAlertRuleDisabled] = useState<
@@ -118,6 +120,8 @@ function AlertActionButtons({
<Tooltip title={isAlertRuleDisabled ? 'Enable alert' : 'Disable alert'}>
{isAlertRuleDisabled !== undefined && (
<Switch
+ color="primary"
+ textPlacement="right"
onChange={toggleAlertRule}
value={!isAlertRuleDisabled}
testId="alert-actions-toggle"
@@ -128,9 +132,9 @@ function AlertActionButtons({
<Divider type="vertical" className="alert-action-buttons__divider" />
- <DropdownMenuSimple menu={{ items: menuItems }}>
+ <Tooltip title="More options">
<span className="dropdown-trigger-wrapper">
- <Tooltip title="More options">
+ <Dropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
type="text"
data-testid="alert-actions-menu"
@@ -141,9 +145,9 @@ function AlertActionButtons({
/>
}
/>
- </Tooltip>
+ </Dropdown>
</span>
- </DropdownMenuSimple>
+ </Tooltip>
</div>
<RenameModal
diff --git a/frontend/src/pages/AlertList/AlertOverview/stories/AlertOverview.stories.mocks.tsx b/frontend/src/pages/AlertList/AlertOverview/stories/AlertOverview.stories.mocks.tsx
index c8c3d97245..75c6fc2797 100644
--- a/frontend/src/pages/AlertList/AlertOverview/stories/AlertOverview.stories.mocks.tsx
+++ b/frontend/src/pages/AlertList/AlertOverview/stories/AlertOverview.stories.mocks.tsx
@@ -171,6 +171,7 @@ export const clickFooterButton = async (
const element = within(canvasElement).getByTestId(testId);
expect(element).toBeEnabled();
+ expect(element).not.toHaveAttribute('aria-disabled', 'true');
return element;
},
diff --git a/frontend/src/pages/AllErrors/stories/AllErrors.stories.tsx b/frontend/src/pages/AllErrors/stories/AllErrors.stories.tsx
index 6a22f56a44..7c5589aa47 100644
--- a/frontend/src/pages/AllErrors/stories/AllErrors.stories.tsx
+++ b/frontend/src/pages/AllErrors/stories/AllErrors.stories.tsx
@@ -49,7 +49,7 @@ const openQuickFiltersSettings = async (): Promise<void> => {
const control = await waitFor(() => {
const settings = screen.getByTestId('settings-icon-container');
- expect(settings).toBeEnabled();
+ expect(settings).not.toHaveAttribute('aria-disabled', 'true');
return settings;
}, untilLoaded);
diff --git a/frontend/src/pages/ApiMonitoring/stories/ApiMonitoringPage.stories.tsx b/frontend/src/pages/ApiMonitoring/stories/ApiMonitoringPage.stories.tsx
index 8e488fc3ab..3f5919106f 100644
--- a/frontend/src/pages/ApiMonitoring/stories/ApiMonitoringPage.stories.tsx
+++ b/frontend/src/pages/ApiMonitoring/stories/ApiMonitoringPage.stories.tsx
@@ -67,7 +67,7 @@ const openQuickFiltersSettings = async (): Promise<void> => {
const control = await waitFor(() => {
const settings = screen.getByTestId('settings-icon-container');
- expect(settings).toBeEnabled();
+ expect(settings).not.toHaveAttribute('aria-disabled', 'true');
return settings;
}, untilLoaded);
diff --git a/frontend/src/pages/CreateAlert/stories/CreateAlert.stories.mocks.tsx b/frontend/src/pages/CreateAlert/stories/CreateAlert.stories.mocks.tsx
index bc5f5648fe..1e171ffc1f 100644
--- a/frontend/src/pages/CreateAlert/stories/CreateAlert.stories.mocks.tsx
+++ b/frontend/src/pages/CreateAlert/stories/CreateAlert.stories.mocks.tsx
@@ -198,6 +198,9 @@ export const clickFooterButton = async (
): Promise<void> => {
const button = await within(canvasElement).findByTestId(testId);
- await waitFor(() => expect(button).toBeEnabled());
+ await waitFor(() => {
+ expect(button).toBeEnabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
+ });
await userEvent.click(button);
};
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.module.scss
index 71b97b66e1..ea2b5178c6 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.module.scss
@@ -6,12 +6,6 @@
gap: 12px;
}
-/* Actions / Configure / Edit-as-JSON: a flat l3 outline — no depth/shadow. */
-.toolbarButton {
- border: 1px solid var(--l3-border) !important;
- box-shadow: none !important;
-}
-
/* Highlights the dashboard name inside the delete-confirm title. */
.deleteName {
color: var(--danger-background);
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.tsx
index 74ce705831..50a1102ceb 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.tsx
@@ -1,11 +1,4 @@
-import {
- type ReactElement,
- type ReactNode,
- useCallback,
- useEffect,
- useMemo,
- useState,
-} from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { FullScreenHandle } from 'react-full-screen';
import { generatePath } from 'react-router-dom';
import {
@@ -21,8 +14,6 @@ import {
Trash2,
} from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import type { MenuItem } from '@signozhq/ui/dropdown-menu';
import { toast } from '@signozhq/ui/sonner';
import logEvent from 'api/common/logEvent';
import { cloneDashboardV2 } from 'api/generated/services/dashboard';
@@ -30,21 +21,20 @@ import type { DashboardtypesGettableDashboardV2DTO } from 'api/generated/service
import ROUTES from 'constants/routes';
import { useSafeNavigate } from 'hooks/useSafeNavigate';
import { DashboardDetailEvents } from 'pages/DashboardPage/constants/events';
-import { useDashboardCollectionPermissions } from 'hooks/dashboards/useDashboardCollectionPermissions';
import { useDashboardLockPermission } from 'hooks/dashboards/useDashboardLockPermission';
import { useErrorModal } from 'providers/ErrorModalProvider';
import APIError from 'types/api/error';
+import AuthZDropdown from 'lib/authz/components/AuthZDropdown/AuthZDropdown';
+import type { AuthZDropdownItemType } from 'lib/authz/components/AuthZDropdown/types';
+import { blockedBy } from 'lib/authz/components/AuthZDropdown/utils';
import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
import { DashboardCreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/dashboard.permissions';
-import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
-import MenuActionItem from '../../components/MenuActionItem/MenuActionItem';
import DashboardSettings from '../../DashboardSettings';
import { useAddSection } from '../../PanelsAndSectionsLayout/Section/hooks/useAddSection';
import SectionTitleModal from '../../PanelsAndSectionsLayout/Section/SectionTitleModal';
import JsonEditorDrawer from '../JsonEditorDrawer/JsonEditorDrawer';
import SettingsDrawer from '../SettingsDrawer';
-import menuStyles from '../../components/MenuActionItem/MenuActionItem.module.scss';
import styles from './DashboardActions.module.scss';
import { useDeleteDashboardAction } from './useDeleteDashboardAction';
import { useDashboardStore } from '../../store/useDashboardStore';
@@ -70,32 +60,26 @@ function DashboardActions({
onOpenRename,
}: DashboardActionsProps): JSX.Element {
const {
- isLocked,
isEditable,
editChecks,
editDisabledTooltip,
deleteChecks,
deleteDisabledTooltip,
- canDeleteDashboard,
- canReadDashboard,
} = useDashboardEditContext();
const settingsRequest = useDashboardStore((s) => s.settingsRequest);
const clearSettingsRequest = useDashboardStore((s) => s.clearSettingsRequest);
const { safeNavigate } = useSafeNavigate();
const { showErrorModal } = useErrorModal();
- const { canCreate } = useDashboardCollectionPermissions();
- const { canToggleLock, disabledTooltip: lockDisabledTooltip } =
- useDashboardLockPermission({
- dashboardId: dashboard.id,
- source: dashboard.source,
- });
+ const { disabledTooltip: lockDisabledTooltip } = useDashboardLockPermission({
+ dashboardId: dashboard.id,
+ source: dashboard.source,
+ });
// Cloning creates a new dashboard, so it needs `create` too, and no lock gate.
const cloneChecks = useMemo(
() => [...editChecks.slice(0, 1), DashboardCreatePermission],
[editChecks],
);
- const cloneDenied = !canCreate || !canReadDashboard;
const [isSettingsDrawerOpen, setIsSettingsDrawerOpen] =
useState<boolean>(false);
@@ -179,138 +163,121 @@ function DashboardActions({
}, [dashboard.id, handle]);
// Unavailable items stay in the menu, carrying the reason.
- // The row carries icon, label and reason; the item keeps `disabled`/`onClick`.
- const row = useCallback(
- (
- text: string,
- icon: ReactElement,
- checks: BrandedPermission[],
- opts: { disabledTooltip?: string; destructive?: boolean } = {},
- ): ReactNode => (
- <MenuActionItem
- label={text}
- icon={icon}
- checks={checks}
- disabledTooltip={opts.disabledTooltip}
- destructive={opts.destructive}
- />
- ),
- [],
- );
-
- const menuItems = useMemo<MenuItem[]>(() => {
- const dashboardGroup: MenuItem[] = [
- {
- key: 'rename',
- label: row('Rename', <PenLine size={14} />, editChecks, {
- disabledTooltip: editDisabledTooltip,
- }),
- disabled: !isEditable,
- onClick: onOpenRename,
- },
- // Clone creates a new dashboard, so it's not lock-gated.
- {
- key: 'clone',
- label: row('Clone dashboard', <Copy size={14} />, cloneChecks),
- disabled: isCloning || cloneDenied,
- onClick: (): void => void handleClone(),
- },
- {
- key: 'lock',
- label: row(
- isDashboardLocked ? 'Unlock dashboard' : 'Lock dashboard',
- <LockKeyhole size={14} />,
- editChecks,
- { disabledTooltip: lockDisabledTooltip },
- ),
- disabled: !canToggleLock,
- onClick: onLockToggle,
- },
- {
- key: 'fullscreen',
- label: row('Full screen', <Fullscreen size={14} />, []),
- onClick: handleEnterFullScreen,
- },
- ];
-
- return [
+ const menuItems = useMemo<AuthZDropdownItemType[]>(
+ () => [
{
type: 'group',
- key: 'group-dashboard',
+ value: 'group-dashboard',
label: 'Dashboard',
- children: dashboardGroup,
+ items: [
+ {
+ type: 'item',
+ value: 'rename',
+ testId: 'dashboard-action-rename',
+ label: 'Rename',
+ prefix: <PenLine size={14} />,
+ checks: editChecks,
+ ...blockedBy(editDisabledTooltip),
+ onClick: onOpenRename,
+ },
+ // Clone creates a new dashboard, so it's not lock-gated.
+ {
+ type: 'item',
+ value: 'clone',
+ testId: 'dashboard-action-clone',
+ label: 'Clone dashboard',
+ prefix: <Copy size={14} />,
+ checks: cloneChecks,
+ loading: isCloning,
+ loadingTooltip: 'Cloning dashboard',
+ onClick: (): void => void handleClone(),
+ },
+ {
+ type: 'item',
+ value: 'lock',
+ testId: 'dashboard-action-lock',
+ label: isDashboardLocked ? 'Unlock dashboard' : 'Lock dashboard',
+ prefix: <LockKeyhole size={14} />,
+ checks: editChecks,
+ ...blockedBy(lockDisabledTooltip),
+ onClick: onLockToggle,
+ },
+ {
+ type: 'item',
+ value: 'fullscreen',
+ testId: 'dashboard-action-fullscreen',
+ label: 'Full screen',
+ prefix: <Fullscreen size={14} />,
+ onClick: handleEnterFullScreen,
+ },
+ ],
},
{
type: 'group',
- key: 'group-layout',
+ value: 'group-layout',
label: 'Layout',
- children: [
+ items: [
{
- key: 'new-section',
- label: row('New section', <SquareStack size={14} />, editChecks, {
- disabledTooltip: editDisabledTooltip,
- }),
- disabled: !isEditable,
+ type: 'item',
+ value: 'new-section',
+ testId: 'dashboard-action-new-section',
+ label: 'New section',
+ prefix: <SquareStack size={14} />,
+ checks: editChecks,
+ ...blockedBy(editDisabledTooltip),
onClick: (): void => setIsNewSectionOpen(true),
},
],
},
- { type: 'divider', key: 'divider-danger' },
+ { type: 'separator', value: 'divider-danger' },
{
- key: 'delete',
- label: row('Delete dashboard', <Trash2 size={14} />, deleteChecks, {
- disabledTooltip: deleteDisabledTooltip,
- destructive: true,
- }),
+ type: 'item',
+ value: 'delete',
+ testId: 'dashboard-action-delete',
+ label: 'Delete dashboard',
+ prefix: <Trash2 size={14} />,
+ danger: true,
+ checks: deleteChecks,
// Independent of read/update, but a locked dashboard can't be removed.
- disabled: isLocked || !canDeleteDashboard,
+ ...blockedBy(deleteDisabledTooltip),
onClick: confirmDeleteDashboard,
},
- ];
- }, [
- row,
- isEditable,
- isLocked,
- editChecks,
- editDisabledTooltip,
- deleteChecks,
- deleteDisabledTooltip,
- canDeleteDashboard,
- cloneChecks,
- cloneDenied,
- isCloning,
- canToggleLock,
- lockDisabledTooltip,
- isDashboardLocked,
- onOpenRename,
- handleClone,
- onLockToggle,
- handleEnterFullScreen,
- confirmDeleteDashboard,
- ]);
+ ],
+ [
+ editChecks,
+ editDisabledTooltip,
+ deleteChecks,
+ deleteDisabledTooltip,
+ cloneChecks,
+ isCloning,
+ lockDisabledTooltip,
+ isDashboardLocked,
+ onOpenRename,
+ handleClone,
+ onLockToggle,
+ handleEnterFullScreen,
+ confirmDeleteDashboard,
+ ],
+ );
return (
<div className={styles.dashboardActionsContainer}>
- <DropdownMenuSimple
- menu={{ items: menuItems }}
- className={menuStyles.menuContent}
- >
+ <AuthZDropdown items={menuItems} nativeButton align="end" side="bottom">
<Button
variant="solid"
color="secondary"
size="md"
- className={styles.toolbarButton}
prefix={<Grid3X3 size="md" />}
testId="options"
>
Actions
</Button>
- </DropdownMenuSimple>
+ </AuthZDropdown>
<AuthZTooltip checks={editChecks} disabledTooltip={editDisabledTooltip}>
<Button
+ disabledTooltip={undefined}
variant="solid"
color="secondary"
- className={styles.toolbarButton}
prefix={<Configure size="md" />}
testId="show-drawer"
disabled={!isEditable}
@@ -334,7 +301,6 @@ function DashboardActions({
<Button
variant="solid"
color="secondary"
- className={styles.toolbarButton}
prefix={<Braces size="md" />}
testId="edit-json"
onClick={handleOpenJsonEditor}
@@ -344,6 +310,7 @@ function DashboardActions({
</Button>
<AuthZTooltip checks={editChecks} disabledTooltip={editDisabledTooltip}>
<Button
+ disabledTooltip={undefined}
variant="solid"
color="primary"
onClick={onAddPanel}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/__tests__/DashboardActions.authz.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/__tests__/DashboardActions.authz.test.tsx
index ae74908bbe..c11f7adea1 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/__tests__/DashboardActions.authz.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardActions/__tests__/DashboardActions.authz.test.tsx
@@ -100,11 +100,20 @@ describe('DashboardActions - AuthZ', () => {
renderActions();
await waitFor(() => {
- expect(screen.getByTestId('show-drawer')).toBeDisabled();
+ expect(screen.getByTestId('show-drawer')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- expect(screen.getByTestId('add-panel-header')).toBeDisabled();
+ expect(screen.getByTestId('add-panel-header')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
// JSON stays available — it's a read-only inspect.
- expect(screen.getByTestId('edit-json')).toBeEnabled();
+ expect(screen.getByTestId('edit-json')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('keeps the menu items present and disabled', async () => {
@@ -126,6 +135,29 @@ describe('DashboardActions - AuthZ', () => {
expect(screen.getByText('Clone dashboard')).toBeInTheDocument();
// Full screen never depended on permission.
expect(screen.getByText('Full screen')).toBeInTheDocument();
+
+ expect(screen.getByTestId('dashboard-action-rename')).toHaveAttribute(
+ 'data-disabled',
+ );
+ expect(screen.getByTestId('dashboard-action-delete')).toHaveAttribute(
+ 'data-disabled',
+ );
+ await waitFor(
+ () => {
+ expect(screen.getByTestId('dashboard-action-clone')).toHaveAttribute(
+ 'data-disabled',
+ );
+ },
+ { timeout: 3000 },
+ );
+ expect(
+ screen.getByTestId('dashboard-action-fullscreen'),
+ ).not.toHaveAttribute('data-disabled');
+
+ await userEvent.hover(screen.getByTestId('dashboard-action-rename'));
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'no permission',
+ );
});
});
@@ -142,7 +174,10 @@ describe('DashboardActions - AuthZ', () => {
renderActions();
await waitFor(() => {
- expect(screen.getByTestId('show-drawer')).toBeDisabled();
+ expect(screen.getByTestId('show-drawer')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await openActionsMenu();
await expect(
@@ -164,12 +199,32 @@ describe('DashboardActions - AuthZ', () => {
renderActions();
await waitFor(() => {
- expect(screen.getByTestId('show-drawer')).toBeEnabled();
+ expect(screen.getByTestId('show-drawer')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
await openActionsMenu();
await expect(
screen.findByText('Clone dashboard'),
).resolves.toBeInTheDocument();
+
+ await waitFor(
+ () => {
+ expect(screen.getByTestId('dashboard-action-clone')).toHaveAttribute(
+ 'data-disabled',
+ );
+ },
+ { timeout: 3000 },
+ );
+ expect(screen.getByTestId('dashboard-action-rename')).not.toHaveAttribute(
+ 'data-disabled',
+ );
+
+ await userEvent.hover(screen.getByTestId('dashboard-action-clone'));
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'is not authorized to perform create',
+ );
});
});
@@ -181,9 +236,15 @@ describe('DashboardActions - AuthZ', () => {
renderActions();
await waitFor(() => {
- expect(screen.getByTestId('show-drawer')).toBeEnabled();
+ expect(screen.getByTestId('show-drawer')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
- expect(screen.getByTestId('add-panel-header')).toBeEnabled();
+ expect(screen.getByTestId('add-panel-header')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.module.scss
index f5329c6ef0..80cdfcb1ed 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.module.scss
@@ -53,34 +53,6 @@
}
}
-.publicLink {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- padding: 0;
- border: none;
- background: transparent;
- color: inherit;
- cursor: pointer;
-}
-
-.lockButton {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- flex-shrink: 0;
- padding: 0;
- border: none;
- background: transparent;
- color: inherit;
- cursor: pointer;
-}
-
-.lockButton:disabled {
- cursor: default;
-}
-
.divider {
flex-shrink: 0;
width: 1px;
@@ -101,10 +73,6 @@
min-width: 0;
}
-.dashboardTitleActionButton {
- flex-shrink: 0;
-}
-
/* Fixed footprint (2 tags + `+N`): never shrinks, so a long title ellipsizes
around it rather than collapsing the tags. */
.dashboardTags {
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.tsx
index d47ff3b4f1..d10eba7d7b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/DashboardInfo/DashboardInfo.tsx
@@ -10,7 +10,7 @@ import {
import TagBadge from 'components/TagBadge/TagBadge';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
import cx from 'classnames';
@@ -20,7 +20,6 @@ import { linkifyText } from 'utils/linkifyText';
import { openInNewTab } from 'utils/navigation';
import styles from './DashboardInfo.module.scss';
-import { TOOLTIP_SCROLL_CONTENT_CLASS } from 'components/TooltipScrollArea/TooltipScrollArea';
import TagsOverflowTooltip from './TagsOverflowTooltip';
import { DASHBOARD_NAME_MAX_LENGTH } from '../../constants';
@@ -138,10 +137,10 @@ function DashboardInfo({
/>
<Button
type="button"
- variant="outlined"
+ variant="solid"
color="primary"
- size="icon"
- className={styles.dashboardTitleActionButton}
+ size="sm"
+ icon
aria-label="Save title"
testId="dashboard-title-save"
onClick={onCommit}
@@ -152,8 +151,8 @@ function DashboardInfo({
type="button"
variant="outlined"
color="secondary"
- size="icon"
- className={styles.dashboardTitleActionButton}
+ size="sm"
+ icon
aria-label="Cancel title edit"
testId="dashboard-title-cancel"
onClick={onCancel}
@@ -162,7 +161,7 @@ function DashboardInfo({
</Button>
</div>
) : (
- <TooltipSimple title={title} disableHoverableContent>
+ <Tooltip title={title}>
<Typography.Text
className={cx(styles.dashboardTitle, {
[styles.dashboardTitleHover]: canEdit,
@@ -172,11 +171,11 @@ function DashboardInfo({
>
{title}
</Typography.Text>
- </TooltipSimple>
+ </Tooltip>
)}
{hasDescription && (
- <TooltipSimple
+ <Tooltip
side="bottom"
title={
<span className={styles.descriptionTooltip}>
@@ -189,37 +188,35 @@ function DashboardInfo({
size={14}
data-testid="dashboard-description-info"
/>
- </TooltipSimple>
+ </Tooltip>
)}
{isPublicDashboard && (
- <TooltipSimple
- title="This dashboard is publicly accessible. Click to open the public page."
- disableHoverableContent
- >
+ <Tooltip title="This dashboard is publicly accessible. Click to open the public page.">
<Button
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.publicLink}
+ size="sm"
+ icon
aria-label="Open public dashboard"
testId="dashboard-public-link"
onClick={handleOpenPublicUrl}
>
<Globe size={14} />
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
{showLockToggle && (
- <TooltipSimple title={lockTooltip} disableHoverableContent>
+ <Tooltip title={onToggleLock ? lockTooltip : undefined}>
<Button
+ disabledTooltip={lockTooltip}
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.lockButton}
+ size="sm"
+ icon
aria-label={isDashboardLocked ? 'Unlock dashboard' : 'Lock dashboard'}
testId="dashboard-lock"
disabled={!onToggleLock}
@@ -231,7 +228,7 @@ function DashboardInfo({
<LockKeyholeOpen size={14} />
)}
</Button>
- </TooltipSimple>
+ </Tooltip>
)}
{hasTags && (
@@ -242,14 +239,11 @@ function DashboardInfo({
<TagBadge key={tag}>{tag}</TagBadge>
))}
{remainingTags.length > 0 && (
- <TooltipSimple
- title={<TagsOverflowTooltip tags={remainingTags} />}
- tooltipContentProps={{ className: TOOLTIP_SCROLL_CONTENT_CLASS }}
- >
+ <Tooltip title={<TagsOverflowTooltip tags={remainingTags} />}>
<span data-testid="dashboard-tags-overflow">
<TagBadge>+{remainingTags.length}</TagBadge>
</span>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
</>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.module.scss
index 4911fa1cc3..101c35d65e 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.module.scss
@@ -85,11 +85,6 @@
white-space: nowrap;
}
-// Above the JSON drawer (antd Drawer sits at ~1100) so the id list is visible.
-.warningTooltip {
- z-index: 1101;
-}
-
.validationValid {
color: var(--bg-forest-400);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.tsx
index 32472c7881..28db75ec79 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorDrawer.tsx
@@ -2,7 +2,7 @@ import { KeyboardEvent, useCallback } from 'react';
import MEditor from '@monaco-editor/react';
import { TriangleAlert } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
import { Drawer } from 'antd';
@@ -97,7 +97,13 @@ function JsonEditorDrawer({
[apply, readOnly, onClose],
);
- const applyDisabled = readOnly || !isDirty || !validity.valid || isSaving;
+ const applyDisabled = readOnly || !isDirty || !validity.valid;
+ let applyDisabledReason: string | undefined;
+ if (!readOnly && !isDirty) {
+ applyDisabledReason = 'No changes to apply';
+ } else if (!readOnly && !validity.valid) {
+ applyDisabledReason = 'Fix the JSON errors first';
+ }
const validationText = validity.valid
? `Valid JSON · ${validity.lineCount} lines`
: `Line ${validity.errorLine ?? '?'} · ${validity.message ?? 'Invalid JSON'}`;
@@ -136,10 +142,7 @@ function JsonEditorDrawer({
{validationText}
</Typography.Text>
{danglingWarning && (
- <TooltipSimple
- title={danglingPanelIds.join(', ')}
- tooltipContentProps={{ className: styles.warningTooltip }}
- >
+ <Tooltip title={danglingPanelIds.join(', ')}>
<span
className={styles.danglingWarning}
data-testid="json-editor-dangling-warning"
@@ -149,13 +152,10 @@ function JsonEditorDrawer({
{danglingWarning}
</Typography.Text>
</span>
- </TooltipSimple>
+ </Tooltip>
)}
{missingRefWarning && (
- <TooltipSimple
- title={missingPanelRefs.join(', ')}
- tooltipContentProps={{ className: styles.warningTooltip }}
- >
+ <Tooltip title={missingPanelRefs.join(', ')}>
<span
className={styles.danglingWarning}
data-testid="json-editor-missing-ref-warning"
@@ -165,7 +165,7 @@ function JsonEditorDrawer({
{missingRefWarning}
</Typography.Text>
</span>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
<div className={styles.footerActions}>
@@ -183,11 +183,13 @@ function JsonEditorDrawer({
disabledTooltip={readOnly ? readOnlyTooltip : undefined}
>
<Button
+ disabledTooltip={applyDisabledReason}
variant="solid"
color="primary"
size="md"
testId="json-editor-apply"
disabled={applyDisabled}
+ loading={isSaving}
onClick={readOnly ? undefined : (): void => void apply()}
>
Apply changes
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorToolbar.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorToolbar.tsx
index 97c5d38339..f7eca6954a 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorToolbar.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/JsonEditorToolbar.tsx
@@ -3,6 +3,8 @@ import { Button } from '@signozhq/ui/button';
import styles from './JsonEditorToolbar.module.scss';
+const READ_ONLY_REASON = 'This dashboard is read-only';
+
interface JsonEditorToolbarProps {
isDirty: boolean;
/** Locked/no-permission — Format and Reset (draft mutators) are disabled. */
@@ -24,6 +26,7 @@ function JsonEditorToolbar({
return (
<div className={styles.toolbar}>
<Button
+ disabledTooltip={READ_ONLY_REASON}
variant="ghost"
color="secondary"
size="sm"
@@ -56,6 +59,7 @@ function JsonEditorToolbar({
</Button>
<div className={styles.spacer} />
<Button
+ disabledTooltip={readOnly ? READ_ONLY_REASON : 'No changes to reset'}
variant="ghost"
color="secondary"
size="sm"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/__tests__/JsonEditorDrawer.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/__tests__/JsonEditorDrawer.test.tsx
index 11792e9c99..d6a3a966fc 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/__tests__/JsonEditorDrawer.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardPageToolbar/JsonEditorDrawer/__tests__/JsonEditorDrawer.test.tsx
@@ -1,5 +1,4 @@
import { fireEvent, render, screen } from 'tests/test-utils';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import type { DashboardtypesGettableDashboardV2DTO } from 'api/generated/services/sigNoz.schemas';
import JsonEditorDrawer from '../JsonEditorDrawer';
@@ -129,9 +128,7 @@ describe('JsonEditorDrawer', () => {
hookValue({ danglingPanelIds: ['p1', 'p2'] }),
);
const { unmount } = render(
- <TooltipProvider>
- <JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />
- </TooltipProvider>,
+ <JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />,
);
expect(screen.getByTestId('json-editor-dangling-warning')).toHaveTextContent(
'2 panels not present in layout',
@@ -141,11 +138,7 @@ describe('JsonEditorDrawer', () => {
// first tree, so a rerender does not pick up the new hook value.
unmount();
mockUseJsonEditor.mockReturnValue(hookValue({ danglingPanelIds: [] }));
- render(
- <TooltipProvider>
- <JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />
- </TooltipProvider>,
- );
+ render(<JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />);
expect(
screen.queryByTestId('json-editor-dangling-warning'),
).not.toBeInTheDocument();
@@ -153,11 +146,7 @@ describe('JsonEditorDrawer', () => {
it('warns about layout refs to missing panels', () => {
mockUseJsonEditor.mockReturnValue(hookValue({ missingPanelRefs: ['ghost'] }));
- render(
- <TooltipProvider>
- <JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />
- </TooltipProvider>,
- );
+ render(<JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />);
expect(
screen.getByTestId('json-editor-missing-ref-warning'),
).toHaveTextContent('1 layout item references a panel that no longer exists');
@@ -186,7 +175,10 @@ describe('JsonEditorDrawer', () => {
const { rerender } = render(
<JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />,
);
- expect(screen.getByTestId('json-editor-apply')).toBeDisabled();
+ expect(screen.getByTestId('json-editor-apply')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
mockUseJsonEditor.mockReturnValue(
hookValue({ validity: { valid: false, lineCount: 1 } }),
@@ -194,13 +186,19 @@ describe('JsonEditorDrawer', () => {
rerender(
<JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />,
);
- expect(screen.getByTestId('json-editor-apply')).toBeDisabled();
+ expect(screen.getByTestId('json-editor-apply')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
mockUseJsonEditor.mockReturnValue(hookValue({ isSaving: true }));
rerender(
<JsonEditorDrawer dashboard={dashboard} isOpen onClose={jest.fn()} />,
);
- expect(screen.getByTestId('json-editor-apply')).toBeDisabled();
+ expect(screen.getByTestId('json-editor-apply')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('wires toolbar and footer buttons to the hook callbacks', () => {
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/CrossPanelSync/CrossPanelSync.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/CrossPanelSync/CrossPanelSync.tsx
index 3eb30be98b..1d715e31ec 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/CrossPanelSync/CrossPanelSync.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/CrossPanelSync/CrossPanelSync.tsx
@@ -1,5 +1,5 @@
import { ExternalLink, SolidInfoCircle } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
import { Events } from 'constants/events';
@@ -50,9 +50,8 @@ function CrossPanelSync({ dashboardId }: CrossPanelSyncProps): JSX.Element {
Cross-Panel Sync
</Typography.Text>
- <TooltipSimple
+ <Tooltip
side="top"
- withPortal={false}
title={
<div className={styles.crossPanelSyncTooltipContent}>
<strong className={styles.crossPanelSyncTooltipTitle}>
@@ -74,7 +73,7 @@ function CrossPanelSync({ dashboardId }: CrossPanelSyncProps): JSX.Element {
}
>
<SolidInfoCircle size="md" className={styles.crossPanelSyncInfoIcon} />
- </TooltipSimple>
+ </Tooltip>
</div>
<div className={styles.crossPanelSyncRow}>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.module.scss
index 27bc9cba9d..c5a464d456 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.module.scss
@@ -1,61 +1,4 @@
.segmented {
- // override RadioGroup's default vertical grid; lay segments out connected
- display: inline-flex;
- grid-auto-flow: column;
- gap: 0;
flex-shrink: 0;
- border: 1px solid var(--l2-border);
- border-radius: 2px;
-}
-
-.segment {
- position: relative;
- display: flex;
- align-items: center;
-
- &:not(:last-child) {
- border-right: 1px solid var(--l2-border);
- }
-
- // the visible segment is the radio's label (htmlFor-wired, so clicks register)
- label {
- display: flex;
- align-items: center;
- min-height: 24px;
- padding: 6px 14px;
- font-family: Inter;
- font-size: 13px;
- line-height: 20px;
- color: var(--l2-foreground);
- white-space: nowrap;
- cursor: pointer;
- user-select: none;
- }
-}
-
-// collapse the radio circle into a transparent full-cell click target
-.segmentInput {
- position: absolute;
- inset: 0;
- width: 100%;
- height: 100%;
- margin: 0;
- padding: 0;
- border: none;
- background: transparent;
- cursor: pointer;
-
- // hide the default radio dot/indicator
- * {
- display: none;
- }
-}
-
-// highlight the selected segment as a raised, lighter pill (data-state is a
-// stable Radix attribute). --l3-background is the lightest layer, so lift it
-// further with a subtle foreground tint rather than going darker.
-.segmentInput[data-state='checked'] + label {
- background: var(--l3-background);
- color: var(--l1-foreground);
- font-weight: 500;
+ --radio-group-display: flex;
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.tsx
index aed2232afe..823332cc8b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/SegmentedControl/SegmentedControl.tsx
@@ -1,4 +1,4 @@
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
+import { RadioGroup } from '@signozhq/ui/radio-group';
import styles from './SegmentedControl.module.scss';
@@ -14,12 +14,6 @@ interface SegmentedControlProps<T extends string> {
testId?: string;
}
-/**
- * Connected pill segmented control composed on top of @signozhq/ui RadioGroup:
- * the radio circle is collapsed into a transparent full-cell click target and
- * the label becomes the visible segment (highlighted via the radio's stable
- * `data-state="checked"`). Keeps radio semantics + keyboard nav.
- */
function SegmentedControl<T extends string>({
value,
options,
@@ -27,24 +21,19 @@ function SegmentedControl<T extends string>({
testId,
}: SegmentedControlProps<T>): JSX.Element {
return (
- <RadioGroup
- className={styles.segmented}
- value={value}
- onChange={(next): void => onChange(next as T)}
- testId={testId}
- >
- {options.map((option) => (
- <RadioGroupItem
- key={option.value}
- value={option.value}
- containerClassName={styles.segment}
- className={styles.segmentInput}
- testId={testId ? `${testId}-${option.value}` : undefined}
- >
- {option.label}
- </RadioGroupItem>
- ))}
- </RadioGroup>
+ <div className={styles.segmented}>
+ <RadioGroup
+ color="primary"
+ value={value}
+ onChange={(next): void => onChange(next as T)}
+ testId={testId}
+ items={options.map((option) => ({
+ value: option.value,
+ label: option.label,
+ testId: testId ? `${testId}-${option.value}` : undefined,
+ }))}
+ />
+ </div>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/UnsavedChangesFooter/UnsavedChangesFooter.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/UnsavedChangesFooter/UnsavedChangesFooter.tsx
index d3e05dbd6f..c199135fd6 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/UnsavedChangesFooter/UnsavedChangesFooter.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Overview/UnsavedChangesFooter/UnsavedChangesFooter.tsx
@@ -31,18 +31,19 @@ function UnsavedChangesFooter({
</div>
<div className={styles.footerActionButtons}>
<Button
+ size="md"
variant="ghost"
color="secondary"
- disabled={isSaving}
+ loading={isSaving}
prefix={<X size={14} />}
onClick={onDiscard}
>
Discard
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
- disabled={isSaving}
loading={isSaving}
prefix={<Check size={14} />}
testId="save-dashboard-config"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardActions/PublicDashboardActions.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardActions/PublicDashboardActions.tsx
index db65d01df2..6e5faca035 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardActions/PublicDashboardActions.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardActions/PublicDashboardActions.tsx
@@ -33,18 +33,16 @@ function PublicDashboardActions({
onUpdate,
onUnpublish,
}: PublicDashboardActionsProps): JSX.Element {
- const disabled = isLoading;
-
return (
<div className={styles.footer}>
{isPublic ? (
<>
<AuthZTooltip checks={checks}>
<Button
- variant="outlined"
- color="destructive"
- disabled={disabled}
- loading={isUnpublishing}
+ size="md"
+ variant="solid"
+ color="danger"
+ loading={isLoading || isUnpublishing}
prefix={<Trash size={15} />}
testId="public-dashboard-unpublish"
onClick={onUnpublish}
@@ -54,10 +52,10 @@ function PublicDashboardActions({
</AuthZTooltip>
<AuthZTooltip checks={checks}>
<Button
+ size="md"
variant="solid"
color="primary"
- disabled={disabled}
- loading={isUpdating}
+ loading={isLoading || isUpdating}
prefix={<RefreshCw size={15} />}
testId="public-dashboard-update"
onClick={onUpdate}
@@ -69,10 +67,10 @@ function PublicDashboardActions({
) : (
<AuthZTooltip checks={checks}>
<Button
+ size="md"
variant="solid"
color="primary"
- disabled={disabled}
- loading={isPublishing}
+ loading={isLoading || isPublishing}
prefix={<Globe size={15} />}
testId="public-dashboard-publish"
onClick={onPublish}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardSettingsForm/PublicDashboardSettingsForm.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardSettingsForm/PublicDashboardSettingsForm.tsx
index 22d2fa1030..2a3353f3ae 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardSettingsForm/PublicDashboardSettingsForm.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardSettingsForm/PublicDashboardSettingsForm.tsx
@@ -9,6 +9,7 @@ interface PublicDashboardSettingsFormProps {
timeRangeEnabled: boolean;
defaultTimeRange: string;
disabled: boolean;
+ disabledTooltip: string | undefined;
onTimeRangeEnabledChange: (value: boolean) => void;
onDefaultTimeRangeChange: (value: string) => void;
}
@@ -17,6 +18,7 @@ function PublicDashboardSettingsForm({
timeRangeEnabled,
defaultTimeRange,
disabled,
+ disabledTooltip,
onTimeRangeEnabledChange,
onDefaultTimeRangeChange,
}: PublicDashboardSettingsFormProps): JSX.Element {
@@ -24,6 +26,9 @@ function PublicDashboardSettingsForm({
<>
<div className={styles.switchRow}>
<Switch
+ color="primary"
+ textPlacement="right"
+ disabledTooltip={disabledTooltip}
testId="public-dashboard-time-range-toggle"
value={timeRangeEnabled}
disabled={disabled}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.module.scss
index c1f801919d..2603767536 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.module.scss
@@ -58,10 +58,9 @@
}
.statusBadgeDot {
- display: inline-block;
+ display: block;
width: 6px;
height: 6px;
border-radius: 50%;
- margin-right: 6px;
background: currentColor;
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.tsx
index 1a6f86620d..c3334c4885 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardStatus/PublicDashboardStatus.tsx
@@ -39,8 +39,11 @@ function PublicDashboardStatus({
</Typography.Text>
</div>
- <Badge variant="outline" color={isPublic ? 'robin' : 'secondary'}>
- <span className={styles.statusBadgeDot} />
+ <Badge
+ prefix={<span className={styles.statusBadgeDot} />}
+ variant="outlined"
+ color={isPublic ? 'primary' : 'secondary'}
+ >
{isPublic ? 'Public' : 'Private'}
</Badge>
</div>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardUrl/PublicDashboardUrl.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardUrl/PublicDashboardUrl.tsx
index 4db9cae052..8ba2ac0076 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardUrl/PublicDashboardUrl.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/PublicDashboardUrl/PublicDashboardUrl.tsx
@@ -26,8 +26,10 @@ function PublicDashboardUrl({
<Typography.Text className={styles.linkUrl}>{url}</Typography.Text>
<span className={styles.linkDivider} />
<Button
+ color="secondary"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
aria-label="Copy link"
testId="public-dashboard-copy-url"
onClick={onCopy}
@@ -35,8 +37,10 @@ function PublicDashboardUrl({
<Copy size={15} />
</Button>
<Button
+ color="secondary"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
aria-label="Open link"
testId="public-dashboard-open-url"
onClick={onOpen}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/__tests__/PublicDashboard.authz.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/__tests__/PublicDashboard.authz.test.tsx
index 6ec69090b7..b029b096c8 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/__tests__/PublicDashboard.authz.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/__tests__/PublicDashboard.authz.test.tsx
@@ -43,7 +43,10 @@ describe('PublicDashboard - AuthZ', () => {
});
await waitFor(() => {
- expect(screen.getByTestId('public-dashboard-publish')).toBeEnabled();
+ expect(screen.getByTestId('public-dashboard-publish')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
@@ -55,7 +58,10 @@ describe('PublicDashboard - AuthZ', () => {
});
await waitFor(() => {
- expect(screen.getByTestId('public-dashboard-publish')).toBeDisabled();
+ expect(screen.getByTestId('public-dashboard-publish')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/index.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/index.tsx
index 77422e135d..9079936760 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/index.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/PublicDashboard/index.tsx
@@ -37,6 +37,12 @@ function PublicDashboardSettings({
} = usePublicDashboard(dashboard.id);
const controlsDisabled = isLoading || !canManage;
+ let controlsDisabledReason: string | undefined;
+ if (isLoading) {
+ controlsDisabledReason = 'Loading public dashboard settings';
+ } else if (!canManage) {
+ controlsDisabledReason = 'You need edit permission on this dashboard';
+ }
return (
<div className={styles.publishTab}>
@@ -54,6 +60,7 @@ function PublicDashboardSettings({
timeRangeEnabled={timeRangeEnabled}
defaultTimeRange={defaultTimeRange}
disabled={controlsDisabled}
+ disabledTooltip={controlsDisabledReason}
onTimeRangeEnabledChange={setTimeRangeEnabled}
onDefaultTimeRangeChange={setDefaultTimeRange}
/>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/ListVariableFields.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/ListVariableFields.tsx
index 0c623719a2..059267bdb6 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/ListVariableFields.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/ListVariableFields.tsx
@@ -52,9 +52,11 @@ function ListVariableFields({
) : (
previewValues.map((value, idx) => (
<Badge
+ textTransform="none"
+ variant="solid"
// eslint-disable-next-line react/no-array-index-key -- preview values are display-only and may contain duplicates
key={`${value}-${idx}`}
- color="vanilla"
+ color="secondary"
>
{value.toString()}
</Badge>
@@ -85,6 +87,8 @@ function ListVariableFields({
Enable multiple values to be checked
</Typography.Text>
<Switch
+ color="primary"
+ textPlacement="right"
value={model.multiSelect}
onChange={(checked): void =>
onChange({
@@ -102,6 +106,8 @@ function ListVariableFields({
Include an option for ALL values
</Typography.Text>
<Switch
+ color="primary"
+ textPlacement="right"
value={model.showAllOption}
onChange={(checked): void => onChange({ showAllOption: checked })}
testId="variable-all-switch"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/QueryVariableFields.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/QueryVariableFields.tsx
index fa18ffcb83..449cbb696f 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/QueryVariableFields.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/QueryVariableFields.tsx
@@ -95,6 +95,7 @@ function QueryVariableFields({
</div>
<div className={styles.testRow}>
<Button
+ disabledTooltip="Enter a query first"
variant="solid"
color="primary"
size="sm"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.module.scss
index 9f77fc0069..cfffe273b2 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.module.scss
@@ -77,6 +77,13 @@
gap: 20px;
margin-top: 40px;
margin-bottom: 0;
+
+ --badge-height: var(--spacing-7);
+ --badge-font-size: 11px;
+ --badge-line-height: 12px;
+ --badge-padding: 0px var(--spacing-2);
+ --tabs-trigger-secondary-icon-width: 14px;
+ --tabs-trigger-secondary-icon-height: 14px;
}
/* Picker row (label left, tabs right); the bottom divider separates type from
@@ -112,54 +119,6 @@
white-space: nowrap;
}
-/* Horizontal scroll so the tab row never wraps to a second line. The scrollbar
- is hidden — the row stays a single crisp line and scrolls only when narrow. */
-.typeTabsScroll {
- justify-self: flex-end;
- --tabs-list-wrapper-secondary-padding-left: 0;
-}
-
-/* Connected segmented control, mirroring Overview's SegmentedControl: no outer
- padding, segments divided by 1px borders, active segment filled + bold. */
-.typeTabs {
- display: inline-flex;
- flex-wrap: nowrap;
- width: max-content;
- gap: 0;
- padding: 0;
- border: 1px solid var(--l2-border);
- border-radius: 2px;
- background: transparent;
-}
-
-.typeTab {
- display: inline-flex;
- flex-shrink: 0;
- align-items: center;
- gap: 6px;
- min-height: 24px;
- padding: 4px 16px !important;
- white-space: nowrap;
- border-radius: 0;
- color: var(--l2-foreground);
-
- &:not(:last-child) {
- border-right: 1px solid var(--l2-border);
- }
-
- &[data-state='active'] {
- color: var(--l1-foreground);
- font-weight: 500;
- // override the Tabs component's default (transparent) active background.
- background: var(--l3-background) !important;
- }
-}
-
-.betaTag {
- margin-left: 4px;
- vertical-align: middle;
-}
-
/* The full "Not Recommended" pill — hidden once the tab row gets tight so it
never forces horizontal scroll; the amber info icon takes over below. */
.notRecommendedBadge {
@@ -178,6 +137,7 @@
align-items: center;
margin-left: 4px;
vertical-align: middle;
+ height: 12px;
}
/* Query */
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.tsx
index 37740ed505..71a77e9ab7 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.tsx
@@ -2,14 +2,12 @@ import { useRef, useState } from 'react';
import { Check, X } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import { TabsContent, TabsRoot } from '@signozhq/ui/tabs';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
// eslint-disable-next-line signoz/no-antd-components -- TextArea/Collapse: no @signozhq/ui equivalent
import { Collapse, Input as AntdInput } from 'antd';
import { CustomMultiSelect } from 'components/NewSelect';
-import type { VariableType } from '../variableFormModel';
import DynamicVariableFields from './DynamicVariableFields';
import ListVariableFields from './ListVariableFields';
import QueryVariableFields from './QueryVariableFields';
@@ -101,103 +99,98 @@ function VariableForm({
visibleNameError={visibleNameError}
/>
- <TabsRoot
- className={styles.typeSection}
+ <VariableTypeTabs
value={model.type}
- onValueChange={(next): void => selectType(next as VariableType)}
- >
- <VariableTypeTabs />
-
- <TabsContent value="DYNAMIC" className={styles.typePanel}>
- <div className={styles.typeContent}>
- <DynamicVariableFields
- attribute={model.dynamicAttribute}
- signal={model.dynamicSignal}
- onChange={onDynamicChange}
- onPreview={setRawPreview}
- attributeError={attributeError}
- />
- {listFields}
- <div className={styles.row}>
- <div className={styles.labelContainer}>
- <Typography.Text className={styles.label}>
- Apply to panels
- </Typography.Text>
- </div>
- <CustomMultiSelect
- placeholder="Select panels"
- options={panelOptions}
- value={selectedPanelIds}
- onChange={(value): void => setSelectedPanelIds(value as string[])}
- data-testid="variable-apply-panels"
- // Resolve the closed-state tags to panel names (else they show the id).
- showLabels
- placement="topRight"
+ onChange={selectType}
+ panels={{
+ DYNAMIC: (
+ <div className={styles.typeContent}>
+ <DynamicVariableFields
+ attribute={model.dynamicAttribute}
+ signal={model.dynamicSignal}
+ onChange={onDynamicChange}
+ onPreview={setRawPreview}
+ attributeError={attributeError}
/>
+ {listFields}
+ <div className={styles.row}>
+ <div className={styles.labelContainer}>
+ <Typography.Text className={styles.label}>
+ Apply to panels
+ </Typography.Text>
+ </div>
+ <CustomMultiSelect
+ placeholder="Select panels"
+ options={panelOptions}
+ value={selectedPanelIds}
+ onChange={(value): void => setSelectedPanelIds(value as string[])}
+ data-testid="variable-apply-panels"
+ // Resolve the closed-state tags to panel names (else they show the id).
+ showLabels
+ placement="topRight"
+ />
+ </div>
</div>
- </div>
- </TabsContent>
-
- <TabsContent value="QUERY" className={styles.typePanel}>
- <div className={styles.typeContent}>
- <QueryVariableFields
- queryValue={model.queryValue}
- variables={payloadVariables}
- onChange={(queryValue): void => set({ queryValue })}
- onPreview={setRawPreview}
- onError={setPreviewError}
- />
- {listFields}
- </div>
- </TabsContent>
-
- <TabsContent value="CUSTOM" className={styles.typePanel}>
- <div className={styles.typeContent}>
- <div className={cx(styles.row, styles.customSection)}>
- <Collapse
- collapsible="header"
- rootClassName="custom-collapse"
- defaultActiveKey={['1']}
- items={[
- {
- key: '1',
- label: 'Options',
- children: (
- <AntdInput.TextArea
- value={model.customValue}
- placeholder="Enter options separated by commas."
- rootClassName="comma-input"
- onChange={(e): void => onCustomChange(e.target.value)}
- data-testid="variable-custom-input"
- />
- ),
- },
- ]}
+ ),
+ QUERY: (
+ <div className={styles.typeContent}>
+ <QueryVariableFields
+ queryValue={model.queryValue}
+ variables={payloadVariables}
+ onChange={(queryValue): void => set({ queryValue })}
+ onPreview={setRawPreview}
+ onError={setPreviewError}
/>
+ {listFields}
</div>
- {listFields}
- </div>
- </TabsContent>
-
- <TabsContent value="TEXT" className={styles.typePanel}>
- <div className={styles.typeContent}>
- <div className={cx(styles.row, styles.textboxSection)}>
- <div className={styles.labelContainer}>
- <Typography.Text className={styles.label}>
- Default Value
- </Typography.Text>
+ ),
+ CUSTOM: (
+ <div className={styles.typeContent}>
+ <div className={cx(styles.row, styles.customSection)}>
+ <Collapse
+ collapsible="header"
+ rootClassName="custom-collapse"
+ defaultActiveKey={['1']}
+ items={[
+ {
+ key: '1',
+ label: 'Options',
+ children: (
+ <AntdInput.TextArea
+ value={model.customValue}
+ placeholder="Enter options separated by commas."
+ rootClassName="comma-input"
+ onChange={(e): void => onCustomChange(e.target.value)}
+ data-testid="variable-custom-input"
+ />
+ ),
+ },
+ ]}
+ />
</div>
- <Input
- className={styles.defaultInput}
- value={model.textValue}
- placeholder="Enter a default value (if any)..."
- onChange={(e): void => set({ textValue: e.target.value })}
- testId="variable-text-input"
- />
+ {listFields}
</div>
- </div>
- </TabsContent>
- </TabsRoot>
+ ),
+ TEXT: (
+ <div className={styles.typeContent}>
+ <div className={cx(styles.row, styles.textboxSection)}>
+ <div className={styles.labelContainer}>
+ <Typography.Text className={styles.label}>
+ Default Value
+ </Typography.Text>
+ </div>
+ <Input
+ className={styles.defaultInput}
+ value={model.textValue}
+ placeholder="Enter a default value (if any)..."
+ onChange={(e): void => set({ textValue: e.target.value })}
+ testId="variable-text-input"
+ />
+ </div>
+ </div>
+ ),
+ }}
+ />
{cycleError ? (
<Typography.Text className={styles.errorText}>
@@ -207,6 +200,7 @@ function VariableForm({
<div className={styles.actionButtons}>
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={<X size={14} />}
@@ -215,10 +209,12 @@ function VariableForm({
Discard
</Button>
<Button
+ disabledTooltip={nameError || attributeError}
+ size="md"
variant="solid"
color="primary"
prefix={<Check size={14} />}
- disabled={!!nameError || !!attributeError || isSaving}
+ disabled={!!nameError || !!attributeError}
loading={isSaving}
onClick={handleSave}
testId="variable-save"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableTypeTabs.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableTypeTabs.tsx
index 087c771819..e4f1f3d91d 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableTypeTabs.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableTypeTabs.tsx
@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
import { Color } from '@signozhq/design-tokens';
import {
ClipboardType,
@@ -7,90 +8,107 @@ import {
Pyramid,
} from '@signozhq/icons';
import { Badge } from '@signozhq/ui/badge';
-import { TabsList, TabsTrigger } from '@signozhq/ui/tabs';
+import { Tabs } from '@signozhq/ui/tabs';
import { Typography } from '@signozhq/ui/typography';
import TextToolTip from 'components/TextToolTip';
+import type { VariableType } from '../variableFormModel';
import styles from './VariableForm.module.scss';
+interface VariableTypeTabsProps {
+ value: VariableType;
+ onChange: (type: VariableType) => void;
+ panels: Record<VariableType, ReactNode>;
+}
+
/**
- * Presentational trigger row for the variable-type tabs (label + segmented
- * triggers). Must render inside a `TabsRoot`, which owns the active state and
- * change handling; the matching `TabsContent` panels are siblings in the root.
+ * Variable-type bar plus the active type's panel. The parent owns `value` and
+ * supplies the panel for each type.
*/
-function VariableTypeTabs(): JSX.Element {
+function VariableTypeTabs({
+ value,
+ onChange,
+ panels,
+}: VariableTypeTabsProps): JSX.Element {
return (
- <div className={styles.typePicker}>
- <div className={styles.typeLabelContainer}>
- <Typography.Text className={styles.label}>Variable Type</Typography.Text>
- <TextToolTip
- text="Learn more about supported variable types"
- url="https://signoz.io/docs/userguide/manage-variables/#supported-variable-types"
- urlText="here"
- useFilledIcon={false}
- outlinedIcon={<Info size={14} />}
- />
- </div>
-
- <div className={styles.typeTabsScroll}>
- <TabsList variant="secondary" className={styles.typeTabs}>
- <TabsTrigger
- value="DYNAMIC"
- className={styles.typeTab}
- testId="variable-type-dynamic"
- >
- <Pyramid size={14} />
- Dynamic
- <Badge color="robin" className={styles.betaTag}>
+ <Tabs
+ variant="secondary"
+ orientation="horizontal"
+ alignment="end"
+ className={styles.typeSection}
+ value={value}
+ onChange={(next): void => onChange(next as VariableType)}
+ noTabContentPadding
+ tabBarStartContent={
+ <div className={styles.typeLabelContainer}>
+ <Typography.Text className={styles.label}>Variable Type</Typography.Text>
+ <TextToolTip
+ text="Learn more about supported variable types"
+ url="https://signoz.io/docs/userguide/manage-variables/#supported-variable-types"
+ urlText="here"
+ useFilledIcon={false}
+ outlinedIcon={<Info size={14} />}
+ />
+ </div>
+ }
+ items={[
+ {
+ key: 'DYNAMIC',
+ label: 'Dynamic',
+ prefixIcon: <Pyramid size={14} />,
+ suffixIcon: (
+ <Badge variant="solid" color="primary">
Beta
</Badge>
- </TabsTrigger>
- <TabsTrigger
- value="TEXT"
- className={styles.typeTab}
- testId="variable-type-textbox"
- >
- <ClipboardType size={14} />
- Textbox
- </TabsTrigger>
- <TabsTrigger
- value="CUSTOM"
- className={styles.typeTab}
- testId="variable-type-custom"
- >
- <LayoutList size={14} />
- Custom
- </TabsTrigger>
- <TabsTrigger
- value="QUERY"
- className={styles.typeTab}
- testId="variable-type-query"
- >
- <DatabaseZap size={14} />
- Query
- {/* Wide screens: the full "Not Recommended" pill. */}
- <Badge color="amber" className={styles.notRecommendedBadge}>
- Not Recommended
- </Badge>
- {/* Small screens: an amber info icon stands in for the pill (keeps the
- tab row from overflowing), its tooltip carries the same message + link. */}
- <span
- className={styles.notRecommendedInfo}
- onClick={(e): void => e.stopPropagation()}
- role="presentation"
- >
- <TextToolTip
- text="Query variables can be slow and brittle, so they aren't recommended. Learn why"
- url="https://signoz.io/docs/userguide/manage-variables/#why-avoid-clickhouse-query-variables"
- urlText="here"
- useFilledIcon={false}
- outlinedIcon={<Info size={14} color={Color.BG_AMBER_600} />}
- />
- </span>
- </TabsTrigger>
- </TabsList>
- </div>
- </div>
+ ),
+ testId: 'variable-type-dynamic',
+ children: panels.DYNAMIC,
+ },
+ {
+ key: 'TEXT',
+ label: 'Textbox',
+ prefixIcon: <ClipboardType size={14} />,
+ testId: 'variable-type-textbox',
+ children: panels.TEXT,
+ },
+ {
+ key: 'CUSTOM',
+ label: 'Custom',
+ prefixIcon: <LayoutList size={14} />,
+ testId: 'variable-type-custom',
+ children: panels.CUSTOM,
+ },
+ {
+ key: 'QUERY',
+ label: 'Query',
+ prefixIcon: <DatabaseZap size={14} />,
+ suffixIcon: (
+ <>
+ <span className={styles.notRecommendedBadge}>
+ <Badge variant="solid" color="warning">
+ Not Recommended
+ </Badge>
+ </span>
+ <span
+ className={styles.notRecommendedInfo}
+ onClick={(e): void => e.stopPropagation()}
+ role="presentation"
+ >
+ <TextToolTip
+ text="Query variables can be slow and brittle, so they aren't recommended. Learn why"
+ url="https://signoz.io/docs/userguide/manage-variables/#why-avoid-clickhouse-query-variables"
+ urlText="here"
+ useFilledIcon={false}
+ outlinedIcon={<Info size={14} color={Color.BG_AMBER_600} />}
+ />
+ </span>
+ </>
+ ),
+ testId: 'variable-type-query',
+ children: panels.QUERY,
+ },
+ ]}
+ />
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableImpactDialog/VariableImpactDialog.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableImpactDialog/VariableImpactDialog.tsx
index afe9ab295e..fd6a6820af 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableImpactDialog/VariableImpactDialog.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/VariableImpactDialog/VariableImpactDialog.tsx
@@ -71,22 +71,24 @@ function VariableImpactDialog({
const footer = (
<div className={styles.footer}>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={onClose}
testId="variable-impact-cancel"
+ prefix={<X size={12} />}
>
- <X size={12} />
Cancel
</Button>
<Button
+ size="md"
variant="solid"
- color={isDelete ? 'destructive' : 'primary'}
+ color={isDelete ? 'danger' : 'primary'}
loading={isLoading}
onClick={(): void => onConfirm(resolvedUsages)}
testId="variable-impact-confirm"
+ prefix={<Check size={12} />}
>
- <Check size={12} />
{confirmLabel}
</Button>
</div>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.module.scss
index ad9eedc5de..2b982c0bfe 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.module.scss
@@ -3,9 +3,3 @@
padding: 8px;
border-bottom: 1px solid var(--l3-border);
}
-
-.backToAllVariablesButton {
- --button-font-size: 14px;
- --button-padding: var(--spacing-5) var(--spacing-3);
- color: var(--l1-foreground);
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.tsx
index 59feec7e52..01e8fc3c65 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/BackToAllVariables/BackToAllVariables.tsx
@@ -13,7 +13,6 @@ const BackToAllVariables = ({
<Button
variant="ghost"
color="secondary"
- className={styles.backToAllVariablesButton}
prefix={<ArrowLeft size={14} />}
onClick={onClose}
testId="variable-form-back"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.module.scss
index 4de3915697..240166bf83 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.module.scss
@@ -64,7 +64,7 @@ $grid-columns: minmax(0, 2fr) minmax(0, 3fr);
.rowActions {
position: absolute;
- top: 6px;
+ top: 10px;
right: 0;
display: flex;
align-items: center;
@@ -88,8 +88,3 @@ $grid-columns: minmax(0, 2fr) minmax(0, 3fr);
font-size: 12px;
color: var(--l2-foreground);
}
-
-.applyAllButton {
- font-size: 12px;
- white-space: nowrap;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.tsx
index 1952592e56..11e06d7618 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/Variables/components/VariableRow/VariableRow.tsx
@@ -3,7 +3,7 @@ import { Check, GripVertical, PenLine, Trash2, X } from '@signozhq/icons';
import { useSortable } from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
@@ -100,9 +100,10 @@ function VariableRow({
Delete?
</Typography.Text>
<Button
- variant="ghost"
- color="destructive"
- size="icon"
+ variant="solid"
+ color="danger"
+ size="sm"
+ icon
onClick={(): void => onConfirmDelete(index)}
aria-label="Confirm delete"
testId={`variable-delete-confirm-${variable.name}`}
@@ -112,7 +113,8 @@ function VariableRow({
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
onClick={onCancelDelete}
aria-label="Cancel delete"
>
@@ -122,31 +124,32 @@ function VariableRow({
) : (
<>
{variable.type === 'DYNAMIC' ? (
- <TooltipSimple
+ <Tooltip
side="top"
title={
isAppliedToAll
- ? 'Already applied to all panels'
+ ? undefined
: 'Add this variable as a filter to every panel'
}
>
<Button
+ disabledTooltip="Already applied to all panels"
variant="ghost"
color="secondary"
size="sm"
disabled={isAppliedToAll}
- className={styles.applyAllButton}
onClick={(): void => onApplyToAll(index)}
testId={`variable-apply-all-${variable.name}`}
>
Apply to all
</Button>
- </TooltipSimple>
+ </Tooltip>
) : null}
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
onClick={(): void => onEdit(index)}
aria-label="Edit variable"
testId={`variable-edit-${variable.name}`}
@@ -156,7 +159,8 @@ function VariableRow({
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
onClick={(): void => onRequestDelete(index)}
aria-label="Delete variable"
testId={`variable-delete-${variable.name}`}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/index.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/index.tsx
index cb65b07b2c..287198ee8d 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/index.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/DashboardSettings/index.tsx
@@ -1,13 +1,7 @@
import { useMemo } from 'react';
import { Braces, Globe, Table } from '@signozhq/icons';
-import {
- TabItemProps,
- TabsContent,
- TabsList,
- TabsRoot,
- TabsTrigger,
-} from '@signozhq/ui/tabs';
+import { Tabs, TabsItemProps } from '@signozhq/ui/tabs';
import type { DashboardtypesGettableDashboardV2DTO } from 'api/generated/services/sigNoz.schemas';
import Overview from './Overview';
@@ -16,7 +10,6 @@ import VariablesSettings from './Variables';
import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
import { useDashboardStore } from '../store/useDashboardStore';
-import styles from './DashboardSettings.module.scss';
interface DashboardSettingsProps {
dashboard: DashboardtypesGettableDashboardV2DTO;
@@ -42,51 +35,45 @@ function DashboardSettings({ dashboard }: DashboardSettingsProps): JSX.Element {
const enablePublicDashboard = isCloudUser || isEnterpriseSelfHostedUser;
- const items: TabItemProps[] = useMemo(
- () => [
+ const items: TabsItemProps[] = useMemo(() => {
+ const next: TabsItemProps[] = [
{
key: TabKeys.OVERVIEW,
label: TabKeys.OVERVIEW,
+ prefixIcon: prefixIcons[TabKeys.OVERVIEW],
children: <Overview dashboard={dashboard} />,
},
{
key: TabKeys.VARIABLES,
label: TabKeys.VARIABLES,
+ prefixIcon: prefixIcons[TabKeys.VARIABLES],
children: <VariablesSettings dashboard={dashboard} />,
- prefixIcon: <Braces size={14} />,
},
- // Readable by anyone who can open the dashboard; the controls inside
- // gate on update.
- ...(enablePublicDashboard
- ? [
- {
- key: TabKeys.PUBLISH,
- label: TabKeys.PUBLISH,
- children: <PublicDashboardSettings dashboard={dashboard} />,
- },
- ]
- : []),
- ],
- [enablePublicDashboard, dashboard],
- );
+ ];
- return (
- <TabsRoot defaultValue={settingsRequest?.tab ?? TabKeys.OVERVIEW}>
- <TabsList variant="primary">
- {items.map((item) => (
- <TabsTrigger value={item.key} key={item.key} disabled={item.disabled}>
- {prefixIcons[item.key as TabKeys]}
- {item.label}
- </TabsTrigger>
- ))}
- </TabsList>
+ // Readable by anyone who can open the dashboard; the controls inside
+ // gate on update.
+ if (enablePublicDashboard) {
+ next.push({
+ key: TabKeys.PUBLISH,
+ label: TabKeys.PUBLISH,
+ prefixIcon: prefixIcons[TabKeys.PUBLISH],
+ children: <PublicDashboardSettings dashboard={dashboard} />,
+ });
+ }
- {items.map((item) => (
- <TabsContent value={item.key} key={item.key} className={styles.tabsContent}>
- {item.children}
- </TabsContent>
- ))}
- </TabsRoot>
+ return next;
+ }, [enablePublicDashboard, dashboard]);
+
+ return (
+ <Tabs
+ variant="secondary" // TODO(H4ad): was primary, but due to a bug between antd drawer and tabs calculation, we changed to secondary, revert once migrated to signozhq/ui
+ orientation="horizontal"
+ alignment="start"
+ defaultValue={settingsRequest?.tab ?? TabKeys.OVERVIEW}
+ noTabContentPadding
+ items={items}
+ />
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActionRow.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActionRow.tsx
index d0202dbdfa..7ce17065dd 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActionRow.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActionRow.tsx
@@ -26,11 +26,12 @@ function ConfigActionRow({
}: ConfigActionRowProps): JSX.Element {
return (
<Button
+ size="md"
type="button"
variant="outlined"
color="secondary"
- className={styles.row}
- data-testid={testId}
+ width="100%"
+ testId={testId}
onClick={onClick}
prefix={<span className={styles.icon}>{icon}</span>}
suffix={<SquareArrowOutUpRight size={14} />}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActions.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActions.module.scss
index d308897626..601cc1539c 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActions.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActions.module.scss
@@ -25,25 +25,6 @@
flex-direction: column;
}
-/* A navigation-link row: leading icon, label, trailing external-link affordance. */
-.row {
- display: flex;
- align-items: center;
- gap: 11px;
- width: 100%;
- height: 44px;
- padding: 0 4px;
- border: none;
- background: transparent;
- cursor: pointer;
- color: var(--text-vanilla-100);
- border-radius: 4px;
-
- &:hover {
- background: color-mix(in srgb, var(--bg-vanilla-100) 6%, transparent);
- }
-}
-
.icon {
display: grid;
place-items: center;
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.module.scss
index 81da460903..ed63c17135 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.module.scss
@@ -1,19 +1,30 @@
@use '../../../../../../styles/scrollbar' as *;
+.field > [data-slot='button'] {
+ align-self: flex-start;
+}
+
+// A field row rather than a button: the label spans the trigger so the
+// Change chip sits at the far end.
.trigger {
--button-height: 36px;
--button-padding: 0 5px 0 12px;
- --button-gap: 8px;
--button-justify-content: flex-start;
+ --button-label-display: flex;
--button-variant-outlined-border: 1px solid var(--l2-border);
--button-variant-outlined-background-color: var(--l2-background);
--button-variant-outlined-hover-background-color: var(--l2-background);
- width: 100%;
- text-align: left;
&:hover {
--button-variant-outlined-border: 1px solid var(--l3-border);
}
+
+ [data-slot='button-label'] {
+ flex: 1;
+ align-items: center;
+ gap: 8px;
+ text-align: left;
+ }
}
.triggerIcon {
@@ -41,10 +52,6 @@
font-size: 12px;
}
-.revert {
- align-self: flex-start;
-}
-
.drawerBody {
display: flex;
flex-direction: column;
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx
index 5e3c94ab05..e8e4558246 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx
@@ -65,30 +65,32 @@ function PanelTypeSwitcher({
};
return (
- <ConfigField label="Panel type">
- <Button
- variant="outlined"
- color="secondary"
- className={styles.trigger}
- onClick={(): void => setIsOpen(true)}
- testId="panel-editor-v2-type-switcher"
- >
- <Icon size={14} className={styles.triggerIcon} />
- <span className={styles.triggerName}>{displayName}</span>
- <span className={styles.triggerAction}>
- <ArrowRightLeft size={14} />
- Change
- </span>
- </Button>
+ <ConfigField label="Panel type" className={styles.field}>
+ <div className={styles.trigger}>
+ <Button
+ variant="outlined"
+ color="secondary"
+ size="md"
+ width="100%"
+ onClick={(): void => setIsOpen(true)}
+ testId="panel-editor-v2-type-switcher"
+ >
+ <Icon size={14} className={styles.triggerIcon} />
+ <span className={styles.triggerName}>{displayName}</span>
+ <span className={styles.triggerAction}>
+ <ArrowRightLeft size={14} />
+ Change
+ </span>
+ </Button>
+ </div>
{canRevert && (
<Button
variant="link"
color="primary"
size="sm"
prefix={<Undo2 />}
- className={styles.revert}
disabled={!!revertBlockedReason}
- title={revertBlockedReason}
+ disabledTooltip={revertBlockedReason}
onClick={(): void => onChange(originalPanelKind)}
testId="panel-editor-v2-type-revert"
>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx
index 2c6b44cc97..85945f916d 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx
@@ -1,6 +1,5 @@
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { getPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/registry';
import PanelTypeSwitcher from '../PanelTypeSwitcher';
@@ -45,14 +44,12 @@ async function renderSwitcher(
const user = userEvent.setup({ pointerEventsCheck: 0 });
const onChange = jest.fn();
render(
- <TooltipProvider>
- <PanelTypeSwitcher
- panelKind="signoz/TimeSeriesPanel"
- queryType={EQueryType.QUERY_BUILDER}
- onChange={onChange}
- {...props}
- />
- </TooltipProvider>,
+ <PanelTypeSwitcher
+ panelKind="signoz/TimeSeriesPanel"
+ queryType={EQueryType.QUERY_BUILDER}
+ onChange={onChange}
+ {...props}
+ />,
);
await user.click(screen.getByTestId('panel-editor-v2-type-switcher'));
return { onChange, user };
@@ -183,7 +180,10 @@ describe('PanelTypeSwitcher', () => {
queryType: EQueryType.PROM,
});
- expect(screen.getByTestId('panel-editor-v2-type-revert')).toBeDisabled();
+ expect(screen.getByTestId('panel-editor-v2-type-revert')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/SectionHeaderQuickAdd.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/SectionHeaderQuickAdd.tsx
index 357f33dd78..c699b0a4ba 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/SectionHeaderQuickAdd.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/SectionHeaderQuickAdd.tsx
@@ -1,6 +1,6 @@
import { Plus } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
interface SectionHeaderQuickAddConfig {
label: string;
@@ -19,20 +19,21 @@ function SectionHeaderQuickAdd({
onClick,
}: SectionHeaderQuickAddProps): JSX.Element {
return (
- <TooltipSimple title="Quick Add" side="top" arrow>
+ <Tooltip title="Quick Add" side="top">
<Button
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label={action.label}
// Not `testId`: TooltipTrigger's Slot merge overwrites it with undefined.
- data-testid={action.testId}
+ testId={action.testId}
onClick={onClick}
>
<Plus size={15} />
</Button>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/ColorSwatches.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/ColorSwatches.tsx
index 13002f204c..974113ce60 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/ColorSwatches.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/ColorSwatches.tsx
@@ -1,5 +1,5 @@
import { Fragment, type ReactNode } from 'react';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import cx from 'classnames';
import CustomColorSwatch from './CustomColorSwatch';
@@ -47,7 +47,7 @@ function ColorSwatches<T extends string>({
<div role="radiogroup" aria-label={label} className={styles.group}>
{options.map((option, index) => (
<Fragment key={option.id}>
- <TooltipSimple title={option.tooltip ?? option.label} arrow>
+ <Tooltip title={option.tooltip ?? option.label}>
<label
className={cx(styles.swatch, {
[styles.transparent]: option.pattern === 'transparent',
@@ -67,7 +67,7 @@ function ColorSwatches<T extends string>({
onChange={(): void => onChange(option.value)}
/>
</label>
- </TooltipSimple>
+ </Tooltip>
{index === dividerAfter && <span className={styles.divider} />}
</Fragment>
))}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/CustomColorSwatch.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/CustomColorSwatch.tsx
index 225fc1979c..7ae08532d6 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/CustomColorSwatch.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/CustomColorSwatch.tsx
@@ -1,5 +1,5 @@
import type { ReactNode } from 'react';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { ColorPicker } from 'antd';
import cx from 'classnames';
@@ -40,7 +40,7 @@ function CustomColorSwatch({
onChangeComplete={(next): void => onChange(next.toHexString())}
>
<span className={styles.customAnchor}>
- <TooltipSimple title={title} arrow>
+ <Tooltip title={title}>
<button
type="button"
aria-label={title}
@@ -50,7 +50,7 @@ function CustomColorSwatch({
})}
data-testid={testId}
/>
- </TooltipSimple>
+ </Tooltip>
</span>
</ColorPicker>
);
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/__tests__/ColorSwatches.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/__tests__/ColorSwatches.test.tsx
index 64eb92e8eb..5cb1e79b2e 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/__tests__/ColorSwatches.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ColorSwatches/__tests__/ColorSwatches.test.tsx
@@ -1,6 +1,5 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import ColorSwatches, { type ColorSwatchOption } from '../ColorSwatches';
@@ -23,23 +22,21 @@ function renderSwatches(
const onChange = jest.fn();
const onCustom = jest.fn();
render(
- <TooltipProvider>
- <ColorSwatches
- testId="color"
- label="Color"
- value="default"
- options={OPTIONS}
- dividerAfter={1}
- onChange={onChange}
- custom={{
- value: undefined,
- initial: '#3A2A63',
- onChange: onCustom,
- pickerFooter: (hex) => <span data-testid="footer">{hex}</span>,
- }}
- {...props}
- />
- </TooltipProvider>,
+ <ColorSwatches
+ testId="color"
+ label="Color"
+ value="default"
+ options={OPTIONS}
+ dividerAfter={1}
+ onChange={onChange}
+ custom={{
+ value: undefined,
+ initial: '#3A2A63',
+ onChange: onCustom,
+ pickerFooter: (hex) => <span data-testid="footer">{hex}</span>,
+ }}
+ {...props}
+ />,
);
return { onChange, onCustom };
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.tsx
index ec58b6a7fa..5db07efcce 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.tsx
@@ -34,7 +34,13 @@ function ConfigSwitch({
</span>
{description && <span className={styles.description}>{description}</span>}
</div>
- <Switch testId={testId} value={value} onChange={onChange} />
+ <Switch
+ color="primary"
+ textPlacement="right"
+ testId={testId}
+ value={value}
+ onChange={onChange}
+ />
</div>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkDialog.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkDialog.tsx
index e576caae73..ec31fdae05 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkDialog.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkDialog.tsx
@@ -100,20 +100,23 @@ function ContextLinkDialog({
footer={
<>
<Button
+ size="md"
type="button"
variant="outlined"
color="secondary"
- data-testid="context-link-cancel"
+ testId="context-link-cancel"
onClick={(): void => onOpenChange(false)}
>
Cancel
</Button>
<Button
+ disabledTooltip={urlInvalid ? URL_ERROR : 'Enter a URL first'}
+ size="md"
type="button"
variant="solid"
color="primary"
disabled={!canSave}
- data-testid="context-link-save"
+ testId="context-link-save"
onClick={handleSave}
>
Save
@@ -213,11 +216,12 @@ function ContextLinkDialog({
</VariablesPopover>
<Button
type="button"
- variant="ghost"
- color="destructive"
- size="icon"
+ variant="solid"
+ color="danger"
+ size="sm"
+ icon
aria-label={`Remove parameter ${index + 1}`}
- data-testid={`context-link-param-remove-${index}`}
+ testId={`context-link-param-remove-${index}`}
onClick={(): void =>
applyParams(params.filter((_, i) => i !== index))
}
@@ -231,11 +235,12 @@ function ContextLinkDialog({
)}
<Button
+ size="md"
type="button"
variant="dashed"
color="secondary"
prefix={<Plus size={12} />}
- data-testid="context-link-add-param"
+ testId="context-link-add-param"
onClick={addParam}
>
Add URL parameter
@@ -243,6 +248,8 @@ function ContextLinkDialog({
<div className={styles.newTab}>
<Switch
+ color="primary"
+ textPlacement="right"
testId="context-link-newtab"
value={targetBlank}
onChange={setTargetBlank}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkListItem.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkListItem.tsx
index a8c2334b34..292d44be4a 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkListItem.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinkListItem.tsx
@@ -36,20 +36,22 @@ function ContextLinkListItem({
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label={`Edit link ${index + 1}`}
- data-testid={`context-link-edit-${index}`}
+ testId={`context-link-edit-${index}`}
onClick={onEdit}
>
<Pencil size={14} />
</Button>
<Button
type="button"
- variant="ghost"
- color="destructive"
- size="icon"
+ variant="solid"
+ color="danger"
+ size="sm"
+ icon
aria-label={`Remove link ${index + 1}`}
- data-testid={`context-link-remove-${index}`}
+ testId={`context-link-remove-${index}`}
onClick={onRemove}
>
<Trash2 size={14} />
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.tsx
index 458b7640b5..b414ca3c2f 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.tsx
@@ -78,11 +78,12 @@ function ContextLinksSection({
))}
<Button
+ size="md"
type="button"
variant="dashed"
color="secondary"
prefix={<Plus size={14} />}
- data-testid="panel-editor-v2-add-link"
+ testId="panel-editor-v2-add-link"
onClick={openAddDialog}
>
Add link
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.module.scss
index eb2f90abe4..e3c859f82c 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.module.scss
@@ -23,16 +23,14 @@
}
.item {
+ display: block;
+ overflow: hidden;
--button-display: flex;
--button-justify-content: flex-start;
--button-height: auto;
--button-padding: 8px 12px;
--button-border-radius: 0;
--button-font-size: 13px;
- --button-line-height: 1.4;
-
- width: 100%;
- overflow: hidden;
}
.row {
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.tsx
index ebe751a4e5..037f8f6421 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/VariablesPopover.tsx
@@ -83,29 +83,34 @@ function VariablesPopover({
<div className={styles.empty}>No variables available</div>
) : (
variables.map((v) => (
- <Button
+ <span
key={`${v.source}-${v.name}`}
- type="button"
- variant="ghost"
- color="secondary"
- size="md"
className={styles.item}
- aria-label={`Insert {{${v.name}}}`}
- testId={`context-link-variable-${v.name}`}
- // Prevent the input from losing focus when clicking an item.
onMouseDown={(e): void => e.preventDefault()}
- onClick={(): void => {
- onVariableSelect(`{{${v.name}}}`, cursorPosition ?? undefined);
- setIsOpen(false);
- }}
>
- <div className={styles.row}>
- <Typography.Text
- className={styles.name}
- >{`{{${v.name}}}`}</Typography.Text>
- <Typography.Text className={styles.source}>{v.source}</Typography.Text>
- </div>
- </Button>
+ <Button
+ type="button"
+ variant="ghost"
+ color="secondary"
+ size="md"
+ width="100%"
+ aria-label={`Insert {{${v.name}}}`}
+ testId={`context-link-variable-${v.name}`}
+ onClick={(): void => {
+ onVariableSelect(`{{${v.name}}}`, cursorPosition ?? undefined);
+ setIsOpen(false);
+ }}
+ >
+ <div className={styles.row}>
+ <Typography.Text
+ className={styles.name}
+ >{`{{${v.name}}}`}</Typography.Text>
+ <Typography.Text className={styles.source}>
+ {v.source}
+ </Typography.Text>
+ </div>
+ </Button>
+ </span>
))
)}
</PopoverContent>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/__tests__/ContextLinksSection.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/__tests__/ContextLinksSection.test.tsx
index 62392a3ecf..a3e03e33a3 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/__tests__/ContextLinksSection.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/__tests__/ContextLinksSection.test.tsx
@@ -42,7 +42,7 @@ describe('ContextLinksSection', () => {
fireEvent.click(screen.getByTestId('panel-editor-v2-add-link'));
const save = await screen.findByTestId('context-link-save');
- expect(save).toBeDisabled();
+ expect(save).toHaveAttribute('aria-disabled', 'true');
fireEvent.change(screen.getByTestId('context-link-url'), {
target: { value: 'https://signoz.io' },
@@ -50,7 +50,7 @@ describe('ContextLinksSection', () => {
fireEvent.change(screen.getByTestId('context-link-label'), {
target: { value: 'Docs' },
});
- expect(save).not.toBeDisabled();
+ expect(save).not.toHaveAttribute('aria-disabled', 'true');
fireEvent.click(save);
expect(onChange).toHaveBeenCalledWith([
@@ -105,7 +105,10 @@ describe('ContextLinksSection', () => {
fireEvent.change(urlInput, { target: { value: 'not-a-url' } });
expect(screen.getByTestId('context-link-url-error')).toBeInTheDocument();
- expect(screen.getByTestId('context-link-save')).toBeDisabled();
+ expect(screen.getByTestId('context-link-save')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
fireEvent.change(urlInput, { target: { value: '/valid/path' } });
expect(
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/__tests__/TextLayoutSection.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/__tests__/TextLayoutSection.test.tsx
index 4a54bda94d..50a7cea955 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/__tests__/TextLayoutSection.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/__tests__/TextLayoutSection.test.tsx
@@ -6,7 +6,6 @@ import {
within,
} from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import {
DashboardtypesTextAlignDTO,
DashboardtypesVerticalAlignDTO,
@@ -25,7 +24,7 @@ const value = {
// The swatch tooltips need a provider; AppLayout supplies one at runtime.
function render(ui: ReactElement): RenderResult {
- return rtlRender(<TooltipProvider>{ui}</TooltipProvider>);
+ return rtlRender(ui);
}
// The theme context defaults to dark, so the swatches paint the dark pairs.
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.tsx
index acbe7fa777..af58aa4c66 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.tsx
@@ -201,11 +201,12 @@ function ThresholdsSection({
{thresholds.map(renderRow)}
<Button
+ size="md"
type="button"
variant="dashed"
color="secondary"
prefix={<Plus size={14} />}
- data-testid={ADD_TESTID[variant]}
+ testId={ADD_TESTID[variant]}
onClick={addThreshold}
>
Add threshold
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdRowShell.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdRowShell.tsx
index e4735af134..851d6f5235 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdRowShell.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdRowShell.tsx
@@ -53,20 +53,22 @@ function ThresholdRowShell({
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label={`Edit threshold ${index + 1}`}
- data-testid={`${testIdPrefix}-edit-${index}`}
+ testId={`${testIdPrefix}-edit-${index}`}
onClick={onEdit}
>
<Pencil size={14} />
</Button>
<Button
type="button"
- variant="ghost"
- color="destructive"
- size="icon"
+ variant="solid"
+ color="danger"
+ size="sm"
+ icon
aria-label={`Remove threshold ${index + 1}`}
- data-testid={`${testIdPrefix}-remove-${index}`}
+ testId={`${testIdPrefix}-remove-${index}`}
onClick={onRemove}
>
<Trash2 size={14} />
@@ -84,19 +86,21 @@ function ThresholdRowShell({
<div className={styles.actions}>
<Button
+ size="md"
type="button"
variant="outlined"
color="secondary"
- data-testid={`${testIdPrefix}-discard-${index}`}
+ testId={`${testIdPrefix}-discard-${index}`}
onClick={onDiscard}
>
Cancel
</Button>
<Button
+ size="md"
type="button"
variant="solid"
color="primary"
- data-testid={`${testIdPrefix}-save-${index}`}
+ testId={`${testIdPrefix}-save-${index}`}
onClick={onSave}
>
Save
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/Header.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/Header.tsx
index 9a4ade7ba2..46de8569d6 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/Header.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/Header.tsx
@@ -67,17 +67,24 @@ function Header({
<div className={styles.header}>
<div className={styles.title}>
<Button
+ aria-label="Close"
variant="ghost"
color="secondary"
- size="icon"
- suffix={<X size={14} />}
- data-testid="panel-editor-v2-close"
+ size="sm"
+ icon
+ testId="panel-editor-v2-close"
onClick={handleCloseClick}
- />
+ >
+ <X size={14} />
+ </Button>
<Divider type="vertical" />
<Typography.Text>Configure panel</Typography.Text>
{isDirty && (
- <Badge color="warning" data-testid="panel-editor-v2-unsaved-badge">
+ <Badge
+ variant="solid"
+ color="warning"
+ testId="panel-editor-v2-unsaved-badge"
+ >
Unsaved Changes
</Badge>
)}
@@ -90,9 +97,10 @@ function Header({
/>
{showSwitchToView && (
<Button
+ size="md"
variant="outlined"
color="secondary"
- data-testid="panel-editor-v2-switch-to-view"
+ testId="panel-editor-v2-switch-to-view"
onClick={onSwitchToView}
>
Switch to View Mode
@@ -103,10 +111,12 @@ function Header({
disabledTooltip={readOnly ? readOnlyTooltip : undefined}
>
<Button
+ disabledTooltip={undefined}
+ size="md"
variant="solid"
color="primary"
- data-testid="panel-editor-v2-save"
- disabled={readOnly || isSaving}
+ testId="panel-editor-v2-save"
+ disabled={readOnly}
loading={!readOnly && isSaving}
onClick={readOnly ? undefined : onSave}
>
@@ -128,20 +138,22 @@ function Header({
footer={
<>
<Button
+ size="md"
type="button"
variant="solid"
- color="destructive"
- data-testid="panel-editor-v2-discard-confirm"
+ color="danger"
+ testId="panel-editor-v2-discard-confirm"
loading={discard.isPending}
onClick={discard.confirm}
>
Discard
</Button>
<Button
+ size="md"
type="button"
variant="outlined"
color="secondary"
- data-testid="panel-editor-v2-discard-cancel"
+ testId="panel-editor-v2-discard-cancel"
onClick={discard.cancel}
>
Keep editing
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/__tests__/Header.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/__tests__/Header.test.tsx
index 106bf4fc6f..6e134a1fa1 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/__tests__/Header.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/Header/__tests__/Header.test.tsx
@@ -1,7 +1,6 @@
import type { ComponentProps } from 'react';
import { MemoryRouter } from 'react-router-dom';
import { render, screen } from 'tests/test-utils';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
import Header from '../Header';
@@ -27,18 +26,15 @@ const mockUseIsAIAssistantEnabled = useIsAIAssistantEnabled as jest.Mock;
function renderHeader(
props: Partial<ComponentProps<typeof Header>> = {},
): void {
- // AppLayout supplies the TooltipProvider in the app; the header is rendered bare here.
render(
<MemoryRouter>
- <TooltipProvider>
- <Header
- isDirty={false}
- isSaving={false}
- onSave={jest.fn()}
- onClose={jest.fn()}
- {...props}
- />
- </TooltipProvider>
+ <Header
+ isDirty={false}
+ isSaving={false}
+ onSave={jest.fn()}
+ onClose={jest.fn()}
+ {...props}
+ />
</MemoryRouter>,
);
}
@@ -76,7 +72,10 @@ describe('PanelEditor Header', () => {
renderHeader({ isDirty: false });
- expect(screen.getByTestId('panel-editor-v2-save')).toBeEnabled();
+ expect(screen.getByTestId('panel-editor-v2-save')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('disables Save only while read-only or saving', () => {
@@ -88,7 +87,10 @@ describe('PanelEditor Header', () => {
readOnlyTooltip: 'Locked',
});
- expect(screen.getByTestId('panel-editor-v2-save')).toBeDisabled();
+ expect(screen.getByTestId('panel-editor-v2-save')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('shows the Unsaved Changes badge only when there are unsaved edits', () => {
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.module.scss
index cee072ed59..02d4bc8ce8 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.module.scss
@@ -1,10 +1,3 @@
-// Shrink the icon Button from its 2rem default to the editor's 28px control row.
-.addBtn {
- --button-height: 28px;
- --button-width: 28px;
- flex-shrink: 0;
-}
-
.dropdown {
width: 260px;
/* The dropdown portals to body; lift it above the query builder's antd
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.tsx
index e02c3cf12f..5debc88521 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/AddColumnDropdown/AddColumnDropdown.tsx
@@ -53,12 +53,12 @@ function AddColumnDropdown({
type="button"
variant="outlined"
color="secondary"
- size="icon"
- className={styles.addBtn}
+ size="sm"
+ icon
aria-label="Add column"
// `data-testid` (not the `testId` prop) survives the trigger's
// `asChild` Slot merge, which otherwise resets it to undefined.
- data-testid="list-columns-add"
+ testId="list-columns-add"
>
<Plus size={16} />
</Button>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.module.scss
index 5e85d9cf76..6a46c0aaf7 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.module.scss
@@ -9,16 +9,11 @@
background-color: var(--l2-background);
}
-// Shrink the icon Button to the chip's compact footprint (defaults are 2rem
-// square with 0.5rem padding) via the component's CSS-custom-property hooks.
.grip {
- --button-height: 16px;
- --button-width: 16px;
- --button-padding: 0;
- cursor: grab;
+ --button-cursor: grab;
&:active {
- cursor: grabbing;
+ --button-cursor: grabbing;
}
}
@@ -30,12 +25,3 @@
font-size: 12px;
color: var(--l1-foreground);
}
-
-.remove {
- --button-height: 16px;
- --button-width: 16px;
- --button-padding: 0;
- // Keep the V1 affordance: neutral by default, cherry-red on hover.
- --button-variant-ghost-hover-color: var(--bg-cherry-400);
- --button-variant-ghost-hover-background-color: transparent;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.tsx
index 21bc47dc34..3173714c1c 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ListColumnsEditor/components/SortableColumnChip/SortableColumnChip.tsx
@@ -27,6 +27,8 @@ function SortableColumnChip({
isDragging,
} = useSortable({ id });
+ const { role: _sortableRole, ...sortableAttributes } = attributes;
+
// dnd-kit drives the drag transform per-frame, so this must be inline.
const style: React.CSSProperties = {
transform: CSS.Transform.toString(transform),
@@ -36,18 +38,19 @@ function SortableColumnChip({
return (
<div ref={setNodeRef} style={style} className={styles.chip}>
- <Button
- type="button"
- variant="ghost"
- color="secondary"
- size="icon"
- className={styles.grip}
- aria-label={`Reorder ${name}`}
- {...attributes}
- {...listeners}
- >
- <GripVertical size={12} />
- </Button>
+ <span {...listeners} className={styles.grip}>
+ <Button
+ type="button"
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ aria-label={`Reorder ${name}`}
+ {...sortableAttributes}
+ >
+ <GripVertical size={12} />
+ </Button>
+ </span>
<span className={styles.chipName} title={name}>
{name}
</span>
@@ -55,8 +58,8 @@ function SortableColumnChip({
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.remove}
+ size="sm"
+ icon
aria-label={`Remove ${name}`}
testId="list-column-remove"
onClick={(): void => onRemove(name)}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
index c0192b4760..14285a1482 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
@@ -196,7 +196,6 @@ function PanelEditorQueryBuilder({
<span className={styles.runQueryBtnContainer}>
<TextToolTip text="This will temporarily save the current query and graph state. This will persist across tab change" />
<RunQueryBtn
- className="run-query-dashboard-btn"
label="Run Query"
onStageRunQuery={onStageRunQuery}
isLoadingQueries={isLoadingQueries}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx
index b50b671bc0..0faef877ca 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/__tests__/panelEditorUrlQuery.promql.test.tsx
@@ -6,7 +6,6 @@ import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider as ReduxProvider } from 'react-redux';
import { MemoryRouter, Route, useHistory, useParams } from 'react-router-dom';
import { CompatRouter } from 'react-router-dom-v5-compat';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import {
type DashboardtypesPanelDTO,
TelemetrytypesSignalDTO,
@@ -144,11 +143,9 @@ const renderHarness = (): void => {
<CompatRouter>
<QueryClientProvider client={new QueryClient()}>
<ReduxProvider store={configureStore([])(appStore.getState())}>
- <TooltipProvider>
- <QueryBuilderProvider>
- <Harness />
- </QueryBuilderProvider>
- </TooltipProvider>
+ <QueryBuilderProvider>
+ <Harness />
+ </QueryBuilderProvider>
</ReduxProvider>
</QueryClientProvider>
</CompatRouter>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/components/PanelMessage/PanelMessage.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/components/PanelMessage/PanelMessage.tsx
index 1869e14c38..0f65d76d6b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/components/PanelMessage/PanelMessage.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/components/PanelMessage/PanelMessage.tsx
@@ -69,7 +69,7 @@ function PanelMessage({
size="sm"
prefix={item.icon}
onClick={item.onClick}
- data-testid={testId ? `${testId}-${suffix}` : undefined}
+ testId={testId ? `${testId}-${suffix}` : undefined}
>
{item.label}
</Button>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx
index 5a8e3eea84..867c09ca37 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/Renderer.tsx
@@ -167,12 +167,14 @@ function ListPanelRenderer({
{showPager && pagination && (
<div className={styles.pager} data-testid="list-panel-pager">
<Button
+ disabledTooltip="You are on the first page"
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Previous page"
- data-testid="list-panel-prev"
+ testId="list-panel-prev"
disabled={!pagination.canPrev}
onClick={pagination.goPrev}
>
@@ -182,12 +184,14 @@ function ListPanelRenderer({
Page {pagination.pageIndex + 1}
</span>
<Button
+ disabledTooltip="You are on the last page"
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Next page"
- data-testid="list-panel-next"
+ testId="list-panel-next"
disabled={!pagination.canNext}
onClick={pagination.goNext}
>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx
index 744f7b4b6d..bbb72ab5d9 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/ListPanel/columns.tsx
@@ -105,7 +105,12 @@ function makeTraceRenderer(name: string) {
}
if (HTTP_FIELDS.has(name)) {
return (
- <Badge color="sakura" variant="outline" data-testid={name}>
+ <Badge
+ textTransform="none"
+ color="highlight-danger"
+ variant="outlined"
+ testId={name}
+ >
{coerceToString(value)}
</Badge>
);
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/__tests__/Renderer.taskList.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/__tests__/Renderer.taskList.test.tsx
index 3b53a4886e..466cc8fff8 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/__tests__/Renderer.taskList.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/__tests__/Renderer.taskList.test.tsx
@@ -1,5 +1,4 @@
import { fireEvent, render, screen } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { PanelMode } from 'lib/visualization/panels/types';
import type { PanelOfKind } from 'pages/DashboardPage/DashboardContainer/Panels/types/rendererProps';
@@ -40,7 +39,6 @@ describe('Text panel task lists', () => {
panelMode={PanelMode.DASHBOARD_VIEW}
onChangeText={onChangeText}
/>,
- { wrapper: TooltipProvider },
);
fireEvent.click(screen.getAllByRole('checkbox')[0]);
@@ -59,7 +57,6 @@ describe('Text panel task lists', () => {
panelMode={PanelMode.DASHBOARD_VIEW}
onChangeText={onChangeText}
/>,
- { wrapper: TooltipProvider },
);
fireEvent.click(screen.getByRole('checkbox'));
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/components/TaskCheckbox/TaskCheckbox.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/components/TaskCheckbox/TaskCheckbox.tsx
index 6f5dbd41ee..5f22c65c6b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/components/TaskCheckbox/TaskCheckbox.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/components/TaskCheckbox/TaskCheckbox.tsx
@@ -1,4 +1,4 @@
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { useTaskItemOffset } from '../MarkdownContent/taskItemOffset';
@@ -34,16 +34,12 @@ function TaskCheckbox({ checked, onChange }: TaskCheckboxProps): JSX.Element {
/>
);
- if (offset === undefined) {
- return box;
- }
-
// `asChild` on the trigger keeps the input itself as the hover target, so no
// wrapper lands inside the body's style reset.
return (
- <TooltipSimple title={WRITE_BACK_HINT} arrow>
+ <Tooltip title={offset === undefined ? undefined : WRITE_BACK_HINT}>
{box}
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/DashboardEmptyState/DashboardEmptyState.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/DashboardEmptyState/DashboardEmptyState.tsx
index bfe8d05171..61de78e84d 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/DashboardEmptyState/DashboardEmptyState.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/DashboardEmptyState/DashboardEmptyState.tsx
@@ -53,8 +53,11 @@ function DashboardEmptyState({
</div>
<AuthZTooltip checks={editChecks} disabledTooltip={editDisabledTooltip}>
<Button
+ disabledTooltip={undefined}
+ size="md"
variant="solid"
color="secondary"
+ width="140px"
prefix={<Configure size="md" />}
disabled={!isEditable}
onClick={(): void => requestSettings({ tab: 'Overview' })}
@@ -79,6 +82,9 @@ function DashboardEmptyState({
</div>
<AuthZTooltip checks={editChecks} disabledTooltip={editDisabledTooltip}>
<Button
+ disabledTooltip={undefined}
+ size="md"
+ variant="solid"
color="primary"
prefix={<Plus size="md" />}
disabled={!canAddPanel}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/Panel.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/Panel.module.scss
index 9815737700..c2d601518b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/Panel.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/Panel.module.scss
@@ -32,7 +32,7 @@
// panel — without this the trigger fades while its menu stays up.
.panel:hover .hiddenHeaderControls,
.hiddenHeaderControls:focus-within,
-.hiddenHeaderControls:has([data-state='open']) {
+.hiddenHeaderControls:has([data-popup-open]) {
opacity: 1;
pointer-events: auto;
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.module.scss
deleted file mode 100644
index aaeb4460f2..0000000000
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.module.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.trigger {
- --button-width: 24px;
- --button-height: 24px;
- --button-padding: 4px;
- display: inline-flex;
- align-items: center;
- justify-content: center;
- padding: 2px;
- background: transparent;
- border: none;
- border-radius: 2px;
- color: var(--l2-foreground);
- cursor: pointer;
-
- &:hover {
- color: var(--l1-foreground);
- background: var(--l2-background);
- }
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.tsx
index 526957ea7f..c719481ca8 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.tsx
@@ -1,14 +1,12 @@
import { EllipsisVertical } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
+import AuthZDropdown from 'lib/authz/components/AuthZDropdown/AuthZDropdown';
import type { PanelQueryData } from 'pages/DashboardPage/DashboardContainer/queryV5/types';
import ConfirmDeleteDialog from '../../../components/ConfirmDeleteDialog/ConfirmDeleteDialog';
import type { PanelActionsConfig } from '../Panel';
import { usePanelActionItems } from './usePanelActionItems';
-import menuStyles from '../../../components/MenuActionItem/MenuActionItem.module.scss';
-import styles from './PanelActionsMenu.module.scss';
interface PanelActionsMenuProps {
panelId: string;
@@ -44,28 +42,24 @@ function PanelActionsMenu({
return (
<>
- <DropdownMenuSimple
- menu={{ items }}
+ <AuthZDropdown
+ items={items}
+ nativeButton
align="end"
- className={menuStyles.menuContent}
+ side="bottom"
+ testId={`panel-actions-${panelId}`}
>
<Button
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.trigger}
+ size="sm"
+ icon
aria-label="Panel actions"
- data-testid={`panel-actions-${panelId}`}
- // Stop pointer/mouse down from reaching the RGL drag handle this
- // button lives inside, so opening the menu never starts a panel drag.
- onPointerDown={(e): void => e.stopPropagation()}
- onMouseDown={(e): void => e.stopPropagation()}
- onClick={(e): void => e.stopPropagation()}
>
<EllipsisVertical size={14} />
</Button>
- </DropdownMenuSimple>
+ </AuthZDropdown>
<ConfirmDeleteDialog
open={deleteConfirm.open}
title="Delete panel?"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/__tests__/usePanelActionItems.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/__tests__/usePanelActionItems.test.tsx
index 3504c49208..60e091650b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/__tests__/usePanelActionItems.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/__tests__/usePanelActionItems.test.tsx
@@ -1,5 +1,12 @@
+import type { MouseEvent } from 'react';
+import type {
+ DropdownActionItemType,
+ DropdownItemType,
+ DropdownSubmenuChildType,
+} from '@signozhq/ui/dropdown';
import { act, renderHook } from '@testing-library/react';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
+import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
import type { PanelQueryData } from 'pages/DashboardPage/DashboardContainer/queryV5/types';
import type { DashboardSection } from '../../../../utils';
@@ -10,7 +17,7 @@ import { usePanelActionItems } from '../usePanelActionItems';
// about what the UI does with a given edit context, so control it directly.
const mockEditContext = {
isEditable: true,
- editChecks: [],
+ editChecks: [] as BrandedPermission[],
areOtherPermissionsLoading: false,
deleteChecks: [],
isLocked: false,
@@ -22,6 +29,7 @@ const mockEditContext = {
function setEditContextMock(next: Partial<typeof mockEditContext>): void {
Object.assign(mockEditContext, {
isEditable: true,
+ editChecks: [],
isLocked: false,
canEditDashboard: true,
canDeleteDashboard: true,
@@ -42,7 +50,42 @@ function disabledKeys(
): unknown[] {
return result.items
.filter((item) => 'disabled' in item && item.disabled)
- .map((item) => ('key' in item ? item.key : undefined));
+ .map((item) => ('value' in item ? item.value : undefined));
+}
+
+function disabledReasons(
+ result: ReturnType<typeof usePanelActionItems>,
+): unknown[] {
+ return result.items
+ .filter((item) => 'disabled' in item && item.disabled)
+ .map((item) =>
+ 'disabledTooltip' in item ? item.disabledTooltip : undefined,
+ );
+}
+
+type Row = DropdownItemType | DropdownSubmenuChildType;
+
+function actionRow(rows: Row[], value: string): DropdownActionItemType {
+ const row = rows.find((r) => r.type === 'item' && r.value === value);
+ if (row?.type !== 'item') {
+ throw new Error(`No "${value}" action row`);
+ }
+ return row;
+}
+
+function submenuRows(rows: Row[], value: string): DropdownActionItemType[] {
+ const row = rows.find((r) => r.type === 'submenu' && r.value === value);
+ if (row?.type !== 'submenu') {
+ throw new Error(`No "${value}" submenu`);
+ }
+ return row.items.filter(
+ (child): child is DropdownActionItemType => child.type === 'item',
+ );
+}
+
+// The rows ignore the event, so an empty one stands in for the click.
+function click(row: DropdownActionItemType): void {
+ row.onClick?.({} as MouseEvent);
}
const mockOpenEditor = jest.fn();
@@ -146,7 +189,7 @@ const baseArgs = {
function itemKeys(result: ReturnType<typeof usePanelActionItems>): unknown[] {
return result.items.map((item) =>
- 'key' in item && item.key !== undefined ? item.key : item.type,
+ item.type === 'separator' || !('value' in item) ? item.type : item.value,
);
}
@@ -162,12 +205,12 @@ describe('usePanelActionItems', () => {
'view-panel',
'edit-panel',
'clone-panel',
- 'divider',
+ 'separator',
'download',
'create-alert',
- 'divider',
+ 'separator',
'move',
- 'divider',
+ 'separator',
'delete-panel',
]);
// The single "Download" entry is a submenu (PNG/SVG, plus CSV on tables);
@@ -188,12 +231,12 @@ describe('usePanelActionItems', () => {
'view-panel',
'edit-panel',
'clone-panel',
- 'divider',
+ 'separator',
'download',
'create-alert',
- 'divider',
+ 'separator',
'move',
- 'divider',
+ 'separator',
'delete-panel',
]);
expect(disabledKeys(result.current)).toStrictEqual([
@@ -202,6 +245,31 @@ describe('usePanelActionItems', () => {
'move',
'delete-panel',
]);
+ expect(disabledReasons(result.current)).toStrictEqual(
+ Array(4).fill('no permission'),
+ );
+ });
+
+ it('leaves a missing permission to the checks, which name it', () => {
+ const editChecks = ['dashboard:update' as BrandedPermission];
+ setEditContextMock({
+ isEditable: false,
+ canEditDashboard: false,
+ editChecks,
+ });
+ const { result } = renderHook(() =>
+ usePanelActionItems({ ...baseArgs, panelActions: undefined }),
+ );
+ expect(disabledKeys(result.current)).toStrictEqual([]);
+ for (const value of ['edit-panel', 'clone-panel', 'move', 'delete-panel']) {
+ expect(actionRow(result.current.items, value)).toHaveProperty(
+ 'checks',
+ editChecks,
+ );
+ }
+ expect(actionRow(result.current.items, 'view-panel')).not.toHaveProperty(
+ 'checks',
+ );
});
it('locked (edit mode) keeps the edit actions visible but disabled', () => {
@@ -218,12 +286,12 @@ describe('usePanelActionItems', () => {
'view-panel',
'edit-panel',
'clone-panel',
- 'divider',
+ 'separator',
'download',
'create-alert',
- 'divider',
+ 'separator',
'move',
- 'divider',
+ 'separator',
'delete-panel',
]);
expect(disabledKeys(result.current)).toStrictEqual([
@@ -232,6 +300,9 @@ describe('usePanelActionItems', () => {
'move',
'delete-panel',
]);
+ expect(disabledReasons(result.current)).toStrictEqual(
+ Array(4).fill('locked'),
+ );
});
it('hides "Move to section" when the only untitled section is not the root (index 0)', () => {
@@ -250,10 +321,7 @@ describe('usePanelActionItems', () => {
it('edit opens the panel editor for this panel', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const edit = result.current.items.find(
- (i) => 'key' in i && i.key === 'edit-panel',
- );
- (edit as { onClick: () => void }).onClick();
+ click(actionRow(result.current.items, 'edit-panel'));
// The panel rides along so its saved query lands in the editor URL.
expect(mockOpenEditor).toHaveBeenCalledWith('panel-1', {
panel: mockPanel,
@@ -262,22 +330,13 @@ describe('usePanelActionItems', () => {
it('"Move to section" offers a single "Dashboard (root)" target', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const move = result.current.items.find(
- (i) => 'key' in i && i.key === 'move',
- ) as {
- children: { key: string; onClick: () => void }[];
- };
- expect(move.children.map((c) => c.key)).toStrictEqual(['move-to-root']);
+ const move = submenuRows(result.current.items, 'move');
+ expect(move.map((c) => c.value)).toStrictEqual(['move-to-root']);
});
it('the "Dashboard (root)" target moves the panel to the untitled root section', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const move = result.current.items.find(
- (i) => 'key' in i && i.key === 'move',
- ) as {
- children: { onClick: () => void }[];
- };
- move.children[0].onClick();
+ click(submenuRows(result.current.items, 'move')[0]);
expect(mockMovePanel).toHaveBeenCalledWith({
panelId: 'panel-1',
fromLayoutIndex: 1,
@@ -292,11 +351,9 @@ describe('usePanelActionItems', () => {
panelActions: { currentLayoutIndex: 0, sections: ROOT_AND_TWO_TITLED },
}),
);
- const move = result.current.items.find(
- (i) => 'key' in i && i.key === 'move',
- ) as { children: { key: string; label: string }[] };
- expect(move.children.map((c) => c.key)).toStrictEqual(['move-1', 'move-2']);
- expect(move.children.map((c) => c.label)).toStrictEqual(['A', 'B']);
+ const move = submenuRows(result.current.items, 'move');
+ expect(move.map((c) => c.value)).toStrictEqual(['move-1', 'move-2']);
+ expect(move.map((c) => c.label)).toStrictEqual(['A', 'B']);
});
it('a panel in a titled section can move to the root and the other titled sections', () => {
@@ -306,18 +363,10 @@ describe('usePanelActionItems', () => {
panelActions: { currentLayoutIndex: 1, sections: ROOT_AND_TWO_TITLED },
}),
);
- const move = result.current.items.find(
- (i) => 'key' in i && i.key === 'move',
- ) as { children: { key: string; label: string }[] };
+ const move = submenuRows(result.current.items, 'move');
// Root leads, then the other titled section — never the current one (A).
- expect(move.children.map((c) => c.key)).toStrictEqual([
- 'move-to-root',
- 'move-2',
- ]);
- expect(move.children.map((c) => c.label)).toStrictEqual([
- 'Dashboard (root)',
- 'B',
- ]);
+ expect(move.map((c) => c.value)).toStrictEqual(['move-to-root', 'move-2']);
+ expect(move.map((c) => c.label)).toStrictEqual(['Dashboard (root)', 'B']);
});
it('moves between titled sections even when the board has no untitled root', () => {
@@ -327,11 +376,9 @@ describe('usePanelActionItems', () => {
panelActions: { currentLayoutIndex: 0, sections: TWO_TITLED_SECTIONS },
}),
);
- const move = result.current.items.find(
- (i) => 'key' in i && i.key === 'move',
- ) as { children: { key: string; onClick: () => void }[] };
- expect(move.children.map((c) => c.key)).toStrictEqual(['move-1']);
- move.children[0].onClick();
+ const move = submenuRows(result.current.items, 'move');
+ expect(move.map((c) => c.value)).toStrictEqual(['move-1']);
+ click(move[0]);
expect(mockMovePanel).toHaveBeenCalledWith({
panelId: 'panel-1',
fromLayoutIndex: 0,
@@ -351,14 +398,12 @@ describe('usePanelActionItems', () => {
it('delete defers to a confirmation: the item opens the dialog, confirm runs the mutation', async () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const del = result.current.items.find(
- (i) => 'key' in i && i.key === 'delete-panel',
- );
+ const del = actionRow(result.current.items, 'delete-panel');
// Clicking the menu item only opens the dialog — no mutation yet.
expect(result.current.deleteConfirm.open).toBe(false);
act(() => {
- (del as { onClick: () => void }).onClick();
+ click(del);
});
expect(result.current.deleteConfirm.open).toBe(true);
expect(mockDeletePanel).not.toHaveBeenCalled();
@@ -376,10 +421,7 @@ describe('usePanelActionItems', () => {
it('clone calls the clone mutation with the panel and its layout index', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const clone = result.current.items.find(
- (i) => 'key' in i && i.key === 'clone-panel',
- );
- (clone as { onClick: () => void }).onClick();
+ click(actionRow(result.current.items, 'clone-panel'));
expect(mockClonePanel).toHaveBeenCalledWith({
panelId: 'panel-1',
layoutIndex: 1,
@@ -388,29 +430,24 @@ describe('usePanelActionItems', () => {
it('the Download submenu captures the panel by id, name and chosen format', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const download = result.current.items.find(
- (i) => 'key' in i && i.key === 'download',
- ) as { children: { key: string; onClick: () => void }[] };
+ const download = submenuRows(result.current.items, 'download');
// TimeSeries declares no CSV capability, so the submenu is just PNG + SVG.
- expect(download.children.map((c) => c.key)).toStrictEqual([
+ expect(download.map((c) => c.value)).toStrictEqual([
'download-png',
'download-svg',
]);
- download.children.find((c) => c.key === 'download-png')?.onClick();
+ click(actionRow(download, 'download-png'));
expect(mockDownloadImage).toHaveBeenCalledWith('panel-1', 'CPU', 'png');
- download.children.find((c) => c.key === 'download-svg')?.onClick();
+ click(actionRow(download, 'download-svg'));
expect(mockDownloadImage).toHaveBeenCalledWith('panel-1', 'CPU', 'svg');
});
it('view opens the View modal for the panel', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const view = result.current.items.find(
- (i) => 'key' in i && i.key === 'view-panel',
- );
- (view as { onClick: () => void }).onClick();
+ click(actionRow(result.current.items, 'view-panel'));
// The panel goes along so the opener can seed the shared query builder before
// the modal mounts (otherwise it renders the previously-viewed panel's query).
expect(mockOpenView).toHaveBeenCalledWith('panel-1', baseArgs.panel);
@@ -454,10 +491,7 @@ describe('usePanelActionItems', () => {
it('create-alert seeds an alert from this panel', () => {
const { result } = renderHook(() => usePanelActionItems(baseArgs));
- const createAlert = result.current.items.find(
- (i) => 'key' in i && i.key === 'create-alert',
- );
- (createAlert as { onClick: () => void }).onClick();
+ click(actionRow(result.current.items, 'create-alert'));
expect(mockCreateAlert).toHaveBeenCalledWith(mockPanel, 'panel-1');
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/usePanelActionItems.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/usePanelActionItems.tsx
index 042414073a..cfe5ce8785 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/usePanelActionItems.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/usePanelActionItems.tsx
@@ -1,4 +1,4 @@
-import { type ReactElement, type ReactNode, useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import {
Bell,
Copy,
@@ -7,7 +7,6 @@ import {
PenLine,
Trash2,
} from '@signozhq/icons';
-import type { MenuItem } from '@signozhq/ui/dropdown-menu';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
import {
type ConfirmableAction,
@@ -26,8 +25,8 @@ import { useDownloadPanelMenuItem } from '../hooks/useDownloadPanelMenuItem';
import { useMovePanelToSection } from '../hooks/useMovePanelToSection';
import { useViewPanel } from '../hooks/useViewPanel';
import { buildMoveItems } from '../utils/buildMoveItems';
-import MenuActionItem from '../../../components/MenuActionItem/MenuActionItem';
-import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
+import type { AuthZDropdownItemType } from 'lib/authz/components/AuthZDropdown/types';
+import { blockedBy } from 'lib/authz/components/AuthZDropdown/utils';
import { getBlockedPanelActions } from '../utils/getBlockedPanelActions';
import { useDashboardEditContext } from '../../../hooks/useDashboardEditContext';
@@ -46,7 +45,7 @@ interface UsePanelActionItemsArgs {
}
export interface PanelActionItems {
- items: MenuItem[];
+ items: AuthZDropdownItemType[];
/** Two-step confirm flow for the destructive Delete action. */
deleteConfirm: ConfirmableAction;
}
@@ -100,48 +99,37 @@ export function usePanelActionItems({
// Stable opener so the items memo doesn't rebuild on dialog state changes.
const { request: requestDelete } = deleteConfirm;
- const items = useMemo<MenuItem[]>(() => {
- // The row is a button carrying its own icon and reason; the item hosts it.
- const row = (
- text: string,
- icon: ReactElement,
- opts: {
- checks?: BrandedPermission[];
- destructive?: boolean;
- disabledTooltip?: string;
- } = {},
- ): ReactNode => (
- <MenuActionItem
- label={text}
- icon={icon}
- checks={opts.checks ?? editChecks}
- disabledTooltip={opts.disabledTooltip ?? editDisabledTooltip}
- destructive={opts.destructive}
- />
- );
-
- const panelGroup: MenuItem[] = [];
+ const items = useMemo<AuthZDropdownItemType[]>(() => {
+ const editGate = { checks: editChecks, ...blockedBy(editDisabledTooltip) };
+
+ const panelGroup: AuthZDropdownItemType[] = [];
if (panelCapabilities.view) {
panelGroup.push({
- key: 'view-panel',
- label: row('View', <Fullscreen size={14} />, { checks: [] }),
+ type: 'item',
+ value: 'view-panel',
+ label: 'View',
+ prefix: <Fullscreen size={14} />,
onClick: (): void => openView(panelId, panel),
});
}
if (panelCapabilities.edit) {
panelGroup.push({
- key: 'edit-panel',
- label: row('Edit panel', <PenLine size={14} />),
- disabled: !isEditable,
+ type: 'item',
+ value: 'edit-panel',
+ label: 'Edit panel',
+ prefix: <PenLine size={14} />,
+ ...editGate,
onClick: (): void => openPanelEditor(panelId, { panel }),
});
}
if (panelCapabilities.clone) {
// Needs section context to place the copy; disabled without it.
panelGroup.push({
- key: 'clone-panel',
- label: row('Clone', <Copy size={14} />),
- disabled: !isEditable || !panelActions,
+ type: 'item',
+ value: 'clone-panel',
+ label: 'Clone',
+ prefix: <Copy size={14} />,
+ ...editGate,
onClick: (): void => {
if (panelActions) {
void clonePanel({
@@ -153,7 +141,7 @@ export function usePanelActionItems({
});
}
- const dataGroup: MenuItem[] = [];
+ const dataGroup: AuthZDropdownItemType[] = [];
if (downloadItem) {
dataGroup.push(downloadItem);
}
@@ -162,17 +150,16 @@ export function usePanelActionItems({
// unlike edit/clone — it isn't gated on editability (V1 parity).
if (panelCapabilities.createAlert) {
dataGroup.push({
- key: 'create-alert',
- label: row('Create Alerts', <Bell size={14} />, {
- checks: [],
- disabledTooltip: blocked.createAlert,
- }),
- disabled: !!blocked.createAlert,
+ type: 'item',
+ value: 'create-alert',
+ label: 'Create Alerts',
+ prefix: <Bell size={14} />,
+ ...blockedBy(blocked.createAlert ?? ''),
onClick: (): void => createAlert(panel, panelId),
});
}
- const moveGroup: MenuItem[] =
+ const moveGroup: AuthZDropdownItemType[] =
isEditable && panelActions
? buildMoveItems({
sections,
@@ -182,25 +169,32 @@ export function usePanelActionItems({
})
: [
{
- key: 'move',
- label: row('Move to section', <FolderInput size={14} />),
- disabled: true,
+ type: 'item',
+ value: 'move',
+ label: 'Move to section',
+ prefix: <FolderInput size={14} />,
+ ...editGate,
},
];
- const deleteGroup: MenuItem[] = [
+ const deleteGroup: AuthZDropdownItemType[] = [
{
- key: 'delete-panel',
- label: row('Delete panel', <Trash2 size={14} />, { destructive: true }),
- disabled: !isEditable || !panelActions,
+ type: 'item',
+ value: 'delete-panel',
+ label: 'Delete panel',
+ prefix: <Trash2 size={14} />,
+ danger: true,
+ ...editGate,
onClick: (): void => requestDelete(),
},
];
return [panelGroup, dataGroup, moveGroup, deleteGroup]
.filter((group) => group.length > 0)
- .flatMap((group, index) =>
- index === 0 ? group : [{ type: 'divider' as const }, ...group],
+ .flatMap<AuthZDropdownItemType>((group, index) =>
+ index === 0
+ ? group
+ : [{ type: 'separator', value: `separator-${index}` }, ...group],
);
}, [
isEditable,
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.module.scss
index de095e14e1..2e14142679 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.module.scss
@@ -55,8 +55,3 @@
border: 1px solid var(--l3-border);
cursor: default;
}
-
-.descriptionTooltip {
- max-width: 240px;
- padding: 12px;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.tsx
index e6d90be96d..018187dd33 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.tsx
@@ -21,7 +21,7 @@ import {
panelStatusFromWarning,
} from '../PanelStatus/utils';
import styles from './PanelHeader.module.scss';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
interface PanelHeaderBaseProps {
panelId: string;
@@ -106,17 +106,13 @@ function PanelHeader(props: PanelHeaderProps): JSX.Element {
<div className={styles.headerLeft}>
<Typography.Text className={styles.headerTitle}>{name}</Typography.Text>
{description && (
- <TooltipSimple
- title={description}
- arrow
- tooltipContentProps={{ className: styles.descriptionTooltip }}
- >
+ <Tooltip title={description}>
<Info
className={styles.headerInfoIcon}
size={14}
data-testid="panel-header-info-icon"
/>
- </TooltipSimple>
+ </Tooltip>
)}
{query?.isFetching && (
<Loader
@@ -136,11 +132,11 @@ function PanelHeader(props: PanelHeaderProps): JSX.Element {
/>
)}
{query?.timeLabel && (
- <TooltipSimple title={query.timeLabel.full} arrow>
+ <Tooltip title={query.timeLabel.full}>
<span className={styles.timePill} data-testid="panel-time-preference">
{query.timeLabel.short}
</span>
- </TooltipSimple>
+ </Tooltip>
)}
{errorDetail && <PanelStatusPopover variant="error" detail={errorDetail} />}
{warningDetail && (
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.module.scss
index f08da9b838..0e217f472f 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.module.scss
@@ -3,15 +3,3 @@
width: min(100%, 320px);
height: 24px;
}
-
-.clear {
- --button-height: 18px;
- --button-width: 18px;
- --button-padding: 0;
-}
-
-.searchTrigger {
- --button-width: 24px;
- --button-height: 24px;
- --button-padding: 4px;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.tsx
index 5941829805..b527b50c80 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeaderSearch.tsx
@@ -1,7 +1,7 @@
import { useState, type ChangeEvent, type KeyboardEvent } from 'react';
import { Input } from '@signozhq/ui/input';
import { Search, X } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import { DashboardDetailEvents } from 'pages/DashboardPage/constants/events';
@@ -43,20 +43,20 @@ function PanelHeaderSearch({
if (!expanded) {
return (
- <TooltipSimple title="Search" arrow>
+ <Tooltip title="Search">
<Button
type="button"
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
onClick={(): void => setExpanded(true)}
- className={styles.searchTrigger}
- data-testid="panel-header-search-trigger"
+ testId="panel-header-search-trigger"
aria-label="Search"
>
<Search size={14} />
</Button>
- </TooltipSimple>
+ </Tooltip>
);
}
@@ -74,10 +74,10 @@ function PanelHeaderSearch({
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.clear}
+ size="sm"
+ icon
onClick={clear}
- data-testid="panel-header-search-clear"
+ testId="panel-header-search-clear"
aria-label="Clear search"
>
<X size={14} />
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.module.scss
index 24a0221eec..541443a14b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.module.scss
@@ -7,15 +7,6 @@
flex-shrink: 0;
}
-// Strip the tooltip's own padding/width cap so the card content (which owns its
-// 16px section padding) frames cleanly — a padding-less surface, like the
-// shared WarningPopover, restyled with V2 tokens.
-.tooltipContent {
- max-width: 520px !important;
- padding: 0 !important;
- overflow: hidden;
-}
-
.content {
display: flex;
flex-direction: column;
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.tsx
index 8d54ebbfc1..f98da62ebb 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/PanelStatusPopover.tsx
@@ -1,6 +1,6 @@
import { Color } from '@signozhq/design-tokens';
import { CircleX, TriangleAlert } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import PanelStatusContent from './PanelStatusContent';
import type { PanelStatusDetail, PanelStatusVariant } from './types';
@@ -34,12 +34,10 @@ function PanelStatusPopover({
const Icon = variant === 'error' ? CircleX : TriangleAlert;
return (
- <TooltipSimple
+ <Tooltip
title={<PanelStatusContent variant={variant} detail={detail} />}
side="top"
align="end"
- arrow
- tooltipContentProps={{ className: styles.tooltipContent }}
>
<span
className={styles.trigger}
@@ -48,7 +46,7 @@ function PanelStatusPopover({
>
<Icon size={16} color={color} />
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.module.scss
index 2ae5d67cfa..7bf6072c5d 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.module.scss
@@ -3,46 +3,16 @@
min-width: 0;
max-width: 220px;
- > .main {
- min-width: 0;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
+ > [data-slot='button']:first-child {
+ --button-min-width: 0;
+ --button-border-radius: var(--radius-1) 0 0 var(--radius-1);
}
- > .toggle {
- flex-shrink: 0;
- padding-inline: 10px;
+ > [data-slot='button']:last-child {
+ --button-flex-shrink: 0;
+ --button-border-radius: 0 var(--radius-1) var(--radius-1) 0;
+
border-left: 1px solid
color-mix(in srgb, var(--l1-foreground) 25%, transparent);
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
}
}
-
-.menu {
- min-width: 240px;
- max-width: 320px;
-
- [data-slot='dropdown-menu-item'] {
- box-sizing: border-box;
- }
-}
-
-.menuLabel {
- text-transform: uppercase;
-}
-
-.check {
- margin-left: auto;
- color: var(--bg-robin-400);
-}
-
-.createOption {
- color: var(--bg-robin-400);
-}
-
-.ellipsis {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.tsx
index 00662710aa..2a81f4050b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/AddPanelSplitButton.tsx
@@ -1,15 +1,7 @@
-import { useRef } from 'react';
-import { Check, ChevronUp, Plus } from '@signozhq/icons';
+import { useMemo } from 'react';
+import { ChevronUp, Plus } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import type { SectionOption } from './types';
@@ -34,78 +26,69 @@ function AddPanelSplitButton({
onConfirm,
disabled,
}: AddPanelSplitButtonProps): JSX.Element {
- const createOnCloseRef = useRef(false);
+ const items = useMemo<DropdownItemType[]>(
+ () => [
+ {
+ type: 'group',
+ value: 'sections',
+ label: 'Add to section',
+ items: [
+ {
+ type: 'radio-group',
+ name: 'section',
+ value: value ?? '',
+ onChange,
+ items: options.map((option) => ({
+ value: option.value,
+ label: option.label,
+ testId: `panel-section-option-${option.value}`,
+ })),
+ },
+ ],
+ },
+ { type: 'separator', value: 'create-separator' },
+ {
+ type: 'item',
+ value: 'create',
+ label: 'New section',
+ prefix: <Plus size={14} />,
+ onClick: onCreate,
+ testId: 'panel-section-create',
+ },
+ ],
+ [options, value, onChange, onCreate],
+ );
return (
<div className={styles.splitButton}>
- <TooltipSimple title={label} delayDuration={1000}>
+ <Button
+ variant="solid"
+ color="primary"
+ size="md"
+ onClick={onConfirm}
+ disabled={disabled}
+ disabledTooltip="Name the new section first"
+ testId="panel-type-confirm"
+ >
+ {label}
+ </Button>
+ <Dropdown
+ items={items}
+ nativeButton
+ side="top"
+ align="end"
+ contentMaxWidth={320}
+ >
<Button
+ variant="solid"
color="primary"
size="md"
- className={styles.main}
- onClick={onConfirm}
- disabled={disabled}
- data-testid="panel-type-confirm"
+ icon
+ aria-label="Choose section"
>
- <span className={styles.ellipsis}>{label}</span>
+ <ChevronUp size={16} />
</Button>
- </TooltipSimple>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- color="primary"
- size="icon"
- className={styles.toggle}
- aria-label="Choose section"
- >
- <ChevronUp size={16} />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent
- side="top"
- align="end"
- sideOffset={6}
- className={styles.menu}
- // Mounted after close, so the name input's autofocus isn't undone.
- onCloseAutoFocus={(e): void => {
- if (createOnCloseRef.current) {
- createOnCloseRef.current = false;
- e.preventDefault();
- onCreate();
- }
- }}
- >
- <DropdownMenuLabel className={styles.menuLabel}>
- Add to section
- </DropdownMenuLabel>
- {options.map((option) => (
- <DropdownMenuItem
- key={option.value}
- onSelect={(): void => onChange(option.value)}
- rightIcon={
- option.value === value ? (
- <Check size={14} className={styles.check} />
- ) : undefined
- }
- title={option.label}
- testId={`panel-section-option-${option.value}`}
- >
- <span className={styles.ellipsis}>{option.label}</span>
- </DropdownMenuItem>
- ))}
- <DropdownMenuSeparator />
- <DropdownMenuItem
- className={styles.createOption}
- leftIcon={<Plus size={14} />}
- onSelect={(): void => {
- createOnCloseRef.current = true;
- }}
- testId="panel-section-create"
- >
- New section
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </Dropdown>
</div>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.module.scss
index cc62a8dc54..78ff8a5f14 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.module.scss
@@ -1,10 +1,9 @@
.nameInput {
flex: 0 1 260px;
min-width: 140px;
-}
-.clear {
- --button-height: 20px;
- --button-width: 20px;
- --button-padding: 0;
+ [data-slot='button'] {
+ --button-height: 20px;
+ --button-padding: 0;
+ }
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.tsx
index b2ab0ef685..775b029533 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/NewSectionNameInput.tsx
@@ -41,8 +41,8 @@ function NewSectionNameInput({
<Button
variant="ghost"
color="secondary"
- size="icon"
- className={styles.clear}
+ size="sm"
+ icon
aria-label="Cancel new section"
onClick={onCancel}
testId="panel-section-name-cancel"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeTile.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeTile.tsx
index 75fbfe74b6..1a66b43347 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeTile.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeTile.tsx
@@ -1,4 +1,4 @@
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import cx from 'classnames';
import type { PanelTypeItem } from './panelTypeCatalog';
@@ -45,7 +45,7 @@ function PanelTypeTile({
);
return disabledReason ? (
- <TooltipSimple title={disabledReason}>{tile}</TooltipSimple>
+ <Tooltip title={disabledReason}>{tile}</Tooltip>
) : (
tile
);
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/__tests__/PanelTypeSelectionModal.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/__tests__/PanelTypeSelectionModal.test.tsx
index 6cf237a37b..3a6da65faa 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/__tests__/PanelTypeSelectionModal.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/__tests__/PanelTypeSelectionModal.test.tsx
@@ -1,6 +1,5 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { useDashboardSections } from '../../../../hooks/useDashboardSections';
import { usePanelPickerTargetStore } from '../../../../store/usePanelPickerTargetStore';
@@ -52,14 +51,12 @@ function renderDrawer(
const onSelect = jest.fn();
const onClose = jest.fn();
render(
- <TooltipProvider>
- <PanelTypeSelectionModal
- open
- onClose={onClose}
- onSelect={onSelect}
- {...props}
- />
- </TooltipProvider>,
+ <PanelTypeSelectionModal
+ open
+ onClose={onClose}
+ onSelect={onSelect}
+ {...props}
+ />,
);
return { onSelect, onClose, user };
}
@@ -70,7 +67,7 @@ async function openSectionMenu(user: User): Promise<void> {
async function startNewSection(user: User): Promise<void> {
await openSectionMenu(user);
- await user.click(screen.getByTestId('panel-section-create'));
+ await user.click(await screen.findByTestId('panel-section-create'));
await screen.findByTestId('panel-section-name');
}
@@ -135,7 +132,7 @@ describe('PanelTypeSelectionModal', () => {
const { onSelect, user } = renderDrawer({ defaultLayoutIndex: 1 });
await openSectionMenu(user);
- await user.click(screen.getByTestId('panel-section-option-0'));
+ await user.click(await screen.findByTestId('panel-section-option-0'));
const confirm = screen.getByTestId('panel-type-confirm');
expect(confirm).toHaveTextContent('Add to Overview');
await user.click(confirm);
@@ -204,7 +201,7 @@ describe('PanelTypeSelectionModal', () => {
await startNewSection(user);
const confirm = screen.getByTestId('panel-type-confirm');
- expect(confirm).toBeDisabled();
+ expect(confirm).toHaveAttribute('aria-disabled', 'true');
expect(confirm).toHaveTextContent('Add to new section');
await user.type(screen.getByTestId('panel-section-name'), ' Errors ');
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalHeader.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalHeader.tsx
index bd2a60936d..d9a75fa42a 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalHeader.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalHeader.tsx
@@ -1,7 +1,6 @@
import { PenLine, RotateCw } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import type { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
-import cx from 'classnames';
import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
import type {
CustomTimeType,
@@ -90,22 +89,25 @@ function ViewPanelModalHeader(props: ViewPanelModalHeaderProps): JSX.Element {
</div>
<AuthZTooltip checks={editChecks} disabledTooltip={editDisabledTooltip}>
<Button
+ disabledTooltip={undefined}
+ size="md"
variant="outlined"
color="secondary"
prefix={<PenLine />}
disabled={!canSwitchToEdit}
onClick={onSwitchToEdit}
- data-testid="view-panel-switch-to-edit"
+ testId="view-panel-switch-to-edit"
>
Switch to Edit Mode
</Button>
</AuthZTooltip>
{query && (
<Button
- variant="link"
- color="primary"
+ size="md"
+ variant="outlined"
+ color="secondary"
onClick={query.onResetQuery}
- data-testid="view-panel-reset-query"
+ testId="view-panel-reset-query"
>
Reset Query
</Button>
@@ -124,15 +126,16 @@ function ViewPanelModalHeader(props: ViewPanelModalHeaderProps): JSX.Element {
modalInitialEndTime={query.endMs}
/>
<Button
- size="icon"
+ size="md"
+ icon
variant="outlined"
color="secondary"
onClick={query.onRefresh}
- disabled={query.isFetching}
+ loading={query.isFetching}
aria-label="Refresh"
- data-testid="view-panel-refresh"
+ testId="view-panel-refresh"
>
- <RotateCw className={cx({ 'animate-spin': query.isFetching })} />
+ <RotateCw />
</Button>
</div>
)}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalTitle.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalTitle.tsx
index 57c3ac696c..0bf2ed13c0 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalTitle.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalTitle.tsx
@@ -1,4 +1,4 @@
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
@@ -13,11 +13,11 @@ function ViewPanelModalTitle({ panel }: ViewPanelModalTitleProps): JSX.Element {
const name = usePanelTitle(panel);
return (
- <TooltipSimple title={name} arrow>
+ <Tooltip title={name}>
<Typography.Text className={styles.title}>
{name ? `${name} - (View mode)` : 'View mode'}
</Typography.Text>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/PanelHeader.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/PanelHeader.test.tsx
index 7e0fad42f4..2fa5afb96f 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/PanelHeader.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/PanelHeader.test.tsx
@@ -1,4 +1,3 @@
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import {
@@ -12,11 +11,6 @@ import type { Warning } from 'types/api';
import PanelHeader from '../PanelHeader/PanelHeader';
-// Status indicators use a radix tooltip, which needs a TooltipProvider ancestor
-// (supplied globally by AppLayout at runtime).
-const renderWithProvider = (ui: ReactElement): ReturnType<typeof render> =>
- render(<TooltipProvider>{ui}</TooltipProvider>);
-
// Stub the actions menu (its gating logic is tested separately) so this asserts
// only whether the menu mounts, per the `hideActions` switch.
jest.mock(
@@ -100,7 +94,7 @@ const warning: Warning = {
describe('PanelHeader title and description', () => {
it('renders the panel name', () => {
- renderWithProvider(<PanelHeader {...baseProps} />);
+ render(<PanelHeader {...baseProps} />);
expect(screen.getByText('My panel')).toBeInTheDocument();
});
@@ -116,7 +110,7 @@ describe('PanelHeader title and description', () => {
},
},
});
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
panel={makePanel({ name: 'Latency of $service ({{missing}})' })}
@@ -129,7 +123,7 @@ describe('PanelHeader title and description', () => {
});
it('shows the description info icon when a description is provided', () => {
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
panel={makePanel({ description: 'What this panel measures' })}
@@ -139,7 +133,7 @@ describe('PanelHeader title and description', () => {
});
it('renders no description info icon when there is no description', () => {
- renderWithProvider(<PanelHeader {...baseProps} />);
+ render(<PanelHeader {...baseProps} />);
expect(
screen.queryByTestId('panel-header-info-icon'),
).not.toBeInTheDocument();
@@ -148,17 +142,17 @@ describe('PanelHeader title and description', () => {
describe('PanelHeader status indicators', () => {
it('shows the error indicator whenever an error is present', () => {
- renderWithProvider(<PanelHeader {...baseProps} error={new Error('boom')} />);
+ render(<PanelHeader {...baseProps} error={new Error('boom')} />);
expect(screen.getByTestId('panel-status-error')).toBeInTheDocument();
});
it('shows the warning indicator whenever a warning is present', () => {
- renderWithProvider(<PanelHeader {...baseProps} warning={warning} />);
+ render(<PanelHeader {...baseProps} warning={warning} />);
expect(screen.getByTestId('panel-status-warning')).toBeInTheDocument();
});
it('renders no status indicators when there is no error or warning', () => {
- renderWithProvider(<PanelHeader {...baseProps} />);
+ render(<PanelHeader {...baseProps} />);
expect(screen.queryByTestId('panel-status-error')).not.toBeInTheDocument();
expect(screen.queryByTestId('panel-status-warning')).not.toBeInTheDocument();
});
@@ -166,7 +160,7 @@ describe('PanelHeader status indicators', () => {
describe('PanelHeader multi-query config warning (issue #9512)', () => {
it('warns when a Number panel has more than one enabled query', () => {
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
panel={makePanelWithQueries('signoz/NumberPanel', 2)}
@@ -176,7 +170,7 @@ describe('PanelHeader multi-query config warning (issue #9512)', () => {
});
it('does not warn when only one query is enabled (others disabled)', () => {
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
panel={makePanelWithQueries('signoz/NumberPanel', 1, 2)}
@@ -188,7 +182,7 @@ describe('PanelHeader multi-query config warning (issue #9512)', () => {
});
it('does not warn for non-Number panels with multiple enabled queries', () => {
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
panel={makePanelWithQueries('signoz/TimeSeriesPanel', 3)}
@@ -200,7 +194,7 @@ describe('PanelHeader multi-query config warning (issue #9512)', () => {
});
it('shows the warning in the editor preview (hideActions, no title)', () => {
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
panel={makePanelWithQueries('signoz/NumberPanel', 2)}
@@ -213,7 +207,7 @@ describe('PanelHeader multi-query config warning (issue #9512)', () => {
describe('PanelHeader search', () => {
it('renders no search affordance when the panel is not searchable', () => {
- renderWithProvider(<PanelHeader {...baseProps} />);
+ render(<PanelHeader {...baseProps} />);
expect(
screen.queryByTestId('panel-header-search-trigger'),
).not.toBeInTheDocument();
@@ -222,7 +216,7 @@ describe('PanelHeader search', () => {
it('expands the collapsed trigger into an input and reports changes', async () => {
const user = userEvent.setup();
const onSearchChange = jest.fn();
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
searchable
@@ -243,7 +237,7 @@ describe('PanelHeader search', () => {
it('clears the term and collapses when the clear button is pressed', async () => {
const user = userEvent.setup();
const onSearchChange = jest.fn();
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
searchable
@@ -262,21 +256,19 @@ describe('PanelHeader search', () => {
describe('PanelHeader actions menu', () => {
it('mounts the actions menu by default', () => {
- renderWithProvider(<PanelHeader {...baseProps} />);
+ render(<PanelHeader {...baseProps} />);
expect(screen.getByTestId('panel-actions-menu')).toBeInTheDocument();
});
it('hides the actions menu when hideActions is set (editor preview)', () => {
- renderWithProvider(<PanelHeader {...baseProps} hideActions />);
+ render(<PanelHeader {...baseProps} hideActions />);
expect(screen.queryByTestId('panel-actions-menu')).not.toBeInTheDocument();
});
});
describe('PanelHeader static mode', () => {
it('renders the title and actions menu with no query-status chrome', () => {
- renderWithProvider(
- <PanelHeader mode="static" panelId="panel-1" panel={makePanel()} />,
- );
+ render(<PanelHeader mode="static" panelId="panel-1" panel={makePanel()} />);
expect(screen.getByText('My panel')).toBeInTheDocument();
expect(screen.getByTestId('panel-actions-menu')).toBeInTheDocument();
expect(screen.queryByTestId('panel-refetching')).not.toBeInTheDocument();
@@ -290,7 +282,7 @@ describe('PanelHeader static mode', () => {
describe('PanelHeader time-preference pill', () => {
it('shows the pill with the short label when the panel overrides the dashboard time', () => {
- renderWithProvider(
+ render(
<PanelHeader
{...baseProps}
timeLabel={{ short: '6h', full: 'Last 6 hr' }}
@@ -300,7 +292,7 @@ describe('PanelHeader time-preference pill', () => {
});
it('renders no pill when the panel follows the dashboard time', () => {
- renderWithProvider(<PanelHeader {...baseProps} timeLabel={null} />);
+ render(<PanelHeader {...baseProps} timeLabel={null} />);
expect(screen.queryByTestId('panel-time-preference')).not.toBeInTheDocument();
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/ViewPanelModal.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/ViewPanelModal.test.tsx
index e3c90a2e75..c3daa27e92 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/ViewPanelModal.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/ViewPanelModal.test.tsx
@@ -1,4 +1,3 @@
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { fireEvent, render, screen } from '@testing-library/react';
import type { ReactElement } from 'react';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
@@ -149,7 +148,7 @@ jest.mock(
);
const renderWithProvider = (ui: ReactElement): ReturnType<typeof render> =>
- render(<TooltipProvider>{ui}</TooltipProvider>);
+ render(ui);
function makePanel(kind: string, name = 'My panel'): DashboardtypesPanelDTO {
return {
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.addons.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.addons.test.tsx
index cfbcd78049..c107363809 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.addons.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.addons.test.tsx
@@ -6,7 +6,6 @@ import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider as ReduxProvider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { CompatRouter } from 'react-router-dom-v5-compat';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
import { QueryBuilderProvider } from 'providers/QueryBuilder';
import configureStore from 'redux-mock-store';
@@ -208,11 +207,9 @@ const renderHarness = (): void => {
<CompatRouter>
<QueryClientProvider client={new QueryClient()}>
<ReduxProvider store={configureStore([])(appStore.getState())}>
- <TooltipProvider>
- <QueryBuilderProvider>
- <Harness />
- </QueryBuilderProvider>
- </TooltipProvider>
+ <QueryBuilderProvider>
+ <Harness />
+ </QueryBuilderProvider>
</ReduxProvider>
</QueryClientProvider>
</CompatRouter>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.promql.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.promql.test.tsx
index efbc9304a6..8ea39be98b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.promql.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/useViewPanel.promql.test.tsx
@@ -6,7 +6,6 @@ import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider as ReduxProvider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { CompatRouter } from 'react-router-dom-v5-compat';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
import { QueryBuilderProvider } from 'providers/QueryBuilder';
import configureStore from 'redux-mock-store';
@@ -144,11 +143,9 @@ const renderHarness = (): void => {
<CompatRouter>
<QueryClientProvider client={new QueryClient()}>
<ReduxProvider store={configureStore([])(appStore.getState())}>
- <TooltipProvider>
- <QueryBuilderProvider>
- <Harness />
- </QueryBuilderProvider>
- </TooltipProvider>
+ <QueryBuilderProvider>
+ <Harness />
+ </QueryBuilderProvider>
</ReduxProvider>
</QueryClientProvider>
</CompatRouter>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/__tests__/useDownloadPanelMenuItem.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/__tests__/useDownloadPanelMenuItem.test.tsx
index 17392a58f0..432a15df39 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/__tests__/useDownloadPanelMenuItem.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/__tests__/useDownloadPanelMenuItem.test.tsx
@@ -34,7 +34,7 @@ const download = (
drilldown: true,
});
-type Submenu = { children: { key: string; onClick: () => void }[] };
+type Submenu = { items: { value: string; onClick: () => void }[] };
function render(actions: PanelActionCapabilities): { current: unknown } {
return renderHook(() =>
@@ -54,20 +54,20 @@ describe('useDownloadPanelMenuItem', () => {
const result = render(download({ csv: true, png: true, svg: true }));
const item = result.current as Submenu;
- expect(item.children.map((c) => c.key)).toStrictEqual([
+ expect(item.items.map((c) => c.value)).toStrictEqual([
'download-csv',
'download-png',
'download-svg',
]);
- item.children.find((c) => c.key === 'download-csv')?.onClick();
+ item.items.find((c) => c.value === 'download-csv')?.onClick();
expect(mockDownloadCsv).toHaveBeenCalledTimes(1);
expect(mockDownloadImage).not.toHaveBeenCalled();
- item.children.find((c) => c.key === 'download-png')?.onClick();
+ item.items.find((c) => c.value === 'download-png')?.onClick();
expect(mockDownloadImage).toHaveBeenCalledWith('panel-1', 'CPU', 'png');
- item.children.find((c) => c.key === 'download-svg')?.onClick();
+ item.items.find((c) => c.value === 'download-svg')?.onClick();
expect(mockDownloadImage).toHaveBeenCalledWith('panel-1', 'CPU', 'svg');
});
});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useDownloadPanelMenuItem.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useDownloadPanelMenuItem.tsx
index b31359dc59..bc4f48e8a6 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useDownloadPanelMenuItem.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useDownloadPanelMenuItem.tsx
@@ -1,5 +1,5 @@
import { useCallback, useMemo } from 'react';
-import type { MenuItem } from '@signozhq/ui/dropdown-menu';
+import type { DropdownSubmenuItemType } from '@signozhq/ui/dropdown';
import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
import {
DownloadFormat,
@@ -28,7 +28,7 @@ export function useDownloadPanelMenuItem({
panel,
data,
actions,
-}: UseDownloadPanelMenuItemArgs): MenuItem | null {
+}: UseDownloadPanelMenuItemArgs): DropdownSubmenuItemType | null {
const panelName = usePanelTitle(panel);
const downloadPanelCsv = useDownloadPanelCsv({
panel,
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildDownloadMenuItem.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildDownloadMenuItem.tsx
index 96c716cd7f..7dfcea5f2a 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildDownloadMenuItem.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildDownloadMenuItem.tsx
@@ -4,7 +4,10 @@ import {
FileImage,
FileSpreadsheet,
} from '@signozhq/icons';
-import type { MenuItem } from '@signozhq/ui/dropdown-menu';
+import type {
+ DropdownActionItemType,
+ DropdownSubmenuItemType,
+} from '@signozhq/ui/dropdown';
import {
DownloadFormat,
type PanelActionCapabilities,
@@ -44,27 +47,31 @@ interface DownloadMenuItemArgs {
export function buildDownloadMenuItem({
supported,
onDownload,
-}: DownloadMenuItemArgs): MenuItem | null {
+}: DownloadMenuItemArgs): DropdownSubmenuItemType | null {
if (!supported) {
return null;
}
- const children: MenuItem[] = DOWNLOAD_FORMAT_OPTIONS.filter(
+ const items = DOWNLOAD_FORMAT_OPTIONS.filter(
({ format }) => supported[format],
- ).map(({ format, label, icon }) => ({
- key: `download-${format}`,
- label,
- icon,
- onClick: (): void => onDownload(format),
- }));
+ ).map(
+ ({ format, label, icon }): DropdownActionItemType => ({
+ type: 'item',
+ value: `download-${format}`,
+ label,
+ prefix: icon,
+ onClick: (): void => onDownload(format),
+ }),
+ );
- if (children.length === 0) {
+ if (items.length === 0) {
return null;
}
return {
- key: 'download',
+ type: 'submenu',
+ value: 'download',
label: 'Download',
- icon: <CloudDownload size={14} />,
- children,
+ prefix: <CloudDownload size={14} />,
+ items,
};
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildMoveItems.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildMoveItems.tsx
index ed2829d7d4..c0e05bd217 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildMoveItems.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildMoveItems.tsx
@@ -1,5 +1,8 @@
import { FolderInput } from '@signozhq/icons';
-import type { MenuItem } from '@signozhq/ui/dropdown-menu';
+import type {
+ DropdownActionItemType,
+ DropdownSubmenuItemType,
+} from '@signozhq/ui/dropdown';
import { findRootSection, type DashboardSection } from '../../../utils';
import type { MovePanelArgs } from '../hooks/useMovePanelToSection';
@@ -26,7 +29,7 @@ export function buildMoveItems({
currentLayoutIndex,
panelId,
movePanel,
-}: MoveItemsArgs): MenuItem[] {
+}: MoveItemsArgs): DropdownSubmenuItemType[] {
const rootSection = findRootSection(sections);
// Sections are already in layout order, so the root (index 0, when present)
@@ -43,13 +46,15 @@ export function buildMoveItems({
return [
{
- key: 'move',
+ type: 'submenu',
+ value: 'move',
label: 'Move to section',
- icon: <FolderInput size={14} />,
- children: targets.map((section) => {
+ prefix: <FolderInput size={14} />,
+ items: targets.map((section): DropdownActionItemType => {
const isRoot = section === rootSection;
return {
- key: isRoot ? 'move-to-root' : `move-${section.layoutIndex}`,
+ type: 'item',
+ value: isRoot ? 'move-to-root' : `move-${section.layoutIndex}`,
label: isRoot ? ROOT_LABEL : (section.title as string),
onClick: (): void =>
void movePanel({
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.module.scss
deleted file mode 100644
index 25da49cfa3..0000000000
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.module.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.addButton {
- display: inline-flex;
- align-items: center;
- gap: 6px;
- margin-top: 8px;
- padding: 8px 12px;
- background: transparent;
- border: 1px dashed var(--l1-border);
- border-radius: 4px;
- color: var(--l2-foreground);
- cursor: pointer;
-
- &:hover {
- border-color: var(--bg-robin-500);
- color: var(--l1-foreground);
- }
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.tsx
index cca7002ae9..eb013a5c0b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/AddSectionControl/AddSectionControl.tsx
@@ -7,7 +7,6 @@ import type { DashboardSection } from '../../../utils';
import { useAddSection } from '../hooks/useAddSection';
import { useFirstSectionMigration } from '../hooks/useFirstSectionMigration';
import FirstSectionMigrationModal from '../FirstSectionMigrationModal';
-import styles from './AddSectionControl.module.scss';
const DEFAULT_SECTION_TITLE = 'New section';
@@ -47,13 +46,14 @@ function AddSectionControl({
return (
<>
<Button
+ size="md"
+ color="secondary"
type="button"
variant="ghost"
- className={styles.addButton}
onClick={handleClick}
- data-testid="add-section"
+ testId="add-section"
+ prefix={<Plus size={14} />}
>
- <Plus size={14} />
Add section
</Button>
<FirstSectionMigrationModal
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/Section/Section.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/Section/Section.tsx
index 7916025f9e..f9f69997e1 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/Section/Section.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/Section/Section.tsx
@@ -130,6 +130,7 @@ function Section({ section, sections, dragHandle }: SectionProps): JSX.Element {
<div className={styles.emptySection}>
<AuthZTooltip checks={editChecks} disabledTooltip={editDisabledTooltip}>
<Button
+ size="md"
type="button"
variant="dashed"
color="secondary"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.module.scss
deleted file mode 100644
index 0c39ab0ef0..0000000000
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.module.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.trigger {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- padding: 2px;
- background: transparent;
- border: none;
- border-radius: 2px;
- color: var(--l2-foreground);
- cursor: pointer;
-
- &:hover {
- color: var(--l1-foreground);
- background: var(--l2-background);
- }
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.tsx
index 2e590e15cb..1726ad74d5 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/SectionActionsMenu.tsx
@@ -1,12 +1,9 @@
-import { type ReactElement, type ReactNode, useMemo } from 'react';
+import { useMemo } from 'react';
import { Copy, EllipsisVertical, PenLine, Plus, Trash2 } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import type { MenuItem } from '@signozhq/ui/dropdown-menu';
-
-import MenuActionItem from '../../../components/MenuActionItem/MenuActionItem';
-import menuStyles from '../../../components/MenuActionItem/MenuActionItem.module.scss';
-import styles from './SectionActionsMenu.module.scss';
+import AuthZDropdown from 'lib/authz/components/AuthZDropdown/AuthZDropdown';
+import type { AuthZDropdownItemType } from 'lib/authz/components/AuthZDropdown/types';
+import { blockedBy } from 'lib/authz/components/AuthZDropdown/utils';
import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
interface SectionActionsMenuProps {
@@ -14,7 +11,6 @@ interface SectionActionsMenuProps {
/** Present when edits are unavailable — items render disabled with its reason. */
disabledChecks?: BrandedPermission[];
disabledTooltip?: string;
- disabled?: boolean;
onAddPanel?: () => void;
onRename?: () => void;
onCloneSection?: () => void;
@@ -24,70 +20,61 @@ interface SectionActionsMenuProps {
function SectionActionsMenu({
sectionId,
disabledChecks = [],
- disabledTooltip,
- disabled = false,
+ disabledTooltip = '',
onAddPanel,
onRename,
onCloneSection,
onDeleteSection,
}: SectionActionsMenuProps): JSX.Element {
- const items = useMemo<MenuItem[]>(() => {
- // The row is a button, so it carries its own icon, disabled state and
- // reason — the dropdown item just hosts it.
- const row = (
- text: string,
- icon: ReactElement,
- opts: { destructive?: boolean } = {},
- ): ReactNode => (
- <MenuActionItem
- label={text}
- icon={icon}
- checks={disabledChecks}
- disabledTooltip={disabledTooltip}
- destructive={opts.destructive}
- />
- );
- const result: MenuItem[] = [];
+ const items = useMemo<AuthZDropdownItemType[]>(() => {
+ const gate = { checks: disabledChecks, ...blockedBy(disabledTooltip) };
+ const result: AuthZDropdownItemType[] = [];
if (onAddPanel) {
result.push({
- key: 'add-panel',
- label: row('Add panel', <Plus size={14} />),
- disabled,
+ type: 'item',
+ value: 'add-panel',
+ label: 'Add panel',
+ prefix: <Plus size={14} />,
+ ...gate,
onClick: onAddPanel,
});
}
if (onRename) {
result.push({
- key: 'rename',
- label: row('Rename section', <PenLine size={14} />),
- disabled,
+ type: 'item',
+ value: 'rename',
+ label: 'Rename section',
+ prefix: <PenLine size={14} />,
+ ...gate,
onClick: onRename,
});
}
if (onCloneSection) {
result.push({
- key: 'clone-section',
- label: row('Clone section', <Copy size={14} />),
- disabled,
+ type: 'item',
+ value: 'clone-section',
+ label: 'Clone section',
+ prefix: <Copy size={14} />,
+ ...gate,
onClick: onCloneSection,
});
}
if (onDeleteSection) {
result.push(
- { type: 'divider' },
+ { type: 'separator', value: 'before-delete-section' },
{
- key: 'delete-section',
- label: row('Delete section', <Trash2 size={14} />, {
- destructive: true,
- }),
- disabled,
+ type: 'item',
+ value: 'delete-section',
+ label: 'Delete section',
+ prefix: <Trash2 size={14} />,
+ danger: true,
+ ...gate,
onClick: onDeleteSection,
},
);
}
return result;
}, [
- disabled,
disabledChecks,
disabledTooltip,
onAddPanel,
@@ -97,19 +84,24 @@ function SectionActionsMenu({
]);
return (
- <DropdownMenuSimple menu={{ items }} className={menuStyles.menuContent}>
+ <AuthZDropdown
+ items={items}
+ nativeButton
+ align="end"
+ side="bottom"
+ testId={`dashboard-section-actions-${sectionId}`}
+ >
<Button
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.trigger}
+ size="sm"
+ icon
aria-label="Section actions"
- data-testid={`dashboard-section-actions-${sectionId}`}
>
<EllipsisVertical size={14} />
</Button>
- </DropdownMenuSimple>
+ </AuthZDropdown>
);
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/__tests__/SectionActionsMenu.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/__tests__/SectionActionsMenu.test.tsx
new file mode 100644
index 0000000000..61cde3a6d3
--- /dev/null
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionActionsMenu/__tests__/SectionActionsMenu.test.tsx
@@ -0,0 +1,82 @@
+import { server } from 'mocks-server/server';
+import { render, screen, userEvent, waitFor } from 'tests/test-utils';
+import { buildDashboardUpdatePermission } from 'lib/authz/hooks/useAuthZ/permissions/dashboard.permissions';
+import { setupAuthzDeny } from 'lib/authz/utils/authz-test-utils';
+
+import SectionActionsMenu from '../SectionActionsMenu';
+
+const SECTION_ID = 'section-1';
+const MENU_TEST_ID = `dashboard-section-actions-${SECTION_ID}`;
+const updatePermission = buildDashboardUpdatePermission('dashboard-1');
+
+async function openMenu(): Promise<void> {
+ await userEvent.click(screen.getByTestId(MENU_TEST_ID));
+ await screen.findByTestId(`${MENU_TEST_ID}-item-rename`);
+}
+
+describe('SectionActionsMenu', () => {
+ afterEach(() => {
+ server.resetHandlers();
+ });
+
+ it('renders only the actions it has handlers for', async () => {
+ render(<SectionActionsMenu sectionId={SECTION_ID} onRename={jest.fn()} />);
+ await openMenu();
+
+ expect(
+ screen.queryByTestId(`${MENU_TEST_ID}-item-delete-section`),
+ ).not.toBeInTheDocument();
+ });
+
+ it('disables every row with the given reason', async () => {
+ render(
+ <SectionActionsMenu
+ sectionId={SECTION_ID}
+ disabledChecks={[updatePermission]}
+ disabledTooltip="This dashboard is locked"
+ onRename={jest.fn()}
+ onDeleteSection={jest.fn()}
+ />,
+ );
+ await openMenu();
+
+ const rename = screen.getByTestId(`${MENU_TEST_ID}-item-rename`);
+ expect(rename).toHaveAttribute('data-disabled');
+ expect(
+ screen.getByTestId(`${MENU_TEST_ID}-item-delete-section`),
+ ).toHaveAttribute('data-disabled');
+
+ await userEvent.hover(rename);
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'This dashboard is locked',
+ );
+ });
+
+ it('names the missing permission when there is no other reason', async () => {
+ server.use(setupAuthzDeny(updatePermission));
+ const onRename = jest.fn();
+ render(
+ <SectionActionsMenu
+ sectionId={SECTION_ID}
+ disabledChecks={[updatePermission]}
+ onRename={onRename}
+ />,
+ );
+ await openMenu();
+
+ const rename = screen.getByTestId(`${MENU_TEST_ID}-item-rename`);
+ await waitFor(
+ () => {
+ expect(rename).toHaveAttribute('data-disabled');
+ },
+ { timeout: 3000 },
+ );
+
+ await userEvent.hover(rename);
+ await expect(screen.findByRole('tooltip')).resolves.toHaveTextContent(
+ 'is not authorized to perform update',
+ );
+ await userEvent.click(rename);
+ expect(onRename).not.toHaveBeenCalled();
+ });
+});
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.module.scss
index 5c6b5f66ac..6898e626c3 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.module.scss
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.module.scss
@@ -10,34 +10,17 @@
}
.dragHandle {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- padding: 0;
- background: transparent;
- border: none;
- color: var(--l2-foreground);
- cursor: grab;
+ --button-cursor: grab;
&:active {
- cursor: grabbing;
+ --button-cursor: grabbing;
}
}
.toggle {
flex: 1;
- display: flex;
- align-items: center;
- justify-content: flex-start;
- gap: 4px;
- padding: 0;
- background: transparent;
- border: none;
- // Muted chevron; the title below carries the prominent heading color.
- color: var(--l2-foreground);
- text-align: left;
- cursor: pointer;
min-width: 0;
+ --button-justify-content: flex-start;
}
.title {
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.tsx
index f7418958a1..7eded47804 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionHeader/SectionHeader.tsx
@@ -39,6 +39,36 @@ interface SectionHeaderProps {
disabledTooltip?: string;
}
+function SectionDragHandleButton({
+ dragHandle,
+ sectionId,
+}: {
+ dragHandle: SectionDragHandle;
+ sectionId: string;
+}): JSX.Element {
+ const { role: _role, ...sortableAttributes } = dragHandle.attributes;
+ return (
+ <span
+ ref={dragHandle.setActivatorNodeRef}
+ {...dragHandle.listeners}
+ className={styles.dragHandle}
+ >
+ <Button
+ type="button"
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ aria-label="Drag to reorder section"
+ testId={`dashboard-section-drag-${sectionId}`}
+ {...sortableAttributes}
+ >
+ <GripVertical size={14} />
+ </Button>
+ </span>
+ );
+}
+
function SectionHeader({
sectionId,
title,
@@ -53,37 +83,27 @@ function SectionHeader({
return (
<div className={cx(styles.header, { [styles.headerOpen]: open })}>
{dragHandle ? (
+ <SectionDragHandleButton dragHandle={dragHandle} sectionId={sectionId} />
+ ) : null}
+ <div className={styles.toggle}>
<Button
+ size="md"
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={styles.dragHandle}
- ref={dragHandle.setActivatorNodeRef}
- aria-label="Drag to reorder section"
- data-testid={`dashboard-section-drag-${sectionId}`}
- {...dragHandle.attributes}
- {...dragHandle.listeners}
+ width="100%"
+ onClick={onToggle}
+ testId={`dashboard-section-toggle-${sectionId}`}
+ prefix={open ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
>
- <GripVertical size={14} />
+ <Typography.Text className={styles.title}>{title}</Typography.Text>
+ {repeatVariable ? (
+ <Typography.Text className={styles.repeatBadge}>
+ (repeats per ${repeatVariable})
+ </Typography.Text>
+ ) : null}
</Button>
- ) : null}
- <Button
- type="button"
- variant="ghost"
- color="secondary"
- className={styles.toggle}
- onClick={onToggle}
- data-testid={`dashboard-section-toggle-${sectionId}`}
- >
- {open ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
- <Typography.Text className={styles.title}>{title}</Typography.Text>
- {repeatVariable ? (
- <Typography.Text className={styles.repeatBadge}>
- (repeats per ${repeatVariable})
- </Typography.Text>
- ) : null}
- </Button>
+ </div>
{actions ? (
<SectionActionsMenu
sectionId={sectionId}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionTitleModal.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionTitleModal.tsx
index 436ba03faa..a7bccae16b 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionTitleModal.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/PanelsAndSectionsLayout/Section/SectionTitleModal.tsx
@@ -72,10 +72,11 @@ function SectionTitleModal({
Cancel
</Button>
<Button
+ disabledTooltip="Enter a section name first"
variant="solid"
color="primary"
size="md"
- disabled={!canSave}
+ disabled={value.trim().length === 0}
loading={isSaving}
onClick={submit}
testId="section-title-submit"
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/VariablesBar.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/VariablesBar.tsx
index 10205368e6..b20e05e95d 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/VariablesBar.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/VariablesBar.tsx
@@ -1,6 +1,6 @@
import { ChevronLeft } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import cx from 'classnames';
import type { DashboardtypesGettableDashboardV2DTO } from 'api/generated/services/sigNoz.schemas';
import { useInlineOverflowCount } from 'hooks/useInlineOverflowCount';
@@ -9,7 +9,6 @@ import { selectVariablesExpanded } from '../store/slices/collapseSlice';
import { useDashboardStore } from '../store/useDashboardStore';
import AddVariableFull from './components/AddVariable/AddVariableFull';
import AddVariableIcon from './components/AddVariable/AddVariableIcon';
-import { TOOLTIP_SCROLL_CONTENT_CLASS } from 'components/TooltipScrollArea/TooltipScrollArea';
import HiddenVariablesTooltip from './components/HiddenVariablesTooltip/HiddenVariablesTooltip';
import { useVariableSelection } from './hooks/useVariableSelection';
@@ -114,9 +113,8 @@ function VariablesBar({ dashboard }: VariablesBarProps): JSX.Element | null {
{expanded ? (
moreButton
) : (
- <TooltipSimple
+ <Tooltip
side="top"
- tooltipContentProps={{ className: TOOLTIP_SCROLL_CONTENT_CLASS }}
title={
<HiddenVariablesTooltip
variables={hiddenVariables}
@@ -125,7 +123,7 @@ function VariablesBar({ dashboard }: VariablesBarProps): JSX.Element | null {
}
>
{moreButton}
- </TooltipSimple>
+ </Tooltip>
)}
</span>
)}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/__tests__/ValueSelector.test.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/__tests__/ValueSelector.test.tsx
index ef5f8bc8f3..435265d2ac 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/__tests__/ValueSelector.test.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/__tests__/ValueSelector.test.tsx
@@ -1,6 +1,5 @@
import { act, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import type { VariableSelection } from '../selectionTypes';
import ValueSelector from '../components/selectors/ValueSelector';
@@ -20,18 +19,16 @@ function renderSelector(
multiSelect = true,
): void {
render(
- <TooltipProvider>
- <ValueSelector
- options={options}
- variableType="dynamic"
- multiSelect={multiSelect}
- showAllOption
- selection={selection}
- onChange={jest.fn()}
- emptyFallback={{ value: [], allSelected: false }}
- testId="variable-select-env"
- />
- </TooltipProvider>,
+ <ValueSelector
+ options={options}
+ variableType="dynamic"
+ multiSelect={multiSelect}
+ showAllOption
+ selection={selection}
+ onChange={jest.fn()}
+ emptyFallback={{ value: [], allSelected: false }}
+ testId="variable-select-env"
+ />,
);
}
@@ -125,25 +122,23 @@ describe('ValueSelector', () => {
): jest.Mock {
const onSearch = jest.fn();
render(
- <TooltipProvider>
- <ValueSelector
- options={OPTIONS}
- variableType="dynamic"
- multiSelect
- showAllOption
- selection={{ value: [], allSelected: false }}
- onChange={jest.fn()}
- emptyFallback={{ value: [], allSelected: false }}
- testId="variable-select-env"
- dynamic={{
- values: OPTIONS,
- relatedValues,
- complete,
- onSearch,
- onSearchReset: jest.fn(),
- }}
- />
- </TooltipProvider>,
+ <ValueSelector
+ options={OPTIONS}
+ variableType="dynamic"
+ multiSelect
+ showAllOption
+ selection={{ value: [], allSelected: false }}
+ onChange={jest.fn()}
+ emptyFallback={{ value: [], allSelected: false }}
+ testId="variable-select-env"
+ dynamic={{
+ values: OPTIONS,
+ relatedValues,
+ complete,
+ onSearch,
+ onSearchReset: jest.fn(),
+ }}
+ />,
);
return onSearch;
}
@@ -165,25 +160,23 @@ describe('ValueSelector', () => {
// The shared single select spreads unknown props over its own handlers, so
// passing it an `onDropdownVisibleChange` silently kills its open state.
render(
- <TooltipProvider>
- <ValueSelector
- options={OPTIONS}
- variableType="dynamic"
- multiSelect={false}
- showAllOption={false}
- selection={{ value: '', allSelected: false }}
- onChange={jest.fn()}
- emptyFallback={{ value: '', allSelected: false }}
- testId="variable-select-env"
- dynamic={{
- values: OPTIONS,
- relatedValues: [],
- complete: false,
- onSearch: jest.fn(),
- onSearchReset: jest.fn(),
- }}
- />
- </TooltipProvider>,
+ <ValueSelector
+ options={OPTIONS}
+ variableType="dynamic"
+ multiSelect={false}
+ showAllOption={false}
+ selection={{ value: '', allSelected: false }}
+ onChange={jest.fn()}
+ emptyFallback={{ value: '', allSelected: false }}
+ testId="variable-select-env"
+ dynamic={{
+ values: OPTIONS,
+ relatedValues: [],
+ complete: false,
+ onSearch: jest.fn(),
+ onSearchReset: jest.fn(),
+ }}
+ />,
);
await openDropdown();
@@ -235,18 +228,16 @@ describe('ValueSelector', () => {
const onChange = jest.fn();
const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
render(
- <TooltipProvider>
- <ValueSelector
- options={OPTIONS}
- variableType="query"
- multiSelect
- showAllOption
- selection={{ value: VALUES, allSelected: false }}
- onChange={onChange}
- emptyFallback={{ value: [OPTIONS[0]], allSelected: false }}
- testId="variable-select-env"
- />
- </TooltipProvider>,
+ <ValueSelector
+ options={OPTIONS}
+ variableType="query"
+ multiSelect
+ showAllOption
+ selection={{ value: VALUES, allSelected: false }}
+ onChange={onChange}
+ emptyFallback={{ value: [OPTIONS[0]], allSelected: false }}
+ testId="variable-select-env"
+ />,
);
await openDropdown();
@@ -274,18 +265,16 @@ describe('ValueSelector', () => {
): jest.Mock {
const onChange = jest.fn();
render(
- <TooltipProvider>
- <ValueSelector
- options={options}
- variableType="dynamic"
- multiSelect
- showAllOption
- selection={selection}
- onChange={onChange}
- emptyFallback={{ value: [], allSelected: false }}
- testId="variable-select-env"
- />
- </TooltipProvider>,
+ <ValueSelector
+ options={options}
+ variableType="dynamic"
+ multiSelect
+ showAllOption
+ selection={selection}
+ onChange={onChange}
+ emptyFallback={{ value: [], allSelected: false }}
+ testId="variable-select-env"
+ />,
);
return onChange;
}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariable.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariable.module.scss
deleted file mode 100644
index 35917e0790..0000000000
--- a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariable.module.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.addVariableNameWithIcon {
- flex: none;
- border-style: dashed !important;
- border-color: var(--l3-border) !important;
- margin-top: 12px;
- margin-bottom: 2px;
-}
-
-.addVariableIcon {
- flex: none;
- border-style: dashed !important;
- border-color: var(--l3-border) !important;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableFull.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableFull.tsx
index 2354f498d3..38da557e53 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableFull.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableFull.tsx
@@ -2,7 +2,6 @@ import { Plus } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { useDashboardStore } from '../../../store/useDashboardStore';
-import styles from './AddVariable.module.scss';
/**
* Full-width labelled "Add variable" button shown in the empty state, before any
@@ -16,7 +15,6 @@ function AddVariableFull(): JSX.Element {
variant="outlined"
color="secondary"
size="md"
- className={styles.addVariableNameWithIcon}
prefix={<Plus size={14} />}
testId="dashboard-variables-add"
onClick={(): void =>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableIcon.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableIcon.tsx
index 96f845889e..a2714e986a 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableIcon.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/VariablesBar/components/AddVariable/AddVariableIcon.tsx
@@ -1,11 +1,10 @@
import { Plus } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
import { useDashboardStore } from '../../../store/useDashboardStore';
-import styles from './AddVariable.module.scss';
interface AddVariableIconProps {
/** Permissions the control needs; reported in the standard wording when denied. */
@@ -35,19 +34,19 @@ function AddVariableIcon({
// explained by the authz button itself.
if (isEditable) {
return (
- <TooltipSimple side="top" title="Add variable">
+ <Tooltip side="top" title="Add variable">
<Button
variant="outlined"
color="secondary"
- size="icon"
- className={styles.addVariableIcon}
+ size="md"
+ icon
aria-label="Add variable"
testId="dashboard-variables-add"
onClick={onClick}
>
<Plus size={14} />
</Button>
- </TooltipSimple>
+ </Tooltip>
);
}
@@ -57,8 +56,8 @@ function AddVariableIcon({
disabledTooltip={disabledTooltip}
variant="outlined"
color="secondary"
- size="icon"
- className={styles.addVariableIcon}
+ size="sm"
+ icon
aria-label="Add variable"
testId="dashboard-variables-add"
onClick={onClick}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/components/ConfirmDeleteDialog/ConfirmDeleteDialog.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/components/ConfirmDeleteDialog/ConfirmDeleteDialog.tsx
index 1ec1b84bb2..14dba8cc59 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/components/ConfirmDeleteDialog/ConfirmDeleteDialog.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/components/ConfirmDeleteDialog/ConfirmDeleteDialog.tsx
@@ -31,18 +31,24 @@ function ConfirmDeleteDialog({
}: ConfirmDeleteDialogProps): JSX.Element {
const footer = (
<div className={styles.footer}>
- <Button variant="solid" color="secondary" onClick={onClose}>
- <X size={12} />
+ <Button
+ size="md"
+ variant="solid"
+ color="secondary"
+ onClick={onClose}
+ prefix={<X size={12} />}
+ >
Cancel
</Button>
<Button
+ size="md"
variant="solid"
- color="destructive"
+ color="danger"
loading={isLoading}
onClick={onConfirm}
testId="confirm-delete"
+ prefix={<Trash2 size={12} />}
>
- <Trash2 size={12} />
{confirmLabel}
</Button>
</div>
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/components/DashboardChangedDialog/DashboardChangedDialog.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/components/DashboardChangedDialog/DashboardChangedDialog.tsx
index 2bc3265c91..0c4972ba42 100644
--- a/frontend/src/pages/DashboardPage/DashboardContainer/components/DashboardChangedDialog/DashboardChangedDialog.tsx
+++ b/frontend/src/pages/DashboardPage/DashboardContainer/components/DashboardChangedDialog/DashboardChangedDialog.tsx
@@ -39,6 +39,7 @@ function DashboardChangedDialog({
const footer = (
<div className={styles.footer}>
<Button
+ size="md"
variant="solid"
color="secondary"
onClick={handleDismiss}
@@ -47,6 +48,7 @@ function DashboardChangedDialog({
Dismiss
</Button>
<Button
+ size="md"
variant="solid"
color="primary"
prefix={<RotateCcw size={12} />}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/components/MenuActionItem/MenuActionItem.module.scss b/frontend/src/pages/DashboardPage/DashboardContainer/components/MenuActionItem/MenuActionItem.module.scss
deleted file mode 100644
index 7f3bf049ab..0000000000
--- a/frontend/src/pages/DashboardPage/DashboardContainer/components/MenuActionItem/MenuActionItem.module.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.menuActionItem {
- /* The item owns the row's height, font, gap, hover and dimming, so anything
- the button would size, paint or dim for itself is handed back. Without this
- the two compound: a highlight inset in the row, 0.6 opacity on top of 0.5.
- Colour stays the button's, from `color`, as on the list rows. */
- --button-padding: var(--spacing-5, 10px) var(--spacing-6, 12px);
- --button-height: auto;
- --button-font-size: inherit;
- --button-line-height: inherit;
- --button-gap: var(--spacing-4, 8px);
- --button-variant-ghost-background-color: transparent;
- --button-variant-ghost-hover-background-color: transparent;
- --button-internal-hover-state-background-color: transparent;
- --button-disabled-opacity: 1;
-
- /* Padding is the exception: it belongs to the button, which is what the
- tooltip anchors to. Left on the item, the anchor is inset from the menu's
- edge and the tooltip opens under the panel. */
- width: 100%;
- justify-content: flex-start;
-}
-
-/* The other half: the menu hands its padding to the rows, so a row's box reaches
- the panel edge, as the list popover's rows do. */
-.menuContent {
- --dropdown-menu-content-padding: 0;
- --dropdown-menu-item-padding: 0;
-}
diff --git a/frontend/src/pages/DashboardPage/DashboardContainer/components/MenuActionItem/MenuActionItem.tsx b/frontend/src/pages/DashboardPage/DashboardContainer/components/MenuActionItem/MenuActionItem.tsx
deleted file mode 100644
index f90cfa5578..0000000000
--- a/frontend/src/pages/DashboardPage/DashboardContainer/components/MenuActionItem/MenuActionItem.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { ReactElement, ReactNode } from 'react';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
-import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
-
-import styles from './MenuActionItem.module.scss';
-
-interface MenuActionItemProps {
- label: ReactNode;
- icon: ReactElement;
- /** Permissions the row needs. Empty for a row that needs none. */
- checks: BrandedPermission[];
- /** A non-permission block, which outranks the checks (see AuthZTooltip). */
- disabledTooltip?: string;
- destructive?: boolean;
-}
-
-/**
- * A row in a dashboard dropdown. The button fills the row, so the tooltip
- * anchors to the whole row and lands clear of the menu.
- *
- * Takes no `onClick` or `disabled`: the item keeps both, because Radix reads
- * `disabled` off it for keyboard navigation and only marks a row `clickable` —
- * the pointer cursor — when the item carries the handler.
- */
-function MenuActionItem({
- label,
- icon,
- checks,
- disabledTooltip,
- destructive = false,
-}: MenuActionItemProps): JSX.Element {
- return (
- <AuthZButton
- checks={checks}
- disabledTooltip={disabledTooltip}
- side="left"
- variant="ghost"
- color={destructive ? 'destructive' : 'secondary'}
- className={styles.menuActionItem}
- prefix={icon}
- >
- {label}
- </AuthZButton>
- );
-}
-
-export default MenuActionItem;
diff --git a/frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.mocks.tsx b/frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.mocks.tsx
index 23d644859c..0377a7de9a 100644
--- a/frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.mocks.tsx
+++ b/frontend/src/pages/DashboardPage/PanelEditorPage/stories/PanelEditorPage.stories.mocks.tsx
@@ -220,7 +220,13 @@ export const savePanel = async (): Promise<void> => {
{ timeout: 10000 },
);
- await waitFor(() => expect(save).toBeEnabled(), { timeout: 10000 });
+ await waitFor(
+ () => {
+ expect(save).toBeEnabled();
+ expect(save).not.toHaveAttribute('aria-disabled', 'true');
+ },
+ { timeout: 10000 },
+ );
await userEvent.click(save);
};
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsMenuItem.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsMenuItem.tsx
deleted file mode 100644
index 9aa3123af9..0000000000
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsMenuItem.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { MouseEvent, ReactElement, ReactNode } from 'react';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
-import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
-
-import styles from './ActionsPopover.module.scss';
-
-interface Props {
- label: ReactNode;
- icon: ReactElement;
- testId: string;
- onClick: (event: MouseEvent<HTMLButtonElement>) => void;
- /** Permissions the row needs; the component words a refusal. */
- checks: BrandedPermission[];
- /** A non-permission block, which outranks the checks (see AuthZTooltip). */
- disabledTooltip?: string;
- loading?: boolean;
- destructive?: boolean;
-}
-
-/**
- * A row in the actions menu. The button fills the row, so the tooltip anchors to
- * it and lands clear of the menu rather than over the row's icon.
- */
-function ActionsMenuItem({
- label,
- icon,
- testId,
- onClick,
- checks,
- disabledTooltip,
- loading = false,
- destructive = false,
-}: Props): JSX.Element {
- return (
- <AuthZButton
- checks={checks}
- disabledTooltip={disabledTooltip}
- side="left"
- variant="ghost"
- color={destructive ? 'destructive' : 'secondary'}
- className={styles.menuItem}
- prefix={icon}
- disabled={loading}
- loading={loading}
- onClick={(e: MouseEvent<HTMLButtonElement>): void => {
- e.preventDefault();
- e.stopPropagation();
- onClick(e);
- }}
- testId={testId}
- >
- {label}
- </AuthZButton>
- );
-}
-
-export default ActionsMenuItem;
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.authz.test.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.authz.test.tsx
index 35b5d4da24..dcc9aea74b 100644
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.authz.test.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.authz.test.tsx
@@ -12,6 +12,7 @@ import {
buildDashboardUpdatePermission,
DashboardCreatePermission,
} from 'lib/authz/hooks/useAuthZ/permissions/dashboard.permissions';
+import { formatPermission } from 'lib/authz/hooks/useAuthZ/utils';
import ActionsPopover from './ActionsPopover';
import { DashboardtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
@@ -32,11 +33,20 @@ const baseProps = {
async function openMenu(): Promise<void> {
await userEvent.click(screen.getByTestId('dashboard-action-icon'));
await screen.findByTestId('dashboard-action-rename');
+ // Rows waiting on their check show as loading, not disabled.
+ await waitFor(() => {
+ expect(document.querySelector('[data-loading]')).toBeNull();
+ });
+}
+
+function isRowDisabled(testId: string): boolean {
+ return screen.getByTestId(testId).hasAttribute('data-disabled');
}
-// The authz component puts the denied scopes on the control it disables.
-function deniedScopes(testId: string): string | null {
- return screen.getByTestId(testId).getAttribute('data-denied-permissions');
+async function rowTooltip(testId: string): Promise<string> {
+ await userEvent.hover(screen.getByTestId(testId));
+ const tooltip = await screen.findByRole('tooltip');
+ return tooltip.textContent ?? '';
}
describe('ActionsPopover - AuthZ', () => {
@@ -74,16 +84,16 @@ describe('ActionsPopover - AuthZ', () => {
await openMenu();
await waitFor(() => {
- expect(deniedScopes('dashboard-action-rename')).toContain(
- buildDashboardUpdatePermission(DASHBOARD_ID),
- );
+ expect(isRowDisabled('dashboard-action-rename')).toBe(true);
});
- expect(screen.getByTestId('dashboard-action-rename')).toBeDisabled();
- expect(screen.getByTestId('dashboard-action-edit-tags')).toBeDisabled();
+ expect(isRowDisabled('dashboard-action-edit-tags')).toBe(true);
+ await expect(rowTooltip('dashboard-action-rename')).resolves.toContain(
+ formatPermission(buildDashboardUpdatePermission(DASHBOARD_ID)),
+ );
// Read-only actions and delete are unaffected.
- expect(screen.getByTestId('dashboard-action-view')).toBeEnabled();
- expect(screen.getByTestId('dashboard-action-delete')).toBeEnabled();
+ expect(isRowDisabled('dashboard-action-view')).toBe(false);
+ expect(isRowDisabled('dashboard-action-delete')).toBe(false);
});
// Authz guide rule 3: delete does not depend on read.
@@ -94,10 +104,10 @@ describe('ActionsPopover - AuthZ', () => {
await openMenu();
await waitFor(() => {
- expect(screen.getByTestId('dashboard-action-delete')).toBeEnabled();
+ expect(isRowDisabled('dashboard-action-rename')).toBe(true);
});
- expect(screen.getByTestId('dashboard-action-rename')).toBeDisabled();
- expect(screen.getByTestId('dashboard-action-duplicate')).toBeDisabled();
+ expect(isRowDisabled('dashboard-action-duplicate')).toBe(true);
+ expect(isRowDisabled('dashboard-action-delete')).toBe(false);
});
it('disables delete and explains why when delete is denied', async () => {
@@ -107,12 +117,12 @@ describe('ActionsPopover - AuthZ', () => {
await openMenu();
await waitFor(() => {
- expect(deniedScopes('dashboard-action-delete')).toBe(
- buildDashboardDeletePermission(DASHBOARD_ID),
- );
+ expect(isRowDisabled('dashboard-action-delete')).toBe(true);
});
- expect(screen.getByTestId('dashboard-action-delete')).toBeDisabled();
- expect(screen.getByTestId('dashboard-action-rename')).toBeEnabled();
+ expect(isRowDisabled('dashboard-action-rename')).toBe(false);
+ await expect(rowTooltip('dashboard-action-delete')).resolves.toContain(
+ formatPermission(buildDashboardDeletePermission(DASHBOARD_ID)),
+ );
});
it('disables duplicate without create, leaving rename usable', async () => {
@@ -122,14 +132,12 @@ describe('ActionsPopover - AuthZ', () => {
await openMenu();
await waitFor(() => {
- expect(screen.getByTestId('dashboard-action-rename')).toBeEnabled();
+ expect(isRowDisabled('dashboard-action-duplicate')).toBe(true);
});
- expect(screen.getByTestId('dashboard-action-duplicate')).toBeDisabled();
+ expect(isRowDisabled('dashboard-action-rename')).toBe(false);
});
});
- describe('lock', () => {});
-
describe('locked dashboard', () => {
// Access before state: without the permission, the lock is the wrong thing
// to point at.
@@ -140,11 +148,13 @@ describe('ActionsPopover - AuthZ', () => {
await openMenu();
await waitFor(() => {
- expect(deniedScopes('dashboard-action-rename')).toContain(
- buildDashboardUpdatePermission(DASHBOARD_ID),
- );
+ expect(isRowDisabled('dashboard-action-rename')).toBe(true);
});
- expect(screen.getByTestId('dashboard-action-rename')).toBeDisabled();
+ const tooltip = await rowTooltip('dashboard-action-rename');
+ expect(tooltip).toContain(
+ formatPermission(buildDashboardUpdatePermission(DASHBOARD_ID)),
+ );
+ expect(tooltip).not.toContain('dashboard_locked');
});
it('reports the lock, not the permission, for an editor', async () => {
@@ -155,10 +165,12 @@ describe('ActionsPopover - AuthZ', () => {
// Duplicate is not lock-gated, so it resolving marks the checks as settled.
await waitFor(() => {
- expect(screen.getByTestId('dashboard-action-duplicate')).toBeEnabled();
+ expect(isRowDisabled('dashboard-action-rename')).toBe(true);
});
- expect(screen.getByTestId('dashboard-action-rename')).toBeDisabled();
- expect(deniedScopes('dashboard-action-rename')).toBeNull();
+ // Jest renders i18n keys.
+ await expect(rowTooltip('dashboard-action-rename')).resolves.toBe(
+ 'dashboard_locked',
+ );
});
});
@@ -169,12 +181,10 @@ describe('ActionsPopover - AuthZ', () => {
render(<ActionsPopover {...baseProps} />);
await openMenu();
- await waitFor(() => {
- expect(screen.getByTestId('dashboard-action-rename')).toBeEnabled();
- });
- expect(screen.getByTestId('dashboard-action-edit-tags')).toBeEnabled();
- expect(screen.getByTestId('dashboard-action-duplicate')).toBeEnabled();
- expect(screen.getByTestId('dashboard-action-delete')).toBeEnabled();
+ expect(isRowDisabled('dashboard-action-rename')).toBe(false);
+ expect(isRowDisabled('dashboard-action-edit-tags')).toBe(false);
+ expect(isRowDisabled('dashboard-action-duplicate')).toBe(false);
+ expect(isRowDisabled('dashboard-action-delete')).toBe(false);
});
});
});
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.module.scss b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.module.scss
index 4ecc378e50..584dfe711e 100644
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.module.scss
@@ -1,53 +1,9 @@
-.content {
- display: flex;
- flex-direction: column;
-}
-
-// Make signoz ghost-Button rows fill the popover and left-align their label.
-.menuItem {
- width: 100%;
- justify-content: flex-start;
-}
-
-:global(.dashboardActionsPopover) {
- :global(.ant-popover-inner) {
- width: 200px;
- height: auto;
- flex-shrink: 0;
- border-radius: 4px;
- border: 1px solid var(--l1-border);
- background: linear-gradient(
- 139deg,
- color-mix(in srgb, var(--card) 80%, transparent) 0%,
- color-mix(in srgb, var(--card) 90%, transparent) 98.68%
- );
- box-shadow: 4px 10px 16px 2px rgba(0, 0, 0, 0.2);
- backdrop-filter: blur(20px);
- padding: 0px;
- }
-}
-
.renameFooter {
display: flex;
justify-content: flex-end;
gap: 8px;
}
-/* Wrap so the tooltip has a hoverable target even when the button is disabled. */
-.menuItemWrap {
- display: block;
- width: 100%;
-}
-
-.menuItemWrap button:disabled {
- pointer-events: none;
-}
-
-/* With the button's pointer events off, the wrapper paints the cursor. */
-.menuItemWrap:has(button:disabled) {
- cursor: not-allowed;
-}
-
.deleteName {
color: var(--danger-background);
font-weight: var(--font-weight-medium);
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.tsx
index cba8c7c067..417fc0ef04 100644
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopover.tsx
@@ -1,11 +1,11 @@
-import { useState } from 'react';
-import { Popover } from 'antd';
+import { useCallback, useState } from 'react';
import { Button } from '@signozhq/ui/button';
import { EllipsisVertical } from '@signozhq/icons';
+import AuthZDropdown from 'lib/authz/components/AuthZDropdown/AuthZDropdown';
-import ActionsPopoverContent from './ActionsPopoverContent';
import EditTagsModal from './EditTagsModal';
import RenameDashboardModal from './RenameDashboardModal';
+import { useDashboardActionItems } from './useDashboardActionItems';
import { DashboardtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
interface Props {
@@ -16,7 +16,7 @@ interface Props {
isLocked: boolean;
// Current tags as `key:value` strings, for the inline tag editor.
tags: string[];
- onView: (event: React.MouseEvent<HTMLElement>) => void;
+ onView: (event: React.MouseEvent) => void;
// A legacy (pre-v2) dashboard has no v2 spec, so the actions that operate on
// one (view, open, copy link, rename, edit tags, duplicate, lock) don't apply —
// only Delete is kept.
@@ -33,56 +33,55 @@ function ActionsPopover({
onView,
isLegacy = false,
}: Props): JSX.Element {
- const [isOpen, setIsOpen] = useState(false);
+ const [hasOpened, setHasOpened] = useState(false);
const [isRenameOpen, setIsRenameOpen] = useState(false);
const [isEditTagsOpen, setIsEditTagsOpen] = useState(false);
+ const handleOpenChange = useCallback((open: boolean): void => {
+ if (open) {
+ setHasOpened(true);
+ }
+ }, []);
+ const openRename = useCallback((): void => setIsRenameOpen(true), []);
+ const openEditTags = useCallback((): void => setIsEditTagsOpen(true), []);
+
+ const { items, contextHolder } = useDashboardActionItems({
+ link,
+ dashboardId,
+ dashboardName,
+ source,
+ isLocked,
+ tags,
+ isLegacy,
+ enabled: hasOpened,
+ onView,
+ onOpenRename: openRename,
+ onOpenEditTags: openEditTags,
+ });
+
return (
<>
- <Popover
- open={isOpen}
- onOpenChange={setIsOpen}
- // A render function, so only the open row pays for the menu's mutations
- // and checks; destroyTooltipOnHide releases them on close.
- content={(): JSX.Element => (
- <ActionsPopoverContent
- link={link}
- dashboardId={dashboardId}
- dashboardName={dashboardName}
- source={source}
- isLocked={isLocked}
- tags={tags}
- isLegacy={isLegacy}
- onView={onView}
- onOpenRename={(): void => {
- setIsOpen(false);
- setIsRenameOpen(true);
- }}
- onOpenEditTags={(): void => {
- setIsOpen(false);
- setIsEditTagsOpen(true);
- }}
- />
- )}
- destroyTooltipOnHide
- placement="bottomRight"
- arrow={false}
- rootClassName="dashboardActionsPopover"
- trigger="click"
+ <AuthZDropdown
+ items={items}
+ nativeButton
+ side="bottom"
+ align="end"
+ aria-label="Dashboard actions"
+ testId="dashboard-action-icon"
+ onOpenChange={handleOpenChange}
>
<Button
- size="icon"
+ aria-label="Action"
+ size="sm"
+ icon
variant="ghost"
color="secondary"
- testId="dashboard-action-icon"
- onClick={(e): void => {
- e.stopPropagation();
- e.preventDefault();
- }}
+ // The row navigates on click.
+ onClick={(e): void => e.stopPropagation()}
>
<EllipsisVertical size={14} />
</Button>
- </Popover>
+ </AuthZDropdown>
<RenameDashboardModal
open={isRenameOpen}
dashboardId={dashboardId}
@@ -95,6 +94,7 @@ function ActionsPopover({
currentTags={tags}
onClose={(): void => setIsEditTagsOpen(false)}
/>
+ {contextHolder}
</>
);
}
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopoverContent.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopoverContent.tsx
deleted file mode 100644
index 51a63f60cf..0000000000
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/ActionsPopoverContent.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import { useMemo } from 'react';
-import {
- Copy,
- Expand,
- Link2,
- LockKeyhole,
- PenLine,
- SquareArrowOutUpRight,
- Tag,
-} from '@signozhq/icons';
-import { useCopyToClipboard } from 'react-use';
-import logEvent from 'api/common/logEvent';
-import { useDashboardLockPermission } from 'hooks/dashboards/useDashboardLockPermission';
-import { useDashboardPermissions } from 'hooks/dashboards/useDashboardPermissions';
-import { DashboardCreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/dashboard.permissions';
-import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
-import { DashboardListEvents } from 'pages/DashboardsListPage/constants/events';
-import { getAbsoluteUrl } from 'utils/basePath';
-import { openInNewTab } from 'utils/navigation';
-
-import ActionsMenuItem from './ActionsMenuItem';
-import DeleteActionItem from './DeleteActionItem';
-import { useCloneDashboardAction } from './useCloneDashboardAction';
-import { useLockToggleAction } from './useLockToggleAction';
-import styles from './ActionsPopover.module.scss';
-import { useTranslation } from 'react-i18next';
-import { DashboardtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
-
-interface Props {
- link: string;
- dashboardId: string;
- dashboardName: string;
- source: DashboardtypesSourceDTO;
- isLocked: boolean;
- tags: string[];
- isLegacy: boolean;
- onView: (event: React.MouseEvent<HTMLElement>) => void;
- onOpenRename: () => void;
- onOpenEditTags: () => void;
-}
-
-// Mounted only while the popover is open, so a page of rows doesn't pay for 20
-// copies of the menu, its mutations or its permission checks.
-// These rows need no permission; the component still owns the styling.
-const NO_CHECKS: BrandedPermission[] = [];
-
-function ActionsPopoverContent({
- link,
- dashboardId,
- dashboardName,
- source,
- isLocked,
- tags,
- isLegacy,
- onView,
- onOpenRename,
- onOpenEditTags,
-}: Props): JSX.Element {
- const { t } = useTranslation('dashboard');
- const [, setCopy] = useCopyToClipboard();
-
- const { canEdit, editChecks, readPermission } =
- useDashboardPermissions(dashboardId);
- // A non-empty reason already means "cannot toggle".
- const { disabledTooltip: lockDisabledTooltip } = useDashboardLockPermission({
- dashboardId,
- source,
- });
-
- const { clone, isCloning } = useCloneDashboardAction({
- dashboardId,
- dashboardName,
- });
- const { toggleLock, isTogglingLock } = useLockToggleAction({
- dashboardId,
- isLocked,
- });
-
- // The lock only: a missing `update` outranks it and is reported by the component.
- const editLockTooltip = canEdit && isLocked ? t('dashboard_locked') : '';
- // Cloning reads this dashboard and creates another, so both are named.
- const cloneChecks = useMemo(
- () => [readPermission, DashboardCreatePermission],
- [readPermission],
- );
-
- return (
- // Stop clicks inside the menu (incl. disabled items) from bubbling to the
- // row's onClick, which would navigate to the dashboard.
- // eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events -- wrapper only guards propagation, not an interactive control
- <div className={styles.content} onClick={(e): void => e.stopPropagation()}>
- {!isLegacy && (
- <>
- <ActionsMenuItem
- label="View"
- icon={<Expand size={14} />}
- testId="dashboard-action-view"
- checks={NO_CHECKS}
- onClick={onView}
- />
- <ActionsMenuItem
- label="Open in New Tab"
- icon={<SquareArrowOutUpRight size={14} />}
- testId="dashboard-action-open-new-tab"
- checks={NO_CHECKS}
- onClick={(): void => {
- openInNewTab(link);
- void logEvent(DashboardListEvents.RowAction, {
- action: 'openNewTab',
- dashboardId,
- });
- }}
- />
- <ActionsMenuItem
- label="Copy Link"
- icon={<Link2 size={14} />}
- testId="dashboard-action-copy-link"
- checks={NO_CHECKS}
- onClick={(): void => {
- setCopy(getAbsoluteUrl(link));
- void logEvent(DashboardListEvents.RowAction, {
- action: 'copyLink',
- dashboardId,
- });
- }}
- />
- <ActionsMenuItem
- label="Rename"
- icon={<PenLine size={14} />}
- testId="dashboard-action-rename"
- checks={editChecks}
- disabledTooltip={editLockTooltip}
- onClick={onOpenRename}
- />
- <ActionsMenuItem
- label={tags.length > 0 ? 'Edit Tags' : 'Add Tags'}
- icon={<Tag size={14} />}
- testId="dashboard-action-edit-tags"
- checks={editChecks}
- disabledTooltip={editLockTooltip}
- onClick={onOpenEditTags}
- />
- <ActionsMenuItem
- label="Duplicate"
- icon={<Copy size={14} />}
- testId="dashboard-action-duplicate"
- checks={cloneChecks}
- loading={isCloning}
- onClick={clone}
- />
- <ActionsMenuItem
- label={isLocked ? 'Unlock Dashboard' : 'Lock Dashboard'}
- icon={<LockKeyhole size={14} />}
- testId="dashboard-action-lock"
- checks={editChecks}
- disabledTooltip={lockDisabledTooltip}
- loading={isTogglingLock}
- onClick={toggleLock}
- />
- </>
- )}
- <DeleteActionItem
- dashboardId={dashboardId}
- dashboardName={dashboardName}
- isLocked={isLocked}
- showDivider={!isLegacy}
- />
- </div>
- );
-}
-
-export default ActionsPopoverContent;
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/EditTagsModal.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/EditTagsModal.tsx
index d0d35f1223..0aeb23c34d 100644
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/EditTagsModal.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/EditTagsModal.tsx
@@ -121,7 +121,6 @@ function EditTagsModal({
color="primary"
size="md"
loading={isLoading}
- disabled={isLoading}
onClick={(): void => runSave()}
testId="edit-tags-submit"
>
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/RenameDashboardModal.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/RenameDashboardModal.tsx
index ddce17724b..9cdd756dcd 100644
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/RenameDashboardModal.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/RenameDashboardModal.tsx
@@ -93,10 +93,15 @@ function RenameDashboardModal({
Cancel
</Button>
<Button
+ disabledTooltip={
+ trimmed.length === 0
+ ? 'Enter a dashboard name first'
+ : 'Change the name first'
+ }
variant="solid"
color="primary"
size="md"
- disabled={!canSave}
+ disabled={trimmed.length === 0 || trimmed === currentName}
loading={isLoading}
onClick={(): void => runRename()}
testId="rename-dashboard-submit"
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/useDashboardActionItems.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/useDashboardActionItems.tsx
new file mode 100644
index 0000000000..53e46d42a3
--- /dev/null
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/useDashboardActionItems.tsx
@@ -0,0 +1,218 @@
+import { ReactNode, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+ Copy,
+ Expand,
+ Link2,
+ LockKeyhole,
+ PenLine,
+ SquareArrowOutUpRight,
+ Tag,
+ Trash2,
+} from '@signozhq/icons';
+import { useCopyToClipboard } from 'react-use';
+import logEvent from 'api/common/logEvent';
+import { DashboardtypesSourceDTO } from 'api/generated/services/sigNoz.schemas';
+import { useDashboardLockPermission } from 'hooks/dashboards/useDashboardLockPermission';
+import { useDashboardPermissions } from 'hooks/dashboards/useDashboardPermissions';
+import type { AuthZDropdownItemType } from 'lib/authz/components/AuthZDropdown/types';
+import { blockedBy } from 'lib/authz/components/AuthZDropdown/utils';
+import { DashboardCreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/dashboard.permissions';
+import { DashboardListEvents } from 'pages/DashboardsListPage/constants/events';
+import { getAbsoluteUrl } from 'utils/basePath';
+import { openInNewTab } from 'utils/navigation';
+
+import { useCloneDashboardAction } from './useCloneDashboardAction';
+import { useDeleteDashboardAction } from './useDeleteDashboardAction';
+import { useLockToggleAction } from './useLockToggleAction';
+
+interface Params {
+ link: string;
+ dashboardId: string;
+ dashboardName: string;
+ source: DashboardtypesSourceDTO;
+ isLocked: boolean;
+ tags: string[];
+ isLegacy: boolean;
+ /** False until the menu first opens, so closed rows fire no checks. */
+ enabled: boolean;
+ onView: (event: React.MouseEvent) => void;
+ onOpenRename: () => void;
+ onOpenEditTags: () => void;
+}
+
+export function useDashboardActionItems({
+ link,
+ dashboardId,
+ dashboardName,
+ source,
+ isLocked,
+ tags,
+ isLegacy,
+ enabled,
+ onView,
+ onOpenRename,
+ onOpenEditTags,
+}: Params): { items: AuthZDropdownItemType[]; contextHolder: ReactNode } {
+ const { t } = useTranslation('dashboard');
+ const [, setCopy] = useCopyToClipboard();
+
+ const { canEdit, editChecks, readPermission } = useDashboardPermissions(
+ dashboardId,
+ { enabled },
+ );
+ // A non-empty reason already means "cannot toggle".
+ const { disabledTooltip: lockDisabledTooltip } = useDashboardLockPermission({
+ dashboardId,
+ source,
+ enabled,
+ });
+
+ const { clone, isCloning } = useCloneDashboardAction({
+ dashboardId,
+ dashboardName,
+ });
+ const { toggleLock, isTogglingLock } = useLockToggleAction({
+ dashboardId,
+ isLocked,
+ });
+ const {
+ openConfirm: openDeleteConfirm,
+ deleteChecks,
+ lockTooltip: deleteLockTooltip,
+ contextHolder,
+ } = useDeleteDashboardAction({
+ dashboardId,
+ dashboardName,
+ isLocked,
+ enabled,
+ });
+
+ // The lock only: a missing `update` outranks it and is reported by the checks.
+ const editLockTooltip = canEdit && isLocked ? t('dashboard_locked') : '';
+
+ const items = useMemo((): AuthZDropdownItemType[] => {
+ const deleteItem: AuthZDropdownItemType = {
+ type: 'item',
+ value: 'delete',
+ label: 'Delete Dashboard',
+ prefix: <Trash2 size={14} />,
+ testId: 'dashboard-action-delete',
+ danger: true,
+ checks: deleteChecks,
+ ...blockedBy(deleteLockTooltip),
+ onClick: openDeleteConfirm,
+ };
+
+ // A legacy (pre-v2) dashboard has no v2 spec, so only Delete applies.
+ if (isLegacy) {
+ return [deleteItem];
+ }
+
+ const logRowAction = (action: string): void => {
+ void logEvent(DashboardListEvents.RowAction, { action, dashboardId });
+ };
+
+ return [
+ {
+ type: 'item',
+ value: 'view',
+ label: 'View',
+ prefix: <Expand size={14} />,
+ testId: 'dashboard-action-view',
+ onClick: onView,
+ },
+ {
+ type: 'item',
+ value: 'open-new-tab',
+ label: 'Open in New Tab',
+ prefix: <SquareArrowOutUpRight size={14} />,
+ testId: 'dashboard-action-open-new-tab',
+ onClick: (): void => {
+ openInNewTab(link);
+ logRowAction('openNewTab');
+ },
+ },
+ {
+ type: 'item',
+ value: 'copy-link',
+ label: 'Copy Link',
+ prefix: <Link2 size={14} />,
+ testId: 'dashboard-action-copy-link',
+ onClick: (): void => {
+ setCopy(getAbsoluteUrl(link));
+ logRowAction('copyLink');
+ },
+ },
+ {
+ type: 'item',
+ value: 'rename',
+ label: 'Rename',
+ prefix: <PenLine size={14} />,
+ testId: 'dashboard-action-rename',
+ checks: editChecks,
+ ...blockedBy(editLockTooltip),
+ onClick: onOpenRename,
+ },
+ {
+ type: 'item',
+ value: 'edit-tags',
+ label: tags.length > 0 ? 'Edit Tags' : 'Add Tags',
+ prefix: <Tag size={14} />,
+ testId: 'dashboard-action-edit-tags',
+ checks: editChecks,
+ ...blockedBy(editLockTooltip),
+ onClick: onOpenEditTags,
+ },
+ {
+ type: 'item',
+ value: 'duplicate',
+ label: 'Duplicate',
+ prefix: <Copy size={14} />,
+ testId: 'dashboard-action-duplicate',
+ // Cloning reads this dashboard and creates another, so both are named.
+ checks: [readPermission, DashboardCreatePermission],
+ loading: isCloning,
+ loadingTooltip: 'Duplicating',
+ onClick: clone,
+ },
+ {
+ type: 'item',
+ value: 'lock',
+ label: isLocked ? 'Unlock Dashboard' : 'Lock Dashboard',
+ prefix: <LockKeyhole size={14} />,
+ testId: 'dashboard-action-lock',
+ checks: editChecks,
+ ...blockedBy(lockDisabledTooltip),
+ loading: isTogglingLock,
+ loadingTooltip: isLocked ? 'Unlocking' : 'Locking',
+ onClick: toggleLock,
+ },
+ { type: 'separator', value: 'before-delete' },
+ deleteItem,
+ ];
+ }, [
+ clone,
+ dashboardId,
+ deleteChecks,
+ deleteLockTooltip,
+ editChecks,
+ editLockTooltip,
+ isCloning,
+ isLegacy,
+ isLocked,
+ isTogglingLock,
+ link,
+ lockDisabledTooltip,
+ onOpenEditTags,
+ onOpenRename,
+ onView,
+ openDeleteConfirm,
+ readPermission,
+ setCopy,
+ tags.length,
+ toggleLock,
+ ]);
+
+ return { items, contextHolder };
+}
diff --git a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/DeleteActionItem.tsx b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/useDeleteDashboardAction.tsx
similarity index 73%
rename from frontend/src/pages/DashboardsListPage/components/ActionsPopover/DeleteActionItem.tsx
rename to frontend/src/pages/DashboardsListPage/components/ActionsPopover/useDeleteDashboardAction.tsx
index 178e80841e..4278c94c69 100644
--- a/frontend/src/pages/DashboardsListPage/components/ActionsPopover/DeleteActionItem.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ActionsPopover/useDeleteDashboardAction.tsx
@@ -1,11 +1,7 @@
-import { useCallback, useMemo } from 'react';
+import { ReactNode, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useMutation, useQueryClient } from 'react-query';
-import { Trash2 } from '@signozhq/icons';
-
-import ActionsMenuItem from './ActionsMenuItem';
import { toast } from '@signozhq/ui/sonner';
-import { Divider } from '@signozhq/ui/divider';
import { Typography } from '@signozhq/ui/typography';
import logEvent from 'api/common/logEvent';
import {
@@ -14,34 +10,41 @@ import {
} from 'api/generated/services/dashboard';
import { useDeleteConfirm } from 'components/DeleteConfirmModal/useDeleteConfirm';
import { useDashboardPermissions } from 'hooks/dashboards/useDashboardPermissions';
+import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';
import { DashboardListEvents } from 'pages/DashboardsListPage/constants/events';
import { useErrorModal } from 'providers/ErrorModalProvider';
import APIError from 'types/api/error';
import styles from './ActionsPopover.module.scss';
-interface Props {
- dashboardId: string;
- dashboardName: string;
- isLocked: boolean;
- // Delete sits below the other actions, so it leads with a divider. When it's
- // the only item (a legacy dashboard), the divider is suppressed.
- showDivider?: boolean;
+interface DeleteDashboardAction {
+ openConfirm: () => void;
+ deleteChecks: BrandedPermission[];
+ /** The lock only; a missing `delete` is reported by the checks. */
+ lockTooltip: string;
+ contextHolder: ReactNode;
}
-function DeleteActionItem({
+export function useDeleteDashboardAction({
dashboardId,
dashboardName,
isLocked,
- showDivider = true,
-}: Props): JSX.Element {
+ enabled,
+}: {
+ dashboardId: string;
+ dashboardName: string;
+ isLocked: boolean;
+ enabled: boolean;
+}): DeleteDashboardAction {
const { t } = useTranslation(['dashboard']);
const { showErrorModal } = useErrorModal();
const queryClient = useQueryClient();
const { contextHolder, confirmDelete } = useDeleteConfirm();
// Guide rule 3: independent of read/update, so `delete` alone is enough.
- const { canDelete, deletePermission } = useDashboardPermissions(dashboardId);
+ const { canDelete, deletePermission } = useDashboardPermissions(dashboardId, {
+ enabled,
+ });
const deleteChecks = useMemo(() => [deletePermission], [deletePermission]);
const { mutate: runDelete } = useMutation({
@@ -80,27 +83,10 @@ function DeleteActionItem({
}, [confirmDelete, dashboardName, runDelete]);
// Access before state: the lock only matters to someone who could delete.
- // The lock only; a missing `delete` is reported by the component.
const lockTooltip =
canDelete && isLocked
? t('dashboard:locked_dashboard_delete_tooltip_admin_author')
: '';
- return (
- <>
- {showDivider && <Divider />}
- <ActionsMenuItem
- label="Delete Dashboard"
- icon={<Trash2 size={14} />}
- testId="dashboard-action-delete"
- destructive
- checks={deleteChecks}
- disabledTooltip={lockTooltip}
- onClick={openConfirm}
- />
- {contextHolder}
- </>
- );
+ return { openConfirm, deleteChecks, lockTooltip, contextHolder };
}
-
-export default DeleteActionItem;
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.module.scss b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.module.scss
index 15cf3cc619..1c09836b8d 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.module.scss
@@ -55,10 +55,6 @@
overflow-wrap: anywhere;
}
-.legacyBadge {
- flex: none;
-}
-
.lockIcon {
display: inline-flex;
align-items: center;
@@ -67,45 +63,17 @@
color: var(--l3-foreground);
}
-/* Wrap so the tooltip has a hoverable target even when the pin button is disabled
- (a legacy dashboard can't be pinned). */
-.pinButtonWrap {
- display: inline-flex;
- flex: none;
-}
-
-.pinButtonWrap button:disabled {
- pointer-events: none;
-}
-
.pinButton {
display: inline-flex;
- align-items: center;
- justify-content: center;
- width: 24px;
- height: 24px;
flex: none;
- border: none;
- border-radius: 5px;
- background: transparent;
- color: transparent;
- cursor: pointer;
- transition:
- background 0.12s,
- color 0.12s;
-}
-
-.row:hover .pinButton {
- color: var(--l3-foreground);
}
.pinButton:hover {
- background: var(--l1-background);
- color: var(--bg-amber-500);
+ --button-variant-ghost-hover-color: var(--bg-amber-500);
}
.pinButtonOn {
- color: var(--bg-amber-500);
+ --button-variant-ghost-color: var(--bg-amber-500);
svg {
fill: currentColor;
@@ -130,12 +98,6 @@
display: inline-flex;
}
-// Cap the name tooltip so a long name wraps instead of spanning the page.
-.nameTooltip {
- max-width: 480px;
- overflow-wrap: break-word;
-}
-
.details {
margin-top: 12px;
display: flex;
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.test.tsx b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.test.tsx
index f59cfb641d..9550c6097c 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.test.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.test.tsx
@@ -73,7 +73,10 @@ describe('DashboardRow', () => {
renderRow(makeDashboard());
expect(screen.queryByTestId('dashboard-legacy-0')).not.toBeInTheDocument();
- expect(screen.getByTestId('dashboard-pin-0')).not.toBeDisabled();
+ expect(screen.getByTestId('dashboard-pin-0')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
expect(screen.getByTestId('actions-popover')).toHaveAttribute(
'data-legacy',
'false',
@@ -90,7 +93,10 @@ describe('DashboardRow', () => {
renderRow(makeDashboard({ legacy: true }));
expect(screen.getByTestId('dashboard-legacy-0')).toBeInTheDocument();
- expect(screen.getByTestId('dashboard-pin-0')).toBeDisabled();
+ expect(screen.getByTestId('dashboard-pin-0')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
expect(screen.getByTestId('actions-popover')).toHaveAttribute(
'data-legacy',
'true',
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.tsx b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.tsx
index d2f41dc94e..fe8fd0a94f 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRow.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
import { Badge } from '@signozhq/ui/badge';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { CalendarClock, LockKeyhole, Pin, PinOff } from '@signozhq/icons';
import cx from 'classnames';
@@ -66,7 +66,7 @@ function DashboardRow({
DATE_TIME_FORMATS.DASH_DATETIME_UTC,
);
- const onClickHandler = (event: React.MouseEvent<HTMLElement>): void => {
+ const onClickHandler = (event: React.MouseEvent): void => {
// Clicks inside portaled overlays (the actions menu, edit modals) bubble here
// through React's tree even though they render outside the row in the DOM.
// Only navigate when the click actually landed inside the row.
@@ -103,12 +103,10 @@ function DashboardRow({
};
const pinLabel = isPinned ? 'Unpin dashboard' : 'Pin dashboard';
- const pinTooltip = isLegacy
- ? "This dashboard isn't available in the new experience, so it can't be pinned"
- : pinLabel;
+ const legacyPinTooltip =
+ "This dashboard isn't available in the new experience, so it can't be pinned";
- // Only long titles are truncated, so only they need the full-name tooltip;
- // wrapping conditionally avoids an empty hanging tooltip for short names.
+ // Only long titles are truncated, so only they need the full-name tooltip.
const titleLink = (
<div className={styles.titleLink} onClick={onClickHandler}>
<img src={image} alt="dashboard-image" className={styles.icon} />
@@ -126,24 +124,15 @@ function DashboardRow({
<div className={styles.row} onClick={onClickHandler}>
<div className={styles.titleWithAction}>
<div className={styles.titleBlock}>
- {name.length > 50 ? (
- <TooltipSimple
- title={name}
- side="bottom"
- disableHoverableContent
- tooltipContentProps={{ className: styles.nameTooltip }}
- >
- {titleLink}
- </TooltipSimple>
- ) : (
- titleLink
- )}
+ <Tooltip title={name.length > 50 ? name : undefined} side="bottom">
+ {titleLink}
+ </Tooltip>
{isLegacy && (
<Badge
- color="amber"
- variant="outline"
- className={styles.legacyBadge}
+ color="warning"
+ variant="outlined"
testId={`dashboard-legacy-${index}`}
+ textTransform="none"
>
Legacy
</Badge>
@@ -153,33 +142,33 @@ function DashboardRow({
<DashboardRowTags tags={tags} />
{isLocked && (
- <TooltipSimple
- title="This dashboard is locked"
- side="top"
- disableHoverableContent
- >
+ <Tooltip title="This dashboard is locked" side="top">
<span
className={styles.lockIcon}
data-testid={`dashboard-lock-${index}`}
>
<LockKeyhole size={14} />
</span>
- </TooltipSimple>
+ </Tooltip>
)}
- <TooltipSimple title={pinTooltip} side="top" disableHoverableContent>
- <span className={styles.pinButtonWrap}>
+ <span
+ className={cx(styles.pinButton, {
+ [styles.pinButtonOn]: isPinned && !isLegacy,
+ })}
+ >
+ <Tooltip title={isLegacy ? undefined : pinLabel} side="top">
<Button
+ disabledTooltip={legacyPinTooltip}
type="button"
variant="ghost"
color="secondary"
- size="icon"
- className={cx(styles.pinButton, {
- [styles.pinButtonOn]: isPinned && !isLegacy,
- })}
+ size="sm"
+ icon
aria-label={pinLabel}
- data-testid={`dashboard-pin-${index}`}
- disabled={isUpdating || isLegacy}
+ testId={`dashboard-pin-${index}`}
+ disabled={isLegacy}
+ loading={isUpdating}
onClick={onTogglePin}
>
{isPinned ? (
@@ -191,8 +180,8 @@ function DashboardRow({
<Pin size={14} />
)}
</Button>
- </span>
- </TooltipSimple>
+ </Tooltip>
+ </span>
<ActionsPopover
link={link}
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.module.scss b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.module.scss
index fcbbc1875a..886faf5a71 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.module.scss
@@ -14,10 +14,3 @@
gap: 8px;
max-width: 320px;
}
-
-/* Recolor via the tooltip's own CSS variables so the arrow (whose fill reads
- --tooltip-background) turns black along with the content. */
-.extraTagsTooltip {
- --tooltip-background: var(--bg-ink-500, #0b0c0e);
- --tooltip-border-color: var(--bg-ink-500, #0b0c0e);
-}
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.tsx b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.tsx
index 771a3d14b5..ad665a2aae 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardRow/DashboardRowTags/DashboardRowTags.tsx
@@ -1,4 +1,4 @@
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import TagBadge from 'components/TagBadge/TagBadge';
import styles from './DashboardRowTags.module.scss';
@@ -26,10 +26,8 @@ function DashboardRowTags({ tags }: DashboardRowTagsProps): JSX.Element | null {
<TagBadge key={tag}>{tag}</TagBadge>
))}
{extra.length > 0 && (
- <TooltipSimple
+ <Tooltip
side="bottom"
- arrow
- tooltipContentProps={{ className: styles.extraTagsTooltip }}
title={
<div className={styles.extraTags}>
{extra.map((tag) => (
@@ -42,7 +40,7 @@ function DashboardRowTags({ tags }: DashboardRowTagsProps): JSX.Element | null {
<span role="presentation" onClick={(e): void => e.stopPropagation()}>
<TagBadge>+{extra.length}</TagBadge>
</span>
- </TooltipSimple>
+ </Tooltip>
)}
</div>
);
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardsList/NewDashboardButton.tsx b/frontend/src/pages/DashboardsListPage/components/DashboardsList/NewDashboardButton.tsx
index 69d566c554..d906e54704 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardsList/NewDashboardButton.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardsList/NewDashboardButton.tsx
@@ -11,6 +11,7 @@ interface Props {
function NewDashboardButton({ onClick }: Props): JSX.Element {
return (
<AuthZButton
+ size="md"
checks={CHECKS}
variant="solid"
color="primary"
diff --git a/frontend/src/pages/DashboardsListPage/components/DashboardsList/__tests__/DashboardsList.authz.test.tsx b/frontend/src/pages/DashboardsListPage/components/DashboardsList/__tests__/DashboardsList.authz.test.tsx
index 7d862fa8ab..c89a02602a 100644
--- a/frontend/src/pages/DashboardsListPage/components/DashboardsList/__tests__/DashboardsList.authz.test.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/DashboardsList/__tests__/DashboardsList.authz.test.tsx
@@ -64,7 +64,10 @@ describe('DashboardsList - AuthZ', () => {
DashboardCreatePermission,
);
});
- expect(screen.getByTestId('new-dashboard-cta')).toBeDisabled();
+ expect(screen.getByTestId('new-dashboard-cta')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('enables the create CTA when create is granted', async () => {
@@ -84,7 +87,9 @@ describe('DashboardsList - AuthZ', () => {
renderList();
const cta = await screen.findByTestId('new-dashboard-cta');
- await waitFor(() => expect(cta).not.toBeDisabled());
+ await waitFor(() =>
+ expect(cta).not.toHaveAttribute('aria-disabled', 'true'),
+ );
});
});
@@ -117,7 +122,7 @@ describe('DashboardsList - AuthZ', () => {
expect(onList).not.toHaveBeenCalled();
const cta = screen.getByTestId('new-dashboard-cta');
- expect(cta).not.toBeDisabled();
+ expect(cta).not.toHaveAttribute('aria-disabled', 'true');
// The box and filters edit a query only the list API can run, so they are
// inert and say why; the rail carries its own denial.
@@ -126,7 +131,10 @@ describe('DashboardsList - AuthZ', () => {
'combobox',
),
).toBeDisabled();
- expect(screen.getByLabelText('Run search')).toBeDisabled();
+ expect(screen.getByLabelText('Run search')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
expect(
screen.getByTestId('dashboards-list-search').querySelector('.cm-content'),
).toHaveAttribute('contenteditable', 'false');
@@ -257,7 +265,7 @@ describe('DashboardsList - AuthZ', () => {
renderList();
const cta = await screen.findByTestId('new-dashboard-cta');
- expect(cta).toBeDisabled();
+ expect(cta).toHaveAttribute('aria-disabled', 'true');
expect(cta).not.toHaveAttribute('data-denied-permissions');
});
});
diff --git a/frontend/src/pages/DashboardsListPage/components/FilterZone/FilterZone.tsx b/frontend/src/pages/DashboardsListPage/components/FilterZone/FilterZone.tsx
index 2e14ef1e8f..8daf566db0 100644
--- a/frontend/src/pages/DashboardsListPage/components/FilterZone/FilterZone.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/FilterZone/FilterZone.tsx
@@ -153,9 +153,10 @@ function FilterZone({
/>
{!isEmpty && (
<Button
+ disabledTooltip={undefined}
variant="outlined"
- color="primary"
- size="sm"
+ color="secondary"
+ size="md"
prefix={<X size={12} />}
disabled={disabled}
onClick={handleClear}
diff --git a/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.test.tsx b/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.test.tsx
index 5dab6fcad1..7d267440ef 100644
--- a/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.test.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.test.tsx
@@ -72,7 +72,9 @@ describe('LegacyDashboardDialog', () => {
// Retry is gated on dashboard:update, so it starts disabled until the check
// resolves.
await waitFor(() =>
- expect(screen.getByTestId('legacy-dashboard-retry-migration')).toBeEnabled(),
+ expect(
+ screen.getByTestId('legacy-dashboard-retry-migration'),
+ ).not.toHaveAttribute('aria-disabled', 'true'),
);
await userEvent.click(screen.getByTestId('legacy-dashboard-retry-migration'));
expect(mockRetryMigration).toHaveBeenCalledWith(DASHBOARD_ID);
@@ -81,8 +83,13 @@ describe('LegacyDashboardDialog', () => {
it('blocks retry and close while the migration is in flight', () => {
isMigrating = true;
setup();
- expect(screen.getByTestId('legacy-dashboard-retry-migration')).toBeDisabled();
- expect(screen.getByTestId('legacy-dashboard-close')).toBeDisabled();
+ expect(
+ screen.getByTestId('legacy-dashboard-retry-migration'),
+ ).toHaveAttribute('aria-disabled', 'true');
+ expect(screen.getByTestId('legacy-dashboard-close')).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('keeps the support path available', () => {
diff --git a/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.tsx b/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.tsx
index c1ddc0fa27..76dcb682d3 100644
--- a/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/LegacyDashboardDialog/LegacyDashboardDialog.tsx
@@ -80,25 +80,37 @@ function LegacyDashboardDialog({
variant="ghost"
color="secondary"
size="md"
- disabled={isMigrating}
+ loading={isMigrating}
onClick={onClose}
testId="legacy-dashboard-close"
>
Close
</Button>
- <Button
- variant={canEdit ? 'outlined' : 'solid'}
- color={canEdit ? 'secondary' : 'primary'}
- size="md"
- suffix={<ArrowUpRight size={14} />}
- onClick={onContactSupport}
- testId="legacy-dashboard-contact-support"
- >
- Contact Support
- </Button>
+ {canEdit ? (
+ <Button
+ variant="outlined"
+ color="secondary"
+ size="md"
+ suffix={<ArrowUpRight size={14} />}
+ onClick={onContactSupport}
+ testId="legacy-dashboard-contact-support"
+ >
+ Contact Support
+ </Button>
+ ) : (
+ <Button
+ variant="solid"
+ color="primary"
+ size="md"
+ suffix={<ArrowUpRight size={14} />}
+ onClick={onContactSupport}
+ testId="legacy-dashboard-contact-support"
+ >
+ Contact Support
+ </Button>
+ )}
<AuthZButton
checks={editChecks}
- withPortal={false}
variant="solid"
color="primary"
size="md"
@@ -135,12 +147,14 @@ function LegacyDashboardDialog({
<Button
variant="ghost"
color="secondary"
- size="icon"
- prefix={<Copy size={14} />}
+ size="sm"
+ icon
aria-label="Copy dashboard ID"
onClick={onCopyId}
testId="legacy-dashboard-copy-id"
- />
+ >
+ <Copy size={14} />
+ </Button>
</div>
</div>
</div>
diff --git a/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.module.scss b/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.module.scss
index 6756fe82c6..76becf3022 100644
--- a/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.module.scss
@@ -85,6 +85,7 @@
flex-direction: column;
align-items: flex-start;
width: 140px;
+ --button-justify-content: flex-start;
}
.sortHeading {
@@ -106,23 +107,6 @@
margin: 4px 0;
}
-.sortButton {
- text-align: start;
- display: flex;
- justify-content: space-between;
- align-items: center;
- width: 100%;
- color: var(--l2-foreground);
- font-family: Inter;
- font-size: var(--font-size-sm);
- font-style: normal;
- font-weight: var(--font-weight-normal);
- line-height: normal;
- letter-spacing: 0.14px;
- padding: 12px 18px 12px 14px;
- height: auto;
-}
-
.configureContent {
display: flex;
flex-direction: column;
diff --git a/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.tsx b/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.tsx
index 23f5b7cc21..a213afaf73 100644
--- a/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ListHeader/ListHeader.tsx
@@ -61,6 +61,8 @@ function ListHeader({
<div key={col.key} className={styles.metaRow}>
<Typography.Text className={styles.metaLabel}>{col.label}</Typography.Text>
<Switch
+ color="primary"
+ textPlacement="right"
value={visibleColumns[col.key]}
testId={`metadata-toggle-${col.key}`}
onChange={(checked): void => {
@@ -86,9 +88,10 @@ function ListHeader({
<div className={styles.sortContent}>
<Typography.Text className={styles.sortHeading}>Sort By</Typography.Text>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.sortButton}
+ width="100%"
onClick={(): void => onSortChange(DashboardtypesListSortDTO.name)}
testId="sort-by-name"
suffix={
@@ -100,9 +103,10 @@ function ListHeader({
Name
</Button>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.sortButton}
+ width="100%"
onClick={(): void => onSortChange(DashboardtypesListSortDTO.created_at)}
testId="sort-by-last-created"
suffix={
@@ -114,9 +118,10 @@ function ListHeader({
Last created
</Button>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.sortButton}
+ width="100%"
onClick={(): void => onSortChange(DashboardtypesListSortDTO.updated_at)}
testId="sort-by-last-updated"
suffix={
@@ -130,9 +135,10 @@ function ListHeader({
<div className={styles.sortDivider} />
<Typography.Text className={styles.sortHeading}>Order</Typography.Text>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.sortButton}
+ width="100%"
onClick={(): void => onOrderChange(DashboardtypesListOrderDTO.asc)}
testId="sort-order-asc"
suffix={
@@ -144,9 +150,10 @@ function ListHeader({
Ascending
</Button>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.sortButton}
+ width="100%"
onClick={(): void => onOrderChange(DashboardtypesListOrderDTO.desc)}
testId="sort-order-desc"
suffix={
@@ -193,7 +200,8 @@ function ListHeader({
<Button
variant="ghost"
color="secondary"
- size="icon"
+ size="sm"
+ icon
aria-label="Columns"
testId="configure-columns-trigger"
>
diff --git a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/BlankDashboardPanel.tsx b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/BlankDashboardPanel.tsx
index f3f9579e7a..576bb8d64a 100644
--- a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/BlankDashboardPanel.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/BlankDashboardPanel.tsx
@@ -150,10 +150,12 @@ function BlankDashboardPanel({ onClose }: Props): JSX.Element {
Cancel
</Button>
<Button
+ disabledTooltip="Enter a dashboard name first"
variant="solid"
color="primary"
size="md"
- disabled={!canSubmit}
+ disabled={name.trim().length === 0}
+ loading={submitting}
testId="create-dashboard-submit"
onClick={(): void => {
void handleCreate();
diff --git a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/JsonEditor.tsx b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/JsonEditor.tsx
index 6dd72923a1..58c57853bd 100644
--- a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/JsonEditor.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/JsonEditor.tsx
@@ -58,17 +58,19 @@ function JsonEditor({
return (
<div className={styles.editorWrap}>
- <Button
- variant="ghost"
- color="secondary"
- size="icon"
- className={styles.expandBtn}
- aria-label="Expand editor"
- testId="json-editor-expand"
- onClick={(): void => setExpanded(true)}
- >
- <Maximize2 size={14} />
- </Button>
+ <div className={styles.expandBtn}>
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ aria-label="Expand editor"
+ testId="json-editor-expand"
+ onClick={(): void => setExpanded(true)}
+ >
+ <Maximize2 size={14} />
+ </Button>
+ </div>
<div className={styles.editor}>{renderEditor(height)}</div>
<DialogWrapper
diff --git a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.module.scss b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.module.scss
index 1a53947956..cf9e67ae9e 100644
--- a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.module.scss
@@ -72,16 +72,6 @@
font-size: var(--font-size-sm);
}
-.spinner {
- animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
- to {
- transform: rotate(360deg);
- }
-}
-
// "From a template" tab: a centered browse-and-request placeholder until the
// templates BE lands. Fixed height matches .panel so switching tabs won't resize.
.templatesPanel {
diff --git a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.tsx b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.tsx
index d3da23413a..eeaed55200 100644
--- a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/NewDashboardModal.tsx
@@ -39,6 +39,9 @@ function NewDashboardModal({ open, onClose }: Props): JSX.Element {
}}
>
<Tabs
+ variant="primary"
+ orientation="horizontal"
+ alignment="start"
value={tab}
onChange={handleTabChange}
items={[
diff --git a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/TemplatesPanel.tsx b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/TemplatesPanel.tsx
index 44ba9ba798..252652be42 100644
--- a/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/TemplatesPanel.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/NewDashboardModal/TemplatesPanel.tsx
@@ -1,10 +1,5 @@
import { type ChangeEvent, type KeyboardEvent, useState } from 'react';
-import {
- Check,
- LayoutDashboard,
- LoaderCircle,
- SquareArrowOutUpRight,
-} from '@signozhq/icons';
+import { Check, LayoutDashboard, SquareArrowOutUpRight } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
import { toast } from '@signozhq/ui/sonner';
@@ -104,18 +99,14 @@ function TemplatesPanel(): JSX.Element {
}}
/>
<Button
+ disabledTooltip="Enter a dashboard name first"
variant="solid"
color="primary"
size="md"
- disabled={submitting || requestName.length === 0}
+ disabled={requestName.length === 0}
+ loading={submitting}
testId="request-dashboard-submit"
- prefix={
- submitting ? (
- <LoaderCircle size={14} className={styles.spinner} />
- ) : (
- <Check size={14} />
- )
- }
+ prefix={<Check size={14} />}
onClick={(): void => {
void handleRequest();
}}
diff --git a/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.module.scss b/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.module.scss
index e904b22325..acc77ea902 100644
--- a/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.module.scss
@@ -179,16 +179,6 @@
top: 5px;
right: 6px;
z-index: 1;
- display: inline-flex;
- align-items: center;
- gap: 6px;
- // Bordered light pill so "Run query ⌘↵" reads as an actionable button, not stray
- // text.
- padding: 3px 8px;
- border-radius: 6px;
- border: 1px solid var(--l2-border);
- background: var(--l2-background);
- color: var(--bg-vanilla-400);
}
// Unrun-changes indicator next to "Run query".
diff --git a/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.tsx b/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.tsx
index e02fd9ad31..3faad463b1 100644
--- a/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/SearchBar/SearchBar.tsx
@@ -171,35 +171,37 @@ function SearchBar({
data-testid="dashboards-list-search"
onChange={(next): void => onChange(next.replace(/\n/g, ' '))}
/>
- <Button
- variant="ghost"
- color="secondary"
- size="sm"
+ <span
className={styles.submit}
- aria-label="Run search"
- disabled={disabled}
- testId="dashboards-list-search-submit"
- onMouseDown={(e: MouseEvent<HTMLButtonElement>): void => {
- e.preventDefault();
- }}
- onClick={handleSubmit}
+ onMouseDown={(e: MouseEvent<HTMLSpanElement>): void => e.preventDefault()}
>
- {dirty && (
- <span
- className={styles.dirtyDot}
- data-testid="dashboards-list-search-dirty"
- />
- )}
- Run query
- <span className={styles.cmdHint}>
- {isMac ? (
- <Command size={12} color={Color.BG_VANILLA_400} />
- ) : (
- <ChevronUp size={12} color={Color.BG_VANILLA_400} />
- )}
- <CornerDownLeft size={12} color={Color.BG_VANILLA_400} />
- </span>
- </Button>
+ <Button
+ disabledTooltip={undefined}
+ variant="outlined"
+ color="secondary"
+ size="sm"
+ aria-label="Run search"
+ disabled={disabled}
+ testId="dashboards-list-search-submit"
+ onClick={handleSubmit}
+ prefix={
+ dirty ? (
+ <span
+ className={styles.dirtyDot}
+ data-testid="dashboards-list-search-dirty"
+ />
+ ) : undefined
+ }
+ suffix={
+ <span className={styles.cmdHint}>
+ {isMac ? <Command size={12} /> : <ChevronUp size={12} />}
+ <CornerDownLeft size={12} />
+ </span>
+ }
+ >
+ Run query
+ </Button>
+ </span>
</div>
</div>
);
diff --git a/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewNamePopover.tsx b/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewNamePopover.tsx
index 556a878d41..d2e00b74b6 100644
--- a/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewNamePopover.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewNamePopover.tsx
@@ -1,7 +1,8 @@
import { type ChangeEvent, type ReactNode, useEffect, useState } from 'react';
import { Button } from '@signozhq/ui/button';
import { Input } from '@signozhq/ui/input';
-import { PopoverSimple } from '@signozhq/ui/popover';
+import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import styles from './ViewsRail.module.scss';
@@ -13,6 +14,7 @@ interface Props {
onOpenChange: (open: boolean) => void;
onSubmit: (name: string) => void;
trigger: ReactNode;
+ tooltip: string;
title: string;
confirmLabel: string;
initialName?: string;
@@ -26,6 +28,7 @@ function ViewNamePopover({
onOpenChange,
onSubmit,
trigger,
+ tooltip,
title,
confirmLabel,
initialName = '',
@@ -50,52 +53,57 @@ function ViewNamePopover({
};
return (
- <PopoverSimple
- open={open}
- onOpenChange={onOpenChange}
- align="start"
- trigger={trigger}
- >
- <div className={styles.savePopover}>
- <div className={styles.saveTitle}>{title}</div>
- <Typography.Text className={styles.saveLabel}>Name</Typography.Text>
- <Input
- value={name}
- autoFocus
- maxLength={VIEW_NAME_MAX_LENGTH}
- placeholder="e.g. Prod alerts"
- testId={`${testIdPrefix}-name`}
- onChange={(e: ChangeEvent<HTMLInputElement>): void =>
- setName(e.target.value)
- }
- onKeyDown={(e): void => {
- if (e.key === 'Enter') {
- handleSave();
+ <Popover open={open} onOpenChange={onOpenChange}>
+ <Tooltip title={tooltip}>
+ <PopoverTrigger asChild>{trigger}</PopoverTrigger>
+ </Tooltip>
+ <PopoverContent align="start">
+ <div className={styles.savePopover}>
+ <div className={styles.saveTitle}>{title}</div>
+ <Typography.Text className={styles.saveLabel}>Name</Typography.Text>
+ <Input
+ value={name}
+ autoFocus
+ maxLength={VIEW_NAME_MAX_LENGTH}
+ placeholder="e.g. Prod alerts"
+ testId={`${testIdPrefix}-name`}
+ onChange={(e: ChangeEvent<HTMLInputElement>): void =>
+ setName(e.target.value)
}
- }}
- />
- <div className={styles.saveActions}>
- <Button
- variant="ghost"
- color="secondary"
- size="sm"
- onClick={(): void => onOpenChange(false)}
- >
- Cancel
- </Button>
- <Button
- variant="solid"
- color="primary"
- size="sm"
- disabled={!canSave}
- testId={`${testIdPrefix}-confirm`}
- onClick={handleSave}
- >
- {confirmLabel}
- </Button>
+ onKeyDown={(e): void => {
+ if (e.key === 'Enter') {
+ handleSave();
+ }
+ }}
+ />
+ <div className={styles.saveActions}>
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ onClick={(): void => onOpenChange(false)}
+ >
+ Cancel
+ </Button>
+ <Button
+ disabledTooltip={
+ trimmed.length === 0
+ ? 'Enter a view name first'
+ : `Use at most ${VIEW_NAME_MAX_LENGTH} characters`
+ }
+ variant="solid"
+ color="primary"
+ size="sm"
+ disabled={!canSave}
+ testId={`${testIdPrefix}-confirm`}
+ onClick={handleSave}
+ >
+ {confirmLabel}
+ </Button>
+ </div>
</div>
- </div>
- </PopoverSimple>
+ </PopoverContent>
+ </Popover>
);
}
diff --git a/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.module.scss b/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.module.scss
index 59c6173ba2..1ff9a0313b 100644
--- a/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.module.scss
@@ -116,14 +116,9 @@
background: var(--primary-background);
}
-.item {
+.row > [data-slot='button'] {
--button-display: flex;
--button-justify-content: flex-start;
- --button-padding: 9px 10px;
- flex: 1;
- min-width: 0;
- width: 100%;
- font-size: var(--font-size-base);
}
.itemIcon {
@@ -135,12 +130,6 @@
color: var(--primary-background);
}
-.itemLabel {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
.dirtyDot {
width: 7px;
height: 7px;
@@ -165,23 +154,6 @@
transition: opacity 0.1s;
}
-.itemAction {
- --button-height: 20px;
- --button-padding: 0;
- --button-border-radius: 4px;
- --button-variant-ghost-color: var(--l3-foreground);
- --button-variant-ghost-hover-background-color: var(--l1-background);
- --button-variant-ghost-hover-color: var(--l1-foreground);
- width: 20px;
- height: 20px;
- flex: none;
-}
-
-.itemActionDanger {
- --button-variant-ghost-hover-background-color: var(--danger-background);
- --button-variant-ghost-hover-color: var(--danger-color, #fff);
-}
-
.row:hover .itemActions {
opacity: 1;
pointer-events: auto;
diff --git a/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.tsx b/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.tsx
index 4064de3469..2c368a5c14 100644
--- a/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ViewsRail/ViewsRail.tsx
@@ -6,6 +6,7 @@ import {
} from 'react';
import logEvent from 'api/common/logEvent';
import { Button } from '@signozhq/ui/button';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Input } from '@signozhq/ui/input';
import { Typography } from '@signozhq/ui/typography';
import { Bookmark, PenLine, Plus, Search, Trash2 } from '@signozhq/icons';
@@ -120,17 +121,20 @@ function ViewsRail({
return (
<div key={row.id} className={cx(styles.row, { [styles.rowActive]: active })}>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.item}
+ width="100%"
onClick={(): void => onSelect(row.id)}
testId={`dashboards-view-${row.id}`}
+ prefix={<Icon size={16} className={styles.itemIcon} />}
+ suffix={
+ active && isModified ? (
+ <div className={styles.dirtyDot} title="Unsaved changes" />
+ ) : undefined
+ }
>
- <Icon size={16} className={styles.itemIcon} />
- <Typography.Text className={styles.itemLabel}>{row.label}</Typography.Text>
- {active && isModified && (
- <div className={styles.dirtyDot} title="Unsaved changes" />
- )}
+ {row.label}
</Button>
{row.deletable && (
<div className={styles.itemActions}>
@@ -145,34 +149,35 @@ function ViewsRail({
confirmLabel="Rename"
initialName={row.label}
testIdPrefix="rename-view"
+ tooltip="Rename view"
trigger={
<Button
variant="ghost"
color="secondary"
- size="icon"
- className={styles.itemAction}
+ size="sm"
+ icon
aria-label="Rename view"
- title="Rename view"
onClick={(e): void => e.stopPropagation()}
>
<PenLine size={12} />
</Button>
}
/>
- <Button
- variant="ghost"
- color="secondary"
- size="icon"
- className={cx(styles.itemAction, styles.itemActionDanger)}
- aria-label="Delete view"
- title="Delete view"
- onClick={(e): void => {
- e.stopPropagation();
- onConfirmDelete(row.id, row.label);
- }}
- >
- <Trash2 size={12} />
- </Button>
+ <Tooltip title="Delete view">
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="sm"
+ icon
+ aria-label="Delete view"
+ onClick={(e): void => {
+ e.stopPropagation();
+ onConfirmDelete(row.id, row.label);
+ }}
+ >
+ <Trash2 size={12} />
+ </Button>
+ </Tooltip>
</div>
)}
</div>
@@ -200,12 +205,14 @@ function ViewsRail({
title="Save as view"
confirmLabel="Save view"
testIdPrefix="save-view"
+ tooltip="Save current filters as a view"
trigger={
<Button
+ aria-label="Save current filters as a view"
variant="ghost"
color="secondary"
- size="icon"
- title="Save current filters as a view"
+ size="sm"
+ icon
testId="dashboards-view-save-trigger"
>
<Plus size={14} />
diff --git a/frontend/src/pages/DashboardsListPage/components/ViewsRail/__tests__/ViewsRail.authz.test.tsx b/frontend/src/pages/DashboardsListPage/components/ViewsRail/__tests__/ViewsRail.authz.test.tsx
index d3d78bb3ab..0071e965a3 100644
--- a/frontend/src/pages/DashboardsListPage/components/ViewsRail/__tests__/ViewsRail.authz.test.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/ViewsRail/__tests__/ViewsRail.authz.test.tsx
@@ -55,13 +55,21 @@ describe('ViewsRail - AuthZ', () => {
renderRail();
- // Radix's asChild clone swallows the trigger's testId, so match its title.
+ // Radix's asChild clone swallows the trigger's testId, so match its label.
await expect(
- screen.findByTitle('Save current filters as a view'),
- ).resolves.toBeEnabled();
- expect(screen.getByTestId('dashboards-view-save-changes')).toBeEnabled();
- expect(screen.getByLabelText('Rename view')).toBeEnabled();
- expect(screen.getByLabelText('Delete view')).toBeEnabled();
+ screen.findByLabelText('Save current filters as a view'),
+ ).resolves.not.toHaveAttribute('aria-disabled', 'true');
+ expect(
+ screen.getByTestId('dashboards-view-save-changes'),
+ ).not.toHaveAttribute('aria-disabled', 'true');
+ expect(screen.getByLabelText('Rename view')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(screen.getByLabelText('Delete view')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
});
it('offers save-as-new-view on a builtin view with unsaved filters', async () => {
@@ -71,6 +79,6 @@ describe('ViewsRail - AuthZ', () => {
await expect(
screen.findByTestId('dashboards-view-save-as-new'),
- ).resolves.toBeEnabled();
+ ).resolves.not.toHaveAttribute('aria-disabled', 'true');
});
});
diff --git a/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.module.scss b/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.module.scss
index 976ae93e20..0aa7881668 100644
--- a/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.module.scss
@@ -31,10 +31,6 @@
margin-top: 24px;
}
-.learnMore {
- composes: learnMoreLink from '../states.module.scss';
-}
-
.learnMoreArrow {
composes: learnMoreArrow from '../states.module.scss';
}
diff --git a/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.tsx b/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.tsx
index 8eed8dcd51..d84fac60aa 100644
--- a/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/states/EmptyState/EmptyState.tsx
@@ -33,9 +33,9 @@ function EmptyState({ createDropdown }: Props): JSX.Element {
<section className={styles.actions}>
{createDropdown}
<Button
+ size="md"
variant="link"
color="primary"
- className={styles.learnMore}
testId="learn-more"
onClick={(): void => {
logEvent('Dashboard List: Learn more clicked', {});
diff --git a/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.module.scss b/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.module.scss
index 6852a1156d..41af8bdb65 100644
--- a/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.module.scss
@@ -27,10 +27,6 @@
margin-top: 20px;
}
-.learnMore {
- composes: learnMoreLink from '../states.module.scss';
-}
-
.learnMoreArrow {
composes: learnMoreArrow from '../states.module.scss';
}
diff --git a/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.tsx b/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.tsx
index 30c4b43435..083dce51bf 100644
--- a/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.tsx
+++ b/frontend/src/pages/DashboardsListPage/components/states/ErrorState/ErrorState.tsx
@@ -70,6 +70,7 @@ function ErrorState({
<section className={styles.actionButtons}>
{!isClientError && (
<Button
+ size="md"
variant="outlined"
color="secondary"
prefix={<RotateCw size={16} />}
@@ -80,9 +81,9 @@ function ErrorState({
</Button>
)}
<Button
+ size="md"
variant="link"
color="primary"
- className={styles.learnMore}
onClick={handleContactSupportClick}
testId="dashboards-list-contact-support"
>
diff --git a/frontend/src/pages/DashboardsListPage/components/states/states.module.scss b/frontend/src/pages/DashboardsListPage/components/states/states.module.scss
index 39940b4688..1633b698b5 100644
--- a/frontend/src/pages/DashboardsListPage/components/states/states.module.scss
+++ b/frontend/src/pages/DashboardsListPage/components/states/states.module.scss
@@ -20,13 +20,6 @@
letter-spacing: -0.07px;
}
-.learnMoreLink {
- composes: bodyText;
- color: var(--bg-robin-400);
- font-weight: var(--font-weight-medium);
- padding: 0px;
-}
-
.learnMoreArrow {
margin-left: -20px;
color: var(--bg-robin-400);
diff --git a/frontend/src/pages/DashboardsListPage/stories/DashboardsListPage.stories.mocks.tsx b/frontend/src/pages/DashboardsListPage/stories/DashboardsListPage.stories.mocks.tsx
index 15e4c10bad..613a99481a 100644
--- a/frontend/src/pages/DashboardsListPage/stories/DashboardsListPage.stories.mocks.tsx
+++ b/frontend/src/pages/DashboardsListPage/stories/DashboardsListPage.stories.mocks.tsx
@@ -564,7 +564,13 @@ export const retryMigration = async (
await openLegacyDialog(canvasElement);
const retry = await screen.findByTestId('legacy-dashboard-retry-migration');
- await waitFor(() => expect(retry).toBeEnabled(), { timeout: TOAST_TIMEOUT });
+ await waitFor(
+ () => {
+ expect(retry).toBeEnabled();
+ expect(retry).not.toHaveAttribute('aria-disabled', 'true');
+ },
+ { timeout: TOAST_TIMEOUT },
+ );
await userEvent.click(retry);
};
diff --git a/frontend/src/pages/EditRules/stories/EditRules.stories.mocks.tsx b/frontend/src/pages/EditRules/stories/EditRules.stories.mocks.tsx
index 16c3164549..1ad9218bc4 100644
--- a/frontend/src/pages/EditRules/stories/EditRules.stories.mocks.tsx
+++ b/frontend/src/pages/EditRules/stories/EditRules.stories.mocks.tsx
@@ -142,15 +142,9 @@ export const findLabelInput = async (
export const removeLabel = async (
canvasElement: HTMLElement,
- label: string,
+ key: string,
): Promise<void> => {
- const chip = within(canvasElement)
- .getByText(label)
- .closest<HTMLElement>('[data-slot="badge"]');
-
- if (!chip) {
- throw new Error(`Label ${label} did not render`);
- }
-
- await userEvent.click(within(chip).getByRole('button'));
+ await userEvent.click(
+ within(canvasElement).getByRole('button', { name: `Remove ${key}` }),
+ );
};
diff --git a/frontend/src/pages/EditRules/stories/EditRules.stories.tsx b/frontend/src/pages/EditRules/stories/EditRules.stories.tsx
index 90f223597d..abc5eb0760 100644
--- a/frontend/src/pages/EditRules/stories/EditRules.stories.tsx
+++ b/frontend/src/pages/EditRules/stories/EditRules.stories.tsx
@@ -96,7 +96,7 @@ export const LabelRemoved: Story = {
play: async ({ canvasElement }): Promise<void> => {
await findLabelInput(canvasElement);
await within(canvasElement).findByText('team: platform');
- await removeLabel(canvasElement, 'team: platform');
+ await removeLabel(canvasElement, 'team');
await waitFor(() =>
expect(within(canvasElement).queryByText('team: platform')).toBeNull(),
);
@@ -109,8 +109,8 @@ export const NoLabels: Story = {
play: async ({ canvasElement }): Promise<void> => {
const input = await findLabelInput(canvasElement);
await within(canvasElement).findByText('team: platform');
- await removeLabel(canvasElement, 'team: platform');
- await removeLabel(canvasElement, 'env: prod');
+ await removeLabel(canvasElement, 'team');
+ await removeLabel(canvasElement, 'env');
await within(canvasElement).findByPlaceholderText(
'Click here to enter a label (key value pairs)',
);
diff --git a/frontend/src/pages/LLMObservability/Explorer/stories/Explorer.stories.tsx b/frontend/src/pages/LLMObservability/Explorer/stories/Explorer.stories.tsx
index 9d00016dbc..8b032c5e29 100644
--- a/frontend/src/pages/LLMObservability/Explorer/stories/Explorer.stories.tsx
+++ b/frontend/src/pages/LLMObservability/Explorer/stories/Explorer.stories.tsx
@@ -88,7 +88,7 @@ const openQuickFiltersSettings = async (): Promise<void> => {
const control = await waitFor(() => {
const settings = screen.getByTestId('settings-icon-container');
- expect(settings).toBeEnabled();
+ expect(settings).not.toHaveAttribute('aria-disabled', 'true');
return settings;
}, untilLoaded);
diff --git a/frontend/src/pages/Login/stories/Login.stories.tsx b/frontend/src/pages/Login/stories/Login.stories.tsx
index 08de2423b1..7991bc4d9e 100644
--- a/frontend/src/pages/Login/stories/Login.stories.tsx
+++ b/frontend/src/pages/Login/stories/Login.stories.tsx
@@ -41,7 +41,7 @@ const submitEmail = async (canvasElement: HTMLElement): Promise<void> => {
await userEvent.type(email, LOGIN_EMAIL);
const next = canvas.getByRole('button', { name: /next/i });
- await waitFor(() => expect(next).toBeEnabled());
+ await waitFor(() => expect(next).not.toHaveAttribute('aria-disabled', 'true'));
await userEvent.click(next);
};
diff --git a/frontend/src/pages/LogsModulePage/stories/LogsModulePage.stories.tsx b/frontend/src/pages/LogsModulePage/stories/LogsModulePage.stories.tsx
index e1fe1feb90..3782deb333 100644
--- a/frontend/src/pages/LogsModulePage/stories/LogsModulePage.stories.tsx
+++ b/frontend/src/pages/LogsModulePage/stories/LogsModulePage.stories.tsx
@@ -49,7 +49,7 @@ const openQuickFiltersSettings = async (): Promise<void> => {
const control = await waitFor(() => {
const settings = screen.getByTestId('settings-icon-container');
- expect(settings).toBeEnabled();
+ expect(settings).not.toHaveAttribute('aria-disabled', 'true');
return settings;
}, untilLoaded);
diff --git a/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.style.scss b/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.style.scss
index 7ba3a48be6..25410d41db 100644
--- a/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.style.scss
+++ b/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.style.scss
@@ -30,23 +30,6 @@
font-weight: 500;
line-height: 28px;
}
-
- .mq-details-options {
- letter-spacing: -0.06px;
- cursor: pointer;
-
- .ant-radio-button-wrapper {
- border-color: var(--l1-border);
- color: var(--l2-foreground);
- }
- .ant-radio-button-wrapper-checked {
- background: var(--l1-border);
- color: var(--l1-foreground);
- }
- .ant-radio-button-wrapper::before {
- width: 0px;
- }
- }
}
.droprate-view {
diff --git a/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.tsx b/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.tsx
index b007631ba1..ce1e2efbbd 100644
--- a/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.tsx
+++ b/frontend/src/pages/MessagingQueues/MQDetails/MQDetails.tsx
@@ -1,7 +1,7 @@
import { Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react';
// eslint-disable-next-line no-restricted-imports
import { useSelector } from 'react-redux';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { QueryParams } from 'constants/query';
import useUrlQuery from 'hooks/useUrlQuery';
import { isEmpty } from 'lodash-es';
@@ -61,13 +61,15 @@ function MessagingQueuesOptions({
MQServiceDetailTypePerView(producerLatencyOption)[selectedView] || [];
return (
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
onChange={(value: string): void =>
handleChange(value as MessagingQueueServiceDetailType)
}
value={currentTab}
- className="mq-details-options"
items={detailTypes.map((detailType) => ({
value: detailType,
label: ConsumerLagDetailTitle[detailType],
diff --git a/frontend/src/pages/MessagingQueues/MQDetails/MessagingQueueOverview.tsx b/frontend/src/pages/MessagingQueues/MQDetails/MessagingQueueOverview.tsx
index 21ecea1fe8..9ca082814f 100644
--- a/frontend/src/pages/MessagingQueues/MQDetails/MessagingQueueOverview.tsx
+++ b/frontend/src/pages/MessagingQueues/MQDetails/MessagingQueueOverview.tsx
@@ -2,7 +2,7 @@ import { Dispatch, SetStateAction, useMemo } from 'react';
// eslint-disable-next-line no-restricted-imports
import { useSelector } from 'react-redux';
import { useHistory, useLocation } from 'react-router-dom';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { MessagingQueueServicePayload } from 'api/messagingQueues/getConsumerLagDetails';
import { getKafkaSpanEval } from 'api/messagingQueues/getKafkaSpanEval';
import { getPartitionLatencyOverview } from 'api/messagingQueues/getPartitionLatencyOverview';
@@ -35,14 +35,16 @@ function ProducerLatencyTabs({
const history = useHistory();
return (
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ size="sm"
type="single"
onChange={(value: string): void => {
setConfigDetail(urlQuery, location, history, {});
setOption(value as ProducerLatencyOptions);
}}
value={option}
- className="mq-details-options"
items={[
{
value: ProducerLatencyOptions.Producers,
diff --git a/frontend/src/pages/MessagingQueues/MessagingQueues.styles.scss b/frontend/src/pages/MessagingQueues/MessagingQueues.styles.scss
index 318e22fdb7..21d2b4d922 100644
--- a/frontend/src/pages/MessagingQueues/MessagingQueues.styles.scss
+++ b/frontend/src/pages/MessagingQueues/MessagingQueues.styles.scss
@@ -78,33 +78,6 @@
.messaging-queue-details {
display: flex;
padding: 16px;
-
- .mq-details-options {
- letter-spacing: -0.06px;
- cursor: pointer;
-
- .ant-radio-button-wrapper {
- border-color: var(--l1-border);
- color: var(--l2-foreground);
- }
- .ant-radio-button-wrapper-checked {
- background: var(--l1-border);
- color: var(--l1-foreground);
- }
- .ant-radio-button-wrapper-disabled {
- background: var(--l2-background);
- color: var(--l3-foreground);
- }
- .ant-radio-button-wrapper::before {
- width: 0px;
- }
-
- .disabled-option {
- .coming-soon {
- margin-left: 8px;
- }
- }
- }
}
}
diff --git a/frontend/src/pages/MeterExplorer/stories/MeterExplorer.stories.tsx b/frontend/src/pages/MeterExplorer/stories/MeterExplorer.stories.tsx
index f26c1104a9..e9edfaed9f 100644
--- a/frontend/src/pages/MeterExplorer/stories/MeterExplorer.stories.tsx
+++ b/frontend/src/pages/MeterExplorer/stories/MeterExplorer.stories.tsx
@@ -40,7 +40,7 @@ const openQuickFiltersSettings = async (): Promise<void> => {
const control = await waitFor(() => {
const settings = screen.getByTestId('settings-icon-container');
- expect(settings).toBeEnabled();
+ expect(settings).not.toHaveAttribute('aria-disabled', 'true');
return settings;
}, untilLoaded);
diff --git a/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicAutoRefresh/PublicAutoRefresh.tsx b/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicAutoRefresh/PublicAutoRefresh.tsx
index 1225789a3b..21ad0eda3b 100644
--- a/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicAutoRefresh/PublicAutoRefresh.tsx
+++ b/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicAutoRefresh/PublicAutoRefresh.tsx
@@ -15,6 +15,7 @@ interface PublicAutoRefreshProps {
/** Selected interval key, e.g. `30s`. */
interval: string;
disabled?: boolean;
+ disabledTooltip?: string;
onToggle: (enabled: boolean) => void;
onIntervalChange: (key: string) => void;
onRefresh: () => void;
@@ -26,6 +27,7 @@ function PublicAutoRefresh({
enabled,
interval,
disabled = false,
+ disabledTooltip,
onToggle,
onIntervalChange,
onRefresh,
@@ -47,14 +49,17 @@ function PublicAutoRefresh({
trigger={['click']}
content={
<div className="auto-refresh-menu">
- <Checkbox
- onChange={(value): void => onToggle(value === true)}
- value={enabled}
- disabled={disabled}
- className="auto-refresh-checkbox"
- >
- Auto Refresh
- </Checkbox>
+ <div className="auto-refresh-checkbox">
+ <Checkbox
+ color="primary"
+ disabledTooltip={disabledTooltip}
+ onChange={(value): void => onToggle(value === true)}
+ value={enabled}
+ disabled={disabled}
+ >
+ Auto Refresh
+ </Checkbox>
+ </div>
<Typography.Text disabled={disabled} className="refresh-interval-text">
Refresh Interval
</Typography.Text>
diff --git a/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicDashboardView.tsx b/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicDashboardView.tsx
index 838f7bbb7c..885759e628 100644
--- a/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicDashboardView.tsx
+++ b/frontend/src/pages/PublicDashboard/PublicDashboardView/PublicDashboardView.tsx
@@ -113,6 +113,7 @@ function PublicDashboardView({
enabled={autoRefreshEnabled}
interval={autoRefreshInterval}
disabled={isAutoRefreshPaused}
+ disabledTooltip="Auto refresh is off for a custom time range"
onToggle={setAutoRefreshEnabled}
onIntervalChange={setAutoRefreshInterval}
onRefresh={handleRefresh}
diff --git a/frontend/src/pages/SaveView/index.tsx b/frontend/src/pages/SaveView/index.tsx
index 59d9393374..3bd3e7fbd9 100644
--- a/frontend/src/pages/SaveView/index.tsx
+++ b/frontend/src/pages/SaveView/index.tsx
@@ -339,24 +339,24 @@ function SaveView(): JSX.Element {
onCancel={hideDeleteViewModal}
footer={[
<Button
+ size="md"
key="cancel"
variant="solid"
color="secondary"
onClick={hideDeleteViewModal}
- className="cancel-btn"
prefix={<X size={16} />}
>
Cancel
</Button>,
<Button
+ size="md"
key="submit"
variant="solid"
- color="destructive"
+ color="danger"
prefix={<Trash2 size={16} />}
onClick={onDeleteHandler}
- className="delete-btn"
- disabled={isDeleteLoading}
- data-testid="confirm-delete"
+ loading={isDeleteLoading}
+ testId="confirm-delete"
>
Delete view
</Button>,
@@ -377,13 +377,14 @@ function SaveView(): JSX.Element {
onCancel={hideEditViewModal}
footer={[
<Button
+ size="md"
key="submit"
variant="solid"
color="primary"
prefix={<Check size={16} color={Color.BG_VANILLA_100} />}
onClick={onUpdateQueryHandler}
- disabled={isViewUpdating}
- data-testid="save-view"
+ loading={isViewUpdating}
+ testId="save-view"
>
Save changes
</Button>,
diff --git a/frontend/src/pages/Settings/Billing/stories/Billing.stories.tsx b/frontend/src/pages/Settings/Billing/stories/Billing.stories.tsx
index 7902e07943..537ac9f87f 100644
--- a/frontend/src/pages/Settings/Billing/stories/Billing.stories.tsx
+++ b/frontend/src/pages/Settings/Billing/stories/Billing.stories.tsx
@@ -134,7 +134,10 @@ export const CancelSubscription: Story = {
// The button is cloned disabled while its own permission check is in
// flight, and the click that lands there is dropped rather than queued.
await waitFor(() =>
- expect(screen.getByTestId('cancel-subscription-btn')).toBeEnabled(),
+ expect(screen.getByTestId('cancel-subscription-btn')).not.toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ ),
);
await userEvent.click(screen.getByTestId('cancel-subscription-btn'));
@@ -151,7 +154,9 @@ export const CancelSubscription: Story = {
);
await waitFor(() =>
- expect(screen.getByTestId('cancel-subscription-confirm-btn')).toBeEnabled(),
+ expect(
+ screen.getByTestId('cancel-subscription-confirm-btn'),
+ ).not.toHaveAttribute('aria-disabled', 'true'),
);
},
};
diff --git a/frontend/src/pages/Settings/Ingestion/stories/Ingestion.stories.tsx b/frontend/src/pages/Settings/Ingestion/stories/Ingestion.stories.tsx
index ed9310f294..fc28436afb 100644
--- a/frontend/src/pages/Settings/Ingestion/stories/Ingestion.stories.tsx
+++ b/frontend/src/pages/Settings/Ingestion/stories/Ingestion.stories.tsx
@@ -163,7 +163,7 @@ export const CreateKeySubmitting: Story = {
await waitFor(() =>
expect(
dialog.getByRole('button', { name: 'Create new Ingestion key' }),
- ).toBeDisabled(),
+ ).toHaveAttribute('aria-busy', 'true'),
);
},
};
diff --git a/frontend/src/pages/Settings/Roles/RoleDetails/stories/RoleDetails.stories.tsx b/frontend/src/pages/Settings/Roles/RoleDetails/stories/RoleDetails.stories.tsx
index bf0acb6a61..59330d4f73 100644
--- a/frontend/src/pages/Settings/Roles/RoleDetails/stories/RoleDetails.stories.tsx
+++ b/frontend/src/pages/Settings/Roles/RoleDetails/stories/RoleDetails.stories.tsx
@@ -93,7 +93,7 @@ export const DeleteRoleConfirm: Story = {
const deleteRole = await waitFor(() => {
const button = within(canvasElement).getByTestId('delete-button');
- expect(button).toBeEnabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
}, untilLoaded);
@@ -117,7 +117,7 @@ export const DeleteRoleFailed: Story = {
const deleteRole = await waitFor(() => {
const button = within(canvasElement).getByTestId('delete-button');
- expect(button).toBeEnabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
}, untilLoaded);
diff --git a/frontend/src/pages/Settings/ServiceAccounts/stories/ServiceAccounts.stories.tsx b/frontend/src/pages/Settings/ServiceAccounts/stories/ServiceAccounts.stories.tsx
index 9fb6bb892e..0151ff44d9 100644
--- a/frontend/src/pages/Settings/ServiceAccounts/stories/ServiceAccounts.stories.tsx
+++ b/frontend/src/pages/Settings/ServiceAccounts/stories/ServiceAccounts.stories.tsx
@@ -85,7 +85,10 @@ export const FilterMenuOpen: Story = {
const trigger = await waitFor(() => {
const button = screen.getByRole('button', { name: /all accounts/i });
- if ((button as HTMLButtonElement).disabled) {
+ if (
+ button.getAttribute('aria-busy') === 'true' ||
+ button.getAttribute('aria-disabled') === 'true'
+ ) {
throw new Error('the filter trigger is still disabled');
}
@@ -254,7 +257,7 @@ export const EditKeyThenRevokeConfirm: Story = {
const revoke = await waitFor(() => {
const button = screen.getByRole('button', { name: 'Revoke Key' });
- expect(button).toBeEnabled();
+ expect(button).not.toHaveAttribute('aria-disabled', 'true');
return button;
}, untilLoaded);
diff --git a/frontend/src/pages/SignUp/SignUp.styles.scss b/frontend/src/pages/SignUp/SignUp.styles.scss
index 63b7be9c3d..e38aa9ffc1 100644
--- a/frontend/src/pages/SignUp/SignUp.styles.scss
+++ b/frontend/src/pages/SignUp/SignUp.styles.scss
@@ -155,10 +155,6 @@
margin-top: 24px;
display: flex;
width: 100%;
-
- .signup-submit-button {
- width: 100%;
- }
}
.ant-form-item {
diff --git a/frontend/src/pages/SignUp/SignUp.tsx b/frontend/src/pages/SignUp/SignUp.tsx
index 90fac2708f..902ab9cc65 100644
--- a/frontend/src/pages/SignUp/SignUp.tsx
+++ b/frontend/src/pages/SignUp/SignUp.tsx
@@ -91,15 +91,21 @@ function SignUp(): JSX.Element {
const showPasswordMismatchError = confirmPasswordTouched && isPasswordMismatch;
- const isValidForm = useMemo(
- (): boolean =>
- !loading &&
- Boolean(email?.trim()) &&
- Boolean(password?.trim()) &&
- Boolean(confirmPassword?.trim()) &&
- password === confirmPassword,
- [loading, email, password, confirmPassword],
- );
+ const invalidFormReason = useMemo((): string | undefined => {
+ if (!email?.trim()) {
+ return 'Enter your email first';
+ }
+ if (!password?.trim()) {
+ return 'Enter a password first';
+ }
+ if (!confirmPassword?.trim()) {
+ return 'Confirm your password first';
+ }
+ if (password !== confirmPassword) {
+ return "Passwords don't match";
+ }
+ return undefined;
+ }, [email, password, confirmPassword]);
return (
<AuthPageContainer>
@@ -186,12 +192,15 @@ function SignUp(): JSX.Element {
<div className="signup-form-actions">
<Button
+ disabledTooltip={invalidFormReason}
+ size="md"
variant="solid"
color="primary"
type="submit"
data-attr="signup"
- disabled={!isValidForm}
- className="signup-submit-button"
+ disabled={!!invalidFormReason}
+ loading={loading}
+ width="100%"
suffix={<ArrowRight size={16} />}
>
Access My Workspace
diff --git a/frontend/src/pages/SignUp/__tests__/SignUp.test.tsx b/frontend/src/pages/SignUp/__tests__/SignUp.test.tsx
index b980a07b65..6a65b45d65 100644
--- a/frontend/src/pages/SignUp/__tests__/SignUp.test.tsx
+++ b/frontend/src/pages/SignUp/__tests__/SignUp.test.tsx
@@ -84,7 +84,7 @@ describe('SignUp Component - Regular Signup', () => {
name: /access my workspace/i,
});
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('disables submit button for partially filled fields', async () => {
@@ -104,19 +104,19 @@ describe('SignUp Component - Regular Signup', () => {
// Missing email
await user.type(passwordInput, 'password123');
await user.type(confirmPasswordInput, 'password123');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
// Missing password
await user.clear(passwordInput);
await user.clear(confirmPasswordInput);
await user.type(emailInput, '[email protected]');
await user.type(confirmPasswordInput, 'password123');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
// Missing confirm password
await user.clear(confirmPasswordInput);
await user.type(passwordInput, 'password123');
- expect(submitButton).toBeDisabled();
+ expect(submitButton).toHaveAttribute('aria-disabled', 'true');
});
it('shows error when passwords do not match', async () => {
@@ -209,7 +209,7 @@ describe('SignUp Component - Regular Signup', () => {
await user.type(confirmPasswordInput, 'password123');
await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
await user.click(submitButton);
@@ -257,7 +257,7 @@ describe('SignUp Component - Regular Signup', () => {
await user.type(confirmPasswordInput, 'password123');
await waitFor(() => {
- expect(submitButton).not.toBeDisabled();
+ expect(submitButton).not.toHaveAttribute('aria-disabled', 'true');
});
await user.click(submitButton);
diff --git a/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataItem.tsx b/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataItem.tsx
index b5c1371223..b9061a68b5 100644
--- a/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataItem.tsx
+++ b/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataItem.tsx
@@ -1,5 +1,5 @@
import { ReactNode } from 'react';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import styles from './EntityMetadataItem.module.scss';
@@ -16,12 +16,12 @@ function EntityMetadataItem({
children,
}: EntityMetadataItemProps): JSX.Element {
return (
- <TooltipSimple title={tooltip}>
+ <Tooltip title={tooltip}>
<span className={styles.item}>
{icon}
<Typography.Text as="span">{children}</Typography.Text>
</span>
- </TooltipSimple>
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataRow.tsx b/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataRow.tsx
index 6c532b18c1..f5e3a314b6 100644
--- a/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataRow.tsx
+++ b/frontend/src/pages/TraceDetailsV3/EntityMetadata/EntityMetadataRow.tsx
@@ -53,7 +53,7 @@ function EntityMetadataRow({
{service.entryPoint && (
<>
{' — '}
- <Badge color="secondary" variant="outline">
+ <Badge color="secondary" variant="outlined" textTransform="none">
{service.entryPoint}
</Badge>
</>
diff --git a/frontend/src/pages/TraceDetailsV3/NoData/NoData.module.scss b/frontend/src/pages/TraceDetailsV3/NoData/NoData.module.scss
index a3dba26f06..a9733a43f6 100644
--- a/frontend/src/pages/TraceDetailsV3/NoData/NoData.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/NoData/NoData.module.scss
@@ -84,7 +84,3 @@
display: flex;
gap: var(--spacing-4);
}
-
-.actionBtn {
- width: 160px;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/NoData/NoData.tsx b/frontend/src/pages/TraceDetailsV3/NoData/NoData.tsx
index 565da8af5a..e24413bb00 100644
--- a/frontend/src/pages/TraceDetailsV3/NoData/NoData.tsx
+++ b/frontend/src/pages/TraceDetailsV3/NoData/NoData.tsx
@@ -45,9 +45,10 @@ function NoData(): JSX.Element {
</Typography.Text>
<div className={styles.actionBtns}>
<Button
+ size="md"
variant="outlined"
color="secondary"
- className={styles.actionBtn}
+ width="160px"
prefix={<RefreshCw size={14} />}
onClick={(): void => window.location.reload()}
testId="trace-no-data-refresh-button"
@@ -55,9 +56,10 @@ function NoData(): JSX.Element {
Refresh this page
</Button>
<Button
+ size="md"
variant="outlined"
color="secondary"
- className={styles.actionBtn}
+ width="160px"
prefix={<LifeBuoy size={14} />}
onClick={(): void => handleContactSupport(isCloudUserVal)}
testId="trace-no-data-contact-support-button"
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.module.scss b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.module.scss
index 02f368a39f..fdc6444a9a 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.module.scss
@@ -20,9 +20,17 @@
flex-shrink: 0;
}
+ [role='tabpanel'] {
+ flex: 1;
+ min-height: 0;
+ overflow-y: auto;
+ scrollbar-width: none;
+ }
+
// Tabs library wrapper — scoped by `.body` so the global match is contained.
:global([class*='tabs__list-wrapper']) {
padding-left: 0 !important;
+ flex-shrink: 0;
}
}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.tsx
index e2d6b7e50a..3ca5e92993 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel.tsx
@@ -1,11 +1,6 @@
import { useMemo } from 'react';
import { useParams } from 'react-router-dom';
-import {
- TabsContent,
- TabsList,
- TabsRoot,
- TabsTrigger,
-} from '@signozhq/ui/tabs';
+import { Tabs } from '@signozhq/ui/tabs';
import { DetailsHeader } from 'components/DetailsPanel';
import { useIsDarkMode } from 'hooks/useDarkMode';
import useGetTraceAggregations from 'hooks/trace/useGetTraceAggregations';
@@ -149,38 +144,47 @@ function AnalyticsPanel({
/>
<div className={styles.body} data-testid="trace-analytics-panel">
- <TabsRoot defaultValue="exec-time" onValueChange={onTabChange}>
- <TabsList variant="secondary">
- <TabsTrigger value="exec-time" variant="secondary">
- % exec time
- </TabsTrigger>
- <TabsTrigger value="spans" variant="secondary">
- Spans
- </TabsTrigger>
- </TabsList>
-
- <div className={styles.tabsScroll}>
- <TabsContent value="exec-time">
- <AnalyticsTabContent
- isLoading={isLoading}
- isError={isError}
- fieldName={colorByFieldName}
- rows={execTimeRows}
- valueVariant="wide"
- />
- </TabsContent>
-
- <TabsContent value="spans">
- <AnalyticsTabContent
- isLoading={isLoading}
- isError={isError}
- fieldName={colorByFieldName}
- rows={spanCountRows}
- valueVariant="narrow"
- />
- </TabsContent>
- </div>
- </TabsRoot>
+ <Tabs
+ variant="secondary"
+ orientation="horizontal"
+ alignment="start"
+ className={styles.tabsScroll}
+ defaultValue="exec-time"
+ onChange={onTabChange}
+ noTabContentPadding
+ items={[
+ {
+ key: 'exec-time',
+ label: '% exec time',
+ children: (
+ <div className={styles.tabsScroll}>
+ <AnalyticsTabContent
+ isLoading={isLoading}
+ isError={isError}
+ fieldName={colorByFieldName}
+ rows={execTimeRows}
+ valueVariant="wide"
+ />
+ </div>
+ ),
+ },
+ {
+ key: 'spans',
+ label: 'Spans',
+ children: (
+ <div className={styles.tabsScroll}>
+ <AnalyticsTabContent
+ isLoading={isLoading}
+ isError={isError}
+ fieldName={colorByFieldName}
+ rows={spanCountRows}
+ valueVariant="narrow"
+ />
+ </div>
+ ),
+ },
+ ]}
+ />
</div>
</FloatingPanel>
);
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/DockModeSwitcher.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/DockModeSwitcher.tsx
index 7523c69ade..772b64e712 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/DockModeSwitcher.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/DockModeSwitcher.tsx
@@ -1,18 +1,12 @@
-import { ReactNode } from 'react';
+import { ReactElement } from 'react';
import { Dock, PanelBottom, PanelRight } from '@signozhq/icons';
-import { ToggleGroup, ToggleGroupItem } from '@signozhq/ui/toggle-group';
-import {
- TooltipContent,
- TooltipProvider,
- TooltipRoot,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { SpanDetailVariant } from './constants';
interface DockOption {
value: SpanDetailVariant;
- icon: ReactNode;
+ icon: ReactElement;
tooltip: string;
}
@@ -37,40 +31,45 @@ const DOCK_OPTIONS: DockOption[] = [
interface DockModeSwitcherProps {
value: SpanDetailVariant;
onChange: (value: SpanDetailVariant) => void;
- tooltipClassName?: string;
}
function DockModeSwitcher({
value,
onChange,
- tooltipClassName,
}: DockModeSwitcherProps): JSX.Element {
return (
- <TooltipProvider>
- <ToggleGroup
- type="single"
- value={value}
- onChange={(v): void => {
- if (v) {
- onChange(v as SpanDetailVariant);
- }
- }}
- size="sm"
- >
- {DOCK_OPTIONS.map((option) => (
- <TooltipRoot key={option.value}>
- <TooltipTrigger asChild>
- <span data-testid={`dock-mode-${option.value}`}>
- <ToggleGroupItem value={option.value}>{option.icon}</ToggleGroupItem>
- </span>
- </TooltipTrigger>
- <TooltipContent className={tooltipClassName}>
+ <ToggleGroup
+ type="single"
+ variant="outlined"
+ color="secondary"
+ size="sm"
+ value={value}
+ onChange={(next): void => {
+ if (next) {
+ onChange(next as SpanDetailVariant);
+ }
+ }}
+ items={DOCK_OPTIONS.map((option) => ({
+ value: option.value,
+ testId: `dock-mode-${option.value}`,
+ // No per-item tooltip. The copy stays the accessible name; the icon stays the visible control.
+ label: (
+ <span style={{ display: 'inline-flex', alignItems: 'center' }}>
+ {option.icon}
+ <span
+ style={{
+ display: 'inline-block',
+ inlineSize: 0,
+ blockSize: 0,
+ overflow: 'hidden',
+ }}
+ >
{option.tooltip}
- </TooltipContent>
- </TooltipRoot>
- ))}
- </ToggleGroup>
- </TooltipProvider>
+ </span>
+ </span>
+ ),
+ }))}
+ />
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.module.scss b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.module.scss
index 82385918a6..53632cfa46 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.module.scss
@@ -3,6 +3,10 @@
flex-direction: column;
gap: var(--spacing-4);
max-width: 50vw;
+
+ > [data-slot='button'] {
+ align-self: flex-end;
+ }
}
.preview {
@@ -13,10 +17,3 @@
padding: var(--spacing-4);
border-radius: 4px;
}
-
-.expandButton {
- align-self: flex-end;
- display: flex;
- align-items: center;
- flex-grow: 0;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.tsx
index 42c2523c69..2de9aded81 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/Events/components/AttributeWithExpandablePopover.tsx
@@ -22,9 +22,10 @@ function AttributeWithExpandablePopover({
<div className={popoverStyles.popover}>
<pre className={popoverStyles.preview}>{attributeValue}</pre>
<Button
+ variant="solid"
+ color="primary"
onClick={(): void => onExpand(attributeKey, attributeValue)}
size="sm"
- className={popoverStyles.expandButton}
prefix={<Fullscreen size={14} />}
>
Expand
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx
index e5afa35365..18445b43fd 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/LinkedSpans/LinkedSpans.tsx
@@ -94,7 +94,9 @@ export function LinkedSpansPanel({
badgeKey="Linked Span ID"
badgeValue={
<Link to={getLink(item)}>
- <Badge color="vanilla">{item.spanId}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {item.spanId}
+ </Badge>
</Link>
}
direction="column"
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.module.scss b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.module.scss
index 087e41091d..edd53b1443 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.module.scss
@@ -73,28 +73,18 @@
[role='tablist'] {
flex-shrink: 0;
+
+ // Default 20px badge is taller than the 16px tab icon and grows the tab bar.
+ --badge-height: 16px;
+ --badge-padding: 0 var(--spacing-3);
}
[class*='tabs__list-wrapper'] {
padding-left: 0 !important;
+ flex-shrink: 0;
}
}
-// The Badge is already pill-rounded, so an 18x18 box renders a circle for a
-// single digit and a capsule for more.
-.eventsBadge {
- // l3 background (!important beats the Badge's [data-color] rule).
- --badge-background: var(--l3-background) !important;
- --badge-padding: 0 5px;
- // Static count, not interactive — cancel the Badge's hover background change.
- --badge-hover-background: var(--badge-background) !important;
-
- margin-left: var(--spacing-3);
- min-width: 18px;
- height: 18px;
- vertical-align: middle;
-}
-
.tabsScroll {
flex: 1;
min-height: 0;
@@ -107,12 +97,7 @@
padding: 0;
flex: 1;
min-height: 0;
+ overflow-y: auto;
+ scrollbar-width: none;
}
}
-
-// Tooltip is rendered in a portal but the SpanDetailsPanel can be docked as a
-// FloatingPanel (z-index 999), which would otherwise sit on top of the default
-// tooltip (z-index 50). Bump the tooltip above the panel.
-.dockToggleTooltip {
- --tooltip-z-index: 1000;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.tsx
index 4e2f904cf2..39ed6dcc4b 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.tsx
@@ -1,11 +1,6 @@
import { useCallback, useMemo, useState } from 'react';
import { Badge } from '@signozhq/ui/badge';
-import {
- TabsContent,
- TabsList,
- TabsRoot,
- TabsTrigger,
-} from '@signozhq/ui/tabs';
+import { Tabs, type TabsItemProps } from '@signozhq/ui/tabs';
import { Bookmark, ChartColumnBig, List, ScrollText } from '@signozhq/icons';
import { Skeleton } from 'antd';
import { DetailsHeader, DetailsPanelDrawer } from 'components/DetailsPanel';
@@ -42,6 +37,7 @@ import { openInNewTab } from 'utils/navigation';
import {
// KEY_ATTRIBUTE_KEYS, // uncomment when key attributes section is re-enabled
+ SPAN_DETAILS_PANEL_MIN_WIDTH,
SpanDetailVariant,
VISIBLE_ACTIONS,
} from './constants';
@@ -287,89 +283,104 @@ function SpanDetailsContent({
);
const eventsCount = selectedSpan.events?.length || 0;
+ const spanDetailTabs: TabsItemProps[] = [
+ {
+ key: 'overview',
+ label: 'Overview',
+ prefixIcon: <Bookmark size={14} />,
+ children: (
+ <>
+ {isWide && summary}
+ <DataViewer
+ data={spanDisplayData}
+ drawerKey="trace-details"
+ prettyViewProps={{
+ showPinned: true,
+ actions: prettyViewCustomActions,
+ visibleActions: VISIBLE_ACTIONS,
+ pinnedFieldsValue,
+ onPinnedFieldsChange,
+ }}
+ />
+ </>
+ ),
+ },
+ {
+ key: 'events',
+ label: 'Events',
+ prefixIcon: <ScrollText size={14} />,
+ suffixIcon:
+ eventsCount > 0 ? (
+ <Badge variant="solid" color="secondary">
+ {eventsCount}
+ </Badge>
+ ) : undefined,
+ children: (
+ <Events
+ span={selectedSpan}
+ startTime={traceStartTime || 0}
+ isSearchVisible
+ />
+ ),
+ },
+ {
+ key: 'logs',
+ label: 'Logs',
+ prefixIcon: <List size={14} />,
+ children: (
+ <SpanLogs
+ traceId={selectedSpan.trace_id}
+ spanId={selectedSpan.span_id}
+ timeRange={{
+ startTime: (traceStartTime || 0) - FIVE_MINUTES_IN_MS,
+ endTime: (traceEndTime || 0) + FIVE_MINUTES_IN_MS,
+ }}
+ logs={logs}
+ isLoading={isLogsLoading}
+ isError={isLogsError}
+ isFetching={isLogsFetching}
+ isLogSpanRelated={isLogSpanRelated}
+ handleExplorerPageRedirect={handleExplorerPageRedirect}
+ emptyStateConfig={!hasTraceIdLogs ? emptyLogsStateConfig : undefined}
+ />
+ ),
+ },
+ ];
+
+ if (infraMetadata) {
+ spanDetailTabs.push({
+ key: 'metrics',
+ label: 'Metrics',
+ prefixIcon: <ChartColumnBig size={14} />,
+ children: (
+ <InfraMetrics
+ clusterName={infraMetadata.clusterName}
+ podName={infraMetadata.podName}
+ nodeName={infraMetadata.nodeName}
+ hostName={infraMetadata.hostName}
+ timestamp={infraMetadata.spanTimestamp}
+ dataSource={DataSource.TRACES}
+ />
+ ),
+ });
+ }
+
return (
<>
<div className={styles.panelBody} ref={bodyRef}>
{!isWide && <div className={styles.detailsSection}>{summary}</div>}
<div className={styles.tabsSection}>
- {/* Step 9: ContentTabs */}
- <TabsRoot defaultValue="overview" onValueChange={handleTabChange}>
- <TabsList variant="secondary">
- <TabsTrigger value="overview" variant="secondary">
- <Bookmark size={14} /> Overview
- </TabsTrigger>
- <TabsTrigger value="events" variant="secondary">
- <ScrollText size={14} /> Events
- {eventsCount > 0 && (
- <Badge color="secondary" className={styles.eventsBadge}>
- {eventsCount}
- </Badge>
- )}
- </TabsTrigger>
- <TabsTrigger value="logs" variant="secondary">
- <List size={14} /> Logs
- </TabsTrigger>
- {infraMetadata && (
- <TabsTrigger value="metrics" variant="secondary">
- <ChartColumnBig size={14} /> Metrics
- </TabsTrigger>
- )}
- </TabsList>
-
- <div className={styles.tabsScroll}>
- <TabsContent value="overview">
- {isWide && summary}
- <DataViewer
- data={spanDisplayData}
- drawerKey="trace-details"
- prettyViewProps={{
- showPinned: true,
- actions: prettyViewCustomActions,
- visibleActions: VISIBLE_ACTIONS,
- pinnedFieldsValue,
- onPinnedFieldsChange,
- }}
- />
- </TabsContent>
- <TabsContent value="events">
- <Events
- span={selectedSpan}
- startTime={traceStartTime || 0}
- isSearchVisible
- />
- </TabsContent>
- <TabsContent value="logs">
- <SpanLogs
- traceId={selectedSpan.trace_id}
- spanId={selectedSpan.span_id}
- timeRange={{
- startTime: (traceStartTime || 0) - FIVE_MINUTES_IN_MS,
- endTime: (traceEndTime || 0) + FIVE_MINUTES_IN_MS,
- }}
- logs={logs}
- isLoading={isLogsLoading}
- isError={isLogsError}
- isFetching={isLogsFetching}
- isLogSpanRelated={isLogSpanRelated}
- handleExplorerPageRedirect={handleExplorerPageRedirect}
- emptyStateConfig={!hasTraceIdLogs ? emptyLogsStateConfig : undefined}
- />
- </TabsContent>
- {infraMetadata && (
- <TabsContent value="metrics">
- <InfraMetrics
- clusterName={infraMetadata.clusterName}
- podName={infraMetadata.podName}
- nodeName={infraMetadata.nodeName}
- hostName={infraMetadata.hostName}
- timestamp={infraMetadata.spanTimestamp}
- dataSource={DataSource.TRACES}
- />
- </TabsContent>
- )}
- </div>
- </TabsRoot>
+ <Tabs
+ variant="secondary"
+ orientation="horizontal"
+ alignment="start"
+ className={styles.tabsScroll}
+ value={activeTab}
+ onChange={handleTabChange}
+ noTabContentPadding
+ items={spanDetailTabs}
+ />
</div>
</div>
@@ -418,20 +429,14 @@ function SpanDetailsPanel({
if (onVariantChange) {
actions.push({
key: 'dock-mode',
- component: (
- <DockModeSwitcher
- value={variant}
- onChange={onVariantChange}
- tooltipClassName={styles.dockToggleTooltip}
- />
- ),
+ component: <DockModeSwitcher value={variant} onChange={onVariantChange} />,
});
}
return actions;
}, [variant, onVariantChange]);
- const PANEL_WIDTH = 500;
+ const PANEL_WIDTH = SPAN_DETAILS_PANEL_MIN_WIDTH;
const PANEL_MARGIN_RIGHT = 20;
const PANEL_MARGIN_TOP = 50;
const PANEL_MARGIN_BOTTOM = 25;
@@ -484,7 +489,7 @@ function SpanDetailsPanel({
isOpen={panelState.isOpen}
className={styles.panel}
width={PANEL_WIDTH}
- minWidth={480}
+ minWidth={SPAN_DETAILS_PANEL_MIN_WIDTH}
height={window.innerHeight - PANEL_MARGIN_TOP - PANEL_MARGIN_BOTTOM}
defaultPosition={{
x: window.innerWidth - PANEL_WIDTH - PANEL_MARGIN_RIGHT,
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/OpenInLogsExplorer.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/OpenInLogsExplorer.tsx
index 4074b31e4c..c09d3e8116 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/OpenInLogsExplorer.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/OpenInLogsExplorer.tsx
@@ -15,7 +15,7 @@ function OpenInLogsExplorer({ onClick }: OpenInLogsExplorerProps): JSX.Element {
size="md"
onClick={onClick}
prefix={<Compass size={16} />}
- data-testid="open-in-explorer-button"
+ testId="open-in-explorer-button"
>
Open in Logs Explorer
</Button>
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.module.scss b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.module.scss
index 9f01707c92..3d02e2d7fb 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.module.scss
@@ -58,16 +58,3 @@
.actionSection {
width: 320px;
}
-
-.actionBtn {
- border-radius: 2px;
- border: 1px solid var(--l1-border);
- background: var(--l1-border);
- color: var(--l2-foreground);
- padding: var(--spacing-2) var(--spacing-4);
- font-size: 12px;
- font-style: normal;
- font-weight: var(--font-weight-normal);
- line-height: var(--line-height-20);
- letter-spacing: -0.07px;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx
index b52c88f378..66ae59ace5 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanLogs/SpanLogs.tsx
@@ -244,8 +244,8 @@ function SpanLogs({
</section>
<section className={styles.actionSection}>
<Button
- className={styles.actionBtn}
- variant="action"
+ color="primary"
+ variant="solid"
prefix={<Compass size={14} />}
onClick={handleExplorerPageRedirect}
size="md"
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanPercentile/SpanPercentilePanel.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanPercentile/SpanPercentilePanel.tsx
index c2046e594d..89aac774b1 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanPercentile/SpanPercentilePanel.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanPercentile/SpanPercentilePanel.tsx
@@ -60,6 +60,7 @@ function SpanPercentilePanel({
<div className={styles.root}>
<div className={styles.header}>
<Button
+ size="md"
variant="link"
color="secondary"
onClick={toggleOpen}
@@ -69,14 +70,15 @@ function SpanPercentilePanel({
</Button>
<Button
+ aria-label="Toggle resource attributes"
variant="link"
color="secondary"
- size="icon"
+ size="sm"
+ icon
onClick={toggleResourceAttributesSelector}
- prefix={
- showResourceAttributesSelector ? <Check size={16} /> : <Plus size={16} />
- }
- />
+ >
+ {showResourceAttributesSelector ? <Check size={16} /> : <Plus size={16} />}
+ </Button>
</div>
{showResourceAttributesSelector && (
@@ -104,6 +106,8 @@ function SpanPercentilePanel({
.map((attr) => (
<div className={styles.resourceSelectorItem} key={attr.key}>
<Checkbox
+ color="primary"
+ disabledTooltip="This attribute is always included"
value={attr.isSelected}
onChange={(checked): void => {
handleResourceAttributeChange(
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanSummary.module.scss b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanSummary.module.scss
index 53cbf5b36c..bc5e9b43ab 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanSummary.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanSummary.module.scss
@@ -49,13 +49,6 @@
flex-shrink: 0;
}
-// Badges stay fit-content so short values shrink and long ones truncate.
-.serviceBadge,
-.statusMessageBadge {
- max-width: 100%;
- min-width: 0;
-}
-
// Truncating text inside a badge (service name, status message).
.badgeEllipsisText {
min-width: 0;
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.module.scss b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.module.scss
index c8c9d288e3..e49cf191c0 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.module.scss
@@ -5,14 +5,3 @@
white-space: nowrap;
display: block;
}
-
-.traceIdCopy {
- display: block;
- max-width: 100%;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- padding: 0;
- height: auto;
- justify-content: flex-start;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.tsx
index 8bf6d0733c..d0a3d8c65d 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/TraceIdField.tsx
@@ -1,6 +1,7 @@
import { Link, useRouteMatch } from 'react-router-dom';
import { useCopyToClipboard } from 'react-use';
import { Button } from '@signozhq/ui/button';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { toast } from '@signozhq/ui/sonner';
import ROUTES from 'constants/routes';
import { SpanV3 } from 'types/api/trace/getTraceV3';
@@ -35,15 +36,17 @@ export function TraceIdField({ span }: TraceIdFieldProps): JSX.Element {
};
return (
- <Button
- variant="link"
- color="secondary"
- className={styles.traceIdCopy}
- onClick={handleCopy}
- title="Click to copy trace ID"
- >
- {span.trace_id}
- </Button>
+ <Tooltip title="Click to copy trace ID">
+ <Button
+ size="md"
+ variant="link"
+ color="secondary"
+ maxWidth="100%"
+ onClick={handleCopy}
+ >
+ {span.trace_id}
+ </Button>
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/config.tsx b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/config.tsx
index 3860d9b8bf..bf76ced03a 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/config.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/config.tsx
@@ -18,7 +18,12 @@ export const HIGHLIGHTED_OPTIONS: HighlightedOption[] = [
label: 'SERVICE',
render: (span): ReactNode | null =>
span['service.name'] ? (
- <Badge color="vanilla" className={styles.serviceBadge}>
+ <Badge
+ textTransform="none"
+ variant="solid"
+ color="secondary"
+ maxWidth="100%"
+ >
<span className={styles.serviceDot} />
<span className={styles.badgeEllipsisText} title={span['service.name']}>
{span['service.name']}
@@ -31,7 +36,9 @@ export const HIGHLIGHTED_OPTIONS: HighlightedOption[] = [
label: 'STATUS CODE',
render: (span): ReactNode | null =>
span.status_code_string ? (
- <Badge color="vanilla">{span.status_code_string}</Badge>
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {span.status_code_string}
+ </Badge>
) : null,
},
{
@@ -44,7 +51,11 @@ export const HIGHLIGHTED_OPTIONS: HighlightedOption[] = [
key: 'spanKind',
label: 'SPAN KIND',
render: (span): ReactNode | null =>
- span.kind_string ? <Badge color="vanilla">{span.kind_string}</Badge> : null,
+ span.kind_string ? (
+ <Badge textTransform="none" variant="solid" color="secondary">
+ {span.kind_string}
+ </Badge>
+ ) : null,
},
{
key: 'statusMessage',
@@ -52,7 +63,12 @@ export const HIGHLIGHTED_OPTIONS: HighlightedOption[] = [
render: (span): ReactNode | null =>
span.status_message ? (
<ExpandableValue value={span.status_message} title="Status message">
- <Badge color="vanilla" className={styles.statusMessageBadge}>
+ <Badge
+ textTransform="none"
+ variant="solid"
+ color="secondary"
+ maxWidth="100%"
+ >
<span className={styles.badgeEllipsisText}>{span.status_message}</span>
</Badge>
</ExpandableValue>
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/constants.ts b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/constants.ts
index 17cf0b38c6..dd069ba092 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/constants.ts
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/constants.ts
@@ -25,6 +25,9 @@ export enum SpanDetailVariant {
DOCKED_RIGHT = 'right',
}
+// Fits the four span detail tabs without scroll arrows
+export const SPAN_DETAILS_PANEL_MIN_WIDTH = 620;
+
export const KEY_ATTRIBUTE_KEYS: Record<string, string[]> = {
traces: [
'service.name',
diff --git a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts
index 92788d0289..1f5e24c520 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/hooks/useSpanAttributeActions.ts
@@ -14,7 +14,7 @@ import { v4 as uuid } from 'uuid';
export interface SpanAttributeAction {
label: string;
value: string;
- icon?: React.ReactNode;
+ icon?: React.ReactElement;
disabled?: boolean;
hidden?: boolean;
callback: (args: { key: string; value: string }) => void;
diff --git a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.module.scss b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.module.scss
index 179fa6d6c4..aabaa6ca16 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.module.scss
@@ -8,18 +8,6 @@
pointer-events: none;
}
-.popover {
- // Hover card may be rendered while the SpanDetailsPanel is docked as
- // a FloatingPanel (z-index 999); bump above the default tooltip z-index.
- --tooltip-z-index: 1000;
- background-color: var(--l1-background);
- padding: 8px 12px;
- border-radius: 4px;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
- border: 1px solid var(--l2-border);
- color: var(--l1-foreground);
-}
-
.content {
font-size: 12px;
color: var(--l1-foreground);
diff --git a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx
index 2ecdf99293..651fd3b923 100644
--- a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx
@@ -1,9 +1,4 @@
-import {
- TooltipRoot,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { convertTimeToRelevantUnit } from 'utils/traceUtils';
import { useIsDarkMode } from 'hooks/useDarkMode';
import { useTraceStore } from 'pages/TraceDetailsV3/stores/traceStore';
@@ -89,7 +84,6 @@ export function SpanTooltipContent({
*/
export interface SpanHoverCardProps {
hoveredSpanId: string | null;
- onOpenChange: (open: boolean) => void;
anchorLeft: number;
rowHeight: number;
spans: SpanV3[];
@@ -98,7 +92,6 @@ export interface SpanHoverCardProps {
export function SpanHoverCard({
hoveredSpanId,
- onOpenChange,
anchorLeft,
rowHeight,
spans,
@@ -150,27 +143,23 @@ export function SpanHoverCard({
]);
return (
- <TooltipProvider>
- <TooltipRoot open={hoverCardData !== null} onOpenChange={onOpenChange}>
- <TooltipTrigger asChild>
- <div
- className={styles.anchor}
- style={{
- top: hoverCardData?.anchorTop ?? 0,
- left: anchorLeft,
- height: rowHeight,
- }}
- />
- </TooltipTrigger>
- <TooltipContent
- side="right"
- align="start"
- sideOffset={8}
- className={styles.popover}
- >
- {hoverCardData && <SpanTooltipContent {...hoverCardData.tooltip} />}
- </TooltipContent>
- </TooltipRoot>
- </TooltipProvider>
+ <Tooltip
+ open={hoverCardData !== null}
+ side="right"
+ align="start"
+ sideOffset={8}
+ title={
+ hoverCardData ? <SpanTooltipContent {...hoverCardData.tooltip} /> : null
+ }
+ >
+ <div
+ className={styles.anchor}
+ style={{
+ top: hoverCardData?.anchorTop ?? 0,
+ left: anchorLeft,
+ height: rowHeight,
+ }}
+ />
+ </Tooltip>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/NozButton.tsx b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/NozButton.tsx
index 05f5d5e4c1..d6f4d56388 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/NozButton.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/NozButton.tsx
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import { useLocation } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import logEvent from 'api/common/logEvent';
import Noz from 'components/Noz/Noz';
import { NOZ_TOOLTIP_TITLE } from 'components/Noz/Noz.constants';
@@ -30,17 +30,19 @@ export default function NozButton(): JSX.Element | null {
}
return (
- <TooltipSimple title={NOZ_TOOLTIP_TITLE}>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- className="noz-wave"
- aria-label="Open Noz"
- onClick={handleOpenNoz}
- >
- <Noz size={16} />
- </Button>
- </TooltipSimple>
+ <span className="noz-wave">
+ <Tooltip title={NOZ_TOOLTIP_TITLE}>
+ <Button
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ aria-label="Open Noz"
+ onClick={handleOpenNoz}
+ >
+ <Noz size={16} />
+ </Button>
+ </Tooltip>
+ </span>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.module.scss b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.module.scss
index 5d6e8a313c..0e874cb97e 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.module.scss
@@ -17,11 +17,6 @@
}
}
-.backBtn {
- flex-shrink: 0;
- border: 1px solid var(--l1-border);
-}
-
.traceIdSection {
display: flex;
align-items: center;
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx
index fad53e8c44..02f7c6a999 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx
@@ -1,12 +1,7 @@
import { useCallback, useState } from 'react';
import { useParams } from 'react-router-dom';
import { Button } from '@signozhq/ui/button';
-import {
- TooltipRoot,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Skeleton } from 'antd';
import cx from 'classnames';
import FieldsSelector from 'components/FieldsSelector';
@@ -113,8 +108,8 @@ function TraceDetailsHeader({
<Button
variant="solid"
color="secondary"
- size="icon"
- className={styles.backBtn}
+ size="sm"
+ icon
onClick={handlePreviousBtnClick}
aria-label="Back"
>
@@ -135,33 +130,29 @@ function TraceDetailsHeader({
)}
>
{!isFilterExpanded && (
- <TooltipProvider>
- <div className={styles.headerActions}>
- <TooltipRoot>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- aria-label="Analytics"
- onClick={handleToggleAnalytics}
- >
- <ChartPie size={14} />
- </Button>
- </TooltipTrigger>
- <TooltipContent>Analytics</TooltipContent>
- </TooltipRoot>
- <TraceOptionsMenu
- showTraceDetails={showTraceDetails}
- onToggleTraceDetails={handleToggleTraceDetails}
- onOpenPreviewFields={(): void => setIsPreviewFieldsOpen(true)}
- traceId={traceID}
- startTime={startTime}
- endTime={endTime}
- totalSpansCount={traceSummary.totalSpansCount}
- />
- </div>
- </TooltipProvider>
+ <div className={styles.headerActions}>
+ <Tooltip title="Analytics">
+ <Button
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ aria-label="Analytics"
+ onClick={handleToggleAnalytics}
+ >
+ <ChartPie size={14} />
+ </Button>
+ </Tooltip>
+ <TraceOptionsMenu
+ showTraceDetails={showTraceDetails}
+ onToggleTraceDetails={handleToggleTraceDetails}
+ onOpenPreviewFields={(): void => setIsPreviewFieldsOpen(true)}
+ traceId={traceID}
+ startTime={startTime}
+ endTime={endTime}
+ totalSpansCount={traceSummary.totalSpansCount}
+ />
+ </div>
)}
<div
key="filter"
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.module.scss b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.module.scss
index f1e399dc9f..868f46f849 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.module.scss
@@ -33,10 +33,3 @@
color: var(--l2-foreground);
flex-shrink: 0;
}
-
-.cancelBtn {
- height: 24px;
- width: 24px;
- flex-shrink: 0;
- color: var(--l2-foreground);
-}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.tsx b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.tsx
index 102a068432..4c0810cce9 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDownloadPanel.tsx
@@ -40,14 +40,15 @@ function TraceDownloadPanel(): JSX.Element {
</span>
<Button
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
- className={styles.cancelBtn}
onClick={cancelDownload}
aria-label="Cancel download"
- data-testid="trace-download-cancel"
- prefix={<X size={16} />}
- />
+ testId="trace-download-cancel"
+ >
+ <X size={16} />
+ </Button>
</div>
<Progress percent={displayProgress} status="active" showInfo={false} />
</div>
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.module.scss b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.module.scss
deleted file mode 100644
index e17112b417..0000000000
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.module.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// Applied to both the menu content and the submenu content (each renders in
-// its own portal with a default z-index of 50) so both stack above
-// FloatingPanel (z-index 999).
-.traceOptionsDropdown {
- z-index: 1100;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.tsx b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.tsx
index 8c4882dffe..c6238bb563 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.tsx
@@ -1,24 +1,11 @@
-import { Button } from '@signozhq/ui/button';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
- DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
import { Settings2 } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { ExportFormat } from 'lib/exportData/types';
import { useTraceStore } from '../stores/traceStore';
import { useDownloadTrace } from './useDownloadTrace';
-import styles from './TraceOptionsMenu.module.scss';
-
interface TraceOptionsMenuProps {
showTraceDetails: boolean;
onToggleTraceDetails: () => void;
@@ -29,9 +16,6 @@ interface TraceOptionsMenuProps {
totalSpansCount: number;
}
-// Composed from dropdown-menu primitives (instead of DropdownMenuSimple)
-// because the simple preset offers no way to style the submenu content,
-// which renders in its own portal and needs a z-index above FloatingPanel.
function TraceOptionsMenu({
showTraceDetails,
onToggleTraceDetails,
@@ -61,71 +45,92 @@ function TraceOptionsMenu({
}
};
+ const items: DropdownItemType[] = [
+ {
+ type: 'item',
+ value: 'toggle-trace-details',
+ label: showTraceDetails ? 'Hide trace details' : 'Show trace details',
+ onClick: onToggleTraceDetails,
+ },
+ {
+ type: 'item',
+ value: 'preview-fields',
+ label: 'Preview fields',
+ onClick: onOpenPreviewFields,
+ },
+ ];
+
+ // Only show the "Colour by" submenu if there's an actual choice to make.
+ if (availableColorByOptions.length > 1) {
+ items.push({
+ type: 'submenu',
+ value: 'colour-by',
+ label: 'Colour by',
+ items: [
+ {
+ type: 'group',
+ value: 'colour-by-options',
+ label: 'Colour by',
+ items: [
+ {
+ type: 'radio-group',
+ name: 'colour-by',
+ value: colorByField.name,
+ onChange: handleColorByChange,
+ items: availableColorByOptions.map((opt) => ({
+ value: opt.field.name,
+ label: opt.label,
+ })),
+ },
+ ],
+ },
+ ],
+ });
+ }
+
+ if (!isExportDisabled) {
+ items.push({
+ type: 'submenu',
+ value: 'download-trace',
+ label: 'Download trace',
+ testId: 'download-trace-submenu',
+ loading: isDownloading,
+ loadingTooltip: 'Downloading trace',
+ items: [
+ {
+ type: 'item',
+ value: 'csv',
+ label: 'CSV',
+ testId: 'download-trace-csv',
+ onClick: (): void => {
+ downloadTrace(ExportFormat.Csv);
+ },
+ },
+ {
+ type: 'item',
+ value: 'jsonl',
+ label: 'JSONL',
+ testId: 'download-trace-jsonl',
+ onClick: (): void => {
+ downloadTrace(ExportFormat.Jsonl);
+ },
+ },
+ ],
+ });
+ }
+
return (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- aria-label="Trace options"
- prefix={<Settings2 size={14} />}
- />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className={styles.traceOptionsDropdown}>
- <DropdownMenuItem clickable onSelect={onToggleTraceDetails}>
- {showTraceDetails ? 'Hide trace details' : 'Show trace details'}
- </DropdownMenuItem>
- <DropdownMenuItem clickable onSelect={onOpenPreviewFields}>
- Preview fields
- </DropdownMenuItem>
- {/* Only show the "Colour by" submenu if there's an actual choice to make. */}
- {availableColorByOptions.length > 1 && (
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Colour by</DropdownMenuSubTrigger>
- <DropdownMenuSubContent className={styles.traceOptionsDropdown}>
- <DropdownMenuLabel>COLOUR BY</DropdownMenuLabel>
- <DropdownMenuRadioGroup
- value={colorByField.name}
- onValueChange={handleColorByChange}
- >
- {availableColorByOptions.map((opt) => (
- <DropdownMenuRadioItem key={opt.field.name} value={opt.field.name}>
- {opt.label}
- </DropdownMenuRadioItem>
- ))}
- </DropdownMenuRadioGroup>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- )}
- {!isExportDisabled && (
- <DropdownMenuSub>
- <DropdownMenuSubTrigger
- disabled={isDownloading}
- data-testid="download-trace-submenu"
- >
- Download trace
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className={styles.traceOptionsDropdown}>
- <DropdownMenuItem
- clickable
- onSelect={(): void => downloadTrace(ExportFormat.Csv)}
- testId="download-trace-csv"
- >
- CSV
- </DropdownMenuItem>
- <DropdownMenuItem
- clickable
- onSelect={(): void => downloadTrace(ExportFormat.Jsonl)}
- testId="download-trace-jsonl"
- >
- JSONL
- </DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- )}
- </DropdownMenuContent>
- </DropdownMenu>
+ <Dropdown items={items} nativeButton align="start" side="bottom">
+ <Button
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ aria-label="Trace options"
+ >
+ <Settings2 size={14} />
+ </Button>
+ </Dropdown>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/__tests__/traceDownload.test.tsx b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/__tests__/traceDownload.test.tsx
index f606b4cd85..b18d8dcb55 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/__tests__/traceDownload.test.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/__tests__/traceDownload.test.tsx
@@ -49,13 +49,11 @@ function renderFeature(
}
// skipHover: simulated pointer travel fires pointerleave on the subtrigger and
-// radix's grace-area math (zero rects in jsdom) closes the submenu.
-// pointerEventsCheck 0: radix puts pointer-events:none on <body> while open.
+// Base UI's safe-polygon math (zero rects in jsdom) closes the submenu.
function setupUser(): ReturnType<typeof userEvent.setup> {
return userEvent.setup({
delay: null,
skipHover: true,
- pointerEventsCheck: 0,
});
}
@@ -64,7 +62,9 @@ async function startDownload(
): Promise<ReturnType<typeof userEvent.setup>> {
const user = setupUser();
await user.click(screen.getByRole('button', { name: /trace options/i }));
- await user.click(await screen.findByTestId('download-trace-submenu'));
+ // Base UI ignores mouse clicks on a hover-opened submenu trigger.
+ (await screen.findByTestId('download-trace-submenu')).focus();
+ await user.keyboard('{ArrowRight}');
await user.click(await screen.findByTestId(`download-trace-${format}`));
return user;
}
@@ -168,7 +168,7 @@ describe('trace download flow', () => {
// Reopen the menu mid-download: trigger is disabled by REAL store state.
await user.click(screen.getByRole('button', { name: /trace options/i }));
const trigger = await screen.findByTestId('download-trace-submenu');
- expect(trigger).toHaveAttribute('data-disabled');
+ expect(trigger).toHaveAttribute('data-loading');
// Cleanup: stop the in-flight download so the module-scoped guard resets.
await user.click(screen.getByTestId('trace-download-cancel'));
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.module.scss b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.module.scss
index 94a04d54d1..c85b646c83 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.module.scss
@@ -28,34 +28,6 @@
border-top: 1px solid var(--l2-border);
padding: 16px !important;
- .saveButton {
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 4px;
- color: var(--l1-foreground);
- font-size: 12px;
- font-weight: 500;
- line-height: 24px;
- width: 135px;
-
- :global(.ant-btn-icon) {
- display: flex;
- }
-
- &:disabled {
- color: var(--l2-foreground);
-
- :global(.ant-btn-icon svg) {
- stroke: var(--l2-foreground);
- }
- }
- }
-
- .discardButton {
- background: var(--l3-background);
- }
-
:global(.ant-btn) {
border-radius: 2px;
padding: 4px 8px;
@@ -71,6 +43,10 @@
// Funnel-detail view overrides — only when the inner wrapper has
// `.isDetails` applied alongside `.root`.
&.isDetails {
+ > [data-slot='button'] {
+ margin-bottom: 14px;
+ }
+
:global(.traces-funnel-details) {
height: unset;
@@ -148,24 +124,6 @@
}
}
-.createButton {
- width: 153px;
- padding: 4px 8px;
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 4px;
- flex-shrink: 0;
- border-radius: 2px;
- background: var(--l3-background);
- border: none;
- box-shadow: none;
- color: var(--l2-foreground);
- font-size: 12px;
- font-weight: 500;
- line-height: 24px;
-}
-
.list {
max-height: 400px;
overflow-y: scroll;
@@ -191,16 +149,6 @@
height: 400px;
}
-.backButton {
- display: flex;
- align-items: center;
- gap: 6px;
- color: var(--l2-foreground);
- font-size: 14px;
- line-height: 20px;
- margin-bottom: 14px;
-}
-
.detailsView {
display: flex;
flex-direction: column;
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.tsx
index 04e2b169c0..830409e234 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.tsx
@@ -204,9 +204,9 @@ function AddSpanToFunnelModal({
const renderDetailsView = ({ span }: { span: SpanV3 }): JSX.Element => (
<div className={cx(styles.root, styles.isDetails)}>
<Button
+ size="md"
variant="ghost"
color="secondary"
- className={styles.backButton}
onClick={handleBack}
prefix={<ArrowLeft size={14} />}
>
@@ -251,20 +251,23 @@ function AddSpanToFunnelModal({
activeView === ModalView.DETAILS
? [
<Button
+ disabledTooltip="No changes to discard"
+ size="md"
variant="outlined"
color="secondary"
key="discard"
onClick={handleDiscard}
- className={styles.discardButton}
disabled={!isUnsavedChanges}
>
Discard
</Button>,
<Button
+ disabledTooltip="No changes to save"
+ size="md"
key="save"
variant="solid"
color="primary"
- className={styles.saveButton}
+ width="135px"
onClick={handleSaveFunnel}
disabled={!isUnsavedChanges}
prefix={<Check size={14} />}
@@ -274,10 +277,11 @@ function AddSpanToFunnelModal({
]
: [
<Button
+ size="md"
key="create"
variant="outlined"
color="secondary"
- className={styles.createButton}
+ width="153px"
onClick={handleCreateNewClick}
prefix={<Plus size={14} />}
>
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/SpanLineActionButtons.module.scss b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/SpanLineActionButtons.module.scss
index 2121b6081a..daa5c98c0c 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/SpanLineActionButtons.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/SpanLineActionButtons.module.scss
@@ -9,19 +9,3 @@
border: 1px solid var(--l1-border);
background: var(--l2-background);
}
-
-.copyBtn {
- border: none;
- box-shadow: none;
- padding: 9px;
- justify-content: center;
- align-items: center;
- display: flex;
- border-color: var(--l1-border) !important;
-}
-
-// Tooltip rendered in a portal; bump above FloatingPanel (z-index 999) so it
-// stays visible when the SpanDetailsPanel is docked as a floating panel.
-.tooltip {
- --tooltip-z-index: 1000;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/index.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/index.tsx
index ea5409a961..951ca55689 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/index.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/SpanLineActionButtons/index.tsx
@@ -1,10 +1,5 @@
import { Button } from '@signozhq/ui/button';
-import {
- TooltipRoot,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { useCopySpanLink } from 'hooks/trace/useCopySpanLink';
import { Link } from '@signozhq/icons';
import { SpanV3 } from 'types/api/trace/getTraceV3';
@@ -21,22 +16,18 @@ export default function SpanLineActionButtons({
return (
<div className={styles.root}>
- <TooltipProvider>
- <TooltipRoot>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- onClick={onSpanCopy}
- className={styles.copyBtn}
- >
- <Link size={14} />
- </Button>
- </TooltipTrigger>
- <TooltipContent className={styles.tooltip}>Copy Span Link</TooltipContent>
- </TooltipRoot>
- </TooltipProvider>
+ <Tooltip title="Copy Span Link">
+ <Button
+ aria-label="Action"
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ onClick={onSpanCopy}
+ >
+ <Link size={14} />
+ </Button>
+ </Tooltip>
</div>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx
index b5269fae75..40ef92e374 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters.tsx
@@ -2,14 +2,9 @@ import { useCallback, useMemo, useRef, useState } from 'react';
import { useHistory, useLocation } from 'react-router-dom';
import { ArrowRightFromLine, Search, X } from '@signozhq/icons';
import { Switch } from '@signozhq/ui/switch';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import { Button } from '@signozhq/ui/button';
-import {
- TooltipRoot,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import cx from 'classnames';
import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
@@ -252,7 +247,8 @@ function Filters({
>
<Typography.Text>Highlight errors</Typography.Text>
<Switch
- color="cherry"
+ textPlacement="right"
+ color="danger"
value={isHighlightErrors}
onChange={handleToggleHighlightErrors}
/>
@@ -281,21 +277,24 @@ function Filters({
</div>
);
- const pillWithPopover = expression ? (
- <TooltipRoot>
- <TooltipTrigger asChild>{pill}</TooltipTrigger>
- <TooltipContent side="bottom" align="start">
- <div className={styles.pillPopover}>
- <div className={styles.pillPopoverHeader}>
- <Typography.Text>Search query</Typography.Text>
- <CopyButton value={expression} size={12} />
+ const pillWithPopover = (
+ <Tooltip
+ title={
+ expression ? (
+ <div className={styles.pillPopover}>
+ <div className={styles.pillPopoverHeader}>
+ <Typography.Text>Search query</Typography.Text>
+ <CopyButton value={expression} size={12} />
+ </div>
+ <div className={styles.pillPopoverExpression}>{expression}</div>
</div>
- <div className={styles.pillPopoverExpression}>{expression}</div>
- </div>
- </TooltipContent>
- </TooltipRoot>
- ) : (
- pill
+ ) : undefined
+ }
+ side="bottom"
+ align="start"
+ >
+ {pill}
+ </Tooltip>
);
// Mode-conditional render: only one of (pill | QuerySearch) is mounted
@@ -303,112 +302,110 @@ function Filters({
// dropped, so collapse can't accidentally commit a malformed expression
// and fire an erroring /query_range request.
return (
- <TooltipProvider>
- {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
- <div
- className={cx(styles.root, isExpanded && styles.isExpanded)}
- ref={containerRef}
- onBlur={(e): void => {
- const relatedTarget = e.relatedTarget as Node | null;
- const blurredIntoSelf = !!containerRef.current?.contains(relatedTarget);
- if (!blurredIntoSelf) {
- handleBlur();
- }
- }}
- >
- {isExpanded && (
- <div className={styles.categoryControls}>
- <ToggleGroupSimple
- type="single"
- value={selectedCategory}
- onChange={(value: SpanCategory): void => {
- if (value) {
- handleCategoryChange(value as SpanCategory);
- }
- }}
- size="sm"
- items={categories.map((category) => ({
- value: category,
- label: category,
- }))}
- />
- </div>
- )}
-
- <div className={styles.searchInput}>
- {isExpanded ? (
- <div className={styles.searchAndNav}>
- <div className={styles.searchContainer}>
- <QuerySearch
- queryData={{
- ...BASE_FILTER_QUERY,
- filter: { expression },
- }}
- onChange={handleExpressionChange}
- onRun={handleRunQuery}
- dataSource={DataSource.TRACES}
- placeholder="Enter your filter query (e.g., http.status_code >= 500 AND service.name = 'frontend')"
- />
- </div>
- </div>
- ) : (
- <div className={styles.searchPill}>{pillWithPopover}</div>
- )}
- </div>
-
- <div className={styles.resultActions}>
- <QueryResult
- hasExpression={hasExpression}
- hasResults={hasResults}
- isFetching={isFetching}
- error={error}
- noData={noData}
- currentIndex={currentSearchedIndex}
- total={filteredSpanIds.length}
- onPrev={handlePrev}
- onNext={handleNext}
- showNavigation={isExpanded}
+ // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+ <div
+ className={cx(styles.root, isExpanded && styles.isExpanded)}
+ ref={containerRef}
+ onBlur={(e): void => {
+ const relatedTarget = e.relatedTarget as Node | null;
+ const blurredIntoSelf = !!containerRef.current?.contains(relatedTarget);
+ if (!blurredIntoSelf) {
+ handleBlur();
+ }
+ }}
+ >
+ {isExpanded && (
+ <div className={styles.categoryControls}>
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
+ type="single"
+ value={selectedCategory}
+ onChange={(value: string): void => {
+ if (value) {
+ handleCategoryChange(value as SpanCategory);
+ }
+ }}
+ size="sm"
+ items={categories.map((category) => ({
+ value: category,
+ label: category,
+ }))}
/>
- {isExpanded && (
- <div className={styles.expandedActions}>
- {hasExpression && (
- <TooltipRoot>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- onClick={handleClear}
- data-testid="clear-filter"
- >
- <X size={14} />
- </Button>
- </TooltipTrigger>
- <TooltipContent>Clear filter</TooltipContent>
- </TooltipRoot>
- )}
- <TooltipRoot>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- onClick={onCollapse}
- >
- <ArrowRightFromLine size={14} />
- </Button>
- </TooltipTrigger>
- <TooltipContent>Collapse filters</TooltipContent>
- </TooltipRoot>
- </div>
- )}
</div>
+ )}
- <NozButton />
+ <div className={styles.searchInput}>
+ {isExpanded ? (
+ <div className={styles.searchAndNav}>
+ <div className={styles.searchContainer}>
+ <QuerySearch
+ queryData={{
+ ...BASE_FILTER_QUERY,
+ filter: { expression },
+ }}
+ onChange={handleExpressionChange}
+ onRun={handleRunQuery}
+ dataSource={DataSource.TRACES}
+ placeholder="Enter your filter query (e.g., http.status_code >= 500 AND service.name = 'frontend')"
+ />
+ </div>
+ </div>
+ ) : (
+ <div className={styles.searchPill}>{pillWithPopover}</div>
+ )}
+ </div>
- <div className={styles.highlightControl}>{highlightErrorsToggle}</div>
+ <div className={styles.resultActions}>
+ <QueryResult
+ hasExpression={hasExpression}
+ hasResults={hasResults}
+ isFetching={isFetching}
+ error={error}
+ noData={noData}
+ currentIndex={currentSearchedIndex}
+ total={filteredSpanIds.length}
+ onPrev={handlePrev}
+ onNext={handleNext}
+ showNavigation={isExpanded}
+ />
+ {isExpanded && (
+ <div className={styles.expandedActions}>
+ {hasExpression && (
+ <Tooltip title="Clear filter">
+ <Button
+ aria-label="Action"
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ onClick={handleClear}
+ testId="clear-filter"
+ >
+ <X size={14} />
+ </Button>
+ </Tooltip>
+ )}
+ <Tooltip title="Collapse filters">
+ <Button
+ aria-label="Action"
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ onClick={onCollapse}
+ >
+ <ArrowRightFromLine size={14} />
+ </Button>
+ </Tooltip>
+ </div>
+ )}
</div>
- </TooltipProvider>
+
+ <NozButton />
+
+ <div className={styles.highlightControl}>{highlightErrorsToggle}</div>
+ </div>
);
}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/QueryResult.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/QueryResult.tsx
index 0323bcf5b5..68c90aff2e 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/QueryResult.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Filters/QueryResult.tsx
@@ -1,10 +1,6 @@
import { ChevronDown, ChevronUp, Info, Loader } from '@signozhq/icons';
import { Button } from '@signozhq/ui/button';
-import {
- TooltipContent,
- TooltipRoot,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
import { AxiosError } from 'axios';
import cx from 'classnames';
@@ -49,8 +45,11 @@ function QueryResult({
{currentIndex + 1} / {total}
</Typography.Text>
<Button
+ aria-label="Action"
+ disabledTooltip="This is the first result"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
disabled={currentIndex === 0}
onClick={onPrev}
@@ -58,8 +57,11 @@ function QueryResult({
<ChevronUp size={14} />
</Button>
<Button
+ aria-label="Action"
+ disabledTooltip="This is the last result"
variant="ghost"
- size="icon"
+ size="sm"
+ icon
color="secondary"
disabled={currentIndex === total - 1}
onClick={onNext}
@@ -72,17 +74,12 @@ function QueryResult({
content = <Loader className="animate-spin" />;
} else if (error) {
content = (
- <TooltipRoot>
- <TooltipTrigger asChild>
- <span className={cx(styles.filterStatus, styles.hasError)}>
- <Info />
- API error
- </span>
- </TooltipTrigger>
- <TooltipContent>
- {(error as AxiosError)?.message || 'Something went wrong'}
- </TooltipContent>
- </TooltipRoot>
+ <Tooltip title={(error as AxiosError)?.message || 'Something went wrong'}>
+ <span className={cx(styles.filterStatus, styles.hasError)}>
+ <Info />
+ API error
+ </span>
+ </Tooltip>
);
} else if (noData) {
content = (
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.module.scss b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.module.scss
index 28e31723eb..6c4374cbba 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.module.scss
@@ -25,20 +25,6 @@
flex-shrink: 0;
}
-// Event-dot tooltip. Visually matches SpanHoverCard's popover; styles are
-// inlined rather than `compose`d from another module because postcss-modules
-// loads cross-module composes through the plain CSS parser, which chokes on
-// SCSS `//` comments in the target file.
-.popover {
- --tooltip-z-index: 1000;
- background-color: var(--l1-background);
- padding: 8px 12px;
- border-radius: 4px;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
- border: 1px solid var(--l2-border);
- color: var(--l1-foreground);
-}
-
.root {
overflow-y: hidden;
overflow-x: hidden;
@@ -445,24 +431,6 @@
pointer-events: none;
}
-.actionBtn {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 22px;
- height: 22px;
- border-radius: 2px;
- cursor: pointer;
- color: var(--l1-foreground);
- background: transparent;
- border: none;
- padding: 0;
-
- &:hover {
- background: var(--l3-background);
- }
-}
-
// Also reveal the actions when the parent tree row is hovered.
.treeRow:hover .rowActions,
.treeRow.hoveredSpan .rowActions {
@@ -588,10 +556,3 @@
opacity: 0.5;
}
}
-
-// Tooltips for the row's hover-revealed action buttons (Copy / Add to Funnel).
-// Bumped above FloatingPanel (z-index 999) so they stay visible when the
-// SpanDetailsPanel is docked as a floating panel.
-.actionTooltip {
- --tooltip-z-index: 1000;
-}
diff --git a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx
index 68677bb414..321ae83b86 100644
--- a/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx
@@ -11,12 +11,7 @@ import {
} from 'react';
import { Badge } from '@signozhq/ui/badge';
import { Button } from '@signozhq/ui/button';
-import {
- TooltipRoot,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import {
createColumnHelper,
flexRender,
@@ -105,26 +100,19 @@ const LazyEventDotPopover = memo(function LazyEventDotPopover({
const eventTimeMs = event.timeUnixNano / 1e6;
return (
- <TooltipProvider>
- <TooltipRoot
- open
- onOpenChange={(open: boolean): void => {
- if (!open) {
- setShowPopover(false);
- }
- }}
- >
- <TooltipTrigger asChild>{dot}</TooltipTrigger>
- <TooltipContent className={styles.popover}>
- <EventTooltipContent
- eventName={event.name}
- timeOffsetMs={eventTimeMs - spanTimestamp}
- isError={isError}
- attributeMap={event.attributeMap || {}}
- />
- </TooltipContent>
- </TooltipRoot>
- </TooltipProvider>
+ <Tooltip
+ open
+ title={
+ <EventTooltipContent
+ eventName={event.name}
+ timeOffsetMs={eventTimeMs - spanTimestamp}
+ isError={isError}
+ attributeMap={event.attributeMap || {}}
+ />
+ }
+ >
+ {dot}
+ </Tooltip>
);
});
@@ -322,7 +310,9 @@ const SpanOverview = memo(function SpanOverview({
<span className={styles.subtreeCountSlot}>
{span.has_children && (
<span className={styles.subtreeCount}>
- <Badge color="vanilla">{span.sub_tree_node_count}</Badge>
+ <Badge variant="solid" color="secondary">
+ {span.sub_tree_node_count}
+ </Badge>
</span>
)}
</span>
@@ -345,40 +335,30 @@ const SpanOverview = memo(function SpanOverview({
{/* Action buttons — shown on hover via CSS, right-aligned */}
<span className={styles.rowActions}>
- <TooltipProvider delayDuration={200}>
- <TooltipRoot>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- className={styles.actionBtn}
- onClick={onSpanCopy}
- >
- <Link size={12} />
- </Button>
- </TooltipTrigger>
- <TooltipContent className={styles.actionTooltip}>
- Copy Span Link
- </TooltipContent>
- </TooltipRoot>
- <TooltipRoot>
- <TooltipTrigger asChild>
- <Button
- variant="ghost"
- size="icon"
- color="secondary"
- className={styles.actionBtn}
- onClick={handleFunnelClick}
- >
- <ListPlus size={12} />
- </Button>
- </TooltipTrigger>
- <TooltipContent className={styles.actionTooltip}>
- Add to Trace Funnel
- </TooltipContent>
- </TooltipRoot>
- </TooltipProvider>
+ <Tooltip title="Copy Span Link">
+ <Button
+ aria-label="Action"
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ onClick={onSpanCopy}
+ >
+ <Link size={12} />
+ </Button>
+ </Tooltip>
+ <Tooltip title="Add to Trace Funnel">
+ <Button
+ aria-label="Action"
+ variant="ghost"
+ size="sm"
+ icon
+ color="secondary"
+ onClick={handleFunnelClick}
+ >
+ <ListPlus size={12} />
+ </Button>
+ </Tooltip>
</span>
</div>
);
@@ -841,12 +821,6 @@ function Success(props: ISuccessProps): JSX.Element {
const virtualItems = virtualizer.getVirtualItems();
const leftRows = leftTable.getRowModel().rows;
- const handleHoverCardOpenChange = useCallback((open: boolean): void => {
- if (!open) {
- setHoveredSpanId(null);
- }
- }, []);
-
return (
<div className={styles.root}>
{isFetching && <div className={styles.loadingBar} />}
@@ -890,7 +864,6 @@ function Success(props: ISuccessProps): JSX.Element {
/>
<SpanHoverCard
hoveredSpanId={hoveredSpanId}
- onOpenChange={handleHoverCardOpenChange}
anchorLeft={sidebarWidth}
rowHeight={ROW_HEIGHT}
spans={spans}
diff --git a/frontend/src/pages/TraceDetailsV3/index.tsx b/frontend/src/pages/TraceDetailsV3/index.tsx
index 4538005240..8d4bf635ff 100644
--- a/frontend/src/pages/TraceDetailsV3/index.tsx
+++ b/frontend/src/pages/TraceDetailsV3/index.tsx
@@ -26,7 +26,10 @@ import { useTraceDetailLogEvent } from './hooks/useTraceDetailLogEvent';
import NoData from './NoData/NoData';
import TraceStoreSync from './stores/TraceStoreSync';
import { useTraceStore } from './stores/traceStore';
-import { SpanDetailVariant } from './SpanDetailsPanel/constants';
+import {
+ SPAN_DETAILS_PANEL_MIN_WIDTH,
+ SpanDetailVariant,
+} from './SpanDetailsPanel/constants';
import SpanDetailsPanel from './SpanDetailsPanel/SpanDetailsPanel';
import TraceDetailsHeader from './TraceDetailsHeader/TraceDetailsHeader';
import { FLAMEGRAPH_SPAN_LIMIT } from './TraceFlamegraph/constants';
@@ -307,7 +310,7 @@ function TraceDetailsV3(): JSX.Element {
) as SpanDetailVariant) || SpanDetailVariant.DOCKED_RIGHT,
);
- const RIGHT_DOCK_MIN = 480;
+ const RIGHT_DOCK_MIN = SPAN_DETAILS_PANEL_MIN_WIDTH;
const RIGHT_DOCK_MAX = 720;
const [rightDockWidth, setRightDockWidth] = useState(RIGHT_DOCK_MIN);
diff --git a/frontend/src/pages/TraceDetailsV3/stories/TraceDetailsV3.stories.tsx b/frontend/src/pages/TraceDetailsV3/stories/TraceDetailsV3.stories.tsx
index 019d23de87..3f9ea58d58 100644
--- a/frontend/src/pages/TraceDetailsV3/stories/TraceDetailsV3.stories.tsx
+++ b/frontend/src/pages/TraceDetailsV3/stories/TraceDetailsV3.stories.tsx
@@ -163,11 +163,7 @@ export const Tooltips: Story = {
}, untilLoaded);
// The dot opens its card on a 200ms timer rather than on the event itself.
- await waitFor(() => {
- if (!document.querySelector('[class*="popover"]')) {
- throw new Error('event popover did not open');
- }
- }, untilLoaded);
+ await screen.findByRole('tooltip', { name: /event details/i }, untilLoaded);
},
};
diff --git a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.styles.scss b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.styles.scss
index 581cd9b10b..cb70a2bc9c 100644
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.styles.scss
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.styles.scss
@@ -34,11 +34,6 @@
}
}
}
-
- .error__switch {
- opacity: 0.5;
- cursor: not-allowed;
- }
}
.step-popover {
diff --git a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx
index e953b0beed..8cc37a87ae 100644
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx
@@ -1,6 +1,6 @@
import { useMemo, useState } from 'react';
import { Button, Form, Space, Tooltip } from 'antd';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownItemType } from '@signozhq/ui/dropdown';
import { Divider } from '@signozhq/ui/divider';
import { Switch } from '@signozhq/ui/switch';
import cx from 'classnames';
@@ -38,19 +38,18 @@ function FunnelStep({
const [isAddDetailsModalOpen, setIsAddDetailsModalOpen] =
useState<boolean>(false);
- const latencyPointerItems: MenuItem[] = [
+ const latencyPointerItems: DropdownItemType[] = [
{
type: 'radio-group',
+ name: 'latency-pointer',
value: stepData.latency_pointer,
onChange: (value): void =>
onStepChange(index, {
latency_pointer: value as FunnelStepData['latency_pointer'],
}),
- children: LatencyPointers.map((option) => ({
- type: 'radio',
- key: option.value,
- label: option.key,
+ items: LatencyPointers.map((option) => ({
value: option.value,
+ label: option.key,
})),
},
];
@@ -200,7 +199,9 @@ function FunnelStep({
<div className="funnel-step__footer">
<div className="error">
<Switch
- className="error__switch"
+ color="primary"
+ textPlacement="right"
+ disabledTooltip="You need edit permissions to change this step"
value={stepData.has_errors}
disabled={!hasEditPermission}
onChange={(): void =>
@@ -212,7 +213,12 @@ function FunnelStep({
<div className="latency-pointer">
<div className="latency-pointer__label">Latency pointer</div>
{hasEditPermission ? (
- <DropdownMenuSimple menu={{ items: latencyPointerItems }}>
+ <Dropdown
+ items={latencyPointerItems}
+ nativeButton={false}
+ align="end"
+ side="bottom"
+ >
<Space data-testid={`funnel-step-latency-pointer-${index}`}>
{
LatencyPointers.find(
@@ -221,7 +227,7 @@ function FunnelStep({
}
<ChevronDown size={14} color="var(--bg-vanilla-400)" />
</Space>
- </DropdownMenuSimple>
+ </Dropdown>
) : (
<Space>
{
diff --git a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/InterStepConfig.tsx b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/InterStepConfig.tsx
index ed00d54da2..79e8b84688 100644
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/InterStepConfig.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/InterStepConfig.tsx
@@ -31,6 +31,7 @@ function InterStepConfig({
value={step.latency_type ?? LatencyOptions.P99}
options={options}
disabled={!hasEditPermission}
+ disabledTooltip="You need edit permissions to change the latency type"
onChange={
hasEditPermission
? (value): void =>
diff --git a/frontend/src/pages/TracesModulePage/stories/TracesModulePage.stories.tsx b/frontend/src/pages/TracesModulePage/stories/TracesModulePage.stories.tsx
index c96b26524d..cc7e38e3af 100644
--- a/frontend/src/pages/TracesModulePage/stories/TracesModulePage.stories.tsx
+++ b/frontend/src/pages/TracesModulePage/stories/TracesModulePage.stories.tsx
@@ -47,7 +47,7 @@ const openQuickFiltersSettings = async (): Promise<void> => {
const control = await waitFor(() => {
const settings = screen.getByTestId('settings-icon-container');
- expect(settings).toBeEnabled();
+ expect(settings).not.toHaveAttribute('aria-disabled', 'true');
return settings;
}, untilLoaded);
diff --git a/frontend/src/periscope/components/BetaTag/BetaTag.tsx b/frontend/src/periscope/components/BetaTag/BetaTag.tsx
index fd333e003f..c735c5b70e 100644
--- a/frontend/src/periscope/components/BetaTag/BetaTag.tsx
+++ b/frontend/src/periscope/components/BetaTag/BetaTag.tsx
@@ -1,5 +1,9 @@
import { Badge } from '@signozhq/ui/badge';
export default function BetaTag(): JSX.Element {
- return <Badge color="robin">Beta</Badge>;
+ return (
+ <Badge variant="solid" color="primary">
+ Beta
+ </Badge>
+ );
}
diff --git a/frontend/src/periscope/components/CopyButton/CopyButton.module.scss b/frontend/src/periscope/components/CopyButton/CopyButton.module.scss
index b412f16cb5..8d4e983ef0 100644
--- a/frontend/src/periscope/components/CopyButton/CopyButton.module.scss
+++ b/frontend/src/periscope/components/CopyButton/CopyButton.module.scss
@@ -1,8 +1,3 @@
-// Square copy button whose icon cross-fades between copy and check.
-.copyButton {
- flex-shrink: 0;
-}
-
// Both icons occupy the same box; only one is visible at a time.
.iconStack {
position: relative;
diff --git a/frontend/src/periscope/components/CopyButton/CopyButton.tsx b/frontend/src/periscope/components/CopyButton/CopyButton.tsx
index c214922dbc..d7509ba817 100644
--- a/frontend/src/periscope/components/CopyButton/CopyButton.tsx
+++ b/frontend/src/periscope/components/CopyButton/CopyButton.tsx
@@ -13,8 +13,6 @@ export interface CopyButtonProps {
size?: number;
/** Accessible label for the idle (not-yet-copied) state. Default "Copy". */
ariaLabel?: string;
- /** Extra class merged onto the button. */
- className?: string;
testId?: string;
/** Called after the copy is triggered (e.g. to show a toast). */
onCopy?: () => void;
@@ -29,7 +27,6 @@ function CopyButton({
value,
size = 14,
ariaLabel = 'Copy',
- className,
testId,
onCopy,
}: CopyButtonProps): JSX.Element {
@@ -50,8 +47,8 @@ function CopyButton({
<Button
variant="ghost"
color="secondary"
- size="icon"
- className={cx(styles.copyButton, className)}
+ size="sm"
+ icon
onClick={handleClick}
aria-label={isCopied ? 'Copied' : ariaLabel}
testId={testId}
@@ -67,7 +64,6 @@ function CopyButton({
CopyButton.defaultProps = {
size: 14,
ariaLabel: 'Copy',
- className: undefined,
testId: undefined,
onCopy: undefined,
};
diff --git a/frontend/src/periscope/components/DataViewer/DataViewer.tsx b/frontend/src/periscope/components/DataViewer/DataViewer.tsx
index b1da1375bd..62a8324226 100644
--- a/frontend/src/periscope/components/DataViewer/DataViewer.tsx
+++ b/frontend/src/periscope/components/DataViewer/DataViewer.tsx
@@ -1,5 +1,5 @@
import { CSSProperties, useMemo, useState } from 'react';
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+import { ToggleGroup } from '@signozhq/ui/toggle-group';
import logEvent from 'api/common/logEvent';
import CopyButton from 'periscope/components/CopyButton/CopyButton';
import { JsonView } from 'periscope/components/JsonView';
@@ -71,7 +71,9 @@ function DataViewer({
}
>
<div className="data-viewer__toolbar">
- <ToggleGroupSimple
+ <ToggleGroup
+ variant="outlined"
+ color="secondary"
type="single"
size="sm"
value={viewMode}
diff --git a/frontend/src/periscope/components/ExpandableValue/ExpandableValue.module.scss b/frontend/src/periscope/components/ExpandableValue/ExpandableValue.module.scss
index b9ec0c11af..aacdf38bc6 100644
--- a/frontend/src/periscope/components/ExpandableValue/ExpandableValue.module.scss
+++ b/frontend/src/periscope/components/ExpandableValue/ExpandableValue.module.scss
@@ -14,7 +14,10 @@
flex-direction: column;
gap: 8px;
max-width: 480px;
- padding: 8px;
+
+ > [data-slot='button'] {
+ align-self: flex-end;
+ }
}
.preview {
@@ -28,10 +31,6 @@
line-height: 1.4;
}
-.expandButton {
- align-self: flex-end;
-}
-
.dialog {
max-width: 80vw;
width: 80vw;
diff --git a/frontend/src/periscope/components/ExpandableValue/ExpandableValue.tsx b/frontend/src/periscope/components/ExpandableValue/ExpandableValue.tsx
index 7d52489680..57991962af 100644
--- a/frontend/src/periscope/components/ExpandableValue/ExpandableValue.tsx
+++ b/frontend/src/periscope/components/ExpandableValue/ExpandableValue.tsx
@@ -1,12 +1,7 @@
import { ReactNode, useState } from 'react';
import { Button } from '@signozhq/ui/button';
import { DialogWrapper } from '@signozhq/ui/dialog';
-import {
- TooltipContent,
- TooltipProvider,
- TooltipRoot,
- TooltipTrigger,
-} from '@signozhq/ui/tooltip';
+import { Tooltip } from '@signozhq/ui/tooltip';
import { Fullscreen } from '@signozhq/icons';
import styles from './ExpandableValue.module.scss';
@@ -38,29 +33,26 @@ function ExpandableValue({
}
return (
- <TooltipProvider>
- <TooltipRoot>
- <TooltipTrigger asChild>
- <span className={styles.trigger}>{children}</span>
- </TooltipTrigger>
- <TooltipContent
- className={styles.tooltipContent}
- side="top"
- style={{ zIndex }}
- >
- <pre className={styles.preview}>{value}</pre>
- <Button
- variant="outlined"
- color="secondary"
- size="sm"
- prefix={<Fullscreen size={14} />}
- onClick={(): void => setIsDialogOpen(true)}
- className={styles.expandButton}
- >
- Expand
- </Button>
- </TooltipContent>
- </TooltipRoot>
+ <>
+ <Tooltip
+ side="top"
+ title={
+ <div className={styles.tooltipContent}>
+ <pre className={styles.preview}>{value}</pre>
+ <Button
+ variant="outlined"
+ color="secondary"
+ size="sm"
+ prefix={<Fullscreen size={14} />}
+ onClick={(): void => setIsDialogOpen(true)}
+ >
+ Expand
+ </Button>
+ </div>
+ }
+ >
+ <span className={styles.trigger}>{children}</span>
+ </Tooltip>
<DialogWrapper
title={title}
@@ -71,7 +63,7 @@ function ExpandableValue({
>
<pre className={styles.fullValue}>{value}</pre>
</DialogWrapper>
- </TooltipProvider>
+ </>
);
}
diff --git a/frontend/src/periscope/components/JsonView/JsonView.tsx b/frontend/src/periscope/components/JsonView/JsonView.tsx
index 1317cc6353..1c1db14ba1 100644
--- a/frontend/src/periscope/components/JsonView/JsonView.tsx
+++ b/frontend/src/periscope/components/JsonView/JsonView.tsx
@@ -84,6 +84,8 @@ function JsonView({
<div className="json-view__wrap-toggle">
<Typography.Text>Wrap text</Typography.Text>
<Switch
+ color="primary"
+ textPlacement="right"
value={isWrapWord}
onChange={(checked): void => setIsWrapWord(checked)}
/>
diff --git a/frontend/src/periscope/components/LineClampedText/LineClampedText.tsx b/frontend/src/periscope/components/LineClampedText/LineClampedText.tsx
index 9b116c3016..fda416f688 100644
--- a/frontend/src/periscope/components/LineClampedText/LineClampedText.tsx
+++ b/frontend/src/periscope/components/LineClampedText/LineClampedText.tsx
@@ -45,16 +45,18 @@ function LineClampedText({
</div>
);
- return isOverflowing ? (
+ return (
<Tooltip
- title={<div onClick={(e): void => e.stopPropagation()}>{text}</div>}
+ title={
+ isOverflowing ? (
+ <div onClick={(e): void => e.stopPropagation()}>{text}</div>
+ ) : undefined
+ }
overlayClassName="line-clamped-wrapper"
{...tooltipProps}
>
{content}
</Tooltip>
- ) : (
- content
);
}
diff --git a/frontend/src/periscope/components/PrettyView/PrettyView.styles.scss b/frontend/src/periscope/components/PrettyView/PrettyView.styles.scss
index 7f826b261b..559d7aff65 100644
--- a/frontend/src/periscope/components/PrettyView/PrettyView.styles.scss
+++ b/frontend/src/periscope/components/PrettyView/PrettyView.styles.scss
@@ -102,15 +102,15 @@
// Keep actions visible on hover, or while this row's menu is open
&:hover .pretty-view__actions,
- &:has(> span [data-state='open']) .pretty-view__actions {
+ &:has(> span [data-popup-open]) .pretty-view__actions {
opacity: 1;
}
// Edge-to-edge highlight, bled past indentation, clipped by `> ul`.
// Persists while this row's ... menu is open (the trigger stays in the
- // row and carries data-state=open, even though the menu is portaled out).
+ // row and carries data-popup-open, even though the menu is portaled out).
&:hover::before,
- &:has(> span [data-state='open'])::before {
+ &:has(> span [data-popup-open])::before {
content: '';
position: absolute;
inset: 0 -9999px;
@@ -127,7 +127,7 @@
// while the row is active (hover, or its ... menu open). !important
// overrides react-json-tree's per-type inline color on the value span.
&:hover > span,
- &:has(> span [data-state='open']) > span {
+ &:has(> span [data-popup-open]) > span {
color: var(--l1-foreground-hover) !important;
}
}
@@ -148,7 +148,7 @@
// menu is open — `> span` scopes it so a child row's open menu (nested
// in `> ul`) doesn't light up this parent.
&:hover::before,
- &:has(> span [data-state='open'])::before {
+ &:has(> span [data-popup-open])::before {
content: '';
position: absolute;
top: 0;
@@ -160,7 +160,7 @@
}
&:hover > label + span .pretty-view__actions,
- &:has(> span [data-state='open']) > label + span .pretty-view__actions {
+ &:has(> span [data-popup-open]) > label + span .pretty-view__actions {
opacity: 1;
}
@@ -200,6 +200,10 @@
}
}
+ &__actions-boundary {
+ display: contents;
+ }
+
// ... actions button — hidden by default, shown on row hover
&__actions {
opacity: 0;
@@ -259,9 +263,3 @@
}
}
}
-
-// Field-action dropdown is rendered in a portal; bump above FloatingPanel
-// (z-index 999) so it stays visible when the consumer panel is floating.
-.pretty-view-actions-dropdown {
- --dropdown-menu-content-z-index: 1000;
-}
diff --git a/frontend/src/periscope/components/PrettyView/PrettyView.tsx b/frontend/src/periscope/components/PrettyView/PrettyView.tsx
index a58f697d87..82a1592485 100644
--- a/frontend/src/periscope/components/PrettyView/PrettyView.tsx
+++ b/frontend/src/periscope/components/PrettyView/PrettyView.tsx
@@ -1,8 +1,8 @@
-import { useCallback, useMemo } from 'react';
+import { type ReactElement, useCallback, useMemo } from 'react';
import { JSONTree, KeyPath } from 'react-json-tree';
import { useCopyToClipboard } from 'react-use';
import { Copy, Ellipsis, Pin, PinOff } from '@signozhq/icons';
-import { DropdownMenuSimple as Dropdown } from '@signozhq/ui/dropdown-menu';
+import { Dropdown, type DropdownActionItemType } from '@signozhq/ui/dropdown';
import { Input } from '@signozhq/ui/input';
import { toast } from '@signozhq/ui/sonner';
import { useIsDarkMode } from 'hooks/useDarkMode';
@@ -26,18 +26,10 @@ export interface FieldContext {
isNested: boolean;
}
-interface MenuItem {
- key: string;
- label: React.ReactNode;
- icon?: React.ReactNode;
- disabled?: boolean;
- onClick: () => void;
-}
-
export interface PrettyViewAction {
key: string;
label: React.ReactNode;
- icon?: React.ReactNode;
+ icon?: ReactElement;
onClick: (context: FieldContext) => void;
/**
* If provided, action is hidden when this returns true. Receives the leaf
@@ -140,15 +132,16 @@ function PrettyView({
);
const buildMenuItems = useCallback(
- (context: FieldContext): MenuItem[] => {
- const items: MenuItem[] = [];
+ (context: FieldContext): DropdownActionItemType[] => {
+ const items: DropdownActionItemType[] = [];
// Copy Value action
if (isActionVisible('copy', context.isNested)) {
items.push({
- key: 'copy-value',
+ type: 'item',
+ value: 'copy-value',
label: 'Copy Value',
- icon: <Copy size={12} />,
+ prefix: <Copy size={12} />,
onClick: (): void => {
const text =
typeof context.fieldValue === 'object'
@@ -170,9 +163,10 @@ function PrettyView({
const pinned = isPinned(serialized);
items.push({
- key: 'pin',
+ type: 'item',
+ value: 'pin',
label: pinned ? 'Unpin field' : 'Pin field',
- icon: pinned ? <PinOff size={12} /> : <Pin size={12} />,
+ prefix: pinned ? <PinOff size={12} /> : <Pin size={12} />,
onClick: (): void => {
togglePin(resolvedPath);
},
@@ -194,9 +188,10 @@ function PrettyView({
);
visibleCustomActions.forEach((action) => {
items.push({
- key: action.key,
+ type: 'item',
+ value: action.key,
label: action.label,
- icon: action.icon,
+ prefix: action.icon,
onClick: (): void => {
action.onClick(context);
},
@@ -233,25 +228,26 @@ function PrettyView({
return (
<span className="pretty-view__value-row">
<span>{content}</span>
- <Dropdown
- menu={{ items: menuItems }}
- align="start"
- className="pretty-view-actions-dropdown"
- // Stop click bubbling so item clicks don't reach clickable ancestors
- // of the trigger through the React tree.
- onClick={(e: React.MouseEvent): void => e.stopPropagation()}
+ {/* The menu is portalled, but its clicks still bubble through the React
+ tree to react-json-tree's expand toggle around getItemString. */}
+ <span
+ role="presentation"
+ className="pretty-view__actions-boundary"
+ onClick={(e): void => {
+ e.stopPropagation();
+ }}
>
- <span
- className="pretty-view__actions"
- onClick={(e): void => {
- e.stopPropagation();
- }}
- role="button"
- tabIndex={0}
+ <Dropdown
+ items={menuItems}
+ nativeButton={false}
+ align="start"
+ side="bottom"
>
- <Ellipsis size={12} />
- </span>
- </Dropdown>
+ <span className="pretty-view__actions" role="button" tabIndex={0}>
+ <Ellipsis size={12} />
+ </span>
+ </Dropdown>
+ </span>
</span>
);
},
diff --git a/frontend/src/periscope/components/PrettyView/__tests__/PrettyView.test.tsx b/frontend/src/periscope/components/PrettyView/__tests__/PrettyView.test.tsx
new file mode 100644
index 0000000000..085d244ff5
--- /dev/null
+++ b/frontend/src/periscope/components/PrettyView/__tests__/PrettyView.test.tsx
@@ -0,0 +1,37 @@
+import { render, screen, userEvent, within } from 'tests/test-utils';
+
+import PrettyView from '../PrettyView';
+
+jest.mock('react-use', () => ({
+ ...jest.requireActual('react-use'),
+ useCopyToClipboard: (): [unknown, jest.Mock] => [{}, jest.fn()],
+}));
+
+jest.mock('@signozhq/ui/sonner', () => ({
+ ...jest.requireActual('@signozhq/ui/sonner'),
+ toast: { success: jest.fn(), error: jest.fn() },
+}));
+
+describe('PrettyView', () => {
+ it('keeps a nested node expanded when one of its menu actions is picked', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ render(
+ <PrettyView
+ data={{ resource: { 'service.name': 'checkout' } }}
+ searchable={false}
+ />,
+ );
+ expect(screen.getByText(/checkout/)).toBeInTheDocument();
+
+ const nestedRow = screen
+ .getByText(/1 key/)
+ .closest<HTMLElement>('.pretty-view__value-row');
+ if (!nestedRow) {
+ throw new Error('Nested row not found');
+ }
+ await user.click(within(nestedRow).getByRole('button'));
+ await user.click(await screen.findByRole('menuitem', { name: 'Copy Value' }));
+
+ expect(screen.getByText(/checkout/)).toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/periscope/components/Tabs2/Tabs2.tsx b/frontend/src/periscope/components/Tabs2/Tabs2.tsx
index 39160d9ffc..6e733f8036 100644
--- a/frontend/src/periscope/components/Tabs2/Tabs2.tsx
+++ b/frontend/src/periscope/components/Tabs2/Tabs2.tsx
@@ -69,7 +69,11 @@ function Tabs2({
>
{tab.label}
- {tab.isBeta && <Badge color="robin">Beta</Badge>}
+ {tab.isBeta && (
+ <Badge variant="solid" color="primary">
+ Beta
+ </Badge>
+ )}
</Button>
))}
</Button.Group>
diff --git a/frontend/src/periscope/components/TrimmedText/TrimmedText.tsx b/frontend/src/periscope/components/TrimmedText/TrimmedText.tsx
index 1e0ac518d1..b880709915 100644
--- a/frontend/src/periscope/components/TrimmedText/TrimmedText.tsx
+++ b/frontend/src/periscope/components/TrimmedText/TrimmedText.tsx
@@ -18,12 +18,10 @@ function TrimmedText({
}
}, [text, maxCharacters]);
- return text.length > maxCharacters ? (
- <Tooltip title={text}>
+ return (
+ <Tooltip title={text.length > maxCharacters ? text : undefined}>
<span>{displayText}</span>
</Tooltip>
- ) : (
- <span>{displayText}</span>
);
}
diff --git a/frontend/src/storybook/README.md b/frontend/src/storybook/README.md
index 0dfe12ee7e..52abc2da24 100644
--- a/frontend/src/storybook/README.md
+++ b/frontend/src/storybook/README.md
@@ -384,13 +384,12 @@ Hovering cannot do this. Radix dispatches a `tooltip.open` event on `document`
when a tooltip opens, and every mounted tooltip closes itself on it, so exactly
one is open at a time no matter how many providers the tree has. A tooltip whose
`open` is controlled ignores the event, which is what the alias passes:
-`mocks/tooltip.mock.tsx` wraps `TooltipSimple` and `TooltipRoot` and hands them
-`open` while the control is on.
+`mocks/tooltip.mock.tsx` wraps `Tooltip` and hands it `open` while the control is on.
-Two cases keep their own state. A tooltip the page already drives, such as
-`SpanHoverCard`, is left alone: only the page knows what its popup is anchored
-to. A tooltip whose title is empty is left alone too, because there is nothing to
-show but the padding of a popup.
+A tooltip the page already drives, such as `SpanHoverCard`, keeps its own state:
+only the page knows what its popup is anchored to. A tooltip whose title is empty
+is held open like any other. It renders no popup unless a nested tooltip, such as
+a `Button`'s `disabledTooltip`, stacks its title into it.
What the control cannot reach is a tooltip that is not mounted: one inside a
closed drawer or modal, one in a row that renders its actions on hover, and
diff --git a/frontend/src/storybook/foundations/FeedbackFixture.tsx b/frontend/src/storybook/foundations/FeedbackFixture.tsx
index b561849f82..8bc96ad9a2 100644
--- a/frontend/src/storybook/foundations/FeedbackFixture.tsx
+++ b/frontend/src/storybook/foundations/FeedbackFixture.tsx
@@ -49,7 +49,13 @@ function FeedbackFixture({ state }: FeedbackFixtureProps): JSX.Element {
return (
<>
{isToastStory && (
- <Button data-testid="show-feedback-toast" onClick={showToast}>
+ <Button
+ size="md"
+ variant="solid"
+ color="primary"
+ testId="show-feedback-toast"
+ onClick={showToast}
+ >
Show feedback
</Button>
)}
@@ -67,14 +73,17 @@ function FeedbackFixture({ state }: FeedbackFixtureProps): JSX.Element {
{(state === 'confirmation' || state === 'toast-over-confirmation') && (
<>
<Button
- data-testid="open-feedback-confirmation"
+ size="md"
+ variant="solid"
+ color="primary"
+ testId="open-feedback-confirmation"
onClick={(): void => setIsConfirmationOpen(true)}
>
Delete environment
</Button>
<ConfirmDialog
cancelText="Cancel"
- confirmColor="destructive"
+ confirmColor="danger"
confirmIcon={<Trash2 size={14} />}
confirmText="Delete environment"
disableOutsideClick
diff --git a/frontend/src/storybook/foundations/TooltipsFixture.tsx b/frontend/src/storybook/foundations/TooltipsFixture.tsx
index 488728c3d8..15aff1824a 100644
--- a/frontend/src/storybook/foundations/TooltipsFixture.tsx
+++ b/frontend/src/storybook/foundations/TooltipsFixture.tsx
@@ -88,7 +88,7 @@ function TooltipsFixture({ site }: TooltipsFixtureProps): JSX.Element {
return (
<div className={styles.fixture}>
<AuthZTooltip checks={DENIED_CHECKS}>
- <Button color="primary" variant="solid">
+ <Button size="md" color="primary" variant="solid">
Create service account
</Button>
</AuthZTooltip>
diff --git a/frontend/src/storybook/mocks/tooltip.mock.tsx b/frontend/src/storybook/mocks/tooltip.mock.tsx
index e26ddb1b3e..175b910e4f 100644
--- a/frontend/src/storybook/mocks/tooltip.mock.tsx
+++ b/frontend/src/storybook/mocks/tooltip.mock.tsx
@@ -3,13 +3,9 @@
// here would resolve back to itself; the barrel is the only specifier left that
// reaches the real components, and it never runs under jest.
import {
- TooltipContent as UiTooltipContent,
TooltipProvider as UiTooltipProvider,
- TooltipRoot as UiTooltipRoot,
- TooltipSimple as UiTooltipSimple,
- TooltipTrigger as UiTooltipTrigger,
- type TooltipRootProps,
- type TooltipSimpleProps,
+ Tooltip as UiTooltip,
+ type TooltipProps,
// eslint-disable-next-line signoz/no-signozhq-ui-barrel
} from '@signozhq/ui';
import { forwardRef } from 'react';
@@ -25,47 +21,28 @@ import { heldOpenState } from './tooltipsHeldOpen';
* over a relative path the alias does not match. The app therefore still sees
* one tooltip context rather than two that cannot talk to each other.
*/
-const HeldTooltipSimple = forwardRef<HTMLButtonElement, TooltipSimpleProps>(
+const HeldTooltip = forwardRef<HTMLButtonElement, TooltipProps>(
(props, ref) => (
- <UiTooltipSimple
- {...props}
- ref={ref}
- open={heldOpenState(props.open, props.title)}
- />
+ <UiTooltip {...props} ref={ref} open={heldOpenState(props.open)} />
),
);
-HeldTooltipSimple.displayName = 'TooltipSimple';
-
-function HeldTooltipRoot({ open, ...props }: TooltipRootProps): JSX.Element {
- return <UiTooltipRoot {...props} open={heldOpenState(open, true)} />;
-}
+HeldTooltip.displayName = 'Tooltip';
/**
* The annotation checks the module's shape against the real one, so an export
* added to the tooltip module fails to compile here rather than at render.
*/
const tooltipModule: typeof import('@signozhq/ui/tooltip') = {
- TooltipContent: UiTooltipContent,
TooltipProvider: UiTooltipProvider,
- TooltipRoot: HeldTooltipRoot,
- TooltipSimple: HeldTooltipSimple,
- TooltipTrigger: UiTooltipTrigger,
+ Tooltip: HeldTooltip,
};
-export const {
- TooltipContent,
- TooltipProvider,
- TooltipRoot,
- TooltipSimple,
- TooltipTrigger,
-} = tooltipModule;
+export const { TooltipProvider, Tooltip } = tooltipModule;
export type {
- TooltipContentProps,
+ TooltipContainer,
TooltipProviderProps,
- TooltipRootProps,
- TooltipSimpleProps,
- TooltipTriggerProps,
+ TooltipProps,
// eslint-disable-next-line signoz/no-signozhq-ui-barrel
} from '@signozhq/ui';
diff --git a/frontend/src/storybook/mocks/tooltipsHeldOpen.ts b/frontend/src/storybook/mocks/tooltipsHeldOpen.ts
index e9b368f48f..160d31b5b8 100644
--- a/frontend/src/storybook/mocks/tooltipsHeldOpen.ts
+++ b/frontend/src/storybook/mocks/tooltipsHeldOpen.ts
@@ -1,5 +1,3 @@
-import type { ReactNode } from 'react';
-
let held = false;
/** Set from the Tooltips control, through `globals/tooltipMocks.ts`. */
@@ -12,15 +10,9 @@ export const holdTooltipsOpen = (value: boolean): void => {
*
* A tooltip the page opens itself keeps its own state: only the page knows what
* the popup is anchored to, and holding it open renders whatever it carries
- * while closed. An empty title has no popup to show, only the padding of one.
+ * while closed. An empty title is held open too: it renders no popup unless a
+ * nested tooltip (a `Button`'s `disabledTooltip`) stacks into it, and that popup
+ * must not switch from uncontrolled to controlled once the title fills in.
*/
-export const heldOpenState = (
- own: boolean | undefined,
- title: ReactNode,
-): boolean | undefined => {
- if (own !== undefined || !held) {
- return own;
- }
-
- return title === undefined || title === null || title === '' ? own : true;
-};
+export const heldOpenState = (own: boolean | undefined): boolean | undefined =>
+ own !== undefined || !held ? own : true;
diff --git a/frontend/src/storybook/providers/StorybookProviders.tsx b/frontend/src/storybook/providers/StorybookProviders.tsx
index cb7e6d3a2f..60fc7c717b 100644
--- a/frontend/src/storybook/providers/StorybookProviders.tsx
+++ b/frontend/src/storybook/providers/StorybookProviders.tsx
@@ -1,7 +1,6 @@
import { ReactNode, useEffect, useMemo } from 'react';
import { Router } from 'react-router-dom';
import { CompatRouter } from 'react-router-dom-v5-compat';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import AppPageProviders from '@/app/AppPageProviders';
import AppProviders from '@/app/AppProviders';
import AppShell from '@/app/AppShell';
@@ -51,10 +50,10 @@ const storyRouter: AppLayer = (children) => (
const appLayout: AppLayer = (children) => <AppLayout>{children}</AppLayout>;
const bareLayout: AppLayer = (children) => (
- <TooltipProvider>
+ <>
{children}
<Toaster />
- </TooltipProvider>
+ </>
);
function StorybookProviders({
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index b2d316d98c..e19948b2b2 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -22,6 +22,12 @@ body {
font-style: normal;
background: var(--l1-background) !important;
color: var(--l1-foreground) !important;
+
+ // compatibility changes, to reduce amount of drift
+ // between old code and new components
+ --badge-max-width: min(300px, 100%); // ignore max-width of badges
+ --dropdown-internal-max-block-size: none; // ignore max-height of dropdowns
+ --toggle-group-label-max-inline-size: 300px;
}
body {
@@ -853,8 +859,7 @@ body.bottom-strip-on {
// @signozhq/ui dropdown content portals to body with a default z-index of 50,
// antd defines it at z-index of 1050. Keeping this till we have components from both
// design libraries.
- --dropdown-menu-content-z-index: 1050;
- --dropdown-menu-sub-content-z-index: 1050;
+ --dropdown-z-index: 1050;
--internal-ant-border-color-focus: #3a52a8;
--internal-ant-border-color-hover: #6e8de8;
diff --git a/frontend/src/tests/submitImplicitly.ts b/frontend/src/tests/submitImplicitly.ts
new file mode 100644
index 0000000000..a4b39c8c1b
--- /dev/null
+++ b/frontend/src/tests/submitImplicitly.ts
@@ -0,0 +1,58 @@
+import { fireEvent } from '@testing-library/react';
+
+const FIELDS_BLOCKING_IMPLICIT_SUBMISSION = new Set([
+ 'text',
+ 'search',
+ 'url',
+ 'tel',
+ 'email',
+ 'password',
+ 'date',
+ 'month',
+ 'week',
+ 'time',
+ 'datetime-local',
+ 'number',
+]);
+
+function isSubmitButton(
+ control: Element,
+): control is HTMLButtonElement | HTMLInputElement {
+ return (
+ (control instanceof HTMLButtonElement ||
+ control instanceof HTMLInputElement) &&
+ control.type === 'submit'
+ );
+}
+
+/**
+ * Presses Enter in `field` the way a browser does (HTML implicit submission).
+ *
+ * user-event 14 looks for the submit button with `form.querySelector`, so it
+ * misses one tied to the form through the `form` attribute and submits the
+ * form directly.
+ */
+export function submitImplicitly(field: HTMLInputElement): void {
+ const { form } = field;
+ if (!form) {
+ return;
+ }
+
+ const controls = Array.from(form.elements);
+ const defaultButton = controls.find(isSubmitButton);
+ if (defaultButton) {
+ if (!defaultButton.disabled) {
+ fireEvent.click(defaultButton);
+ }
+ return;
+ }
+
+ const blockingFields = controls.filter(
+ (control) =>
+ control instanceof HTMLInputElement &&
+ FIELDS_BLOCKING_IMPLICIT_SUBMISSION.has(control.type),
+ );
+ if (blockingFields.length === 1) {
+ fireEvent.submit(form);
+ }
+}
diff --git a/frontend/src/tests/test-utils.tsx b/frontend/src/tests/test-utils.tsx
index a9765efdc6..c7d3e15a99 100644
--- a/frontend/src/tests/test-utils.tsx
+++ b/frontend/src/tests/test-utils.tsx
@@ -4,7 +4,6 @@ import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { render, RenderOptions, RenderResult } from '@testing-library/react';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
import { ResourceProvider } from 'hooks/useResourceAttribute';
import { NuqsAdapter } from 'nuqs/adapters/react';
import { AppContext } from 'providers/App/App';
@@ -146,11 +145,9 @@ export function AllTheProviders({
<ResourceProvider>
<ErrorModalProvider>
<TimezoneProvider>
- <TooltipProvider>
- <PreferenceContextProvider>
- {queryBuilderContent}
- </PreferenceContextProvider>
- </TooltipProvider>
+ <PreferenceContextProvider>
+ {queryBuilderContent}
+ </PreferenceContextProvider>
</TimezoneProvider>
</ErrorModalProvider>
</ResourceProvider>
diff --git a/tests/e2e/helpers/alert-forms/v2.ts b/tests/e2e/helpers/alert-forms/v2.ts
index 0e9db43d11..3c6f39a61a 100644
--- a/tests/e2e/helpers/alert-forms/v2.ts
+++ b/tests/e2e/helpers/alert-forms/v2.ts
@@ -71,15 +71,13 @@ export async function elementAtPointClassName(
}
/**
- * Hover the (disabled) Save button and return the antd tooltip's text — this is
+ * Hover the (disabled) Save button and return the tooltip's text — this is
* the only way to read `validateCreateAlertState`'s message, since the button
* cannot be clicked while a message exists.
*/
export async function v2SaveTooltip(page: Page): Promise<string> {
- // The tooltip anchors to the wrapper span, not the disabled button: a disabled
- // button emits no pointer events, so hovering it directly never opens.
- await v2SaveButton(page).locator('xpath=..').hover();
- const tooltip = page.locator('.ant-tooltip-inner').first();
+ await v2SaveButton(page).hover();
+ const tooltip = page.locator('[data-slot="tooltip-content"]').first();
await expect(tooltip).toBeVisible();
return (await tooltip.innerText()).trim();
}
diff --git a/tests/e2e/helpers/logs-explorer.ts b/tests/e2e/helpers/logs-explorer.ts
index 01e2620ac8..f5653b416c 100644
--- a/tests/e2e/helpers/logs-explorer.ts
+++ b/tests/e2e/helpers/logs-explorer.ts
@@ -92,7 +92,7 @@ export async function openLogDetailsFromRow(row: Locator): Promise<void> {
export async function openContextView(page: Page): Promise<void> {
await page
- .locator('.views-tabs')
+ .getByTestId('log-detail-views-tabs')
.getByText('Context', { exact: true })
.click();
await expect(contextLogItems(page).first()).toBeVisible();
diff --git a/tests/e2e/helpers/quick-filters.ts b/tests/e2e/helpers/quick-filters.ts
index 01a0b8babd..a3607ad5d1 100644
--- a/tests/e2e/helpers/quick-filters.ts
+++ b/tests/e2e/helpers/quick-filters.ts
@@ -45,10 +45,6 @@ function settingsPanel(page: Page): Locator {
.filter({ hasText: SETTINGS_PANEL_TITLE });
}
-function settingsGearContainer(page: Page): Locator {
- return page.getByTestId(SETTINGS_ICON_TEST_ID).locator('..');
-}
-
/** Minimal filter set so `isDynamicFilters` is true and the settings gear renders. */
export async function seedCustomFiltersViaApi(
page: Page,
@@ -102,7 +98,6 @@ export async function assertQuickFiltersSettingsDrawerClosed(
page: Page,
): Promise<void> {
await expect(page.getByText(SETTINGS_PANEL_TITLE)).toBeHidden();
- await expect(settingsGearContainer(page)).not.toHaveClass(/active/);
// Collapsed panel keeps the `hidden` class (width: 0). Assert the class, not
// toBeVisible() — a zero-width element is never "visible" to Playwright.
await expect(page.locator('.quick-filters-settings')).toHaveClass(/hidden/);
@@ -128,7 +123,6 @@ export async function assertQuickFiltersSettingsDrawerOpen(
const panel = settingsPanel(page);
const filtersColumn = page.locator('.quick-filters');
- await expect(settingsGearContainer(page)).toHaveClass(/active/);
await expect(panel).toBeVisible();
await expect(panel).not.toHaveClass(/hidden/);
await expect(page.getByText(SETTINGS_PANEL_TITLE)).toBeVisible();
diff --git a/tests/e2e/helpers/trace-details.ts b/tests/e2e/helpers/trace-details.ts
index aef9024e05..6787410da6 100644
--- a/tests/e2e/helpers/trace-details.ts
+++ b/tests/e2e/helpers/trace-details.ts
@@ -1,6 +1,6 @@
import { randomBytes } from 'crypto';
-import type { APIRequestContext, Page } from '@playwright/test';
+import { expect, type APIRequestContext, type Page } from '@playwright/test';
import largeTraceRecords from '../testdata/traces/large-trace.json';
import { authToken, seederUrl } from './common';
@@ -136,6 +136,12 @@ export async function changeColourByViaMenu(
await page
.getByRole('menuitemradio', { name: fieldName, exact: true })
.click();
+ await expect(async () => {
+ if (await page.getByRole('menu').count()) {
+ await page.keyboard.press('Escape');
+ }
+ await expect(page.getByRole('menu')).toHaveCount(0, { timeout: 500 });
+ }).toPass();
}
// ── Large trace fixture (tests/e2e/testdata/traces/large-trace.json) ─────────
diff --git a/tests/e2e/tests/alerts/create/v2.spec.ts b/tests/e2e/tests/alerts/create/v2.spec.ts
index 6bc4cc8722..cb39146f47 100644
--- a/tests/e2e/tests/alerts/create/v2.spec.ts
+++ b/tests/e2e/tests/alerts/create/v2.spec.ts
@@ -554,8 +554,7 @@ test.describe('Alert create — v2 builder', () => {
// `disableButtons` is one flag shared by all three, so Discard going disabled is
// what proves a user cannot abandon a half-created rule mid-request.
- await expect(page.getByTestId('save-alert-rule-loader-icon')).toBeVisible();
- await expect(page.getByTestId('save-alert-rule-check-icon')).toHaveCount(0);
+ await expect(v2SaveButton(page)).toHaveAttribute('aria-busy', 'true');
await expect(v2SaveButton(page)).toBeDisabled();
await expect(v2TestButton(page)).toBeDisabled();
await expect(v2DiscardButton(page)).toBeDisabled();
diff --git a/tests/e2e/tests/dashboards/details/12-sections.spec.ts b/tests/e2e/tests/dashboards/details/12-sections.spec.ts
index 31025011b6..8f9b79f631 100644
--- a/tests/e2e/tests/dashboards/details/12-sections.spec.ts
+++ b/tests/e2e/tests/dashboards/details/12-sections.spec.ts
@@ -449,7 +449,7 @@ test.describe('Dashboard Detail — Sections', () => {
const sectionName = `Temp Section ${Date.now()}`;
await page.getByTestId('options').click();
- await page.getByRole('button', { name: 'New section' }).click();
+ await page.getByRole('menuitem', { name: 'New section' }).click();
const newSectionDialog = page.getByRole('dialog', { name: 'New Section' });
await expect(newSectionDialog).toBeVisible();
diff --git a/tests/e2e/tests/sso/auth-domains.spec.ts b/tests/e2e/tests/sso/auth-domains.spec.ts
index c833cd7944..404e56369c 100644
--- a/tests/e2e/tests/sso/auth-domains.spec.ts
+++ b/tests/e2e/tests/sso/auth-domains.spec.ts
@@ -134,9 +134,7 @@ test.describe('SSO auth domains', () => {
await openConfigureAuthDomain(page, domain);
await page.getByTestId('google-auth-workspace-groups-header').click();
- const fetchGroups = page
- .getByTestId('google-auth-fetch-groups')
- .getByRole('checkbox');
+ const fetchGroups = page.getByRole('checkbox', { name: 'Fetch Groups' });
await expect(fetchGroups).toBeChecked();
await expect(
page