Skip to content

Commit 55fd928

Browse files
committed
Merge branch 'main' of https://github.com/kyma-project/busola into post-conversations
2 parents 102719b + 4368dfe commit 55fd928

File tree

20 files changed

+146
-92
lines changed

20 files changed

+146
-92
lines changed

.github/workflows/accessibility-tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ on:
77
types: [opened, edited, synchronize, reopened, ready_for_review]
88
paths:
99
- '.github/workflows/accessibility-tests.yml'
10-
- 'tests/integration/tests/accessibility/**'
11-
- 'tests/integration/support/**'
10+
- 'resources/**'
11+
- 'tests/integration/**'
12+
- 'nginx/**'
13+
- 'src/**'
14+
- 'backend/**'
15+
- 'kyma/**'
16+
- 'Dockerfile*'
1217

1318
jobs:
1419
run-accessibility-tests:
@@ -36,11 +41,12 @@ jobs:
3641
shell: bash
3742
env:
3843
ACC_AMP_TOKEN: ${{ secrets.ACC_AMP_TOKEN }}
44+
IS_PR: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
3945
run: |
4046
k3d kubeconfig get kyma > tests/integration/fixtures/kubeconfig.yaml
4147
export CYPRESS_DOMAIN=http://localhost:3001
4248
cd tests/integration
43-
npm ci && ACC_AMP_TOKEN=$ACC_AMP_TOKEN npm run "test:accesibility"
49+
npm ci && ACC_AMP_TOKEN=$ACC_AMP_TOKEN IS_PR=$IS_PR npm run "test:accesibility"
4450
- name: Uploads artifacts
4551
uses: actions/upload-artifact@v4
4652
if: ${{ always() }}

kyma/environments/dev/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ config:
100100
COLUMN_LAYOUT:
101101
isEnabled: true
102102
SNOW:
103-
isEnabled: true
103+
isEnabled: false

kyma/environments/stage/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ config:
9999
COLUMN_LAYOUT:
100100
isEnabled: true
101101
SNOW:
102-
isEnabled: true
102+
isEnabled: false

public/defaultConfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ config:
8080
isEnabled: true
8181
link: https://sapinsights.eu.qualtrics.com/jfe/form/SV_d3UPNymSgUHAb9Y?product=SAP%20BTP,%20Kyma%20Runtime&product_filter=Kyma
8282
SNOW:
83-
isEnabled: true
83+
isEnabled: false

src/components/BusolaExtensions/ExtensibilityStarterForm.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
ui5-checkbox {
77
margin-top: -6.75px;
88
}
9+
10+
@media (max-width: 1200px) {
11+
grid-template-columns: 2fr 8fr 8fr 3fr;
12+
}
13+
14+
@media (max-width: 480px) {
15+
grid-template-columns: 1fr;
16+
}
917
}
1018

1119
.resource-form--unset-height {

src/hooks/useSentry.js

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
1-
import { useState } from 'react';
1+
import { useState, useEffect } from 'react';
22
import * as Sentry from '@sentry/react';
33
import { useFeature } from './useFeature';
44

5-
export function useSentry() {
6-
const [dsn, setDsn] = useState();
7-
8-
const initSentry = dsn => {
9-
Sentry.init({
10-
dsn,
11-
release: 'busola',
12-
integrations: [new Sentry.browserTracingIntegration()],
13-
tracesSampleRate: 1.0,
14-
});
15-
};
5+
const initSentry = dsn => {
6+
Sentry.init({
7+
dsn,
8+
release: 'busola',
9+
integrations: [
10+
new Sentry.browserTracingIntegration(),
11+
new Sentry.replayIntegration(),
12+
],
13+
tracesSampleRate: 1.0,
14+
// Session Replay
15+
replaysSessionSampleRate: 0.1,
16+
replaysOnErrorSampleRate: 1.0,
17+
});
18+
};
1619

17-
try {
18-
const feature = useFeature('SENTRY') || {};
19-
if (feature.isEnabled && feature.config?.dsn) {
20-
const nextDsn = feature.config.dsn;
20+
export function useSentry() {
21+
const [dsn, setDsn] = useState(null);
22+
const feature = useFeature('SENTRY');
2123

22-
if (nextDsn !== dsn) {
23-
setDsn(nextDsn);
24-
initSentry(nextDsn);
24+
useEffect(() => {
25+
try {
26+
if (feature?.isEnabled && feature?.config?.dsn) {
27+
const nextDsn = feature.config.dsn;
28+
if (nextDsn !== dsn) {
29+
setDsn(nextDsn);
30+
initSentry(nextDsn);
31+
}
2532
}
33+
} catch (e) {
34+
console.warn('Sentry not enabled due to error', e);
2635
}
27-
} catch (e) {
28-
console.warn('Sentry not enabled due to error', e);
29-
}
36+
}, [feature, dsn]);
3037
}

src/resources/Namespaces/YamlUpload/YamlResourcesList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export function YamlResourcesList({ resourcesData }) {
102102
<span style={{ fontWeight: 'bold' }}></span>
103103
</Trans>
104104
</p>
105-
<Title level="H4" size="H4" className="sap-margin-top-small">
105+
<Title level="H2" size="H4" className="sap-margin-top-small">
106106
{t('upload-yaml.uploaded-resources')}
107107
</Title>
108108
<SeparatorLine style={{ margin: '0rem -1rem' }} />

src/resources/ReplicaSets/ReplicaSetDetails.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,19 @@ export function ReplicaSetsDetails(props) {
120120
value: resource => <div>{resource?.status?.replicas ?? 0}</div>,
121121
},
122122
];
123-
124123
const statusConditions = resource => {
125124
return resource?.status?.conditions?.map(condition => {
125+
const overridenStatus = () => {
126+
if (condition.type === 'ReplicaFailure')
127+
return condition.status === 'True' ? 'Negative' : 'Positive';
128+
return undefined;
129+
};
126130
return {
127-
header: { titleText: condition.type, status: condition.status },
131+
header: {
132+
titleText: condition.type,
133+
status: condition.status,
134+
overrideStatusType: overridenStatus(),
135+
},
128136
message: condition.message,
129137
};
130138
});

src/shared/components/DynamicPageComponent/DynamicPageComponent.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
.bold-title {
1616
font-family: var(--sapObjectHeader_Title_FontFamily);
17+
text-wrap-mode: wrap;
1718
}
1819

1920
.description {

src/shared/components/MonacoEditorESM/Editor.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ export function Editor({
105105
design="Negative"
106106
hideCloseButton
107107
className="break-word sap-margin-small"
108+
role="alert"
108109
>
109110
{t('common.create-form.editor-error', { error })}
110111
</MessageStrip>
@@ -113,6 +114,7 @@ export function Editor({
113114
<MessageStrip
114115
className="break-word sap-margin-small"
115116
design="Critical"
117+
role="alert"
116118
>
117119
{t('common.create-form.autocomplete-unavailable-error', {
118120
error: schemaError.error || schemaError.message || schemaError,
@@ -124,6 +126,7 @@ export function Editor({
124126
design="Critical"
125127
hideCloseButton
126128
className="break-word sap-margin-small"
129+
role="alert"
127130
>
128131
{warnings.map(m => (
129132
<span

0 commit comments

Comments
 (0)