Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4cbd2f85c7 | ||
|
|
fae9de4e1c | ||
|
|
89c1ed71e1 | ||
|
|
1725f3cb8a | ||
|
|
f7be49e402 | ||
|
|
c8d732d936 | ||
|
|
5a32b6327c | ||
|
|
8488105810 | ||
|
|
57ebfa51d8 | ||
|
|
40170fdf90 | ||
|
|
1629f62d09 | ||
|
|
fff0552081 | ||
|
|
e792cb26b1 | ||
|
|
7ee2d76be4 | ||
|
|
eb56b2147b | ||
|
|
8747aa59de | ||
|
|
934dcdf39b | ||
|
|
2c84316fe0 | ||
|
|
03825c3bed | ||
|
|
200ea3bbc0 | ||
|
|
5b4b0cd635 | ||
|
|
a1323cd516 | ||
|
|
92f75789fa | ||
|
|
8a8c1fee0c | ||
|
|
16499052f7 | ||
|
|
cc32daa009 | ||
|
|
ea1b3b7f92 | ||
|
|
4e2863faa7 | ||
|
|
b46fb43e6f | ||
|
|
bcacfa8fe2 | ||
|
|
4df2becd6f | ||
|
|
2990ea593a | ||
|
|
b976673826 | ||
|
|
16e034efcb | ||
|
|
6712625c3f | ||
|
|
b5bbf6a6a4 | ||
|
|
3d3e7761f5 | ||
|
|
fa56b9c01f | ||
|
|
882213784f | ||
|
|
251bd793f3 | ||
|
|
088b0e760b | ||
|
|
cc1fa1cc3b | ||
|
|
bcd3ea86e8 | ||
|
|
0176650f67 | ||
|
|
f3963aded3 | ||
|
|
bbe720481a | ||
|
|
04f9030474 | ||
|
|
6d135be859 | ||
|
|
63cbe7063e | ||
|
|
7985bea2b8 | ||
|
|
733abccaa9 | ||
|
|
119cce82b4 | ||
|
|
988e70ec40 | ||
|
|
5e3fca3771 | ||
|
|
6d9ce56f4a | ||
|
|
3c8c04fd37 | ||
|
|
790a1d5cc9 | ||
|
|
4b352fd878 | ||
|
|
a196f2ef11 | ||
|
|
6c65d135f7 | ||
|
|
a1a1e9a86a | ||
|
|
0d39a7567f | ||
|
|
76a18d06d6 | ||
|
|
ce52fc5af7 | ||
|
|
0a2863a79c | ||
|
|
39e320fe4b | ||
|
|
2f3dfe775e | ||
|
|
22964cb375 | ||
|
|
fd89cf7f2b | ||
|
|
5acf84c20b | ||
|
|
6cd9da844f | ||
|
|
d7847fe89b | ||
|
|
d033520927 | ||
|
|
d911030831 | ||
|
|
9d95ed6c41 | ||
|
|
1a5a853fa3 | ||
|
|
bb358e01dd | ||
|
|
9f0fce098e | ||
|
|
60ab09771d | ||
|
|
cb3ef783ba | ||
|
|
fe376b10c1 | ||
|
|
786441cda0 | ||
|
|
0d3cf0a32d | ||
|
|
b4e01d7256 | ||
|
|
73a641b935 | ||
|
|
6802a0dc69 | ||
|
|
81d6c43cd9 | ||
|
|
ca6a1a14f5 | ||
|
|
c096444acb | ||
|
|
51d05f3cd3 | ||
|
|
221da3c455 | ||
|
|
92098e136c | ||
|
|
fd5c33dd5d | ||
|
|
0c1c7e2192 | ||
|
|
b8d262f745 | ||
|
|
a1fd694248 | ||
|
|
634d6ceab1 | ||
|
|
31d4d5f38d | ||
|
|
3f99438402 | ||
|
|
7e7727e3e1 | ||
|
|
273d994750 | ||
|
|
86d21d6abd | ||
|
|
a9c200cc3b | ||
|
|
3fedc14062 | ||
|
|
c42e1fb5dd | ||
|
|
9961340118 | ||
|
|
f54bd22757 | ||
|
|
1043dacd67 | ||
|
|
616304a1fa | ||
|
|
1e01148138 | ||
|
|
ede56e1ae3 | ||
|
|
b2e0c45539 | ||
|
|
389648b546 | ||
|
|
f4789c28db | ||
|
|
668092de7d | ||
|
|
920f9c097d | ||
|
|
da63598de3 | ||
|
|
517cb34cfe | ||
|
|
079b8eba53 | ||
|
|
af02cdd8bf | ||
|
|
e1bc189b88 | ||
|
|
5f2723623a | ||
|
|
fee6841d0a | ||
|
|
ca6fb3b962 | ||
|
|
28c3f28e01 | ||
|
|
80d12aaeeb | ||
|
|
89af209a2e | ||
|
|
f1fed3e533 | ||
|
|
eddeb96b16 | ||
|
|
9e8ff3b579 | ||
|
|
fc1278011c | ||
|
|
24163463fc | ||
|
|
fdef87e3b9 | ||
|
|
964498dbaa | ||
|
|
5b519cb62f | ||
|
|
11fc3b4485 | ||
|
|
37c0b59f82 | ||
|
|
239611ad51 | ||
|
|
0575e665fe | ||
|
|
019766dced | ||
|
|
6dc9e4ed99 | ||
|
|
d4b64b90fc | ||
|
|
1a49826b85 | ||
|
|
815643eb2c | ||
|
|
bcc4c0d923 | ||
|
|
cf7810b067 | ||
|
|
f1c72df8b6 | ||
|
|
5056d38848 | ||
|
|
3ef5b3ead8 | ||
|
|
ded58dc8b0 | ||
|
|
d8ee1ecdd1 | ||
|
|
fc2f4cd5d3 | ||
|
|
7ef457157e | ||
|
|
23ee815200 | ||
|
|
40c04c35ff | ||
|
|
743f2956c8 | ||
|
|
5bf5db27d8 | ||
|
|
667c5daf25 | ||
|
|
6662b0a717 | ||
|
|
348bf4d6c4 | ||
|
|
3ac2d289d0 | ||
|
|
3bc73c43ea | ||
|
|
8e0c60f5be | ||
|
|
aae69cb5e4 | ||
|
|
782c0356c8 | ||
|
|
757cdb14a4 | ||
|
|
8a4bdbd1fe | ||
|
|
5bf42be786 | ||
|
|
d896c3183b | ||
|
|
13ee0c3466 | ||
|
|
211c841379 | ||
|
|
90a30961ff | ||
|
|
7cb9774e05 | ||
|
|
875895b331 | ||
|
|
91bc889fed | ||
|
|
a34d8e9753 | ||
|
|
107cb85ba2 | ||
|
|
9333ef562e | ||
|
|
7d28abc7e6 | ||
|
|
5317950b5c | ||
|
|
7501619b7e | ||
|
|
080e29aa03 | ||
|
|
48c532b2c2 | ||
|
|
a62815f825 | ||
|
|
6938232dc4 | ||
|
|
4c4cfa9c66 | ||
|
|
ba89d41b19 |
@@ -0,0 +1,57 @@
|
|||||||
|
name: Build and publish release package
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [created]
|
||||||
|
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-publish-release-package:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: '18'
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Workflow install pnpm
|
||||||
|
run: npm install pnpm -g
|
||||||
|
|
||||||
|
- name: Client install dependencies
|
||||||
|
run: pnpm install
|
||||||
|
|
||||||
|
- name: Server install dependencies
|
||||||
|
run: pnpm install
|
||||||
|
|
||||||
|
- name: Server include into dist
|
||||||
|
run: mv server/ dist/
|
||||||
|
|
||||||
|
- name: Client build production
|
||||||
|
run: |
|
||||||
|
npm run build
|
||||||
|
working-directory: ./client
|
||||||
|
|
||||||
|
- name: Client include into dist
|
||||||
|
run: |
|
||||||
|
mv build/index.html ../dist/views/index.ejs
|
||||||
|
mv build/* ../dist/public/
|
||||||
|
working-directory: ./client
|
||||||
|
|
||||||
|
- name: Dist include README.md SECURITY.md LICENSE start.sh
|
||||||
|
run: mv README.md SECURITY.md LICENSE start.sh dist/
|
||||||
|
|
||||||
|
- name: Dist Remove node modules
|
||||||
|
run: rm -R dist/node_modules
|
||||||
|
|
||||||
|
- name: Dist create .zip file
|
||||||
|
run: |
|
||||||
|
mv dist/ planka/
|
||||||
|
zip -r planka-prebuild-${{ github.event.release.tag_name }}.zip planka
|
||||||
|
|
||||||
|
- name: Dist upload assets
|
||||||
|
run: |
|
||||||
|
gh release upload ${{ github.event.release.tag_name }} planka-prebuild-${{ github.event.release.tag_name }}.zip
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
@@ -13,26 +13,26 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push-docker-base-image:
|
build-and-push-docker-base-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
@@ -40,5 +40,5 @@ jobs:
|
|||||||
build-args: ALPINE_VERSION=${{ env.ALPINE_VERSION }}
|
build-args: ALPINE_VERSION=${{ env.ALPINE_VERSION }}
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
ghcr.io/plankanban/planka:base-latest
|
ghcr.io/${{ github.repository }}:base-latest
|
||||||
ghcr.io/plankanban/planka:base-${{ env.ALPINE_VERSION }}
|
ghcr.io/${{ github.repository }}:base-${{ env.ALPINE_VERSION }}
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# https://docs.docker.com/build/ci/github-actions/multi-platform/
|
||||||
|
name: Build and push Docker DEV image
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
paths-ignore:
|
||||||
|
- '.github/**'
|
||||||
|
- 'charts/**'
|
||||||
|
- 'docker-*.sh'
|
||||||
|
- '*.md'
|
||||||
|
branches: [master]
|
||||||
|
workflow_dispatch:
|
||||||
|
env:
|
||||||
|
REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: self-hosted
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
|
- name: Login to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v2
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Generate docker image tags
|
||||||
|
id: metadata
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY_IMAGE }}
|
||||||
|
tags: |
|
||||||
|
type=raw,value=dev
|
||||||
|
|
||||||
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.metadata.outputs.tags }}
|
||||||
|
labels: ${{ steps.metadata.outputs.labels }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
@@ -6,19 +6,19 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push-docker-image:
|
build-and-push-docker-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v2
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -31,12 +31,23 @@ jobs:
|
|||||||
result-encoding: string
|
result-encoding: string
|
||||||
script: return context.payload.release.tag_name.replace('v', '')
|
script: return context.payload.release.tag_name.replace('v', '')
|
||||||
|
|
||||||
|
- name: Generate docker image tags
|
||||||
|
id: metadata
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
name=ghcr.io/${{ github.repository }}
|
||||||
|
tags: |
|
||||||
|
type=raw,value=${{ steps.set-version.outputs.result }}
|
||||||
|
type=raw,value=latest
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
platforms: linux/amd64,linux/arm64,linux/arm/v7
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: ${{ steps.metadata.outputs.tags }}
|
||||||
ghcr.io/plankanban/planka:latest
|
labels: ${{ steps.metadata.outputs.labels }}
|
||||||
ghcr.io/plankanban/planka:${{ steps.set-version.outputs.result }}
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ jobs:
|
|||||||
# see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
|
# see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
runs-on: ubuntu-latest
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
@@ -35,8 +35,9 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: Run chart-releaser for stable
|
- name: Run chart-releaser for stable
|
||||||
uses: helm/chart-releaser-action@v1.5.0
|
uses: helm/chart-releaser-action@v1.6.0
|
||||||
with:
|
with:
|
||||||
charts_dir: charts
|
charts_dir: charts
|
||||||
|
mark_as_latest: false
|
||||||
env:
|
env:
|
||||||
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
|||||||
+23
-8
@@ -1,33 +1,44 @@
|
|||||||
FROM ghcr.io/plankanban/planka:base-latest as server-dependencies
|
FROM node:18-alpine as server-dependencies
|
||||||
|
|
||||||
|
RUN apk -U upgrade \
|
||||||
|
&& apk add build-base python3 \
|
||||||
|
--no-cache
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY server/package.json server/package-lock.json .
|
COPY server/package.json server/package-lock.json ./
|
||||||
|
|
||||||
RUN npm install npm@latest --global \
|
RUN npm install npm@latest --global \
|
||||||
&& npm clean-install --omit=dev
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
|
&& pnpm install --prod
|
||||||
|
|
||||||
FROM node:lts AS client
|
FROM node:lts AS client
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY client/package.json client/package-lock.json .
|
COPY client/package.json client/package-lock.json ./
|
||||||
|
|
||||||
RUN npm install npm@latest --global \
|
RUN npm install npm@latest --global \
|
||||||
&& npm clean-install --omit=dev
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
|
&& pnpm install --prod
|
||||||
|
|
||||||
COPY client .
|
COPY client .
|
||||||
RUN DISABLE_ESLINT_PLUGIN=true npm run build
|
RUN DISABLE_ESLINT_PLUGIN=true npm run build
|
||||||
|
|
||||||
FROM ghcr.io/plankanban/planka:base-latest
|
FROM node:18-alpine
|
||||||
|
|
||||||
RUN apk del vips-dependencies --purge
|
RUN apk -U upgrade \
|
||||||
|
&& apk add bash \
|
||||||
|
--no-cache
|
||||||
|
|
||||||
USER node
|
USER node
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --chown=node:node start.sh .
|
COPY --chown=node:node start.sh .
|
||||||
COPY --chown=node:node server .
|
COPY --chown=node:node server .
|
||||||
|
COPY --chown=node:node healthcheck.js .
|
||||||
|
|
||||||
RUN mv .env.sample .env
|
RUN mv .env.sample .env
|
||||||
|
|
||||||
@@ -42,4 +53,8 @@ VOLUME /app/private/attachments
|
|||||||
|
|
||||||
EXPOSE 1337
|
EXPOSE 1337
|
||||||
|
|
||||||
CMD ["./start.sh"]
|
HEALTHCHECK --interval=10s --timeout=2s --start-period=15s \
|
||||||
|
CMD node ./healthcheck.js
|
||||||
|
|
||||||
|
|
||||||
|
CMD [ "bash", "start.sh" ]
|
||||||
|
|||||||
+12
-17
@@ -1,27 +1,22 @@
|
|||||||
FROM node:lts-alpine
|
FROM node:18-alpine
|
||||||
|
|
||||||
ARG ALPINE_VERSION=3.16
|
ARG VIPS_VERSION=8.14.5
|
||||||
ARG VIPS_VERSION=8.13.3
|
|
||||||
|
|
||||||
RUN apk -U upgrade \
|
RUN apk -U upgrade \
|
||||||
&& apk add \
|
&& apk add \
|
||||||
bash giflib glib lcms2 libexif \
|
bash pkgconf \
|
||||||
libgsf libjpeg-turbo libpng librsvg libwebp \
|
libjpeg-turbo libexif librsvg cgif tiff libspng libimagequant \
|
||||||
orc pango tiff \
|
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/community/ \
|
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/main/ \
|
|
||||||
--no-cache \
|
--no-cache \
|
||||||
&& apk add \
|
&& apk add \
|
||||||
build-base giflib-dev glib-dev lcms2-dev libexif-dev \
|
build-base gobject-introspection-dev meson \
|
||||||
libgsf-dev libjpeg-turbo-dev libpng-dev librsvg-dev libwebp-dev \
|
libjpeg-turbo-dev libexif-dev librsvg-dev cgif-dev tiff-dev libspng-dev libimagequant-dev \
|
||||||
orc-dev pango-dev tiff-dev \
|
|
||||||
--virtual vips-dependencies \
|
--virtual vips-dependencies \
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/community/ \
|
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/v${ALPINE_VERSION}/main/ \
|
|
||||||
--no-cache \
|
--no-cache \
|
||||||
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz | tar xzC /tmp \
|
&& wget -O- https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz | tar xJC /tmp \
|
||||||
&& cd /tmp/vips-${VIPS_VERSION} \
|
&& cd /tmp/vips-${VIPS_VERSION} \
|
||||||
&& ./configure \
|
&& meson setup build-dir \
|
||||||
&& make \
|
&& cd build-dir \
|
||||||
&& make install-strip \
|
&& ninja \
|
||||||
|
&& ninja test \
|
||||||
|
&& ninja install \
|
||||||
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Planka
|
# Planka
|
||||||
#### Elegant open source project tracking
|
#### Elegant open source project tracking.
|
||||||
|
|
||||||
  
|
  
|
||||||
|
|
||||||
@@ -10,19 +10,18 @@
|
|||||||
## Features
|
## Features
|
||||||
|
|
||||||
- Create projects, boards, lists, cards, labels and tasks
|
- Create projects, boards, lists, cards, labels and tasks
|
||||||
- Add card members, track time, set a due date, add attachments, write comments
|
- Add card members, track time, set due dates, add attachments, write comments
|
||||||
- Markdown support in a card description and comment
|
- Markdown support in card description and comments
|
||||||
- Filter by members and labels
|
- Filter by members and labels
|
||||||
- Customize project background
|
- Customize project backgrounds
|
||||||
- Real-time updates
|
- Real-time updates
|
||||||
- User notifications
|
- Internal notifications
|
||||||
- Internationalization
|
- Multiple interface languages
|
||||||
|
- Single sign-on via OpenID Connect
|
||||||
|
|
||||||
## How to deploy Planka
|
## How to deploy Planka
|
||||||
|
|
||||||
There are 2 types of installation:
|
There are many ways to install Planka, [check them out](https://docs.planka.cloud/docs/intro).
|
||||||
- [Without Docker](https://docs.planka.cloud/docs/installl-planka/Debian%20&%20Ubuntu) ([for Windows](https://docs.planka.cloud/docs/installl-planka/Windows))
|
|
||||||
- [Dockerized](https://docs.planka.cloud/docs/installl-planka/Docker%20Compose)
|
|
||||||
|
|
||||||
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
For configuration, please see the [configuration section](https://docs.planka.cloud/docs/category/configuration).
|
||||||
|
|
||||||
@@ -46,3 +45,7 @@ See the [development section](https://docs.planka.cloud/docs/Development).
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
Planka is [AGPL-3.0 licensed](https://github.com/plankanban/planka/blob/master/LICENSE).
|
Planka is [AGPL-3.0 licensed](https://github.com/plankanban/planka/blob/master/LICENSE).
|
||||||
|
|
||||||
|
## Contributors
|
||||||
|
|
||||||
|
[](https://github.com/plankanban/planka/graphs/contributors)
|
||||||
|
|||||||
@@ -15,17 +15,17 @@ type: application
|
|||||||
# This is the chart version. This version number should be incremented each time you make changes
|
# This is the chart version. This version number should be incremented each time you make changes
|
||||||
# to the chart and its templates, including the app version.
|
# to the chart and its templates, including the app version.
|
||||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||||
version: 0.1.0
|
version: 0.1.30
|
||||||
|
|
||||||
# This is the version number of the application being deployed. This version number should be
|
# This is the version number of the application being deployed. This version number should be
|
||||||
# incremented each time you make changes to the application. Versions are not expected to
|
# incremented each time you make changes to the application. Versions are not expected to
|
||||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||||
# It is recommended to use it with quotes.
|
# It is recommended to use it with quotes.
|
||||||
appVersion: "1.12.0"
|
appVersion: "1.17.3"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- alias: postgresql
|
- alias: postgresql
|
||||||
condition: postgresql.enabled
|
condition: postgresql.enabled
|
||||||
name: postgresql
|
name: postgresql
|
||||||
repository: &bitnami-repo https://charts.bitnami.com/bitnami
|
repository: &bitnami-repo https://charts.bitnami.com/bitnami
|
||||||
version: 12.5.1
|
version: 12.5.1
|
||||||
|
|||||||
+30
-3
@@ -14,14 +14,22 @@ If you want to fully uninstall this chart including the data, follow [these step
|
|||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
|
If you just want to spin up an instance using help, please see [these docs](https://docs.planka.cloud/docs/installation/kubernetes/helm_chart/). If you want to make changes to the chart locally, and deploy them, see the below section.
|
||||||
|
|
||||||
|
## Local Building and Using the Chart
|
||||||
|
|
||||||
The basic usage of the chart can be found below:
|
The basic usage of the chart can be found below:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/Chris-Greaves/planka-helm-chart.git
|
git clone https://github.com/plankanban/planka.git
|
||||||
cd planka-helm-chart
|
cd planka/charts/planka
|
||||||
helm dependency build
|
helm dependency build
|
||||||
export SECRETKEY=$(openssl rand -hex 64)
|
export SECRETKEY=$(openssl rand -hex 64)
|
||||||
helm install planka . --set secretkey=$SECRETKEY
|
helm install planka . --set secretkey=$SECRETKEY \
|
||||||
|
--set admin_email="demo@demo.demo" \
|
||||||
|
--set admin_password="demo" \
|
||||||
|
--set admin_name="Demo Demo" \
|
||||||
|
--set admin_username="demo"
|
||||||
```
|
```
|
||||||
|
|
||||||
> **NOTE:** The command `openssl rand -hex 64` is needed to create a random hexadecimal key for planka. On Windows you can use Git Bash to run that command.
|
> **NOTE:** The command `openssl rand -hex 64` is needed to create a random hexadecimal key for planka. On Windows you can use Git Bash to run that command.
|
||||||
@@ -39,11 +47,19 @@ To access Planka externally you can use the following configuration
|
|||||||
```bash
|
```bash
|
||||||
# HTTP only
|
# HTTP only
|
||||||
helm install planka . --set secretkey=$SECRETKEY \
|
helm install planka . --set secretkey=$SECRETKEY \
|
||||||
|
--set admin_email="demo@demo.demo" \
|
||||||
|
--set admin_password="demo" \
|
||||||
|
--set admin_name="Demo Demo" \
|
||||||
|
--set admin_username="demo" \
|
||||||
--set ingress.enabled=true \
|
--set ingress.enabled=true \
|
||||||
--set ingress.hosts[0].host=planka.example.dev \
|
--set ingress.hosts[0].host=planka.example.dev \
|
||||||
|
|
||||||
# HTTPS
|
# HTTPS
|
||||||
helm install planka . --set secretkey=$SECRETKEY \
|
helm install planka . --set secretkey=$SECRETKEY \
|
||||||
|
--set admin_email="demo@demo.demo" \
|
||||||
|
--set admin_password="demo" \
|
||||||
|
--set admin_name="Demo Demo" \
|
||||||
|
--set admin_username="demo" \
|
||||||
--set ingress.enabled=true \
|
--set ingress.enabled=true \
|
||||||
--set ingress.hosts[0].host=planka.example.dev \
|
--set ingress.hosts[0].host=planka.example.dev \
|
||||||
--set ingress.tls[0].secretName=planka-tls \
|
--set ingress.tls[0].secretName=planka-tls \
|
||||||
@@ -54,6 +70,17 @@ or create a values.yaml file like:
|
|||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
secretkey: "<InsertSecretKey>"
|
secretkey: "<InsertSecretKey>"
|
||||||
|
# The admin section needs to be present for new instances of Planka, after the first start you can remove the lines starting with admin_. If you want the admin user to be unchangeable admin_email: has to stay
|
||||||
|
# After changing the config you have to run ```helm upgrade planka . -f values.yaml```
|
||||||
|
|
||||||
|
# Admin user
|
||||||
|
admin_email: "demo@demo.demo" # Do not remove if you want to prevent this user from being edited/deleted
|
||||||
|
admin_password: "demo"
|
||||||
|
admin_name: "Demo Demo"
|
||||||
|
admin_username: "demo"
|
||||||
|
# Admin user
|
||||||
|
|
||||||
|
# Ingress
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
hosts:
|
hosts:
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ spec:
|
|||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: {{ .Values.service.port }}
|
containerPort: {{ .Values.service.containerPort | default 1337 }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
@@ -55,16 +55,36 @@ spec:
|
|||||||
- mountPath: /app/private/attachments
|
- mountPath: /app/private/attachments
|
||||||
subPath: attachments
|
subPath: attachments
|
||||||
name: planka
|
name: planka
|
||||||
|
{{- if .Values.securityContext.readOnlyRootFilesystem }}
|
||||||
|
- mountPath: /app/logs
|
||||||
|
subPath: app-logs
|
||||||
|
name: emptydir
|
||||||
|
{{- end }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.resources | nindent 12 }}
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
env:
|
env:
|
||||||
|
{{- if not .Values.postgresql.enabled }}
|
||||||
|
{{- if .Values.existingDburlSecret }}
|
||||||
|
- name: DATABASE_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: .Values.existingDburlSecret
|
||||||
|
key: uri
|
||||||
|
{{- else }}
|
||||||
|
- name: DATABASE_URL
|
||||||
|
value: {{ required "If the included postgresql deployment is disabled you need to provide an existing secret in .Values.existingDburlSecret or define a Database URL in 'dburl'" .Values.dburl }}
|
||||||
|
{{- end }}
|
||||||
|
{{- else }}
|
||||||
- name: DATABASE_URL
|
- name: DATABASE_URL
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: planka-postgresql-svcbind-custom-user
|
name: planka-postgresql-svcbind-custom-user
|
||||||
key: uri
|
key: uri
|
||||||
|
{{- end }}
|
||||||
- name: BASE_URL
|
- name: BASE_URL
|
||||||
{{- if .Values.ingress.enabled }}
|
{{- if .Values.baseUrl }}
|
||||||
|
value: {{ .Values.baseUrl }}
|
||||||
|
{{- else if .Values.ingress.enabled }}
|
||||||
value: {{ printf "https://%s" (first .Values.ingress.hosts).host }}
|
value: {{ printf "https://%s" (first .Values.ingress.hosts).host }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
value: http://localhost:3000
|
value: http://localhost:3000
|
||||||
@@ -73,6 +93,45 @@ spec:
|
|||||||
value: {{ required "A secret key needs to be generated using 'openssl rand -hex 64' and assigned to secretkey." .Values.secretkey }}
|
value: {{ required "A secret key needs to be generated using 'openssl rand -hex 64' and assigned to secretkey." .Values.secretkey }}
|
||||||
- name: TRUST_PROXY
|
- name: TRUST_PROXY
|
||||||
value: "0"
|
value: "0"
|
||||||
|
- name: DEFAULT_ADMIN_EMAIL
|
||||||
|
value: {{ .Values.admin_email }}
|
||||||
|
- name: DEFAULT_ADMIN_PASSWORD
|
||||||
|
value: {{ .Values.admin_password }}
|
||||||
|
- name: DEFAULT_ADMIN_NAME
|
||||||
|
value: {{ .Values.admin_name }}
|
||||||
|
- name: DEFAULT_ADMIN_USERNAME
|
||||||
|
value: {{ .Values.admin_username }}
|
||||||
|
{{ range $k, $v := .Values.env }}
|
||||||
|
- name: {{ $k | quote }}
|
||||||
|
value: {{ $v | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.oidc.enabled }}
|
||||||
|
{{- $secretName := default (printf "%s-oidc" (include "planka.fullname" .)) .Values.oidc.existingSecret }}
|
||||||
|
- name: OIDC_CLIENT_ID
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: clientId
|
||||||
|
name: {{ $secretName }}
|
||||||
|
- name: OIDC_CLIENT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
key: clientSecret
|
||||||
|
name: {{ $secretName }}
|
||||||
|
- name: OIDC_ISSUER
|
||||||
|
value: {{ required "issuerUrl is required when configuring OIDC" .Values.oidc.issuerUrl | quote }}
|
||||||
|
- name: OIDC_SCOPES
|
||||||
|
value: {{ join " " .Values.oidc.scopes | default "openid profile email" | quote }}
|
||||||
|
{{- if .Values.oidc.admin.roles }}
|
||||||
|
- name: OIDC_ADMIN_ROLES
|
||||||
|
value: {{ join "," .Values.oidc.admin.roles | quote }}
|
||||||
|
{{- end }}
|
||||||
|
- name: OIDC_ROLES_ATTRIBUTE
|
||||||
|
value: {{ .Values.oidc.admin.rolesAttribute | default "groups" | quote }}
|
||||||
|
{{- if .Values.oidc.admin.ignoreRoles }}
|
||||||
|
- name: OIDC_IGNORE_ROLES
|
||||||
|
value: {{ .Values.oidc.admin.ignoreRoles | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
{{- with .Values.nodeSelector }}
|
{{- with .Values.nodeSelector }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
@@ -93,3 +152,7 @@ spec:
|
|||||||
{{- else }}
|
{{- else }}
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.securityContext.readOnlyRootFilesystem }}
|
||||||
|
- name: emptydir
|
||||||
|
emptyDir: {}
|
||||||
|
{{- end }}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{{- if .Values.autoscaling.enabled }}
|
{{- if .Values.autoscaling.enabled }}
|
||||||
apiVersion: autoscaling/v2beta1
|
apiVersion: autoscaling/v2
|
||||||
kind: HorizontalPodAutoscaler
|
kind: HorizontalPodAutoscaler
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "planka.fullname" . }}
|
name: {{ include "planka.fullname" . }}
|
||||||
@@ -17,12 +17,16 @@ spec:
|
|||||||
- type: Resource
|
- type: Resource
|
||||||
resource:
|
resource:
|
||||||
name: cpu
|
name: cpu
|
||||||
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
|
target:
|
||||||
|
type: Utilization
|
||||||
|
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
- type: Resource
|
- type: Resource
|
||||||
resource:
|
resource:
|
||||||
name: memory
|
name: memory
|
||||||
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
target:
|
||||||
|
type: Utilization
|
||||||
|
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{{- if .Values.oidc.enabled }}
|
||||||
|
{{- if eq (and (not (empty .Values.oidc.clientId)) (not (empty .Values.oidc.clientSecret))) (not (empty .Values.oidc.existingSecret)) -}}
|
||||||
|
{{- fail "Either specify inline `clientId` and `clientSecret` or refer to them via `existingSecret`" -}}
|
||||||
|
{{- end }}
|
||||||
|
{{- if (and (and (not (empty .Values.oidc.clientId)) (not (empty .Values.oidc.clientSecret))) (empty .Values.oidc.existingSecret)) -}}
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Secret
|
||||||
|
metadata:
|
||||||
|
name: {{ include "planka.fullname" . }}-oidc
|
||||||
|
labels:
|
||||||
|
{{- include "planka.labels" . | nindent 4 }}
|
||||||
|
type: Opaque
|
||||||
|
data:
|
||||||
|
clientId: {{ .Values.oidc.clientId | b64enc | quote }}
|
||||||
|
clientSecret: {{ .Values.oidc.clientSecret | b64enc | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
@@ -17,6 +17,10 @@ fullnameOverride: ""
|
|||||||
# Generate a secret using openssl rand -base64 45
|
# Generate a secret using openssl rand -base64 45
|
||||||
secretkey: ""
|
secretkey: ""
|
||||||
|
|
||||||
|
# Base url for Planka. Will override `ingress.hosts[0].host`
|
||||||
|
# Defaults to `http://localhost:3000` if ingress is disabled.
|
||||||
|
baseUrl: ""
|
||||||
|
|
||||||
serviceAccount:
|
serviceAccount:
|
||||||
# Specifies whether a service account should be created
|
# Specifies whether a service account should be created
|
||||||
create: true
|
create: true
|
||||||
@@ -42,6 +46,10 @@ securityContext: {}
|
|||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
port: 1337
|
port: 1337
|
||||||
|
## @param service.containerPort Planka HTTP container port
|
||||||
|
## If empty will default to 1337
|
||||||
|
##
|
||||||
|
containerPort: 1337
|
||||||
|
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: false
|
||||||
@@ -50,6 +58,7 @@ ingress:
|
|||||||
# kubernetes.io/ingress.class: nginx
|
# kubernetes.io/ingress.class: nginx
|
||||||
# kubernetes.io/tls-acme: "true"
|
# kubernetes.io/tls-acme: "true"
|
||||||
hosts:
|
hosts:
|
||||||
|
# Used to set planka BASE_URL if no `baseurl` is provided.
|
||||||
- host: planka.local
|
- host: planka.local
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
@@ -96,11 +105,84 @@ postgresql:
|
|||||||
serviceBindings:
|
serviceBindings:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
|
## Set this or existingDburlSecret if you disable the built-in postgresql deployment
|
||||||
|
dburl:
|
||||||
|
|
||||||
|
## @param existingDburlSecret Name of an existing secret containing a DBurl connection string
|
||||||
|
## NOTE: Must contain key `uri`
|
||||||
|
## NOTE: When it's set, the `dburl` parameter is ignored
|
||||||
|
##
|
||||||
|
existingDburlSecret: ""
|
||||||
|
|
||||||
## PVC-based data storage configuration
|
## PVC-based data storage configuration
|
||||||
persistence:
|
persistence:
|
||||||
enabled: false
|
enabled: false
|
||||||
# existingClaim: netbox-data
|
# existingClaim: netbox-data
|
||||||
# storageClass: "-"
|
# storageClass: "-"
|
||||||
|
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
size: 10Gi
|
size: 10Gi
|
||||||
|
|
||||||
|
## OpenID Identity Management configuration
|
||||||
|
##
|
||||||
|
## Example:
|
||||||
|
## ---------------
|
||||||
|
## oidc:
|
||||||
|
## enabled: true
|
||||||
|
## clientId: sxxaAIAxVXlCxTmc1YLHBbQr8NL8MqLI2DUbt42d
|
||||||
|
## clientSecret: om4RTMRVHRszU7bqxB7RZNkHIzA8e4sGYWxeCwIMYQXPwEBWe4SY5a0wwCe9ltB3zrq5f0dnFnp34cEHD7QSMHsKvV9AiV5Z7eqDraMnv0I8IFivmuV5wovAECAYreSI
|
||||||
|
## issuerUrl: https://auth.local/application/o/planka/
|
||||||
|
## admin:
|
||||||
|
## roles:
|
||||||
|
## - planka-admin
|
||||||
|
##
|
||||||
|
## ---------------
|
||||||
|
## NOTE: A minimal configuration requires setting `clientId`, `clientSecret` and `issuerUrl`. (plus `admin.roles` for administrators)
|
||||||
|
## ref: https://docs.planka.cloud/docs/Configuration/OIDC
|
||||||
|
##
|
||||||
|
oidc:
|
||||||
|
## @param oidc.enabled Enable single sign-on (SSO) with OpenID Connect (OIDC)
|
||||||
|
##
|
||||||
|
enabled: false
|
||||||
|
|
||||||
|
## OIDC credentials
|
||||||
|
## @param oidc.clientId A string unique to the provider that identifies your app.
|
||||||
|
## @param oidc.clientSecret A secret string that the provider uses to confirm ownership of a client ID.
|
||||||
|
##
|
||||||
|
## NOTE: Either specify inline `clientId` and `clientSecret` or refer to them via `existingSecret`
|
||||||
|
##
|
||||||
|
clientId: ""
|
||||||
|
clientSecret: ""
|
||||||
|
|
||||||
|
## @param oidc.existingSecret Name of an existing secret containing OIDC credentials
|
||||||
|
## NOTE: Must contain key `clientId` and `clientSecret`
|
||||||
|
## NOTE: When it's set, the `clientId` and `clientSecret` parameters are ignored
|
||||||
|
##
|
||||||
|
existingSecret: ""
|
||||||
|
|
||||||
|
## @param oidc.issuerUrl The OpenID connect metadata document endpoint
|
||||||
|
##
|
||||||
|
issuerUrl: ""
|
||||||
|
|
||||||
|
## @param oidc.scopes A list of scopes required for OIDC client.
|
||||||
|
## If empty will default to `openid`, `profile` and `email`
|
||||||
|
## NOTE: Planka needs the email and name claims
|
||||||
|
##
|
||||||
|
scopes: []
|
||||||
|
|
||||||
|
## Admin permissions configuration
|
||||||
|
admin:
|
||||||
|
## @param oidc.admin.ignoreRoles If set to true, the admin roles will be ignored.
|
||||||
|
## It is useful if you want to use OIDC for authentication but not for authorization.
|
||||||
|
## If empty will default to `false`
|
||||||
|
##
|
||||||
|
ignoreRoles: false
|
||||||
|
|
||||||
|
## @param oidc.admin.rolesAttribute The name of a custom group claim that you have configured in your OIDC provider
|
||||||
|
## If empty will default to `groups`
|
||||||
|
##
|
||||||
|
rolesAttribute: groups
|
||||||
|
|
||||||
|
## @param oidc.admin.roles The names of the admin groups
|
||||||
|
##
|
||||||
|
roles: []
|
||||||
|
# - planka-admin
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
REACT_APP_VERSION=1.12.0
|
REACT_APP_VERSION=1.17.3
|
||||||
|
|||||||
Generated
+9616
-21683
File diff suppressed because it is too large
Load Diff
+39
-30
@@ -49,65 +49,74 @@
|
|||||||
"**/*.test.js"
|
"**/*.test.js"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"prettier/prettier": [
|
||||||
|
"error",
|
||||||
|
{
|
||||||
|
"endOfLine": "auto"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@juggle/resize-observer": "^3.4.0",
|
"@juggle/resize-observer": "^3.4.0",
|
||||||
"classnames": "^2.3.2",
|
"classnames": "^2.5.1",
|
||||||
"date-fns": "^2.29.3",
|
"date-fns": "^2.30.0",
|
||||||
"dequal": "^2.0.3",
|
"dequal": "^2.0.3",
|
||||||
"easymde": "^2.18.0",
|
"easymde": "^2.18.0",
|
||||||
"history": "^5.3.0",
|
"history": "^5.3.0",
|
||||||
"i18next": "^22.0.6",
|
"i18next": "^23.11.2",
|
||||||
"i18next-browser-languagedetector": "^7.0.1",
|
"i18next-browser-languagedetector": "^7.2.1",
|
||||||
"initials": "^3.1.2",
|
"initials": "^3.1.2",
|
||||||
"js-cookie": "^3.0.1",
|
"js-cookie": "^3.0.5",
|
||||||
"jwt-decode": "^3.1.2",
|
"jwt-decode": "^4.0.0",
|
||||||
|
"linkify-react": "^4.1.3",
|
||||||
|
"linkifyjs": "^4.1.3",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"node-sass": "^8.0.0",
|
"nanoid": "^5.0.7",
|
||||||
"photoswipe": "^5.3.3",
|
"node-sass": "^9.0.0",
|
||||||
|
"photoswipe": "^5.4.3",
|
||||||
"prop-types": "^15.8.1",
|
"prop-types": "^15.8.1",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-app-rewired": "^2.2.1",
|
"react-app-rewired": "^2.2.1",
|
||||||
"react-beautiful-dnd": "^13.1.1",
|
"react-beautiful-dnd": "^13.1.1",
|
||||||
"react-datepicker": "^4.8.0",
|
"react-datepicker": "^4.25.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-dropzone": "^14.2.3",
|
"react-dropzone": "^14.2.3",
|
||||||
"react-i18next": "^12.0.0",
|
"react-i18next": "^13.5.0",
|
||||||
"react-input-mask": "^2.0.4",
|
"react-input-mask": "^2.0.4",
|
||||||
"react-markdown": "^8.0.3",
|
"react-markdown": "^8.0.7",
|
||||||
"react-photoswipe-gallery": "^2.2.2",
|
"react-photoswipe-gallery": "^2.2.7",
|
||||||
"react-redux": "^8.0.5",
|
"react-redux": "^8.1.3",
|
||||||
"react-router-dom": "^6.4.3",
|
"react-router-dom": "^6.22.3",
|
||||||
"react-scripts": "5.0.1",
|
"react-scripts": "5.0.1",
|
||||||
"react-simplemde-editor": "^5.2.0",
|
"react-simplemde-editor": "^5.2.0",
|
||||||
"react-textarea-autosize": "^8.4.0",
|
"react-textarea-autosize": "^8.5.3",
|
||||||
"redux": "^4.2.0",
|
"redux": "^4.2.1",
|
||||||
"redux-logger": "^3.0.6",
|
"redux-logger": "^3.0.6",
|
||||||
"redux-orm": "^0.16.2",
|
"redux-orm": "^0.16.2",
|
||||||
"redux-saga": "^1.2.1",
|
"redux-saga": "^1.3.0",
|
||||||
"remark-breaks": "^3.0.2",
|
"remark-breaks": "^4.0.0",
|
||||||
"remark-gfm": "^3.0.1",
|
"remark-gfm": "^3.0.1",
|
||||||
"reselect": "^4.1.7",
|
"reselect": "^4.1.8",
|
||||||
"sails.io.js": "^1.2.1",
|
"sails.io.js": "^1.2.1",
|
||||||
"semantic-ui-react": "^2.1.3",
|
"semantic-ui-react": "^2.1.5",
|
||||||
"socket.io-client": "^2.5.0",
|
"socket.io-client": "^2.5.0",
|
||||||
"validator": "^13.7.0",
|
"validator": "^13.11.0",
|
||||||
"whatwg-fetch": "^3.6.2",
|
"whatwg-fetch": "^3.6.20",
|
||||||
"zxcvbn": "^4.4.2"
|
"zxcvbn": "^4.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@testing-library/jest-dom": "^5.16.5",
|
"@testing-library/jest-dom": "^6.4.2",
|
||||||
"@testing-library/react": "^13.4.0",
|
"@testing-library/react": "^14.3.1",
|
||||||
"@testing-library/user-event": "^13.5.0",
|
"@testing-library/user-event": "^14.5.2",
|
||||||
"babel-preset-airbnb": "^5.0.0",
|
"babel-preset-airbnb": "^5.0.0",
|
||||||
"chai": "^4.3.7",
|
"chai": "^4.4.1",
|
||||||
"eslint": "^8.28.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-config-airbnb": "^19.0.4",
|
"eslint-config-airbnb": "^19.0.4",
|
||||||
"eslint-plugin-import": "^2.26.0",
|
"eslint-plugin-import": "^2.29.1",
|
||||||
"eslint-plugin-jsx-a11y": "^6.6.1",
|
"eslint-plugin-jsx-a11y": "^6.8.0",
|
||||||
"eslint-plugin-react": "^7.31.11",
|
"eslint-plugin-react": "^7.34.1",
|
||||||
"eslint-plugin-react-hooks": "^4.6.0",
|
"eslint-plugin-react-hooks": "^4.6.0",
|
||||||
"react-test-renderer": "^18.2.0"
|
"react-test-renderer": "^18.2.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,10 +23,14 @@ createCard.failure = (localId, error) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const handleCardCreate = (card) => ({
|
const handleCardCreate = (card, cardMemberships, cardLabels, tasks, attachments) => ({
|
||||||
type: ActionTypes.CARD_CREATE_HANDLE,
|
type: ActionTypes.CARD_CREATE_HANDLE,
|
||||||
payload: {
|
payload: {
|
||||||
card,
|
card,
|
||||||
|
cardMemberships,
|
||||||
|
cardLabels,
|
||||||
|
tasks,
|
||||||
|
attachments,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -60,6 +64,34 @@ const handleCardUpdate = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const duplicateCard = (id, card, taskIds) => ({
|
||||||
|
type: ActionTypes.CARD_DUPLICATE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
card,
|
||||||
|
taskIds,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
duplicateCard.success = (localId, card, cardMemberships, cardLabels, tasks) => ({
|
||||||
|
type: ActionTypes.CARD_DUPLICATE__SUCCESS,
|
||||||
|
payload: {
|
||||||
|
localId,
|
||||||
|
card,
|
||||||
|
cardMemberships,
|
||||||
|
cardLabels,
|
||||||
|
tasks,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
duplicateCard.failure = (id, error) => ({
|
||||||
|
type: ActionTypes.CARD_DUPLICATE__FAILURE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteCard = (id) => ({
|
const deleteCard = (id) => ({
|
||||||
type: ActionTypes.CARD_DELETE,
|
type: ActionTypes.CARD_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -89,11 +121,21 @@ const handleCardDelete = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const filterText = (boardId, text) => ({
|
||||||
|
type: ActionTypes.TEXT_FILTER_IN_CURRENT_BOARD,
|
||||||
|
payload: {
|
||||||
|
boardId,
|
||||||
|
text,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createCard,
|
createCard,
|
||||||
handleCardCreate,
|
handleCardCreate,
|
||||||
updateCard,
|
updateCard,
|
||||||
handleCardUpdate,
|
handleCardUpdate,
|
||||||
|
duplicateCard,
|
||||||
deleteCard,
|
deleteCard,
|
||||||
handleCardDelete,
|
handleCardDelete,
|
||||||
|
filterText,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -39,9 +39,19 @@ const initializeCore = (
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const logout = () => ({
|
// TODO: with success?
|
||||||
|
initializeCore.fetchConfig = (config) => ({
|
||||||
|
type: ActionTypes.CORE_INITIALIZE__CONFIG_FETCH,
|
||||||
|
payload: {
|
||||||
|
config,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const logout = (invalidateAccessToken) => ({
|
||||||
type: ActionTypes.LOGOUT,
|
type: ActionTypes.LOGOUT,
|
||||||
payload: {},
|
payload: {
|
||||||
|
invalidateAccessToken,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
logout.invalidateAccessToken = () => ({
|
logout.invalidateAccessToken = () => ({
|
||||||
|
|||||||
@@ -60,6 +60,38 @@ const handleListUpdate = (list) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const sortList = (id, data) => ({
|
||||||
|
type: ActionTypes.LIST_SORT,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
sortList.success = (list, cards) => ({
|
||||||
|
type: ActionTypes.LIST_SORT__SUCCESS,
|
||||||
|
payload: {
|
||||||
|
list,
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
sortList.failure = (id, error) => ({
|
||||||
|
type: ActionTypes.LIST_SORT__FAILURE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleListSort = (list, cards) => ({
|
||||||
|
type: ActionTypes.LIST_SORT_HANDLE,
|
||||||
|
payload: {
|
||||||
|
list,
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteList = (id) => ({
|
const deleteList = (id) => ({
|
||||||
type: ActionTypes.LIST_DELETE,
|
type: ActionTypes.LIST_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -94,6 +126,8 @@ export default {
|
|||||||
handleListCreate,
|
handleListCreate,
|
||||||
updateList,
|
updateList,
|
||||||
handleListUpdate,
|
handleListUpdate,
|
||||||
|
sortList,
|
||||||
|
handleListSort,
|
||||||
deleteList,
|
deleteList,
|
||||||
handleListDelete,
|
handleListDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
import ActionTypes from '../constants/ActionTypes';
|
import ActionTypes from '../constants/ActionTypes';
|
||||||
|
|
||||||
|
const initializeLogin = (config) => ({
|
||||||
|
type: ActionTypes.LOGIN_INITIALIZE,
|
||||||
|
payload: {
|
||||||
|
config,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const authenticate = (data) => ({
|
const authenticate = (data) => ({
|
||||||
type: ActionTypes.AUTHENTICATE,
|
type: ActionTypes.AUTHENTICATE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -21,12 +28,33 @@ authenticate.failure = (error) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const authenticateUsingOidc = () => ({
|
||||||
|
type: ActionTypes.USING_OIDC_AUTHENTICATE,
|
||||||
|
payload: {},
|
||||||
|
});
|
||||||
|
|
||||||
|
authenticateUsingOidc.success = (accessToken) => ({
|
||||||
|
type: ActionTypes.USING_OIDC_AUTHENTICATE__SUCCESS,
|
||||||
|
payload: {
|
||||||
|
accessToken,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
authenticateUsingOidc.failure = (error) => ({
|
||||||
|
type: ActionTypes.USING_OIDC_AUTHENTICATE__FAILURE,
|
||||||
|
payload: {
|
||||||
|
error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const clearAuthenticateError = () => ({
|
const clearAuthenticateError = () => ({
|
||||||
type: ActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
type: ActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
||||||
payload: {},
|
payload: {},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
initializeLogin,
|
||||||
authenticate,
|
authenticate,
|
||||||
|
authenticateUsingOidc,
|
||||||
clearAuthenticateError,
|
clearAuthenticateError,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,10 +5,14 @@ import socket from './socket';
|
|||||||
|
|
||||||
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
|
const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
|
||||||
|
|
||||||
|
const exchangeForAccessTokenUsingOidc = (data, headers) =>
|
||||||
|
http.post('/access-tokens/exchange-using-oidc', data, headers);
|
||||||
|
|
||||||
const deleteCurrentAccessToken = (headers) =>
|
const deleteCurrentAccessToken = (headers) =>
|
||||||
socket.delete('/access-tokens/me', undefined, headers);
|
socket.delete('/access-tokens/me', undefined, headers);
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createAccessToken,
|
createAccessToken,
|
||||||
|
exchangeForAccessTokenUsingOidc,
|
||||||
deleteCurrentAccessToken,
|
deleteCurrentAccessToken,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -57,6 +57,12 @@ const updateCard = (id, data, headers) =>
|
|||||||
item: transformCard(body.item),
|
item: transformCard(body.item),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const duplicateCard = (id, data, headers) =>
|
||||||
|
socket.post(`/cards/${id}/duplicate`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
item: transformCard(body.item),
|
||||||
|
}));
|
||||||
|
|
||||||
const deleteCard = (id, headers) =>
|
const deleteCard = (id, headers) =>
|
||||||
socket.delete(`/cards/${id}`, undefined, headers).then((body) => ({
|
socket.delete(`/cards/${id}`, undefined, headers).then((body) => ({
|
||||||
...body,
|
...body,
|
||||||
@@ -81,6 +87,7 @@ export default {
|
|||||||
getCard,
|
getCard,
|
||||||
updateCard,
|
updateCard,
|
||||||
deleteCard,
|
deleteCard,
|
||||||
|
duplicateCard,
|
||||||
makeHandleCardCreate,
|
makeHandleCardCreate,
|
||||||
makeHandleCardUpdate,
|
makeHandleCardUpdate,
|
||||||
makeHandleCardDelete,
|
makeHandleCardDelete,
|
||||||
|
|||||||
@@ -5,13 +5,15 @@ import Config from '../constants/Config';
|
|||||||
const http = {};
|
const http = {};
|
||||||
|
|
||||||
// TODO: add all methods
|
// TODO: add all methods
|
||||||
['POST'].forEach((method) => {
|
['GET', 'POST'].forEach((method) => {
|
||||||
http[method.toLowerCase()] = (url, data, headers) => {
|
http[method.toLowerCase()] = (url, data, headers) => {
|
||||||
const formData = Object.keys(data).reduce((result, key) => {
|
const formData =
|
||||||
result.append(key, data[key]);
|
data &&
|
||||||
|
Object.keys(data).reduce((result, key) => {
|
||||||
|
result.append(key, data[key]);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}, new FormData());
|
}, new FormData());
|
||||||
|
|
||||||
return fetch(`${Config.SERVER_BASE_URL}/api${url}`, {
|
return fetch(`${Config.SERVER_BASE_URL}/api${url}`, {
|
||||||
method,
|
method,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import http from './http';
|
import http from './http';
|
||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import root from './root';
|
||||||
import accessTokens from './access-tokens';
|
import accessTokens from './access-tokens';
|
||||||
import users from './users';
|
import users from './users';
|
||||||
import projects from './projects';
|
import projects from './projects';
|
||||||
@@ -20,6 +21,7 @@ import notifications from './notifications';
|
|||||||
export { http, socket };
|
export { http, socket };
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
...root,
|
||||||
...accessTokens,
|
...accessTokens,
|
||||||
...users,
|
...users,
|
||||||
...projects,
|
...projects,
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import socket from './socket';
|
import socket from './socket';
|
||||||
|
import { transformCard } from './cards';
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
|
|
||||||
@@ -7,10 +8,33 @@ const createList = (boardId, data, headers) =>
|
|||||||
|
|
||||||
const updateList = (id, data, headers) => socket.patch(`/lists/${id}`, data, headers);
|
const updateList = (id, data, headers) => socket.patch(`/lists/${id}`, data, headers);
|
||||||
|
|
||||||
|
const sortList = (id, data, headers) =>
|
||||||
|
socket.post(`/lists/${id}/sort`, data, headers).then((body) => ({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
cards: body.included.cards.map(transformCard),
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
const deleteList = (id, headers) => socket.delete(`/lists/${id}`, undefined, headers);
|
const deleteList = (id, headers) => socket.delete(`/lists/${id}`, undefined, headers);
|
||||||
|
|
||||||
|
/* Event handlers */
|
||||||
|
|
||||||
|
const makeHandleListSort = (next) => (body) => {
|
||||||
|
next({
|
||||||
|
...body,
|
||||||
|
included: {
|
||||||
|
...body.included,
|
||||||
|
cards: body.included.cards.map(transformCard),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createList,
|
createList,
|
||||||
updateList,
|
updateList,
|
||||||
|
sortList,
|
||||||
deleteList,
|
deleteList,
|
||||||
|
makeHandleListSort,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import http from './http';
|
||||||
|
|
||||||
|
/* Actions */
|
||||||
|
|
||||||
|
const getConfig = (headers) => http.get('/config', undefined, headers);
|
||||||
|
|
||||||
|
export default {
|
||||||
|
getConfig,
|
||||||
|
};
|
||||||
+2337
File diff suppressed because it is too large
Load Diff
+4
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 434 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -13,6 +13,7 @@ const BoardActions = React.memo(
|
|||||||
labels,
|
labels,
|
||||||
filterUsers,
|
filterUsers,
|
||||||
filterLabels,
|
filterLabels,
|
||||||
|
filterText,
|
||||||
allUsers,
|
allUsers,
|
||||||
canEdit,
|
canEdit,
|
||||||
canEditMemberships,
|
canEditMemberships,
|
||||||
@@ -27,6 +28,7 @@ const BoardActions = React.memo(
|
|||||||
onLabelUpdate,
|
onLabelUpdate,
|
||||||
onLabelMove,
|
onLabelMove,
|
||||||
onLabelDelete,
|
onLabelDelete,
|
||||||
|
onTextFilterUpdate,
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
<div className={styles.wrapper}>
|
<div className={styles.wrapper}>
|
||||||
@@ -46,6 +48,7 @@ const BoardActions = React.memo(
|
|||||||
<Filters
|
<Filters
|
||||||
users={filterUsers}
|
users={filterUsers}
|
||||||
labels={filterLabels}
|
labels={filterLabels}
|
||||||
|
filterText={filterText}
|
||||||
allBoardMemberships={memberships}
|
allBoardMemberships={memberships}
|
||||||
allLabels={labels}
|
allLabels={labels}
|
||||||
canEdit={canEdit}
|
canEdit={canEdit}
|
||||||
@@ -57,6 +60,7 @@ const BoardActions = React.memo(
|
|||||||
onLabelUpdate={onLabelUpdate}
|
onLabelUpdate={onLabelUpdate}
|
||||||
onLabelMove={onLabelMove}
|
onLabelMove={onLabelMove}
|
||||||
onLabelDelete={onLabelDelete}
|
onLabelDelete={onLabelDelete}
|
||||||
|
onTextFilterUpdate={onTextFilterUpdate}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -71,6 +75,7 @@ BoardActions.propTypes = {
|
|||||||
labels: PropTypes.array.isRequired,
|
labels: PropTypes.array.isRequired,
|
||||||
filterUsers: PropTypes.array.isRequired,
|
filterUsers: PropTypes.array.isRequired,
|
||||||
filterLabels: PropTypes.array.isRequired,
|
filterLabels: PropTypes.array.isRequired,
|
||||||
|
filterText: PropTypes.string.isRequired,
|
||||||
allUsers: PropTypes.array.isRequired,
|
allUsers: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
canEdit: PropTypes.bool.isRequired,
|
canEdit: PropTypes.bool.isRequired,
|
||||||
@@ -86,6 +91,7 @@ BoardActions.propTypes = {
|
|||||||
onLabelUpdate: PropTypes.func.isRequired,
|
onLabelUpdate: PropTypes.func.isRequired,
|
||||||
onLabelMove: PropTypes.func.isRequired,
|
onLabelMove: PropTypes.func.isRequired,
|
||||||
onLabelDelete: PropTypes.func.isRequired,
|
onLabelDelete: PropTypes.func.isRequired,
|
||||||
|
onTextFilterUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BoardActions;
|
export default BoardActions;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import React, { useCallback } from 'react';
|
import React, { useCallback, useRef, useState } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Icon } from 'semantic-ui-react';
|
||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
|
import { Input } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import User from '../User';
|
import User from '../User';
|
||||||
import Label from '../Label';
|
import Label from '../Label';
|
||||||
@@ -14,6 +17,7 @@ const Filters = React.memo(
|
|||||||
({
|
({
|
||||||
users,
|
users,
|
||||||
labels,
|
labels,
|
||||||
|
filterText,
|
||||||
allBoardMemberships,
|
allBoardMemberships,
|
||||||
allLabels,
|
allLabels,
|
||||||
canEdit,
|
canEdit,
|
||||||
@@ -25,8 +29,17 @@ const Filters = React.memo(
|
|||||||
onLabelUpdate,
|
onLabelUpdate,
|
||||||
onLabelMove,
|
onLabelMove,
|
||||||
onLabelDelete,
|
onLabelDelete,
|
||||||
|
onTextFilterUpdate,
|
||||||
}) => {
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
const [isSearchFocused, setIsSearchFocused] = useState(false);
|
||||||
|
|
||||||
|
const searchFieldRef = useRef(null);
|
||||||
|
|
||||||
|
const cancelSearch = useCallback(() => {
|
||||||
|
onTextFilterUpdate('');
|
||||||
|
searchFieldRef.current.blur();
|
||||||
|
}, [onTextFilterUpdate]);
|
||||||
|
|
||||||
const handleRemoveUserClick = useCallback(
|
const handleRemoveUserClick = useCallback(
|
||||||
(id) => {
|
(id) => {
|
||||||
@@ -42,9 +55,39 @@ const Filters = React.memo(
|
|||||||
[onLabelRemove],
|
[onLabelRemove],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleSearchChange = useCallback(
|
||||||
|
(_, { value }) => {
|
||||||
|
onTextFilterUpdate(value);
|
||||||
|
},
|
||||||
|
[onTextFilterUpdate],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleSearchFocus = useCallback(() => {
|
||||||
|
setIsSearchFocused(true);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSearchKeyDown = useCallback(
|
||||||
|
(event) => {
|
||||||
|
if (event.key === 'Escape') {
|
||||||
|
cancelSearch();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[cancelSearch],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleSearchBlur = useCallback(() => {
|
||||||
|
setIsSearchFocused(false);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleCancelSearchClick = useCallback(() => {
|
||||||
|
cancelSearch();
|
||||||
|
}, [cancelSearch]);
|
||||||
|
|
||||||
const BoardMembershipsPopup = usePopup(BoardMembershipsStep);
|
const BoardMembershipsPopup = usePopup(BoardMembershipsStep);
|
||||||
const LabelsPopup = usePopup(LabelsStep);
|
const LabelsPopup = usePopup(LabelsStep);
|
||||||
|
|
||||||
|
const isSearchActive = filterText || isSearchFocused;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span className={styles.filter}>
|
<span className={styles.filter}>
|
||||||
@@ -100,6 +143,25 @@ const Filters = React.memo(
|
|||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</span>
|
</span>
|
||||||
|
<span className={styles.filter}>
|
||||||
|
<Input
|
||||||
|
ref={searchFieldRef}
|
||||||
|
value={filterText}
|
||||||
|
placeholder={t('common.searchCards')}
|
||||||
|
icon={
|
||||||
|
isSearchActive ? (
|
||||||
|
<Icon link name="cancel" onClick={handleCancelSearchClick} />
|
||||||
|
) : (
|
||||||
|
'search'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
className={classNames(styles.search, !isSearchActive && styles.searchInactive)}
|
||||||
|
onFocus={handleSearchFocus}
|
||||||
|
onKeyDown={handleSearchKeyDown}
|
||||||
|
onChange={handleSearchChange}
|
||||||
|
onBlur={handleSearchBlur}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -109,6 +171,7 @@ Filters.propTypes = {
|
|||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
users: PropTypes.array.isRequired,
|
users: PropTypes.array.isRequired,
|
||||||
labels: PropTypes.array.isRequired,
|
labels: PropTypes.array.isRequired,
|
||||||
|
filterText: PropTypes.string.isRequired,
|
||||||
allBoardMemberships: PropTypes.array.isRequired,
|
allBoardMemberships: PropTypes.array.isRequired,
|
||||||
allLabels: PropTypes.array.isRequired,
|
allLabels: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
@@ -121,6 +184,7 @@ Filters.propTypes = {
|
|||||||
onLabelUpdate: PropTypes.func.isRequired,
|
onLabelUpdate: PropTypes.func.isRequired,
|
||||||
onLabelMove: PropTypes.func.isRequired,
|
onLabelMove: PropTypes.func.isRequired,
|
||||||
onLabelDelete: PropTypes.func.isRequired,
|
onLabelDelete: PropTypes.func.isRequired,
|
||||||
|
onTextFilterUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Filters;
|
export default Filters;
|
||||||
|
|||||||
@@ -43,4 +43,32 @@
|
|||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
padding: 2px 12px;
|
padding: 2px 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.search {
|
||||||
|
height: 30px;
|
||||||
|
margin: 0 12px;
|
||||||
|
transition: width 0.2s ease;
|
||||||
|
width: 280px;
|
||||||
|
|
||||||
|
input {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.searchInactive {
|
||||||
|
color: #fff;
|
||||||
|
height: 24px;
|
||||||
|
width: 220px;
|
||||||
|
|
||||||
|
input {
|
||||||
|
background: rgba(0, 0, 0, 0.24);
|
||||||
|
border: none;
|
||||||
|
color: #fff !important;
|
||||||
|
font-size: 12px;
|
||||||
|
|
||||||
|
&::placeholder {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
|
|||||||
@@ -85,7 +85,6 @@
|
|||||||
height: 56px;
|
height: 56px;
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
height: 38px;
|
height: 38px;
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ const ActionsStep = React.memo(
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
onMove,
|
onMove,
|
||||||
onTransfer,
|
onTransfer,
|
||||||
|
onDuplicate,
|
||||||
onDelete,
|
onDelete,
|
||||||
onUserAdd,
|
onUserAdd,
|
||||||
onUserRemove,
|
onUserRemove,
|
||||||
@@ -76,6 +77,11 @@ const ActionsStep = React.memo(
|
|||||||
openStep(StepTypes.MOVE);
|
openStep(StepTypes.MOVE);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
|
|
||||||
|
const handleDuplicateClick = useCallback(() => {
|
||||||
|
onDuplicate();
|
||||||
|
onClose();
|
||||||
|
}, [onDuplicate, onClose]);
|
||||||
|
|
||||||
const handleDeleteClick = useCallback(() => {
|
const handleDeleteClick = useCallback(() => {
|
||||||
openStep(StepTypes.DELETE);
|
openStep(StepTypes.DELETE);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
@@ -207,6 +213,11 @@ const ActionsStep = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
<Menu.Item className={styles.menuItem} onClick={handleDuplicateClick}>
|
||||||
|
{t('action.duplicateCard', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Menu.Item>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
||||||
{t('action.deleteCard', {
|
{t('action.deleteCard', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
@@ -232,6 +243,7 @@ ActionsStep.propTypes = {
|
|||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onMove: PropTypes.func.isRequired,
|
onMove: PropTypes.func.isRequired,
|
||||||
onTransfer: PropTypes.func.isRequired,
|
onTransfer: PropTypes.func.isRequired,
|
||||||
|
onDuplicate: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
onUserAdd: PropTypes.func.isRequired,
|
onUserAdd: PropTypes.func.isRequired,
|
||||||
onUserRemove: PropTypes.func.isRequired,
|
onUserRemove: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ const Card = React.memo(
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
onMove,
|
onMove,
|
||||||
onTransfer,
|
onTransfer,
|
||||||
|
onDuplicate,
|
||||||
onDelete,
|
onDelete,
|
||||||
onUserAdd,
|
onUserAdd,
|
||||||
onUserRemove,
|
onUserRemove,
|
||||||
@@ -185,6 +186,7 @@ const Card = React.memo(
|
|||||||
onUpdate={onUpdate}
|
onUpdate={onUpdate}
|
||||||
onMove={onMove}
|
onMove={onMove}
|
||||||
onTransfer={onTransfer}
|
onTransfer={onTransfer}
|
||||||
|
onDuplicate={onDuplicate}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
onUserAdd={onUserAdd}
|
onUserAdd={onUserAdd}
|
||||||
onUserRemove={onUserRemove}
|
onUserRemove={onUserRemove}
|
||||||
@@ -238,6 +240,7 @@ Card.propTypes = {
|
|||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onMove: PropTypes.func.isRequired,
|
onMove: PropTypes.func.isRequired,
|
||||||
onTransfer: PropTypes.func.isRequired,
|
onTransfer: PropTypes.func.isRequired,
|
||||||
|
onDuplicate: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
onUserAdd: PropTypes.func.isRequired,
|
onUserAdd: PropTypes.func.isRequired,
|
||||||
onUserRemove: PropTypes.func.isRequired,
|
onUserRemove: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import classNames from 'classnames';
|
|||||||
import { Progress } from 'semantic-ui-react';
|
import { Progress } from 'semantic-ui-react';
|
||||||
import { useToggle } from '../../lib/hooks';
|
import { useToggle } from '../../lib/hooks';
|
||||||
|
|
||||||
|
import Linkify from '../Linkify';
|
||||||
|
|
||||||
import styles from './Tasks.module.scss';
|
import styles from './Tasks.module.scss';
|
||||||
|
|
||||||
const Tasks = React.memo(({ items }) => {
|
const Tasks = React.memo(({ items }) => {
|
||||||
@@ -48,7 +50,7 @@ const Tasks = React.memo(({ items }) => {
|
|||||||
key={item.id}
|
key={item.id}
|
||||||
className={classNames(styles.task, item.isCompleted && styles.taskCompleted)}
|
className={classNames(styles.task, item.isCompleted && styles.taskCompleted)}
|
||||||
>
|
>
|
||||||
{item.name}
|
<Linkify linkStopPropagation>{item.name}</Linkify>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -55,8 +55,10 @@
|
|||||||
display: block;
|
display: block;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 14px;
|
line-height: 14px;
|
||||||
|
overflow: hidden;
|
||||||
padding-bottom: 6px;
|
padding-bottom: 6px;
|
||||||
padding-left: 14px;
|
padding-left: 14px;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
content: "–";
|
content: "–";
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import TextareaAutosize from 'react-textarea-autosize';
|
import TextareaAutosize from 'react-textarea-autosize';
|
||||||
import { Button, Form, TextArea } from 'semantic-ui-react';
|
import { Button, Form, TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useClosableForm, useForm } from '../../../hooks';
|
import { useForm } from '../../../hooks';
|
||||||
|
|
||||||
import styles from './CommentEdit.module.scss';
|
import styles from './CommentEdit.module.scss';
|
||||||
|
|
||||||
@@ -35,12 +35,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
text: data.text.trim(),
|
text: data.text.trim(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!cleanData.text) {
|
if (cleanData.text && !dequal(cleanData, defaultData)) {
|
||||||
textField.current.ref.current.select();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!dequal(cleanData, defaultData)) {
|
|
||||||
onUpdate(cleanData);
|
onUpdate(cleanData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,10 +60,9 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
[submit],
|
[submit],
|
||||||
);
|
);
|
||||||
|
|
||||||
const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
|
const handleFieldBlur = useCallback(() => {
|
||||||
close,
|
submit();
|
||||||
isOpened,
|
}, [submit]);
|
||||||
);
|
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
submit();
|
submit();
|
||||||
@@ -99,13 +93,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
onBlur={handleFieldBlur}
|
onBlur={handleFieldBlur}
|
||||||
/>
|
/>
|
||||||
<div className={styles.controls}>
|
<div className={styles.controls}>
|
||||||
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
<Button positive content={t('action.save')} />
|
||||||
<Button
|
|
||||||
positive
|
|
||||||
content={t('action.save')}
|
|
||||||
onMouseOver={handleControlMouseOver}
|
|
||||||
onMouseOut={handleControlMouseOut}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import classNames from 'classnames';
|
|||||||
import { useTranslation, Trans } from 'react-i18next';
|
import { useTranslation, Trans } from 'react-i18next';
|
||||||
import { Comment } from 'semantic-ui-react';
|
import { Comment } from 'semantic-ui-react';
|
||||||
|
|
||||||
|
import getDateFormat from '../../../utils/get-date-format';
|
||||||
import { ActivityTypes } from '../../../constants/Enums';
|
import { ActivityTypes } from '../../../constants/Enums';
|
||||||
import ItemComment from './ItemComment';
|
import ItemComment from './ItemComment';
|
||||||
import User from '../../User';
|
import User from '../../User';
|
||||||
@@ -66,7 +67,7 @@ const Item = React.memo(({ type, data, createdAt, user }) => {
|
|||||||
<div className={classNames(styles.content)}>
|
<div className={classNames(styles.content)}>
|
||||||
<div>{contentNode}</div>
|
<div>{contentNode}</div>
|
||||||
<span className={styles.date}>
|
<span className={styles.date}>
|
||||||
{t('format:longDateTime', {
|
{t(`format:${getDateFormat(createdAt)}`, {
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
value: createdAt,
|
value: createdAt,
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { Comment } from 'semantic-ui-react';
|
|||||||
import { usePopup } from '../../../lib/popup';
|
import { usePopup } from '../../../lib/popup';
|
||||||
import { Markdown } from '../../../lib/custom-ui';
|
import { Markdown } from '../../../lib/custom-ui';
|
||||||
|
|
||||||
|
import getDateFormat from '../../../utils/get-date-format';
|
||||||
import CommentEdit from './CommentEdit';
|
import CommentEdit from './CommentEdit';
|
||||||
import User from '../../User';
|
import User from '../../User';
|
||||||
import DeleteStep from '../../DeleteStep';
|
import DeleteStep from '../../DeleteStep';
|
||||||
@@ -33,7 +34,7 @@ const ItemComment = React.memo(
|
|||||||
<div className={styles.title}>
|
<div className={styles.title}>
|
||||||
<span className={styles.author}>{user.name}</span>
|
<span className={styles.author}>{user.name}</span>
|
||||||
<span className={styles.date}>
|
<span className={styles.date}>
|
||||||
{t('format:longDateTime', {
|
{t(`format:${getDateFormat(createdAt)}`, {
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
value: createdAt,
|
value: createdAt,
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ const AttachmentAddZone = React.memo(({ children, onCreate }) => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
||||||
<div {...getRootProps()} className={styles.wrapper}>
|
<div {...getRootProps()}>
|
||||||
{isDragActive && <div className={styles.dropzone}>{t('common.dropFileToUpload')}</div>}
|
{isDragActive && <div className={styles.dropzone}>{t('common.dropFileToUpload')}</div>}
|
||||||
{children}
|
{children}
|
||||||
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
|
||||||
|
|||||||
@@ -12,8 +12,4 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: 2001;
|
z-index: 2001;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wrapper {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ const CardModal = React.memo(
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
onMove,
|
onMove,
|
||||||
onTransfer,
|
onTransfer,
|
||||||
|
onDuplicate,
|
||||||
onDelete,
|
onDelete,
|
||||||
onUserAdd,
|
onUserAdd,
|
||||||
onUserRemove,
|
onUserRemove,
|
||||||
@@ -140,6 +141,11 @@ const CardModal = React.memo(
|
|||||||
});
|
});
|
||||||
}, [isSubscribed, onUpdate]);
|
}, [isSubscribed, onUpdate]);
|
||||||
|
|
||||||
|
const handleDuplicateClick = useCallback(() => {
|
||||||
|
onDuplicate();
|
||||||
|
onClose();
|
||||||
|
}, [onDuplicate, onClose]);
|
||||||
|
|
||||||
const handleGalleryOpen = useCallback(() => {
|
const handleGalleryOpen = useCallback(() => {
|
||||||
isGalleryOpened.current = true;
|
isGalleryOpened.current = true;
|
||||||
}, []);
|
}, []);
|
||||||
@@ -217,6 +223,7 @@ const CardModal = React.memo(
|
|||||||
onUserSelect={onUserAdd}
|
onUserSelect={onUserAdd}
|
||||||
onUserDeselect={onUserRemove}
|
onUserDeselect={onUserRemove}
|
||||||
>
|
>
|
||||||
|
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
@@ -266,6 +273,7 @@ const CardModal = React.memo(
|
|||||||
onMove={onLabelMove}
|
onMove={onLabelMove}
|
||||||
onDelete={onLabelDelete}
|
onDelete={onLabelDelete}
|
||||||
>
|
>
|
||||||
|
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
@@ -314,10 +322,11 @@ const CardModal = React.memo(
|
|||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
{canEdit && (
|
{canEdit && (
|
||||||
|
// eslint-disable-next-line jsx-a11y/control-has-associated-label
|
||||||
<button
|
<button
|
||||||
onClick={handleToggleStopwatchClick}
|
|
||||||
type="button"
|
type="button"
|
||||||
className={classNames(styles.attachment, styles.dueDate)}
|
className={classNames(styles.attachment, styles.dueDate)}
|
||||||
|
onClick={handleToggleStopwatchClick}
|
||||||
>
|
>
|
||||||
<Icon
|
<Icon
|
||||||
name={stopwatch.startedAt ? 'pause' : 'play'}
|
name={stopwatch.startedAt ? 'pause' : 'play'}
|
||||||
@@ -493,6 +502,10 @@ const CardModal = React.memo(
|
|||||||
{t('action.move')}
|
{t('action.move')}
|
||||||
</Button>
|
</Button>
|
||||||
</CardMovePopup>
|
</CardMovePopup>
|
||||||
|
<Button fluid className={styles.actionButton} onClick={handleDuplicateClick}>
|
||||||
|
<Icon name="copy outline" className={styles.actionIcon} />
|
||||||
|
{t('action.duplicate')}
|
||||||
|
</Button>
|
||||||
<DeletePopup
|
<DeletePopup
|
||||||
title="common.deleteCard"
|
title="common.deleteCard"
|
||||||
content="common.areYouSureYouWantToDeleteThisCard"
|
content="common.areYouSureYouWantToDeleteThisCard"
|
||||||
@@ -552,6 +565,7 @@ CardModal.propTypes = {
|
|||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onMove: PropTypes.func.isRequired,
|
onMove: PropTypes.func.isRequired,
|
||||||
onTransfer: PropTypes.func.isRequired,
|
onTransfer: PropTypes.func.isRequired,
|
||||||
|
onDuplicate: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
onUserAdd: PropTypes.func.isRequired,
|
onUserAdd: PropTypes.func.isRequired,
|
||||||
onUserRemove: PropTypes.func.isRequired,
|
onUserRemove: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
|
|||||||
|
|
||||||
const mdEditorOptions = useMemo(
|
const mdEditorOptions = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
|
autoDownloadFontAwesome: false,
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
spellChecker: false,
|
spellChecker: false,
|
||||||
status: false,
|
status: false,
|
||||||
@@ -100,7 +101,6 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
|
|||||||
onChange={setValue}
|
onChange={setValue}
|
||||||
/>
|
/>
|
||||||
<div className={styles.controls}>
|
<div className={styles.controls}>
|
||||||
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
|
||||||
<Button positive content={t('action.save')} />
|
<Button positive content={t('action.save')} />
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { usePopup } from '../../../lib/popup';
|
|||||||
|
|
||||||
import NameEdit from './NameEdit';
|
import NameEdit from './NameEdit';
|
||||||
import ActionsStep from './ActionsStep';
|
import ActionsStep from './ActionsStep';
|
||||||
|
import Linkify from '../../Linkify';
|
||||||
|
|
||||||
import styles from './Item.module.scss';
|
import styles from './Item.module.scss';
|
||||||
|
|
||||||
@@ -65,7 +66,7 @@ const Item = React.memo(
|
|||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
>
|
>
|
||||||
<span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
|
<span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
|
||||||
{name}
|
<Linkify linkStopPropagation>{name}</Linkify>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
{isPersisted && canEdit && (
|
{isPersisted && canEdit && (
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import TextareaAutosize from 'react-textarea-autosize';
|
import TextareaAutosize from 'react-textarea-autosize';
|
||||||
import { Button, Form, TextArea } from 'semantic-ui-react';
|
import { Button, Form, TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useClosableForm, useField } from '../../../hooks';
|
import { useField } from '../../../hooks';
|
||||||
|
|
||||||
import styles from './NameEdit.module.scss';
|
import styles from './NameEdit.module.scss';
|
||||||
|
|
||||||
@@ -28,12 +28,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
const submit = useCallback(() => {
|
const submit = useCallback(() => {
|
||||||
const cleanValue = value.trim();
|
const cleanValue = value.trim();
|
||||||
|
|
||||||
if (!cleanValue) {
|
if (cleanValue && cleanValue !== defaultValue) {
|
||||||
field.current.ref.current.select();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cleanValue !== defaultValue) {
|
|
||||||
onUpdate(cleanValue);
|
onUpdate(cleanValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,10 +55,9 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
[submit],
|
[submit],
|
||||||
);
|
);
|
||||||
|
|
||||||
const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
|
const handleFieldBlur = useCallback(() => {
|
||||||
close,
|
submit();
|
||||||
isOpened,
|
}, [submit]);
|
||||||
);
|
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
submit();
|
submit();
|
||||||
@@ -93,13 +87,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
onBlur={handleFieldBlur}
|
onBlur={handleFieldBlur}
|
||||||
/>
|
/>
|
||||||
<div className={styles.controls}>
|
<div className={styles.controls}>
|
||||||
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
<Button positive content={t('action.save')} />
|
||||||
<Button
|
|
||||||
positive
|
|
||||||
content={t('action.save')}
|
|
||||||
onMouseOver={handleControlMouseOver}
|
|
||||||
onMouseOut={handleControlMouseOut}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -48,14 +48,21 @@ const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onMove, onDelete
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{items.length > 0 && (
|
{items.length > 0 && (
|
||||||
<Progress
|
<>
|
||||||
autoSuccess
|
<span className={styles.progressWrapper}>
|
||||||
value={completedItems.length}
|
<Progress
|
||||||
total={items.length}
|
autoSuccess
|
||||||
color="blue"
|
value={completedItems.length}
|
||||||
size="tiny"
|
total={items.length}
|
||||||
className={styles.progress}
|
color="blue"
|
||||||
/>
|
size="tiny"
|
||||||
|
className={styles.progress}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
<span className={styles.count}>
|
||||||
|
{completedItems.length}/{items.length}
|
||||||
|
</span>
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
<DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
|
<DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
|
||||||
<Droppable droppableId="tasks" type={DroppableTypes.TASK}>
|
<Droppable droppableId="tasks" type={DroppableTypes.TASK}>
|
||||||
|
|||||||
@@ -3,6 +3,23 @@
|
|||||||
margin: 0 0 16px;
|
margin: 0 0 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.progressWrapper {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 3px 0;
|
||||||
|
vertical-align: top;
|
||||||
|
width: calc(100% - 50px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.count {
|
||||||
|
color: #8c8c8c;
|
||||||
|
display: inline-block;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 14px;
|
||||||
|
text-align: right;
|
||||||
|
vertical-align: top;
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
.taskButton {
|
.taskButton {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import PropTypes from 'prop-types';
|
|||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import getDateFormat from '../../utils/get-date-format';
|
||||||
|
|
||||||
import styles from './DueDate.module.scss';
|
import styles from './DueDate.module.scss';
|
||||||
|
|
||||||
const SIZES = {
|
const SIZES = {
|
||||||
@@ -12,15 +14,27 @@ const SIZES = {
|
|||||||
MEDIUM: 'medium',
|
MEDIUM: 'medium',
|
||||||
};
|
};
|
||||||
|
|
||||||
const FORMATS = {
|
const LONG_DATE_FORMAT_BY_SIZE = {
|
||||||
tiny: 'longDate',
|
tiny: 'longDate',
|
||||||
small: 'longDate',
|
small: 'longDate',
|
||||||
medium: 'longDateTime',
|
medium: 'longDateTime',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const FULL_DATE_FORMAT_BY_SIZE = {
|
||||||
|
tiny: 'fullDate',
|
||||||
|
small: 'fullDate',
|
||||||
|
medium: 'fullDateTime',
|
||||||
|
};
|
||||||
|
|
||||||
const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
|
||||||
|
const dateFormat = getDateFormat(
|
||||||
|
value,
|
||||||
|
LONG_DATE_FORMAT_BY_SIZE[size],
|
||||||
|
FULL_DATE_FORMAT_BY_SIZE[size],
|
||||||
|
);
|
||||||
|
|
||||||
const contentNode = (
|
const contentNode = (
|
||||||
<span
|
<span
|
||||||
className={classNames(
|
className={classNames(
|
||||||
@@ -29,7 +43,7 @@ const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
|||||||
onClick && styles.wrapperHoverable,
|
onClick && styles.wrapperHoverable,
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{t(`format:${FORMATS[size]}`, {
|
{t(`format:${dateFormat}`, {
|
||||||
value,
|
value,
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
})}
|
})}
|
||||||
|
|||||||
@@ -2,11 +2,12 @@ import React, { useCallback } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import { Icon, Menu } from 'semantic-ui-react';
|
import { Button, Icon, Menu } from 'semantic-ui-react';
|
||||||
import { usePopup } from '../../lib/popup';
|
import { usePopup } from '../../lib/popup';
|
||||||
|
|
||||||
import Paths from '../../constants/Paths';
|
import Paths from '../../constants/Paths';
|
||||||
import NotificationsStep from './NotificationsStep';
|
import NotificationsStep from './NotificationsStep';
|
||||||
|
import User from '../User';
|
||||||
import UserStep from '../UserStep';
|
import UserStep from '../UserStep';
|
||||||
|
|
||||||
import styles from './Header.module.scss';
|
import styles from './Header.module.scss';
|
||||||
@@ -55,15 +56,16 @@ const Header = React.memo(
|
|||||||
>
|
>
|
||||||
<Icon fitted name="arrow left" />
|
<Icon fitted name="arrow left" />
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item
|
<Menu.Item className={classNames(styles.item, styles.title)}>
|
||||||
className={classNames(
|
|
||||||
styles.item,
|
|
||||||
canEditProject && styles.itemHoverable,
|
|
||||||
styles.title,
|
|
||||||
)}
|
|
||||||
onClick={handleProjectSettingsClick}
|
|
||||||
>
|
|
||||||
{project.name}
|
{project.name}
|
||||||
|
{canEditProject && (
|
||||||
|
<Button
|
||||||
|
className={classNames(styles.editButton, styles.target)}
|
||||||
|
onClick={handleProjectSettingsClick}
|
||||||
|
>
|
||||||
|
<Icon fitted name="pencil" size="small" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu.Menu>
|
</Menu.Menu>
|
||||||
)}
|
)}
|
||||||
@@ -90,7 +92,8 @@ const Header = React.memo(
|
|||||||
onLogout={onLogout}
|
onLogout={onLogout}
|
||||||
>
|
>
|
||||||
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
|
<Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
|
||||||
{user.name}
|
<span className={styles.userName}>{user.name}</span>
|
||||||
|
<User name={user.name} avatarUrl={user.avatarUrl} size="small" />
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</UserPopup>
|
</UserPopup>
|
||||||
</Menu.Menu>
|
</Menu.Menu>
|
||||||
|
|||||||
@@ -1,4 +1,20 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
|
.editButton {
|
||||||
|
background: transparent;
|
||||||
|
box-shadow: none;
|
||||||
|
color: #fff;
|
||||||
|
font-size: 15px;
|
||||||
|
line-height: 34px;
|
||||||
|
margin-left: 8px;
|
||||||
|
opacity: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: 34px;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.item {
|
.item {
|
||||||
cursor: auto;
|
cursor: auto;
|
||||||
user-select: auto;
|
user-select: auto;
|
||||||
@@ -11,6 +27,10 @@
|
|||||||
&:hover {
|
&:hover {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: rgba(255, 255, 255, 0.9);
|
color: rgba(255, 255, 255, 0.9);
|
||||||
|
|
||||||
|
.target {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,6 +86,10 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.userName {
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
background: rgba(0, 0, 0, 0.24);
|
background: rgba(0, 0, 0, 0.24);
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -49,7 +49,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
import React, { useCallback } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import LinkifyReact from 'linkify-react';
|
||||||
|
|
||||||
|
import history from '../history';
|
||||||
|
|
||||||
|
const Linkify = React.memo(({ children, linkStopPropagation, ...props }) => {
|
||||||
|
const handleLinkClick = useCallback(
|
||||||
|
(event) => {
|
||||||
|
if (linkStopPropagation) {
|
||||||
|
event.stopPropagation();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!event.target.getAttribute('target')) {
|
||||||
|
event.preventDefault();
|
||||||
|
history.push(event.target.href);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[linkStopPropagation],
|
||||||
|
);
|
||||||
|
|
||||||
|
const linkRenderer = useCallback(
|
||||||
|
({ attributes: { href, ...linkProps }, content }) => {
|
||||||
|
let url;
|
||||||
|
try {
|
||||||
|
url = new URL(href, window.location);
|
||||||
|
} catch (error) {} // eslint-disable-line no-empty
|
||||||
|
|
||||||
|
const isSameSite = !!url && url.origin === window.location.origin;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<a
|
||||||
|
{...linkProps} // eslint-disable-line react/jsx-props-no-spreading
|
||||||
|
href={href}
|
||||||
|
target={isSameSite ? undefined : '_blank'}
|
||||||
|
rel={isSameSite ? undefined : 'noreferrer'}
|
||||||
|
onClick={handleLinkClick}
|
||||||
|
>
|
||||||
|
{isSameSite ? url.pathname : content}
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
[handleLinkClick],
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<LinkifyReact
|
||||||
|
{...props} // eslint-disable-line react/jsx-props-no-spreading
|
||||||
|
options={{
|
||||||
|
defaultProtocol: 'https',
|
||||||
|
render: linkRenderer,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</LinkifyReact>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
Linkify.propTypes = {
|
||||||
|
children: PropTypes.string.isRequired,
|
||||||
|
linkStopPropagation: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
Linkify.defaultProps = {
|
||||||
|
linkStopPropagation: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Linkify;
|
||||||
@@ -5,15 +5,17 @@ import { Menu } from 'semantic-ui-react';
|
|||||||
import { Popup } from '../../lib/custom-ui';
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useSteps } from '../../hooks';
|
import { useSteps } from '../../hooks';
|
||||||
|
import ListSortStep from '../ListSortStep';
|
||||||
import DeleteStep from '../DeleteStep';
|
import DeleteStep from '../DeleteStep';
|
||||||
|
|
||||||
import styles from './ActionsStep.module.scss';
|
import styles from './ActionsStep.module.scss';
|
||||||
|
|
||||||
const StepTypes = {
|
const StepTypes = {
|
||||||
DELETE: 'DELETE',
|
DELETE: 'DELETE',
|
||||||
|
SORT: 'SORT',
|
||||||
};
|
};
|
||||||
|
|
||||||
const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) => {
|
const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onSort, onDelete, onClose }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [step, openStep, handleBack] = useSteps();
|
const [step, openStep, handleBack] = useSteps();
|
||||||
|
|
||||||
@@ -27,20 +29,41 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
|
|||||||
onClose();
|
onClose();
|
||||||
}, [onCardAdd, onClose]);
|
}, [onCardAdd, onClose]);
|
||||||
|
|
||||||
|
const handleSortClick = useCallback(() => {
|
||||||
|
openStep(StepTypes.SORT);
|
||||||
|
}, [openStep]);
|
||||||
|
|
||||||
const handleDeleteClick = useCallback(() => {
|
const handleDeleteClick = useCallback(() => {
|
||||||
openStep(StepTypes.DELETE);
|
openStep(StepTypes.DELETE);
|
||||||
}, [openStep]);
|
}, [openStep]);
|
||||||
|
|
||||||
if (step && step.type === StepTypes.DELETE) {
|
const handleSortTypeSelect = useCallback(
|
||||||
return (
|
(type) => {
|
||||||
<DeleteStep
|
onSort({
|
||||||
title="common.deleteList"
|
type,
|
||||||
content="common.areYouSureYouWantToDeleteThisList"
|
});
|
||||||
buttonContent="action.deleteList"
|
|
||||||
onConfirm={onDelete}
|
onClose();
|
||||||
onBack={handleBack}
|
},
|
||||||
/>
|
[onSort, onClose],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (step && step.type) {
|
||||||
|
switch (step.type) {
|
||||||
|
case StepTypes.SORT:
|
||||||
|
return <ListSortStep onTypeSelect={handleSortTypeSelect} onBack={handleBack} />;
|
||||||
|
case StepTypes.DELETE:
|
||||||
|
return (
|
||||||
|
<DeleteStep
|
||||||
|
title="common.deleteList"
|
||||||
|
content="common.areYouSureYouWantToDeleteThisList"
|
||||||
|
buttonContent="action.deleteList"
|
||||||
|
onConfirm={onDelete}
|
||||||
|
onBack={handleBack}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
default:
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -62,6 +85,11 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
<Menu.Item className={styles.menuItem} onClick={handleSortClick}>
|
||||||
|
{t('action.sortList', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Menu.Item>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
||||||
{t('action.deleteList', {
|
{t('action.deleteList', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
@@ -77,6 +105,7 @@ ActionsStep.propTypes = {
|
|||||||
onNameEdit: PropTypes.func.isRequired,
|
onNameEdit: PropTypes.func.isRequired,
|
||||||
onCardAdd: PropTypes.func.isRequired,
|
onCardAdd: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onSort: PropTypes.func.isRequired,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,18 @@ import { ReactComponent as PlusMathIcon } from '../../assets/images/plus-math-ic
|
|||||||
import styles from './List.module.scss';
|
import styles from './List.module.scss';
|
||||||
|
|
||||||
const List = React.memo(
|
const List = React.memo(
|
||||||
({ id, index, name, isPersisted, cardIds, canEdit, onUpdate, onDelete, onCardCreate }) => {
|
({
|
||||||
|
id,
|
||||||
|
index,
|
||||||
|
name,
|
||||||
|
isPersisted,
|
||||||
|
cardIds,
|
||||||
|
canEdit,
|
||||||
|
onUpdate,
|
||||||
|
onDelete,
|
||||||
|
onSort,
|
||||||
|
onCardCreate,
|
||||||
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const [isAddCardOpened, setIsAddCardOpened] = useState(false);
|
const [isAddCardOpened, setIsAddCardOpened] = useState(false);
|
||||||
|
|
||||||
@@ -114,6 +125,7 @@ const List = React.memo(
|
|||||||
onNameEdit={handleNameEdit}
|
onNameEdit={handleNameEdit}
|
||||||
onCardAdd={handleCardAdd}
|
onCardAdd={handleCardAdd}
|
||||||
onDelete={onDelete}
|
onDelete={onDelete}
|
||||||
|
onSort={onSort}
|
||||||
>
|
>
|
||||||
<Button className={classNames(styles.headerButton, styles.target)}>
|
<Button className={classNames(styles.headerButton, styles.target)}>
|
||||||
<Icon fitted name="pencil" size="small" />
|
<Icon fitted name="pencil" size="small" />
|
||||||
@@ -159,6 +171,7 @@ List.propTypes = {
|
|||||||
cardIds: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
cardIds: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
canEdit: PropTypes.bool.isRequired,
|
canEdit: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
|
onSort: PropTypes.func.isRequired,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
onCardCreate: PropTypes.func.isRequired,
|
onCardCreate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
max-height: calc(100vh - 268px);
|
max-height: calc(100vh - 268px);
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
width: 290px;
|
width: 290px;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Menu } from 'semantic-ui-react';
|
||||||
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
import { ListSortTypes } from '../../constants/Enums';
|
||||||
|
|
||||||
|
import styles from './ListSortStep.module.scss';
|
||||||
|
|
||||||
|
const ListSortStep = React.memo(({ onTypeSelect, onBack }) => {
|
||||||
|
const [t] = useTranslation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Popup.Header onBack={onBack}>
|
||||||
|
{t('common.sortList', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
|
<Popup.Content>
|
||||||
|
<Menu secondary vertical className={styles.menu}>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.NAME_ASC)}
|
||||||
|
>
|
||||||
|
{t('common.title')}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.DUE_DATE_ASC)}
|
||||||
|
>
|
||||||
|
{t('common.dueDate')}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.CREATED_AT_ASC)}
|
||||||
|
>
|
||||||
|
{t('common.oldestFirst')}
|
||||||
|
</Menu.Item>
|
||||||
|
<Menu.Item
|
||||||
|
className={styles.menuItem}
|
||||||
|
onClick={() => onTypeSelect(ListSortTypes.CREATED_AT_DESC)}
|
||||||
|
>
|
||||||
|
{t('common.newestFirst')}
|
||||||
|
</Menu.Item>
|
||||||
|
</Menu>
|
||||||
|
</Popup.Content>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
ListSortStep.propTypes = {
|
||||||
|
onTypeSelect: PropTypes.func.isRequired,
|
||||||
|
onBack: PropTypes.func,
|
||||||
|
};
|
||||||
|
|
||||||
|
ListSortStep.defaultProps = {
|
||||||
|
onBack: undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ListSortStep;
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
:global(#app) {
|
||||||
|
.menu {
|
||||||
|
margin: -7px -12px -5px;
|
||||||
|
width: calc(100% + 24px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menuItem {
|
||||||
|
margin: 0;
|
||||||
|
padding-left: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
import ListSortStep from './ListSortStep';
|
||||||
|
|
||||||
|
export default ListSortStep;
|
||||||
@@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Form, Grid, Header, Message } from 'semantic-ui-react';
|
import { Button, Form, Grid, Header, Message } from 'semantic-ui-react';
|
||||||
import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
|
import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
|
||||||
import { Input } from '../../lib/custom-ui';
|
import { Input } from '../../lib/custom-ui';
|
||||||
|
|
||||||
@@ -28,6 +28,21 @@ const createMessage = (error) => {
|
|||||||
type: 'error',
|
type: 'error',
|
||||||
content: 'common.invalidPassword',
|
content: 'common.invalidPassword',
|
||||||
};
|
};
|
||||||
|
case 'Use single sign-on':
|
||||||
|
return {
|
||||||
|
type: 'error',
|
||||||
|
content: 'common.useSingleSignOn',
|
||||||
|
};
|
||||||
|
case 'Email already in use':
|
||||||
|
return {
|
||||||
|
type: 'error',
|
||||||
|
content: 'common.emailAlreadyInUse',
|
||||||
|
};
|
||||||
|
case 'Username already in use':
|
||||||
|
return {
|
||||||
|
type: 'error',
|
||||||
|
content: 'common.usernameAlreadyInUse',
|
||||||
|
};
|
||||||
case 'Failed to fetch':
|
case 'Failed to fetch':
|
||||||
return {
|
return {
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
@@ -47,7 +62,17 @@ const createMessage = (error) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const Login = React.memo(
|
const Login = React.memo(
|
||||||
({ defaultData, isSubmitting, error, onAuthenticate, onMessageDismiss }) => {
|
({
|
||||||
|
defaultData,
|
||||||
|
isSubmitting,
|
||||||
|
isSubmittingUsingOidc,
|
||||||
|
error,
|
||||||
|
withOidc,
|
||||||
|
isOidcEnforced,
|
||||||
|
onAuthenticate,
|
||||||
|
onAuthenticateUsingOidc,
|
||||||
|
onMessageDismiss,
|
||||||
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
const wasSubmitting = usePrevious(isSubmitting);
|
const wasSubmitting = usePrevious(isSubmitting);
|
||||||
|
|
||||||
@@ -83,8 +108,10 @@ const Login = React.memo(
|
|||||||
}, [onAuthenticate, data]);
|
}, [onAuthenticate, data]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
emailOrUsernameField.current.focus();
|
if (!isOidcEnforced) {
|
||||||
}, []);
|
emailOrUsernameField.current.focus();
|
||||||
|
}
|
||||||
|
}, [isOidcEnforced]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (wasSubmitting && !isSubmitting && error) {
|
if (wasSubmitting && !isSubmitting && error) {
|
||||||
@@ -135,42 +162,58 @@ const Login = React.memo(
|
|||||||
onDismiss={onMessageDismiss}
|
onDismiss={onMessageDismiss}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<Form size="large" onSubmit={handleSubmit}>
|
{!isOidcEnforced && (
|
||||||
<div className={styles.inputWrapper}>
|
<Form size="large" onSubmit={handleSubmit}>
|
||||||
<div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
|
<div className={styles.inputWrapper}>
|
||||||
<Input
|
<div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
|
||||||
fluid
|
<Input
|
||||||
ref={emailOrUsernameField}
|
fluid
|
||||||
name="emailOrUsername"
|
ref={emailOrUsernameField}
|
||||||
value={data.emailOrUsername}
|
name="emailOrUsername"
|
||||||
readOnly={isSubmitting}
|
value={data.emailOrUsername}
|
||||||
className={styles.input}
|
readOnly={isSubmitting}
|
||||||
onChange={handleFieldChange}
|
className={styles.input}
|
||||||
|
onChange={handleFieldChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className={styles.inputWrapper}>
|
||||||
|
<div className={styles.inputLabel}>{t('common.password')}</div>
|
||||||
|
<Input.Password
|
||||||
|
fluid
|
||||||
|
ref={passwordField}
|
||||||
|
name="password"
|
||||||
|
value={data.password}
|
||||||
|
readOnly={isSubmitting}
|
||||||
|
className={styles.input}
|
||||||
|
onChange={handleFieldChange}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<Form.Button
|
||||||
|
primary
|
||||||
|
size="large"
|
||||||
|
icon="right arrow"
|
||||||
|
labelPosition="right"
|
||||||
|
content={t('action.logIn')}
|
||||||
|
floated="right"
|
||||||
|
loading={isSubmitting}
|
||||||
|
disabled={isSubmitting || isSubmittingUsingOidc}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Form>
|
||||||
<div className={styles.inputWrapper}>
|
)}
|
||||||
<div className={styles.inputLabel}>{t('common.password')}</div>
|
{withOidc && (
|
||||||
<Input.Password
|
<Button
|
||||||
fluid
|
type="button"
|
||||||
ref={passwordField}
|
fluid={isOidcEnforced}
|
||||||
name="password"
|
primary={isOidcEnforced}
|
||||||
value={data.password}
|
size={isOidcEnforced ? 'large' : undefined}
|
||||||
readOnly={isSubmitting}
|
icon={isOidcEnforced ? 'right arrow' : undefined}
|
||||||
className={styles.input}
|
labelPosition={isOidcEnforced ? 'right' : undefined}
|
||||||
onChange={handleFieldChange}
|
content={t('action.logInWithSSO')}
|
||||||
/>
|
loading={isSubmittingUsingOidc}
|
||||||
</div>
|
disabled={isSubmitting || isSubmittingUsingOidc}
|
||||||
<Form.Button
|
onClick={onAuthenticateUsingOidc}
|
||||||
primary
|
|
||||||
size="large"
|
|
||||||
icon="right arrow"
|
|
||||||
labelPosition="right"
|
|
||||||
content={t('action.logIn')}
|
|
||||||
floated="right"
|
|
||||||
loading={isSubmitting}
|
|
||||||
disabled={isSubmitting}
|
|
||||||
/>
|
/>
|
||||||
</Form>
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Grid.Column>
|
</Grid.Column>
|
||||||
@@ -201,10 +244,16 @@ const Login = React.memo(
|
|||||||
);
|
);
|
||||||
|
|
||||||
Login.propTypes = {
|
Login.propTypes = {
|
||||||
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
/* eslint-disable react/forbid-prop-types */
|
||||||
|
defaultData: PropTypes.object.isRequired,
|
||||||
|
/* eslint-enable react/forbid-prop-types */
|
||||||
isSubmitting: PropTypes.bool.isRequired,
|
isSubmitting: PropTypes.bool.isRequired,
|
||||||
|
isSubmittingUsingOidc: PropTypes.bool.isRequired,
|
||||||
error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
|
withOidc: PropTypes.bool.isRequired,
|
||||||
|
isOidcEnforced: PropTypes.bool.isRequired,
|
||||||
onAuthenticate: PropTypes.func.isRequired,
|
onAuthenticate: PropTypes.func.isRequired,
|
||||||
|
onAuthenticateUsingOidc: PropTypes.func.isRequired,
|
||||||
onMessageDismiss: PropTypes.func.isRequired,
|
onMessageDismiss: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { Loader } from 'semantic-ui-react';
|
||||||
|
|
||||||
|
import LoginContainer from '../containers/LoginContainer';
|
||||||
|
|
||||||
|
const LoginWrapper = React.memo(({ isInitializing }) => {
|
||||||
|
if (isInitializing) {
|
||||||
|
return <Loader active size="massive" />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return <LoginContainer />;
|
||||||
|
});
|
||||||
|
|
||||||
|
LoginWrapper.propTypes = {
|
||||||
|
isInitializing: PropTypes.bool.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default LoginWrapper;
|
||||||
@@ -3,6 +3,7 @@ import React, { useCallback } from 'react';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Button } from 'semantic-ui-react';
|
import { Button } from 'semantic-ui-react';
|
||||||
|
import { Popup } from '../../lib/custom-ui';
|
||||||
|
|
||||||
import { useSteps } from '../../hooks';
|
import { useSteps } from '../../hooks';
|
||||||
import User from '../User';
|
import User from '../User';
|
||||||
@@ -19,6 +20,7 @@ const ActionsStep = React.memo(
|
|||||||
({
|
({
|
||||||
membership,
|
membership,
|
||||||
permissionsSelectStep,
|
permissionsSelectStep,
|
||||||
|
title,
|
||||||
leaveButtonContent,
|
leaveButtonContent,
|
||||||
leaveConfirmationTitle,
|
leaveConfirmationTitle,
|
||||||
leaveConfirmationContent,
|
leaveConfirmationContent,
|
||||||
@@ -31,6 +33,7 @@ const ActionsStep = React.memo(
|
|||||||
canLeave,
|
canLeave,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
onDelete,
|
onDelete,
|
||||||
|
onBack,
|
||||||
onClose,
|
onClose,
|
||||||
}) => {
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
@@ -53,6 +56,11 @@ const ActionsStep = React.memo(
|
|||||||
[onUpdate],
|
[onUpdate],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleDeleteConfirm = useCallback(() => {
|
||||||
|
onDelete();
|
||||||
|
onClose();
|
||||||
|
}, [onDelete, onClose]);
|
||||||
|
|
||||||
if (step) {
|
if (step) {
|
||||||
switch (step.type) {
|
switch (step.type) {
|
||||||
case StepTypes.EDIT_PERMISSIONS: {
|
case StepTypes.EDIT_PERMISSIONS: {
|
||||||
@@ -81,7 +89,7 @@ const ActionsStep = React.memo(
|
|||||||
? leaveConfirmationButtonContent
|
? leaveConfirmationButtonContent
|
||||||
: deleteConfirmationButtonContent
|
: deleteConfirmationButtonContent
|
||||||
}
|
}
|
||||||
onConfirm={onDelete}
|
onConfirm={handleDeleteConfirm}
|
||||||
onBack={handleBack}
|
onBack={handleBack}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@@ -89,7 +97,7 @@ const ActionsStep = React.memo(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
const contentNode = (
|
||||||
<>
|
<>
|
||||||
<span className={styles.user}>
|
<span className={styles.user}>
|
||||||
<User name={membership.user.name} avatarUrl={membership.user.avatarUrl} size="large" />
|
<User name={membership.user.name} avatarUrl={membership.user.avatarUrl} size="large" />
|
||||||
@@ -125,12 +133,26 @@ const ActionsStep = React.memo(
|
|||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
return onBack ? (
|
||||||
|
<>
|
||||||
|
<Popup.Header onBack={onBack}>
|
||||||
|
{t(title, {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Popup.Header>
|
||||||
|
<Popup.Content>{contentNode}</Popup.Content>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
contentNode
|
||||||
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
ActionsStep.propTypes = {
|
ActionsStep.propTypes = {
|
||||||
membership: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
membership: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
permissionsSelectStep: PropTypes.elementType,
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
|
title: PropTypes.string,
|
||||||
leaveButtonContent: PropTypes.string,
|
leaveButtonContent: PropTypes.string,
|
||||||
leaveConfirmationTitle: PropTypes.string,
|
leaveConfirmationTitle: PropTypes.string,
|
||||||
leaveConfirmationContent: PropTypes.string,
|
leaveConfirmationContent: PropTypes.string,
|
||||||
@@ -143,11 +165,13 @@ ActionsStep.propTypes = {
|
|||||||
canLeave: PropTypes.bool.isRequired,
|
canLeave: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func,
|
onUpdate: PropTypes.func,
|
||||||
onDelete: PropTypes.func.isRequired,
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onBack: PropTypes.func,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
ActionsStep.defaultProps = {
|
ActionsStep.defaultProps = {
|
||||||
permissionsSelectStep: undefined,
|
permissionsSelectStep: undefined,
|
||||||
|
title: 'common.memberActions',
|
||||||
leaveButtonContent: 'action.leaveBoard',
|
leaveButtonContent: 'action.leaveBoard',
|
||||||
leaveConfirmationTitle: 'common.leaveBoard',
|
leaveConfirmationTitle: 'common.leaveBoard',
|
||||||
leaveConfirmationContent: 'common.areYouSureYouWantToLeaveBoard',
|
leaveConfirmationContent: 'common.areYouSureYouWantToLeaveBoard',
|
||||||
@@ -157,6 +181,7 @@ ActionsStep.defaultProps = {
|
|||||||
deleteConfirmationContent: 'common.areYouSureYouWantToRemoveThisMemberFromBoard',
|
deleteConfirmationContent: 'common.areYouSureYouWantToRemoveThisMemberFromBoard',
|
||||||
deleteConfirmationButtonContent: 'action.removeMember',
|
deleteConfirmationButtonContent: 'action.removeMember',
|
||||||
onUpdate: undefined,
|
onUpdate: undefined,
|
||||||
|
onBack: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ActionsStep;
|
export default ActionsStep;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
max-height: 60vh;
|
max-height: 60vh;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
scrollbar-width: thin;
|
|
||||||
|
|
||||||
&::-webkit-scrollbar {
|
&::-webkit-scrollbar {
|
||||||
width: 5px;
|
width: 5px;
|
||||||
|
|||||||
@@ -5,16 +5,21 @@ import { usePopup } from '../../lib/popup';
|
|||||||
|
|
||||||
import AddStep from './AddStep';
|
import AddStep from './AddStep';
|
||||||
import ActionsStep from './ActionsStep';
|
import ActionsStep from './ActionsStep';
|
||||||
|
import MembershipsStep from './MembershipsStep';
|
||||||
import User from '../User';
|
import User from '../User';
|
||||||
|
|
||||||
import styles from './Memberships.module.scss';
|
import styles from './Memberships.module.scss';
|
||||||
|
|
||||||
|
const MAX_MEMBERS = 6;
|
||||||
|
|
||||||
const Memberships = React.memo(
|
const Memberships = React.memo(
|
||||||
({
|
({
|
||||||
items,
|
items,
|
||||||
allUsers,
|
allUsers,
|
||||||
permissionsSelectStep,
|
permissionsSelectStep,
|
||||||
|
title,
|
||||||
addTitle,
|
addTitle,
|
||||||
|
actionsTitle,
|
||||||
leaveButtonContent,
|
leaveButtonContent,
|
||||||
leaveConfirmationTitle,
|
leaveConfirmationTitle,
|
||||||
leaveConfirmationContent,
|
leaveConfirmationContent,
|
||||||
@@ -31,11 +36,14 @@ const Memberships = React.memo(
|
|||||||
}) => {
|
}) => {
|
||||||
const AddPopup = usePopup(AddStep);
|
const AddPopup = usePopup(AddStep);
|
||||||
const ActionsPopup = usePopup(ActionsStep);
|
const ActionsPopup = usePopup(ActionsStep);
|
||||||
|
const MembershipsPopup = usePopup(MembershipsStep);
|
||||||
|
|
||||||
|
const remainMembersCount = items.length - MAX_MEMBERS;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span className={styles.users}>
|
<span className={styles.users}>
|
||||||
{items.map((item) => (
|
{items.slice(0, MAX_MEMBERS).map((item) => (
|
||||||
<span key={item.id} className={styles.user}>
|
<span key={item.id} className={styles.user}>
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
membership={item}
|
membership={item}
|
||||||
@@ -63,6 +71,30 @@ const Memberships = React.memo(
|
|||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</span>
|
</span>
|
||||||
|
{remainMembersCount > 0 && (
|
||||||
|
<MembershipsPopup
|
||||||
|
items={items}
|
||||||
|
permissionsSelectStep={permissionsSelectStep}
|
||||||
|
title={title}
|
||||||
|
actionsTitle={actionsTitle}
|
||||||
|
leaveButtonContent={leaveButtonContent}
|
||||||
|
leaveConfirmationTitle={leaveConfirmationTitle}
|
||||||
|
leaveConfirmationContent={leaveConfirmationContent}
|
||||||
|
leaveConfirmationButtonContent={leaveConfirmationButtonContent}
|
||||||
|
deleteButtonContent={deleteButtonContent}
|
||||||
|
deleteConfirmationTitle={deleteConfirmationTitle}
|
||||||
|
deleteConfirmationContent={deleteConfirmationContent}
|
||||||
|
deleteConfirmationButtonContent={deleteConfirmationButtonContent}
|
||||||
|
canEdit={canEdit}
|
||||||
|
canLeave={items.length > 1 || canLeaveIfLast}
|
||||||
|
onUpdate={onUpdate}
|
||||||
|
onDelete={onDelete}
|
||||||
|
>
|
||||||
|
<Button icon className={styles.addUser}>
|
||||||
|
+{remainMembersCount < 99 ? remainMembersCount : 99}
|
||||||
|
</Button>
|
||||||
|
</MembershipsPopup>
|
||||||
|
)}
|
||||||
{canEdit && (
|
{canEdit && (
|
||||||
<AddPopup
|
<AddPopup
|
||||||
users={allUsers}
|
users={allUsers}
|
||||||
@@ -85,7 +117,9 @@ Memberships.propTypes = {
|
|||||||
allUsers: PropTypes.array.isRequired,
|
allUsers: PropTypes.array.isRequired,
|
||||||
/* eslint-enable react/forbid-prop-types */
|
/* eslint-enable react/forbid-prop-types */
|
||||||
permissionsSelectStep: PropTypes.elementType,
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
|
title: PropTypes.string,
|
||||||
addTitle: PropTypes.string,
|
addTitle: PropTypes.string,
|
||||||
|
actionsTitle: PropTypes.string,
|
||||||
leaveButtonContent: PropTypes.string,
|
leaveButtonContent: PropTypes.string,
|
||||||
leaveConfirmationTitle: PropTypes.string,
|
leaveConfirmationTitle: PropTypes.string,
|
||||||
leaveConfirmationContent: PropTypes.string,
|
leaveConfirmationContent: PropTypes.string,
|
||||||
@@ -103,7 +137,9 @@ Memberships.propTypes = {
|
|||||||
|
|
||||||
Memberships.defaultProps = {
|
Memberships.defaultProps = {
|
||||||
permissionsSelectStep: undefined,
|
permissionsSelectStep: undefined,
|
||||||
|
title: undefined,
|
||||||
addTitle: undefined,
|
addTitle: undefined,
|
||||||
|
actionsTitle: undefined,
|
||||||
leaveButtonContent: undefined,
|
leaveButtonContent: undefined,
|
||||||
leaveConfirmationTitle: undefined,
|
leaveConfirmationTitle: undefined,
|
||||||
leaveConfirmationContent: undefined,
|
leaveConfirmationContent: undefined,
|
||||||
|
|||||||
@@ -0,0 +1,121 @@
|
|||||||
|
import React, { useCallback } from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
|
||||||
|
import { useSteps } from '../../hooks';
|
||||||
|
import ActionsStep from './ActionsStep';
|
||||||
|
import BoardMembershipsStep from '../BoardMembershipsStep';
|
||||||
|
|
||||||
|
const StepTypes = {
|
||||||
|
EDIT: 'EDIT',
|
||||||
|
};
|
||||||
|
|
||||||
|
const MembershipsStep = React.memo(
|
||||||
|
({
|
||||||
|
items,
|
||||||
|
permissionsSelectStep,
|
||||||
|
title,
|
||||||
|
actionsTitle,
|
||||||
|
leaveButtonContent,
|
||||||
|
leaveConfirmationTitle,
|
||||||
|
leaveConfirmationContent,
|
||||||
|
leaveConfirmationButtonContent,
|
||||||
|
deleteButtonContent,
|
||||||
|
deleteConfirmationTitle,
|
||||||
|
deleteConfirmationContent,
|
||||||
|
deleteConfirmationButtonContent,
|
||||||
|
canEdit,
|
||||||
|
canLeave,
|
||||||
|
onUpdate,
|
||||||
|
onDelete,
|
||||||
|
onClose,
|
||||||
|
}) => {
|
||||||
|
const [step, openStep, handleBack] = useSteps();
|
||||||
|
|
||||||
|
const handleUserSelect = useCallback(
|
||||||
|
(userId) => {
|
||||||
|
openStep(StepTypes.EDIT, {
|
||||||
|
userId,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[openStep],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (step && step.type === StepTypes.EDIT) {
|
||||||
|
const currentItem = items.find((item) => item.userId === step.params.userId);
|
||||||
|
|
||||||
|
if (currentItem) {
|
||||||
|
return (
|
||||||
|
<ActionsStep
|
||||||
|
membership={currentItem}
|
||||||
|
permissionsSelectStep={permissionsSelectStep}
|
||||||
|
title={actionsTitle}
|
||||||
|
leaveButtonContent={leaveButtonContent}
|
||||||
|
leaveConfirmationTitle={leaveConfirmationTitle}
|
||||||
|
leaveConfirmationContent={leaveConfirmationContent}
|
||||||
|
leaveConfirmationButtonContent={leaveConfirmationButtonContent}
|
||||||
|
deleteButtonContent={deleteButtonContent}
|
||||||
|
deleteConfirmationTitle={deleteConfirmationTitle}
|
||||||
|
deleteConfirmationContent={deleteConfirmationContent}
|
||||||
|
deleteConfirmationButtonContent={deleteConfirmationButtonContent}
|
||||||
|
canEdit={canEdit}
|
||||||
|
canLeave={canLeave}
|
||||||
|
onUpdate={(data) => onUpdate(currentItem.id, data)}
|
||||||
|
onDelete={() => onDelete(currentItem.id)}
|
||||||
|
onBack={handleBack}
|
||||||
|
onClose={onClose}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
openStep(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
// FIXME: hack
|
||||||
|
<BoardMembershipsStep
|
||||||
|
items={items}
|
||||||
|
currentUserIds={[]}
|
||||||
|
title={title}
|
||||||
|
onUserSelect={handleUserSelect}
|
||||||
|
onUserDeselect={() => {}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
MembershipsStep.propTypes = {
|
||||||
|
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
permissionsSelectStep: PropTypes.elementType,
|
||||||
|
title: PropTypes.string,
|
||||||
|
actionsTitle: PropTypes.string,
|
||||||
|
leaveButtonContent: PropTypes.string,
|
||||||
|
leaveConfirmationTitle: PropTypes.string,
|
||||||
|
leaveConfirmationContent: PropTypes.string,
|
||||||
|
leaveConfirmationButtonContent: PropTypes.string,
|
||||||
|
deleteButtonContent: PropTypes.string,
|
||||||
|
deleteConfirmationTitle: PropTypes.string,
|
||||||
|
deleteConfirmationContent: PropTypes.string,
|
||||||
|
deleteConfirmationButtonContent: PropTypes.string,
|
||||||
|
canEdit: PropTypes.bool.isRequired,
|
||||||
|
canLeave: PropTypes.bool.isRequired,
|
||||||
|
onUpdate: PropTypes.func,
|
||||||
|
onDelete: PropTypes.func.isRequired,
|
||||||
|
onClose: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
MembershipsStep.defaultProps = {
|
||||||
|
permissionsSelectStep: undefined,
|
||||||
|
title: undefined,
|
||||||
|
actionsTitle: undefined,
|
||||||
|
leaveButtonContent: undefined,
|
||||||
|
leaveConfirmationTitle: undefined,
|
||||||
|
leaveConfirmationContent: undefined,
|
||||||
|
leaveConfirmationButtonContent: undefined,
|
||||||
|
deleteButtonContent: undefined,
|
||||||
|
deleteConfirmationTitle: undefined,
|
||||||
|
deleteConfirmationContent: undefined,
|
||||||
|
deleteConfirmationButtonContent: undefined,
|
||||||
|
onUpdate: undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MembershipsStep;
|
||||||
@@ -12,7 +12,9 @@ const ManagersPane = React.memo(({ items, allUsers, onCreate, onDelete }) => {
|
|||||||
<Memberships
|
<Memberships
|
||||||
items={items}
|
items={items}
|
||||||
allUsers={allUsers}
|
allUsers={allUsers}
|
||||||
|
title="common.managers"
|
||||||
addTitle="common.addManager"
|
addTitle="common.addManager"
|
||||||
|
actionsTitle="common.managerActions"
|
||||||
leaveButtonContent="action.leaveProject"
|
leaveButtonContent="action.leaveProject"
|
||||||
leaveConfirmationTitle="common.leaveProject"
|
leaveConfirmationTitle="common.leaveProject"
|
||||||
leaveConfirmationContent="common.areYouSureYouWantToLeaveProject"
|
leaveConfirmationContent="common.areYouSureYouWantToLeaveProject"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { Route, Routes } from 'react-router-dom';
|
|||||||
import { ReduxRouter } from '../lib/redux-router';
|
import { ReduxRouter } from '../lib/redux-router';
|
||||||
|
|
||||||
import Paths from '../constants/Paths';
|
import Paths from '../constants/Paths';
|
||||||
import LoginContainer from '../containers/LoginContainer';
|
import LoginWrapperContainer from '../containers/LoginWrapperContainer';
|
||||||
import CoreContainer from '../containers/CoreContainer';
|
import CoreContainer from '../containers/CoreContainer';
|
||||||
import NotFound from './NotFound';
|
import NotFound from './NotFound';
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ import 'react-datepicker/dist/react-datepicker.css';
|
|||||||
import 'photoswipe/dist/photoswipe.css';
|
import 'photoswipe/dist/photoswipe.css';
|
||||||
import 'easymde/dist/easymde.min.css';
|
import 'easymde/dist/easymde.min.css';
|
||||||
import '../lib/custom-ui/styles.css';
|
import '../lib/custom-ui/styles.css';
|
||||||
|
import '../assets/css/font-awesome.css';
|
||||||
import '../styles.module.scss';
|
import '../styles.module.scss';
|
||||||
|
|
||||||
function Root({ store, history }) {
|
function Root({ store, history }) {
|
||||||
@@ -21,7 +21,8 @@ function Root({ store, history }) {
|
|||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<ReduxRouter history={history}>
|
<ReduxRouter history={history}>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path={Paths.LOGIN} element={<LoginContainer />} />
|
<Route path={Paths.LOGIN} element={<LoginWrapperContainer />} />
|
||||||
|
<Route path={Paths.OIDC_CALLBACK} element={<LoginWrapperContainer />} />
|
||||||
<Route path={Paths.ROOT} element={<CoreContainer />} />
|
<Route path={Paths.ROOT} element={<CoreContainer />} />
|
||||||
<Route path={Paths.PROJECTS} element={<CoreContainer />} />
|
<Route path={Paths.PROJECTS} element={<CoreContainer />} />
|
||||||
<Route path={Paths.BOARDS} element={<CoreContainer />} />
|
<Route path={Paths.BOARDS} element={<CoreContainer />} />
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { dequal } from 'dequal';
|
import { dequal } from 'dequal';
|
||||||
|
import omit from 'lodash/omit';
|
||||||
import pickBy from 'lodash/pickBy';
|
import pickBy from 'lodash/pickBy';
|
||||||
import React, { useCallback, useMemo, useRef } from 'react';
|
import React, { useCallback, useMemo, useRef } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
@@ -9,7 +10,7 @@ import { useForm } from '../../hooks';
|
|||||||
|
|
||||||
import styles from './UserInformationEdit.module.scss';
|
import styles from './UserInformationEdit.module.scss';
|
||||||
|
|
||||||
const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
const UserInformationEdit = React.memo(({ defaultData, isNameEditable, onUpdate }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
|
||||||
const [data, handleFieldChange] = useForm(() => ({
|
const [data, handleFieldChange] = useForm(() => ({
|
||||||
@@ -32,13 +33,17 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
|||||||
const nameField = useRef(null);
|
const nameField = useRef(null);
|
||||||
|
|
||||||
const handleSubmit = useCallback(() => {
|
const handleSubmit = useCallback(() => {
|
||||||
if (!cleanData.name) {
|
if (isNameEditable) {
|
||||||
nameField.current.select();
|
if (!cleanData.name) {
|
||||||
return;
|
nameField.current.select();
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
onUpdate(cleanData);
|
onUpdate(cleanData);
|
||||||
}, [onUpdate, cleanData]);
|
} else {
|
||||||
|
onUpdate(omit(cleanData, 'name'));
|
||||||
|
}
|
||||||
|
}, [isNameEditable, onUpdate, cleanData]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Form onSubmit={handleSubmit}>
|
<Form onSubmit={handleSubmit}>
|
||||||
@@ -48,6 +53,7 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
|||||||
ref={nameField}
|
ref={nameField}
|
||||||
name="name"
|
name="name"
|
||||||
value={data.name}
|
value={data.name}
|
||||||
|
disabled={!isNameEditable}
|
||||||
className={styles.field}
|
className={styles.field}
|
||||||
onChange={handleFieldChange}
|
onChange={handleFieldChange}
|
||||||
/>
|
/>
|
||||||
@@ -74,6 +80,7 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
|
|||||||
|
|
||||||
UserInformationEdit.propTypes = {
|
UserInformationEdit.propTypes = {
|
||||||
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
isNameEditable: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,33 +5,40 @@ import { Popup } from '../lib/custom-ui';
|
|||||||
|
|
||||||
import UserInformationEdit from './UserInformationEdit';
|
import UserInformationEdit from './UserInformationEdit';
|
||||||
|
|
||||||
const UserInformationEditStep = React.memo(({ defaultData, onUpdate, onBack, onClose }) => {
|
const UserInformationEditStep = React.memo(
|
||||||
const [t] = useTranslation();
|
({ defaultData, isNameEditable, onUpdate, onBack, onClose }) => {
|
||||||
|
const [t] = useTranslation();
|
||||||
|
|
||||||
const handleUpdate = useCallback(
|
const handleUpdate = useCallback(
|
||||||
(data) => {
|
(data) => {
|
||||||
onUpdate(data);
|
onUpdate(data);
|
||||||
onClose();
|
onClose();
|
||||||
},
|
},
|
||||||
[onUpdate, onClose],
|
[onUpdate, onClose],
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup.Header onBack={onBack}>
|
<Popup.Header onBack={onBack}>
|
||||||
{t('common.editInformation', {
|
{t('common.editInformation', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Popup.Header>
|
</Popup.Header>
|
||||||
<Popup.Content>
|
<Popup.Content>
|
||||||
<UserInformationEdit defaultData={defaultData} onUpdate={handleUpdate} />
|
<UserInformationEdit
|
||||||
</Popup.Content>
|
defaultData={defaultData}
|
||||||
</>
|
isNameEditable={isNameEditable}
|
||||||
);
|
onUpdate={handleUpdate}
|
||||||
});
|
/>
|
||||||
|
</Popup.Content>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
UserInformationEditStep.propTypes = {
|
UserInformationEditStep.propTypes = {
|
||||||
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
isNameEditable: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onBack: PropTypes.func,
|
onBack: PropTypes.func,
|
||||||
onClose: PropTypes.func.isRequired,
|
onClose: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ const AccountPane = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -74,6 +76,7 @@ const AccountPane = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
organization,
|
organization,
|
||||||
}}
|
}}
|
||||||
|
isNameEditable={!isLocked}
|
||||||
onUpdate={onUpdate}
|
onUpdate={onUpdate}
|
||||||
/>
|
/>
|
||||||
<Divider horizontal section>
|
<Divider horizontal section>
|
||||||
@@ -102,63 +105,73 @@ const AccountPane = React.memo(
|
|||||||
value={language || 'auto'}
|
value={language || 'auto'}
|
||||||
onChange={handleLanguageChange}
|
onChange={handleLanguageChange}
|
||||||
/>
|
/>
|
||||||
<Divider horizontal section>
|
{(!isLocked || !isUsernameLocked) && (
|
||||||
<Header as="h4">
|
<>
|
||||||
{t('common.authentication', {
|
<Divider horizontal section>
|
||||||
context: 'title',
|
<Header as="h4">
|
||||||
})}
|
{t('common.authentication', {
|
||||||
</Header>
|
context: 'title',
|
||||||
</Divider>
|
})}
|
||||||
<div className={styles.action}>
|
</Header>
|
||||||
<UserUsernameEditPopup
|
</Divider>
|
||||||
usePasswordConfirmation
|
{!isUsernameLocked && (
|
||||||
defaultData={usernameUpdateForm.data}
|
<div className={styles.action}>
|
||||||
username={username}
|
<UserUsernameEditPopup
|
||||||
isSubmitting={usernameUpdateForm.isSubmitting}
|
defaultData={usernameUpdateForm.data}
|
||||||
error={usernameUpdateForm.error}
|
username={username}
|
||||||
onUpdate={onUsernameUpdate}
|
isSubmitting={usernameUpdateForm.isSubmitting}
|
||||||
onMessageDismiss={onUsernameUpdateMessageDismiss}
|
error={usernameUpdateForm.error}
|
||||||
>
|
usePasswordConfirmation={!isLocked} // FIXME: hack
|
||||||
<Button className={styles.actionButton}>
|
onUpdate={onUsernameUpdate}
|
||||||
{t('action.editUsername', {
|
onMessageDismiss={onUsernameUpdateMessageDismiss}
|
||||||
context: 'title',
|
>
|
||||||
})}
|
<Button className={styles.actionButton}>
|
||||||
</Button>
|
{t('action.editUsername', {
|
||||||
</UserUsernameEditPopup>
|
context: 'title',
|
||||||
</div>
|
})}
|
||||||
<div className={styles.action}>
|
</Button>
|
||||||
<UserEmailEditPopup
|
</UserUsernameEditPopup>
|
||||||
usePasswordConfirmation
|
</div>
|
||||||
defaultData={emailUpdateForm.data}
|
)}
|
||||||
email={email}
|
{!isLocked && (
|
||||||
isSubmitting={emailUpdateForm.isSubmitting}
|
<>
|
||||||
error={emailUpdateForm.error}
|
<div className={styles.action}>
|
||||||
onUpdate={onEmailUpdate}
|
<UserEmailEditPopup
|
||||||
onMessageDismiss={onEmailUpdateMessageDismiss}
|
usePasswordConfirmation
|
||||||
>
|
defaultData={emailUpdateForm.data}
|
||||||
<Button className={styles.actionButton}>
|
email={email}
|
||||||
{t('action.editEmail', {
|
isSubmitting={emailUpdateForm.isSubmitting}
|
||||||
context: 'title',
|
error={emailUpdateForm.error}
|
||||||
})}
|
onUpdate={onEmailUpdate}
|
||||||
</Button>
|
onMessageDismiss={onEmailUpdateMessageDismiss}
|
||||||
</UserEmailEditPopup>
|
>
|
||||||
</div>
|
<Button className={styles.actionButton}>
|
||||||
<div className={styles.action}>
|
{t('action.editEmail', {
|
||||||
<UserPasswordEditPopup
|
context: 'title',
|
||||||
usePasswordConfirmation
|
})}
|
||||||
defaultData={passwordUpdateForm.data}
|
</Button>
|
||||||
isSubmitting={passwordUpdateForm.isSubmitting}
|
</UserEmailEditPopup>
|
||||||
error={passwordUpdateForm.error}
|
</div>
|
||||||
onUpdate={onPasswordUpdate}
|
<div className={styles.action}>
|
||||||
onMessageDismiss={onPasswordUpdateMessageDismiss}
|
<UserPasswordEditPopup
|
||||||
>
|
usePasswordConfirmation
|
||||||
<Button className={styles.actionButton}>
|
defaultData={passwordUpdateForm.data}
|
||||||
{t('action.editPassword', {
|
isSubmitting={passwordUpdateForm.isSubmitting}
|
||||||
context: 'title',
|
error={passwordUpdateForm.error}
|
||||||
})}
|
onUpdate={onPasswordUpdate}
|
||||||
</Button>
|
onMessageDismiss={onPasswordUpdateMessageDismiss}
|
||||||
</UserPasswordEditPopup>
|
>
|
||||||
</div>
|
<Button className={styles.actionButton}>
|
||||||
|
{t('action.editPassword', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Button>
|
||||||
|
</UserPasswordEditPopup>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</Tab.Pane>
|
</Tab.Pane>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -172,6 +185,8 @@ AccountPane.propTypes = {
|
|||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
isAvatarUpdating: PropTypes.bool.isRequired,
|
isAvatarUpdating: PropTypes.bool.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
usernameUpdateForm: PropTypes.object.isRequired,
|
usernameUpdateForm: PropTypes.object.isRequired,
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ const UserSettingsModal = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -48,6 +50,8 @@ const UserSettingsModal = React.memo(
|
|||||||
phone={phone}
|
phone={phone}
|
||||||
organization={organization}
|
organization={organization}
|
||||||
language={language}
|
language={language}
|
||||||
|
isLocked={isLocked}
|
||||||
|
isUsernameLocked={isUsernameLocked}
|
||||||
isAvatarUpdating={isAvatarUpdating}
|
isAvatarUpdating={isAvatarUpdating}
|
||||||
usernameUpdateForm={usernameUpdateForm}
|
usernameUpdateForm={usernameUpdateForm}
|
||||||
emailUpdateForm={emailUpdateForm}
|
emailUpdateForm={emailUpdateForm}
|
||||||
@@ -105,6 +109,8 @@ UserSettingsModal.propTypes = {
|
|||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
subscribeToOwnCards: PropTypes.bool.isRequired,
|
subscribeToOwnCards: PropTypes.bool.isRequired,
|
||||||
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
isAvatarUpdating: PropTypes.bool.isRequired,
|
isAvatarUpdating: PropTypes.bool.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
usernameUpdateForm: PropTypes.object.isRequired,
|
usernameUpdateForm: PropTypes.object.isRequired,
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ const ActionsStep = React.memo(
|
|||||||
return (
|
return (
|
||||||
<UserInformationEditStep
|
<UserInformationEditStep
|
||||||
defaultData={pick(user, ['name', 'phone', 'organization'])}
|
defaultData={pick(user, ['name', 'phone', 'organization'])}
|
||||||
|
isNameEditable={!user.isLocked}
|
||||||
onUpdate={onUpdate}
|
onUpdate={onUpdate}
|
||||||
onBack={handleBack}
|
onBack={handleBack}
|
||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
@@ -135,26 +136,34 @@ const ActionsStep = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
|
{!user.isUsernameLocked && (
|
||||||
{t('action.editUsername', {
|
<Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
|
||||||
context: 'title',
|
{t('action.editUsername', {
|
||||||
})}
|
context: 'title',
|
||||||
</Menu.Item>
|
})}
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
|
</Menu.Item>
|
||||||
{t('action.editEmail', {
|
)}
|
||||||
context: 'title',
|
{!user.isLocked && (
|
||||||
})}
|
<>
|
||||||
</Menu.Item>
|
<Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditPasswordClick}>
|
{t('action.editEmail', {
|
||||||
{t('action.editPassword', {
|
context: 'title',
|
||||||
context: 'title',
|
})}
|
||||||
})}
|
</Menu.Item>
|
||||||
</Menu.Item>
|
<Menu.Item className={styles.menuItem} onClick={handleEditPasswordClick}>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
{t('action.editPassword', {
|
||||||
{t('action.deleteUser', {
|
context: 'title',
|
||||||
context: 'title',
|
})}
|
||||||
})}
|
</Menu.Item>
|
||||||
</Menu.Item>
|
</>
|
||||||
|
)}
|
||||||
|
{!user.isDeletionLocked && (
|
||||||
|
<Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
|
||||||
|
{t('action.deleteUser', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Menu.Item>
|
||||||
|
)}
|
||||||
</Menu>
|
</Menu>
|
||||||
</Popup.Content>
|
</Popup.Content>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ const Item = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
|
isLocked,
|
||||||
|
isRoleLocked,
|
||||||
|
isUsernameLocked,
|
||||||
|
isDeletionLocked,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
@@ -46,7 +50,7 @@ const Item = React.memo(
|
|||||||
<Table.Cell>{username || '-'}</Table.Cell>
|
<Table.Cell>{username || '-'}</Table.Cell>
|
||||||
<Table.Cell>{email}</Table.Cell>
|
<Table.Cell>{email}</Table.Cell>
|
||||||
<Table.Cell>
|
<Table.Cell>
|
||||||
<Radio toggle checked={isAdmin} onChange={handleIsAdminChange} />
|
<Radio toggle checked={isAdmin} disabled={isRoleLocked} onChange={handleIsAdminChange} />
|
||||||
</Table.Cell>
|
</Table.Cell>
|
||||||
<Table.Cell textAlign="right">
|
<Table.Cell textAlign="right">
|
||||||
<ActionsPopup
|
<ActionsPopup
|
||||||
@@ -57,6 +61,9 @@ const Item = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
|
isDeletionLocked,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
@@ -88,6 +95,10 @@ Item.propTypes = {
|
|||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
phone: PropTypes.string,
|
phone: PropTypes.string,
|
||||||
isAdmin: PropTypes.bool.isRequired,
|
isAdmin: PropTypes.bool.isRequired,
|
||||||
|
isLocked: PropTypes.bool.isRequired,
|
||||||
|
isRoleLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
|
isDeletionLocked: PropTypes.bool.isRequired,
|
||||||
/* eslint-disable react/forbid-prop-types */
|
/* eslint-disable react/forbid-prop-types */
|
||||||
emailUpdateForm: PropTypes.object.isRequired,
|
emailUpdateForm: PropTypes.object.isRequired,
|
||||||
passwordUpdateForm: PropTypes.object.isRequired,
|
passwordUpdateForm: PropTypes.object.isRequired,
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import Item from './Item';
|
|||||||
const UsersModal = React.memo(
|
const UsersModal = React.memo(
|
||||||
({
|
({
|
||||||
items,
|
items,
|
||||||
|
canAdd,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
onUsernameUpdate,
|
onUsernameUpdate,
|
||||||
onUsernameUpdateMessageDismiss,
|
onUsernameUpdateMessageDismiss,
|
||||||
@@ -110,6 +111,10 @@ const UsersModal = React.memo(
|
|||||||
organization={item.organization}
|
organization={item.organization}
|
||||||
phone={item.phone}
|
phone={item.phone}
|
||||||
isAdmin={item.isAdmin}
|
isAdmin={item.isAdmin}
|
||||||
|
isLocked={item.isLocked}
|
||||||
|
isRoleLocked={item.isRoleLocked}
|
||||||
|
isUsernameLocked={item.isUsernameLocked}
|
||||||
|
isDeletionLocked={item.isDeletionLocked}
|
||||||
emailUpdateForm={item.emailUpdateForm}
|
emailUpdateForm={item.emailUpdateForm}
|
||||||
passwordUpdateForm={item.passwordUpdateForm}
|
passwordUpdateForm={item.passwordUpdateForm}
|
||||||
usernameUpdateForm={item.usernameUpdateForm}
|
usernameUpdateForm={item.usernameUpdateForm}
|
||||||
@@ -126,11 +131,13 @@ const UsersModal = React.memo(
|
|||||||
</Table.Body>
|
</Table.Body>
|
||||||
</Table>
|
</Table>
|
||||||
</Modal.Content>
|
</Modal.Content>
|
||||||
<Modal.Actions>
|
{canAdd && (
|
||||||
<UserAddPopupContainer>
|
<Modal.Actions>
|
||||||
<Button positive content={t('action.addUser')} />
|
<UserAddPopupContainer>
|
||||||
</UserAddPopupContainer>
|
<Button positive content={t('action.addUser')} />
|
||||||
</Modal.Actions>
|
</UserAddPopupContainer>
|
||||||
|
</Modal.Actions>
|
||||||
|
)}
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -138,6 +145,7 @@ const UsersModal = React.memo(
|
|||||||
|
|
||||||
UsersModal.propTypes = {
|
UsersModal.propTypes = {
|
||||||
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
|
||||||
|
canAdd: PropTypes.bool.isRequired,
|
||||||
onUpdate: PropTypes.func.isRequired,
|
onUpdate: PropTypes.func.isRequired,
|
||||||
onUsernameUpdate: PropTypes.func.isRequired,
|
onUsernameUpdate: PropTypes.func.isRequired,
|
||||||
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
|
onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -12,14 +12,19 @@ export default {
|
|||||||
|
|
||||||
/* Login */
|
/* Login */
|
||||||
|
|
||||||
|
LOGIN_INITIALIZE: 'LOGIN_INITIALIZE',
|
||||||
AUTHENTICATE: 'AUTHENTICATE',
|
AUTHENTICATE: 'AUTHENTICATE',
|
||||||
AUTHENTICATE__SUCCESS: 'AUTHENTICATE__SUCCESS',
|
AUTHENTICATE__SUCCESS: 'AUTHENTICATE__SUCCESS',
|
||||||
AUTHENTICATE__FAILURE: 'AUTHENTICATE__FAILURE',
|
AUTHENTICATE__FAILURE: 'AUTHENTICATE__FAILURE',
|
||||||
|
USING_OIDC_AUTHENTICATE: 'USING_OIDC_AUTHENTICATE',
|
||||||
|
USING_OIDC_AUTHENTICATE__SUCCESS: 'USING_OIDC_AUTHENTICATE__SUCCESS',
|
||||||
|
USING_OIDC_AUTHENTICATE__FAILURE: 'USING_OIDC_AUTHENTICATE__FAILURE',
|
||||||
AUTHENTICATE_ERROR_CLEAR: 'AUTHENTICATE_ERROR_CLEAR',
|
AUTHENTICATE_ERROR_CLEAR: 'AUTHENTICATE_ERROR_CLEAR',
|
||||||
|
|
||||||
/* Core */
|
/* Core */
|
||||||
|
|
||||||
CORE_INITIALIZE: 'CORE_INITIALIZE',
|
CORE_INITIALIZE: 'CORE_INITIALIZE',
|
||||||
|
CORE_INITIALIZE__CONFIG_FETCH: 'CORE_INITIALIZE__CONFIG_FETCH',
|
||||||
LOGOUT: 'LOGOUT',
|
LOGOUT: 'LOGOUT',
|
||||||
LOGOUT__ACCESS_TOKEN_INVALIDATE: 'LOGOUT__ACCESS_TOKEN_INVALIDATE',
|
LOGOUT__ACCESS_TOKEN_INVALIDATE: 'LOGOUT__ACCESS_TOKEN_INVALIDATE',
|
||||||
|
|
||||||
@@ -168,6 +173,10 @@ export default {
|
|||||||
LIST_UPDATE__SUCCESS: 'LIST_UPDATE__SUCCESS',
|
LIST_UPDATE__SUCCESS: 'LIST_UPDATE__SUCCESS',
|
||||||
LIST_UPDATE__FAILURE: 'LIST_UPDATE__FAILURE',
|
LIST_UPDATE__FAILURE: 'LIST_UPDATE__FAILURE',
|
||||||
LIST_UPDATE_HANDLE: 'LIST_UPDATE_HANDLE',
|
LIST_UPDATE_HANDLE: 'LIST_UPDATE_HANDLE',
|
||||||
|
LIST_SORT: 'LIST_SORT',
|
||||||
|
LIST_SORT__SUCCESS: 'LIST_SORT__SUCCESS',
|
||||||
|
LIST_SORT__FAILURE: 'LIST_SORT__FAILURE',
|
||||||
|
LIST_SORT_HANDLE: 'LIST_SORT_HANDLE',
|
||||||
LIST_DELETE: 'LIST_DELETE',
|
LIST_DELETE: 'LIST_DELETE',
|
||||||
LIST_DELETE__SUCCESS: 'LIST_DELETE__SUCCESS',
|
LIST_DELETE__SUCCESS: 'LIST_DELETE__SUCCESS',
|
||||||
LIST_DELETE__FAILURE: 'LIST_DELETE__FAILURE',
|
LIST_DELETE__FAILURE: 'LIST_DELETE__FAILURE',
|
||||||
@@ -189,10 +198,14 @@ export default {
|
|||||||
CARD_TRANSFER: 'CARD_TRANSFER',
|
CARD_TRANSFER: 'CARD_TRANSFER',
|
||||||
CARD_TRANSFER__SUCCESS: 'CARD_TRANSFER__SUCCESS',
|
CARD_TRANSFER__SUCCESS: 'CARD_TRANSFER__SUCCESS',
|
||||||
CARD_TRANSFER__FAILURE: 'CARD_TRANSFER__FAILURE',
|
CARD_TRANSFER__FAILURE: 'CARD_TRANSFER__FAILURE',
|
||||||
|
CARD_DUPLICATE: 'CARD_DUPLICATE',
|
||||||
|
CARD_DUPLICATE__SUCCESS: 'CARD_DUPLICATE__SUCCESS',
|
||||||
|
CARD_DUPLICATE__FAILURE: 'CARD_DUPLICATE__FAILURE',
|
||||||
CARD_DELETE: 'CARD_DELETE',
|
CARD_DELETE: 'CARD_DELETE',
|
||||||
CARD_DELETE__SUCCESS: 'CARD_DELETE__SUCCESS',
|
CARD_DELETE__SUCCESS: 'CARD_DELETE__SUCCESS',
|
||||||
CARD_DELETE__FAILURE: 'CARD_DELETE__FAILURE',
|
CARD_DELETE__FAILURE: 'CARD_DELETE__FAILURE',
|
||||||
CARD_DELETE_HANDLE: 'CARD_DELETE_HANDLE',
|
CARD_DELETE_HANDLE: 'CARD_DELETE_HANDLE',
|
||||||
|
TEXT_FILTER_IN_CURRENT_BOARD: 'TEXT_FILTER_IN_CURRENT_BOARD',
|
||||||
|
|
||||||
/* Tasks */
|
/* Tasks */
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ export default {
|
|||||||
/* Login */
|
/* Login */
|
||||||
|
|
||||||
AUTHENTICATE: `${PREFIX}/AUTHENTICATE`,
|
AUTHENTICATE: `${PREFIX}/AUTHENTICATE`,
|
||||||
|
USING_OIDC_AUTHENTICATE: `${PREFIX}/USING_OIDC_AUTHENTICATE`,
|
||||||
AUTHENTICATE_ERROR_CLEAR: `${PREFIX}/AUTHENTICATE_ERROR_CLEAR`,
|
AUTHENTICATE_ERROR_CLEAR: `${PREFIX}/AUTHENTICATE_ERROR_CLEAR`,
|
||||||
|
|
||||||
/* Core */
|
/* Core */
|
||||||
|
|
||||||
CORE_INITIALIZE: `${PREFIX}/CORE_INITIALIZE`,
|
|
||||||
LOGOUT: `${PREFIX}/LOGOUT`,
|
LOGOUT: `${PREFIX}/LOGOUT`,
|
||||||
|
|
||||||
/* Modals */
|
/* Modals */
|
||||||
@@ -120,6 +120,8 @@ export default {
|
|||||||
LIST_MOVE: `${PREFIX}/LIST_MOVE`,
|
LIST_MOVE: `${PREFIX}/LIST_MOVE`,
|
||||||
LIST_DELETE: `${PREFIX}/LIST_DELETE`,
|
LIST_DELETE: `${PREFIX}/LIST_DELETE`,
|
||||||
LIST_DELETE_HANDLE: `${PREFIX}/LIST_DELETE_HANDLE`,
|
LIST_DELETE_HANDLE: `${PREFIX}/LIST_DELETE_HANDLE`,
|
||||||
|
LIST_SORT: `${PREFIX}/LIST_SORT`,
|
||||||
|
LIST_SORT_HANDLE: `${PREFIX}/LIST_SORT_HANDLE`,
|
||||||
|
|
||||||
/* Cards */
|
/* Cards */
|
||||||
|
|
||||||
@@ -132,9 +134,12 @@ export default {
|
|||||||
CURRENT_CARD_MOVE: `${PREFIX}/CURRENT_CARD_MOVE`,
|
CURRENT_CARD_MOVE: `${PREFIX}/CURRENT_CARD_MOVE`,
|
||||||
CARD_TRANSFER: `${PREFIX}/CARD_TRANSFER`,
|
CARD_TRANSFER: `${PREFIX}/CARD_TRANSFER`,
|
||||||
CURRENT_CARD_TRANSFER: `${PREFIX}/CURRENT_CARD_TRANSFER`,
|
CURRENT_CARD_TRANSFER: `${PREFIX}/CURRENT_CARD_TRANSFER`,
|
||||||
|
CARD_DUPLICATE: `${PREFIX}/CARD_DUPLICATE`,
|
||||||
|
CURRENT_CARD_DUPLICATE: `${PREFIX}/CURRENT_CARD_DUPLICATE`,
|
||||||
CARD_DELETE: `${PREFIX}/CARD_DELETE`,
|
CARD_DELETE: `${PREFIX}/CARD_DELETE`,
|
||||||
CURRENT_CARD_DELETE: `${PREFIX}/CURRENT_CARD_DELETE`,
|
CURRENT_CARD_DELETE: `${PREFIX}/CURRENT_CARD_DELETE`,
|
||||||
CARD_DELETE_HANDLE: `${PREFIX}/CARD_DELETE_HANDLE`,
|
CARD_DELETE_HANDLE: `${PREFIX}/CARD_DELETE_HANDLE`,
|
||||||
|
TEXT_FILTER_IN_CURRENT_BOARD: `${PREFIX}/FILTER_TEXT_HANDLE`,
|
||||||
|
|
||||||
/* Tasks */
|
/* Tasks */
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,13 @@ export const BoardMembershipRoles = {
|
|||||||
VIEWER: 'viewer',
|
VIEWER: 'viewer',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const ListSortTypes = {
|
||||||
|
NAME_ASC: 'name_asc',
|
||||||
|
DUE_DATE_ASC: 'dueDate_asc',
|
||||||
|
CREATED_AT_ASC: 'createdAt_asc',
|
||||||
|
CREATED_AT_DESC: 'createdAt_desc',
|
||||||
|
};
|
||||||
|
|
||||||
export const ActivityTypes = {
|
export const ActivityTypes = {
|
||||||
CREATE_CARD: 'createCard',
|
CREATE_CARD: 'createCard',
|
||||||
MOVE_CARD: 'moveCard',
|
MOVE_CARD: 'moveCard',
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import Config from './Config';
|
|||||||
|
|
||||||
const ROOT = `${Config.BASE_PATH}/`;
|
const ROOT = `${Config.BASE_PATH}/`;
|
||||||
const LOGIN = `${Config.BASE_PATH}/login`;
|
const LOGIN = `${Config.BASE_PATH}/login`;
|
||||||
|
const OIDC_CALLBACK = `${Config.BASE_PATH}/oidc-callback`;
|
||||||
const PROJECTS = `${Config.BASE_PATH}/projects/:id`;
|
const PROJECTS = `${Config.BASE_PATH}/projects/:id`;
|
||||||
const BOARDS = `${Config.BASE_PATH}/boards/:id`;
|
const BOARDS = `${Config.BASE_PATH}/boards/:id`;
|
||||||
const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
||||||
@@ -9,6 +10,7 @@ const CARDS = `${Config.BASE_PATH}/cards/:id`;
|
|||||||
export default {
|
export default {
|
||||||
ROOT,
|
ROOT,
|
||||||
LOGIN,
|
LOGIN,
|
||||||
|
OIDC_CALLBACK,
|
||||||
PROJECTS,
|
PROJECTS,
|
||||||
BOARDS,
|
BOARDS,
|
||||||
CARDS,
|
CARDS,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ const mapStateToProps = (state) => {
|
|||||||
const labels = selectors.selectLabelsForCurrentBoard(state);
|
const labels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const filterUsers = selectors.selectFilterUsersForCurrentBoard(state);
|
const filterUsers = selectors.selectFilterUsersForCurrentBoard(state);
|
||||||
const filterLabels = selectors.selectFilterLabelsForCurrentBoard(state);
|
const filterLabels = selectors.selectFilterLabelsForCurrentBoard(state);
|
||||||
|
const filterText = selectors.selectFilterTextForCurrentBoard(state);
|
||||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const isCurrentUserEditor =
|
const isCurrentUserEditor =
|
||||||
@@ -23,6 +24,7 @@ const mapStateToProps = (state) => {
|
|||||||
labels,
|
labels,
|
||||||
filterUsers,
|
filterUsers,
|
||||||
filterLabels,
|
filterLabels,
|
||||||
|
filterText,
|
||||||
allUsers,
|
allUsers,
|
||||||
canEdit: isCurrentUserEditor,
|
canEdit: isCurrentUserEditor,
|
||||||
canEditMemberships: isCurrentUserManager,
|
canEditMemberships: isCurrentUserManager,
|
||||||
@@ -43,6 +45,7 @@ const mapDispatchToProps = (dispatch) =>
|
|||||||
onLabelUpdate: entryActions.updateLabel,
|
onLabelUpdate: entryActions.updateLabel,
|
||||||
onLabelMove: entryActions.moveLabel,
|
onLabelMove: entryActions.moveLabel,
|
||||||
onLabelDelete: entryActions.deleteLabel,
|
onLabelDelete: entryActions.deleteLabel,
|
||||||
|
onTextFilterUpdate: entryActions.filterText,
|
||||||
},
|
},
|
||||||
dispatch,
|
dispatch,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ const mapDispatchToProps = (dispatch, { id }) =>
|
|||||||
onUpdate: (data) => entryActions.updateCard(id, data),
|
onUpdate: (data) => entryActions.updateCard(id, data),
|
||||||
onMove: (listId, index) => entryActions.moveCard(id, listId, index),
|
onMove: (listId, index) => entryActions.moveCard(id, listId, index),
|
||||||
onTransfer: (boardId, listId) => entryActions.transferCard(id, boardId, listId),
|
onTransfer: (boardId, listId) => entryActions.transferCard(id, boardId, listId),
|
||||||
|
onDuplicate: () => entryActions.duplicateCard(id),
|
||||||
onDelete: () => entryActions.deleteCard(id),
|
onDelete: () => entryActions.deleteCard(id),
|
||||||
onUserAdd: (userId) => entryActions.addUserToCard(userId, id),
|
onUserAdd: (userId) => entryActions.addUserToCard(userId, id),
|
||||||
onUserRemove: (userId) => entryActions.removeUserFromCard(userId, id),
|
onUserRemove: (userId) => entryActions.removeUserFromCard(userId, id),
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ const mapDispatchToProps = (dispatch) =>
|
|||||||
onUpdate: entryActions.updateCurrentCard,
|
onUpdate: entryActions.updateCurrentCard,
|
||||||
onMove: entryActions.moveCurrentCard,
|
onMove: entryActions.moveCurrentCard,
|
||||||
onTransfer: entryActions.transferCurrentCard,
|
onTransfer: entryActions.transferCurrentCard,
|
||||||
|
onDuplicate: entryActions.duplicateCurrentCard,
|
||||||
onDelete: entryActions.deleteCurrentCard,
|
onDelete: entryActions.deleteCurrentCard,
|
||||||
onUserAdd: entryActions.addUserToCurrentCard,
|
onUserAdd: entryActions.addUserToCurrentCard,
|
||||||
onUserRemove: entryActions.removeUserFromCurrentCard,
|
onUserRemove: entryActions.removeUserFromCurrentCard,
|
||||||
|
|||||||
@@ -4,18 +4,18 @@ import selectors from '../selectors';
|
|||||||
import Core from '../components/Core';
|
import Core from '../components/Core';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
const isCoreInitializing = selectors.selectIsCoreInitializing(state);
|
const isInitializing = selectors.selectIsInitializing(state);
|
||||||
const isSocketDisconnected = selectors.selectIsSocketDisconnected(state);
|
const isSocketDisconnected = selectors.selectIsSocketDisconnected(state);
|
||||||
const currentModal = selectors.selectCurrentModal(state);
|
const currentModal = selectors.selectCurrentModal(state);
|
||||||
const currentProject = selectors.selectCurrentProject(state);
|
const currentProject = selectors.selectCurrentProject(state);
|
||||||
const currentBoard = selectors.selectCurrentBoard(state);
|
const currentBoard = selectors.selectCurrentBoard(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
isInitializing,
|
||||||
isSocketDisconnected,
|
isSocketDisconnected,
|
||||||
currentModal,
|
currentModal,
|
||||||
currentProject,
|
currentProject,
|
||||||
currentBoard,
|
currentBoard,
|
||||||
isInitializing: isCoreInitializing,
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ const mapDispatchToProps = (dispatch, { id }) =>
|
|||||||
bindActionCreators(
|
bindActionCreators(
|
||||||
{
|
{
|
||||||
onUpdate: (data) => entryActions.updateList(id, data),
|
onUpdate: (data) => entryActions.updateList(id, data),
|
||||||
|
onSort: (data) => entryActions.sortList(id, data),
|
||||||
onDelete: () => entryActions.deleteList(id),
|
onDelete: () => entryActions.deleteList(id),
|
||||||
onCardCreate: (data, autoOpen) => entryActions.createCard(id, data, autoOpen),
|
onCardCreate: (data, autoOpen) => entryActions.createCard(id, data, autoOpen),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,23 +1,34 @@
|
|||||||
import { bindActionCreators } from 'redux';
|
import { bindActionCreators } from 'redux';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
import selectors from '../selectors';
|
||||||
import entryActions from '../entry-actions';
|
import entryActions from '../entry-actions';
|
||||||
import Login from '../components/Login';
|
import Login from '../components/Login';
|
||||||
|
|
||||||
const mapStateToProps = ({
|
const mapStateToProps = (state) => {
|
||||||
ui: {
|
const oidcConfig = selectors.selectOidcConfig(state);
|
||||||
authenticateForm: { data: defaultData, isSubmitting, error },
|
|
||||||
},
|
const {
|
||||||
}) => ({
|
ui: {
|
||||||
defaultData,
|
authenticateForm: { data: defaultData, isSubmitting, isSubmittingUsingOidc, error },
|
||||||
isSubmitting,
|
},
|
||||||
error,
|
} = state;
|
||||||
});
|
|
||||||
|
return {
|
||||||
|
defaultData,
|
||||||
|
isSubmitting,
|
||||||
|
isSubmittingUsingOidc,
|
||||||
|
error,
|
||||||
|
withOidc: !!oidcConfig,
|
||||||
|
isOidcEnforced: !!oidcConfig && oidcConfig.isEnforced,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
const mapDispatchToProps = (dispatch) =>
|
const mapDispatchToProps = (dispatch) =>
|
||||||
bindActionCreators(
|
bindActionCreators(
|
||||||
{
|
{
|
||||||
onAuthenticate: entryActions.authenticate,
|
onAuthenticate: entryActions.authenticate,
|
||||||
|
onAuthenticateUsingOidc: entryActions.authenticateUsingOidc,
|
||||||
onMessageDismiss: entryActions.clearAuthenticateError,
|
onMessageDismiss: entryActions.clearAuthenticateError,
|
||||||
},
|
},
|
||||||
dispatch,
|
dispatch,
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
import selectors from '../selectors';
|
||||||
|
import LoginWrapper from '../components/LoginWrapper';
|
||||||
|
|
||||||
|
const mapStateToProps = (state) => {
|
||||||
|
const isInitializing = selectors.selectIsInitializing(state);
|
||||||
|
|
||||||
|
return {
|
||||||
|
isInitializing,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(LoginWrapper);
|
||||||
@@ -15,6 +15,8 @@ const mapStateToProps = (state) => {
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
@@ -30,6 +32,8 @@ const mapStateToProps = (state) => {
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
|
|||||||
@@ -6,10 +6,12 @@ import entryActions from '../entry-actions';
|
|||||||
import UsersModal from '../components/UsersModal';
|
import UsersModal from '../components/UsersModal';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
|
const oidcConfig = selectors.selectOidcConfig(state);
|
||||||
const users = selectors.selectUsersExceptCurrent(state);
|
const users = selectors.selectUsersExceptCurrent(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
items: users,
|
items: users,
|
||||||
|
canAdd: !oidcConfig || !oidcConfig.isEnforced,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ const handleCardUpdate = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const moveCard = (id, listId, index = 0) => ({
|
const moveCard = (id, listId, index) => ({
|
||||||
type: EntryActionTypes.CARD_MOVE,
|
type: EntryActionTypes.CARD_MOVE,
|
||||||
payload: {
|
payload: {
|
||||||
id,
|
id,
|
||||||
@@ -47,7 +47,7 @@ const moveCard = (id, listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const moveCurrentCard = (listId, index = 0) => ({
|
const moveCurrentCard = (listId, index) => ({
|
||||||
type: EntryActionTypes.CURRENT_CARD_MOVE,
|
type: EntryActionTypes.CURRENT_CARD_MOVE,
|
||||||
payload: {
|
payload: {
|
||||||
listId,
|
listId,
|
||||||
@@ -55,7 +55,7 @@ const moveCurrentCard = (listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const transferCard = (id, boardId, listId, index = 0) => ({
|
const transferCard = (id, boardId, listId, index) => ({
|
||||||
type: EntryActionTypes.CARD_TRANSFER,
|
type: EntryActionTypes.CARD_TRANSFER,
|
||||||
payload: {
|
payload: {
|
||||||
id,
|
id,
|
||||||
@@ -65,7 +65,7 @@ const transferCard = (id, boardId, listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const transferCurrentCard = (boardId, listId, index = 0) => ({
|
const transferCurrentCard = (boardId, listId, index) => ({
|
||||||
type: EntryActionTypes.CURRENT_CARD_TRANSFER,
|
type: EntryActionTypes.CURRENT_CARD_TRANSFER,
|
||||||
payload: {
|
payload: {
|
||||||
boardId,
|
boardId,
|
||||||
@@ -74,6 +74,18 @@ const transferCurrentCard = (boardId, listId, index = 0) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const duplicateCard = (id) => ({
|
||||||
|
type: EntryActionTypes.CARD_DUPLICATE,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const duplicateCurrentCard = () => ({
|
||||||
|
type: EntryActionTypes.CURRENT_CARD_DUPLICATE,
|
||||||
|
payload: {},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteCard = (id) => ({
|
const deleteCard = (id) => ({
|
||||||
type: EntryActionTypes.CARD_DELETE,
|
type: EntryActionTypes.CARD_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -93,6 +105,13 @@ const handleCardDelete = (card) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const filterText = (text) => ({
|
||||||
|
type: EntryActionTypes.TEXT_FILTER_IN_CURRENT_BOARD,
|
||||||
|
payload: {
|
||||||
|
text,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
createCard,
|
createCard,
|
||||||
handleCardCreate,
|
handleCardCreate,
|
||||||
@@ -103,7 +122,10 @@ export default {
|
|||||||
moveCurrentCard,
|
moveCurrentCard,
|
||||||
transferCard,
|
transferCard,
|
||||||
transferCurrentCard,
|
transferCurrentCard,
|
||||||
|
duplicateCard,
|
||||||
|
duplicateCurrentCard,
|
||||||
deleteCard,
|
deleteCard,
|
||||||
deleteCurrentCard,
|
deleteCurrentCard,
|
||||||
handleCardDelete,
|
handleCardDelete,
|
||||||
|
filterText,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,16 +1,12 @@
|
|||||||
import EntryActionTypes from '../constants/EntryActionTypes';
|
import EntryActionTypes from '../constants/EntryActionTypes';
|
||||||
|
|
||||||
const initializeCore = () => ({
|
const logout = (invalidateAccessToken) => ({
|
||||||
type: EntryActionTypes.CORE_INITIALIZE,
|
|
||||||
payload: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
const logout = () => ({
|
|
||||||
type: EntryActionTypes.LOGOUT,
|
type: EntryActionTypes.LOGOUT,
|
||||||
payload: {},
|
payload: {
|
||||||
|
invalidateAccessToken,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
initializeCore,
|
|
||||||
logout,
|
logout,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -37,6 +37,24 @@ const moveList = (id, index) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const sortList = (id, data) => {
|
||||||
|
return {
|
||||||
|
type: EntryActionTypes.LIST_SORT,
|
||||||
|
payload: {
|
||||||
|
id,
|
||||||
|
data,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleListSort = (list, cards) => ({
|
||||||
|
type: EntryActionTypes.LIST_SORT_HANDLE,
|
||||||
|
payload: {
|
||||||
|
list,
|
||||||
|
cards,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const deleteList = (id) => ({
|
const deleteList = (id) => ({
|
||||||
type: EntryActionTypes.LIST_DELETE,
|
type: EntryActionTypes.LIST_DELETE,
|
||||||
payload: {
|
payload: {
|
||||||
@@ -57,6 +75,8 @@ export default {
|
|||||||
updateList,
|
updateList,
|
||||||
handleListUpdate,
|
handleListUpdate,
|
||||||
moveList,
|
moveList,
|
||||||
|
sortList,
|
||||||
|
handleListSort,
|
||||||
deleteList,
|
deleteList,
|
||||||
handleListDelete,
|
handleListDelete,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ const authenticate = (data) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const authenticateUsingOidc = () => ({
|
||||||
|
type: EntryActionTypes.USING_OIDC_AUTHENTICATE,
|
||||||
|
payload: {},
|
||||||
|
});
|
||||||
|
|
||||||
const clearAuthenticateError = () => ({
|
const clearAuthenticateError = () => ({
|
||||||
type: EntryActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
type: EntryActionTypes.AUTHENTICATE_ERROR_CLEAR,
|
||||||
payload: {},
|
payload: {},
|
||||||
@@ -14,5 +19,6 @@ const clearAuthenticateError = () => ({
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
authenticate,
|
authenticate,
|
||||||
|
authenticateUsingOidc,
|
||||||
clearAuthenticateError,
|
clearAuthenticateError,
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user