Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Adding bleve to the admin console #5120

Merged
merged 14 commits into from
May 19, 2020
Merged

Adding bleve to the admin console #5120

merged 14 commits into from
May 19, 2020

Conversation

jespino
Copy link
Member

@jespino jespino commented Mar 24, 2020

Summary

Adding bleve to the admin console

Ticket Link

MM-23144

@jespino jespino added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Mar 24, 2020
@hanzei hanzei added the Work in Progress Not yet ready for review label Mar 29, 2020
@mgdelacroix mgdelacroix mentioned this pull request May 13, 2020
Merged
@mgdelacroix mgdelacroix mentioned this pull request May 18, 2020
Merged
@mgdelacroix mgdelacroix added 1: PM Review Requires review by a product manager 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester and removed Work in Progress Not yet ready for review labels May 18, 2020
wiersgallak
wiersgallak suggested changes May 18, 2020
View reviewed changes
Copy link
Contributor

@wiersgallak wiersgallak left a comment

Choose a reason for hiding this comment

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

Please add a "Experimental" to the LHS and to the page header for the settings.

@wiersgallak
Copy link
Contributor

@mgdelacroix Per our discussion, this can actually be moved to the Experimental section at the bottom of the LHS.

ethervoid
ethervoid approved these changes May 18, 2020
View reviewed changes
Copy link
Contributor

@ethervoid ethervoid left a comment

Choose a reason for hiding this comment

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

LGTM. Maybe including someone with more experience in webapp could be good too

actions/admin_actions.jsx
@@ -254,6 +254,20 @@ export async function elasticsearchPurgeIndexes(success, error) {
}
}

export async function blevePurgeIndexes(success, error) {
const purgeBleveIndexes = bindClientFunc({
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we calling here the client function instead of in redux because of the deprecation?

Copy link
Member

Choose a reason for hiding this comment

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

It was initially put in the redux PR and moved here out of a discussion there. The only piece needed in redux is the client function.

@mgdelacroix mgdelacroix added this to the v5.24.0 milestone May 19, 2020
@mgdelacroix mgdelacroix removed the 1: PM Review Requires review by a product manager label May 19, 2020
@mgdelacroix mgdelacroix removed the 2: Dev Review Requires review by a core commiter label May 19, 2020
@mgdelacroix mgdelacroix requested a review from ogi-m May 19, 2020 16:26
@ogi-m ogi-m removed the 3: QA Review Requires review by a QA tester label May 19, 2020
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label May 19, 2020
@mgdelacroix mgdelacroix removed the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label May 19, 2020
@mgdelacroix mgdelacroix merged commit e185641 into mattermost:master May 19, 2020
@mattermod
Copy link
Contributor

@jespino
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-#5120-upstream-release-5.24-1589930871
Branch 'automated-cherry-pick-of-#5120-upstream-release-5.24-1589930871' set up to track remote branch 'release-5.24' from 'upstream'.
+++ Downloading patch to /tmp/5120.patch (in case you need to do this again)

+++ About to attempt cherry pick of PR. To reattempt:
  $ git am -3 /tmp/5120.patch

Applying: Adding bleve to the admin console
Using index info to reconstruct a base tree...
M	components/admin_console/admin_definition.jsx
M	utils/constants.jsx
Falling back to patching base and 3-way merge...
Auto-merging utils/constants.jsx
Auto-merging components/admin_console/admin_definition.jsx
Applying: Adding snapshot
Applying: Moving the action from mattermost-redux into the webapp
Applying: Pointing mattermost-redux to the correct branch commit
Using index info to reconstruct a base tree...
M	package-lock.json
M	package.json
Falling back to patching base and 3-way merge...
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Patch failed at 0004 Pointing mattermost-redux to the correct branch commit
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

+++ Conflicts detected:

UU package-lock.json
UU package.json

+++ Aborting in-progress git am.

+++ Returning you to the master branch and cleaning up.

mgdelacroix added a commit that referenced this pull request May 20, 2020
@jespino @mgdelacroix
Adding bleve to the admin console (#5120)
13a3449 
* Adding bleve to the admin console

* Adding snapshot

* Moving the action from mattermost-redux into the webapp

* Pointing mattermost-redux to the correct branch commit

* Add missing translations

* Update redux references

* Move bleve under Experimental submenu

* Update test snapshots

* Fix admin test

* Fixing purge index button

* Fixing small problem with buttons enabling/disabling

Co-authored-by: Miguel de la Cruz <[email protected]>
@mgdelacroix mgdelacroix added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels May 20, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels May 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wiersgallak wiersgallak wiersgallak requested changes

@mgdelacroix mgdelacroix mgdelacroix approved these changes

@ethervoid ethervoid ethervoid approved these changes

@ogi-m ogi-m ogi-m approved these changes

Assignees
No one assigned
Labels
Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
v5.24.0
8 participants
@jespino @wiersgallak @mattermod @mgdelacroix @ethervoid @ogi-m @hanzei @amyblais