Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small consistency fixes on dependency updates #6386

Merged
merged 3 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions cypress/plugins/tasks.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.

Check warning on line 1 in cypress/plugins/tasks.js

View workflow job for this annotation

GitHub Actions / Check Mergeability

cypress/plugins/tasks.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.27.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -77,17 +77,10 @@
},
dropAndSeedDatabase: async () => {
const exec = util.promisify(childProcess.exec)
const res = await Promise.all([
await Promise.all([
exec('tools/bin/mage dev:sqlRestore', { cwd: '..' }),
exec('tools/bin/mage dev:redisFlush', { cwd: '..' }),
])
const err = res
.filter(e => Boolean(e.stderr))
.map(e => e.stderr)
.join(', ')
if (err) {
// Throw new Error(err)
}
return null
},
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ class PayloadFormattersForm extends React.Component {
{this.formatter}
{/*
// TODO: Refactor to use data API and re-enable prompt.
// https://github.com/TheThingsNetwork/lorawan-stack/issues/6384
// NOTE: Unfortunately react router v6 requires us to do further
// refactoring to use the data API to be able to use `usePrompt`
// again, which is required to make the Prompt component work.
Expand Down
186 changes: 89 additions & 97 deletions pkg/webui/console/containers/webhooks-table/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.
// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -12,9 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import React from 'react'
import { connect } from 'react-redux'
import React, { useCallback } from 'react'
import { useSelector, useDispatch } from 'react-redux'
import { defineMessages } from 'react-intl'
import { createSelector } from 'reselect'
import { useParams } from 'react-router-dom'

import Status from '@ttn-lw/components/status'

Expand All @@ -24,7 +26,6 @@ import Message from '@ttn-lw/lib/components/message'
import DateTime from '@ttn-lw/lib/components/date-time'

import sharedMessages from '@ttn-lw/lib/shared-messages'
import PropTypes from '@ttn-lw/lib/prop-types'

import { getWebhooksList } from '@console/store/actions/webhooks'

Expand All @@ -46,101 +47,92 @@ const m = defineMessages({
requestsFailing: 'Requests failing',
})

@connect(state => ({
healthStatusEnabled: selectWebhooksHealthStatusEnabled(state),
}))
export default class WebhooksTable extends React.Component {
static propTypes = {
appId: PropTypes.string.isRequired,
healthStatusEnabled: PropTypes.bool.isRequired,
}

constructor(props) {
super(props)

const { appId } = props
this.getWebhooksList = () => getWebhooksList(appId, ['template_ids', 'health_status'])
}

baseDataSelector(state) {
return {
webhooks: selectWebhooks(state),
totalCount: selectWebhooksTotalCount(state),
fetching: selectWebhooksFetching(state),
}
}

render() {
const { healthStatusEnabled } = this.props

const headers = [
{
name: 'ids.webhook_id',
displayName: sharedMessages.id,
width: 30,
sortable: true,
},
{
name: 'base_url',
displayName: m.baseUrl,
width: 40,
sortable: true,
},
{
name: 'template_ids.template_id',
displayName: m.templateId,
width: 12,
render: value => value || <Message className={style.none} content={sharedMessages.none} />,
sortable: true,
},
]

if (healthStatusEnabled) {
headers.push({
name: 'health_status',
displayName: sharedMessages.status,
width: 8,
render: value => {
let indicator = 'unknown'
let label = sharedMessages.unknown

if (value && value.healthy) {
indicator = 'good'
label = m.healthy
} else if (value && value.unhealthy) {
indicator = 'bad'
label = m.requestsFailing
} else {
indicator = 'mediocre'
label = m.pending
}

return <Status status={indicator} label={label} pulse={false} />
},
})
}
const WebhooksTable = () => {
const { appId } = useParams()
const dispatch = useDispatch()
const healthStatusEnabled = useSelector(selectWebhooksHealthStatusEnabled)
const getWebhooksListCallback = useCallback(
() => dispatch(getWebhooksList(appId, ['template_ids', 'health_status'])),
[appId, dispatch],
)

const baseDataSelector = createSelector(
[selectWebhooks, selectWebhooksTotalCount, selectWebhooksFetching],
(webhooks, totalCount, fetching) => ({
webhooks,
totalCount,
fetching,
}),
)

const headers = [
{
name: 'ids.webhook_id',
displayName: sharedMessages.id,
width: 30,
sortable: true,
},
{
name: 'base_url',
displayName: m.baseUrl,
width: 40,
sortable: true,
},
{
name: 'template_ids.template_id',
displayName: m.templateId,
width: 12,
render: value => value || <Message className={style.none} content={sharedMessages.none} />,
sortable: true,
},
]

if (healthStatusEnabled) {
headers.push({
name: 'created_at',
displayName: sharedMessages.createdAt,
width: 10,
sortable: true,
render: date => <DateTime.Relative value={date} />,
name: 'health_status',
displayName: sharedMessages.status,
width: 8,
render: value => {
let indicator = 'unknown'
let label = sharedMessages.unknown

if (value && value.healthy) {
indicator = 'good'
label = m.healthy
} else if (value && value.unhealthy) {
indicator = 'bad'
label = m.requestsFailing
} else {
indicator = 'mediocre'
label = m.pending
}

return <Status status={indicator} label={label} pulse={false} />
},
})

return (
<FetchTable
entity="webhooks"
defaultOrder="-created_at"
addMessage={sharedMessages.addWebhook}
headers={headers}
getItemsAction={this.getWebhooksList}
baseDataSelector={this.baseDataSelector}
tableTitle={<Message content={sharedMessages.webhooks} />}
paginated={false}
handlesSorting
{...this.props}
/>
)
}

headers.push({
name: 'created_at',
displayName: sharedMessages.createdAt,
width: 10,
sortable: true,
render: date => <DateTime.Relative value={date} />,
})

return (
<FetchTable
entity="webhooks"
defaultOrder="-created_at"
addMessage={sharedMessages.addWebhook}
headers={headers}
getItemsAction={getWebhooksListCallback}
baseDataSelector={baseDataSelector}
tableTitle={<Message content={sharedMessages.webhooks} />}
paginated={false}
handlesSorting
/>
)
}

export default WebhooksTable
10 changes: 6 additions & 4 deletions pkg/webui/console/store/selectors/webhook-templates.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2020 The Things Network Foundation, The Things Industries B.V.
// Copyright © 2023 The Things Network Foundation, The Things Industries B.V.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { createSelector } from 'reselect'

import { createFetchingSelector } from '@ttn-lw/lib/store/selectors/fetching'
import { createErrorSelector } from '@ttn-lw/lib/store/selectors/error'

Expand All @@ -32,12 +34,12 @@ export const selectWebhookTemplateById = (state, id) => {
export const selectWebhookTemplateError = createErrorSelector(GET_WEBHOOK_TEMPLATE_BASE)
export const selectWebhookTemplateFetching = createFetchingSelector(GET_WEBHOOK_TEMPLATE_BASE)

export const selectWebhookTemplates = state => {
const { entities } = selectWebhookTemplatesStore(state)
export const selectWebhookTemplates = createSelector([selectWebhookTemplatesStore], state => {
const { entities } = state

if (!Boolean(entities)) return undefined

return Object.keys(entities).map(key => entities[key])
}
})
export const selectWebhookTemplatesError = createErrorSelector(LIST_WEBHOOK_TEMPLATES_BASE)
export const selectWebhookTemplatesFetching = createFetchingSelector(LIST_WEBHOOK_TEMPLATES_BASE)
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import LoRaCloudImage from '@assets/misc/lora-cloud.png'

import PageTitle from '@ttn-lw/components/page-title'
import Breadcrumb from '@ttn-lw/components/breadcrumbs/breadcrumb'
import { withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
import { useBreadcrumbs, withBreadcrumb } from '@ttn-lw/components/breadcrumbs/context'
import Link from '@ttn-lw/components/link'
import Collapse from '@ttn-lw/components/collapse'

Expand Down Expand Up @@ -60,6 +60,13 @@ const m = defineMessages({
})

const LoRaCloud = () => {
useBreadcrumbs(
'apps.single.integrations.lora-cloud',
<Breadcrumb
path={`/applications/${appId}/integrations/lora-cloud`}
content={sharedMessages.loraCloud}
/>,
)
const appId = useSelector(selectSelectedApplicationId)
const selector = ['data']

Expand Down
Loading