bulk update separation #356
There are no files selected for viewing
This file contains 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 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 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 |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import { createSelector, createSlice } from '@reduxjs/toolkit'; | ||
| import { async, concat, from, Observable, of } from 'rxjs'; | ||
| import { map, mergeMap, tap, toArray } from 'rxjs/operators'; | ||
| import { forEach } from 'lodash'; | ||
| import { | ||
| CUSTOM_PANELS_API_PREFIX, | ||
| CUSTOM_PANELS_SAVED_OBJECT_TYPE, | ||
|
|
@@ -16,6 +17,7 @@ import { | |
| import { coreRefs } from '../../../framework/core_refs'; | ||
| import { SavedObject, SimpleSavedObject } from '../../../../../../src/core/public'; | ||
| import { isNameValid } from '../helpers/utils'; | ||
| import { addVisualizationPanel } from '../helpers/add_visualization_helper'; | ||
|
|
||
| interface InitialState { | ||
| id: string; | ||
|
|
@@ -56,10 +58,7 @@ export const panelReducer = panelSlice.reducer; | |
|
|
||
| export const selectPanel = (rootState): CustomPanelType => rootState.customPanel.panel; | ||
|
|
||
| export const selectPanelList = (rootState): CustomPanelType[] => rootState.customPanel.panelList; | ||
|
|
||
| // export const selectPanelList = createSelector( | ||
| // rootState => { console.log("selectPanelList", { rootState }); return rootState.customPanel.panelList }, | ||
|
|
@@ -90,16 +89,18 @@ const fetchCustomPanels = async () => { | |
| const panels$: Observable<CustomPanelListType> = concat( | ||
| fetchSavedObjectPanels$(), | ||
| fetchObservabilityPanels$() | ||
| ).pipe( | ||
| map((res) => { | ||
| console.log('fetchCustomPanels', res); | ||
| return res as CustomPanelListType; | ||
| }) | ||
| ); | ||
|
|
||
| return panels$.pipe(toArray()).toPromise(); | ||
| }; | ||
|
|
||
| export const fetchPanels = () => async (dispatch, getState) => { | ||
| const panels = await fetchCustomPanels(); | ||
| console.log('fetchPanels', { panels }); | ||
| dispatch(setPanelList(panels)); | ||
| }; | ||
|
|
@@ -112,34 +113,49 @@ export const fetchPanel = (id) => async (dispatch, getState) => { | |
|
|
||
| export const fetchVisualization = () => (dispatch, getState) => {}; | ||
|
|
||
| const updateLegacyPanel = (panel: CustomPanelType) => | ||
| coreRefs.http!.post(`${CUSTOM_PANELS_API_PREFIX}/panels/update`, { | ||
| body: JSON.stringify({ panelId: panel.id, panel: panel as PanelType }), | ||
| }); | ||
|
|
||
| const updateSavedObjectPanel = (panel: CustomPanelType) => savedObjectPanelsClient.update(panel); | ||
|
|
||
| export const uuidRx = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/; | ||
|
|
||
| const isUuid = (id) => !!id.match(uuidRx); | ||
|
|
||
| export const updatePanel = (panel: CustomPanelType) => async (dispatch, getState) => { | ||
| try { | ||
| if (isUuid(panel.id)) await updateSavedObjectPanel(panel); | ||
| else await updateLegacyPanel(panel); | ||
|
|
||
| dispatch(setPanel(panel)); | ||
| const panelList = getState().customPanel.panelList.map((p) => (p.id === panel.id ? panel : p)); | ||
| dispatch(setPanelList(panelList)); | ||
| } catch (err) { | ||
| console.log('Error updating panel', { err, panel }); | ||
| } | ||
| }; | ||
|
|
||
| export const addVizToPanels = (panels, vizId) => async (dispatch, getState) => { | ||
| forEach(panels, (oldPanel) => { | ||
| console.log(oldPanel); | ||
| console.log(getState().customPanel.panelList); | ||
derek-ho marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| const panel = getState().customPanel.panelList.find((p) => p.id === oldPanel.panel.id); | ||
|
|
||
| const allVisualizations = panel!.visualizations; | ||
|
|
||
| const visualizationsWithNewPanel = addVisualizationPanel(vizId, undefined, allVisualizations); | ||
|
There was a problem hiding this comment. @ps48 @joshuali925 can you verify this line makes sense? Since we want to add a viz to panel as a new one, pass in undefined into this function: ?There was a problem hiding this comment. Yes, this is correct for adding panels to a visualization. For replace workflow, you can use the same function and pass OldVisualizationId. |
||
|
|
||
| const updatedPanel = { ...panel, visualizations: visualizationsWithNewPanel }; | ||
| try { | ||
| dispatch(updatePanel(updatedPanel)); | ||
| } catch (err) { | ||
| console.error(err?.body?.message || err); | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| export const deletePanel = (id) => async (dispatch, getState) => { | ||
| await savedObjectPanelsClient.delete(id); | ||
| const panelList: CustomPanelType[] = getState().panelList.filter((p) => p.id !== id); | ||
|
|
@@ -152,7 +168,6 @@ export const createPanel = (panel) => async (dispatch, getState) => { | |
| dispatch(setPanelList([...panelList, newPanel])); | ||
| }; | ||
|
|
||
| const saveRenamedPanel = async (id, name) => { | ||
| const renamePanelObject = { | ||
| panelId: id, | ||
|
|
@@ -174,17 +189,20 @@ const saveRenamedPanelSO = async (id, name) => { | |
| }; | ||
|
|
||
| // Renames an existing CustomPanel | ||
| export const renameCustomPanel = (editedCustomPanelName: string, id: string) => async ( | ||
| dispatch, | ||
| getState | ||
| ) => { | ||
| console.log('renameCustomPanel dispatched', { editedCustomPanelName, id }); | ||
|
|
||
| if (!isNameValid(editedCustomPanelName)) { | ||
| console.log('Invalid Custom Panel name', 'danger'); | ||
| return Promise.reject(); | ||
| } | ||
|
|
||
| const panel = getState().customPanel.panelList.find((p) => p.id === id); | ||
| const updatedPanel = { ...panel, title: editedCustomPanelName }; | ||
| dispatch(updatePanel(updatedPanel)); | ||
|
|
||
| // try { | ||
| // // await savePanelFn(editedCustomPanelId, editedCustomPanelName); | ||
|
|
||
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -3,13 +3,20 @@ | |
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import { forEach } from 'lodash'; | ||
| import { | ||
| addVizToPanels, | ||
| fetchPanel, | ||
| uuidRx, | ||
| } from '../../../../../public/components/custom_panels/redux/panel_slice'; | ||
| import { | ||
| SAVED_OBJECT_ID, | ||
| SAVED_OBJECT_TYPE, | ||
| SAVED_VISUALIZATION, | ||
| } from '../../../../../common/constants/explorer'; | ||
| import { ISavedObjectsClient } from '../../saved_object_client/client_interface'; | ||
| import { SavedQuerySaver } from './saved_query_saver'; | ||
| import { addVisualizationPanel } from '../../../../../public/components/custom_panels/helpers/add_visualization_helper'; | ||
|
|
||
| export class SaveAsNewVisualization extends SavedQuerySaver { | ||
| constructor( | ||
|
|
@@ -76,9 +83,14 @@ export class SaveAsNewVisualization extends SavedQuerySaver { | |
| } | ||
|
|
||
| addToPanel({ selectedPanels, saveTitle, notifications, visId }) { | ||
| const { dispatch } = this.dispatchers; | ||
|
There was a problem hiding this comment. Please consider context here, as well as SRP-SingleResponsibilityPrinciple. Wer are inside "saved_objects/saved_object_savers".... This, despite it's name, is the Observability index re-invention of saved objects. Also, wrt. SRP, although "saving things" sounds like a single responsibliity, we can see from the code that saving to SavedObject-Core (via Redux/Dispatch) is very different from using SavedObjectSavers. Recommendation : There was a problem hiding this comment.
Why does this happen? I didn't look into impl details but essentially the difference between saving SO vs. observability object is the client. If the client can be abstracted, then the same operation should work for both cases There was a problem hiding this comment. @joshuali925 @pjfitzgibbons can we merge this in as is? I understand it may not be right but theres a few other p0 items today, once we make the final go-no go call I can refactor to be correct |
||
| const soPanels = selectedPanels.filter((panel) => panel.panel.id.test(uuidRx)); | ||
| const opsPanels = selectedPanels.filter((panel) => !panel.panel.id.test(uuidRx)); | ||
|
|
||
| dispatch(addVizToPanels(soPanels, visId)); | ||
| this.panelClient | ||
| .updateBulk({ | ||
| selectedCustomPanels: opsPanels, | ||
| savedVisualizationId: visId, | ||
| }) | ||
| .then((res: any) => { | ||
|
|
||
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.
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.
I thought
var?: stringmeantstring | undefinedexactly?I've even "fixed" my own bugs many times with the
?syntax.Thuoghts?
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.
Maybe... I think what it is doing is makes it optional, which it cannot be since a required parameter comes after. This gets rid of it but maybe the more right thing is to put it at the end...