Skip to content

Commit

Permalink
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
Browse files Browse the repository at this point in the history
…e-v2
  • Loading branch information
OliwiaGowor committed Jan 14, 2025
2 parents 34644e6 + 31d0526 commit 150d427
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 25 deletions.
2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"start": "SSL_CERT_FILE=certs.pem NODE_ENV=development nodemon --exec babel-node index.js",
"build": "webpack --mode=production",
"start:prod": "SSL_CERT_FILE=certs.pem NODE_ENV=production node backend-production.js",
"start:prod": "SSL_CERT_FILE=certs.pem NODE_ENV=production node --max-http-header-size 24576 backend-production.js",
"test": "jest"
},
"keywords": [],
Expand Down
14 changes: 11 additions & 3 deletions src/components/Extensibility/components/Badge.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,23 @@ export function Badge({

type = TYPE_FALLBACK.get(type) || type;

const getTooltipContent = description => {
if (tooltip && !tooltipError) {
return tooltip;
}
if (!tooltip && !tooltipError) {
return '';
}
return description;
};

return isNil(value) ? (
emptyLeafPlaceholder
) : structure?.description ? (
<StatusBadge
autoResolveType={!type}
type={type}
tooltipContent={
tooltip && !tooltipError ? tooltip : structure.description
}
tooltipContent={getTooltipContent(structure.description)}
>
{tExt(value)}
</StatusBadge>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/Namespaces/ResourcesUsage.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export const ResourcesUsage = ({ namespace }) => {
pollingInterval: 3300,
},
);

if (resourceQuotas?.length < 1) return null;
return (
<>
<div className="item-wrapper tall">
Expand Down
58 changes: 39 additions & 19 deletions tests/lighthouse/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/lighthouse/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "npx playwright test"
},
"devDependencies": {
"@playwright/test": "^1.44.0",
"@playwright/test": "^1.49.1",
"lighthouse": "^12.0.0",
"playwright": "^1.44.0",
"playwright-lighthouse": "^4.0.0",
Expand Down

0 comments on commit 150d427

Please sign in to comment.