Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ec4b619d9 | ||
|
|
12f05adde7 | ||
|
|
c594e8bd71 | ||
|
|
f84166406f | ||
|
|
82b2ba298d | ||
|
|
38b6805ba1 | ||
|
|
6a7a582045 | ||
|
|
c53a00b4ba | ||
|
|
52103c775b | ||
|
|
eeb1bd80cc | ||
|
|
e6b8538863 | ||
|
|
9dc38932fb | ||
|
|
e9b4a4adfc | ||
|
|
76c78c7252 | ||
|
|
04f52a63f2 | ||
|
|
6b16a104b1 | ||
|
|
aff853c602 | ||
|
|
ad2966c5d6 | ||
|
|
8d74cc1732 | ||
|
|
ea94fe8bf3 | ||
|
|
6052f8999f | ||
|
|
67d1b1c194 | ||
|
|
b3cb8405f5 | ||
|
|
7acaec6d04 | ||
|
|
72896a66b3 | ||
|
|
4be4783251 | ||
|
|
5c6c6a0bcf | ||
|
|
ba178d66fa | ||
|
|
270ce29f87 | ||
|
|
de1ed3c784 | ||
|
|
caf8790f28 | ||
|
|
81436b373d | ||
|
|
cc1e886a31 | ||
|
|
f0e9fe7904 | ||
|
|
5fcea5d651 | ||
|
|
a963d85a66 | ||
|
|
04b42decef | ||
|
|
c065566c15 | ||
|
|
3779bdb053 | ||
|
|
4124ab17d2 | ||
|
|
0e3bc92a61 | ||
|
|
b8d7e713b9 | ||
|
|
017eee8302 | ||
|
|
1b28892cf5 | ||
|
|
013ea1b869 | ||
|
|
4975fa2eeb | ||
|
|
3e28ad87c7 | ||
|
|
2d6666d693 | ||
|
|
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 |
@@ -0,0 +1,53 @@
|
|||||||
|
name: "🐛 Bug Report"
|
||||||
|
description: Report a bug found while using Planka
|
||||||
|
title: "[Bug]: "
|
||||||
|
labels: ["Type: Bug", "Status: Triage"]
|
||||||
|
body:
|
||||||
|
- type: dropdown
|
||||||
|
id: issue-type
|
||||||
|
attributes:
|
||||||
|
label: Where is the problem occurring?
|
||||||
|
description: Select the part of the application where you encountered the issue.
|
||||||
|
options:
|
||||||
|
- "I encountered the problem while using the application (Frontend)"
|
||||||
|
- "I encountered the problem while interacting with the server (Backend)"
|
||||||
|
- "I'm not sure"
|
||||||
|
- type: dropdown
|
||||||
|
id: browsers
|
||||||
|
attributes:
|
||||||
|
label: What browsers are you seeing the problem on?
|
||||||
|
multiple: true
|
||||||
|
options:
|
||||||
|
- Brave
|
||||||
|
- Chrome
|
||||||
|
- Firefox
|
||||||
|
- Microsoft Edge
|
||||||
|
- Safari
|
||||||
|
- Other
|
||||||
|
- type: textarea
|
||||||
|
id: current-behavior
|
||||||
|
attributes:
|
||||||
|
label: Current behaviour
|
||||||
|
description: A description of what is currently happening, including screenshots and other useful information (**DO NOT INCLUDE PRIVATE INFORMATION**).
|
||||||
|
placeholder: Currently...
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: desired-behavior
|
||||||
|
attributes:
|
||||||
|
label: Desired behaviour
|
||||||
|
description: A clear description of what you think should happen.
|
||||||
|
placeholder: In this situation, I expected ...
|
||||||
|
- type: textarea
|
||||||
|
id: reproduction
|
||||||
|
attributes:
|
||||||
|
label: Steps to reproduce
|
||||||
|
description: Clearly describe which steps or actions you have taken to arrive at the problem. If you have some experience with the code, please link to the specific pieces of code.
|
||||||
|
placeholder: I did X, then Y, before arriving at Z, when ERROR ...
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: other
|
||||||
|
attributes:
|
||||||
|
label: Other information
|
||||||
|
description: Any other details?
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
name: "✨ Feature Request"
|
||||||
|
description: Suggest a feature or enhancement to improve Planka.
|
||||||
|
labels: ["Type: Idea"]
|
||||||
|
body:
|
||||||
|
- type: dropdown
|
||||||
|
id: idea-type
|
||||||
|
attributes:
|
||||||
|
label: Is this a feature for the backend or frontend?
|
||||||
|
multiple: true
|
||||||
|
options:
|
||||||
|
- Backend
|
||||||
|
- Frontend
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: feature
|
||||||
|
attributes:
|
||||||
|
label: What would you like?
|
||||||
|
description: A clear description of the feature or enhancement wanted.
|
||||||
|
placeholder: I'd like to be able to...
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: reason
|
||||||
|
attributes:
|
||||||
|
label: Why is this needed?
|
||||||
|
description: A clear description of why this would be useful to have.
|
||||||
|
placeholder: I want this because...
|
||||||
|
- type: textarea
|
||||||
|
id: other
|
||||||
|
attributes:
|
||||||
|
label: Other information
|
||||||
|
placeholder: Any other details?
|
||||||
@@ -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 }}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# https://docs.docker.com/build/ci/github-actions/multi-platform/
|
||||||
name: Build and push Docker DEV image
|
name: Build and push Docker DEV image
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@@ -8,9 +9,12 @@ on:
|
|||||||
- 'docker-*.sh'
|
- 'docker-*.sh'
|
||||||
- '*.md'
|
- '*.md'
|
||||||
branches: [master]
|
branches: [master]
|
||||||
|
workflow_dispatch:
|
||||||
|
env:
|
||||||
|
REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push-docker-image-dev:
|
build:
|
||||||
runs-on: self-hosted
|
runs-on: self-hosted
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@@ -29,11 +33,21 @@ jobs:
|
|||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
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
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v4
|
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:dev
|
labels: ${{ steps.metadata.outputs.labels }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|||||||
@@ -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@v4
|
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
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ 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
|
mark_as_latest: false
|
||||||
|
|||||||
Executable → Regular
-2
@@ -1,4 +1,2 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
. "$(dirname "$0")/_/husky.sh"
|
|
||||||
|
|
||||||
npx lint-staged
|
npx lint-staged
|
||||||
|
|||||||
+19
-6
@@ -1,35 +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 install pnpm --global \
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
&& pnpm install --prod
|
&& 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 install pnpm --global \
|
&& npm install pnpm --global \
|
||||||
|
&& pnpm import \
|
||||||
&& pnpm install --prod
|
&& 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
|
||||||
|
|
||||||
@@ -44,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" ]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# 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 many ways to install Planka
|
There are many ways to install Planka, [check them out](https://docs.planka.cloud/docs/intro).
|
||||||
|
|
||||||
[Check them out](https://docs.planka.cloud/docs/intro)
|
|
||||||
|
|
||||||
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,13 +15,13 @@ 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.10
|
version: 0.2.6
|
||||||
|
|
||||||
# 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.15.0"
|
appVersion: "1.21.0"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- alias: postgresql
|
- alias: postgresql
|
||||||
|
|||||||
@@ -14,11 +14,15 @@ 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 \
|
||||||
@@ -46,7 +50,7 @@ helm install planka . --set secretkey=$SECRETKEY \
|
|||||||
--set admin_email="demo@demo.demo" \
|
--set admin_email="demo@demo.demo" \
|
||||||
--set admin_password="demo" \
|
--set admin_password="demo" \
|
||||||
--set admin_name="Demo Demo" \
|
--set admin_name="Demo Demo" \
|
||||||
--set admin_username="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 \
|
||||||
|
|
||||||
@@ -55,7 +59,7 @@ helm install planka . --set secretkey=$SECRETKEY \
|
|||||||
--set admin_email="demo@demo.demo" \
|
--set admin_email="demo@demo.demo" \
|
||||||
--set admin_password="demo" \
|
--set admin_password="demo" \
|
||||||
--set admin_name="Demo Demo" \
|
--set admin_name="Demo Demo" \
|
||||||
--set admin_username="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 \
|
||||||
@@ -76,6 +80,7 @@ admin_name: "Demo Demo"
|
|||||||
admin_username: "demo"
|
admin_username: "demo"
|
||||||
# Admin user
|
# Admin user
|
||||||
|
|
||||||
|
# Ingress
|
||||||
ingress:
|
ingress:
|
||||||
enabled: true
|
enabled: true
|
||||||
hosts:
|
hosts:
|
||||||
|
|||||||
@@ -55,14 +55,32 @@ 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.baseUrl }}
|
{{- if .Values.baseUrl }}
|
||||||
value: {{ .Values.baseUrl }}
|
value: {{ .Values.baseUrl }}
|
||||||
@@ -72,21 +90,68 @@ spec:
|
|||||||
value: http://localhost:3000
|
value: http://localhost:3000
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: SECRET_KEY
|
- name: SECRET_KEY
|
||||||
|
{{- if .Values.existingSecretkeySecret }}
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ .Values.existingSecretkeySecret }}
|
||||||
|
key: key
|
||||||
|
{{- else }}
|
||||||
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 }}
|
||||||
|
{{- end }}
|
||||||
- name: TRUST_PROXY
|
- name: TRUST_PROXY
|
||||||
value: "0"
|
value: "0"
|
||||||
- name: DEFAULT_ADMIN_EMAIL
|
- name: DEFAULT_ADMIN_EMAIL
|
||||||
value: {{ .Values.admin_email }}
|
value: {{ .Values.admin_email }}
|
||||||
- name: DEFAULT_ADMIN_PASSWORD
|
|
||||||
value: {{ .Values.admin_password }}
|
|
||||||
- name: DEFAULT_ADMIN_NAME
|
- name: DEFAULT_ADMIN_NAME
|
||||||
value: {{ .Values.admin_name }}
|
value: {{ .Values.admin_name }}
|
||||||
|
{{- if .Values.existingAdminCredsSecret }}
|
||||||
|
- name: DEFAULT_ADMIN_USERNAME
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ .Values.existingAdminCredsSecret }}
|
||||||
|
key: username
|
||||||
|
- name: DEFAULT_ADMIN_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ .Values.existingAdminCredsSecret }}
|
||||||
|
key: password
|
||||||
|
{{- else }}
|
||||||
- name: DEFAULT_ADMIN_USERNAME
|
- name: DEFAULT_ADMIN_USERNAME
|
||||||
value: {{ .Values.admin_username }}
|
value: {{ .Values.admin_username }}
|
||||||
|
- name: DEFAULT_ADMIN_PASSWORD
|
||||||
|
value: {{ .Values.admin_password }}
|
||||||
|
{{- end }}
|
||||||
{{ range $k, $v := .Values.env }}
|
{{ range $k, $v := .Values.env }}
|
||||||
- name: {{ $k | quote }}
|
- name: {{ $k | quote }}
|
||||||
value: {{ $v | quote }}
|
value: {{ $v | quote }}
|
||||||
{{- end }}
|
{{- 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 }}
|
||||||
@@ -107,3 +172,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,16 @@ fullnameOverride: ""
|
|||||||
# Generate a secret using openssl rand -base64 45
|
# Generate a secret using openssl rand -base64 45
|
||||||
secretkey: ""
|
secretkey: ""
|
||||||
|
|
||||||
|
## @param existingSecretkeySecret Name of an existing secret containing the session key string
|
||||||
|
## NOTE: Must contain key `key`
|
||||||
|
## NOTE: When it's set, the secretkey parameter is ignored
|
||||||
|
existingSecretkeySecret: ""
|
||||||
|
|
||||||
|
## @param existingAdminCredsSecret Name of an existing secret containing the admin username and password
|
||||||
|
## NOTE: Must contain keys `username` and `password`
|
||||||
|
## NOTE: When it's set, the `admin_username` and `admin_password` parameters are ignored
|
||||||
|
existingAdminCredsSecret: ""
|
||||||
|
|
||||||
# Base url for Planka. Will override `ingress.hosts[0].host`
|
# Base url for Planka. Will override `ingress.hosts[0].host`
|
||||||
# Defaults to `http://localhost:3000` if ingress is disabled.
|
# Defaults to `http://localhost:3000` if ingress is disabled.
|
||||||
baseUrl: ""
|
baseUrl: ""
|
||||||
@@ -105,11 +115,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.15.0
|
REACT_APP_VERSION=1.21.0
|
||||||
|
|||||||
Generated
+9912
-4414
File diff suppressed because it is too large
Load Diff
+29
-21
@@ -49,67 +49,75 @@
|
|||||||
"**/*.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.30.0",
|
"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": "^23.7.6",
|
"i18next": "^23.12.2",
|
||||||
"i18next-browser-languagedetector": "^7.2.0",
|
"i18next-browser-languagedetector": "^8.0.0",
|
||||||
"initials": "^3.1.2",
|
"initials": "^3.1.2",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"jwt-decode": "^4.0.0",
|
"jwt-decode": "^4.0.0",
|
||||||
|
"linkify-react": "^4.1.3",
|
||||||
|
"linkifyjs": "^4.1.3",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"nanoid": "^5.0.3",
|
"nanoid": "^5.0.7",
|
||||||
"node-sass": "^9.0.0",
|
"node-sass": "^9.0.0",
|
||||||
"photoswipe": "^5.4.2",
|
"photoswipe": "^5.4.4",
|
||||||
"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.21.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": "^13.5.0",
|
"react-i18next": "^15.0.0",
|
||||||
"react-input-mask": "^2.0.4",
|
"react-input-mask": "^2.0.4",
|
||||||
"react-markdown": "^8.0.7",
|
"react-markdown": "^8.0.7",
|
||||||
"react-photoswipe-gallery": "^2.2.7",
|
"react-photoswipe-gallery": "^2.2.7",
|
||||||
"react-redux": "^8.1.3",
|
"react-redux": "^8.1.3",
|
||||||
"react-router-dom": "^6.19.0",
|
"react-router-dom": "^6.23.1",
|
||||||
"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.5.3",
|
"react-textarea-autosize": "^8.5.3",
|
||||||
"redux": "^4.2.1",
|
"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.3",
|
"redux-saga": "^1.3.0",
|
||||||
"remark-breaks": "^4.0.0",
|
"remark-breaks": "^4.0.0",
|
||||||
"remark-gfm": "^4.0.0",
|
"remark-gfm": "^3.0.1",
|
||||||
"reselect": "^4.1.8",
|
"reselect": "^4.1.8",
|
||||||
"sails.io.js": "^1.2.1",
|
"sails.io.js": "^1.2.1",
|
||||||
"semantic-ui-react": "^2.1.4",
|
"semantic-ui-react": "^2.1.5",
|
||||||
"socket.io-client": "^2.5.0",
|
"socket.io-client": "^2.5.0",
|
||||||
"validator": "^13.11.0",
|
"validator": "^13.12.0",
|
||||||
"whatwg-fetch": "^3.6.19",
|
"whatwg-fetch": "^3.6.20",
|
||||||
"zxcvbn": "^4.4.2"
|
"zxcvbn": "^4.4.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@testing-library/jest-dom": "^6.1.4",
|
"@testing-library/jest-dom": "^6.4.5",
|
||||||
"@testing-library/react": "^14.1.0",
|
"@testing-library/react": "^15.0.7",
|
||||||
"@testing-library/user-event": "^14.5.1",
|
"@testing-library/user-event": "^14.5.2",
|
||||||
"babel-preset-airbnb": "^5.0.0",
|
"babel-preset-airbnb": "^5.0.0",
|
||||||
"chai": "^4.3.10",
|
"chai": "^4.4.1",
|
||||||
"eslint": "^8.53.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-config-airbnb": "^19.0.4",
|
"eslint-config-airbnb": "^19.0.4",
|
||||||
"eslint-plugin-import": "^2.29.0",
|
"eslint-plugin-import": "^2.29.1",
|
||||||
"eslint-plugin-jsx-a11y": "^6.8.0",
|
"eslint-plugin-jsx-a11y": "^6.8.0",
|
||||||
"eslint-plugin-react": "^7.33.2",
|
"eslint-plugin-react": "^7.34.2",
|
||||||
"eslint-plugin-react-hooks": "^4.6.0",
|
"eslint-plugin-react-hooks": "^4.6.2",
|
||||||
"react-test-renderer": "^18.2.0"
|
"react-test-renderer": "^18.2.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
|
||||||
<meta name="theme-color" content="#000000" />
|
<meta name="theme-color" content="#000000" />
|
||||||
<meta
|
<meta
|
||||||
name="description"
|
name="description"
|
||||||
|
|||||||
@@ -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,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -53,10 +57,43 @@ updateCard.failure = (id, error) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const handleCardUpdate = (card) => ({
|
const handleCardUpdate = (card, isFetched, cardMemberships, cardLabels, tasks, attachments) => ({
|
||||||
type: ActionTypes.CARD_UPDATE_HANDLE,
|
type: ActionTypes.CARD_UPDATE_HANDLE,
|
||||||
payload: {
|
payload: {
|
||||||
card,
|
card,
|
||||||
|
isFetched,
|
||||||
|
cardMemberships,
|
||||||
|
cardLabels,
|
||||||
|
tasks,
|
||||||
|
attachments,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
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,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -89,11 +126,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,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -47,9 +47,11 @@ initializeCore.fetchConfig = (config) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const logout = () => ({
|
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,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ io.sails.environment = process.env.NODE_ENV;
|
|||||||
|
|
||||||
const { socket } = io;
|
const { socket } = io;
|
||||||
|
|
||||||
socket.path = `${Config.BASE_PATH}/socket.io`;
|
socket.path = `${Config.SERVER_BASE_PATH}/socket.io`;
|
||||||
socket.connect = socket._connect; // eslint-disable-line no-underscore-dangle
|
socket.connect = socket._connect; // eslint-disable-line no-underscore-dangle
|
||||||
|
|
||||||
['GET', 'POST', 'PUT', 'PATCH', 'DELETE'].forEach((method) => {
|
['GET', 'POST', 'PUT', 'PATCH', 'DELETE'].forEach((method) => {
|
||||||
|
|||||||
+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.
@@ -1,6 +1,8 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.wrapper {
|
.wrapper {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
max-height: 100vh;
|
||||||
|
max-width: 100vw;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
|
|||||||
@@ -48,16 +48,6 @@
|
|||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel {
|
|
||||||
align-items: center;
|
|
||||||
display: flex;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panelItem {
|
|
||||||
margin-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
margin: 0 20px;
|
margin: 0 20px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,12 +1,15 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.action {
|
.action {
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
margin-right: 20px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
gap: 20px;
|
||||||
|
justify-content: flex-start;
|
||||||
margin: 20px 20px;
|
margin: 20px 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,36 @@
|
|||||||
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;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
width: 220px;
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ const Card = React.memo(
|
|||||||
index,
|
index,
|
||||||
name,
|
name,
|
||||||
dueDate,
|
dueDate,
|
||||||
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
coverUrl,
|
coverUrl,
|
||||||
boardId,
|
boardId,
|
||||||
@@ -41,6 +42,7 @@ const Card = React.memo(
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
onMove,
|
onMove,
|
||||||
onTransfer,
|
onTransfer,
|
||||||
|
onDuplicate,
|
||||||
onDelete,
|
onDelete,
|
||||||
onUserAdd,
|
onUserAdd,
|
||||||
onUserRemove,
|
onUserRemove,
|
||||||
@@ -119,7 +121,7 @@ const Card = React.memo(
|
|||||||
)}
|
)}
|
||||||
{dueDate && (
|
{dueDate && (
|
||||||
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
<span className={classNames(styles.attachment, styles.attachmentLeft)}>
|
||||||
<DueDate value={dueDate} size="tiny" />
|
<DueDate value={dueDate} isCompleted={isDueDateCompleted} size="tiny" />
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{stopwatch && (
|
{stopwatch && (
|
||||||
@@ -185,6 +187,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}
|
||||||
@@ -219,6 +222,7 @@ Card.propTypes = {
|
|||||||
index: PropTypes.number.isRequired,
|
index: PropTypes.number.isRequired,
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
dueDate: PropTypes.instanceOf(Date),
|
dueDate: PropTypes.instanceOf(Date),
|
||||||
|
isDueDateCompleted: PropTypes.bool,
|
||||||
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
coverUrl: PropTypes.string,
|
coverUrl: PropTypes.string,
|
||||||
boardId: PropTypes.string.isRequired,
|
boardId: PropTypes.string.isRequired,
|
||||||
@@ -238,6 +242,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,
|
||||||
@@ -252,6 +257,7 @@ Card.propTypes = {
|
|||||||
|
|
||||||
Card.defaultProps = {
|
Card.defaultProps = {
|
||||||
dueDate: undefined,
|
dueDate: undefined,
|
||||||
|
isDueDateCompleted: undefined,
|
||||||
stopwatch: undefined,
|
stopwatch: undefined,
|
||||||
coverUrl: undefined,
|
coverUrl: undefined,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,6 +21,14 @@
|
|||||||
background: #ebeef0;
|
background: #ebeef0;
|
||||||
color: #516b7a;
|
color: #516b7a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
&:focus,
|
||||||
|
&:active {
|
||||||
|
background: #ebeef0;
|
||||||
|
color: #516b7a;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.attachment {
|
.attachment {
|
||||||
@@ -55,6 +63,12 @@
|
|||||||
box-shadow: 0 1px 0 #ccc;
|
box-shadow: 0 1px 0 #ccc;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
.target {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background: #f5f6f7;
|
background: #f5f6f7;
|
||||||
border-bottom-color: rgba(9, 30, 66, 0.25);
|
border-bottom-color: rgba(9, 30, 66, 0.25);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ 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 { useClosableForm, useField } from '../../hooks';
|
||||||
|
import { focusEnd } from '../../utils/element-helpers';
|
||||||
|
|
||||||
import styles from './NameEdit.module.scss';
|
import styles from './NameEdit.module.scss';
|
||||||
|
|
||||||
@@ -79,7 +80,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isOpened) {
|
if (isOpened) {
|
||||||
field.current.ref.current.focus();
|
focusEnd(field.current.ref.current);
|
||||||
}
|
}
|
||||||
}, [isOpened]);
|
}, [isOpened]);
|
||||||
|
|
||||||
|
|||||||
@@ -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: "–";
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import TextareaAutosize from 'react-textarea-autosize';
|
|||||||
import { Button, Form, TextArea } from 'semantic-ui-react';
|
import { Button, Form, TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useForm } from '../../../hooks';
|
import { useForm } from '../../../hooks';
|
||||||
|
import { focusEnd } from '../../../utils/element-helpers';
|
||||||
|
|
||||||
import styles from './CommentEdit.module.scss';
|
import styles from './CommentEdit.module.scss';
|
||||||
|
|
||||||
@@ -70,7 +71,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isOpened) {
|
if (isOpened) {
|
||||||
textField.current.ref.current.focus();
|
focusEnd(textField.current.ref.current);
|
||||||
}
|
}
|
||||||
}, [isOpened]);
|
}, [isOpened]);
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import React, { useCallback, useRef } from 'react';
|
import React, { useCallback, useRef, useState } 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 { Button, Grid, Icon, Modal } from 'semantic-ui-react';
|
import { Button, Checkbox, Grid, Icon, Modal } 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';
|
||||||
|
|
||||||
@@ -32,6 +32,7 @@ const CardModal = React.memo(
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
isSubscribed,
|
isSubscribed,
|
||||||
isActivitiesFetching,
|
isActivitiesFetching,
|
||||||
@@ -55,6 +56,7 @@ const CardModal = React.memo(
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
onMove,
|
onMove,
|
||||||
onTransfer,
|
onTransfer,
|
||||||
|
onDuplicate,
|
||||||
onDelete,
|
onDelete,
|
||||||
onUserAdd,
|
onUserAdd,
|
||||||
onUserRemove,
|
onUserRemove,
|
||||||
@@ -80,6 +82,7 @@ const CardModal = React.memo(
|
|||||||
onClose,
|
onClose,
|
||||||
}) => {
|
}) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
const [isLinkCopied, setIsLinkCopied] = useState(false);
|
||||||
|
|
||||||
const isGalleryOpened = useRef(false);
|
const isGalleryOpened = useRef(false);
|
||||||
|
|
||||||
@@ -116,6 +119,12 @@ const CardModal = React.memo(
|
|||||||
[onUpdate],
|
[onUpdate],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handleDueDateCompletionChange = useCallback(() => {
|
||||||
|
onUpdate({
|
||||||
|
isDueDateCompleted: !isDueDateCompleted,
|
||||||
|
});
|
||||||
|
}, [isDueDateCompleted, onUpdate]);
|
||||||
|
|
||||||
const handleStopwatchUpdate = useCallback(
|
const handleStopwatchUpdate = useCallback(
|
||||||
(newStopwatch) => {
|
(newStopwatch) => {
|
||||||
onUpdate({
|
onUpdate({
|
||||||
@@ -140,6 +149,19 @@ const CardModal = React.memo(
|
|||||||
});
|
});
|
||||||
}, [isSubscribed, onUpdate]);
|
}, [isSubscribed, onUpdate]);
|
||||||
|
|
||||||
|
const handleDuplicateClick = useCallback(() => {
|
||||||
|
onDuplicate();
|
||||||
|
onClose();
|
||||||
|
}, [onDuplicate, onClose]);
|
||||||
|
|
||||||
|
const handleCopyLinkClick = useCallback(() => {
|
||||||
|
navigator.clipboard.writeText(window.location.href);
|
||||||
|
setIsLinkCopied(true);
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsLinkCopied(false);
|
||||||
|
}, 5000);
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleGalleryOpen = useCallback(() => {
|
const handleGalleryOpen = useCallback(() => {
|
||||||
isGalleryOpened.current = true;
|
isGalleryOpened.current = true;
|
||||||
}, []);
|
}, []);
|
||||||
@@ -285,13 +307,24 @@ const CardModal = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<span className={styles.attachment}>
|
<span className={classNames(styles.attachment, styles.attachmentDueDate)}>
|
||||||
{canEdit ? (
|
{canEdit ? (
|
||||||
|
<>
|
||||||
|
<Checkbox
|
||||||
|
checked={isDueDateCompleted}
|
||||||
|
disabled={!canEdit}
|
||||||
|
onChange={handleDueDateCompletionChange}
|
||||||
|
/>
|
||||||
<DueDateEditPopup defaultValue={dueDate} onUpdate={handleDueDateUpdate}>
|
<DueDateEditPopup defaultValue={dueDate} onUpdate={handleDueDateUpdate}>
|
||||||
<DueDate value={dueDate} />
|
<DueDate
|
||||||
|
withStatusIcon
|
||||||
|
value={dueDate}
|
||||||
|
isCompleted={isDueDateCompleted}
|
||||||
|
/>
|
||||||
</DueDateEditPopup>
|
</DueDateEditPopup>
|
||||||
|
</>
|
||||||
) : (
|
) : (
|
||||||
<DueDate value={dueDate} />
|
<DueDate withStatusIcon value={dueDate} isCompleted={isDueDateCompleted} />
|
||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -496,6 +529,23 @@ 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>
|
||||||
|
{window.isSecureContext && (
|
||||||
|
<Button fluid className={styles.actionButton} onClick={handleCopyLinkClick}>
|
||||||
|
<Icon
|
||||||
|
name={isLinkCopied ? 'linkify' : 'unlink'}
|
||||||
|
className={styles.actionIcon}
|
||||||
|
/>
|
||||||
|
{isLinkCopied
|
||||||
|
? t('common.linkIsCopied')
|
||||||
|
: t('action.copyLink', {
|
||||||
|
context: 'title',
|
||||||
|
})}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<DeletePopup
|
<DeletePopup
|
||||||
title="common.deleteCard"
|
title="common.deleteCard"
|
||||||
content="common.areYouSureYouWantToDeleteThisCard"
|
content="common.areYouSureYouWantToDeleteThisCard"
|
||||||
@@ -530,6 +580,7 @@ CardModal.propTypes = {
|
|||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
description: PropTypes.string,
|
description: PropTypes.string,
|
||||||
dueDate: PropTypes.instanceOf(Date),
|
dueDate: PropTypes.instanceOf(Date),
|
||||||
|
isDueDateCompleted: PropTypes.bool,
|
||||||
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
|
||||||
isSubscribed: PropTypes.bool.isRequired,
|
isSubscribed: PropTypes.bool.isRequired,
|
||||||
isActivitiesFetching: PropTypes.bool.isRequired,
|
isActivitiesFetching: PropTypes.bool.isRequired,
|
||||||
@@ -555,6 +606,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,
|
||||||
@@ -583,6 +635,7 @@ CardModal.propTypes = {
|
|||||||
CardModal.defaultProps = {
|
CardModal.defaultProps = {
|
||||||
description: undefined,
|
description: undefined,
|
||||||
dueDate: undefined,
|
dueDate: undefined,
|
||||||
|
isDueDateCompleted: false,
|
||||||
stopwatch: undefined,
|
stopwatch: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -20,12 +20,20 @@
|
|||||||
|
|
||||||
.actionIcon {
|
.actionIcon {
|
||||||
color: #17394d;
|
color: #17394d;
|
||||||
display: inline;
|
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 425px) {
|
||||||
|
padding: 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.actionsTitle {
|
.actionsTitle {
|
||||||
@@ -50,6 +58,12 @@
|
|||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.attachmentDueDate {
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.attachments {
|
.attachments {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin: 0 8px 8px 0;
|
margin: 0 8px 8px 0;
|
||||||
@@ -63,6 +77,11 @@
|
|||||||
|
|
||||||
.contentPadding {
|
.contentPadding {
|
||||||
padding: 8px 8px 0 16px;
|
padding: 8px 8px 0 16px;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
padding-right: 16px;
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.cursorPointer {
|
.cursorPointer {
|
||||||
@@ -155,6 +174,11 @@
|
|||||||
|
|
||||||
.modalPadding {
|
.modalPadding {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column nowrap;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.moduleHeader {
|
.moduleHeader {
|
||||||
@@ -185,6 +209,15 @@
|
|||||||
|
|
||||||
.sidebarPadding {
|
.sidebarPadding {
|
||||||
padding: 8px 16px 0 8px;
|
padding: 8px 16px 0 8px;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
align-items: flex-start;
|
||||||
|
display: flex;
|
||||||
|
flex-flow: row wrap;
|
||||||
|
gap: 10px;
|
||||||
|
padding-left: 16px;
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.text {
|
.text {
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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 && (
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import TextareaAutosize from 'react-textarea-autosize';
|
|||||||
import { Button, Form, TextArea } from 'semantic-ui-react';
|
import { Button, Form, TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useField } from '../../../hooks';
|
import { useField } from '../../../hooks';
|
||||||
|
import { focusEnd } from '../../../utils/element-helpers';
|
||||||
|
|
||||||
import styles from './NameEdit.module.scss';
|
import styles from './NameEdit.module.scss';
|
||||||
|
|
||||||
@@ -65,7 +66,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isOpened) {
|
if (isOpened) {
|
||||||
field.current.ref.current.focus();
|
focusEnd(field.current.ref.current);
|
||||||
}
|
}
|
||||||
}, [isOpened]);
|
}, [isOpened]);
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
bottom: 20px;
|
bottom: 20px;
|
||||||
box-shadow: #b04632 0 1px 0;
|
box-shadow: #b04632 0 1px 0;
|
||||||
|
max-width: calc(100% - 40px);
|
||||||
padding: 12px 18px;
|
padding: 12px 18px;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
right: 20px;
|
right: 20px;
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import upperFirst from 'lodash/upperFirst';
|
import upperFirst from 'lodash/upperFirst';
|
||||||
import React from 'react';
|
import React, { useEffect, 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 { Icon } from 'semantic-ui-react';
|
||||||
|
import { useForceUpdate } from '../../lib/hooks';
|
||||||
|
|
||||||
|
import getDateFormat from '../../utils/get-date-format';
|
||||||
|
|
||||||
import styles from './DueDate.module.scss';
|
import styles from './DueDate.module.scss';
|
||||||
|
|
||||||
@@ -12,27 +16,111 @@ const SIZES = {
|
|||||||
MEDIUM: 'medium',
|
MEDIUM: 'medium',
|
||||||
};
|
};
|
||||||
|
|
||||||
const FORMATS = {
|
const STATUSES = {
|
||||||
|
DUE_SOON: 'dueSoon',
|
||||||
|
OVERDUE: 'overdue',
|
||||||
|
COMPLETED: 'completed',
|
||||||
|
};
|
||||||
|
|
||||||
|
const LONG_DATE_FORMAT_BY_SIZE = {
|
||||||
tiny: 'longDate',
|
tiny: 'longDate',
|
||||||
small: 'longDate',
|
small: 'longDate',
|
||||||
medium: 'longDateTime',
|
medium: 'longDateTime',
|
||||||
};
|
};
|
||||||
|
|
||||||
const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
const FULL_DATE_FORMAT_BY_SIZE = {
|
||||||
|
tiny: 'fullDate',
|
||||||
|
small: 'fullDate',
|
||||||
|
medium: 'fullDateTime',
|
||||||
|
};
|
||||||
|
|
||||||
|
const STATUS_ICON_PROPS_BY_STATUS = {
|
||||||
|
[STATUSES.DUE_SOON]: {
|
||||||
|
name: 'hourglass half',
|
||||||
|
color: 'orange',
|
||||||
|
},
|
||||||
|
[STATUSES.OVERDUE]: {
|
||||||
|
name: 'hourglass end',
|
||||||
|
color: 'red',
|
||||||
|
},
|
||||||
|
[STATUSES.COMPLETED]: {
|
||||||
|
name: 'checkmark',
|
||||||
|
color: 'green',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const getStatus = (dateTime, isCompleted) => {
|
||||||
|
if (isCompleted) {
|
||||||
|
return STATUSES.COMPLETED;
|
||||||
|
}
|
||||||
|
|
||||||
|
const secondsLeft = Math.floor((dateTime.getTime() - new Date().getTime()) / 1000);
|
||||||
|
|
||||||
|
if (secondsLeft <= 0) {
|
||||||
|
return STATUSES.OVERDUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (secondsLeft <= 24 * 60 * 60) {
|
||||||
|
return STATUSES.DUE_SOON;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const DueDate = React.memo(({ value, size, isCompleted, isDisabled, withStatusIcon, onClick }) => {
|
||||||
const [t] = useTranslation();
|
const [t] = useTranslation();
|
||||||
|
const forceUpdate = useForceUpdate();
|
||||||
|
|
||||||
|
const statusRef = useRef(null);
|
||||||
|
statusRef.current = getStatus(value, isCompleted);
|
||||||
|
|
||||||
|
const intervalRef = useRef(null);
|
||||||
|
|
||||||
|
const dateFormat = getDateFormat(
|
||||||
|
value,
|
||||||
|
LONG_DATE_FORMAT_BY_SIZE[size],
|
||||||
|
FULL_DATE_FORMAT_BY_SIZE[size],
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if ([null, STATUSES.DUE_SOON].includes(statusRef.current)) {
|
||||||
|
intervalRef.current = setInterval(() => {
|
||||||
|
const status = getStatus(value, isCompleted);
|
||||||
|
|
||||||
|
if (status !== statusRef.current) {
|
||||||
|
forceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status === STATUSES.OVERDUE) {
|
||||||
|
clearInterval(intervalRef.current);
|
||||||
|
}
|
||||||
|
}, 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (intervalRef.current) {
|
||||||
|
clearInterval(intervalRef.current);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}, [value, isCompleted, forceUpdate]);
|
||||||
|
|
||||||
const contentNode = (
|
const contentNode = (
|
||||||
<span
|
<span
|
||||||
className={classNames(
|
className={classNames(
|
||||||
styles.wrapper,
|
styles.wrapper,
|
||||||
styles[`wrapper${upperFirst(size)}`],
|
styles[`wrapper${upperFirst(size)}`],
|
||||||
|
!withStatusIcon && statusRef.current && styles[`wrapper${upperFirst(statusRef.current)}`],
|
||||||
onClick && styles.wrapperHoverable,
|
onClick && styles.wrapperHoverable,
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{t(`format:${FORMATS[size]}`, {
|
{t(`format:${dateFormat}`, {
|
||||||
value,
|
value,
|
||||||
postProcess: 'formatDate',
|
postProcess: 'formatDate',
|
||||||
})}
|
})}
|
||||||
|
{withStatusIcon && statusRef.current && (
|
||||||
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||||
|
<Icon {...STATUS_ICON_PROPS_BY_STATUS[statusRef.current]} className={styles.statusIcon} />
|
||||||
|
)}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -48,14 +136,19 @@ const DueDate = React.memo(({ value, size, isDisabled, onClick }) => {
|
|||||||
DueDate.propTypes = {
|
DueDate.propTypes = {
|
||||||
value: PropTypes.instanceOf(Date).isRequired,
|
value: PropTypes.instanceOf(Date).isRequired,
|
||||||
size: PropTypes.oneOf(Object.values(SIZES)),
|
size: PropTypes.oneOf(Object.values(SIZES)),
|
||||||
|
isCompleted: PropTypes.bool.isRequired,
|
||||||
isDisabled: PropTypes.bool,
|
isDisabled: PropTypes.bool,
|
||||||
|
withStatusIcon: PropTypes.bool,
|
||||||
onClick: PropTypes.func,
|
onClick: PropTypes.func,
|
||||||
|
onCompletionToggle: PropTypes.func,
|
||||||
};
|
};
|
||||||
|
|
||||||
DueDate.defaultProps = {
|
DueDate.defaultProps = {
|
||||||
size: SIZES.MEDIUM,
|
size: SIZES.MEDIUM,
|
||||||
isDisabled: false,
|
isDisabled: false,
|
||||||
|
withStatusIcon: false,
|
||||||
onClick: undefined,
|
onClick: undefined,
|
||||||
|
onCompletionToggle: undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default DueDate;
|
export default DueDate;
|
||||||
|
|||||||
@@ -8,16 +8,17 @@
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.statusIcon {
|
||||||
|
line-height: 1;
|
||||||
|
margin: 0 0 0 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
background: #dce0e4;
|
background: #dce0e4;
|
||||||
border: none;
|
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
color: #6a808b;
|
color: #6a808b;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
outline: none;
|
|
||||||
text-align: left;
|
|
||||||
transition: background 0.3s ease;
|
transition: background 0.3s ease;
|
||||||
vertical-align: top;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.wrapperHoverable:hover {
|
.wrapperHoverable:hover {
|
||||||
@@ -43,4 +44,21 @@
|
|||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
padding: 6px 12px;
|
padding: 6px 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Statuses */
|
||||||
|
|
||||||
|
.wrapperDueSoon {
|
||||||
|
background: #f2711c;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wrapperOverdue {
|
||||||
|
background: #db2828;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.wrapperCompleted {
|
||||||
|
background: #21ba45;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
:global(#app) {
|
:global(#app) {
|
||||||
.wrapper {
|
.wrapper {
|
||||||
|
max-width: 100vw;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ 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';
|
||||||
@@ -91,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>
|
||||||
|
|||||||
@@ -86,6 +86,15 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.userName {
|
||||||
|
display: none;
|
||||||
|
margin-right: 10px;
|
||||||
|
|
||||||
|
@media only screen and (min-width: 797px) {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.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;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ const SIZES = {
|
|||||||
|
|
||||||
const Label = React.memo(({ name, color, size, isDisabled, onClick }) => {
|
const Label = React.memo(({ name, color, size, isDisabled, onClick }) => {
|
||||||
const contentNode = (
|
const contentNode = (
|
||||||
<div
|
<span
|
||||||
title={name}
|
title={name}
|
||||||
className={classNames(
|
className={classNames(
|
||||||
styles.wrapper,
|
styles.wrapper,
|
||||||
@@ -28,7 +28,7 @@ const Label = React.memo(({ name, color, size, isDisabled, onClick }) => {
|
|||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
{name || '\u00A0'}
|
{name || '\u00A0'}
|
||||||
</div>
|
</span>
|
||||||
);
|
);
|
||||||
|
|
||||||
return onClick ? (
|
return onClick ? (
|
||||||
|
|||||||
@@ -11,17 +11,17 @@
|
|||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
box-sizing: border-box;
|
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
display: inline-block;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
outline: none;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
|
text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
|
||||||
|
vertical-align: top;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wrapperNameless{
|
.wrapperNameless {
|
||||||
width: 40px;
|
width: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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,11 +29,30 @@ 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(
|
||||||
|
(type) => {
|
||||||
|
onSort({
|
||||||
|
type,
|
||||||
|
});
|
||||||
|
|
||||||
|
onClose();
|
||||||
|
},
|
||||||
|
[onSort, onClose],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (step && step.type) {
|
||||||
|
switch (step.type) {
|
||||||
|
case StepTypes.SORT:
|
||||||
|
return <ListSortStep onTypeSelect={handleSortTypeSelect} onBack={handleBack} />;
|
||||||
|
case StepTypes.DELETE:
|
||||||
return (
|
return (
|
||||||
<DeleteStep
|
<DeleteStep
|
||||||
title="common.deleteList"
|
title="common.deleteList"
|
||||||
@@ -41,6 +62,8 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
|
|||||||
onBack={handleBack}
|
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 {
|
||||||
@@ -81,6 +80,12 @@
|
|||||||
&:hover .target {
|
&:hover .target {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
.target {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerEditable {
|
.headerEditable {
|
||||||
@@ -104,6 +109,14 @@
|
|||||||
background: rgba(9, 30, 66, 0.13);
|
background: rgba(9, 30, 66, 0.13);
|
||||||
color: #516b7a;
|
color: #516b7a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
&:focus,
|
||||||
|
&:active {
|
||||||
|
background: rgba(9, 30, 66, 0.13);
|
||||||
|
color: #516b7a;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.headerName {
|
.headerName {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import TextareaAutosize from 'react-textarea-autosize';
|
|||||||
import { TextArea } from 'semantic-ui-react';
|
import { TextArea } from 'semantic-ui-react';
|
||||||
|
|
||||||
import { useField } from '../../hooks';
|
import { useField } from '../../hooks';
|
||||||
|
import { focusEnd } from '../../utils/element-helpers';
|
||||||
|
|
||||||
import styles from './NameEdit.module.scss';
|
import styles from './NameEdit.module.scss';
|
||||||
|
|
||||||
@@ -71,7 +72,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isOpened) {
|
if (isOpened) {
|
||||||
field.current.ref.current.select();
|
focusEnd(field.current.ref.current);
|
||||||
}
|
}
|
||||||
}, [isOpened]);
|
}, [isOpened]);
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -68,6 +68,7 @@ const Login = React.memo(
|
|||||||
isSubmittingUsingOidc,
|
isSubmittingUsingOidc,
|
||||||
error,
|
error,
|
||||||
withOidc,
|
withOidc,
|
||||||
|
isOidcEnforced,
|
||||||
onAuthenticate,
|
onAuthenticate,
|
||||||
onAuthenticateUsingOidc,
|
onAuthenticateUsingOidc,
|
||||||
onMessageDismiss,
|
onMessageDismiss,
|
||||||
@@ -107,8 +108,10 @@ const Login = React.memo(
|
|||||||
}, [onAuthenticate, data]);
|
}, [onAuthenticate, data]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!isOidcEnforced) {
|
||||||
emailOrUsernameField.current.focus();
|
emailOrUsernameField.current.focus();
|
||||||
}, []);
|
}
|
||||||
|
}, [isOidcEnforced]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (wasSubmitting && !isSubmitting && error) {
|
if (wasSubmitting && !isSubmitting && error) {
|
||||||
@@ -159,6 +162,7 @@ const Login = React.memo(
|
|||||||
onDismiss={onMessageDismiss}
|
onDismiss={onMessageDismiss}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{!isOidcEnforced && (
|
||||||
<Form size="large" onSubmit={handleSubmit}>
|
<Form size="large" onSubmit={handleSubmit}>
|
||||||
<div className={styles.inputWrapper}>
|
<div className={styles.inputWrapper}>
|
||||||
<div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
|
<div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
|
||||||
@@ -195,15 +199,20 @@ const Login = React.memo(
|
|||||||
disabled={isSubmitting || isSubmittingUsingOidc}
|
disabled={isSubmitting || isSubmittingUsingOidc}
|
||||||
/>
|
/>
|
||||||
</Form>
|
</Form>
|
||||||
|
)}
|
||||||
{withOidc && (
|
{withOidc && (
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
|
fluid={isOidcEnforced}
|
||||||
|
primary={isOidcEnforced}
|
||||||
|
size={isOidcEnforced ? 'large' : undefined}
|
||||||
|
icon={isOidcEnforced ? 'right arrow' : undefined}
|
||||||
|
labelPosition={isOidcEnforced ? 'right' : undefined}
|
||||||
|
content={t('action.logInWithSSO')}
|
||||||
loading={isSubmittingUsingOidc}
|
loading={isSubmittingUsingOidc}
|
||||||
disabled={isSubmitting || isSubmittingUsingOidc}
|
disabled={isSubmitting || isSubmittingUsingOidc}
|
||||||
onClick={onAuthenticateUsingOidc}
|
onClick={onAuthenticateUsingOidc}
|
||||||
>
|
/>
|
||||||
{t('action.logInWithSSO')}
|
|
||||||
</Button>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -242,6 +251,7 @@ Login.propTypes = {
|
|||||||
isSubmittingUsingOidc: 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,
|
withOidc: PropTypes.bool.isRequired,
|
||||||
|
isOidcEnforced: PropTypes.bool.isRequired,
|
||||||
onAuthenticate: PropTypes.func.isRequired,
|
onAuthenticate: PropTypes.func.isRequired,
|
||||||
onAuthenticateUsingOidc: PropTypes.func.isRequired,
|
onAuthenticateUsingOidc: PropTypes.func.isRequired,
|
||||||
onMessageDismiss: PropTypes.func.isRequired,
|
onMessageDismiss: PropTypes.func.isRequired,
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -11,6 +11,10 @@
|
|||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
width: 36px;
|
width: 36px;
|
||||||
|
|
||||||
|
@media only screen and (max-width: 797px) {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background: rgba(0, 0, 0, 0.32);
|
background: rgba(0, 0, 0, 0.32);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -13,6 +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 }) {
|
||||||
|
|||||||
@@ -10,13 +10,10 @@
|
|||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
background: #dce0e4;
|
background: #dce0e4;
|
||||||
border: none;
|
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
color: #6a808b;
|
color: #6a808b;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
font-variant-numeric: tabular-nums;
|
font-variant-numeric: tabular-nums;
|
||||||
outline: none;
|
|
||||||
text-align: left;
|
|
||||||
transition: background 0.3s ease;
|
transition: background 0.3s ease;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,12 +14,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.wrapper {
|
.wrapper {
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
outline: none;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ const AccountPane = React.memo(
|
|||||||
organization,
|
organization,
|
||||||
language,
|
language,
|
||||||
isLocked,
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -104,7 +105,7 @@ const AccountPane = React.memo(
|
|||||||
value={language || 'auto'}
|
value={language || 'auto'}
|
||||||
onChange={handleLanguageChange}
|
onChange={handleLanguageChange}
|
||||||
/>
|
/>
|
||||||
{!isLocked && (
|
{(!isLocked || !isUsernameLocked) && (
|
||||||
<>
|
<>
|
||||||
<Divider horizontal section>
|
<Divider horizontal section>
|
||||||
<Header as="h4">
|
<Header as="h4">
|
||||||
@@ -113,13 +114,14 @@ const AccountPane = React.memo(
|
|||||||
})}
|
})}
|
||||||
</Header>
|
</Header>
|
||||||
</Divider>
|
</Divider>
|
||||||
|
{!isUsernameLocked && (
|
||||||
<div className={styles.action}>
|
<div className={styles.action}>
|
||||||
<UserUsernameEditPopup
|
<UserUsernameEditPopup
|
||||||
usePasswordConfirmation
|
|
||||||
defaultData={usernameUpdateForm.data}
|
defaultData={usernameUpdateForm.data}
|
||||||
username={username}
|
username={username}
|
||||||
isSubmitting={usernameUpdateForm.isSubmitting}
|
isSubmitting={usernameUpdateForm.isSubmitting}
|
||||||
error={usernameUpdateForm.error}
|
error={usernameUpdateForm.error}
|
||||||
|
usePasswordConfirmation={!isLocked} // FIXME: hack
|
||||||
onUpdate={onUsernameUpdate}
|
onUpdate={onUsernameUpdate}
|
||||||
onMessageDismiss={onUsernameUpdateMessageDismiss}
|
onMessageDismiss={onUsernameUpdateMessageDismiss}
|
||||||
>
|
>
|
||||||
@@ -130,6 +132,9 @@ const AccountPane = React.memo(
|
|||||||
</Button>
|
</Button>
|
||||||
</UserUsernameEditPopup>
|
</UserUsernameEditPopup>
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
|
{!isLocked && (
|
||||||
|
<>
|
||||||
<div className={styles.action}>
|
<div className={styles.action}>
|
||||||
<UserEmailEditPopup
|
<UserEmailEditPopup
|
||||||
usePasswordConfirmation
|
usePasswordConfirmation
|
||||||
@@ -165,6 +170,8 @@ const AccountPane = React.memo(
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</Tab.Pane>
|
</Tab.Pane>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -179,6 +186,7 @@ AccountPane.propTypes = {
|
|||||||
organization: PropTypes.string,
|
organization: PropTypes.string,
|
||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
isLocked: 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,
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ const UserSettingsModal = React.memo(
|
|||||||
language,
|
language,
|
||||||
subscribeToOwnCards,
|
subscribeToOwnCards,
|
||||||
isLocked,
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isAvatarUpdating,
|
isAvatarUpdating,
|
||||||
usernameUpdateForm,
|
usernameUpdateForm,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
@@ -50,6 +51,7 @@ const UserSettingsModal = React.memo(
|
|||||||
organization={organization}
|
organization={organization}
|
||||||
language={language}
|
language={language}
|
||||||
isLocked={isLocked}
|
isLocked={isLocked}
|
||||||
|
isUsernameLocked={isUsernameLocked}
|
||||||
isAvatarUpdating={isAvatarUpdating}
|
isAvatarUpdating={isAvatarUpdating}
|
||||||
usernameUpdateForm={usernameUpdateForm}
|
usernameUpdateForm={usernameUpdateForm}
|
||||||
emailUpdateForm={emailUpdateForm}
|
emailUpdateForm={emailUpdateForm}
|
||||||
@@ -108,6 +110,7 @@ UserSettingsModal.propTypes = {
|
|||||||
language: PropTypes.string,
|
language: PropTypes.string,
|
||||||
subscribeToOwnCards: PropTypes.bool.isRequired,
|
subscribeToOwnCards: PropTypes.bool.isRequired,
|
||||||
isLocked: 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,
|
||||||
|
|||||||
@@ -136,13 +136,15 @@ const ActionsStep = React.memo(
|
|||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
{!user.isLocked && (
|
{!user.isUsernameLocked && (
|
||||||
<>
|
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
|
<Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
|
||||||
{t('action.editUsername', {
|
{t('action.editUsername', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
})}
|
})}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
|
)}
|
||||||
|
{!user.isLocked && (
|
||||||
|
<>
|
||||||
<Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
|
<Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
|
||||||
{t('action.editEmail', {
|
{t('action.editEmail', {
|
||||||
context: 'title',
|
context: 'title',
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ const Item = React.memo(
|
|||||||
isAdmin,
|
isAdmin,
|
||||||
isLocked,
|
isLocked,
|
||||||
isRoleLocked,
|
isRoleLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isDeletionLocked,
|
isDeletionLocked,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
@@ -61,6 +62,7 @@ const Item = React.memo(
|
|||||||
phone,
|
phone,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
isLocked,
|
isLocked,
|
||||||
|
isUsernameLocked,
|
||||||
isDeletionLocked,
|
isDeletionLocked,
|
||||||
emailUpdateForm,
|
emailUpdateForm,
|
||||||
passwordUpdateForm,
|
passwordUpdateForm,
|
||||||
@@ -95,6 +97,7 @@ Item.propTypes = {
|
|||||||
isAdmin: PropTypes.bool.isRequired,
|
isAdmin: PropTypes.bool.isRequired,
|
||||||
isLocked: PropTypes.bool.isRequired,
|
isLocked: PropTypes.bool.isRequired,
|
||||||
isRoleLocked: PropTypes.bool.isRequired,
|
isRoleLocked: PropTypes.bool.isRequired,
|
||||||
|
isUsernameLocked: PropTypes.bool.isRequired,
|
||||||
isDeletionLocked: 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,
|
||||||
|
|||||||
@@ -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,
|
||||||
@@ -112,6 +113,7 @@ const UsersModal = React.memo(
|
|||||||
isAdmin={item.isAdmin}
|
isAdmin={item.isAdmin}
|
||||||
isLocked={item.isLocked}
|
isLocked={item.isLocked}
|
||||||
isRoleLocked={item.isRoleLocked}
|
isRoleLocked={item.isRoleLocked}
|
||||||
|
isUsernameLocked={item.isUsernameLocked}
|
||||||
isDeletionLocked={item.isDeletionLocked}
|
isDeletionLocked={item.isDeletionLocked}
|
||||||
emailUpdateForm={item.emailUpdateForm}
|
emailUpdateForm={item.emailUpdateForm}
|
||||||
passwordUpdateForm={item.passwordUpdateForm}
|
passwordUpdateForm={item.passwordUpdateForm}
|
||||||
@@ -129,11 +131,13 @@ const UsersModal = React.memo(
|
|||||||
</Table.Body>
|
</Table.Body>
|
||||||
</Table>
|
</Table>
|
||||||
</Modal.Content>
|
</Modal.Content>
|
||||||
|
{canAdd && (
|
||||||
<Modal.Actions>
|
<Modal.Actions>
|
||||||
<UserAddPopupContainer>
|
<UserAddPopupContainer>
|
||||||
<Button positive content={t('action.addUser')} />
|
<Button positive content={t('action.addUser')} />
|
||||||
</UserAddPopupContainer>
|
</UserAddPopupContainer>
|
||||||
</Modal.Actions>
|
</Modal.Actions>
|
||||||
|
)}
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -141,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,
|
||||||
|
|||||||
@@ -173,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',
|
||||||
@@ -191,13 +195,14 @@ export default {
|
|||||||
CARD_UPDATE__SUCCESS: 'CARD_UPDATE__SUCCESS',
|
CARD_UPDATE__SUCCESS: 'CARD_UPDATE__SUCCESS',
|
||||||
CARD_UPDATE__FAILURE: 'CARD_UPDATE__FAILURE',
|
CARD_UPDATE__FAILURE: 'CARD_UPDATE__FAILURE',
|
||||||
CARD_UPDATE_HANDLE: 'CARD_UPDATE_HANDLE',
|
CARD_UPDATE_HANDLE: 'CARD_UPDATE_HANDLE',
|
||||||
CARD_TRANSFER: 'CARD_TRANSFER',
|
CARD_DUPLICATE: 'CARD_DUPLICATE',
|
||||||
CARD_TRANSFER__SUCCESS: 'CARD_TRANSFER__SUCCESS',
|
CARD_DUPLICATE__SUCCESS: 'CARD_DUPLICATE__SUCCESS',
|
||||||
CARD_TRANSFER__FAILURE: 'CARD_TRANSFER__FAILURE',
|
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 */
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const BASE_PATH = BASE_URL.replace(/^.*\/\/[^/]*(.*)[^?#]*.*$/, '$1');
|
|||||||
const SERVER_BASE_URL =
|
const SERVER_BASE_URL =
|
||||||
process.env.REACT_APP_SERVER_BASE_URL ||
|
process.env.REACT_APP_SERVER_BASE_URL ||
|
||||||
(process.env.NODE_ENV === 'production' ? BASE_URL : 'http://localhost:1337');
|
(process.env.NODE_ENV === 'production' ? BASE_URL : 'http://localhost:1337');
|
||||||
|
const SERVER_BASE_PATH = SERVER_BASE_URL.replace(/^.*\/\/[^/]*(.*)[^?#]*.*$/, '$1');
|
||||||
|
|
||||||
const SERVER_HOST_NAME = SERVER_BASE_URL.replace(/^(.*\/\/[^/?#]*).*$/, '$1');
|
const SERVER_HOST_NAME = SERVER_BASE_URL.replace(/^(.*\/\/[^/?#]*).*$/, '$1');
|
||||||
|
|
||||||
@@ -20,6 +21,7 @@ export default {
|
|||||||
VERSION,
|
VERSION,
|
||||||
BASE_PATH,
|
BASE_PATH,
|
||||||
SERVER_BASE_URL,
|
SERVER_BASE_URL,
|
||||||
|
SERVER_BASE_PATH,
|
||||||
SERVER_HOST_NAME,
|
SERVER_HOST_NAME,
|
||||||
ACCESS_TOKEN_KEY,
|
ACCESS_TOKEN_KEY,
|
||||||
ACCESS_TOKEN_VERSION_KEY,
|
ACCESS_TOKEN_VERSION_KEY,
|
||||||
|
|||||||
@@ -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',
|
||||||
|
|||||||
@@ -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,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -20,10 +20,8 @@ const makeMapStateToProps = () => {
|
|||||||
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
const allLabels = selectors.selectLabelsForCurrentBoard(state);
|
||||||
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
|
||||||
|
|
||||||
const { name, dueDate, stopwatch, coverUrl, boardId, listId, isPersisted } = selectCardById(
|
const { name, dueDate, isDueDateCompleted, stopwatch, coverUrl, boardId, listId, isPersisted } =
|
||||||
state,
|
selectCardById(state, id);
|
||||||
id,
|
|
||||||
);
|
|
||||||
|
|
||||||
const users = selectUsersByCardId(state, id);
|
const users = selectUsersByCardId(state, id);
|
||||||
const labels = selectLabelsByCardId(state, id);
|
const labels = selectLabelsByCardId(state, id);
|
||||||
@@ -38,6 +36,7 @@ const makeMapStateToProps = () => {
|
|||||||
index,
|
index,
|
||||||
name,
|
name,
|
||||||
dueDate,
|
dueDate,
|
||||||
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
coverUrl,
|
coverUrl,
|
||||||
boardId,
|
boardId,
|
||||||
@@ -62,6 +61,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),
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ const mapStateToProps = (state) => {
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
isSubscribed,
|
isSubscribed,
|
||||||
isActivitiesFetching,
|
isActivitiesFetching,
|
||||||
@@ -49,6 +50,7 @@ const mapStateToProps = (state) => {
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
dueDate,
|
dueDate,
|
||||||
|
isDueDateCompleted,
|
||||||
stopwatch,
|
stopwatch,
|
||||||
isSubscribed,
|
isSubscribed,
|
||||||
isActivitiesFetching,
|
isActivitiesFetching,
|
||||||
@@ -78,6 +80,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,
|
||||||
|
|||||||
@@ -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),
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ const mapStateToProps = (state) => {
|
|||||||
isSubmittingUsingOidc,
|
isSubmittingUsingOidc,
|
||||||
error,
|
error,
|
||||||
withOidc: !!oidcConfig,
|
withOidc: !!oidcConfig,
|
||||||
|
isOidcEnforced: !!oidcConfig && oidcConfig.isEnforced,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,12 +6,13 @@ import entryActions from '../entry-actions';
|
|||||||
import Projects from '../components/Projects';
|
import Projects from '../components/Projects';
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
|
const { allowAllToCreateProjects } = selectors.selectConfig(state);
|
||||||
const { isAdmin } = selectors.selectCurrentUser(state);
|
const { isAdmin } = selectors.selectCurrentUser(state);
|
||||||
const projects = selectors.selectProjectsForCurrentUser(state);
|
const projects = selectors.selectProjectsForCurrentUser(state);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
items: projects,
|
items: projects,
|
||||||
canAdd: isAdmin,
|
canAdd: allowAllToCreateProjects || isAdmin,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user