* updated import application modal design as v2 * updated import flow * added title, description, uploadIcon on filepicker ads component for custom file picker * adding modal of add credential for git import * added "Git Import" modal * added generating ssh key for importing flow * fixed issue of merging * chore: fix import * chore: show old import modal based on feature flag * seperated import api from connect * added datasource list on reconnect credential modal * chore: minor changes * chore: move ssh keys to git sync reducer from applications reducer * chore: minor fixes * chore: fetch datasource config for import * for pulling * for review of displaying of datasource * added reconnect datasources after git import * fix: initialize datasource with default values * fix: initialise redux for after updating datasource with default values * fixed issue of git connection init when importing * if there is a datasource config missing in import, reconnect modal should be opened * updated logic for unconfigured datasources * commented unnecessary code * fixed issue of successful import * updated import app error logic * Add un-configured datasources to Import via file response * Add test * fix * chore: refactors * change per review * fix: reset ssh keys / url * Fix issue with newly created datasources not sent * fix * chore: minor updates * chore: minor fix * WIP * added saas and rest api datasource form * feat: fixes and updates for file import flow * chore: close on upload * Refactor logic ofr finding unconfigured datasources * fix: minor fixes * Fix issue with IsPartialImport * fix * Add PartialImport flag for ImportExport service * refactoring of datasource editor form for both of importing app and editing app * fixed collapse config * Fix tests * Handle redirection back to the /applications for oAuth type * Show reconnect button on the datasources pages if the datasource configuration is skipped * added analytic events for reconnecting datasource modal * Fix the repo limit check for git import * updated test of importing app from json as new work flow * updated exported app json while testing automatically * Add isImport flag for handling OAuth redirection in import flow * WIP * updated card UI for import from git title and message in import app modal * chore: cleanup * chore: lint * fix: add is import query param to get token for oauth * fix * When the user imports the application there should not be any uncommitted changes displayed on the commit icon * Add flag to identify OAuth redirection for git import * Update the variable name * refactoring reconnect datasource modal * close git import modal when repo limit error responded * fixed issue of restoring draft data of datasource form without save on reconnect datasource modal * chore: update query * updated query name of oauth redirection url * Fix duplicate name issue in git import * fixed rest api reconnect issue on reconnect modal * init datasources and plugins after imported app, updated reconnect modal as new design * added unconfigured datasource list logic when importing and updated rest api form delete button visible * removed put default config of datasource and fixed issue on it * Add logic to check isCOnfugred in datasource API * Expose API to get un configured datasources for git import * added fetch unconfigured datasource list api when redirecting form OAuth * Remove sensitive fields from application json during export * update put call response to check for datasourceConfig * chore: use @appsmith for constants/messages * chore: use download icon and Import for Importing application label * chore: move import application text up a bit * Fix bad merge * chore: update skip to application tooltip text * fixed tooltip content of skip to application CTA * init values of datasource when importing * updated ui of git import modal as figma design * fixing padding issue of reconnect datasource modal * fixed cursor issue on import app modal * Fix issue with datasource config * chore: make code compile * chore: sort lines * fixed save button issue of dbform on reconnecting modal * fixed style of import application modal * Fix iisue with wrong value updated to flag * reverted from reconnection form style * fix: update design as per slack discussions on 2022.02.23 * fix: move modal close button to the left * Remove check for the flag and use the one from db * Set siCOnfigured as true for mockdata sets * updated creating datasource with isConfigured as false * Fix NPE while importing * fixed scrollbar issue and text alignment on reconnect datasource modal * fixed style of form container in reconnect datasource and redirecting to app if all are configured * remove unwanted fields from application json * FIx NPE for file import * fix: move close button up in import modal * remove delete button on reconnect datasource modal * Add isConfigured false while creating datasources * fix: add a gap and update color gap between git import dialog title and subtitle update color of subtext to GREY_800 * fix: use git import feature flag * fix: do not use older modal * updated selecting logic of unconfigured datasource in reconnect modal * cleanup: auto format * cleanup: refactor react component * cleanup: refactor some more * cleanup: autoformat * Fix reconnect flag for mockdatasource * During git import set the isConfigured to false for datasources * Remove decrypted field from the applicationJson file * Remove decrypted field from the applicationJson file * Add app slug to remote repo * fixed cypress test related with git * updated json while testing * Changes per review * Update the method name * fixed cypress test related with git * fixed migration cypress test * set is configured field as true on tour app * Fix issue with datasource creation for welcome tour * fixed issue of replay_editor cypress test Co-authored-by: Rishabh Saxena <rishabh@appsmith.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: Anubhav <anubhav@appsmith.com> Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com>
237 lines
6.4 KiB
TypeScript
237 lines
6.4 KiB
TypeScript
import { getDependenciesFromInverseDependencies } from "components/editorComponents/Debugger/helpers";
|
|
import _, { debounce } from "lodash";
|
|
import { useMemo } from "react";
|
|
import ReactDOM from "react-dom";
|
|
import { useLocation } from "react-router";
|
|
import ResizeObserver from "resize-observer-polyfill";
|
|
|
|
export const draggableElement = (
|
|
id: string,
|
|
element: any,
|
|
onPositionChange: any,
|
|
parentElement?: Element | null,
|
|
initPostion?: any,
|
|
renderDragBlockPositions?: {
|
|
left?: string;
|
|
top?: string;
|
|
zIndex?: string;
|
|
position?: string;
|
|
},
|
|
dragHandle?: () => JSX.Element,
|
|
cypressSelectorDragHandle?: string,
|
|
) => {
|
|
let newXPos = 0,
|
|
newYPos = 0,
|
|
oldXPos = 0,
|
|
oldYPos = 0;
|
|
let dragHandler = element;
|
|
let isDragged = !!initPostion;
|
|
|
|
const setElementPosition = () => {
|
|
element.style.top = initPostion.top + "px";
|
|
element.style.left = initPostion.left + "px";
|
|
};
|
|
|
|
const dragMouseDown = (e: MouseEvent) => {
|
|
e = e || window.event;
|
|
oldXPos = e.clientX;
|
|
oldYPos = e.clientY;
|
|
document.onmouseup = closeDragElement;
|
|
document.onmousemove = elementDrag;
|
|
};
|
|
|
|
const calculateBoundaryConfinedPosition = (
|
|
calculatedLeft: number,
|
|
calculatedTop: number,
|
|
) => {
|
|
const bottomBarOffset = 34;
|
|
|
|
/*
|
|
Default to 70 for a save offset that can also
|
|
handle the pagination Bar.
|
|
*/
|
|
const canvasTopOffset = parentElement?.getBoundingClientRect().top || 70;
|
|
|
|
if (calculatedLeft <= 0) {
|
|
calculatedLeft = 0;
|
|
}
|
|
|
|
if (calculatedTop <= canvasTopOffset) {
|
|
calculatedTop = canvasTopOffset;
|
|
}
|
|
|
|
if (calculatedLeft >= window.innerWidth - element.clientWidth) {
|
|
calculatedLeft = window.innerWidth - element.clientWidth;
|
|
}
|
|
|
|
if (
|
|
calculatedTop >=
|
|
window.innerHeight - (element.clientHeight + bottomBarOffset)
|
|
) {
|
|
calculatedTop =
|
|
window.innerHeight - element.clientHeight - bottomBarOffset;
|
|
}
|
|
|
|
return {
|
|
left: calculatedLeft,
|
|
top: calculatedTop,
|
|
};
|
|
};
|
|
|
|
const elementDrag = (e: MouseEvent) => {
|
|
e = e || window.event;
|
|
e.preventDefault();
|
|
newXPos = oldXPos - e.clientX;
|
|
newYPos = oldYPos - e.clientY;
|
|
oldXPos = e.clientX;
|
|
oldYPos = e.clientY;
|
|
const calculatedTop = element.offsetTop - newYPos;
|
|
const calculatedLeft = element.offsetLeft - newXPos;
|
|
element.style.top = calculatedTop + "px";
|
|
element.style.left = calculatedLeft + "px";
|
|
const validFirstDrag = !isDragged && newXPos !== 0 && newYPos !== 0;
|
|
if (validFirstDrag) {
|
|
resizeObserver.observe(element);
|
|
isDragged = true;
|
|
}
|
|
};
|
|
|
|
const calculateNewPosition = () => {
|
|
const { height, left, top, width } = element.getBoundingClientRect();
|
|
const isElementOpen = height && width;
|
|
const {
|
|
left: calculatedLeft,
|
|
top: calculatedTop,
|
|
} = calculateBoundaryConfinedPosition(left, top);
|
|
|
|
return {
|
|
updatePosition: isDragged && isElementOpen,
|
|
left: calculatedLeft,
|
|
top: calculatedTop,
|
|
};
|
|
};
|
|
|
|
const updateElementPosition = () => {
|
|
const calculatedPositionData = calculateNewPosition();
|
|
if (calculatedPositionData.updatePosition) {
|
|
const { left, top } = calculatedPositionData;
|
|
onPositionChange({
|
|
left: left,
|
|
top: top,
|
|
});
|
|
element.style.top = top + "px";
|
|
element.style.left = left + "px";
|
|
}
|
|
};
|
|
|
|
const closeDragElement = () => {
|
|
updateElementPosition();
|
|
document.onmouseup = null;
|
|
document.onmousemove = null;
|
|
};
|
|
const debouncedUpdatePosition = debounce(updateElementPosition, 50);
|
|
|
|
const resizeObserver = new ResizeObserver(function() {
|
|
debouncedUpdatePosition();
|
|
});
|
|
|
|
if (isDragged) {
|
|
resizeObserver.observe(element);
|
|
}
|
|
|
|
const OnInit = () => {
|
|
if (dragHandle) {
|
|
dragHandler = createDragHandler(
|
|
id,
|
|
element,
|
|
dragHandle,
|
|
renderDragBlockPositions,
|
|
cypressSelectorDragHandle,
|
|
);
|
|
}
|
|
if (initPostion) {
|
|
setElementPosition();
|
|
}
|
|
dragHandler.addEventListener("mousedown", dragMouseDown);
|
|
// stop clicks from propogating to widget editor.
|
|
dragHandler.addEventListener("click", (e: any) => e.stopPropagation());
|
|
};
|
|
|
|
OnInit();
|
|
};
|
|
|
|
const createDragHandler = (
|
|
id: string,
|
|
el: any,
|
|
dragHandle: () => JSX.Element,
|
|
renderDragBlockPositions?: {
|
|
left?: string;
|
|
top?: string;
|
|
zIndex?: string;
|
|
position?: string;
|
|
},
|
|
cypressSelectorDragHandle?: string,
|
|
) => {
|
|
const oldDragHandler = document.getElementById(`${id}-draghandler`);
|
|
const dragElement = document.createElement("div");
|
|
dragElement.setAttribute("id", `${id}-draghandler`);
|
|
dragElement.style.position = renderDragBlockPositions?.position ?? "absolute";
|
|
dragElement.style.left = renderDragBlockPositions?.left ?? "135px";
|
|
dragElement.style.top = renderDragBlockPositions?.top ?? "0px";
|
|
dragElement.style.zIndex = renderDragBlockPositions?.zIndex ?? "3";
|
|
|
|
if (cypressSelectorDragHandle) {
|
|
dragElement.setAttribute("data-cy", cypressSelectorDragHandle);
|
|
}
|
|
|
|
oldDragHandler
|
|
? el.replaceChild(dragElement, oldDragHandler)
|
|
: el.appendChild(dragElement);
|
|
ReactDOM.render(dragHandle(), dragElement);
|
|
return dragElement;
|
|
};
|
|
|
|
// Function to access nested property in an object
|
|
const getNestedValue = (obj: Record<string, any>, path = "") => {
|
|
return path.split(".").reduce((prev, cur) => {
|
|
return prev && prev[cur];
|
|
}, obj);
|
|
};
|
|
|
|
export const useIsWidgetActionConnectionPresent = (
|
|
widgets: any,
|
|
actions: any,
|
|
deps: any,
|
|
): boolean => {
|
|
const actionLables = actions.map((action: any) => action.config.name);
|
|
|
|
let isBindingAvailable = !!Object.values(widgets).find((widget: any) => {
|
|
const depsConnections = getDependenciesFromInverseDependencies(
|
|
deps,
|
|
widget.widgetName,
|
|
);
|
|
return !!_.intersection(depsConnections?.directDependencies, actionLables)
|
|
.length;
|
|
});
|
|
|
|
if (!isBindingAvailable) {
|
|
isBindingAvailable = !!Object.values(widgets).find((widget: any) => {
|
|
return (
|
|
widget.dynamicTriggerPathList &&
|
|
!!widget.dynamicTriggerPathList.find((path: { key: string }) => {
|
|
return !!actionLables.find((label: string) => {
|
|
const snippet = getNestedValue(widget, path.key);
|
|
return snippet ? snippet.indexOf(`${label}.run`) > -1 : false;
|
|
});
|
|
})
|
|
);
|
|
});
|
|
}
|
|
return isBindingAvailable;
|
|
};
|
|
|
|
export const useQuery = () => {
|
|
const { search } = useLocation();
|
|
return useMemo(() => new URLSearchParams(search), [search]);
|
|
};
|