Upgrade UI #818
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,12 +7,11 @@ ifdef GOTOOLCHAIN | |
| else | ||
| GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//') | ||
| endif | ||
| DOCKER_BUILD_IMAGE=docker.io/gotify/build | ||
| DOCKER_WORKDIR=/proj | ||
| DOCKER_RUN=docker run --rm -e LD_FLAGS="$$LD_FLAGS" -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR} | ||
|
Member
Author
There was a problem hiding this comment. @eternal-flame-AD Do you have time to give this PR a small manual test? It should work as the e2e tests are successful, but there may be something I overlooked. The UI coloring changed a little because the defaults of the material-ui lib changed.
Member
There was a problem hiding this comment. Sure, will do today or tomorrow! |
||
| DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS" | ||
| DOCKER_TEST_LEVEL ?= 0 # Optionally run a test during docker build | ||
|
|
||
| test: test-coverage test-js | ||
| check: check-go check-swagger check-js | ||
|
|
@@ -116,7 +115,7 @@ _build_within_docker: | |
| ${DOCKER_GO_BUILD} -o ${OUTPUT} | ||
|
|
||
| build-js: | ||
| (cd ui && yarn build) | ||
|
|
||
| build-linux-amd64: | ||
| ${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-amd64 make _build_within_docker OUTPUT=${BUILD_DIR}/gotify-linux-amd64 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // @ts-check | ||
|
|
||
| import eslint from '@eslint/js'; | ||
| import tseslint from 'typescript-eslint'; | ||
|
|
||
| export default tseslint.config(eslint.configs.recommended, tseslint.configs.recommended); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reconnecting doesn't correctly refresh the currently visible data.
reconnect.webm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure how you made this happen, I blocked
/messageand clicked refresh and can get stuck in this state.Probably it's MessagesStore#loadMore needs a
.finally(() => (this.loading = false)), I think it is an old bug bc IIRC I accidentally got it stuck refreshing before too.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a separate problem, I'll fix this too. The one I can reproduce happens after restarting gotify/server. The cause of this bug is that the state is cleared after a reconnect happens (there could be new messages while the websocket was disconnected, so we do a full refresh). This happens here
server/ui/src/reactions.ts
Lines 37 to 45 in 43574a0
server/ui/src/message/Messages.tsx
Lines 30 to 34 in 43574a0
This useEffect isn't reexecuted after the state is cleared by the reaction. On the current master version this is done in a different way that is reexecuted.