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.

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

Jump to bottom

#6814 fix The "Publish..." button is disappeared #6815

Merged
merged 1 commit into from
Feb 9, 2018
Merged

#6814 fix The "Publish..." button is disappeared #6815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 1 addition & 27 deletions js/notebook/src/tree/Models/TreeWidgetModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,6 @@ import SyncIndicatorWidget from "../Widgets/SyncIndicatorWidget";
export default class TreeWidgetModel {

private _options: IApiSettingsResponse;
private readonly DEFAULT_CONFIG = {
jvm_options: {
heap_GB: null,
other: [],
properties: []
},
ui_options: {
auto_close: false,
improve_fonts: true,
wide_cells: true,
show_publication: true
},
version: 2
};

constructor(
private api: BeakerXApi,
Expand All @@ -54,9 +40,6 @@ export default class TreeWidgetModel {
this.api
.loadSettings()
.then((data: IApiSettingsResponse) => {
if (!data.ui_options) {
data.ui_options = this.DEFAULT_CONFIG.ui_options;
}

this._options = data;

Expand All @@ -79,16 +62,7 @@ export default class TreeWidgetModel {
public save() {
this.syncStart();

let payload: IApiSettingsResponse = this.DEFAULT_CONFIG;

payload.jvm_options.heap_GB = this._options.jvm_options.heap_GB;
payload.jvm_options.other = this._options.jvm_options.other;
payload.jvm_options.properties = this._options.jvm_options.properties;

payload.ui_options.auto_close = this._options.ui_options.auto_close;
payload.ui_options.improve_fonts = this._options.ui_options.improve_fonts;
payload.ui_options.wide_cells = this._options.ui_options.wide_cells;
payload.ui_options.show_publication = this._options.ui_options.show_publication;
let payload: IApiSettingsResponse = this.api.mergeWithDefaults(this._options);

this.showResult(payload.jvm_options);

Expand Down
36 changes: 34 additions & 2 deletions js/notebook/src/tree/Utils/BeakerXApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,21 @@ function getCookie(name) {

export default class BeakerXApi {

private readonly DEFAULT_SETTINGS: IApiSettingsResponse = {
jvm_options: {
heap_GB: null,
other: [],
properties: []
},
ui_options: {
auto_close: false,
improve_fonts: true,
wide_cells: true,
show_publication: true
},
version: 2
};

private apiUrl: string;

constructor(baseUrl: string = '/') {
Expand Down Expand Up @@ -53,7 +68,7 @@ export default class BeakerXApi {
return new Promise((resolve, reject) => {
$.ajax(this.getApiUrl('settings'), {
success: (data, status) => {
resolve(data.beakerx);
resolve(this.mergeWithDefaults(data.beakerx));
},
error: (jqXHR, status, err) => {
reject();
Expand All @@ -63,8 +78,25 @@ export default class BeakerXApi {
});
}

public mergeWithDefaults(settings: IApiSettingsResponse): IApiSettingsResponse {
let merged = this.DEFAULT_SETTINGS;

if (settings.hasOwnProperty('version')) {
merged.version = settings.version;
}

if (settings.hasOwnProperty('ui_options')) {
merged.ui_options = settings.ui_options;
}

if (settings.hasOwnProperty('ui_options')) {
merged.jvm_options = settings.jvm_options;
}

return merged;
}
public saveSettings(data): Promise<any> {
return new Promise<IApiSettingsResponse>((resolve, reject) => {
return new Promise<any>((resolve, reject) => {

$.ajax(this.getApiUrl('settings'), {
method: "POST",
Expand Down