Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'fix/url-params-sync' into 'release'

Browse Source 
Fix url params sync issue

See merge request theappsmith/internal-tools-client!226
This commit is contained in:
Hetu Nandu 2020-01-08 09:19:00 +00:00
commit bf317e652e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/client/src/components/editorComponents/DynamicAutocompleteInput.tsx
View File

@ -99,7 +99,7 @@ const IconContainer = styled.div`
.bp3-icon { .bp3-icon {
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
margin: 0; margin: 0;
height: 32px; height: 30px;
width: 30px; width: 30px;
display: flex; display: flex;
align-items: center; align-items: center;
@ -166,7 +166,7 @@ class DynamicAutocompleteInput extends Component<Props> {
extraKeys, extraKeys,
...options, ...options,
}); });
this.editor.on("change", _.debounce(this.handleChange, 200)); this.editor.on("change", _.debounce(this.handleChange, 100));
this.editor.on("cursorActivity", this.handleAutocompleteVisibility); this.editor.on("cursorActivity", this.handleAutocompleteVisibility);
this.editor.setOption("hintOptions", { this.editor.setOption("hintOptions", {
completeSingle: false, completeSingle: false,
@ -187,15 +187,17 @@ class DynamicAutocompleteInput extends Component<Props> {
inputValue = JSON.stringify(inputValue, null, 2); inputValue = JSON.stringify(inputValue, null, 2);
} }
if ((!!inputValue || inputValue === "") && inputValue !== editorValue) { if ((!!inputValue || inputValue === "") && inputValue !== editorValue) {
const cursor = this.editor.getCursor();
this.editor.setValue(inputValue); this.editor.setValue(inputValue);
this.editor.setCursor(this.editor.lineCount(), 0); this.editor.setCursor(cursor);
} }
} }
} }
handleChange = () => { handleChange = () => {
const value = this.editor.getValue(); const value = this.editor.getValue();
if (this.props.input.onChange) { const inputValue = this.props.input.value;
if (this.props.input.onChange && value !== inputValue) {
this.props.input.onChange(value); this.props.input.onChange(value);
} }
this.editor.eachLine(this.highlightBindings); this.editor.eachLine(this.highlightBindings);

2
app/client/src/components/editorComponents/LoadingOverlayScreen.tsx
View File

@ -8,7 +8,7 @@ export default styled.div`
left: 0; left: 0;
background-color: rgba(255, 255, 255, 0.6); background-color: rgba(255, 255, 255, 0.6);
pointer-events: none; pointer-events: none;
z-index: 1; z-index: 10;
color: black; color: black;
display: flex; display: flex;
align-items: center; align-items: center;

5
app/client/src/transformers/RestActionTransformer.ts
View File

@ -2,7 +2,10 @@ import { RestAction } from "api/ActionAPI";
export const transformRestAction = (data: RestAction): RestAction => { export const transformRestAction = (data: RestAction): RestAction => {
let action = { ...data }; let action = { ...data };
if (data.pluginType === "API") { if (
data.actionConfiguration.queryParameters &&
data.actionConfiguration.queryParameters.length
) {
const path = data.actionConfiguration.path; const path = data.actionConfiguration.path;
if (path && path.indexOf("?") > -1) { if (path && path.indexOf("?") > -1) {
action = { action = {