-
Notifications
You must be signed in to change notification settings - Fork 123
Conversation
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.
Thank you for the PR! Some small comments.
@@ -11324,14 +11324,6 @@ | |||
} | |||
} | |||
}, | |||
"react-tap-event-plugin": { |
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.
Could you please write docu how to udpate this file?
@@ -99,7 +99,12 @@ export default class SettingsDialog extends Component { | |||
} | |||
// persist value to kdb and show notification | |||
const { timeout } = this.state[key] || {} | |||
setMeta(key, value) | |||
|
|||
// remove metakey when setting to 0 |
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.
and empty value?
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.
Thank you for improving the docu!
'binary', | ||
+ 'check/something', | ||
] | ||
``` |
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.
And then, how to do validation or similar?
@markus2330 all tasks from #2032 should be done now, I also tested with Firefox ESR. you can review already, because only the docker container for the live demo is missing now. |
Thank you! The docker container would make it easier to test (and reproduce) 😉 |
@markus2330 I created a Dockerfile (see #1901 (comment)). I also released an image, but it is still 1.4.0 (as the Dockerfile builds from the official git repo). I am also building a beta release docker image for 1.5.0 right now. |
I am okay with merging this PR so that creating the Docker image is easier. If everything is finished, please set "ready to merge". |
src/tools/web/Dockerfile
Outdated
@@ -0,0 +1,34 @@ | |||
FROM ubuntu:16.04 |
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.
Any reason why this file is not in scripts/docker/?
@markus2330 I already created a
|
why the two ports? you are missing Additionally you don't have a PID1 that controls signals sent to the container. |
@omnidan Thank you, works for me. As said, mountpoints would make the image more interesting. (Maybe mount /tmp/hosts to not destroy anything.) What about providing a start-web script instead of creating it only for the docker image? And release notes are missing! You are welcome to highlight your changes. @ingwinlu Thank you for reviewing the Dockerfile! |
@omnidan small things: "edit value" does not automatically focus to the edit field. Please also check if tabs work as wanted (they also cycle in the background of the dialog). And numbering of arrays sometimes does not work (if I clicked somewhere else before.) Should I create an issue for this? |
@ingwinlu thanks for the hints! I added the two ports via EXPOSE. One port is for elektrad (33333), the other for webd/client (33334). I also tried reducing the image size by following instructions from: https://blog.florianlopes.io/5-tips-to-reduce-docker-image-size/ I'm not sure what you mean by "you don't have a PID 1" - I found out that nodejs is not supposed to run as PID 1 in docker: https://www.elastic.io/nodejs-as-pid-1-under-docker-images/ |
thanks for the hint - I fixed this!
unfortunately trapping the focus in the dialog does not work with the current version of the UI library I use (MUI): mui/material-ui#4384 I tried using an external library to achieve this, but with the external library I can only trap focus within the dialog contents, which excludes the dialog buttons. so when I enable the focus trap, it is not possible to navigate to the dialog buttons anymore. focus trapping dialogs are implemented in the latest beta version of MUI, however: mui/material-ui#10458 - should I make an issue about things that can be fixed by upgrading to MUI 1.0 when it comes out (selecting text when pressing the copy button, trapping focus in dialogs)?
Where did you click? I'm not sure how to reproduce this. |
We could push an example kdb export to a git repo and then pull that to build the docker image for the live demo (I would create a separate image for that though).
I added them to the initial post of this PR! |
Thank you, looks great. But please describe changes in changelog (news). (your text in this PR is quite good, but it should be in doc/news/_preparation_next_release.md) You can also finish (some) tasks of #2037 here. |
jenkins build all please |
Please add some info to the release notes. |
Thank you. Seems like you need to rebase. |
Verified build of HEAD under OpenBSD 6.3 with egcc/eg++ 4.9.4.
… directory" This reverts commit 98a27d6.
@markus2330 done! |
Thank you! Could you please rebase to get rid of the old commits. @ingwinlu Can you take a look at the docker file? |
@markus2330 I already rebased, what do you mean "get rid of the old commits"? |
The github view shows 250+ commits. Something seems to be wrong here. |
And maybe it is a good idea to split the docker files and the WebUI changes. |
@markus2330 that is because I rebased and it added all commits from upstream master to the branch, they should not be duplicated after merging (it looked the same way when I rebased my previous PR). BTW: you can see that the PR only has my changes when going to the "files" tab: https://github.com/ElektraInitiative/libelektra/pull/2029/files |
I will remove them from this PR for now and create a new PR with the updated docker files tomorrow. |
There is still something very wrong in this PR. There are 250+ commits. |
@markus2330 as I said, that is a result of rebasing, it happened in the previous PR too. Look at the "Files changed" tab, it does not actually contain the changes of the commits. |
see #2099 |
@omnidan out of curiosity: how do you rebase? |
This does not say it was correct. It also messed up the history back then. The problem is that the common commit is old (26.05) and that you rebased something that already contained a merge commit. A rebase should be very simple in your case, nobody else modified the directories you are working in. You can also create a new PR if it is easier for you. |
@ingwinlu https://help.github.com/articles/syncing-a-fork/ and then |
I do not think you should mix these two. You can either merge with |
Make sure upstream is really pointing at the correct repository via |
@ingwinlu I read that it might be the way I created the branch, not the way I rebased: https://stackoverflow.com/a/40413455 |
@markus2330 please review
Release notes
Many UX improvements from the usability test!
elektra/web