Skip to content

Commit

Permalink
Accessibility bug fix wave2 and websocket fix (#609)
Browse files Browse the repository at this point in the history 
* bug fixing wave2

* fix websocket ready state

* fix issue 606
  • Loading branch information
@YingXue
YingXue authored Feb 1, 2023
1 parent a92a0d4 commit 6df3d34
Show file tree
Hide file tree
Showing 14 changed files with 197 additions and 245 deletions.
2 changes: 1 addition & 1 deletion src/app/authentication/azureActiveDirectory/components/filterTextBox.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const FilterTextBox: React.FC<FilterTextBoxPros> = props => {
value={filterValue}
onChange={onValueChange}
/>
{filterValue && <Announced message={`${searchResultCount.toString()} results found`}/>}
{filterValue && <Announced message={`${searchResultCount.toString()} ${t(ResourceKeys.authentication.azureActiveDirectory.filter.result)}`}/>}
</div>
);
};
42 changes: 0 additions & 42 deletions src/app/css/_deviceSettings.scss
View file

This file was deleted.

8 changes: 0 additions & 8 deletions src/app/css/_themes.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
pagerColor: $gray,
pagerColorSelected: $light-gray,
pagerButtonColor: $blue,
successText: $successText,
infoText: #52ABFF,
disabledText: $dark-gray,
inputComponentBackgroundColor: #ffffff,
pivotOnHoverBackground: $textfield-disabled-background,
Expand Down Expand Up @@ -102,8 +100,6 @@
pagerColor: $blue,
pagerColorSelected: #cccccc,
pagerButtonColor: black,
successText: #1AC11A,
infoText: rgb(75, 166, 216),
disabledText: $light-gray,
inputComponentBackgroundColor: $dark-gray,
pivotOnHoverBackground: #363636,
Expand Down Expand Up @@ -156,8 +152,6 @@
pagerColor: $contrast-white-text,
pagerColorSelected: $contrast-white-selected-background,
pagerButtonColor: $contrast-white-text,
successText: $contrast-white-text,
infoText: $contrast-white-text,
disabledText: $contrast-white-background,
inputComponentBackgroundColor: $contrast-white-background,
pivotOnHoverBackground: $contrast-white-background,
Expand Down Expand Up @@ -205,8 +199,6 @@
pagerColor: $contrast-black-text,
pagerColorSelected: $contrast-black-selected-background,
pagerButtonColor: $contrast-black-text,
successText: $contrast-black-text,
infoText: $contrast-black-background,
disabledText: $dark-gray,
inputComponentBackgroundColor: $contrast-black-background,
pivotOnHoverBackground: $contrast-black-background
Expand Down
254 changes: 132 additions & 122 deletions src/app/devices/deviceEvents/components/__snapshots__/commands.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -1,141 +1,151 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`commands matches snapshot in electron 1`] = `
<StyledCommandBarBase
farItems={
Array [
Object {
"ariaLabel": "deviceEvents.command.close",
"iconProps": Object {
"iconName": "NavigateBack",
<Fragment>
<StyledCommandBarBase
farItems={
Array [
Object {
"ariaLabel": "deviceEvents.command.close",
"iconProps": Object {
"iconName": "NavigateBack",
},
"key": "NavigateBack",
"name": "deviceEvents.command.close",
"onClick": [Function],
},
"key": "NavigateBack",
"name": "deviceEvents.command.close",
"onClick": [Function],
},
]
}
items={
Array [
Object {
"ariaLabel": "deviceEvents.command.stop",
"disabled": true,
"iconProps": Object {
"iconName": "StopSolid",
]
}
items={
Array [
Object {
"ariaLabel": "deviceEvents.command.stop",
"disabled": true,
"iconProps": Object {
"iconName": "StopSolid",
},
"key": "StopSolid",
"name": "deviceEvents.command.stop",
"onClick": [Function],
},
"key": "StopSolid",
"name": "deviceEvents.command.stop",
"onClick": [Function],
},
Object {
"ariaLabel": "Show modeled events",
"iconProps": Object {
"iconName": "CheckboxComposite",
Object {
"ariaLabel": "Show modeled events",
"iconProps": Object {
"iconName": "CheckboxComposite",
},
"key": "Checkbox",
"name": "Show modeled events",
"onClick": [Function],
},
"key": "Checkbox",
"name": "Show modeled events",
"onClick": [Function],
},
Object {
"ariaLabel": "deviceEvents.command.showSystemProperties",
"disabled": true,
"iconProps": Object {
"iconName": "CheckboxComposite",
Object {
"ariaLabel": "deviceEvents.command.showSystemProperties.label",
"disabled": true,
"iconProps": Object {
"iconName": "CheckboxComposite",
},
"key": "CheckboxComposite",
"name": "deviceEvents.command.showSystemProperties.label",
"onClick": [Function],
},
"key": "CheckboxComposite",
"name": "deviceEvents.command.showSystemProperties",
"onClick": [Function],
},
Object {
"ariaLabel": "deviceEvents.command.refresh",
"disabled": false,
"iconProps": Object {
"iconName": "Refresh",
Object {
"ariaLabel": "deviceEvents.command.refresh",
"disabled": false,
"iconProps": Object {
"iconName": "Refresh",
},
"key": "Refresh",
"name": "deviceEvents.command.refresh",
"onClick": undefined,
},
"key": "Refresh",
"name": "deviceEvents.command.refresh",
"onClick": undefined,
},
Object {
"ariaLabel": "deviceEvents.command.clearEvents",
"iconProps": Object {
"iconName": "Delete",
Object {
"ariaLabel": "deviceEvents.command.clearEvents",
"iconProps": Object {
"iconName": "Delete",
},
"key": "Clear",
"name": "deviceEvents.command.clearEvents",
"onClick": [Function],
},
"key": "Clear",
"name": "deviceEvents.command.clearEvents",
"onClick": [Function],
},
]
}
/>
]
}
/>
<StyledAnnouncedBase
message="deviceEvents.command.showSystemProperties.announce.show"
/>
</Fragment>
`;

exports[`commands matches snapshot in hosted environment 1`] = `
<StyledCommandBarBase
farItems={
Array [
Object {
"ariaLabel": "deviceEvents.command.close",
"iconProps": Object {
"iconName": "NavigateBack",
<Fragment>
<StyledCommandBarBase
farItems={
Array [
Object {
"ariaLabel": "deviceEvents.command.close",
"iconProps": Object {
"iconName": "NavigateBack",
},
"key": "NavigateBack",
"name": "deviceEvents.command.close",
"onClick": [Function],
},
"key": "NavigateBack",
"name": "deviceEvents.command.close",
"onClick": [Function],
},
]
}
items={
Array [
Object {
"ariaLabel": "deviceEvents.command.start",
"disabled": false,
"iconProps": Object {
"iconName": "Play",
]
}
items={
Array [
Object {
"ariaLabel": "deviceEvents.command.start",
"disabled": false,
"iconProps": Object {
"iconName": "Play",
},
"key": "Play",
"name": "deviceEvents.command.start",
"onClick": [Function],
},
"key": "Play",
"name": "deviceEvents.command.start",
"onClick": [Function],
},
Object {
"ariaLabel": "Show modeled events",
"iconProps": Object {
"iconName": "Checkbox",
Object {
"ariaLabel": "Show modeled events",
"iconProps": Object {
"iconName": "Checkbox",
},
"key": "Checkbox",
"name": "Show modeled events",
"onClick": [Function],
},
"key": "Checkbox",
"name": "Show modeled events",
"onClick": [Function],
},
Object {
"ariaLabel": "deviceEvents.command.showSystemProperties",
"disabled": false,
"iconProps": Object {
"iconName": "Checkbox",
Object {
"ariaLabel": "deviceEvents.command.showSystemProperties.label",
"disabled": false,
"iconProps": Object {
"iconName": "Checkbox",
},
"key": "CheckboxComposite",
"name": "deviceEvents.command.showSystemProperties.label",
"onClick": [Function],
},
"key": "CheckboxComposite",
"name": "deviceEvents.command.showSystemProperties",
"onClick": [Function],
},
Object {
"ariaLabel": "deviceEvents.command.refresh",
"disabled": false,
"iconProps": Object {
"iconName": "Refresh",
Object {
"ariaLabel": "deviceEvents.command.refresh",
"disabled": false,
"iconProps": Object {
"iconName": "Refresh",
},
"key": "Refresh",
"name": "deviceEvents.command.refresh",
"onClick": undefined,
},
"key": "Refresh",
"name": "deviceEvents.command.refresh",
"onClick": undefined,
},
Object {
"ariaLabel": "deviceEvents.command.clearEvents",
"iconProps": Object {
"iconName": "Delete",
Object {
"ariaLabel": "deviceEvents.command.clearEvents",
"iconProps": Object {
"iconName": "Delete",
},
"key": "Clear",
"name": "deviceEvents.command.clearEvents",
"onClick": [Function],
},
"key": "Clear",
"name": "deviceEvents.command.clearEvents",
"onClick": [Function],
},
]
}
/>
]
}
/>
<StyledAnnouncedBase
message="deviceEvents.command.showSystemProperties.announce.hide"
/>
</Fragment>
`;
3 changes: 2 additions & 1 deletion src/app/devices/deviceEvents/components/__snapshots__/deviceSimulationPanel.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ exports[`deviceSimulationPanel matches snapshot 1`] = `
type={3}
>
<a
onClick={[Function]}
href="https://shell.azure.com"
role="link"
target="_blank"
>
<img
Expand Down
Loading

0 comments on commit 6df3d34

Please sign in to comment.