Tweaks to the query log filters to make them a bit more user friendly #1568

PromoFaux · 2020-08-28T07:41:34Z

By submitting this pull request, I confirm the following:

I have read and understood the contributors guide, as well as this entire template.
I have made only one major change in my proposed changes.
I have commented my proposed changes within the code.
I have tested my proposed changes, and have included unit tests where possible.
I am willing to help maintain this change if there are issues with it later.
I give this submission freely and claim no ownership.
It is compatible with the EUPL 1.2 license
I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

Allows mobile users to be able to use the new filtering options as well as desktop users
Removes need to hold down a modifier key to add or remove to/from the filter. Simply click the field to toggle it on/off
Utilises the ctrl/meta modifier keys for desktop users to copy domain to the clipboard (mobile users can long-press the domain and use native browser functionality to copy highlighted text)

How does this PR accomplish the above?:

What documentation changes (if any) are needed to support this PR?:
Possibly docs, I've not checked. This may need to be replicated to long term tables?

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

pralor-bot · 2020-08-28T07:45:21Z

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/how-am-i-supposed-to-filter-the-query-logs-with-a-mobile-phone-browser/37656/12

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Address prettier complaints Signed-off-by: Adam Warner <me@adamwarner.co.uk>

PromoFaux · 2020-10-10T18:22:17Z

mobile functionality:

scripts/pi-hole/js/queries.js

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

PromoFaux · 2020-10-11T12:34:57Z

Desktop functionality (didn't have time to make a gif last night!

yubiuser · 2020-10-11T13:29:35Z

The tooltip (mouse over) still recommends the old behavior
The text selection (Ctrl+mouse) does not work on my linux + firefox. (But does work on Linux+ Chrome)
I never see the showAlert after copying

wait, something is wrong here...

yubiuser · 2020-10-11T13:39:11Z

I fixed it.

The only thing that remains:

The tooltip (mouse over) still recommends the old behavior

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

PromoFaux · 2020-10-11T13:48:28Z

Ah, OK.. what was happening with ff on linux?

I have sorted the tooltip text

yubiuser · 2020-10-11T13:51:36Z

Ah, OK.. what was happening with ff on linux?

It was always selecting the whole cell. I figured out that the local repository was in a weird state, I nuked it and cloned it again. Now it is working as expected.

yubiuser

Looks good to me.

DL6ER · 2020-10-11T18:17:44Z

scripts/pi-hole/js/utils.js

+  document.body.appendChild(tmpTextarea);
+  tmpTextarea.value = text;
+  tmpTextarea.select();
+  document.execCommand("copy");


Thanks for your suggestion. However, I've just found

This feature [document.execCommand] is obsolete. Although it may still work in some browsers, its use is discouraged since it could be removed at any time. Try to avoid using it.

https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand

and

The execCommand('copy') API isn't supported in Safari

https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Interact_with_the_clipboard

There seems to be the new asynchronous Clipboard API methods to add this feature, however, ...

The asynchronous Clipboard API methods are a recent addition to the specification, and may not be fully implemented to the specification in all browsers. Be sure to review the compatibility tables for each method before using them, to ensure that support is broad enough for your needs.

(same source as above)

Compatibility matrix: https://developer.mozilla.org/en-US/docs/Web/API/Clipboard_API

Oh. Fiddlesticks...

I'll look at using this newer API. Maybe it's time we say "to hell with internet explorer", anyway

That said, the clipboard API is still in working draft status. So probably best not to use it....

PromoFaux · 2020-10-12T16:42:25Z

Killing this. It's got messy and needed rebasing anyway...

PromoFaux · 2020-10-12T16:45:49Z

Redone as #1602

Don't require modifier keys to add/remove to/from the filter

18006fc

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

PromoFaux marked this pull request as draft August 28, 2020 07:42

yubiuser mentioned this pull request Aug 28, 2020

Change to filtering for non-mobile browsers has broken mobile browsers functionality #1561

Closed

PromoFaux added 2 commits October 10, 2020 18:40

please prettier rules

55d0cd0

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

add utility for copying text to clipboard

8901eda

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

PromoFaux force-pushed the tweak/queryfilters branch from b8598ce to cca659a Compare October 10, 2020 17:42

Ctrl/Cmd+click on desktop copies domain to clipboard

63e9348

Address prettier complaints Signed-off-by: Adam Warner <me@adamwarner.co.uk>

PromoFaux force-pushed the tweak/queryfilters branch from cca659a to 63e9348 Compare October 10, 2020 17:49

PromoFaux marked this pull request as ready for review October 10, 2020 17:50

PromoFaux requested a review from DL6ER October 10, 2020 17:50

PromoFaux added the Ready for Check and Merge label Oct 10, 2020

PromoFaux requested a review from yubiuser October 10, 2020 17:51

DL6ER reviewed Oct 10, 2020

View reviewed changes

scripts/pi-hole/js/queries.js Outdated Show resolved Hide resolved

include client column in clipboard

1db4b91

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Update tooltip text

08d103e

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

yubiuser approved these changes Oct 11, 2020

View reviewed changes

DL6ER reviewed Oct 11, 2020

View reviewed changes

PromoFaux closed this Oct 12, 2020

PromoFaux deleted the tweak/queryfilters branch October 12, 2020 16:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tweaks to the query log filters to make them a bit more user friendly #1568

Tweaks to the query log filters to make them a bit more user friendly #1568

PromoFaux commented Aug 28, 2020 •

edited

pralor-bot commented Aug 28, 2020

PromoFaux commented Oct 10, 2020

PromoFaux commented Oct 11, 2020

yubiuser commented Oct 11, 2020 •

edited

yubiuser commented Oct 11, 2020

PromoFaux commented Oct 11, 2020 •

edited

yubiuser commented Oct 11, 2020

yubiuser left a comment

DL6ER Oct 11, 2020 •

edited

DL6ER Oct 11, 2020

PromoFaux Oct 11, 2020

PromoFaux Oct 12, 2020

PromoFaux Oct 12, 2020

PromoFaux commented Oct 12, 2020

PromoFaux commented Oct 12, 2020

Tweaks to the query log filters to make them a bit more user friendly #1568

Tweaks to the query log filters to make them a bit more user friendly #1568

Conversation

PromoFaux commented Aug 28, 2020 • edited

pralor-bot commented Aug 28, 2020

PromoFaux commented Oct 10, 2020

PromoFaux commented Oct 11, 2020

yubiuser commented Oct 11, 2020 • edited

yubiuser commented Oct 11, 2020

PromoFaux commented Oct 11, 2020 • edited

yubiuser commented Oct 11, 2020

yubiuser left a comment

Choose a reason for hiding this comment

DL6ER Oct 11, 2020 • edited

Choose a reason for hiding this comment

DL6ER Oct 11, 2020

Choose a reason for hiding this comment

PromoFaux Oct 11, 2020

Choose a reason for hiding this comment

PromoFaux Oct 12, 2020

Choose a reason for hiding this comment

PromoFaux Oct 12, 2020

Choose a reason for hiding this comment

PromoFaux commented Oct 12, 2020

PromoFaux commented Oct 12, 2020

PromoFaux commented Aug 28, 2020 •

edited

yubiuser commented Oct 11, 2020 •

edited

PromoFaux commented Oct 11, 2020 •

edited

DL6ER Oct 11, 2020 •

edited