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

89 editor #101

Merged
merged 3 commits into from
May 15, 2024
Merged

89 editor #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be5d133
nex user experience with editor
dufoli May 14, 2024
a3c91ac
fix suggestion field
dufoli May 15, 2024
7c385ca
fix issue with selection
dufoli May 15, 2024
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
62 changes: 53 additions & 9 deletions addon/apex-runner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ class Model {
this.suggestionTop = 0;
this.suggestionLeft = 0;
this.disableSuggestionOverText = localStorage.getItem("disableSuggestionOverText") === "true";
this.activeSuggestion = -1;
if (history.disableSuggestionOverText) {
this.displaySuggestion = true;
} else {
this.displaySuggestion = false;
}
this.clientId = localStorage.getItem(sfHost + "_clientId") ? localStorage.getItem(sfHost + "_clientId") : "";
let scriptTemplatesRawValue = localStorage.getItem("scriptTemplates");
if (scriptTemplatesRawValue && scriptTemplatesRawValue != "[]") {
Expand Down Expand Up @@ -296,12 +302,7 @@ class Model {
selStart = selEnd - searchTerm.length;

if (ctrlSpace) {
if (vm.autocompleteResults && vm.autocompleteResults.results && vm.autocompleteResults.results.length > 0) {
let ar = vm.autocompleteResults.results;
vm.editor.focus();
vm.editor.setRangeText(ar[0].value + ar[0].suffix, selStart, selEnd, "end");
vm.editorAutocompleteHandler();
}
this.selectSuggestion();
return;
}
let contextPath;
Expand Down Expand Up @@ -497,6 +498,49 @@ class Model {
console.error(error);
});
}
showSuggestion() {
this.displaySuggestion = true;
this.didUpdate();
}
hideSuggestion() {
this.displaySuggestion = false;
this.didUpdate();
}
nextSuggestion() {
if (this.activeSuggestion < this.autocompleteResults.results.length - 1) {
this.activeSuggestion++;
} else {
this.activeSuggestion = 0;
}
this.didUpdate();
}
previousSuggestion() {
if (this.activeSuggestion > 0) {
this.activeSuggestion--;
} else {
this.activeSuggestion = this.autocompleteResults.results.length - 1;
}
this.didUpdate();
}
selectSuggestion() {
if (!this.autocompleteResults || !this.autocompleteResults.results || this.autocompleteResults.results.length == 0) {
return;
}
//by default auto complete the first item
let idx = this.activeSuggestion > -1 ? this.activeSuggestion : 0;
let ar = this.autocompleteResults.results;
let selStart = this.editor.selectionStart;
let selEnd = this.editor.selectionEnd;
let searchTerm = selStart != selEnd
? this.editor.value.substring(selStart, selEnd)
: this.editor.value.substring(0, selStart).match(/[a-zA-Z0-9_.]*$/)[0];
selStart = selEnd - searchTerm.length;

this.editor.focus();
this.editor.setRangeText(ar[idx].value + ar[idx].suffix, selStart, selEnd, "end");
this.activeSuggestion = -1;
this.editorAutocompleteHandler();
}
parseClass(source, clsName){
//todo build hierarchy of block List<Block> with startPosition, endPosition and context
//for moment simple list
Expand Down Expand Up @@ -1218,9 +1262,9 @@ class App extends React.Component {
h("button", {tabIndex: 2, onClick: this.onCopyScript, title: "Copy script url", className: "copy-id"}, "Export Script")
),
),
h("div", {className: "autocomplete-results", style: model.disableSuggestionOverText ? {} : {top: model.suggestionTop + "px", left: model.suggestionLeft + "px"}},
model.autocompleteResults.results.map(r =>
h("div", {className: "autocomplete-result", key: r.key ? r.key : r.value}, h("a", {tabIndex: 0, title: r.title, onClick: e => { e.preventDefault(); model.autocompleteClick(r); model.didUpdate(); }, href: "#", className: r.autocompleteType + " " + r.dataType}, h("div", {className: "autocomplete-icon"}), r.title), " ")
h("div", {className: "autocomplete-results" + (model.disableSuggestionOverText ? " autocomplete-results-under" : " autocomplete-results-over"), hidden: !model.displaySuggestion, style: model.disableSuggestionOverText ? {} : {top: model.suggestionTop + "px", left: model.suggestionLeft + "px"}},
model.autocompleteResults.results.map((r, ri) =>
h("div", {className: "autocomplete-result" + (ri == model.activeSuggestion ? " active" : ""), key: r.key ? r.key : r.value}, h("a", {tabIndex: 0, title: r.title, onClick: e => { e.preventDefault(); model.autocompleteClick(r); model.didUpdate(); }, href: "#", className: r.autocompleteType + " " + r.dataType}, h("div", {className: "autocomplete-icon"}), r.title), " ")
)
),
),
Expand Down
8 changes: 5 additions & 3 deletions addon/data-export.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ textarea {
border: 1px solid #DDDBDA;
}

textarea[hidden] {
display: none;
textarea[hidden], .autocomplete-results[hidden] {
display: none !important;
}

.help-text {
Expand Down Expand Up @@ -561,7 +561,9 @@ button.toggle .button-icon {
}

.autocomplete-results a:hover,
.autocomplete-results a:active {
.autocomplete-results a:active,
.autocomplete-results .active a
{
background-color: #eff1f5;
color: #005fb2;
}
Expand Down
182 changes: 132 additions & 50 deletions addon/data-export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ class Model {
this.suggestionLeft = 0;
this.columnIndex = {fields: []};
this.disableSuggestionOverText = localStorage.getItem("disableSuggestionOverText") === "true";
this.activeSuggestion = -1;
if (history.disableSuggestionOverText) {
this.displaySuggestion = true;
} else {
this.displaySuggestion = false;
}
this.clientId = localStorage.getItem(sfHost + "_clientId") ? localStorage.getItem(sfHost + "_clientId") : "";
let queryTemplatesRawValue = localStorage.getItem("queryTemplates");
if (queryTemplatesRawValue && queryTemplatesRawValue != "[]") {
Expand Down Expand Up @@ -352,6 +358,65 @@ class Model {
})
.catch(err => console.log("error handling failed", err));
}

showSuggestion() {
this.displaySuggestion = true;
this.didUpdate();
}
hideSuggestion() {
this.displaySuggestion = false;
this.didUpdate();
}
nextSuggestion() {
if (this.activeSuggestion < this.autocompleteResults.results.length - 1) {
this.activeSuggestion++;
} else {
this.activeSuggestion = 0;
}
this.didUpdate();
}
previousSuggestion() {
if (this.activeSuggestion > 0) {
this.activeSuggestion--;
} else {
this.activeSuggestion = this.autocompleteResults.results.length - 1;
}
this.didUpdate();
}
selectSuggestion() {
if (!this.autocompleteResults || !this.autocompleteResults.results || this.autocompleteResults.results.length == 0) {
return;
}
let selStart = this.editor.selectionStart;
let selEnd = this.editor.selectionEnd;
let searchTerm = selStart != selEnd
? this.editor.value.substring(selStart, selEnd)
: this.editor.value.substring(0, selStart).match(/[a-zA-Z0-9_.]*$/)[0];
selStart = selEnd - searchTerm.length;
let ar = this.autocompleteResults.results;
if (this.autocompleteResults.isField && this.activeSuggestion == -1) {
ar = ar
.filter(r => r.autocompleteType == "fieldName")
.map((r, i, l) => this.autocompleteResults.contextPath + r.value + (i != l.length - 1 ? r.suffix : ""));
if (ar.length > 0) {
this.editor.focus();
this.editor.setRangeText(ar.join(""), selStart - this.autocompleteResults.contextPath.length, selEnd, "end");
}
return;
}
if (this.autocompleteResults.isFieldValue && this.activeSuggestion == -1) {
this.suggestFieldValues();
return;
}

//by default auto complete the first item
let idx = this.activeSuggestion > -1 ? this.activeSuggestion : 0;

this.editor.focus();
this.editor.setRangeText(ar[idx].value + ar[idx].suffix, selStart, selEnd, "end");
this.activeSuggestion = -1;
this.editorAutocompleteHandler();
}
setSuggestionPosition(top, left){
if (this.suggestionTop == top && this.suggestionLeft == left) {
return;
Expand Down Expand Up @@ -643,6 +708,63 @@ class Model {
};
}

suggestFieldValues(){
//previous object suggestion
let sobjectName = this.autocompleteResults.sobjectName;
let useToolingApi = this.queryTooling;
let selStart = this.editor.selectionStart;
let selEnd = this.editor.selectionEnd;
let query = this.editor.value;
let searchTerm = selStart != selEnd
? query.substring(selStart, selEnd)
: query.substring(0, selStart).match(/[a-zA-Z0-9_]*$/)[0];
selStart = selEnd - searchTerm.length;
let contextValueFields = this.autocompleteResults.contextValueFields;
let fieldNames = contextValueFields.map(contextValueField => contextValueField.sobjectDescribe.name + "." + contextValueField.field.name).join(", ");
if (contextValueFields.length > 1) {
this.autocompleteResults = {
sobjectName,
title: "Multiple possible fields: " + fieldNames,
results: []
};
return;
}
let contextValueField = contextValueFields[0];
let queryMethod = useToolingApi ? "tooling/query" : this.queryAll ? "queryAll" : "query";
let acQuery = "select " + contextValueField.field.name + " from " + contextValueField.sobjectDescribe.name + " where " + contextValueField.field.name + " like '%" + searchTerm.replace(/'/g, "\\'") + "%' group by " + contextValueField.field.name + " limit 100";
this.spinFor(sfConn.rest("/services/data/v" + apiVersion + "/" + queryMethod + "/?q=" + encodeURIComponent(acQuery), {progressHandler: this.autocompleteProgress})
.catch(err => {
if (err.name != "AbortError") {
this.autocompleteResults = {
sobjectName,
title: "Error: " + err.message,
results: []
};
}
return null;
})
.then(data => {
this.autocompleteProgress = {};
if (!data) {
return;
}
this.autocompleteResults = {
sobjectName,
title: fieldNames + " values suggestions:",
results: new Enumerable(data.records)
.map(record => record[contextValueField.field.name])
.filter(value => value)
.map(value => ({value: "'" + value + "'", title: value, suffix: " ", rank: 1, autocompleteType: "fieldValue"}))
.toArray()
.sort(this.resultsSort(searchTerm))
};
}));
this.autocompleteResults = {
sobjectName,
title: "Loading " + fieldNames + " values...",
results: []
};
}
autocompleteField(vm, ctrlSpace, sobjectName, isAfterWhere) {
let useToolingApi = vm.queryTooling;
let selStart = vm.editor.selectionStart;
Expand Down Expand Up @@ -811,49 +933,7 @@ class Model {
let fieldNames = contextValueFields.map(contextValueField => contextValueField.sobjectDescribe.name + "." + contextValueField.field.name).join(", ");
if (ctrlSpace) {
// Since this performs a Salesforce API call, we ask the user to opt in by pressing Ctrl+Space
if (contextValueFields.length > 1) {
vm.autocompleteResults = {
sobjectName,
title: "Multiple possible fields: " + fieldNames,
results: []
};
return;
}
let contextValueField = contextValueFields[0];
let queryMethod = useToolingApi ? "tooling/query" : vm.queryAll ? "queryAll" : "query";
let acQuery = "select " + contextValueField.field.name + " from " + contextValueField.sobjectDescribe.name + " where " + contextValueField.field.name + " like '%" + searchTerm.replace(/'/g, "\\'") + "%' group by " + contextValueField.field.name + " limit 100";
vm.spinFor(sfConn.rest("/services/data/v" + apiVersion + "/" + queryMethod + "/?q=" + encodeURIComponent(acQuery), {progressHandler: vm.autocompleteProgress})
.catch(err => {
if (err.name != "AbortError") {
vm.autocompleteResults = {
sobjectName,
title: "Error: " + err.message,
results: []
};
}
return null;
})
.then(data => {
vm.autocompleteProgress = {};
if (!data) {
return;
}
vm.autocompleteResults = {
sobjectName,
title: fieldNames + " values suggestions:",
results: new Enumerable(data.records)
.map(record => record[contextValueField.field.name])
.filter(value => value)
.map(value => ({value: "'" + value + "'", title: value, suffix: " ", rank: 1, autocompleteType: "fieldValue"}))
.toArray()
.sort(this.resultsSort(searchTerm))
};
}));
vm.autocompleteResults = {
sobjectName,
title: "Loading " + fieldNames + " values...",
results: []
};
vm.suggestFieldValues();
return;
}
let ar = new Enumerable(contextValueFields).flatMap(function* ({field}) {
Expand Down Expand Up @@ -934,6 +1014,8 @@ class Model {
.sort(this.resultsSort(searchTerm));
vm.autocompleteResults = {
sobjectName,
isFieldValue,
contextValueFields,
title: fieldNames + (ar.length == 0 ? " values (Press Ctrl+Space to load suggestions):" : " values:"),
results: ar
};
Expand All @@ -955,6 +1037,8 @@ class Model {
}
vm.autocompleteResults = {
sobjectName,
isField: true,
contextPath,
title: contextSobjectDescribes.map(sobjectDescribe => sobjectDescribe.name).toArray().join(", ") + " fields suggestions:",
results: contextSobjectDescribes
.flatMap(sobjectDescribe => sobjectDescribe.fields)
Expand Down Expand Up @@ -1036,12 +1120,10 @@ class Model {
.sort(this.resultsSort(searchTerm));
if (ctx.ctrlSpace) {
if (ar.length > 0) {
let rel = ar.shift();
let rel = ar[0];
ctx.sobjectName = rel.dataType;
ctx.vm.editor.focus();
ctx.vm.editor.setRangeText(rel.value, selStart, selEnd, "end");
}
ctx.vm.editorAutocompleteHandler();
this.selectSuggestion();
return;
}
if (suggestRelation) {
Expand Down Expand Up @@ -1986,9 +2068,9 @@ class App extends React.Component {
h("div", {className: "button-toggle-icon"})) : ""
),
),
h("div", {className: "autocomplete-results " + (model.disableSuggestionOverText ? "autocomplete-results-under" : "autocomplete-results-over"), style: model.disableSuggestionOverText ? {} : {top: model.suggestionTop + "px", left: model.suggestionLeft + "px"}},
model.autocompleteResults.results.map(r =>
h("div", {className: "autocomplete-result", key: r.value}, h("a", {tabIndex: 0, title: r.title, onClick: e => { e.preventDefault(); model.autocompleteClick(r); model.didUpdate(); }, href: "#", className: r.autocompleteType + " " + r.dataType}, h("div", {className: "autocomplete-icon"}), r.value), " ")
h("div", {className: "autocomplete-results" + (model.disableSuggestionOverText ? " autocomplete-results-under" : " autocomplete-results-over"), hidden: !model.displaySuggestion, style: model.disableSuggestionOverText ? {} : {top: model.suggestionTop + "px", left: model.suggestionLeft + "px"}},
model.autocompleteResults.results.map((r, ri) =>
h("div", {className: "autocomplete-result" + (ri == model.activeSuggestion ? " active" : ""), key: r.value}, h("a", {tabIndex: 0, title: r.title, onClick: e => { e.preventDefault(); model.autocompleteClick(r); model.didUpdate(); }, href: "#", className: r.autocompleteType + " " + r.dataType}, h("div", {className: "autocomplete-icon"}), r.value), " ")
)
),
),
Expand Down
Loading