Skip to content

Commit

Permalink
Merge branch 'main' of github.com:kyma-project/busola into acc-automa…
Browse files Browse the repository at this point in the history
…tion-schedule
  • Loading branch information
mrCherry97 committed Oct 18, 2024
2 parents 7b5ca76 + 5f0538c commit d1f5734
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 12 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/accessibility-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,10 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
- name: Create Single Cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
with:
cluster-name: "k3dCluster"
args: >-
--agents 1
--port 80:80@loadbalancer
--port 443:443@loadbalancer
--wait
- name: Install k3d
env:
K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh
run: curl --silent --fail $K3D_URL | bash
- name: Setup Kyma
run: |
set -o pipefail
Expand Down
2 changes: 2 additions & 0 deletions public/i18n/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ common:
show: Show read-only fields
sort: Sort
unknown-date: Unknown date
expand-navigation: Expand Navigation
collapse-navigation: Collapse Navigation
'yes': 'yes'
components:
incorrect-path:
Expand Down
1 change: 1 addition & 0 deletions src/header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export function Header() {
onClick={() => window.open(feedbackLink, '_blank')}
icon="feedback"
text={t('navigation.feedback')}
title={t('navigation.feedback')}
/>
)}
</ShellBar>
Expand Down
13 changes: 11 additions & 2 deletions src/header/SidebarSwitcher/SidebarSwitcher.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { Button } from '@ui5/webcomponents-react';
import { useSetRecoilState } from 'recoil';
import { useTranslation } from 'react-i18next';
import { useRecoilState } from 'recoil';
import { isSidebarCondensedState } from 'state/preferences/isSidebarCondensedAtom';

export function SidebarSwitcher(props: any) {
const setSidebarCondensed = useSetRecoilState(isSidebarCondensedState);
const { t } = useTranslation();
const [isSidebarCondensed, setSidebarCondensed] = useRecoilState(
isSidebarCondensedState,
);

return (
<Button
Expand All @@ -12,6 +16,11 @@ export function SidebarSwitcher(props: any) {
icon="menu2"
design="Transparent"
accessibleName="collapse-sidebar"
tooltip={
isSidebarCondensed
? t('common.tooltips.expand-navigation')
: t('common.tooltips.collapse-navigation')
}
/>
);
}
1 change: 1 addition & 0 deletions src/shared/ResourceForm/components/CollapsibleSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export function CollapsibleSection({
data-testid={titleText?.toLowerCase().replaceAll(' ', '-')}
header={
<Toolbar
tabIndex={-1}
active={!disabled}
toolbarStyle="Clear"
onClick={toggle}
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/DescriptionHint/DescriptionHint.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export function HintButton({
setShowTitleDescription(true);
}}
accessibleName={`${ariaTitle} information`}
tooltip={`${ariaTitle} Information`}
/>
{createPortal(
<Popover
Expand Down
7 changes: 6 additions & 1 deletion src/state/useAfterInitHook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ export function useAfterInitHook(handledKubeconfigId: KubeconfigIdHandleState) {

initDone.current = true;
const previousPath = getPreviousPath();
if (previousPath) {

if (
previousPath &&
previousPath.startsWith('/') &&
!previousPath.startsWith('//')
) {
navigate(previousPath);
removePreviousPath();
} else {
Expand Down

0 comments on commit d1f5734

Please sign in to comment.