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.

Sign up for GitHub

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

Jump to bottom

Merge v3.30 into feature/console-redesign #6940

Closed
wants to merge 27 commits into from
Closed

Merge v3.30 into feature/console-redesign #6940

wants to merge 27 commits into from

Conversation

PavelJankoski
Copy link
Contributor

Summary

Merging latest v3.30 into the redesign branch.

TheThingsBot and others added 27 commits January 30, 2024 13:12
@TheThingsBot
all: Bump to version 3.29.0
470de96
@adriansmares
dev: Update changelog
1690c70
@kschiffer
dev: Add copyright header year check
791a41c
@dependabot
dev: bump golangci/golangci-lint-action
78eec17 
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 0e8f5bf773dd8000d6aeb01936f3090976982f33 to 3cfe3a4abbb849e10058ce4af15d205b6da42804.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@0e8f5bf...3cfe3a4)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot
dev: bump the safe group with 14 updates
5705bae 
Bumps the safe group with 14 updates:

| Package | From | To |
| --- | --- | --- |
| [@sentry/browser](https://github.com/getsentry/sentry-javascript) | `7.98.0` | `7.99.0` |
| [@sentry/integrations](https://github.com/getsentry/sentry-javascript) | `7.98.0` | `7.99.0` |
| [react-virtualized-auto-sizer](https://github.com/bvaughn/react-virtualized-auto-sizer) | `1.0.21` | `1.0.22` |
| [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) | `7.23.9` | `7.23.10` |
| [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/actions) | `7.6.10` | `7.6.12` |
| [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/code/renderers/react) | `7.6.10` | `7.6.12` |
| [css-loader](https://github.com/webpack-contrib/css-loader) | `6.9.1` | `6.10.0` |
| [cypress](https://github.com/cypress-io/cypress) | `13.6.3` | `13.6.4` |
| [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) | `48.0.4` | `48.0.5` |
| [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) | `2.7.7` | `2.8.0` |
| [mjml](https://github.com/mjmlio/mjml/tree/HEAD/packages/mjml) | `4.15.2` | `4.15.3` |
| [prettier](https://github.com/prettier/prettier) | `3.2.4` | `3.2.5` |
| [stylus-loader](https://github.com/webpack-contrib/stylus-loader) | `8.0.0` | `8.1.0` |
| [webpack](https://github.com/webpack/webpack) | `5.90.0` | `5.90.1` |


Updates `@sentry/browser` from 7.98.0 to 7.99.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](getsentry/sentry-javascript@7.98.0...7.99.0)

Updates `@sentry/integrations` from 7.98.0 to 7.99.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](getsentry/sentry-javascript@7.98.0...7.99.0)

Updates `react-virtualized-auto-sizer` from 1.0.21 to 1.0.22
- [Release notes](https://github.com/bvaughn/react-virtualized-auto-sizer/releases)
- [Changelog](https://github.com/bvaughn/react-virtualized-auto-sizer/blob/master/CHANGELOG.md)
- [Commits](bvaughn/react-virtualized-auto-sizer@1.0.21...1.0.22)

Updates `@babel/eslint-parser` from 7.23.9 to 7.23.10
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.10/eslint/babel-eslint-parser)

Updates `@storybook/addon-actions` from 7.6.10 to 7.6.12
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v7.6.12/code/addons/actions)

Updates `@storybook/react` from 7.6.10 to 7.6.12
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v7.6.12/code/renderers/react)

Updates `css-loader` from 6.9.1 to 6.10.0
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v6.9.1...v6.10.0)

Updates `cypress` from 13.6.3 to 13.6.4
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](cypress-io/cypress@v13.6.3...v13.6.4)

Updates `eslint-plugin-jsdoc` from 48.0.4 to 48.0.5
- [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases)
- [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc)
- [Commits](gajus/eslint-plugin-jsdoc@v48.0.4...v48.0.5)

Updates `mini-css-extract-plugin` from 2.7.7 to 2.8.0
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/mini-css-extract-plugin@v2.7.7...v2.8.0)

Updates `mjml` from 4.15.2 to 4.15.3
- [Release notes](https://github.com/mjmlio/mjml/releases)
- [Commits](https://github.com/mjmlio/mjml/commits/v4.15.3/packages/mjml)

Updates `prettier` from 3.2.4 to 3.2.5
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.2.4...3.2.5)

Updates `stylus-loader` from 8.0.0 to 8.1.0
- [Release notes](https://github.com/webpack-contrib/stylus-loader/releases)
- [Changelog](https://github.com/webpack-contrib/stylus-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/stylus-loader@v8.0.0...v8.1.0)

Updates `webpack` from 5.90.0 to 5.90.1
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](webpack/webpack@v5.90.0...v5.90.1)

---
updated-dependencies:
- dependency-name: "@sentry/browser"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: safe
- dependency-name: "@sentry/integrations"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: safe
- dependency-name: react-virtualized-auto-sizer
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: "@babel/eslint-parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: "@storybook/addon-actions"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: "@storybook/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: safe
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: eslint-plugin-jsdoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: safe
- dependency-name: mjml
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: stylus-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: safe
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: safe
...

Signed-off-by: dependabot[bot] <[email protected]>
@kschiffer
Merge pull request #6915 from TheThingsNetwork/dependabot/npm_and_yar…
8136516 
…n/safe-70ab694770

dev: bump the safe group with 14 updates
@kschiffer
Merge pull request #6911 from TheThingsNetwork/feature/copyright-head…
78f6ffa 
…er-year-check

Add copyright header year check for new files
@adriansmares
is: Add notification event
fed2485
@adriansmares
is: Add notification status updated event
4fa8b6f
@adriansmares
is: Add event data type
c96ef1f
@adriansmares
is: Add receiver identifiers comment
566d1f5
@adriansmares
is: Provide full notification
2deea91
@adriansmares
Merge pull request #6913 from TheThingsNetwork/dependabot/github_acti…
36218f1 
…ons/golangci/golangci-lint-action-3cfe3a4abbb849e10058ce4af15d205b6da42804

dev: bump golangci/golangci-lint-action from 0e8f5bf773dd8000d6aeb01936f3090976982f33 to 3cfe3a4abbb849e10058ce4af15d205b6da42804
@dependabot @adriansmares
dev: bump the safe group with 4 updates
8fa2cac 
Bumps the safe group with 4 updates: [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go), [github.com/jackc/pgx/v5](https://github.com/jackc/pgx), [github.com/klauspost/compress](https://github.com/klauspost/compress) and [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server).

Updates `github.com/aws/aws-sdk-go` from 1.50.6 to 1.50.11
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.50.6...v1.50.11)

Updates `github.com/jackc/pgx/v5` from 5.5.2 to 5.5.3
- [Changelog](https://github.com/jackc/pgx/blob/master/CHANGELOG.md)
- [Commits](jackc/pgx@v5.5.2...v5.5.3)

Updates `github.com/klauspost/compress` from 1.17.5 to 1.17.6
- [Release notes](https://github.com/klauspost/compress/releases)
- [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml)
- [Commits](klauspost/compress@v1.17.5...v1.17.6)

Updates `github.com/nats-io/nats-server/v2` from 2.10.9 to 2.10.10
- [Release notes](https://github.com/nats-io/nats-server/releases)
- [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml)
- [Commits](nats-io/nats-server@v2.10.9...v2.10.10)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: github.com/jackc/pgx/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: github.com/klauspost/compress
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: safe
- dependency-name: github.com/nats-io/nats-server/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: safe
...

Signed-off-by: dependabot[bot] <[email protected]>
@adriansmares
Merge pull request #6914 from TheThingsNetwork/dependabot/go_modules/…
1b1aabd 
…safe-f17bd0d405

dev: bump the safe group with 4 updates
@adriansmares
all: Remove @storybook/addon-info
d4a3e50
@adriansmares
dev: Update build space settings
5660ea1
@TheThingsBot
all: Enter release date of version 3.29.0 into the changelog
7d1e643
@adriansmares
dev: Run yarn upgrade
0ddfe64
@adriansmares
dev: Remove space manipulations
418248d
@adriansmares
Merge pull request #6920 from TheThingsNetwork/release/v3.29.0
f8d7665 
Release v3.29.0
@adriansmares
Merge pull request #6917 from TheThingsNetwork/feature/add-notificati…
630b4f8 
…on-event

Add notification events
@adriansmares
Merge pull request #6919 from TheThingsNetwork/feature/remove-storybo…
24419cb 
…ok-docs

Remove @storybook/addon-info
@adriansmares
dev: Remove stylint
c80daef
@adriansmares
Merge pull request #6921 from TheThingsNetwork/fix/remove-stylint
70daeae 
Remove stylint
@adriansmares
all: Fix error initialization
012d0d9
@PavelJankoski
Merge remote-tracking branch 'origin/v3.30' into merge/console-redesi…
4a515e8 
…gn-v3.30

# Conflicts:
#	config/storybook/main.js
#	package.json
#	pkg/webui/components/breadcrumbs/story.js
#	pkg/webui/components/checkbox/story.js
#	pkg/webui/components/data-sheet/story.js
#	pkg/webui/components/form/field/stories/bytes.stories.js
#	pkg/webui/components/form/field/stories/checkbox.stories.js
#	pkg/webui/components/form/field/stories/file-input.stories.js
#	pkg/webui/components/form/field/stories/input.stories.js
#	pkg/webui/components/form/field/stories/radio.stories.js
#	pkg/webui/components/form/field/stories/select.stories.js
#	pkg/webui/components/form/field/stories/text-area.stories.js
#	pkg/webui/components/form/field/stories/unit-input.stories.js
#	pkg/webui/components/form/story.js
#	pkg/webui/components/header/header.styl
#	pkg/webui/components/icon/story.js
#	pkg/webui/components/modal/story.js
#	pkg/webui/components/navigation/bar/story.js
#	pkg/webui/components/navigation/side/item/item.styl
#	pkg/webui/components/navigation/side/story.js
#	pkg/webui/components/pagination/story.js
#	pkg/webui/components/profile-dropdown/story.js
#	pkg/webui/components/profile-picture/story.js
#	pkg/webui/components/prompt/story.js
#	pkg/webui/components/radio-button/story.js
#	pkg/webui/components/safe-inspector/story.js
#	pkg/webui/components/table/story/story.js
#	pkg/webui/components/tabs/story.js
#	pkg/webui/components/tag/story.js
#	pkg/webui/lib/components/error-message/story.js
#	pkg/webui/lib/components/message/story.js
#	pkg/webui/styles/fonts.styl
#	tools/mage/js.go
#	yarn.lock
@PavelJankoski PavelJankoski added the merge This just merges version branches label Feb 15, 2024
@PavelJankoski PavelJankoski self-assigned this Feb 15, 2024
@PavelJankoski PavelJankoski requested a review from a team as a code owner February 15, 2024 13:43
@PavelJankoski PavelJankoski requested review from a team as code owners February 15, 2024 13:43
@PavelJankoski PavelJankoski requested review from a team, mjamescompton, johanstokking, nicholaspcr and adriansmares and removed request for a team February 15, 2024 13:43
@github-actions github-actions bot added c/join server This is related to the Join Server c/identity server This is related to the Identity Server c/application server This is related to the Application Server c/packet broker agent This is related to Packet Broker Agent dependencies Pull requests that update a dependency file ui/web This is related to a web interface tooling Development tooling labels Feb 15, 2024
@PavelJankoski PavelJankoski deleted the merge/console-redesign-v3.30 branch February 15, 2024 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjamescompton mjamescompton Awaiting requested review from mjamescompton mjamescompton is a code owner automatically assigned from TheThingsNetwork/stack-reviewers-3

@johanstokking johanstokking Awaiting requested review from johanstokking johanstokking is a code owner automatically assigned from TheThingsNetwork/stack-reviewers-1

@nicholaspcr nicholaspcr Awaiting requested review from nicholaspcr nicholaspcr is a code owner automatically assigned from TheThingsNetwork/stack-reviewers-9

@adriansmares adriansmares Awaiting requested review from adriansmares

Assignees

@PavelJankoski PavelJankoski

Labels
c/application server This is related to the Application Server c/identity server This is related to the Identity Server c/join server This is related to the Join Server c/packet broker agent This is related to Packet Broker Agent dependencies Pull requests that update a dependency file merge This just merges version branches tooling Development tooling ui/web This is related to a web interface
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@PavelJankoski @TheThingsBot @adriansmares @kschiffer