Skip to content

Pass new saved object by ref #4

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.

Sign up for GitHub

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

Merged
wylieconlon merged 2 commits into from
Aug 6, 2019
Merged

Pass new saved object by ref #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6020e0
pass new saved object by ref
flash1293 Aug 6, 2019
e4a9545
add dirty state checking
flash1293 Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import _ from 'lodash';
import React, { useState, useEffect, useCallback } from 'react';
import React, { useState, useEffect, useCallback, useRef } from 'react';
import { I18nProvider } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { EuiLink, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
Expand All @@ -28,7 +28,6 @@ interface State {
};
query: Query;
indexPatternTitles: string[];
lastKnownDoc?: Document;
persistedDoc?: Document;
}

Expand Down Expand Up @@ -63,6 +62,10 @@ export function App({
indexPatternTitles: [],
});

const [isDirty, setDirty] = useState(false);

const lastKnownDocRef = useRef<Document | undefined>(undefined);

useEffect(() => {
if (docId && (!state.persistedDoc || state.persistedDoc.id !== docId)) {
setState({ ...state, isLoading: true });
Expand Down Expand Up @@ -96,10 +99,10 @@ export function App({
// Can save if the frame has told us what it has, and there is either:
// a) No saved doc
// b) A saved doc that differs from the frame state
const isSaveable =
state.lastKnownDoc &&
(!state.persistedDoc ||
(state.persistedDoc && !_.isEqual(state.lastKnownDoc, state.persistedDoc)));
const isSaveable = isDirty;
// state.lastKnownDoc &&
// (!state.persistedDoc ||
// (state.persistedDoc && !_.isEqual(state.lastKnownDoc, state.persistedDoc)));

const onError = useCallback(
(e: { message: string }) =>
Expand All @@ -119,17 +122,17 @@ export function App({
<EuiLink
data-test-subj="lnsApp_saveButton"
onClick={() => {
if (isSaveable && state.lastKnownDoc) {
if (isSaveable && lastKnownDocRef.current) {
docStorage
.save(state.lastKnownDoc)
.save(lastKnownDocRef.current)
.then(({ id }) => {
// Prevents unnecessary network request and disables save button
const newDoc = { ...(state.lastKnownDoc as Document), id };
const newDoc = { ...(lastKnownDocRef.current!), id };
setState({
...state,
persistedDoc: newDoc,
lastKnownDoc: newDoc,
});
setDirty(false);
if (docId !== id) {
redirectTo(id);
}
Expand Down Expand Up @@ -188,11 +191,17 @@ export function App({
doc: state.persistedDoc,
onError,
onChange: ({ indexPatternTitles, doc }) => {
setState({
...state,
indexPatternTitles,
lastKnownDoc: doc,
});
if (!_.isEqual(state.indexPatternTitles, indexPatternTitles)) {
setState({
...state,
indexPatternTitles,
});
}
const docChanged = !_.isEqual(doc, state.persistedDoc);
if (docChanged !== isDirty) {
setDirty(docChanged);
}
lastKnownDocRef.current = doc;
},
}}
/>
Expand Down