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

Change the copy from blacklist to blocklist #65419

Merged
merged 2 commits into from
May 7, 2020

Conversation

stratoula
Copy link
Contributor

@stratoula stratoula commented May 6, 2020

Fixes #62133
Fix inconsistent copy introduced from #62133

@stratoula stratoula added the Team:Visualizations Visualization editors, elastic-charts and infrastructure label May 6, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-app (Team:KibanaApp)

@stratoula stratoula added Feature:Graph Graph application feature v7.8.0 v8.0.0 release_note:fix and removed Team:Visualizations Visualization editors, elastic-charts and infrastructure labels May 6, 2020
@stratoula stratoula force-pushed the 2020-06-05-fix-copy-blocklist branch from 9c8eb39 to 0df2899 Compare May 6, 2020 09:16
@mbondyra
Copy link
Contributor

mbondyra commented May 6, 2020

yey! First PR 🥳

@stratoula stratoula marked this pull request as ready for review May 6, 2020 11:22
@stratoula stratoula requested review from a team, timroes and flash1293 May 6, 2020 11:22
Copy link
Contributor

@flash1293 flash1293 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested in Chrome and works as expected. I'm not 100% sure whether "blocklist" is a proper verb - another option would be "Block selection from return to workspace" or "Exclude selection from return to workspace".

@gchaps What do you think? Are you fine with "Blocklist selection from return to workspace"?

@stratoula Sorry, completely missed this in the issue description, it wasn't really clear.

@stratoula
Copy link
Contributor Author

Tested in Chrome and works as expected. I'm not 100% sure whether "blocklist" is a proper verb - another option would be "Block selection from return to workspace" or "Exclude selection from return to workspace".

@gchaps What do you think? Are you fine with "Blocklist selection from return to workspace"?

@stratoula Sorry, completely missed this in the issue description, it wasn't really clear.

No prob at all! Let's agree on the final message and I will change it :)

@gchaps
Copy link
Contributor

gchaps commented May 6, 2020

@stratoula Can you please include a screenshot of the revised copy?

@stratoula
Copy link
Contributor Author

@gchaps here it is
Screenshot 2020-05-06 at 7 03 34 PM

@gchaps
Copy link
Contributor

gchaps commented May 6, 2020

Thanks, @stratoula. I'm confused by what "return to workspace" means. Can it be simplified to

"Block selection from graph"

@flash1293
Copy link
Contributor

@gchaps ”Return to workspace” means if you are searching for new data or expanding selections, this term won’t show up again.

@gchaps
Copy link
Contributor

gchaps commented May 6, 2020

Maybe one of the following?

Block selection from appearing in workspace.
Block selection from appearing in workspace on search and expand.
Block selection from appearing in workspace when searching data and expanding nodes.

OR the original

Block selection from returning to workspace

@flash1293
Copy link
Contributor

I like “ Block selection from appearing in workspace” - that’s explaining it well in simple terms. Thanks @gchaps ! @stratoula could you update the PR?

@stratoula stratoula force-pushed the 2020-06-05-fix-copy-blocklist branch from 0df2899 to 564467e Compare May 7, 2020 06:42
@stratoula
Copy link
Contributor Author

Sure @flash1293 @gchaps, I have updated the PR!

Copy link
Contributor

@flash1293 flash1293 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once green, didn't test again.

@stratoula
Copy link
Contributor Author

@elasticmachine merge upstream

Copy link
Contributor

@timroes timroes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed code change only. LGTM

@stratoula stratoula merged commit 8b862fe into elastic:master May 7, 2020
@stratoula stratoula added the Team:Visualizations Visualization editors, elastic-charts and infrastructure label May 7, 2020
gmmorris added a commit to gmmorris/kibana that referenced this pull request May 7, 2020
…ttional-flaky

* upstream/master: (49 commits)
  Move remaining home assets to the new platform (elastic#65053)
  Change the copy and the id from blacklist to block list for consistency (elastic#65419)
  [ML] Hide selector helper in Anomaly Explorer swimlane (elastic#65522)
  [ML] Fix the limit control on the Anomaly explorer page (elastic#65459)
  [Mappings editor] Add component integration tests (elastic#63853)
  [Logs + Metrics UI] Prevent component errors from breaking the whole UI (elastic#65456)
  [Logs UI] Disable search bar when live stream is on. (elastic#65491)
  fix SavedObjectMigrationMap type (elastic#65569)
  [Uptime] Improve cert flaky test (elastic#65458)
  [Uptime] Fix monitor list result runtime type, ip can be null (elastic#65532)
  [APM] Agent configuration: Bug makes it possible to create invalid configurations (elastic#65508)
  [APM] Remove link from active page in the breadcrumb (elastic#65473)
  [SIEM] Fixes test flakiness (elastic#65510)
  [ESLint] update @kbn/eslint/no-restricted-paths rule to allow imports mocks from folder (elastic#65471)
  Migrate test plugins ⇒ NP (kbn_tp_run_pipeline) (elastic#64780)
  move core provier to NP. allows to run tests on every page (elastic#64929)
  Extended alerting documentation with information about using Kibana keystore and action types for preconfigured connectors (elastic#65201)
  [functional tests] add some missing awaits (elastic#65566)
  Fixed create new connector from alert flyout form throw an error messages in external plugins. (elastic#65539)
  [SIEM] [Cases] External services not getting all comments bug fix (elastic#65307)
  ...
stratoula added a commit to stratoula/kibana that referenced this pull request May 7, 2020
…cy (elastic#65419)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

gmmorris added a commit to gmmorris/kibana that referenced this pull request May 7, 2020
* master:
  [ML] Transforms: Fix API error message display for edit flyout. (elastic#65494)
  [SIEM][Detection Engine] Fixes import bug with non existent signals index (elastic#65595)
  [Lens] Use rules of hooks with linting (elastic#65593)
  [ML] Migrate server side Mocha tests to Jest. (elastic#65651)
  Fixes the client to setup SSL with the CA certificates for testing (elastic#65598)
  reduce uptime plugin initial bundle size (elastic#65257)
  [ML] Consolidating shared types and util functions (elastic#65247)
  [Drilldowns] Preserve state when selecting different action factory (elastic#65074)
  Migrate test plugins ⇒ NP (kbn_tp_embeddable_explorer) (elastic#64756)
  Move remaining home assets to the new platform (elastic#65053)
  Change the copy and the id from blacklist to block list for consistency (elastic#65419)
  [ML] Hide selector helper in Anomaly Explorer swimlane (elastic#65522)
  [ML] Fix the limit control on the Anomaly explorer page (elastic#65459)
  [Mappings editor] Add component integration tests (elastic#63853)
  [Logs + Metrics UI] Prevent component errors from breaking the whole UI (elastic#65456)
  [Logs UI] Disable search bar when live stream is on. (elastic#65491)
gmmorris added a commit to gmmorris/kibana that referenced this pull request May 7, 2020
…ponents

* alerting/lazy-load-actions:
  align and style loading indicator
  [ML] Transforms: Fix API error message display for edit flyout. (elastic#65494)
  [SIEM][Detection Engine] Fixes import bug with non existent signals index (elastic#65595)
  [Lens] Use rules of hooks with linting (elastic#65593)
  [ML] Migrate server side Mocha tests to Jest. (elastic#65651)
  Fixes the client to setup SSL with the CA certificates for testing (elastic#65598)
  reduce uptime plugin initial bundle size (elastic#65257)
  [ML] Consolidating shared types and util functions (elastic#65247)
  [Drilldowns] Preserve state when selecting different action factory (elastic#65074)
  Migrate test plugins ⇒ NP (kbn_tp_embeddable_explorer) (elastic#64756)
  Move remaining home assets to the new platform (elastic#65053)
  Change the copy and the id from blacklist to block list for consistency (elastic#65419)
  [ML] Hide selector helper in Anomaly Explorer swimlane (elastic#65522)
  [ML] Fix the limit control on the Anomaly explorer page (elastic#65459)
  [Mappings editor] Add component integration tests (elastic#63853)
  [Logs + Metrics UI] Prevent component errors from breaking the whole UI (elastic#65456)
  [Logs UI] Disable search bar when live stream is on. (elastic#65491)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature:Graph Graph application feature release_note:fix Team:Visualizations Visualization editors, elastic-charts and infrastructure v7.8.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsistent copy: blocklist or blacklist?
7 participants