random-mirrors
/
cosmos-explorer
mirror of https://github.com/Azure/cosmos-explorer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for QueryTab Load More (#907)

This commit is contained in:
Steve Faulkner 2021-06-22 15:21:58 -05:00 committed by GitHub
parent 39215dc4de
commit f9bd12eaa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Explorer/Controls/Editor/EditorReact.tsx
View File

@ -33,6 +33,12 @@ export class EditorReact extends React.Component<EditorReactProps, EditorReactSt
this.createEditor(this.configureEditor.bind(this)); this.createEditor(this.configureEditor.bind(this));
} }
public componentDidUpdate(previous: EditorReactProps) {
if (this.props.content !== previous.content) {
this.editor.setValue(this.props.content);
}
}
public componentWillUnmount(): void { public componentWillUnmount(): void {
this.selectionListener && this.selectionListener.dispose(); this.selectionListener && this.selectionListener.dispose();
} }

37
src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx
View File

@ -102,7 +102,6 @@ interface IQueryTabStates {
export default class QueryTabComponent extends React.Component<IQueryTabComponentProps, IQueryTabStates> { export default class QueryTabComponent extends React.Component<IQueryTabComponentProps, IQueryTabStates> {
public queryEditorId: string; public queryEditorId: string;
public executeQueryButton: Button; public executeQueryButton: Button;
public fetchNextPageButton: Button;
public saveQueryButton: Button; public saveQueryButton: Button;
public splitterId: string; public splitterId: string;
public splitter: Splitter; public splitter: Splitter;
@ -195,23 +194,6 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
enabled: this.state._isSaveQueriesEnabled, enabled: this.state._isSaveQueriesEnabled,
visible: this.state._isSaveQueriesEnabled, visible: this.state._isSaveQueriesEnabled,
}; };
this.fetchNextPageButton = {
enabled: (() => {
const allResultsMetadata = this.state.allResultsMetadata || [];
const numberOfResultsMetadata = allResultsMetadata.length;
if (numberOfResultsMetadata === 0) {
return false;
}
if (allResultsMetadata[numberOfResultsMetadata - 1].hasMoreResults) {
return true;
}
return false;
})(),
visible: true,
};
this._buildCommandBarOptions(); this._buildCommandBarOptions();
props.onTabAccessor({ props.onTabAccessor({
@ -981,14 +963,17 @@ export default class QueryTabComponent extends React.Component<IQueryTabComponen
<span> <span>
<span>{this.state.showingDocumentsDisplayText}</span> <span>{this.state.showingDocumentsDisplayText}</span>
</span> </span>
{this.fetchNextPageButton.enabled && <span className="queryResultDivider">|</span>} {this.state.allResultsMetadata[this.state.allResultsMetadata.length - 1]
{this.fetchNextPageButton.enabled && ( .hasMoreResults && (
<span className="queryResultNextEnable"> <>
<a onClick={this.onFetchNextPageClick}> <span className="queryResultDivider">|</span>
<span>Load more</span> <span className="queryResultNextEnable">
<img className="queryResultnextImg" src={QueryEditorNext} alt="Fetch next page" /> <a onClick={this.onFetchNextPageClick.bind(this)}>
</a> <span>Load more</span>
</span> <img className="queryResultnextImg" src={QueryEditorNext} alt="Fetch next page" />
</a>
</span>
</>
)} )}
</div> </div>
{this.state.queryResults && {this.state.queryResults &&