Skip to content

Commit 7a400e5

Browse files
authored
Merge branch 'dev' into fix/sample-selection
2 parents a653155 + 48dae26 commit 7a400e5

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/app/views/main-header/Tenant.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import { useAppSelector } from '../../../store'
44
import { translateMessage } from '../../utils/translate-messages'
55
import { useHeaderStyles } from './utils'
66

7-
const tooltipContent = `${translateMessage('Using demo tenant')} ${translateMessage('To access your own data:')}`
8-
97
const Tenant = ()=>{
108
const styles = useHeaderStyles()
119
const user = useAppSelector(state => state.profile.user)
12-
const secondaryContent = user && user.tenant ? user.tenant : 'Sample'
10+
const secondaryContent = user?.tenant ?? 'Sample'
11+
const tooltipContent = user?.tenant
12+
?? `${translateMessage('Using demo tenant')} ${translateMessage('To access your own data:')}`
1313

1414
return (
1515
<Tooltip content={tooltipContent} relationship="description">

src/app/views/query-response/response/ResponseMessages.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export const ResponseMessages = () => {
6565
// Display link to step to next result
6666
if (odataLink) {
6767
messageBars.push(
68-
<MessageBar intent='warning' key={'odataLink'}>
68+
<MessageBar intent='info' key={'odataLink'}>
6969
<MessageBarBody>
7070
{translateMessage('This response contains an @odata property.')}&nbsp;
7171
<Text font="monospace">@odata.{odataLink.name}</Text>&nbsp;

src/app/views/query-runner/request/headers/RequestHeaders.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ const RequestHeaders = () => {
116116
className={styles.button}
117117
appearance='primary'
118118
onClick={handleAddHeader}
119+
disabled={!header.name.trim() || !header.value.trim()}
119120
>
120121
{translateMessage(isUpdatingHeader ? 'Update' : 'Add')}
121122
</Button>

0 commit comments

Comments
 (0)