Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 13 additions & 14 deletions .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ on:
types: [opened, synchronize, reopened]
paths:
- 'client/**'
- '.github/workflows/client.yml'

permissions:
contents: read

jobs:
test:
name: Tests
build-client:
name: Build
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -25,15 +26,13 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: 'client/yarn.lock'
- run: |
cd client && yarn install && yarn test
# - name: Install dependencies
# uses: borales/actions-yarn@v4
# with:
# cmd: install
# dir: client
# - name: Run tests
# uses: borales/actions-yarn@v4
# with:
# cmd: test
# dir: client
- name: Install dependencies
uses: borales/actions-yarn@v4.2.0
with:
cmd: install
dir: client
- name: Run tests
uses: borales/actions-yarn@v4.2.0
with:
cmd: build
dir: client
38 changes: 38 additions & 0 deletions .github/workflows/node-service.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Node Service
on:
pull_request:
types: [opened, synchronize, reopened]
paths:
- 'server/node-service/**'
- '.github/workflows/node-service.yml'

permissions:
contents: read

jobs:
build-node-service:
name: Build
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ 20.x ]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: 'server/node-service/yarn.lock'
- name: Install dependencies
uses: borales/actions-yarn@v4.2.0
with:
cmd: install
dir: server/node-service
- name: Run tests
uses: borales/actions-yarn@v4.2.0
with:
cmd: build
dir: server/node-service
2 changes: 1 addition & 1 deletion client/packages/lowcoder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"rehype-sanitize": "^5.0.1",
"remark-gfm": "^3.0.1",
"resize-observer-polyfill": "^1.5.1",
"simplebar-react": "^2.3.6",
"simplebar-react": "2.3.6",
"sql-formatter": "^8.2.0",
"styled-components": "^5.3.3",
"stylis": "^4.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const Wrapper = styled.div<{ dragging: boolean; isOver: boolean; dropInAsSub: bo
`;

interface IProps extends HTMLAttributes<HTMLDivElement> {
content: ReactNode;
dragContent: ReactNode;
isOver?: boolean;
extra?: ReactNode;
dragging?: boolean;
Expand All @@ -84,7 +84,7 @@ interface IProps extends HTMLAttributes<HTMLDivElement> {

function DraggableItem(props: IProps, ref: Ref<HTMLDivElement>) {
const {
content: text,
dragContent: text,
extra,
dragging = false,
dropInAsSub = true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const MenuItem = React.forwardRef((props: IMenuItemProps, ref: React.Ref<HTMLDiv
dragging={dragging}
dropInAsSub={dropInAsSub}
dragListeners={dragListeners}
content={
dragContent={
<SimplePopover
title={trans("edit")}
content={content}
Expand Down
Loading