mirror of
https://github.com/ToolJet/ToolJet
synced 2026-05-06 06:48:21 +00:00
* importing service: updated * import service, categorize and update events with associations * fix: deleting events associated with pages on page delete * handle app version: creation, updates, switching versions from app builder * on version switch: no updates should be triggeted to server * versioning for query events * fixes: new components db transaction fails for newly created pages * fixes: query chaining with events * map older query ids to new for event action: run query * fixes: multi-editor support * fixes/multi-editor: users should be able to edit different version of the app at real time without sync * minor fixes * fixes: undo/redo savings with latest app def updates * fixes: execution of page switch action * fixes: csa events * fixes: csa selection dropdown * fixes: on csa action changed, the action params should also be updated correctly * fixes: event rendering actions * fixes: table event - row hovered * fixes: table event - on search * fixes: table event - onNewRowsAdded * fixes: table event - onBulkUpdate * fixes: table column updates * fixes: table column updates to component definition * re-order events * handle adding widgets to sub containers * fixes: csa for modals * fixes: deletes children components on deleting parent * fixes: components with default children * fixed events for imported app * gs- crash fix * fixes: global settings UI * fixes: header and user * fixes: page switch event * fixes: adapts to new event manager ui * import app * add event index for creating app versions * fixes: table rendering on viewer * fixes: event execution for viewer * fixes: loading app with slug * fixes: Page side bar is not rendered in viewer * fixes: version manager ui for released versions * fixes: tabs default children saving * fixes: app resource mapping for parent-child components * fixes: duplicate pages * fixes: page load events for viewer * fixes: enable and disable pages * fixes: hide and show pages * fixes: on maintaince toggle button * fixes: new version child components are not tied to its parent * fixes: redo breaks- on deleting a component and undo then redo (editor) * new export schema and handling apps impport with new and older schemas * table events: column and actions events * fixes: query confirmations popup * fixes: copy/paste * fixes: cut/paste * fixes: event mapping for newer versions for new components, pages and queries id * fixes: app resource mapping for imported apps * fixes: cascade events for table actions and colulmns * Migrates the existing JSON-based app definition schema to a structured table-based architecture. This enhancement introduces component and page-specific permissions, improves data organization, and enables fine-grained access control. Additionally, it adds the 'globalSettings' column to the 'appVersion' table. * cleanup * fixes: enable and disable pages * fixes: hide/show page and set saving state for cloning pages * cleanup * fixes: page disable menu * fixes: migrations for data query events * fixes: switching app version from version creation modal results in editor loading state * fixes: setting up the page title * fixes: Page duplication has same page handler name. * fixes: updating general styles of a component * fixes: delete component should trigger confirmations box for one widget and for multiple should process deletion * fixes: CSA for button(component) does not work for page event handler. * fixes: component name update [calendar] * fixes: Duplicating pages do not create child components * improves copy-paste mechanism of widgets * fix: calendar subcontainer components comes out of the parent container on copy/paste * fix:Form properties, no option for selecting submit button. * fixes: Dark mode issue with event handler. * fixes: display preferences for components * fixes:have to select the selected version again to create a new * fixes: Pages menu is not getting disabled when enabled and vice-versa * fixes: correct naming of duplicating pages * fixes: 2 action button even with no event attached to one, it gets attached to both. * fixes: event deletion for action btn removal * fixes: Keyboard action to move component is not saving * reduce outbound calls when widget re-positioned with keyboard * fixes: Not able to delete component from Inspector * fixes: cloning of widgets * fixes: Request confirmation before query run toggle is not visible on viewer mode. (can't run query if confirmation toggle is on) * fixes: event sorting * fixes: events mapping for versioning: queries and components * fixes: importing app bug - query running issue when importing apps * [appdef-2.0] fixes: event action linking for imported apps (#7627) * fixes: event action linking for imported apps * cleanup * fixes: Toggling display preferences is not saving for components. (#7629) * fixes: dnd issue for mobile view (#7632) * default page menu settings should be true * [appdef-2] event manager selector bug (#7631) * fixes: on selecting query - 3 outbound calls are done to the server, and event manager re-renders 3times resulting in flikering ui * reduces outbound calls for updating csa actions to 1 * [appdef] - copy associated events for cloned components (#7634) * fixes: Copying component is not coping the events associated with the component. * cleanup * [appdef-2] : Fixes frontend issues (#7636) * Fix UI issues * Fix Scrollbar is not available after we pin the inspector. * Fix button jumping places if switched from extended monitor to laptop. * Fix white background around canvas * fixes: Component inspector go blank after switching to different pages after dropping components (#7637) * fixes: general properties of widgets are not getting saved (#7638) * fixes: selecting the components via selecto (#7653) * fixes: multiple undo-redo simlut. (#7656) * fixes: copy associated events for cloned queries (#7657) * Fixes not able toggle of Listview pagination toggle (#7701) * Fix UI issues * Fix Scrollbar is not available after we pin the inspector. * Fix button jumping places if switched from extended monitor to laptop. * fix enable pagination not getting toggled in listview * Fix form children not being displayed * fixes: dnd fix for widgets dropped inside subcontainer (#7691) * [Appdef-2] copy-paste, cut and clone fix for widgets (#7687) * fixes: copy/cut/paste and cloning of widgets * cleanup * can copy/paste-clone in listview * fixes: on mulit-widget selected via mouse area selection: widget manager should be rendered (#7688) * fixes: on deleting tabs widgets should delete its children (#7692) * fixes: column data generated from restapi does not render correct columns in viewer (#7695) * [appdef-2] fixes: multiple query confirmations trigger (#7704) * fixes: multiple query confirmations trigger * fixes: multiple outbound calls in the inital load, run queries on app load with confirmations:editor&viewer * fixes: correct confirmations list to the stote * [appdef-2] fixes:Event handler are running twice for page load (#7705) * fixes:Event handler are running twice for page load(eg- add 2 show alert and change the page). * fixes: for viewer page events * fixes: container widget is not getting saved on drop (#7718) * fixes: Create app version from is empty if we delete another version. (#7720) * [appdef-2] fixes: on versioned app (switching or creating) version, the componet layout is wrongly updated to the container dnd (#7721) * fixes: on versioned app (switching or creating) version, the component layout is wrongly updated to the container dnd * fixes: container widget is not saving * fixes: triggering confirmation box for every query with on load trigger (#7728) * Fixes canvas background and go to app crashing (#7725) * Fix UI issues * Fix Scrollbar is not available after we pin the inspector. * Fix button jumping places if switched from extended monitor to laptop. * fix enable pagination not getting toggled in listview * Fix form children not being displayed * Fix Go to app is crashing the application. * Fix fx for canvas background color is not working. * fixes: cloned/copied table with actions (#7758) * fixes: calendar and form widgets (#7735) * fixes: rendering of components in viewer for mobile (#7759) * fixes: toggling, resizing, dropping widgets in both display preferences (#7760) * fixes: page switch action via runjs actions (#7762) * fixes: component validations do not get saved (#7766) * [appdef-2] subcontainer dnd height outbound fix (#7767) * fixes: listview children can be dragged outside its outbound limit * cleanup * fixes: widget inspector going to empty component (#7768) * fixes: goToApp not running from runjs in viewer mode (#7770) * fixes: multi-components cloning or copy/paste have same name (#7761) * Fix disabled page is being displayed on switch page event dropdown (#7769) * Fix kanban rendering leading to infinite look * Fix disabled page is being displayed on switch page event dropdown * Fix Kanban widget getting into infinite loop (#7808) * Fix kanban rendering leading to infinite look * Fix disabled page is being displayed on switch page event dropdown * Fix kanban getting into infinite loop * adds support of constants to current state of the ediotr (#7821) * removes loader added for testing (#7822) * [appdef] fixes - dnd container cloning edge cases (#7820) * fixes: copy/pasting components updating wrong display preferences * fixes: copy/pasting tabs and cloning components inside tabs * fixes: duplication of calendar component bug * if components in subcontainer(children) are selected via selecto along with its parent, children should not be going through duplication * if components in subcontainer(children) are selected via selecto along with its parent, children should not be going through duplication * fixes: Resolving App Version and Timestamp Update Challenges (#7863) * Fixes query confirmation issue on viewer (#7862) * [appdef ]fixes: components copied from template app to a new page or app do not render in canvas (#7867) * fixes: components copied from template app to a new page or app does not render in canvas * fixes: table crash on coping from other pages with columns * adds the column exists check * fixes: tables crash for imported apps with auto generated cols * appdefinition refactor/cleanup (#7872) * cleanup controllers and request calls from frontend * removing unwanted console logs and unused variables * revering v1 apis og * adding length validation for page dto * adding dtos for components * updated dtos for components and pages * added dto for event handlers * fixes event handler dto * fixes: page dto * adds/fixes event handlers creating dtp * fixes: event handler service and dtos * [appdef] fixes: Creating page not changing the slug (#7873) * fixes: Creating page not changing the slug * removes extra whitespace * [appdef] fixes: on importing a exported app child components are not present in the parent component (#7864) * fixes: on importing a exported app child components are not present in the parent component * handles parent component mapping for tabs and calendar component * handles parent component mapping for tabs and calendar component for new versions * [appdef] api endpoint fixes (#7888) * fixes: moved fetching app version to v2 api * fixes: app slug api * Fixes CurrentUser & Mode not present in globals in inspector (#7812) * Fix current user not being present in inspector * Add Mode in globas in inspector * Fix creating page not changing the slug. * Revert "Fix creating page not changing the slug." This reverts commit0ff9c18ab8. * Fixes on adding query params in event handler, breaking the app (#7889) * Fix on version change if left sidebar is open canvas not scrolling right * Fix on adding query params in event handler, breaking the app * Fix * Fix on version change if left sidebar is open canvas not scrolling right (#7884) * fixes: fixes on on app load switch page action via run queires (#7858) * fixes: fixes on on app load switch page action via run queires * Fix * refactor * Fix on load event not appearing on viewer --------- Co-authored-by: Nakul Nagargade <nakul@tooljet.com> * [appdef] fixes: event actions mapping for import-export (#7895) * fixes: event actions mapping for import-export * fixes: updates organisation id * fixes: templates event mapping * do not app again for not normalized apps * [appdef]migrations fix (#7910) * fixes: page attributes * fixes: table action and column events for imported apps (prev) and app migrations * adds processDataInBatches * fixes: app data migrations * create a new queryBuilder instance for each batch to ensure that there's no interference between batches * fix: app migration * cleanup * cleanup * fixes: table column data not updated on boxes changes in container (#7919) * fixes: creating all pages from all versions (#7905) * Fix state not changing in chart (#7900) * Fix in chart, toggles are not working * Update Chart.jsx --------- Co-authored-by: Arpit <arpitnath42@gmail.com> * fix event param not updating (#7902) * [appdef] Pages attributes are missing on versioning or imported app (#7904) * fixes: on creating new version pages attributes are not copied * fixes: on importing apps with pages attributes are not copied * fixes: component double duplication issues * fixes: deleting children components via selecto (#7915) * fixes: component deletion fixes * fixes: cloning components to a new version should also create associated events * fixes: creating components on cloning with general styles or properties * fixes: creatinng general properties on version * fixes: imported app * fixes added to app migrations * fixes: mobile view * fixes: Created a new version with multiple pages from second page, the new version shows the homepage with second page URL * fixes: table crash due to columnDeletionHistory saved as an object instead of an array * fixes: on creating new version, data_queries should be created (#7975) * [appdef] fixes: migrations (#7951) * refactor migrations with batching * event actions: switch page should be mapped to correct new page id * fixes: importing json-schema app with multiple version: same components do not get render in the canvas * fixes: import/export of legecy apps * event actions mapping to correct page ids: migrations * fixes: migrations children not rendered in subcontainer components * adapts to main/viewer changes * fixes: viewer with #6698 * fixes: viewer route * fixes: page switch via validateRoutes * fixes: on delete version fetchApp fails * handle error on saving changes * skip name opts * typo fix * Instead of relying on the schema, we choose to use the Tooljet version as the determining factor for decoupling import flows * fixes: slug updates from global settings * fixes: slug app link (#8008) * fixes: on version changed the preview link should also update (#8009) * fixes: on cut and paste events should not cascade (#8010) * fixes: query options to new mapped ids * [appdef] fixes: cloning apps (#8012) * fixes: cloning apps * fixes: slug status from share modal * fixes: query confirmations list on viewer (#8017) * undo-fix * fixes: updates current state with page data on creating new page * Fix failing specs (#8031) * [appdef] fixes : ghost child components are being created on imported/cloned apps and while migrating (#8026) * fixes: ignore ghost components while importing * added the fix in migrations * fixes: adding other components * fixes: table column resizes * updates layout dto * update component dto * fixes: tabs children are not rendered as the are not in their repsective parent container (#8036) * moving editorFunc to Editor.jsx * cleanup * fixes: e2e test for clone * cleanup * fixes: toggle maintaince * bumping version * multi-edit: ymap-fix-1 * Revert "multi-edit: ymap-fix-1" This reverts commit8b799c3c51. * [appdef] fixes: viewer route: keeps on reloading for private apps (#8051) * fixes: viewer route: keeps on reloading for pribate apps * should return the response * test: ymap updates-1 * fixes: v1 apps with dq queries resuts in app crash * Updated import spec * Revert "Updated import spec" This reverts commit802136cdc3. * Fixed failed platform test cases for app desinition re-design (#8053) * Fix failed platform test cases * Modify user permission test cases * fixes: trial-5: fixing vanishing of components * Revert "fixes: trial-5: fixing vanishing of components" This reverts commita22aec12c7. * fixes: trail-6: fix * fixes: trail-7: fix * Revert "fixes: trail-7: fix" This reverts commit08f373c415. * Revert "fixes: trail-6: fix" This reverts commitc4e19b5d05. * multi-edit: ymap-fix * Revert "multi-edit: ymap-fix" This reverts commit92f49c0cde. * fixes: multi-user updates: adding or removing * event handlers sycned for multi-user * should take slug instead of appid if slug is present * updating adding ymap logic * versioning with multi-user * fixes: saving issue * dont skip ymap * adds delay to ymap * ymap-update-order-fixed * ymap-update-order-fixed-1.1 * ymap-update-order-fixed-1.2 * test=fix * Updated import spec (#8061) * cleanup * lint fixed * fixes: cloning apps with tabs * veiwer on event should return * fixes: event should map with show/hide modal component id * Fix failing appbuilder specs (#8117) * cherrypicked ee/00195c064 * bumping version to v2.24.0 * fixed modal actionid typo * fixes: slugs issues for released an public apps (#8119) * Fix failed test cases (#8121) * reverting global slug input * fixes: versioning with cloned page and ghost components (#8122) --------- Co-authored-by: Nakul Nagargade <133095394+nakulnagargade@users.noreply.github.com> Co-authored-by: Kavin Venkatachalam <50441969+kavinvenkatachalam@users.noreply.github.com> Co-authored-by: Nakul Nagargade <nakul@tooljet.com> Co-authored-by: Midhun Kumar E <midhun752@gmail.com> Co-authored-by: nandinisaha13 <nandinisaha13@gmail.com> Co-authored-by: Mekhla Asopa <dadhichmekhla@gmail.com> Co-authored-by: Ajith KV <ajith.jaban@gmail.com> Co-authored-by: Mekhla Asopa <59684099+Mekhla-Asopa@users.noreply.github.com>
253 lines
7.6 KiB
JavaScript
253 lines
7.6 KiB
JavaScript
import React, { useState } from 'react';
|
|
import { RenameInput } from './RenameInput';
|
|
import { PagehandlerMenu } from './PagehandlerMenu';
|
|
import { EditModal } from './EditModal';
|
|
import { SettingsModal } from './SettingsModal';
|
|
import _ from 'lodash';
|
|
import SortableList from '@/_components/SortableList';
|
|
import { toast } from 'react-hot-toast';
|
|
import { useAppVersionStore } from '@/_stores/appVersionStore';
|
|
import { shallow } from 'zustand/shallow';
|
|
import EyeDisable from '@/_ui/Icon/solidIcons/EyeDisable';
|
|
import FileRemove from '@/_ui/Icon/solidIcons/FIleRemove';
|
|
import Home from '@/_ui/Icon/solidIcons/Home';
|
|
|
|
export const PageHandler = ({
|
|
darkMode,
|
|
page,
|
|
switchPage,
|
|
deletePage,
|
|
renamePage,
|
|
clonePage,
|
|
hidePage,
|
|
unHidePage,
|
|
homePageId,
|
|
currentPageId,
|
|
updateHomePage,
|
|
updatePageHandle,
|
|
|
|
apps,
|
|
pages,
|
|
components,
|
|
pinPagesPopover,
|
|
haveUserPinned,
|
|
disableEnablePage,
|
|
}) => {
|
|
const isHomePage = page.id === homePageId;
|
|
const isSelected = page.id === currentPageId;
|
|
const isHidden = page?.hidden ?? false;
|
|
const isDisabled = page?.disabled ?? false;
|
|
const isIconApplied = isHomePage || isHidden || isDisabled;
|
|
const [isEditingPageName, setIsEditingPageName] = useState(false);
|
|
const [showEditModal, setShowEditModal] = useState(false);
|
|
const [showPagehandlerMenu, setShowPagehandlerMenu] = useState(false);
|
|
const [showSettingsModal, setShowSettingsModal] = useState(false);
|
|
const [isHovered, setIsHovered] = useState(false);
|
|
const { isVersionReleased } = useAppVersionStore(
|
|
(state) => ({
|
|
isVersionReleased: state.isVersionReleased,
|
|
}),
|
|
shallow
|
|
);
|
|
|
|
const handleClose = () => {
|
|
setShowEditModal(false);
|
|
setShowPagehandlerMenu(true);
|
|
};
|
|
const handleShow = () => {
|
|
setShowEditModal(true);
|
|
setShowPagehandlerMenu(false);
|
|
};
|
|
|
|
const showSettings = () => {
|
|
setShowSettingsModal(true);
|
|
};
|
|
|
|
const handleCallback = (id) => {
|
|
setIsHovered(false);
|
|
switch (id) {
|
|
case 'delete-page':
|
|
deletePage(page.id, isHomePage, page.name);
|
|
break;
|
|
|
|
case 'rename-page':
|
|
setIsEditingPageName(true);
|
|
break;
|
|
|
|
case 'mark-as-home-page':
|
|
updateHomePage(page.id);
|
|
break;
|
|
|
|
case 'edit-page-handle':
|
|
handleShow();
|
|
break;
|
|
|
|
case 'settings':
|
|
showSettings();
|
|
break;
|
|
|
|
case 'clone-page':
|
|
clonePage(page.id);
|
|
break;
|
|
|
|
case 'hide-page':
|
|
hidePage(page.id);
|
|
break;
|
|
|
|
case 'unhide-page':
|
|
unHidePage(page.id);
|
|
break;
|
|
case 'disable-page':
|
|
disableEnablePage({ pageId: page.id, isDisabled: true });
|
|
break;
|
|
case 'enable-page':
|
|
disableEnablePage({ pageId: page.id });
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
};
|
|
|
|
React.useEffect(() => {
|
|
if (!isHovered && !isSelected && showPagehandlerMenu) {
|
|
setShowPagehandlerMenu(false);
|
|
}
|
|
|
|
if (isHovered && currentPageId !== page.id) {
|
|
setShowPagehandlerMenu(false);
|
|
}
|
|
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [isHovered]);
|
|
|
|
if (isEditingPageName) {
|
|
return <RenameInput page={page} updaterCallback={renamePage} updatePageEditMode={setIsEditingPageName} />;
|
|
}
|
|
const windowUrl = window.location.href;
|
|
|
|
const slug = windowUrl.split(page.handle)[0];
|
|
|
|
return (
|
|
<div
|
|
onMouseEnter={() => setIsHovered(true)}
|
|
onMouseLeave={() => setIsHovered(false)}
|
|
className={`card cursor-pointer ${isSelected ? 'active' : 'non-active-page'}`}
|
|
onClick={() => page.id != currentPageId && switchPage(page.id)}
|
|
style={{ display: 'flex', justifyContent: 'center' }}
|
|
>
|
|
<div>
|
|
<div className="row" role="button">
|
|
<div className="col-auto d-flex align-items-center">
|
|
{!isHovered && isHomePage && <Home width={16} height={16} />}
|
|
{/* When the page is hidden as well as disabled, disabled icon takes precedence */}
|
|
{!isHovered && (isDisabled || (isDisabled && isHidden)) && (
|
|
<FileRemove width={16} height={16} viewBox={'0 0 16 16'} />
|
|
)}
|
|
{!isHovered && isHidden && !isDisabled && <EyeDisable width={16} height={16} />}
|
|
{/* When hovered on disabled page, show disabled icon instead of hovered icon */}
|
|
{isHovered && isDisabled && <FileRemove width={16} height={16} viewBox={'0 0 16 16'} />}
|
|
{isHovered && !isDisabled && (
|
|
<div style={{ paddingRight: '4px' }}>
|
|
<SortableList.DragHandle show />
|
|
</div>
|
|
)}
|
|
</div>
|
|
<div
|
|
className="col text-truncate font-weight-400 page-name tj-text-xsm"
|
|
data-cy={`pages-name-${String(page.name).toLowerCase()}`}
|
|
style={isHomePage || isHidden || isHovered || isDisabled ? { paddingLeft: '0px' } : { paddingLeft: '16px' }}
|
|
>
|
|
<span className={darkMode && 'dark-theme'}>{`${page.name}`}</span>
|
|
{isIconApplied && (
|
|
<span
|
|
style={{
|
|
marginLeft: '8px',
|
|
}}
|
|
className="color-slate09"
|
|
>
|
|
{isHomePage && 'Home'}
|
|
{isDisabled && 'Disabled'}
|
|
{isHidden && !isDisabled && 'Hidden'}
|
|
</span>
|
|
)}
|
|
</div>
|
|
<div className="col-auto" data-cy="page-menu-option-icon">
|
|
{(isHovered || isSelected) && !isVersionReleased && (
|
|
<PagehandlerMenu
|
|
page={page}
|
|
darkMode={darkMode}
|
|
handlePageCallback={handleCallback}
|
|
showMenu={showPagehandlerMenu}
|
|
setShowMenu={setShowPagehandlerMenu}
|
|
isHome={isHomePage}
|
|
isHidden={isHidden}
|
|
isDisabled={isDisabled}
|
|
/>
|
|
)}
|
|
<EditModal
|
|
slug={slug}
|
|
page={page}
|
|
show={showEditModal}
|
|
handleClose={handleClose}
|
|
updatePageHandle={updatePageHandle}
|
|
darkMode={darkMode}
|
|
/>
|
|
<SettingsModal
|
|
page={page}
|
|
show={showSettingsModal}
|
|
handleClose={() => {
|
|
setShowSettingsModal(false);
|
|
!haveUserPinned && pinPagesPopover(false);
|
|
}}
|
|
darkMode={darkMode}
|
|
apps={apps}
|
|
pages={pages}
|
|
components={components}
|
|
pinPagesPopover={pinPagesPopover}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export const AddingPageHandler = ({ addNewPage, setNewPageBeingCreated, darkMode }) => {
|
|
const handleAddingNewPage = (pageName) => {
|
|
if (pageName.trim().length === 0) {
|
|
toast('Page name should have at least 1 character', {
|
|
icon: '⚠️',
|
|
});
|
|
}
|
|
|
|
if (pageName && pageName.trim().length > 0) {
|
|
addNewPage({ name: pageName, handle: _.kebabCase(pageName.toLowerCase()) });
|
|
}
|
|
setNewPageBeingCreated(false);
|
|
};
|
|
|
|
return (
|
|
<div className="row" role="button" style={{ marginTop: '2px' }}>
|
|
<div className="col-12">
|
|
<input
|
|
type="text"
|
|
className={`form-control page-name-input color-slate12 ${darkMode && 'bg-transparent'}`}
|
|
autoFocus
|
|
onBlur={(event) => {
|
|
const name = event.target.value;
|
|
handleAddingNewPage(name);
|
|
event.stopPropagation();
|
|
}}
|
|
onKeyDown={(event) => {
|
|
if (event.key === 'Enter') {
|
|
const name = event.target.value;
|
|
handleAddingNewPage(name);
|
|
event.stopPropagation();
|
|
}
|
|
}}
|
|
/>
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|