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.

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

Feature loading indicator #1335

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
52c81cf
Increase Heap Size
dragonpoo Nov 20, 2024
3a443bb
Merge pull request #1323 from lowcoder-org/fix/heapsize
FalkWolsky Nov 20, 2024
24ba4bd
convert snapshot migration to use aggregation pipeline
dragonpoo Nov 20, 2024
0c5c344
delete after copying records
dragonpoo Nov 20, 2024
1eca3af
different migration based on mongo version.
dragonpoo Nov 20, 2024
dc98eb3
Merge pull request #1324 from lowcoder-org/fix/migration
FalkWolsky Nov 20, 2024
b605907
modify to use aggregate
dragonpoo Nov 21, 2024
f7a6179
modify snapshot task logic to move from normal collection to timeseri…
dragonpoo Nov 21, 2024
138ebd8
swap ts and normal collection in api endpoint
dragonpoo Nov 22, 2024
a28b90f
application snapshot history count logic fix
dragonpoo Nov 22, 2024
311bae7
page number start from 1
dragonpoo Nov 22, 2024
570e35c
#1284 Fixed duplicate key error for currentUser endpoint when logging…
dragonpoo Nov 22, 2024
d6d7a88
fix test compile issue
dragonpoo Nov 22, 2024
a740d0f
Added tree structure basically.
Imiss-U1025 Nov 19, 2024
69c7415
Added Movefolder in redux.
Imiss-U1025 Nov 21, 2024
b6e07d5
Made be possible Drag and Drop in extension.
Imiss-U1025 Nov 21, 2024
63534ca
Added removing module.
Imiss-U1025 Nov 21, 2024
c8daa8d
Added removing folder.
Imiss-U1025 Nov 22, 2024
39dbd40
Added Renaming folders.
Imiss-U1025 Nov 22, 2024
521370f
Added removing modules
Imiss-U1025 Nov 22, 2024
fdc0145
Fixed UI.
Imiss-U1025 Nov 22, 2024
ff55d93
Fxied ability to module drag and drop in right panel.
Imiss-U1025 Nov 22, 2024
4e4e906
Fixed an issue where subApplications are hidden when rename a folder.
Imiss-U1025 Nov 22, 2024
ab549e4
Merge pull request #1334 from lowcoder-org/feature-extension
FalkWolsky Nov 22, 2024
4871649
Fixed an issue miss loading-indicator.
Imiss-U1025 Nov 23, 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
2 changes: 2 additions & 0 deletions client/packages/lowcoder/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
display: flex;
pointer-events: none;
flex-direction: column;
top: 0;
z-index: 10000;
}
#loading svg {
animation: breath 1s linear infinite;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Wrapper = styled.div<{
$itemHeight?: number;
}>`
position: relative;
width: 100%;
width: auto;
height: ${(props) => props.$itemHeight ?? 30}px;
/* border: 1px solid #d7d9e0; */
border-radius: 4px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { DraggableTreeContext } from "./DraggableTreeContext";
import DroppablePlaceholder from "./DroppablePlaceHolder";
import { DraggableTreeNode, DraggableTreeNodeItemRenderProps, IDragData, IDropData } from "./types";
import { checkDroppableFlag } from "./util";
import { Flex } from "antd";

const DraggableMenuItemWrapper = styled.div`
position: relative;
Expand Down Expand Up @@ -88,29 +89,34 @@ export default function DraggableMenuItem(props: IDraggableMenuItemProps) {
disabled={isDragging || disabled}
/>
)}
<DraggableItem
path={path}
id={id}
dropInAsSub={dropInAsSub && canDropIn !== false}
isOver={isOver}
ref={(node) => {
setDragNodeRef(node);
setDropNodeRef(node);
}}
{...dragListeners}
>
{renderContent?.({
node: item,
isOver,
path,
isOverlay,
hasChildren: items.length > 0,
dragging: !!(isDragging || parentDragging),
isFolded: isFold,
onDelete: () => onDelete?.(path),
onToggleFold: () => context.toggleFold(id),
}) || null}
</DraggableItem>
<Flex style={{paddingLeft: '15px'}} align="center">
<DraggableItem
path={path}
id={id}
dropInAsSub={dropInAsSub && canDropIn !== false}
isOver={isOver}
ref={(node) => {
setDragNodeRef(node);
setDropNodeRef(node);
}}
{...dragListeners}
>
<span style={{cursor: "default"}}>⣿</span>
</DraggableItem>
<div style={{flex: 1}}>
{renderContent?.({
node: item,
isOver,
path,
isOverlay,
hasChildren: items.length > 0,
dragging: !!(isDragging || parentDragging),
isFolded: isFold,
onDelete: () => onDelete?.(path),
onToggleFold: () => context.toggleFold(id),
}) || null}
</div>
</Flex>
</DraggableMenuItemWrapper>
{items.length > 0 && !isFold && (
<div className="sub-menu-list">
Expand Down
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/comps/comps/rootComp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { ExternalEditorContext } from "util/context/ExternalEditorContext";
import { useUserViewMode } from "util/hooks";
import React from "react";
import { isEqual } from "lodash";

import {LoadingBarHideTrigger} from "@lowcoder-ee/util/hideLoading";
const EditorView = lazy(
() => import("pages/editor/editorView"),
);
Expand Down Expand Up @@ -138,6 +138,7 @@ const RootView = React.memo((props: RootViewProps) => {
<div key={key}>{comp.children.queries.children[key].getView()}</div>
))}
<Suspense fallback={!readOnly || isUserViewMode ? SuspenseFallback : null}>
<LoadingBarHideTrigger />
<EditorView uiComp={comp.children.ui} preloadComp={comp.children.preload} />
</Suspense>
</EditorContext.Provider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const ReduxActionTypes = {
FETCH_RAW_CURRENT_USER_SUCCESS: "FETCH_RAW_CURRENT_USER_SUCCESS",
FETCH_API_KEYS: "FETCH_API_KEYS",
FETCH_API_KEYS_SUCCESS: "FETCH_API_KEYS_SUCCESS",

MOVE_TO_FOLDER2_SUCCESS: "MOVE_TO_FOLDER2_SUCCESS",

/* plugin RELATED */
FETCH_DATA_SOURCE_TYPES: "FETCH_DATA_SOURCE_TYPES",
Expand Down
1 change: 1 addition & 0 deletions client/packages/lowcoder/src/i18n/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2785,6 +2785,7 @@ export const en = {
"switch": "Switch Component: "
},
"module": {
"folderNotEmpty": "Folder is not empty",
"emptyText": "No Data",
"docLink": "Read More About Modules...",
"documentationText" : "Modules are complete Applications, that can get included and repeated in other Applications and it functions just like a single component. As modules can get embedded, they need to be able to interact with your outside apps or websites. This four settings help to support communication with a Module.",
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (!window.ResizeObserver) {
window.ResizeObserver = ResizeObserver;
}

function hideLoading() {
export function hideLoading() {
// hide loading
const node = document.getElementById("loading");
if (node) {
Expand All @@ -42,7 +42,7 @@ debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);

try {
bootstrap();
hideLoading();
// hideLoading();
} catch (e) {
log.error(e);
}
3 changes: 2 additions & 1 deletion client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import AppEditor from "../editor/AppEditor";
import { fetchDeploymentIdAction } from "@lowcoder-ee/redux/reduxActions/configActions";
import { getDeploymentId } from "@lowcoder-ee/redux/selectors/configSelectors";
import { SimpleSubscriptionContextProvider } from '@lowcoder-ee/util/context/SimpleSubscriptionContext';

import {LoadingBarHideTrigger} from "@lowcoder-ee/util/hideLoading";
const TabLabel = styled.div`
font-weight: 500;
`;
Expand Down Expand Up @@ -222,6 +222,7 @@ export default function ApplicationHome() {

return (
<DivStyled>
<LoadingBarHideTrigger />
<SimpleSubscriptionContextProvider>
<Layout
sections={[
Expand Down
Loading
Loading