From 9e3e6be1c66e5c77650f1ed2db7b0b9af64ece28 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 4 Feb 2022 13:45:52 -0500 Subject: [PATCH 01/21] Revert "Fixed a bug causing double scroll bars to appear (#2217)" This reverts commit 55879bdf110e18e69c480ba6575c65ba0a58444b. --- webapp/src/pages/boardPage.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/webapp/src/pages/boardPage.scss b/webapp/src/pages/boardPage.scss index f94317e68..881213ed7 100644 --- a/webapp/src/pages/boardPage.scss +++ b/webapp/src/pages/boardPage.scss @@ -39,7 +39,7 @@ } } - @media screen and (max-width: 768px) { + @media screen and (max-width: 768px) { .mobileWarning {display: flex;} } } @@ -48,7 +48,3 @@ width: 600px; height: 468px; } - -.mainContentRow { - height: calc(100% - 40px); -} From 6389d542b259b9bfc81bf369597526ef5f6f5047 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Feb 2022 22:08:59 +0500 Subject: [PATCH 02/21] GH-2249 - Updating template selector screen (#2279) * GH-2249 - Updating template selector screen * Updating snapshots --- .../boardTemplateSelector.test.tsx.snap | 24 +--- ...boardTemplateSelectorPreview.test.tsx.snap | 3 - .../boardTemplateSelector.scss | 4 + .../boardTemplateSelectorPreview.scss | 8 +- .../boardTemplateSelectorPreview.tsx | 105 +++++++++--------- 5 files changed, 61 insertions(+), 83 deletions(-) diff --git a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap index e1d2c8bc2..6cfb85141 100644 --- a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap +++ b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelector.test.tsx.snap @@ -110,11 +110,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector a focalboard Plu >
-
-
+ />
@@ -239,11 +235,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector a focalboard Plu >
-
-
+ />
@@ -368,11 +360,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector a focalboard Plu >
-
-
+ />
@@ -507,11 +495,7 @@ exports[`components/boardTemplateSelector/boardTemplateSelector not a focalboard >
-
-
+ />
diff --git a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap index b26f668e3..f96559440 100644 --- a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap +++ b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap @@ -7,9 +7,6 @@ exports[`components/boardTemplateSelector/boardTemplateSelectorPreview should ma
-
diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss index 80431f4ae..e795b9af1 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss @@ -82,6 +82,10 @@ justify-content: center; } + .empty-board { + background-color: rgb(var(--center-channel-bg-rgb)); + } + .Button { &:first-child { margin-right: 16px; diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.scss b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.scss index 97220abb5..c51efaa39 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.scss +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.scss @@ -4,15 +4,9 @@ width: 158%; height: 480px; border-radius: var(--modal-rad); + pointer-events: none; .Kanban { overflow: hidden; } - - .prevent-click { - position: absolute; - width: 100%; - height: 100%; - z-index: 1100; - } } diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx index af7cfc2d1..cd2a4bfcb 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx @@ -65,28 +65,27 @@ const BoardTemplateSelectorPreview = React.memo((props: Props) => { return (
-
{activeView && -
- - null} - addCardFromTemplate={() => null} - addCardTemplate={() => null} - editCardTemplate={() => null} - readonly={false} - showShared={false} - /> -
} +
+ + null} + addCardFromTemplate={() => null} + addCardTemplate={() => null} + editCardTemplate={() => null} + readonly={false} + showShared={false} + /> +
} {activeView?.fields.viewType === 'board' && { showCard={() => null} />} {activeView?.fields.viewType === 'table' && - null} - addCard={() => Promise.resolve()} - showCard={() => null} - />} +
null} + addCard={() => Promise.resolve()} + showCard={() => null} + />} {activeView?.fields.viewType === 'gallery' && - null} - addCard={() => Promise.resolve()} - />} + null} + addCard={() => Promise.resolve()} + />} {activeView?.fields.viewType === 'calendar' && - null} - addCard={() => Promise.resolve()} - />} + null} + addCard={() => Promise.resolve()} + />} ) }) From 9071424abafe0043edf2bcde010d771e4e19d659 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Tue, 8 Feb 2022 09:56:58 -0800 Subject: [PATCH 03/21] Set theme jekyll-theme-architect --- docs/_config.yml | 1 + docs/index.md | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 docs/_config.yml create mode 100644 docs/index.md diff --git a/docs/_config.yml b/docs/_config.yml new file mode 100644 index 000000000..3397c9a49 --- /dev/null +++ b/docs/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-architect \ No newline at end of file diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 000000000..01c76ac6e --- /dev/null +++ b/docs/index.md @@ -0,0 +1,37 @@ +## Welcome to GitHub Pages + +You can use the [editor on GitHub](https://github.com/mattermost/focalboard/edit/main/docs/index.md) to maintain and preview the content for your website in Markdown files. + +Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files. + +### Markdown + +Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for + +```markdown +Syntax highlighted code block + +# Header 1 +## Header 2 +### Header 3 + +- Bulleted +- List + +1. Numbered +2. List + +**Bold** and _Italic_ and `Code` text + +[Link](url) and ![Image](src) +``` + +For more details see [Basic writing and formatting syntax](https://docs.github.com/en/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax). + +### Jekyll Themes + +Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/mattermost/focalboard/settings/pages). The name of this theme is saved in the Jekyll `_config.yml` configuration file. + +### Support or Contact + +Having trouble with Pages? Check out our [documentation](https://docs.github.com/categories/github-pages-basics/) or [contact support](https://support.github.com/contact) and we’ll help you sort it out. From 03c240c7998ff45d6693bf90f7769e6dd39cafc3 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Tue, 8 Feb 2022 10:58:24 -0800 Subject: [PATCH 04/21] API Readme: Add note on Boards API usage. (#2293) --- server/swagger/README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/server/swagger/README.md b/server/swagger/README.md index 504df0d02..f349f1129 100644 --- a/server/swagger/README.md +++ b/server/swagger/README.md @@ -18,3 +18,27 @@ brew install openapi-generator # Server API documentation See the generated [server API documentation here](https://htmlpreview.github.io/?https://github.com/mattermost/focalboard/blob/main/server/swagger/docs/html/index.html). + +# Differences for Mattermost Boards + +The auto-generated Swagger API documentation is for Focalboard Personal Server. If you are calling the API on Mattermost Boards, the additional changes are: + +### API URLs endpoint + +The API endpoint is at `https://SERVERNAME/plugins/focalboard/api/`, e.g. `https://community.mattermost.com/plugins/focalboard/api/`. + +### Use the Mattermost auth token + +Refer to the [Mattermost API documentation here](https://api.mattermost.com/#tag/authentication) on how to obtain the auth token. + +Pass this token as a bearer token to the Boards APIs, e.g. + +``` +curl -i -H "X-Requested-With: XMLHttpRequest" -H 'Authorization: Bearer abcdefghijklmnopqrstuvwxyz' https://community.mattermost.com/plugins/focalboard/api/v1/workspaces +``` + +Note that the `X-Requested-With: XMLHttpRequest` header is required to pass the CSRF check. + +# We want to hear from you! + +If you are planning on using the Boards API, we would love to hear about what you'd like to do, and how we can improve the APIs in the future. [See here](https://github.com/mattermost/focalboard/discussions/2139) for more details on how to connect. From 761e268bf6e593ec4ba34a72169f94a7e98cd3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 8 Feb 2022 22:44:15 +0100 Subject: [PATCH 05/21] Preview the first view of the template (#2295) --- .../boardTemplateSelector/boardTemplateSelectorPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx index cd2a4bfcb..96f2de13a 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx @@ -33,7 +33,7 @@ const BoardTemplateSelectorPreview = React.memo((props: Props) => { setActiveTemplateCards([]) octoClient.getSubtree(activeTemplate.id, activeView?.fields.viewType === 'gallery' ? 3 : 2, activeTemplate.workspaceId).then((blocks) => { const cards = blocks.filter((b) => b.type === 'card') - const views = blocks.filter((b) => b.type === 'view') + const views = blocks.filter((b) => b.type === 'view').sort((a, b) => a.title.localeCompare(b.title)) if (views.length > 0) { setActiveView(views[0] as BoardView) } From ad9e83e8fd008c256aabfaea0e9298c975334361 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Tue, 8 Feb 2022 13:46:14 -0800 Subject: [PATCH 06/21] Port contributors guide to GitHub pages (#2296) * Port contributor's guide to GitHub * Fix #2178. Port contributors guide to GitHub pages * Fix wrong file change * typo * Fix link * Replace PR with pull request * Remove comment * Doc at-mention, headings * Add sudo apt-get install autoconf dh-autoreconf * database typo * Update docs/dev-tips.md Co-authored-by: Doug Lauder * Update docs/index.md Co-authored-by: Doug Lauder * Update index.md * Update dev-tips.md Co-authored-by: Doug Lauder Co-authored-by: Justine Geffen --- docs/code-review.md | 55 +++++++++++ docs/contribution-checklist.md | 16 ++++ docs/contributions-without-ticket.md | 15 +++ docs/dev-tips.md | 96 +++++++++++++++++++ docs/index.md | 38 ++------ .../contribute/getting-started/dev-tips.md | 2 +- 6 files changed, 193 insertions(+), 29 deletions(-) create mode 100644 docs/code-review.md create mode 100644 docs/contribution-checklist.md create mode 100644 docs/contributions-without-ticket.md create mode 100644 docs/dev-tips.md diff --git a/docs/code-review.md b/docs/code-review.md new file mode 100644 index 000000000..baf55da32 --- /dev/null +++ b/docs/code-review.md @@ -0,0 +1,55 @@ +# Code Review Checklist + +Currently, all changes to the product must be reviewed by a [core committer](/contribute/getting-started/core-committers/#core-committers). + +### If you are a community member seeking a review + +1. Submit your pull request (PR). + * Follow the [contribution checklist](../contribution-checklist/). +2. Wait for a reviewer to be assigned. + * Product managers are on the lookout for new pull requests and usually handle this for you automatically. + * If you have been working alongside a core committer, feel free to message them for help. + * When in doubt, ask for help in the [Focalboard](https://community.mattermost.com/core/channels/focalboard) channel on our community server. + * If you are still stuck, please message Chen Lim (@chenilim on GitHub). +3. [Wait for a review](#if-you-are-awaiting-a-review). + * Expect some interaction with at least one reviewer within 5 business days (weekdays, Monday through Friday, excluding [statutory holidays](https://docs.mattermost.com/process/working-at-mattermost.html#holidays)). + * Keep in mind that core committers are geographically distributed around the world and likely in a different time zone than your own. + * If no interaction has occurred after 5 business days, please [at-mention](https://github.blog/2011-03-23-mention-somebody-they-re-notified/) a reviewer with a comment on your pull request. +4. Make any necessary changes. + * If a reviewer requests changes, your pull request will disappear from their queue of reviews. + * Once you've addressed the concerns, please at-mention the reviewer with a comment on your pull request. +5. Wait for your code to be merged. + * Larger pull requests may require more time to review. + * Once all reviewers have approved your changes, they will handle merging your code. + +### If you are awaiting a review + +1. Wait patiently for reviews to complete. + * Expect some interaction with each of your reviewers within 5 business days. + * There is no need to explicitly mention them on the pull request or to explicitly reach out on our community server. +2. Make any necessary changes. + * If a reviewer requests changes, your pull request will disappear from their queue of reviews. + * Once you've addressed the concerns, assign them as a reviewer again to put your pull request back in their queue. + +### If you are a core committer asked to give a review + +1. Respond promptly to requested reviews. + * Assume the requested review is urgent and blocking unless explicitly stated otherwise. + * Try to interact with the author within 2 business days. + * Configure the GitHub plugin to automate notifications. + * Review your outstanding requested reviews daily to avoid blocking authors. + * Prioritize earlier milestones when reviewing to help with the release process. + * Responding quickly doesn't necessarily mean reviewing quickly! Just don't leave the author hanging. +2. Feel free to clarify expectations with the author. + * If the code is experimental, they may need only a cursory glance and thumbs up to proceed with productizing their changes. + * If the review is large or complex, additional time may be required to complete your review. Be upfront with the author. + * If you are not comfortable reviewing the code, avoid "rubber stamping" the review. Be honest with the author and ask them to consider another core committer. +3. Never rush a review. + * Take the time necessary to review the code thoroughly. + * Don't be afraid to ask for changes repeatedly until all concerns are addressed. + * Feel free to challenge assumptions and timelines. Rushing a change into a patch release may cause more harm than good. +4. Avoid leaving a review hanging. + * Try to accept or reject the review instead of just leaving comments. +5. Merge the pull request. + * Do not merge if there are outstanding changes requested. + * Merge the pull request, and delete the branch if not from a fork. diff --git a/docs/contribution-checklist.md b/docs/contribution-checklist.md new file mode 100644 index 000000000..9e85e1370 --- /dev/null +++ b/docs/contribution-checklist.md @@ -0,0 +1,16 @@ +# Contribution Checklist + +Thanks for your interest in contributing code! + +Follow this checklist for submitting a pull request (PR): + +1. You've signed the [Contributor License Agreement](http://www.mattermost.org/mattermost-contributor-agreement/), so you can be added to the Mattermost [Approved Contributor List](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). +2. Your ticket is a Help Wanted GitHub issue for the project you're contributing to. + - If not, follow the process [here](contributions-without-ticket). +3. Your code is thoroughly tested, including appropriate unit tests, and manual testing. +4. If applicable, user interface strings are included in the localization file ([en.json](https://github.com/mattermost/focalboard/blob/main/webapp/i18n/en.json)) + - In the webapp folder, run `npm run i18n-extract` to generate the new/updated strings. +5. The PR is submitted against the `main` branch from your fork. +6. The PR title begins with the GitHub Ticket ID (e.g. `[GH-394]`) and the summary template is filled out. + +Once submitted, the automated build process must pass in order for the PR to be accepted. Any errors or failures need to be addressed in order for the PR to be accepted. Next, the PR goes through [code review](code-review). To learn about the review process for each project, read the [CONTRIBUTING.md](https://github.com/mattermost/focalboard/blob/main/CONTRIBUTING.md) file of that GitHub repository. diff --git a/docs/contributions-without-ticket.md b/docs/contributions-without-ticket.md new file mode 100644 index 000000000..e61282b5c --- /dev/null +++ b/docs/contributions-without-ticket.md @@ -0,0 +1,15 @@ +# Contributions Without Ticket + +Contributions for minor corrections and improvements without a corresponding `Help Wanted` ticket are welcome. For example, a pull request for a bug or incremental improvement, with less than 20 lines of code change, is usually accepted if the change to existing behaviour is minor. + +All pull requests submitted without a corresponding ticket will first be reviewed by a core team product manager. Some examples of minor corrections and improvements include: + +- [Fix a formatting error in help text](https://github.com/mattermost/mattermost-server/pull/5640) +- [Fix success typo in Makefile](https://github.com/mattermost/mattermost-server/pull/5809) +- [Fix broken Cancel button in Edit Webhooks screen](https://github.com/mattermost/mattermost-server/pull/5612) +- [Fix Android app crashing when saving user notification settings](https://github.com/mattermost/mattermost-mobile/pull/364) +- [Fix recent mentions search not working](https://github.com/mattermost/mattermost-server/pull/5878) + +**Note:** For pull requests greater than 20 lines of code, a `Help Wanted` ticket should be opened by the core team. This helps ensure that everything going into the project aligns with a unified vision. Core committers who review the PR are entitled to reject it if there isn't a `Help Wanted` ticket and feel it significantly changes behavior or user expectations. + +The best way to discuss opening a `Help Wanted` ticket with the core team is by [starting a conversation in Contributors channel](https://community.mattermost.com/core/channels/focalboard) or [opening an issue in the GitHub repository](https://github.com/mattermost/focalboard/issues/new). diff --git a/docs/dev-tips.md b/docs/dev-tips.md new file mode 100644 index 000000000..d32d79a6f --- /dev/null +++ b/docs/dev-tips.md @@ -0,0 +1,96 @@ +# Developer Tips and Tricks + +## Installation prerequisites + +Check that you have recent versions of the basic dependencies installed: +* [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) + * On Windows, install [Git for Windows](https://gitforwindows.org/) and use the git-bash terminal shell +* [Go](https://golang.org/doc/install) +* [Node](https://nodejs.org/en/download/) (v10+) and [npm](https://www.npmjs.com/get-npm) + +On Windows: +* Install [Mingw64](https://chocolatey.org/packages/mingw) via [Chocolatey](https://chocolatey.org/) + +On macOS, to build the Mac app: +* Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) (v12+) +* Install the Xcode commandline tools, via the IDE or run `xcode-select --install` + +On Linux, to build the Linux app: +* `sudo apt-get install libgtk-3-dev` +* `sudo apt-get install libwebkit2gtk-4.0-dev` +* `sudo apt-get install autoconf dh-autoreconf` + +## Clone the project source code + +Clone the [GitHub repo here](https://github.com/mattermost/focalboard). + +## Build and run from the terminal + +Follow the steps in the [main readme file](https://github.com/mattermost/focalboard#building-the-server). In summary, to build and run the server: + +``` +make prebuild +make + ./bin/focalboard-server +``` + +Then open a browser to `http://localhost:8000` to access it. The port is configured in `config.json`. + +Once the server is running, you can rebuild just the webapp with `make webapp` (in a separate terminal window), then reload the browser. + +## VSCode setup + +Here's a recommended dev-test loop using VSCode: +* Open a bash terminal window to the project folder +* Run `make prebuild` to npm install + * Do this again when dependencies change in `webapp/package.json` +* Run `cd webapp && npm run watchdev` + * This will auto-build the webapp on file changes +* Open VSCode + * Install the [Go](https://marketplace.visualstudio.com/items?itemName=golang.Go) and [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) VSCode extensions if you haven't already +* Hit F5 and select `Go: Launch Server` + * Or, press `Cmd+P` and type `debug ` and pick the option +* Open a browser to `http://localhost:8000` + * The port is configured in `config.json` + +You can now edit the webapp code and refresh the browser to see your changes. + +## Debugging the web app + +You can use your favorite browser to debug the webapp code. With Chrome, open the dev tools with `Cmd+Alt+I` (`Ctrl+Alt+I` in Windows). +* `npm run watchdev` builds the dev package, which includes source maps from js to typescript +* In the Chrome devtools source tab, press `Cmd+P` to jump to a source file + +As a starting point, add a breakpoint to the `render()` function in `BoardPage.tsx`, then refresh the browser to walk through page rendering. + +## Debugging the server + +Debug the Go code in VSCode. This is set up automatically when you launch the server from there. + +To start, add a breakpoint to `handleGetBlocks()` in `server/api/api.go`, then refresh the browser to see how data is retrieved. + +## Localization/Internationalization/Translation + +We use `i18n` to localize the web app. Localized string generally use `intl.formatMessage`. When adding or modifying localized strings, run `npm run i18n-extract` in `webapp` to rebuild `webapp/i18n/en.json`. + +Translated strings are stored in other json files under `webapp/i18n`, e.g. `es.json` for Spanish. + +## Database + +By default, data is stored in a sqlite database `focalboard.db`. You can view and edit this directly using `sqlite3 focalboard.db` from bash. + +## Unit tests + +Before checking-in commits, run: `make ci`, which is simlar to the ci.yml workflow and includes: +* Server unit tests: `make server-test` +* Webapp eslint: `cd webapp; npm run check` +* Webapp unit tests: `make webapp-test` +* Webapp UI tests: `cd webapp; npm run cypress:ci` + +## Running into problems or have questions? + +If you run into any issues with the steps here, or have any general questions, please don't hesitate to reach out either on [GitHub](https://github.com/mattermost/focalboard) or our [Mattermost community channel](https://community.mattermost.com/core/channels/focalboard). + +We welcome everyone, and appreciate any feedback. + +glhf! :) diff --git a/docs/index.md b/docs/index.md index 01c76ac6e..9975f9d57 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,37 +1,19 @@ -## Welcome to GitHub Pages +# Focalboard/Mattermost Boards Contributors Guide -You can use the [editor on GitHub](https://github.com/mattermost/focalboard/edit/main/docs/index.md) to maintain and preview the content for your website in Markdown files. +Welcome to the Focalboard/Mattermost Boards project! -Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files. +We're very glad you want to check it out and perhaps contribute code our repository in GitHub. -### Markdown +Our goal is to make your experience as great as possible. Follow these simple steps to contribute: -Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for +1. [Clone the project from GitHub](https://github.com/mattermost/focalboard) and follow the steps in the README to build. Read the [developer tips & tricks](dev-tips) to get started. -```markdown -Syntax highlighted code block +2. Find [help wanted tickets in GitHub](https://github.com/mattermost/focalboard/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). Comment to let everyone know you’re working on it, and to allow a core contributor to assign the issue to you. If there’s no ticket for what you want to work on see [contributions without a ticket.](contributions-without-ticket). -# Header 1 -## Header 2 -### Header 3 +3. When your changes are ready, run through our [checklist for pull requests](contribution-checklist). Note that if it’s your first contribution, there is a standard [CLA](https://www.mattermost.org/mattermost-contributor-agreement/) to sign. -- Bulleted -- List +## Just ask if you need help! -1. Numbered -2. List +You can find us on our [public Focalboard channel](https://community.mattermost.com/core/channels/focalboard) on the Mattermost community server. Also feel free to [file a bug](https://github.com/mattermost/focalboard/issues/new/choose) for any issues you run into, or [start a discussion](https://github.com/mattermost/focalboard/discussions). -**Bold** and _Italic_ and `Code` text - -[Link](url) and ![Image](src) -``` - -For more details see [Basic writing and formatting syntax](https://docs.github.com/en/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax). - -### Jekyll Themes - -Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/mattermost/focalboard/settings/pages). The name of this theme is saved in the Jekyll `_config.yml` configuration file. - -### Support or Contact - -Having trouble with Pages? Check out our [documentation](https://docs.github.com/categories/github-pages-basics/) or [contact support](https://support.github.com/contact) and we’ll help you sort it out. +We're glad ❤️ you're here! Good luck and have fun! diff --git a/website/site/content/contribute/getting-started/dev-tips.md b/website/site/content/contribute/getting-started/dev-tips.md index cd4038f52..5df65626c 100644 --- a/website/site/content/contribute/getting-started/dev-tips.md +++ b/website/site/content/contribute/getting-started/dev-tips.md @@ -83,7 +83,7 @@ Translated strings are stored in other json files under `webapp/i18n`, e.g. `es. ## Database -By default, data is stored in a sqlite datebase `focalboard.db`. You can view and edit this directly using `sqlite3 focalboard.db` from bash. +By default, data is stored in a sqlite database `focalboard.db`. You can view and edit this directly using `sqlite3 focalboard.db` from bash. ## Unit tests From 1d7e789ac9806ad378a9ee17aa49ef805e8300e6 Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Tue, 8 Feb 2022 14:05:17 -0800 Subject: [PATCH 07/21] GH-pages: Formatting and settings --- docs/_config.yml | 3 +++ docs/code-review.md | 6 +++--- docs/index.md | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index 3397c9a49..372ac3824 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1 +1,4 @@ +title: Focalboard Developers +show_downloads: true +google_analytics: UA-64458817-2 theme: jekyll-theme-architect \ No newline at end of file diff --git a/docs/code-review.md b/docs/code-review.md index baf55da32..b76271dce 100644 --- a/docs/code-review.md +++ b/docs/code-review.md @@ -2,7 +2,7 @@ Currently, all changes to the product must be reviewed by a [core committer](/contribute/getting-started/core-committers/#core-committers). -### If you are a community member seeking a review +## If you are a community member seeking a review 1. Submit your pull request (PR). * Follow the [contribution checklist](../contribution-checklist/). @@ -22,7 +22,7 @@ Currently, all changes to the product must be reviewed by a [core committer](/co * Larger pull requests may require more time to review. * Once all reviewers have approved your changes, they will handle merging your code. -### If you are awaiting a review +## If you are awaiting a review 1. Wait patiently for reviews to complete. * Expect some interaction with each of your reviewers within 5 business days. @@ -31,7 +31,7 @@ Currently, all changes to the product must be reviewed by a [core committer](/co * If a reviewer requests changes, your pull request will disappear from their queue of reviews. * Once you've addressed the concerns, assign them as a reviewer again to put your pull request back in their queue. -### If you are a core committer asked to give a review +## If you are a core committer asked to give a review 1. Respond promptly to requested reviews. * Assume the requested review is urgent and blocking unless explicitly stated otherwise. diff --git a/docs/index.md b/docs/index.md index 9975f9d57..479bf2805 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ -# Focalboard/Mattermost Boards Contributors Guide +# Focalboard / Mattermost Boards Contributors Guide -Welcome to the Focalboard/Mattermost Boards project! +Welcome to the [Focalboard](https://www.focalboard.com) / [Mattermost Boards](https://mattermost.com/boards/?utm_source=focalboard) project! We're very glad you want to check it out and perhaps contribute code our repository in GitHub. From 9d12efa2a2577336c25cfc7a99e6bcc11f860106 Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Tue, 8 Feb 2022 14:08:50 -0800 Subject: [PATCH 08/21] GH-pages: download settings --- docs/_config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 372ac3824..74ecfc801 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,4 +1,3 @@ title: Focalboard Developers -show_downloads: true google_analytics: UA-64458817-2 theme: jekyll-theme-architect \ No newline at end of file From 092cf2397249a0a887313d0146235826e24ace14 Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Wed, 9 Feb 2022 05:25:28 -0700 Subject: [PATCH 09/21] Growth share board modal (#2286) * Skeleton dialog * Updating share board modal * first changes * Separate button * Separate button * Skeleton dialog * Updating share board modal * first changes * Separate button * Separate button * add code to make it work, add telemetry, check config * update icons * add classes for personal server * some cleanup * increase padding * add unit tests * add unit tests * more cleanup * i18n extract and fix styles * remove old shareBoardComponent * remove old sharedBoardComponent * lint fixes * update additional snapshot tests * remove more code * more test cleanup Co-authored-by: Harshil Sharma Co-authored-by: Asaad Mahmood --- webapp/i18n/en.json | 8 +- .../__snapshots__/centerPanel.test.tsx.snap | 2830 +++++++++++------ .../shareBoardComponent.test.tsx.snap | 601 ---- .../__snapshots__/workspace.test.tsx.snap | 554 ++-- .../boardTemplateSelectorPreview.tsx | 1 - webapp/src/components/centerPanel.scss | 8 + webapp/src/components/centerPanel.test.tsx | 18 + webapp/src/components/centerPanel.tsx | 25 +- webapp/src/components/dialog.tsx | 4 +- .../globalHeaderSettingsMenu.test.tsx.snap | 6 +- .../__snapshots__/shareBoard.test.tsx.snap | 950 ++++++ .../shareBoardButton.test.tsx.snap | 22 + .../src/components/shareBoard/shareBoard.scss | 66 + .../shareBoard.test.tsx} | 201 +- .../src/components/shareBoard/shareBoard.tsx | 178 ++ .../shareBoard/shareBoardButton.scss | 20 + .../shareBoard/shareBoardButton.test.tsx | 30 + .../shareBoard/shareBoardButton.tsx | 52 + .../src/components/shareBoardComponent.scss | 36 - webapp/src/components/shareBoardComponent.tsx | 167 - .../sidebarSettingsMenu.test.tsx.snap | 8 +- .../__snapshots__/filterValue.test.tsx.snap | 2 +- .../viewHeaderActionsMenu.test.tsx.snap | 302 +- .../viewHeaderPropertiesMenu.test.tsx.snap | 22 +- .../components/viewHeader/viewHeader.test.tsx | 2 - .../src/components/viewHeader/viewHeader.tsx | 4 +- .../viewHeader/viewHeaderActionsMenu.test.tsx | 25 +- .../viewHeader/viewHeaderActionsMenu.tsx | 26 +- .../__snapshots__/centerContent.test.tsx.snap | 20 +- .../__snapshots__/dashboardPage.test.tsx.snap | 2 +- webapp/src/styles/main.scss | 4 + webapp/src/telemetry/telemetryClient.ts | 2 + webapp/src/widgets/switch.scss | 16 + webapp/src/widgets/switch.tsx | 8 +- 34 files changed, 3735 insertions(+), 2485 deletions(-) delete mode 100644 webapp/src/components/__snapshots__/shareBoardComponent.test.tsx.snap create mode 100644 webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap create mode 100644 webapp/src/components/shareBoard/__snapshots__/shareBoardButton.test.tsx.snap create mode 100644 webapp/src/components/shareBoard/shareBoard.scss rename webapp/src/components/{shareBoardComponent.test.tsx => shareBoard/shareBoard.test.tsx} (67%) create mode 100644 webapp/src/components/shareBoard/shareBoard.tsx create mode 100644 webapp/src/components/shareBoard/shareBoardButton.scss create mode 100644 webapp/src/components/shareBoard/shareBoardButton.test.tsx create mode 100644 webapp/src/components/shareBoard/shareBoardButton.tsx delete mode 100644 webapp/src/components/shareBoardComponent.scss delete mode 100644 webapp/src/components/shareBoardComponent.tsx diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index af934a051..b260ef3ea 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -11,7 +11,7 @@ "BoardPage.syncFailed": "Board may be deleted or access revoked.", "BoardTemplateSelector.add-template": "New template", "BoardTemplateSelector.create-empty-board": "Create empty board", - "BoardTemplateSelector.delete-template": "Delete template", + "BoardTemplateSelector.delete-template": "Delete", "BoardTemplateSelector.description": "Choose a template to help you get started. Easily customize the template to fit your needs, or create an empty board to start from scratch.", "BoardTemplateSelector.edit-template": "Edit", "BoardTemplateSelector.plugin.no-content-description": "Add a board to the sidebar using any of the templates defined below or start from scratch.{lineBreak} Members of \"{workspaceName}\" will have access to boards created here.", @@ -81,6 +81,7 @@ "CardDialog.delete-confirmation-dialog-heading": "Confirm card delete!", "CardDialog.editing-template": "You're editing a template.", "CardDialog.nocard": "This card doesn't exist or is inaccessible.", + "CenterPanel.Share": "Share", "ColorOption.selectColor": "Select {color} Color", "Comment.delete": "Delete", "CommentsList.send": "Send", @@ -161,9 +162,13 @@ "RegistrationLink.description": "Share this link for others to create accounts:", "RegistrationLink.regenerateToken": "Regenerate token", "RegistrationLink.tokenRegenerated": "Registration link regenerated", + "ShareBoard.PublishDescription": "Publish and share a “read only” link with everyone on the web", + "ShareBoard.PublishTitle": "Publish to the web", + "ShareBoard.Title": "Share Board", "ShareBoard.confirmRegenerateToken": "This will invalidate previously shared links. Continue?", "ShareBoard.copiedLink": "Copied!", "ShareBoard.copyLink": "Copy link", + "ShareBoard.regenerate": "Regenerate token", "ShareBoard.regenerateToken": "Regenerate token", "ShareBoard.share": "Publish and share this board with anyone who has the link", "ShareBoard.tokenRegenrated": "Token regenerated", @@ -232,6 +237,7 @@ "ViewHeader.share-board": "Share board", "ViewHeader.sort": "Sort", "ViewHeader.untitled": "Untitled", + "ViewHeader.view-header-menu": "View header menu", "ViewHeader.view-menu": "View menu", "ViewTitle.hide-description": "hide description", "ViewTitle.pick-icon": "Pick icon", diff --git a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap index 6eb6c21c6..7284ee18c 100644 --- a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap +++ b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap @@ -30,106 +30,110 @@ exports[`components/centerPanel return centerPanel and click on card to show car
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -139,6 +143,21 @@ exports[`components/centerPanel return centerPanel and click on card to show car
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -688,6 +711,21 @@ exports[`components/centerPanel return centerPanel and click on new card to edit
+
+ +
-
-
-
- - i - -
-
-
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -1626,106 +1668,110 @@ exports[`components/centerPanel return centerPanel and press touch ctrl+d for on
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -1735,6 +1781,21 @@ exports[`components/centerPanel return centerPanel and press touch ctrl+d for on
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -2343,6 +2408,21 @@ exports[`components/centerPanel return centerPanel and press touch del for one c
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -2951,6 +3035,21 @@ exports[`components/centerPanel return centerPanel and press touch esc for one c
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -3559,6 +3662,21 @@ exports[`components/centerPanel return centerPanel and press touch esc for one c
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -4167,6 +4289,21 @@ exports[`components/centerPanel return centerPanel and press touch esc for two c
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -4775,6 +4916,21 @@ exports[`components/centerPanel return centerPanel and press touch esc for two c
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -5383,6 +5543,21 @@ exports[`components/centerPanel return centerPanel and press touch esc for two c
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -5991,6 +6170,21 @@ exports[`components/centerPanel return centerPanel and select one card and click
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -6599,6 +6797,21 @@ exports[`components/centerPanel return centerPanel and select one card and click
+
+ +
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -7207,6 +7424,21 @@ exports[`components/centerPanel should match snapshot for Gallery 1`] = `
+
+ +
+
+ +
+
+
+
+
+ + i + +
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
+ New +
+
+
+ +
+
+
+
+
+
+
+
+ + No name + + +
+ +
+
+
+ +
+ +
+
+ + + +
+ +
+
+
+ +
+ +
+
+ + + +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+ +
+
+
-
- - i - + + +
+
+
+ i +
+
+ card1
- +
+ +
+
+
+
+
+`; + +exports[`components/centerPanel should match snapshot for Kanban, not shared 1`] = ` +
+
+
+
+ + Give Feedback + + + + +
+
+
+ +
+
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -7900,106 +8671,110 @@ exports[`components/centerPanel should match snapshot for Table 1`] = `
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -8009,6 +8784,21 @@ exports[`components/centerPanel should match snapshot for Table 1`] = `
+
+ +
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/workspace/1/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent return shareBoardComponent and click Regenerate token 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/workspace/1/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent return shareBoardComponent and click Switch 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/workspace/1/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent return shareBoardComponent and click Switch without sharing 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/workspace/1/shared/1/1?r=aToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent should match snapshot 1`] = ` -
-
-
- -
-
-
-
- Publish and share this board with anyone who has the link -
-
-
-
-
-
-
-
-`; - -exports[`src/components/shareBoardComponent should match snapshot with sharing 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/workspace/1/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent should match snapshot with sharing and subpath 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/test-subpath/plugins/boards/workspace/1/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent should match snapshot with sharing and without workspaceId 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; - -exports[`src/components/shareBoardComponent should match snapshot with sharing and without workspaceId and subpath 1`] = ` -
-
-
- -
-
-
-
- Anyone with the link can view this board and all cards in it. -
-
-
-
-
-
- - http://localhost/test-subpath/plugins/boards/shared/1/1?r=oneToken - - -
-
- -
-
-
-
-`; diff --git a/webapp/src/components/__snapshots__/workspace.test.tsx.snap b/webapp/src/components/__snapshots__/workspace.test.tsx.snap index c20b9fe69..841d0656d 100644 --- a/webapp/src/components/__snapshots__/workspace.test.tsx.snap +++ b/webapp/src/components/__snapshots__/workspace.test.tsx.snap @@ -250,106 +250,110 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -359,6 +363,21 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
+
+ +
-
-
-
- - i - -
-
-
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -1451,106 +1474,110 @@ exports[`src/components/workspace should match snapshot 1`] = `
- -
-
-
-
- - i - -
-
+ + + + hide description + +
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
@@ -1560,6 +1587,21 @@ exports[`src/components/workspace should match snapshot 1`] = `
+
+ +
-
-
-
- - i - -
-
-
- -
-
-
+ + i + +
+
+
+ +
+
+
+
+
+
diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx index 96f2de13a..acfb25ad5 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx @@ -83,7 +83,6 @@ const BoardTemplateSelectorPreview = React.memo((props: Props) => { addCardTemplate={() => null} editCardTemplate={() => null} readonly={false} - showShared={false} />
} diff --git a/webapp/src/components/centerPanel.scss b/webapp/src/components/centerPanel.scss index 56fa05085..cfe3aa3fe 100644 --- a/webapp/src/components/centerPanel.scss +++ b/webapp/src/components/centerPanel.scss @@ -44,7 +44,15 @@ left: 0; background: rgb(var(--center-channel-bg-rgb)); z-index: 100; + + > .mid-head { + flex: 0 0 auto; + display: flex; + flex-direction: row; + justify-content: space-between; + } } + > div:nth-child(2) { padding: 0 0 0 1px; diff --git a/webapp/src/components/centerPanel.test.tsx b/webapp/src/components/centerPanel.test.tsx index bc4055c8a..0d900724e 100644 --- a/webapp/src/components/centerPanel.test.tsx +++ b/webapp/src/components/centerPanel.test.tsx @@ -110,6 +110,24 @@ describe('components/centerPanel', () => { activeView.fields.viewType = 'board' jest.clearAllMocks() }) + test('should match snapshot for Kanban, not shared', () => { + const {container} = render(wrapDNDIntl( + + + , + )) + expect(container).toMatchSnapshot() + }) test('should match snapshot for Kanban', () => { const {container} = render(wrapDNDIntl( diff --git a/webapp/src/components/centerPanel.tsx b/webapp/src/components/centerPanel.tsx index 81f38e9d3..1d1ee0305 100644 --- a/webapp/src/components/centerPanel.tsx +++ b/webapp/src/components/centerPanel.tsx @@ -20,11 +20,12 @@ import {UserSettings} from '../userSettings' import {addCard, addTemplate} from '../store/cards' import {updateView} from '../store/views' import {getVisibleAndHiddenGroups} from '../boardUtils' +import TelemetryClient, {TelemetryCategory, TelemetryActions} from '../../../webapp/src/telemetry/telemetryClient' + +import ShareBoardButton from './shareBoard/shareBoardButton' import './centerPanel.scss' -import TelemetryClient, {TelemetryCategory, TelemetryActions} from '../../../webapp/src/telemetry/telemetryClient' - import CardDialog from './cardDialog' import RootPortal from './rootPortal' import TopBar from './topBar' @@ -59,6 +60,7 @@ type Props = { type State = { selectedCardIds: string[] cardIdToFocusOnRender: string + showShareDialog: boolean } class CenterPanel extends React.Component { @@ -102,6 +104,7 @@ class CenterPanel extends React.Component { this.state = { selectedCardIds: [], cardIdToFocusOnRender: '', + showShareDialog: false, } } @@ -146,11 +149,18 @@ class CenterPanel extends React.Component {
- +
+ + {!this.props.readonly && this.props.showShared && + + } +
{ addCardTemplate={this.addCardTemplate} editCardTemplate={this.editCardTemplate} readonly={this.props.readonly} - showShared={this.props.showShared} />
diff --git a/webapp/src/components/dialog.tsx b/webapp/src/components/dialog.tsx index 42bbd2d93..151a2df4e 100644 --- a/webapp/src/components/dialog.tsx +++ b/webapp/src/components/dialog.tsx @@ -16,12 +16,13 @@ type Props = { toolbar?: React.ReactNode hideCloseButton?: boolean className?: string + title?: string onClose: () => void, } const Dialog = React.memo((props: Props) => { const {toolsMenu} = props - const {toolbar} = props + const {toolbar, title} = props const intl = useIntl() const closeDialogText = intl.formatMessage({ @@ -47,6 +48,7 @@ const Dialog = React.memo((props: Props) => { className='dialog' >
+ {title &&

{title}

} { !props.hideCloseButton &&
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard return shareBoard and click Copy link 2`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard return shareBoard and click Regenerate token 1`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard return shareBoard, and click switch 1`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard return shareBoardComponent and click Switch without sharing 1`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard should match snapshot 1`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard should match snapshot with sharing 1`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard should match snapshot with sharing and subpath 1`] = ` +
+
+
+ +
+
+`; + +exports[`src/components/shareBoard/shareBoard should match snapshot with sharing and without workspaceId and subpath 1`] = ` +
+
+
+ +
+
+`; diff --git a/webapp/src/components/shareBoard/__snapshots__/shareBoardButton.test.tsx.snap b/webapp/src/components/shareBoard/__snapshots__/shareBoardButton.test.tsx.snap new file mode 100644 index 000000000..8e2341beb --- /dev/null +++ b/webapp/src/components/shareBoard/__snapshots__/shareBoardButton.test.tsx.snap @@ -0,0 +1,22 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`src/components/shareBoard/shareBoard should match snapshot 1`] = ` +
+
+ +
+
+`; diff --git a/webapp/src/components/shareBoard/shareBoard.scss b/webapp/src/components/shareBoard/shareBoard.scss new file mode 100644 index 000000000..50d8c3104 --- /dev/null +++ b/webapp/src/components/shareBoard/shareBoard.scss @@ -0,0 +1,66 @@ +.ShareBoardDialog { + .dialog { + @media not screen and (max-width: 975px) { + max-width: 600px; + height: auto; + } + } + + .tabs-modal { + padding: 24px; + border-radius: 8px; + background: rgba(var(--center-channel-bg-rgb), 1); + border-top: 1px solid rgba(var(--center-channel-color-rgb), 0.16); + + .d-flex { + display: flex; + } + + .justify-content-between { + justify-content: space-between; + } + + .flex-column { + flex-direction: column; + } + + .tabs-inputs { + margin-top: 16px; + + .input-container { + border: 1px solid rgba(var(--center-channel-color-rgb), 0.16); + border-radius: 4px; + width: 400px; + height: 40px; + } + + .IconButton { + height: 100%; + width: 40px; + } + + .icon-refresh { + margin: 4px; + font-size: 18px; + } + + .icon-content-copy { + margin-right: 4px; + font-size: 18px; + } + + .shareUrl { + flex-grow: 1; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + margin: auto 4px; + padding: 0 16px; + + :hover { + background-color: rgb(var(--center-channel-color-rgb), 0.1); + } + } + } + } +} diff --git a/webapp/src/components/shareBoardComponent.test.tsx b/webapp/src/components/shareBoard/shareBoard.test.tsx similarity index 67% rename from webapp/src/components/shareBoardComponent.test.tsx rename to webapp/src/components/shareBoard/shareBoard.test.tsx index 57b341a87..08a263065 100644 --- a/webapp/src/components/shareBoardComponent.test.tsx +++ b/webapp/src/components/shareBoard/shareBoard.test.tsx @@ -7,13 +7,13 @@ import React from 'react' import {MemoryRouter} from 'react-router' import {mocked} from 'ts-jest/utils' -import {ISharing} from '../blocks/sharing' -import {TestBlockFactory} from '../test/testBlockFactory' -import {wrapDNDIntl} from '../testUtils' -import client from '../octoClient' -import {Utils} from '../utils' +import {ISharing} from '../../blocks/sharing' +import {TestBlockFactory} from '../../test/testBlockFactory' +import {wrapDNDIntl} from '../../testUtils' +import client from '../../octoClient' +import {Utils} from '../../utils' -import ShareBoardComponent from './shareBoardComponent' +import ShareBoard from './shareBoard' jest.useFakeTimers() @@ -21,8 +21,8 @@ const boardId = '1' const workspaceId: string|undefined = boardId const viewId = boardId -jest.mock('../octoClient') -jest.mock('../utils') +jest.mock('../../octoClient') +jest.mock('../../utils') const mockedOctoClient = mocked(client, true) const mockedUtils = mocked(Utils, true) @@ -46,7 +46,7 @@ jest.mock('react-router', () => { const board = TestBlockFactory.createBoard() board.id = boardId -describe('src/components/shareBoardComponent', () => { +describe('src/components/shareBoard/shareBoard', () => { const w = (window as any) const oldBaseURL = w.baseURL @@ -69,15 +69,22 @@ describe('src/components/shareBoardComponent', () => { mockedOctoClient.getSharing.mockResolvedValue(undefined) let container await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) + const result = render( + wrapDNDIntl( + ), + {wrapper: MemoryRouter}, + ) container = result.container }) + expect(container).toMatchSnapshot() + const closeButton = screen.getByRole('button', {name: 'Close dialog'}) + expect(closeButton).toBeDefined() }) + test('should match snapshot with sharing', async () => { const sharing:ISharing = { id: boardId, @@ -85,62 +92,64 @@ describe('src/components/shareBoardComponent', () => { token: 'oneToken', } mockedOctoClient.getSharing.mockResolvedValue(sharing) + let container await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) - container = result.container - }) - expect(container).toMatchSnapshot() - }) - test('should match snapshot with sharing and without workspaceId', async () => { - const sharing:ISharing = { - id: boardId, - enabled: true, - token: 'oneToken', - } - params = { - boardId, - viewId, - } - mockedOctoClient.getSharing.mockResolvedValue(sharing) - let container - await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) - container = result.container - }) - expect(container).toMatchSnapshot() - }) - test('return shareBoardComponent and click Copy link', async () => { - const sharing:ISharing = { - id: boardId, - enabled: true, - token: 'oneToken', - } - mockedOctoClient.getSharing.mockResolvedValue(sharing) - let container: Element | undefined - await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) + const result = render( + wrapDNDIntl( + ), + {wrapper: MemoryRouter}, + ) container = result.container }) const copyLinkElement = screen.getByRole('button', {name: 'Copy link'}) expect(copyLinkElement).toBeDefined() - userEvent.click(copyLinkElement) - expect(mockedUtils.copyTextToClipboard).toBeCalledTimes(1) + expect(container).toMatchSnapshot() }) - test('return shareBoardComponent and click Regenerate token', async () => { + + test('return shareBoard and click Copy link', async () => { + const sharing:ISharing = { + id: boardId, + enabled: true, + token: 'oneToken', + } + mockedOctoClient.getSharing.mockResolvedValue(sharing) + + let container + await act(async () => { + const result = render( + wrapDNDIntl( + ), + {wrapper: MemoryRouter}, + ) + container = result.container + }) + + expect(container).toMatchSnapshot() + + const copyLinkElement = screen.getByRole('button', {name: 'Copy link'}) + expect(copyLinkElement).toBeDefined() + + await act(async () => { + userEvent.click(copyLinkElement!) + }) + + expect(mockedUtils.copyTextToClipboard).toBeCalledTimes(1) + expect(container).toMatchSnapshot() + + const copiedLinkElement = screen.getByRole('button', {name: 'Copy link'}) + expect(copiedLinkElement).toBeDefined() + expect(copiedLinkElement.textContent).toContain('Copied!') + }) + + test('return shareBoard and click Regenerate token', async () => { window.confirm = jest.fn(() => { return true }) @@ -150,15 +159,20 @@ describe('src/components/shareBoardComponent', () => { token: 'oneToken', } mockedOctoClient.getSharing.mockResolvedValue(sharing) - let container: Element | undefined + + let container await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) + const result = render( + wrapDNDIntl( + ), + {wrapper: MemoryRouter}, + ) container = result.container }) + sharing.token = 'anotherToken' mockedUtils.createGuid.mockReturnValue('anotherToken') mockedOctoClient.getSharing.mockResolvedValue(sharing) @@ -172,7 +186,7 @@ describe('src/components/shareBoardComponent', () => { expect(mockedOctoClient.setSharing).toBeCalledTimes(1) expect(container).toMatchSnapshot() }) - test('return shareBoardComponent and click Switch', async () => { + test('return shareBoard, and click switch', async () => { const sharing:ISharing = { id: boardId, enabled: true, @@ -181,18 +195,24 @@ describe('src/components/shareBoardComponent', () => { mockedOctoClient.getSharing.mockResolvedValue(sharing) let container: Element | undefined await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) + const result = render( + wrapDNDIntl( + ), + {wrapper: MemoryRouter}, + ) container = result.container }) const switchElement = container?.querySelector('.Switch') expect(switchElement).toBeDefined() - userEvent.click(switchElement!) + await act(async () => { + userEvent.click(switchElement!) + }) + expect(mockedOctoClient.setSharing).toBeCalledTimes(1) - expect(mockedOctoClient.getSharing).toBeCalledTimes(1) + expect(mockedOctoClient.getSharing).toBeCalledTimes(2) expect(container).toMatchSnapshot() }) test('return shareBoardComponent and click Switch without sharing', async () => { @@ -200,11 +220,14 @@ describe('src/components/shareBoardComponent', () => { mockedUtils.createGuid.mockReturnValue('aToken') let container: Element | undefined await act(async () => { - const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) + const result = render( + wrapDNDIntl( + ), + {wrapper: MemoryRouter}, + ) container = result.container mockedOctoClient.getSharing.mockResolvedValue({ id: boardId, @@ -215,11 +238,12 @@ describe('src/components/shareBoardComponent', () => { expect(switchElement).toBeDefined() userEvent.click(switchElement!) jest.runOnlyPendingTimers() - result.rerender(wrapDNDIntl( - )) + result.rerender( + wrapDNDIntl( + )) }) expect(mockedOctoClient.setSharing).toBeCalledTimes(1) @@ -227,7 +251,6 @@ describe('src/components/shareBoardComponent', () => { expect(mockedUtils.createGuid).toBeCalledTimes(1) expect(container).toMatchSnapshot() }) - test('should match snapshot with sharing and without workspaceId and subpath', async () => { w.baseURL = '/test-subpath/plugins/boards' const sharing:ISharing = { @@ -243,7 +266,7 @@ describe('src/components/shareBoardComponent', () => { let container await act(async () => { const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) @@ -263,7 +286,7 @@ describe('src/components/shareBoardComponent', () => { let container await act(async () => { const result = render(wrapDNDIntl( - ), {wrapper: MemoryRouter}) diff --git a/webapp/src/components/shareBoard/shareBoard.tsx b/webapp/src/components/shareBoard/shareBoard.tsx new file mode 100644 index 000000000..dccb063b1 --- /dev/null +++ b/webapp/src/components/shareBoard/shareBoard.tsx @@ -0,0 +1,178 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import React, {useState, useEffect} from 'react' +import {useIntl, FormattedMessage} from 'react-intl' +import {generatePath, useRouteMatch} from 'react-router' + +import {Utils, IDType} from '../../utils' +import Tooltip from '../../widgets/tooltip' + +import {ISharing} from '../../blocks/sharing' + +import client from '../../octoClient' +import Dialog from '../dialog' +import Switch from '../../widgets/switch' +import Button from '../../widgets/buttons/button' +import {sendFlashMessage} from '../flashMessages' + +import TelemetryClient, {TelemetryActions, TelemetryCategory} from '../../telemetry/telemetryClient' + +import CompassIcon from '../../widgets/icons/compassIcon' +import IconButton from '../../widgets/buttons/iconButton' +import './shareBoard.scss' + +type Props = { + boardId: string + onClose: () => void +} + +export default function ShareBoardDialog(props: Props): JSX.Element { + const [wasCopied, setWasCopied] = useState(false) + const [sharing, setSharing] = useState(undefined) + + const intl = useIntl() + const match = useRouteMatch<{workspaceId?: string, boardId: string, viewId: string}>() + + const loadData = async () => { + const newSharing = await client.getSharing(props.boardId) + setSharing(newSharing) + setWasCopied(false) + } + + const createSharingInfo = () => { + const newSharing: ISharing = { + id: props.boardId, + enabled: true, + token: Utils.createGuid(IDType.Token), + } + return newSharing + } + + const onShareChanged = async (isOn: boolean) => { + const newSharing: ISharing = sharing || createSharingInfo() + newSharing.id = props.boardId + newSharing.enabled = isOn + TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.ShareBoard, {board: props.boardId, shareBoardEnabled: isOn}) + await client.setSharing(newSharing) + await loadData() + } + + const onRegenerateToken = async () => { + // eslint-disable-next-line no-alert + const accept = window.confirm(intl.formatMessage({id: 'ShareBoard.confirmRegenerateToken', defaultMessage: 'This will invalidate previously shared links. Continue?'})) + if (accept) { + const newSharing: ISharing = sharing || createSharingInfo() + newSharing.token = Utils.createGuid(IDType.Token) + await client.setSharing(newSharing) + await loadData() + + const description = intl.formatMessage({id: 'ShareBoard.tokenRegenrated', defaultMessage: 'Token regenerated'}) + sendFlashMessage({content: description, severity: 'low'}) + } + } + + useEffect(() => { + loadData() + }, []) + + const isSharing = Boolean(sharing && sharing.id === props.boardId && sharing.enabled) + const readToken = (sharing && isSharing) ? sharing.token : '' + const shareUrl = new URL(window.location.toString()) + shareUrl.searchParams.set('r', readToken) + + if (match.params.workspaceId) { + const newPath = generatePath('/workspace/:workspaceId/shared/:boardId/:viewId', { + boardId: match.params.boardId, + viewId: match.params.viewId, + workspaceId: match.params.workspaceId, + }) + shareUrl.pathname = Utils.buildURL(newPath) + } else { + const newPath = generatePath('/shared/:boardId/:viewId', { + boardId: match.params.boardId, + viewId: match.params.viewId, + }) + shareUrl.pathname = Utils.buildURL(newPath) + } + + return ( + +
+
+
+
+
{intl.formatMessage({id: 'ShareBoard.PublishTitle', defaultMessage: 'Publish to the web'})}
+
{intl.formatMessage({id: 'ShareBoard.PublishDescription', defaultMessage: 'Publish and share a “read only” link with everyone on the web'})}
+
+
+ +
+
+
+ {isSharing && + (
+
+ + {shareUrl.toString()} + + + } + title={intl.formatMessage({id: 'ShareBoard.regenerate', defaultMessage: 'Regenerate token'})} + className='IconButton--large' + /> + +
+ +
) + } +
+ + ) +} diff --git a/webapp/src/components/shareBoard/shareBoardButton.scss b/webapp/src/components/shareBoard/shareBoardButton.scss new file mode 100644 index 000000000..f5c429d4d --- /dev/null +++ b/webapp/src/components/shareBoard/shareBoardButton.scss @@ -0,0 +1,20 @@ +.ShareBoardButton { + flex: 0 0 auto; + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 8px; + + > .Button { + margin-top: 36px; + padding: 3px 10px; + background-color: rgb(var(--button-bg-rgb)); + color: rgb(var(--button-color-rgb)); + border-radius: 5px; + + &:hover { + background-color: rgba(var(--button-bg-rgb), 0.8); + } + } +} + diff --git a/webapp/src/components/shareBoard/shareBoardButton.test.tsx b/webapp/src/components/shareBoard/shareBoardButton.test.tsx new file mode 100644 index 000000000..fb3027018 --- /dev/null +++ b/webapp/src/components/shareBoard/shareBoardButton.test.tsx @@ -0,0 +1,30 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. +import {render} from '@testing-library/react' +import React from 'react' + +import {TestBlockFactory} from '../../test/testBlockFactory' +import {wrapDNDIntl} from '../../testUtils' + +import ShareBoardButton from './shareBoardButton' + +jest.useFakeTimers() + +const boardId = '1' + +const board = TestBlockFactory.createBoard() +board.id = boardId + +describe('src/components/shareBoard/shareBoard', () => { + test('should match snapshot', async () => { + const result = render( + wrapDNDIntl( + )) + + const renderer = result.container + + expect(renderer).toMatchSnapshot() + }) +}) diff --git a/webapp/src/components/shareBoard/shareBoardButton.tsx b/webapp/src/components/shareBoard/shareBoardButton.tsx new file mode 100644 index 000000000..4e7ec1475 --- /dev/null +++ b/webapp/src/components/shareBoard/shareBoardButton.tsx @@ -0,0 +1,52 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import React, {useState} from 'react' +import {FormattedMessage} from 'react-intl' + +import Button from '../../widgets/buttons/button' +import TelemetryClient, {TelemetryActions, TelemetryCategory} from '../../telemetry/telemetryClient' + +import CompassIcon from '../../widgets/icons/compassIcon' + +import './shareBoardButton.scss' + +import ShareBoardDialog from './shareBoard' + +type Props = { + boardId: string +} +const ShareBoardButton = React.memo((props: Props) => { + const [showShareDialog, setShowShareDialog] = useState(false) + + return ( +
+ + {showShareDialog && + setShowShareDialog(false)} + boardId={props.boardId} + /> + } +
+ ) +}) + +export default ShareBoardButton diff --git a/webapp/src/components/shareBoardComponent.scss b/webapp/src/components/shareBoardComponent.scss deleted file mode 100644 index 64d0bef21..000000000 --- a/webapp/src/components/shareBoardComponent.scss +++ /dev/null @@ -1,36 +0,0 @@ -.ShareBoardComponent { - display: flex; - flex-direction: column; - padding: 5px; - color: rgb(var(--center-channel-color-rgb)); - max-width: 500px; - white-space: normal; - - .Switch { - margin-left: 8px; - } - - > .row { - display: flex; - flex-direction: row; - align-items: center; - margin: 0 0 10px; - } - - > .row:last-child { - margin-bottom: 0; - } - - .spacer { - flex-grow: 1; - } - - a.shareUrl { - max-width: 320px; - flex-grow: 1; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - margin-right: 5px; - } -} diff --git a/webapp/src/components/shareBoardComponent.tsx b/webapp/src/components/shareBoardComponent.tsx deleted file mode 100644 index 474eef985..000000000 --- a/webapp/src/components/shareBoardComponent.tsx +++ /dev/null @@ -1,167 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. -import React, {useState, useEffect} from 'react' -import {FormattedMessage, useIntl} from 'react-intl' -import {generatePath, useRouteMatch} from 'react-router' - -import {ISharing} from '../blocks/sharing' - -import client from '../octoClient' - -import {Utils, IDType} from '../utils' -import {sendFlashMessage} from '../components/flashMessages' - -import Button from '../widgets/buttons/button' -import Switch from '../widgets/switch' - -import TelemetryClient, {TelemetryActions, TelemetryCategory} from '../telemetry/telemetryClient' - -import Modal from './modal' -import './shareBoardComponent.scss' - -type Props = { - boardId: string - onClose: () => void -} - -const ShareBoardComponent = React.memo((props: Props): JSX.Element => { - const [wasCopied, setWasCopied] = useState(false) - const [sharing, setSharing] = useState(undefined) - const intl = useIntl() - const match = useRouteMatch<{workspaceId?: string, boardId: string, viewId: string}>() - - const loadData = async () => { - const newSharing = await client.getSharing(props.boardId) - setSharing(newSharing) - setWasCopied(false) - } - - const createSharingInfo = () => { - const newSharing: ISharing = { - id: props.boardId, - enabled: true, - token: Utils.createGuid(IDType.Token), - } - return newSharing - } - - const onShareChanged = async (isOn: boolean) => { - const newSharing: ISharing = sharing || createSharingInfo() - newSharing.id = props.boardId - newSharing.enabled = isOn - TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.ShareBoard, {board: props.boardId, shareBoardEnabled: isOn}) - await client.setSharing(newSharing) - await loadData() - } - - const onRegenerateToken = async () => { - // eslint-disable-next-line no-alert - const accept = window.confirm(intl.formatMessage({id: 'ShareBoard.confirmRegenerateToken', defaultMessage: 'This will invalidate previously shared links. Continue?'})) - if (accept) { - const newSharing: ISharing = sharing || createSharingInfo() - newSharing.token = Utils.createGuid(IDType.Token) - await client.setSharing(newSharing) - await loadData() - - const description = intl.formatMessage({id: 'ShareBoard.tokenRegenrated', defaultMessage: 'Token regenerated'}) - sendFlashMessage({content: description, severity: 'low'}) - } - } - - useEffect(() => { - loadData() - }, []) - - const isSharing = Boolean(sharing && sharing.id === props.boardId && sharing.enabled) - const readToken = (sharing && isSharing) ? sharing.token : '' - - const shareUrl = new URL(window.location.toString()) - shareUrl.searchParams.set('r', readToken) - - if (match.params.workspaceId) { - const newPath = generatePath('/workspace/:workspaceId/shared/:boardId/:viewId', { - boardId: match.params.boardId, - viewId: match.params.viewId, - workspaceId: match.params.workspaceId, - }) - shareUrl.pathname = Utils.buildURL(newPath) - } else { - const newPath = generatePath('/shared/:boardId/:viewId', { - boardId: match.params.boardId, - viewId: match.params.viewId, - }) - shareUrl.pathname = Utils.buildURL(newPath) - } - - return ( - -
-
-
- {isSharing && - } - {!isSharing && - } -
- -
- {isSharing && <> -
- - {shareUrl.toString()} - - -
-
- -
- } -
- - ) -}) - -export default ShareBoardComponent diff --git a/webapp/src/components/sidebar/__snapshots__/sidebarSettingsMenu.test.tsx.snap b/webapp/src/components/sidebar/__snapshots__/sidebarSettingsMenu.test.tsx.snap index 53c0da2b1..5c2fb9bba 100644 --- a/webapp/src/components/sidebar/__snapshots__/sidebarSettingsMenu.test.tsx.snap +++ b/webapp/src/components/sidebar/__snapshots__/sidebarSettingsMenu.test.tsx.snap @@ -259,7 +259,7 @@ exports[`components/sidebar/SidebarSettingsMenu imports menu open should match s Random icons
+
+
+
+
+
+ Cancel +
+
+
+
+
+
+
+
+
+`; + +exports[`components/viewHeader/viewHeaderActionsMenu return menu and verify call to board archive 1`] = ` +
+
+
+ +
+
+
+
@@ -72,7 +131,24 @@ exports[`components/viewHeader/viewHeaderActionsMenu return menu and verify call
- Share board + Export to CSV +
+
+
+
+
+
+ Export board archive
-
-
- -
-
-
-
-
-
- Export to CSV -
-
-
-
-
-
- Export board archive -
-
-
-
-
-
- Share board -
-
-
-
-
-
-
-
-
- Cancel -
-
-
-
-
-
-
-
-
-`; - -exports[`components/viewHeader/viewHeaderActionsMenu return menu with Share Boards 1`] = ` -
-
-
- -
-
-
-
-
-
- Export to CSV -
-
-
-
-
-
- Export board archive -
-
-
-
-
-
- Share board -
-
-
-
-
-
-
-
-
- Cancel -
-
-
-
-
-
-
-
-
-`; - -exports[`components/viewHeader/viewHeaderActionsMenu return menu without Share Boards 1`] = `
{ addCardTemplate={jest.fn()} editCardTemplate={jest.fn()} readonly={false} - showShared={false} /> , ), @@ -89,7 +88,6 @@ describe('components/viewHeader/viewHeader', () => { addCardTemplate={jest.fn()} editCardTemplate={jest.fn()} readonly={true} - showShared={false} /> , ), diff --git a/webapp/src/components/viewHeader/viewHeader.tsx b/webapp/src/components/viewHeader/viewHeader.tsx index 976bd5c27..6502de3d4 100644 --- a/webapp/src/components/viewHeader/viewHeader.tsx +++ b/webapp/src/components/viewHeader/viewHeader.tsx @@ -38,7 +38,6 @@ type Props = { addCardTemplate: () => void editCardTemplate: (cardTemplateId: string) => void readonly: boolean - showShared: boolean dateDisplayProperty?: IPropertyTemplate } @@ -46,7 +45,7 @@ const ViewHeader = React.memo((props: Props) => { const [showFilter, setShowFilter] = useState(false) const intl = useIntl() - const {board, activeView, views, groupByProperty, cards, showShared, dateDisplayProperty} = props + const {board, activeView, views, groupByProperty, cards, dateDisplayProperty} = props const withGroupBy = activeView.fields.viewType === 'board' || activeView.fields.viewType === 'table' const withDisplayBy = activeView.fields.viewType === 'calendar' @@ -160,7 +159,6 @@ const ViewHeader = React.memo((props: Props) => { board={board} activeView={activeView} cards={cards} - showShared={showShared} /> {/* New card button */} diff --git a/webapp/src/components/viewHeader/viewHeaderActionsMenu.test.tsx b/webapp/src/components/viewHeader/viewHeaderActionsMenu.test.tsx index 3cfdc37c9..b3a827cab 100644 --- a/webapp/src/components/viewHeader/viewHeaderActionsMenu.test.tsx +++ b/webapp/src/components/viewHeader/viewHeaderActionsMenu.test.tsx @@ -43,7 +43,8 @@ describe('components/viewHeader/viewHeaderActionsMenu', () => { beforeEach(() => { jest.clearAllMocks() }) - test('return menu with Share Boards', () => { + + test('return menu', () => { const {container} = render( wrapIntl( @@ -51,7 +52,6 @@ describe('components/viewHeader/viewHeaderActionsMenu', () => { board={board} activeView={activeView} cards={[card]} - showShared={true} /> , ), @@ -63,25 +63,6 @@ describe('components/viewHeader/viewHeaderActionsMenu', () => { expect(container).toMatchSnapshot() }) - test('return menu without Share Boards', () => { - const {container} = render( - wrapIntl( - - - , - ), - ) - const buttonElement = screen.getByRole('button', { - name: 'View header menu', - }) - userEvent.click(buttonElement) - expect(container).toMatchSnapshot() - }) test('return menu and verify call to csv exporter', () => { const {container} = render( wrapIntl( @@ -90,7 +71,6 @@ describe('components/viewHeader/viewHeaderActionsMenu', () => { board={board} activeView={activeView} cards={[card]} - showShared={true} /> , ), @@ -111,7 +91,6 @@ describe('components/viewHeader/viewHeaderActionsMenu', () => { board={board} activeView={activeView} cards={[card]} - showShared={true} /> , ), diff --git a/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx b/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx index 1ee3dc7f8..0584f1161 100644 --- a/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx +++ b/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx @@ -1,11 +1,10 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import React, {useState} from 'react' +import React from 'react' import {useIntl, IntlShape} from 'react-intl' import {CsvExporter} from '../../csvExporter' import {Archiver} from '../../archiver' -import {IUser} from '../../user' import {Board} from '../../blocks/board' import {BoardView} from '../../blocks/boardView' import {Card} from '../../blocks/card' @@ -13,18 +12,14 @@ import IconButton from '../../widgets/buttons/iconButton' import OptionsIcon from '../../widgets/icons/options' import Menu from '../../widgets/menu' import MenuWrapper from '../../widgets/menuWrapper' -import {getMe} from '../../store/users' -import {useAppSelector} from '../../store/hooks' import ModalWrapper from '../modalWrapper' -import ShareBoardComponent from '../shareBoardComponent' import {sendFlashMessage} from '../flashMessages' type Props = { board: Board activeView: BoardView cards: Card[] - showShared: boolean } // import {mutator} from '../../mutator' @@ -98,14 +93,9 @@ function onExportCsvTrigger(board: Board, activeView: BoardView, cards: Card[], } const ViewHeaderActionsMenu = React.memo((props: Props) => { - const [showShareDialog, setShowShareDialog] = useState(false) - const {board, activeView, cards} = props - const user = useAppSelector(getMe) const intl = useIntl() - const showShareBoard = user && user.id !== 'single-user' && props.showShared - return ( @@ -121,14 +111,6 @@ const ViewHeaderActionsMenu = React.memo((props: Props) => { name={intl.formatMessage({id: 'ViewHeader.export-board-archive', defaultMessage: 'Export board archive'})} onClick={() => Archiver.exportBoardArchive(board)} /> - {showShareBoard && - setShowShareDialog(true)} - /> - } - {/* @@ -155,12 +137,6 @@ const ViewHeaderActionsMenu = React.memo((props: Props) => { */} - {showShareDialog && - setShowShareDialog(false)} - /> - } ) }) diff --git a/webapp/src/pages/dashboard/__snapshots__/centerContent.test.tsx.snap b/webapp/src/pages/dashboard/__snapshots__/centerContent.test.tsx.snap index 4f0424a5b..aad87627c 100644 --- a/webapp/src/pages/dashboard/__snapshots__/centerContent.test.tsx.snap +++ b/webapp/src/pages/dashboard/__snapshots__/centerContent.test.tsx.snap @@ -18,7 +18,7 @@ exports[`pages/dashboard/CenterContent base case - find all workspaces 1`] = ` > Show empty
Show empty
Show empty
Show empty
Show empty
Show empty
Show empty
Show empty
Show empty
Show empty
Show empty
void isOn: boolean readOnly?: boolean + size?: string } // Switch is an on-off style switch / checkbox function Switch(props: Props): JSX.Element { - const className = props.isOn ? 'Switch on' : 'Switch' + let switchSize = 'size--small' + if (props.size === 'medium') { + switchSize = 'size--medium' + } + + const className = props.isOn ? `Switch ${switchSize} on` : `Switch ${switchSize}` return (
Date: Wed, 9 Feb 2022 15:36:27 +0100 Subject: [PATCH 10/21] Fixing style problems on hover editable board templates (#2221) * Fixing style problems on hover editable board templates * Making template version relevant to detect if the template is builtin or not * Fixing snapshots Co-authored-by: Mattermod --- webapp/src/blocks/board.ts | 1 + .../boardTemplateSelector/boardTemplateSelector.scss | 2 +- .../boardTemplateSelector/boardTemplateSelector.test.tsx | 2 ++ .../boardTemplateSelector/boardTemplateSelectorItem.scss | 4 ++++ .../boardTemplateSelector/boardTemplateSelectorItem.test.tsx | 2 ++ .../boardTemplateSelector/boardTemplateSelectorItem.tsx | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/webapp/src/blocks/board.ts b/webapp/src/blocks/board.ts index 5decb9632..8eb844f4d 100644 --- a/webapp/src/blocks/board.ts +++ b/webapp/src/blocks/board.ts @@ -67,6 +67,7 @@ function createBoard(block?: Block): Board { description: block?.fields.description || '', icon: block?.fields.icon || '', isTemplate: block?.fields.isTemplate || false, + templateVer: block?.fields.templateVer || 0, columnCalculations: block?.fields.columnCalculations || [], cardProperties, }, diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss index e795b9af1..5c5b20dd2 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.scss @@ -41,7 +41,7 @@ .templates-list { margin-right: 32px; - min-width: 200px; + width: 300px; max-height: 500px; overflow-y: auto; diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx index b46a8a308..126b9a3be 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.test.tsx @@ -100,6 +100,8 @@ describe('components/boardTemplateSelector/boardTemplateSelector', () => { {id: 'global-id-5'}, ], dateDisplayPropertyId: 'global-id-5', + isTemplate: true, + templateVer: 2, }, }], }, diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.scss b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.scss index 265e3e49e..f30662215 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.scss +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.scss @@ -40,6 +40,10 @@ position: relative; display: none; right: -8px; + + .DeleteIcon { + padding-top: 3px; + } } } diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx index cf6a8e151..08cc574ec 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.test.tsx @@ -127,6 +127,8 @@ describe('components/boardTemplateSelector/boardTemplateSelectorItem', () => { cardProperties: [groupProperty], dateDisplayPropertyId: 'global-id-5', columnCalculations: {}, + isTemplate: true, + templateVer: 2, }, } diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx index d659ea410..f5d0fac12 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx @@ -38,7 +38,7 @@ const BoardTemplateSelectorItem = React.memo((props: Props) => { > {template.fields.icon} {template.title} - {template.workspaceId !== '0' && + {!template.fields.templateVer &&
} From 73420bcf2a858715ab4ae0722e3360b754a826f5 Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Wed, 9 Feb 2022 08:31:58 -0700 Subject: [PATCH 11/21] calculation column order to be based on view (#2262) --- webapp/src/components/table/calculation/calculationRow.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/table/calculation/calculationRow.tsx b/webapp/src/components/table/calculation/calculationRow.tsx index 17b9ab655..712cdc3c7 100644 --- a/webapp/src/components/table/calculation/calculationRow.tsx +++ b/webapp/src/components/table/calculation/calculationRow.tsx @@ -39,7 +39,7 @@ const CalculationRow = (props: Props): JSX.Element => { const templates: IPropertyTemplate[] = [ titleTemplate, - ...props.board.fields.cardProperties.filter((template) => props.activeView.fields.visiblePropertyIds.includes(template.id)), + ...props.activeView.fields.visiblePropertyIds.map((id) => props.board.fields.cardProperties.find((t) => t.id === id)).filter((i) => i) as IPropertyTemplate[], ] const selectedCalculations = props.board.fields.columnCalculations || [] From 16120e43d463e4a5c8c7db04ac15e5edcbbdb57f Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Wed, 9 Feb 2022 08:17:46 -0800 Subject: [PATCH 12/21] GH-Pages: Move contributors guide to GitHub (#2298) * GH-Pages: Move contributors guide to GitHub * Fix URL --- CONTRIBUTING.md | 8 +- README.md | 2 +- docs/code-review.md | 2 +- docs/core-committers.md | 20 ++++ import/README.md | 2 +- import/asana/README.md | 2 +- import/jira/README.md | 2 +- import/nextcloud-deck/README.md | 2 +- import/notion/README.md | 2 +- import/trello/README.md | 2 +- website/site/config.toml | 4 +- ...-27-Mattermost-Focalboard-early-preview.md | 2 +- .../2021-5-13-Focalboard-the-road-to-v1.md | 2 +- .../contribute/getting-started/_index.md | 18 ---- .../contribute/getting-started/code-review.md | 66 ------------ .../getting-started/contribution-checklist.md | 27 ----- .../contributions-without-ticket.md | 20 ---- .../getting-started/core-committers.md | 20 ---- .../contribute/getting-started/dev-tips.md | 102 ------------------ website/site/content/guide/user/_index.md | 2 +- website/site/themes/config.toml | 4 +- 21 files changed, 39 insertions(+), 272 deletions(-) create mode 100644 docs/core-committers.md delete mode 100644 website/site/content/contribute/getting-started/_index.md delete mode 100644 website/site/content/contribute/getting-started/code-review.md delete mode 100644 website/site/content/contribute/getting-started/contribution-checklist.md delete mode 100644 website/site/content/contribute/getting-started/contributions-without-ticket.md delete mode 100644 website/site/content/contribute/getting-started/core-committers.md delete mode 100644 website/site/content/contribute/getting-started/dev-tips.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c90151b2..7a2cc0ac4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,18 +1,18 @@ # Code Contribution Guidelines -Thank you for your interest in contributing! Please see the [Focalboard Contribution Guide](https://www.focalboard.com/contribute/getting-started/) which describes the process for making code contributions, and [join our Focalboard community channel](https://community.mattermost.com/core/channels/focalboard) to ask questions from community members and the core team. +Thank you for your interest in contributing! Please see the [Focalboard Contribution Guide](https://mattermost.github.io/focalboard/) which describes the process for making code contributions, and [join our Focalboard community channel](https://community.mattermost.com/core/channels/focalboard) to ask questions from community members and the core team. -When you submit a pull request, it goes through a [code review process outlined here](https://www.focalboard.com/contribute/getting-started/code-review/). +When you submit a pull request, it goes through a [code review process outlined here](https://mattermost.github.io/focalboard/code-review). # Updating Changelog -After a noteable bug fix or an improvement you've submitted is merged, please consider making a pull request to the [CHANGELOG.md](https://github.com/mattermost/focalboard/blob/main/CHANGELOG.md) under the next release section. +After a noteable bug fix or an improvement you've submitted is merged, please consider making a pull request to the [CHANGELOG.md](https://github.com/mattermost/focalboard/blob/main/CHANGELOG.md) under the next release section. # Bug reports Please file a [GitHub issue](https://github.com/mattermost/focalboard/issues) if anything isn't working the way you expect. -# Documentation +# Documentation You can contribute to our documentation in the [Mattermost Boards documentation](https://docs.mattermost.com/guides/boards.html). Read more about how the contribution process works in the repo [README](https://github.com/mattermost/docs/blob/master/README.md). Visit the [Documentation Working Group channel](https://community.mattermost.com/core/channels/dwg-documentation-working-group) on our Community server if you have any questions! diff --git a/README.md b/README.md index 1efd5928b..a7b1fac2c 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Download the latest server release from [GitHub releases](https://github.com/mat ## Building the server -Most development can be done on the Personal Server edition. Please refer to the [Developer's Tips & Tricks](https://www.focalboard.com/contribute/getting-started/dev-tips/) for more detailed steps. Here's a summary: +Most development can be done on the Personal Server edition. Please refer to the [Developer's Tips & Tricks](https://mattermost.github.io/focalboard/dev-tips) for more detailed steps. Here's a summary: First, install basic dependencies: * Go 1.15+ diff --git a/docs/code-review.md b/docs/code-review.md index b76271dce..443ce49cf 100644 --- a/docs/code-review.md +++ b/docs/code-review.md @@ -1,6 +1,6 @@ # Code Review Checklist -Currently, all changes to the product must be reviewed by a [core committer](/contribute/getting-started/core-committers/#core-committers). +Currently, all changes to the product must be reviewed by a [core committer](core-committers). ## If you are a community member seeking a review diff --git a/docs/core-committers.md b/docs/core-committers.md new file mode 100644 index 000000000..df5f8dea7 --- /dev/null +++ b/docs/core-committers.md @@ -0,0 +1,20 @@ +# Core Committers + +A core committer is a maintainer on the Focalboard project who has merge access to the repositories. They are responsible for reviewing pull requests, cultivating the developer community, and guiding the technical vision of Focalboard. If you have a question or need some help, these are the people to ask. + +## Core Committers + +Below is the list of core committers working on Focalboard: + +- **Scott Bishel** + - @scott.bishel on [community.mattermost.com](https://community.mattermost.com/core/messages/@scott.bishel) and [@sbishel](https://github.com/sbishel) on GitHub +- **Jesús Espino** + - @jesus.espino on [community.mattermost.com](https://community.mattermost.com/core/messages/@jesus.espino) and [@jespino](https://github.com/jespino) on GitHub +- **Doug Lauder** + - @doug.lauder on [community.mattermost.com](https://community.mattermost.com/core/messages/@doug.lauder) and [@wiggin77](https://github.com/wiggin77) on GitHub +- **Miguel de la Cruz** + - @miguel.delacruz on [community.mattermost.com](https://community.mattermost.com/core/messages/@miguel.delacruz) and [@mgdelacroix](https://github.com/mgdelacroix) on GitHub +- **Harshil Sharma** + - @harshil.sharma on [community.mattermost.com](https://community.mattermost.com/core/messages/@harshil.sharma) and [@harshilsharma63](https://github.com/harshilsharma63) on GitHub +- **Chen Lim** + - @chen-i.lim on [community.mattermost.com](https://community.mattermost.com/core/messages/@chen-i.lim) and [@chenilim](https://github.com/chenilim) on GitHub diff --git a/import/README.md b/import/README.md index 6905b42ab..a9f15658c 100644 --- a/import/README.md +++ b/import/README.md @@ -8,4 +8,4 @@ This subfolder contains scripts to import data from other systems. It is at an e * Todoist * Nextcloud Deck -[Contribute code](https://www.focalboard.com/contribute/getting-started/) to expand this. +[Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/import/asana/README.md b/import/asana/README.md index 86dc8a032..055f93d03 100644 --- a/import/asana/README.md +++ b/import/asana/README.md @@ -10,4 +10,4 @@ This node app converts an Asana json archive into a Focalboard archive. To use: ## Import scope -Currently, the script imports all cards from a single board, including their section (column) membership, names, and notes. [Contribute code](https://www.focalboard.com/contribute/getting-started/) to expand this. +Currently, the script imports all cards from a single board, including their section (column) membership, names, and notes. [Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/import/jira/README.md b/import/jira/README.md index 6eb913a45..c50dc3cd8 100644 --- a/import/jira/README.md +++ b/import/jira/README.md @@ -20,4 +20,4 @@ The following aren't currently imported: * Comments * Embedded files -[Contribute code](https://www.focalboard.com/contribute/getting-started/) to expand this. +[Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/import/nextcloud-deck/README.md b/import/nextcloud-deck/README.md index fa3442c32..283486a1a 100644 --- a/import/nextcloud-deck/README.md +++ b/import/nextcloud-deck/README.md @@ -11,6 +11,6 @@ This node app converts data from a Nextcloud Server with the [app Deck](https:// ## Import scope -Currently, the script imports all cards from a single board, including their stacks (column) membership, labels, names, descriptions, duedate and comments. [Contribute code](https://www.focalboard.com/contribute/getting-started/) to expand this. +Currently, the script imports all cards from a single board, including their stacks (column) membership, labels, names, descriptions, duedate and comments. [Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/import/notion/README.md b/import/notion/README.md index 985bbe3e7..05148568e 100644 --- a/import/notion/README.md +++ b/import/notion/README.md @@ -15,4 +15,4 @@ Currently, the script imports all cards from a single board, including their pro The Notion export format does not preserve property types, so the script currently imports all card properties as a Select type. You can change the type after importing into Focalboard. -[Contribute code](https://www.focalboard.com/contribute/getting-started/) to expand this. +[Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/import/trello/README.md b/import/trello/README.md index 14035274e..003604e12 100644 --- a/import/trello/README.md +++ b/import/trello/README.md @@ -11,6 +11,6 @@ This node app converts a Trello json archive into a Focalboard archive. To use: ## Import scope -Currently, the script imports all cards from a single board, including their list (column) membership, names, and descriptions. [Contribute code](https://www.focalboard.com/contribute/getting-started/) to expand this. +Currently, the script imports all cards from a single board, including their list (column) membership, names, and descriptions. [Contribute code](https://mattermost.github.io/focalboard/) to expand this. diff --git a/website/site/config.toml b/website/site/config.toml index f931b0615..e16fc1cd7 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -72,7 +72,7 @@ pygmentsStyle = "manni" weight = 2 [[menu.postpend]] - url = "/contribute/getting-started" + url = "https://mattermost.github.io/focalboard/" name = "Contribute" weight = 3 @@ -125,7 +125,7 @@ pygmentsStyle = "manni" [[params.intro.item]] title = "Contribute" description = "Help build the future of productivity and submit code directly to the Focalboard open-source project." - url = "contribute/getting-started" + url = "https://mattermost.github.io/focalboard/" button = "Start Contributing" icon = "/img/contribute-icon.svg" draft = false diff --git a/website/site/content/blog/2021-4-27-Mattermost-Focalboard-early-preview.md b/website/site/content/blog/2021-4-27-Mattermost-Focalboard-early-preview.md index 61065fed2..ba70bda46 100644 --- a/website/site/content/blog/2021-4-27-Mattermost-Focalboard-early-preview.md +++ b/website/site/content/blog/2021-4-27-Mattermost-Focalboard-early-preview.md @@ -56,7 +56,7 @@ Please [get in touch](https://www.focalboard.com/feedback/)! ## Want to Contribute? We’d love your help! -Help shape the future of Focalboard by contributing ideas, bug reports, and code. Check out our [community page](https://www.focalboard.com/contribute/getting-started/) or [GitHub repo](https://github.com/mattermost/focalboard) to get started. +Help shape the future of Focalboard by contributing ideas, bug reports, and code. Check out our [community page](https://mattermost.github.io/focalboard/) or [GitHub repo](https://github.com/mattermost/focalboard) to get started. You can also browse GitHub tickets with a “[help wanted](https://github.com/mattermost/focalboard/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+for+grabs%22)” tag to see what projects are available. diff --git a/website/site/content/blog/2021-5-13-Focalboard-the-road-to-v1.md b/website/site/content/blog/2021-5-13-Focalboard-the-road-to-v1.md index 5173fc1ad..a6852d638 100644 --- a/website/site/content/blog/2021-5-13-Focalboard-the-road-to-v1.md +++ b/website/site/content/blog/2021-5-13-Focalboard-the-road-to-v1.md @@ -64,7 +64,7 @@ Continuing to get feedback from you, our community is vital to us. Focalboard (a We’d love your help! -Help shape the future of Focalboard by contributing ideas, bug reports, and code. Check out our [community page](https://www.focalboard.com/contribute/getting-started/) or [GitHub repo](https://github.com/mattermost/focalboard) to get started. +Help shape the future of Focalboard by contributing ideas, bug reports, and code. Check out our [community page](https://mattermost.github.io/focalboard/) or [GitHub repo](https://github.com/mattermost/focalboard) to get started. You can also browse GitHub tickets with a “[up for grabs](https://github.com/mattermost/focalboard/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+for+grabs%22)” tag to see what projects are available. diff --git a/website/site/content/contribute/getting-started/_index.md b/website/site/content/contribute/getting-started/_index.md deleted file mode 100644 index ab76d4178..000000000 --- a/website/site/content/contribute/getting-started/_index.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: "Getting Started" -date: "2018-05-19T12:01:23-04:00" -section: "contribute" -weight: 1 ---- - -Welcome to the Focalboard project! - -We're very glad you want to check it out and perhaps contribute code our repository in GitHub. - -Our goal is to make your experience as great as possible. Follow these simple steps to contribute: - -{{< bignumber number="1" title="Set up your developer machine" content="[Clone the project from GitHub](https://github.com/mattermost/focalboard) and follow the steps in the README to build. Read the [developer tips & tricks](dev-tips) to get started." >}} - -{{< bignumber number="2" title="Select a ticket" content="Find [help wanted tickets in GitHub](https://github.com/mattermost/focalboard/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). Comment to let everyone know you’re working on it. If there’s no ticket for what you want to work on see [contributions without a ticket.](/contribute/getting-started/contributions-without-ticket)" >}} - -{{< bignumber number="3" title="Start developing" content="When your changes are ready, run through our [checklist for pull requests](/contribute/getting-started/contribution-checklist). Note that if it’s your first contribution, there is a standard [CLA](https://www.mattermost.org/mattermost-contributor-agreement/) to sign." >}} diff --git a/website/site/content/contribute/getting-started/code-review.md b/website/site/content/contribute/getting-started/code-review.md deleted file mode 100644 index 734d5696b..000000000 --- a/website/site/content/contribute/getting-started/code-review.md +++ /dev/null @@ -1,66 +0,0 @@ ---- -title: "Code Review" -date: 2021-02-03T08:00:00-00:00 -weight: 5 -subsection: Getting Started ---- - -Currently, all changes to the product must be reviewed by a [core committer](/contribute/getting-started/core-committers/#core-committers). - - - -If you are a community member seeking a review ----------------------------------------------- - -1. Submit your pull request. - * Follow the [contribution checklist](../contribution-checklist/). -2. Wait for a reviewer to be assigned. - * Product managers are on the lookout for new pull requests and usually handle this for you automatically. - * If you have been working alongside a core committer, feel free to message them for help. - * When in doubt, ask for help in the [Focalboard](https://community.mattermost.com/core/channels/focalboard) channel on our community server. - * If you are still stuck, please message Chen Lim (@chenilim on GitHub). -3. [Wait for a review](#if-you-are-awaiting-a-review). - * Expect some interaction with at least one reviewer within 5 business days (weekdays, Monday through Friday, excluding [statutory holidays](https://docs.mattermost.com/process/working-at-mattermost.html#holidays)). - * Keep in mind that core committers are geographically distributed around the world and likely in a different time zone than your own. - * If no interaction has occurred after 5 business days, please at-mention a reviewer with a comment on your PR. -4. Make any necessary changes. - * If a reviewer requests changes, your pull request will disappear from their queue of reviews. - * Once you've addressed the concerns, please at-mention the reviewer with a comment on your PR. -5. Wait for your code to be merged. - * Larger pull requests may require more time to review. - * Once all reviewers have approved your changes, they will handle merging your code. - -If you are awaiting a review ----------------------------- - -1. Wait patiently for reviews to complete. - * Expect some interaction with each of your reviewers within 5 business days. - * There is no need to explicitly mention them on the pull request or to explicitly reach out on our community server. -2. Make any necessary changes. - * If a reviewer requests changes, your pull request will disappear from their queue of reviews. - * Once you've addressed the concerns, assign them as a reviewer again to put your pull request back in their queue. - -If you are a core committer asked to give a review --------------------------------------------------- - -1. Respond promptly to requested reviews. - * Assume the requested review is urgent and blocking unless explicitly stated otherwise. - * Try to interact with the author within 2 business days. - * Configure the GitHub plugin to automate notifications. - * Review your outstanding requested reviews daily to avoid blocking authors. - * Prioritize earlier milestones when reviewing to help with the release process. - * Responding quickly doesn't necessarily mean reviewing quickly! Just don't leave the author hanging. -2. Feel free to clarify expectations with the author. - * If the code is experimental, they may need only a cursory glance and thumbs up to proceed with productizing their changes. - * If the review is large or complex, additional time may be required to complete your review. Be upfront with the author. - * If you are not comfortable reviewing the code, avoid "rubber stamping" the review. Be honest with the author and ask them to consider another core committer. -3. Never rush a review. - * Take the time necessary to review the code thoroughly. - * Don't be afraid to ask for changes repeatedly until all concerns are addressed. - * Feel free to challenge assumptions and timelines. Rushing a change into a patch release may cause more harm than good. -4. Avoid leaving a review hanging. - * Try to accept or reject the review instead of just leaving comments. -5. Merge the pull request. - * Do not merge if there are outstanding changes requested. - * Merge the pull request, and delete the branch if not from a fork. diff --git a/website/site/content/contribute/getting-started/contribution-checklist.md b/website/site/content/contribute/getting-started/contribution-checklist.md deleted file mode 100644 index fcf981a00..000000000 --- a/website/site/content/contribute/getting-started/contribution-checklist.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -title: "Contribution Checklist" -date: 2021-02-03T08:00:00-00:00 -weight: 2 -subsection: Getting Started ---- - -Thanks for your interest in contributing code! - - - - - -Follow this checklist for submitting a pull request (PR): - -1. You've signed the [Contributor License Agreement](http://www.mattermost.org/mattermost-contributor-agreement/), so you can be added to the Mattermost [Approved Contributor List](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). -2. Your ticket is a Help Wanted GitHub issue for the project you're contributing to. - - If not, follow the process [here](/contribute/getting-started/contributions-without-ticket). -3. Your code is thoroughly tested, including appropriate unit tests, and manual testing. -4. If applicable, user interface strings are included in the localization file ([en.json](https://github.com/mattermost/focalboard/blob/main/webapp/i18n/en.json)) - - In the webapp folder, run `npm run i18n-extract` to generate the new/updated strings. -5. The PR is submitted against the `main` branch from your fork. -6. The PR title begins with the GitHub Ticket ID (e.g. `[GH-394]`) and the summary template is filled out. - -Once submitted, the automated build process must pass in order for the PR to be accepted. Any errors or failures need to be addressed in order for the PR to be accepted. Next, the PR goes through [code review](../code-review/). To learn about the review process for each project, read the `CONTRIBUTING.md` file of that GitHub repository. - - diff --git a/website/site/content/contribute/getting-started/contributions-without-ticket.md b/website/site/content/contribute/getting-started/contributions-without-ticket.md deleted file mode 100644 index 9ee9e06f1..000000000 --- a/website/site/content/contribute/getting-started/contributions-without-ticket.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: "Contributions Without Ticket" -date: 2021-02-03T08:00:00-00:00 -weight: 3 -subsection: Getting Started ---- - -Contributions for minor corrections and improvements without a corresponding `Help Wanted` ticket are welcome. For example, a pull request for a bug or incremental improvement, with less than 20 lines of code change, is usually accepted if the change to existing behaviour is minor. - -All pull requests submitted without a corresponding ticket will first be reviewed by a core team product manager. Some examples of minor corrections and improvements include: - -- [Fix a formatting error in help text](https://github.com/mattermost/mattermost-server/pull/5640) -- [Fix success typo in Makefile](https://github.com/mattermost/mattermost-server/pull/5809) -- [Fix broken Cancel button in Edit Webhooks screen](https://github.com/mattermost/mattermost-server/pull/5612) -- [Fix Android app crashing when saving user notification settings](https://github.com/mattermost/mattermost-mobile/pull/364) -- [Fix recent mentions search not working](https://github.com/mattermost/mattermost-server/pull/5878) - -**Note:** For pull requests greater than 20 lines of code, a `Help Wanted` ticket should be opened by the core team. This helps ensure that everything going into the project aligns with a unified vision. Core committers who review the PR are entitled to reject it if there isn't a `Help Wanted` ticket and feel it significantly changes behavior or user expectations. - -The best way to discuss opening a `Help Wanted` ticket with the core team is by [starting a conversation in Contributors channel](https://community.mattermost.com/core/channels/focalboard) or [opening an issue in the GitHub repository](https://github.com/mattermost/focalboard/issues/new). diff --git a/website/site/content/contribute/getting-started/core-committers.md b/website/site/content/contribute/getting-started/core-committers.md deleted file mode 100644 index 5172aba5c..000000000 --- a/website/site/content/contribute/getting-started/core-committers.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: "Core Committers" -date: 2021-02-03T08:00:00-00:00 -weight: 4 -subsection: Getting Started ---- - -A core committer is a maintainer on the Focalboard project who has merge access to the repositories. They are responsible for reviewing pull requests, cultivating the developer community, and guiding the technical vision of Focalboard. If you have a question or need some help, these are the people to ask. - -Core Committers ---------------- - -Below is the list of core committers working on Focalboard: - -- **Chen Lim** - - @chen-i.lim on [community.mattermost.com](https://community.mattermost.com/core/messages/@chen-i.lim) and [@chenilim](https://github.com/chenilim) on GitHub -- **Jesús Espino** - - @jesus.espino on [community.mattermost.com](https://community.mattermost.com/core/messages/@jesus.espino) and [@jespino](https://github.com/jespino) on GitHub -- **Corey Hulen** - - @corey on [community.mattermost.com](https://community.mattermost.com/core/messages/@corey) and [@coreyhulen](https://github.com/coreyhulen) on GitHub diff --git a/website/site/content/contribute/getting-started/dev-tips.md b/website/site/content/contribute/getting-started/dev-tips.md deleted file mode 100644 index 5df65626c..000000000 --- a/website/site/content/contribute/getting-started/dev-tips.md +++ /dev/null @@ -1,102 +0,0 @@ ---- -title: "Developer Tips & Tricks" -date: 2021-02-03T00:08:00-00:00 -weight: 1 -subsection: Getting Started ---- - -## Install pre-reqs - -Check that you have recent versions of the basic dependencies installed: -* [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) - * On Windows, install [Git for Windows](https://gitforwindows.org/) and use the git-bash terminal shell -* [Go](https://golang.org/doc/install) -* [Node](https://nodejs.org/en/download/) (v10+) and [npm](https://www.npmjs.com/get-npm) - -On Windows: -* Install [Mingw64](https://chocolatey.org/packages/mingw) via [Chocolatey](https://chocolatey.org/) - -On Mac, to build the Mac app: -* Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) (v12+) -* Install the Xcode commandline tools, via the IDE or run `xcode-select --install` - -On Linux, to build the Linux app: -* `sudo apt-get install libgtk-3-dev` -* `sudo apt-get install libwebkit2gtk-4.0-dev` - -## Clone the project source code - -Clone the [GitHub repo here](https://github.com/mattermost/focalboard). - -## Build and run from the terminal - -Follow the steps in the [main readme file](https://github.com/mattermost/focalboard#building-the-server). In summary, to build and run the server: - -``` -make prebuild -make - ./bin/focalboard-server -``` - -Then open a browser to `http://localhost:8000` to access it. The port is configured in `config.json`. - -Once the server is running, you can rebuild just the webapp with `make webapp` (in a separate terminal window), then reload the browser. - -## VSCode Setup - -Here's a recommended dev-test loop using VSCode: -* Open a bash terminal window to the project folder -* Run `make prebuild` to npm install - * Do this again when dependencies change in `webapp/package.json` -* Run `cd webapp && npm run watchdev` - * This will auto-build the webapp on file changes -* Open VSCode - * Install the [Go](https://marketplace.visualstudio.com/items?itemName=golang.Go) and [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) VSCode extensions if you haven't already -* Hit F5 and select `Go: Launch Server` - * Or, press `Cmd+P` and type `debug ` and pick the option -* Open a browser to `http://localhost:8000` - * The port is configured in `config.json` - -You can now edit the webapp code and refresh the browser to see your changes. - -## Debugging the web app - -You can use your favorite browser to debug the webapp code. With Chrome, open the dev tools with `Cmd+Alt+I` (`Ctrl+Alt+I` in Windows). -* `npm run watchdev` builds the dev package, which includes source maps from js to typescript -* In the Chrome devtools source tab, press `Cmd+P` to jump to a source file - -As a starting point, add a breakpoint to the `render()` function in `BoardPage.tsx`, then refresh the browser to walk through page rendering. - -## Debugging the server - -Debug the Go code in VSCode. This is set up automatically when you launch the server from there. - -To start, add a breakpoint to `handleGetBlocks()` in `server/api/api.go`, then refresh the browser to see how data is retrieved. - -## Localization / Internationalization / Translation - -We use `i18n` to localize the web app. Localized string generally use `intl.formatMessage`. - -When adding or modifying localized strings, run `npm run i18n-extract` in `webapp` to rebuild `webapp/i18n/en.json`. - -Translated strings are stored in other json files under `webapp/i18n`, e.g. `es.json` for Spanish. - -## Database - -By default, data is stored in a sqlite database `focalboard.db`. You can view and edit this directly using `sqlite3 focalboard.db` from bash. - -## Unit tests - -Before checking-in commits, run: `make ci`, which is simlar to the ci.yml workflow and includes: -* Server unit tests: `make server-test` -* Webapp eslint: `cd webapp; npm run check` -* Webapp unit tests: `cd webapp; npm run test` -* Webapp UI tests: `cd webapp; npm run cypress:ci` - -## Running into problems or have questions? - -If you run into any issues with the steps here, or have any general questions, please don't hesitate to reach out either on [GitHub](https://github.com/mattermost/focalboard) or our [Mattermost community channel](https://community.mattermost.com/core/channels/focalboard). - -We welcome everyone, and appreciate any feedback. - -glhf! :) diff --git a/website/site/content/guide/user/_index.md b/website/site/content/guide/user/_index.md index 54be42687..cce5309c5 100644 --- a/website/site/content/guide/user/_index.md +++ b/website/site/content/guide/user/_index.md @@ -7,7 +7,7 @@ weight: 2 This guide is an overview of the basic features to get you started. Focalboard is an open source project that is being updated continuously. -[Let us know](/feedback/) if there's a feature you are looking for, or [connect with our vibrant community](/contribute/getting-started/) to help bring it to life. +[Let us know](/feedback/) if there's a feature you are looking for, or [connect with our vibrant community](https://mattermost.github.io/focalboard/) to help bring it to life. ## Adding new Boards diff --git a/website/site/themes/config.toml b/website/site/themes/config.toml index 52104d054..5d07a5748 100644 --- a/website/site/themes/config.toml +++ b/website/site/themes/config.toml @@ -28,7 +28,7 @@ theme = "hugo-elate-theme" # postpended links [[menu.postpend]] - url = "/contribute/" + url = "https://mattermost.github.io/focalboard/" name = "Contribute" weight = 10 @@ -44,7 +44,7 @@ theme = "hugo-elate-theme" [[params.intro.item]] title = "Contribute" description = "Join the hunrdeds of contributors and submit code directly to the Focalboard open-source project." - url = "/contribute/" + url = "https://mattermost.github.io/focalboard/" button = "Start Contributing" icon = "icon-bulb" img = "img_7.jpg" From b92a3a9786fcf7f0bdc8c368e4979db83ef13106 Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Wed, 9 Feb 2022 13:38:03 -0800 Subject: [PATCH 13/21] Minor: Add .md extension to contributor guide links --- docs/code-review.md | 2 +- docs/contribution-checklist.md | 4 ++-- docs/index.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/code-review.md b/docs/code-review.md index 443ce49cf..0931d11a4 100644 --- a/docs/code-review.md +++ b/docs/code-review.md @@ -1,6 +1,6 @@ # Code Review Checklist -Currently, all changes to the product must be reviewed by a [core committer](core-committers). +Currently, all changes to the product must be reviewed by a [core committer](core-committers.md). ## If you are a community member seeking a review diff --git a/docs/contribution-checklist.md b/docs/contribution-checklist.md index 9e85e1370..ac1d60dac 100644 --- a/docs/contribution-checklist.md +++ b/docs/contribution-checklist.md @@ -6,11 +6,11 @@ Follow this checklist for submitting a pull request (PR): 1. You've signed the [Contributor License Agreement](http://www.mattermost.org/mattermost-contributor-agreement/), so you can be added to the Mattermost [Approved Contributor List](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). 2. Your ticket is a Help Wanted GitHub issue for the project you're contributing to. - - If not, follow the process [here](contributions-without-ticket). + - If not, follow the process [here](contributions-without-ticket.md). 3. Your code is thoroughly tested, including appropriate unit tests, and manual testing. 4. If applicable, user interface strings are included in the localization file ([en.json](https://github.com/mattermost/focalboard/blob/main/webapp/i18n/en.json)) - In the webapp folder, run `npm run i18n-extract` to generate the new/updated strings. 5. The PR is submitted against the `main` branch from your fork. 6. The PR title begins with the GitHub Ticket ID (e.g. `[GH-394]`) and the summary template is filled out. -Once submitted, the automated build process must pass in order for the PR to be accepted. Any errors or failures need to be addressed in order for the PR to be accepted. Next, the PR goes through [code review](code-review). To learn about the review process for each project, read the [CONTRIBUTING.md](https://github.com/mattermost/focalboard/blob/main/CONTRIBUTING.md) file of that GitHub repository. +Once submitted, the automated build process must pass in order for the PR to be accepted. Any errors or failures need to be addressed in order for the PR to be accepted. Next, the PR goes through [code review](code-review.md). To learn about the review process for each project, read the [CONTRIBUTING.md](https://github.com/mattermost/focalboard/blob/main/CONTRIBUTING.md) file of that GitHub repository. diff --git a/docs/index.md b/docs/index.md index 479bf2805..f83c9e28d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -6,11 +6,11 @@ We're very glad you want to check it out and perhaps contribute code our reposit Our goal is to make your experience as great as possible. Follow these simple steps to contribute: -1. [Clone the project from GitHub](https://github.com/mattermost/focalboard) and follow the steps in the README to build. Read the [developer tips & tricks](dev-tips) to get started. +1. [Clone the project from GitHub](https://github.com/mattermost/focalboard) and follow the steps in the README to build. Read the [developer tips & tricks](dev-tips.md) to get started. -2. Find [help wanted tickets in GitHub](https://github.com/mattermost/focalboard/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). Comment to let everyone know you’re working on it, and to allow a core contributor to assign the issue to you. If there’s no ticket for what you want to work on see [contributions without a ticket.](contributions-without-ticket). +2. Find [help wanted tickets in GitHub](https://github.com/mattermost/focalboard/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22). Comment to let everyone know you’re working on it, and to allow a core contributor to assign the issue to you. If there’s no ticket for what you want to work on see [contributions without a ticket.](contributions-without-ticket.md). -3. When your changes are ready, run through our [checklist for pull requests](contribution-checklist). Note that if it’s your first contribution, there is a standard [CLA](https://www.mattermost.org/mattermost-contributor-agreement/) to sign. +3. When your changes are ready, run through our [checklist for pull requests](contribution-checklist.md). Note that if it’s your first contribution, there is a standard [CLA](https://www.mattermost.org/mattermost-contributor-agreement/) to sign. ## Just ask if you need help! From dfa5d54b16bc83197379ec28f8a157b4385af8a1 Mon Sep 17 00:00:00 2001 From: Julien Tant <785518+JulienTant@users.noreply.github.com> Date: Wed, 9 Feb 2022 15:53:47 -0700 Subject: [PATCH 14/21] use mattermost siteURL to determine rudder cookie domain (#2294) --- mattermost-plugin/webapp/src/index.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mattermost-plugin/webapp/src/index.tsx b/mattermost-plugin/webapp/src/index.tsx index a33d7fdf4..28735de61 100644 --- a/mattermost-plugin/webapp/src/index.tsx +++ b/mattermost-plugin/webapp/src/index.tsx @@ -172,7 +172,14 @@ export default class Plugin { } if (rudderKey !== '') { - rudderAnalytics.load(rudderKey, rudderUrl) + const rudderCfg = {} as {setCookieDomain: string} + if (siteURL && siteURL !== '') { + try { + rudderCfg.setCookieDomain = new URL(siteURL).hostname + // eslint-disable-next-line no-empty + } catch (_) {} + } + rudderAnalytics.load(rudderKey, rudderUrl, rudderCfg) rudderAnalytics.identify(config?.telemetryid, {}, TELEMETRY_OPTIONS) From fab5422c94f2e25c6800b0c64d73d04c69a00b35 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Thu, 10 Feb 2022 12:17:22 -0800 Subject: [PATCH 15/21] Website: Add links to footer (#2313) --- website/site/layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/site/layouts/partials/footer.html b/website/site/layouts/partials/footer.html index e72788d7d..7b625047d 100755 --- a/website/site/layouts/partials/footer.html +++ b/website/site/layouts/partials/footer.html @@ -1,6 +1,6 @@
-
© Mattermost, Inc. All Rights Reserved.
+
© Mattermost, Inc. All Rights Reserved. Terms of use. Privacy policy. Cookie policy.
Join the team, we're hiring!
From cad726a813a8137accf1222f63fe61bca3dbd3bd Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Fri, 11 Feb 2022 10:25:23 -0800 Subject: [PATCH 16/21] Update contributors list in contributing.md (#2320) --- CONTRIBUTING.md | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a2cc0ac4..8df8e6072 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,16 +18,32 @@ You can contribute to our documentation in the [Mattermost Boards documentation] # Contributors -**Quality Assurance Contributors**: Correctly files verified bug reports. +**Core Committers**: A core committer is a maintainer on the Focalboard project who has merge access to the repositories. They are responsible for reviewing pull requests, cultivating the developer community, and guiding the technical vision of Focalboard. If you have a question or need some help, these are the people to ask. -- [chenilim](https://github.com/chenilim) +- **Scott Bishel** + - @scott.bishel on [community.mattermost.com](https://community.mattermost.com/core/messages/@scott.bishel) and [@sbishel](https://github.com/sbishel) on GitHub +- **Jesús Espino** + - @jesus.espino on [community.mattermost.com](https://community.mattermost.com/core/messages/@jesus.espino) and [@jespino](https://github.com/jespino) on GitHub +- **Doug Lauder** + - @doug.lauder on [community.mattermost.com](https://community.mattermost.com/core/messages/@doug.lauder) and [@wiggin77](https://github.com/wiggin77) on GitHub +- **Miguel de la Cruz** + - @miguel.delacruz on [community.mattermost.com](https://community.mattermost.com/core/messages/@miguel.delacruz) and [@mgdelacroix](https://github.com/mgdelacroix) on GitHub +- **Harshil Sharma** + - @harshil.sharma on [community.mattermost.com](https://community.mattermost.com/core/messages/@harshil.sharma) and [@harshilsharma63](https://github.com/harshilsharma63) on GitHub +- **Chen Lim** + - @chen-i.lim on [community.mattermost.com](https://community.mattermost.com/core/messages/@chen-i.lim) and [@chenilim](https://github.com/chenilim) on GitHub + +**Quality Assurance**: Checks quality of code and verifies bug fixes. + +- **Ogi Marušić** + - @ogi.marusic on [community.mattermost.com](https://community.mattermost.com/core/messages/@ogi.marusic) and [@ogi-m](https://github.com/ogi-m) on GitHub **Community Organizers**: Responds with comments to Bug Reports, Issues, and Pull Requests with tags, edits and mentions to Core Committers and contributors. -- [it33](https://github.com/it33) +- **Winson Wu** + - @winson.wu on [community.mattermost.com](https://community.mattermost.com/core/messages/@winson.wu) and [@wuwinson](https://github.com/wuwinson) on GitHub -**Core Committers**: Updates project. Approves and merges pull requests from contributors. +**Documentation**: Verifies documentation changes, and updates documentation for new features. -- [chenilim](https://github.com/chenilim) -- [jespino](https://github.com/jespino) -- [coreyhulen](https://github.com/coreyhulen) +- **Justine Geffen** + - @justine.geffen on [community.mattermost.com](https://community.mattermost.com/core/messages/@justine.geffen) and [@justinegeffen ](https://github.com/justinegeffen) on GitHub From 02b50275ee5b011b9f306f07b2cb423ef83a74e7 Mon Sep 17 00:00:00 2001 From: Divya Yeruva Date: Mon, 14 Feb 2022 13:07:10 +0530 Subject: [PATCH 17/21] fixed label and text alignment under hidden columns (#1309) * fixed label and text alignment under hidden columns * alignment fix Co-authored-by: divyay --- webapp/src/components/kanban/kanban.scss | 5 +++++ webapp/src/widgets/label.scss | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/webapp/src/components/kanban/kanban.scss b/webapp/src/components/kanban/kanban.scss index 229e45013..356c2c9c7 100644 --- a/webapp/src/components/kanban/kanban.scss +++ b/webapp/src/components/kanban/kanban.scss @@ -85,9 +85,14 @@ .octo-board-hidden-item { display: flex; flex-direction: row; + align-items: center; > div { margin-right: 5px; } + + .Label { + margin: 5px; + } } } diff --git a/webapp/src/widgets/label.scss b/webapp/src/widgets/label.scss index c665f6891..c85a7d719 100644 --- a/webapp/src/widgets/label.scss +++ b/webapp/src/widgets/label.scss @@ -3,7 +3,6 @@ align-items: center; padding: 2px 8px; margin-right: 5px; - margin-bottom: 5px; border-radius: 3px; line-height: 20px; color: rgba(var(--center-channel-color-rgb), 0.8); From 869cb7ea889b95d78263f36581ee8357ba36a6f1 Mon Sep 17 00:00:00 2001 From: Doug Lauder Date: Mon, 14 Feb 2022 10:38:45 -0500 Subject: [PATCH 18/21] restore ArchiveUtils for import scripts (#2314) --- import/asana/importAsana.ts | 2 +- import/jira/jiraImporter.ts | 2 +- import/notion/importNotion.ts | 2 +- import/todoist/importTodoist.ts | 2 +- import/trello/importTrello.ts | 2 +- import/util/archive.ts | 81 +++++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 import/util/archive.ts diff --git a/import/asana/importAsana.ts b/import/asana/importAsana.ts index 58ca3cca9..806c1f5f9 100644 --- a/import/asana/importAsana.ts +++ b/import/asana/importAsana.ts @@ -3,7 +3,7 @@ import * as fs from 'fs' import minimist from 'minimist' import {exit} from 'process' -import {ArchiveUtils} from '../../webapp/src/blocks/archive' +import {ArchiveUtils} from '../util/archive' import {Block} from '../../webapp/src/blocks/block' import {IPropertyOption, IPropertyTemplate, createBoard} from '../../webapp/src/blocks/board' import {createBoardView} from '../../webapp/src/blocks/boardView' diff --git a/import/jira/jiraImporter.ts b/import/jira/jiraImporter.ts index e35d33cff..afca95171 100644 --- a/import/jira/jiraImporter.ts +++ b/import/jira/jiraImporter.ts @@ -2,7 +2,7 @@ // See LICENSE.txt for license information. import * as fs from 'fs' import {exit} from 'process' -import {ArchiveUtils} from '../../webapp/src/blocks/archive' +import {ArchiveUtils} from '../util/archive' import {Block} from '../../webapp/src/blocks/block' import {IPropertyOption, IPropertyTemplate, createBoard} from '../../webapp/src/blocks/board' import {createBoardView} from '../../webapp/src/blocks/boardView' diff --git a/import/notion/importNotion.ts b/import/notion/importNotion.ts index 4f48acbbf..10a71e887 100644 --- a/import/notion/importNotion.ts +++ b/import/notion/importNotion.ts @@ -3,7 +3,7 @@ import * as fs from 'fs' import minimist from 'minimist' import path from 'path' import {exit} from 'process' -import {ArchiveUtils} from '../../webapp/src/blocks/archive' +import {ArchiveUtils} from '../util/archive' import {Block} from '../../webapp/src/blocks/block' import {IPropertyTemplate, createBoard} from '../../webapp/src/blocks/board' import {createBoardView} from '../../webapp/src/blocks/boardView' diff --git a/import/todoist/importTodoist.ts b/import/todoist/importTodoist.ts index bbbb338ce..a881b59bb 100644 --- a/import/todoist/importTodoist.ts +++ b/import/todoist/importTodoist.ts @@ -3,7 +3,7 @@ import * as fs from 'fs' import minimist from 'minimist' import {exit} from 'process' -import {ArchiveUtils} from '../../webapp/src/blocks/archive' +import {ArchiveUtils} from '../util/archive' import {Block} from '../../webapp/src/blocks/block' import {IPropertyOption, IPropertyTemplate, createBoard} from '../../webapp/src/blocks/board' import {createBoardView} from '../../webapp/src/blocks/boardView' diff --git a/import/trello/importTrello.ts b/import/trello/importTrello.ts index 7157d0f9c..afa95cba3 100644 --- a/import/trello/importTrello.ts +++ b/import/trello/importTrello.ts @@ -3,7 +3,7 @@ import * as fs from 'fs' import minimist from 'minimist' import {exit} from 'process' -import {ArchiveUtils} from '../../webapp/src/blocks/archive' +import {ArchiveUtils} from '../util/archive' import {Block} from '../../webapp/src/blocks/block' import {IPropertyOption, IPropertyTemplate, createBoard} from '../../webapp/src/blocks/board' import {createBoardView} from '../../webapp/src/blocks/boardView' diff --git a/import/util/archive.ts b/import/util/archive.ts new file mode 100644 index 000000000..e4502d3f4 --- /dev/null +++ b/import/util/archive.ts @@ -0,0 +1,81 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. +import {Block} from '../../webapp/src/blocks/block' + +interface ArchiveHeader { + version: number + date: number +} + +interface ArchiveLine { + type: string, + data: unknown, +} + +// This schema allows the expansion of additional line types in the future +interface BlockArchiveLine extends ArchiveLine { + type: 'block', + data: Block +} + +class ArchiveUtils { + static buildBlockArchive(blocks: readonly Block[]): string { + const header: ArchiveHeader = { + version: 1, + date: Date.now(), + } + + const headerString = JSON.stringify(header) + let content = headerString + '\n' + for (const block of blocks) { + const line: BlockArchiveLine = { + type: 'block', + data: block, + } + const lineString = JSON.stringify(line) + content += lineString + content += '\n' + } + + return content + } + + static parseBlockArchive(contents: string): Block[] { + const blocks: Block[] = [] + const allLineStrings = contents.split('\n') + if (allLineStrings.length >= 2) { + const headerString = allLineStrings[0] + const header = JSON.parse(headerString) as ArchiveHeader + if (header.date && header.version >= 1) { + const lineStrings = allLineStrings.slice(1) + let lineNum = 2 + for (const lineString of lineStrings) { + if (!lineString) { + // Ignore empty lines, e.g. last line + continue + } + const line = JSON.parse(lineString) as ArchiveLine + if (!line || !line.type || !line.data) { + throw new Error(`ERROR parsing line ${lineNum}`) + } + switch (line.type) { + case 'block': { + const blockLine = line as BlockArchiveLine + const block = blockLine.data + blocks.push(block) + break + } + } + + lineNum += 1 + } + } else { + throw new Error('ERROR parsing header') + } + } + + return blocks + } +} + +export {ArchiveHeader, ArchiveLine, BlockArchiveLine, ArchiveUtils} \ No newline at end of file From 263e6606046f89d079b821ff27d02b77dee0acc7 Mon Sep 17 00:00:00 2001 From: kamre Date: Mon, 14 Feb 2022 23:55:13 +0300 Subject: [PATCH 19/21] Change wrapping of components in `React.memo` so that components have proper names in React Dev Tools. (#2332) --- webapp/src/app.tsx | 6 +++--- webapp/src/components/addContentMenuItem.tsx | 6 +++--- webapp/src/components/blockIconSelector.tsx | 6 +++--- .../boardTemplateSelector/boardTemplateSelector.tsx | 7 +++---- .../boardTemplateSelector/boardTemplateSelectorItem.tsx | 6 +++--- .../boardTemplateSelector/boardTemplateSelectorPreview.tsx | 6 +++--- webapp/src/components/cardDetail/cardDetailContents.tsx | 6 +++--- .../src/components/cardDetail/cardDetailContentsMenu.tsx | 6 +++--- webapp/src/components/cardDetail/cardDetailProperties.tsx | 6 +++--- webapp/src/components/cardDetail/commentsList.tsx | 6 +++--- webapp/src/components/content/checkboxElement.tsx | 6 +++--- webapp/src/components/content/dividerElement.tsx | 4 ++-- webapp/src/components/content/imageElement.tsx | 6 +++--- webapp/src/components/content/textElement.tsx | 6 +++--- webapp/src/components/contentBlock.tsx | 6 +++--- webapp/src/components/dialog.tsx | 6 +++--- webapp/src/components/gallery/galleryCard.tsx | 6 +++--- .../components/globalHeader/globalHeaderSettingsMenu.tsx | 6 +++--- webapp/src/components/kanban/kanbanCard.tsx | 6 +++--- webapp/src/components/kanban/kanbanColumn.tsx | 6 +++--- webapp/src/components/modal.tsx | 6 +++--- webapp/src/components/modalWrapper.tsx | 6 +++--- webapp/src/components/properties/select/select.tsx | 6 +++--- webapp/src/components/rootPortal.tsx | 6 +++--- webapp/src/components/shareBoard/shareBoardButton.tsx | 6 +++--- webapp/src/components/sidebar/registrationLink.tsx | 6 +++--- webapp/src/components/sidebar/sidebar.tsx | 6 +++--- webapp/src/components/sidebar/sidebarBoardItem.tsx | 6 +++--- webapp/src/components/sidebar/sidebarSettingsMenu.tsx | 6 +++--- webapp/src/components/sidebar/sidebarUserMenu.tsx | 6 +++--- webapp/src/components/table/horizontalGrip.tsx | 6 +++--- webapp/src/components/table/tableGroup.tsx | 6 +++--- webapp/src/components/table/tableGroupHeaderRow.tsx | 6 +++--- webapp/src/components/table/tableHeader.tsx | 6 +++--- webapp/src/components/table/tableRow.tsx | 6 +++--- webapp/src/components/topBar.tsx | 6 +++--- webapp/src/components/viewHeader/emptyCardButton.tsx | 6 +++--- webapp/src/components/viewHeader/filterComponent.tsx | 6 +++--- webapp/src/components/viewHeader/filterEntry.tsx | 6 +++--- webapp/src/components/viewHeader/newCardButton.tsx | 6 +++--- .../components/viewHeader/newCardButtonTemplateItem.tsx | 6 +++--- webapp/src/components/viewHeader/viewHeader.tsx | 6 +++--- webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx | 6 +++--- .../src/components/viewHeader/viewHeaderDisplayByMenu.tsx | 6 +++--- webapp/src/components/viewHeader/viewHeaderGroupByMenu.tsx | 6 +++--- .../src/components/viewHeader/viewHeaderPropertiesMenu.tsx | 6 +++--- webapp/src/components/viewHeader/viewHeaderSortMenu.tsx | 6 +++--- webapp/src/components/viewMenu.tsx | 6 +++--- webapp/src/components/viewTitle.tsx | 6 +++--- webapp/src/components/workspace.tsx | 6 +++--- webapp/src/pages/changePasswordPage.tsx | 6 +++--- webapp/src/pages/dashboard/dashboardPage.tsx | 6 +++--- webapp/src/pages/errorPage.tsx | 6 +++--- webapp/src/pages/loginPage.tsx | 6 +++--- webapp/src/pages/registerPage.tsx | 6 +++--- webapp/src/pages/welcome/welcomePage.tsx | 6 +++--- webapp/src/widgets/menuWrapper.tsx | 6 +++--- webapp/src/widgets/propertyMenu.tsx | 6 +++--- webapp/src/widgets/valueSelector.tsx | 6 +++--- 59 files changed, 176 insertions(+), 177 deletions(-) diff --git a/webapp/src/app.tsx b/webapp/src/app.tsx index 794584fe3..2b1934eb1 100644 --- a/webapp/src/app.tsx +++ b/webapp/src/app.tsx @@ -42,7 +42,7 @@ declare let window: IAppWindow const UUID_REGEX = new RegExp(/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/) -const App = React.memo((): JSX.Element => { +const App = (): JSX.Element => { const language = useAppSelector(getLanguage) const loggedIn = useAppSelector(getLoggedIn) const globalError = useAppSelector(getGlobalError) @@ -277,6 +277,6 @@ const App = React.memo((): JSX.Element => { ) -}) +} -export default App +export default React.memo(App) diff --git a/webapp/src/components/addContentMenuItem.tsx b/webapp/src/components/addContentMenuItem.tsx index 434715300..1e121b641 100644 --- a/webapp/src/components/addContentMenuItem.tsx +++ b/webapp/src/components/addContentMenuItem.tsx @@ -18,7 +18,7 @@ type Props = { cords: {x: number, y?: number, z?: number} } -const AddContentMenuItem = React.memo((props:Props): JSX.Element => { +const AddContentMenuItem = (props:Props): JSX.Element => { const {card, type, cords} = props const index = cords.x const contentOrder = card.fields.contentOrder.slice() @@ -51,6 +51,6 @@ const AddContentMenuItem = React.memo((props:Props): JSX.Element => { }} /> ) -}) +} -export default AddContentMenuItem +export default React.memo(AddContentMenuItem) diff --git a/webapp/src/components/blockIconSelector.tsx b/webapp/src/components/blockIconSelector.tsx index 0f95ee4dd..f404f9bdd 100644 --- a/webapp/src/components/blockIconSelector.tsx +++ b/webapp/src/components/blockIconSelector.tsx @@ -20,7 +20,7 @@ type Props = { readonly?: boolean } -const BlockIconSelector = React.memo((props: Props) => { +const BlockIconSelector = (props: Props) => { const {block, size} = props const intl = useIntl() @@ -72,6 +72,6 @@ const BlockIconSelector = React.memo((props: Props) => { }
) -}) +} -export default BlockIconSelector +export default React.memo(BlockIconSelector) diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx index 329c49150..e680128e7 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelector.tsx @@ -27,7 +27,7 @@ type Props = { onClose?: () => void } -const BoardTemplateSelector = React.memo((props: Props) => { +const BoardTemplateSelector = (props: Props) => { const globalTemplates = useAppSelector(getGlobalTemplates) || [] const currentBoard = useAppSelector(getCurrentBoard) || null const {title, description, onClose} = props @@ -166,7 +166,6 @@ const BoardTemplateSelector = React.memo((props: Props) => {
) -}) - -export default BoardTemplateSelector +} +export default React.memo(BoardTemplateSelector) diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx index f5d0fac12..0d0899b04 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorItem.tsx @@ -19,7 +19,7 @@ type Props = { onEdit: (templateId: string) => void } -const BoardTemplateSelectorItem = React.memo((props: Props) => { +const BoardTemplateSelectorItem = (props: Props) => { const {isActive, template, onEdit, onDelete, onSelect} = props const intl = useIntl() const [deleteOpen, setDeleteOpen] = useState(false) @@ -65,6 +65,6 @@ const BoardTemplateSelectorItem = React.memo((props: Props) => { />}
) -}) +} -export default BoardTemplateSelectorItem +export default React.memo(BoardTemplateSelectorItem) diff --git a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx index acfb25ad5..02d8314cb 100644 --- a/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx +++ b/webapp/src/components/boardTemplateSelector/boardTemplateSelectorPreview.tsx @@ -21,7 +21,7 @@ type Props = { activeTemplate: Board|null } -const BoardTemplateSelectorPreview = React.memo((props: Props) => { +const BoardTemplateSelectorPreview = (props: Props) => { const {activeTemplate} = props const [activeView, setActiveView] = useState(null) const [activeTemplateCards, setActiveTemplateCards] = useState([]) @@ -137,7 +137,7 @@ const BoardTemplateSelectorPreview = React.memo((props: Props) => { />}
) -}) +} -export default BoardTemplateSelectorPreview +export default React.memo(BoardTemplateSelectorPreview) diff --git a/webapp/src/components/cardDetail/cardDetailContents.tsx b/webapp/src/components/cardDetail/cardDetailContents.tsx index 3b1eb6467..4c2d00adf 100644 --- a/webapp/src/components/cardDetail/cardDetailContents.tsx +++ b/webapp/src/components/cardDetail/cardDetailContents.tsx @@ -147,7 +147,7 @@ const ContentBlockWithDragAndDrop = (props: ContentBlockWithDragAndDropProps) => ) } -const CardDetailContents = React.memo((props: Props) => { +const CardDetailContents = (props: Props) => { const intl = useIntl() const {contents, card, id} = props if (contents.length) { @@ -188,6 +188,6 @@ const CardDetailContents = React.memo((props: Props) => {
) -}) +} -export default CardDetailContents +export default React.memo(CardDetailContents) diff --git a/webapp/src/components/cardDetail/cardDetailContentsMenu.tsx b/webapp/src/components/cardDetail/cardDetailContentsMenu.tsx index ee11c4165..ed1bc1690 100644 --- a/webapp/src/components/cardDetail/cardDetailContentsMenu.tsx +++ b/webapp/src/components/cardDetail/cardDetailContentsMenu.tsx @@ -37,7 +37,7 @@ function addContentMenu(intl: IntlShape, type: BlockTypes): JSX.Element { ) } -const CardDetailContentsMenu = React.memo(() => { +const CardDetailContentsMenu = () => { const intl = useIntl() return (
@@ -54,6 +54,6 @@ const CardDetailContentsMenu = React.memo(() => {
) -}) +} -export default CardDetailContentsMenu +export default React.memo(CardDetailContentsMenu) diff --git a/webapp/src/components/cardDetail/cardDetailProperties.tsx b/webapp/src/components/cardDetail/cardDetailProperties.tsx index f21f2af69..0b096ce20 100644 --- a/webapp/src/components/cardDetail/cardDetailProperties.tsx +++ b/webapp/src/components/cardDetail/cardDetailProperties.tsx @@ -32,7 +32,7 @@ type Props = { readonly: boolean } -const CardDetailProperties = React.memo((props: Props) => { +const CardDetailProperties = (props: Props) => { const {board, card, cards, views, activeView, contents, comments} = props const [newTemplateId, setNewTemplateId] = useState('') const intl = useIntl() @@ -202,6 +202,6 @@ const CardDetailProperties = React.memo((props: Props) => { }
) -}) +} -export default CardDetailProperties +export default React.memo(CardDetailProperties) diff --git a/webapp/src/components/cardDetail/commentsList.tsx b/webapp/src/components/cardDetail/commentsList.tsx index 86017196a..df64a6847 100644 --- a/webapp/src/components/cardDetail/commentsList.tsx +++ b/webapp/src/components/cardDetail/commentsList.tsx @@ -24,7 +24,7 @@ type Props = { readonly: boolean } -const CommentsList = React.memo((props: Props) => { +const CommentsList = (props: Props) => { const [newComment, setNewComment] = useState('') const me = useAppSelector(getMe) @@ -97,6 +97,6 @@ const CommentsList = React.memo((props: Props) => { {!(comments.length === 0 && props.readonly) &&
}
) -}) +} -export default CommentsList +export default React.memo(CommentsList) diff --git a/webapp/src/components/content/checkboxElement.tsx b/webapp/src/components/content/checkboxElement.tsx index c86602eea..15955a546 100644 --- a/webapp/src/components/content/checkboxElement.tsx +++ b/webapp/src/components/content/checkboxElement.tsx @@ -21,7 +21,7 @@ type Props = { onDeleteElement?: () => void } -const CheckboxElement = React.memo((props: Props) => { +const CheckboxElement = (props: Props) => { const {block, readonly} = props const intl = useIntl() const titleRef = useRef(null) @@ -83,7 +83,7 @@ const CheckboxElement = React.memo((props: Props) => { />
) -}) +} contentRegistry.registerContentType({ type: 'checkbox', @@ -104,4 +104,4 @@ contentRegistry.registerContentType({ }, }) -export default CheckboxElement +export default React.memo(CheckboxElement) diff --git a/webapp/src/components/content/dividerElement.tsx b/webapp/src/components/content/dividerElement.tsx index 11c3dca94..cc7c1cad9 100644 --- a/webapp/src/components/content/dividerElement.tsx +++ b/webapp/src/components/content/dividerElement.tsx @@ -8,7 +8,7 @@ import DividerIcon from '../../widgets/icons/divider' import {contentRegistry} from './contentRegistry' import './dividerElement.scss' -const DividerElement = React.memo((): JSX.Element =>
) +const DividerElement = (): JSX.Element =>
contentRegistry.registerContentType({ type: 'divider', @@ -20,4 +20,4 @@ contentRegistry.registerContentType({ createComponent: () => , }) -export default DividerElement +export default React.memo(DividerElement) diff --git a/webapp/src/components/content/imageElement.tsx b/webapp/src/components/content/imageElement.tsx index ffdc8eb8e..a687102fe 100644 --- a/webapp/src/components/content/imageElement.tsx +++ b/webapp/src/components/content/imageElement.tsx @@ -14,7 +14,7 @@ type Props = { block: ContentBlock } -const ImageElement = React.memo((props: Props): JSX.Element|null => { +const ImageElement = (props: Props): JSX.Element|null => { const [imageDataUrl, setImageDataUrl] = useState(null) const {block} = props @@ -40,7 +40,7 @@ const ImageElement = React.memo((props: Props): JSX.Element|null => { alt={block.title} /> ) -}) +} contentRegistry.registerContentType({ type: 'image', @@ -65,4 +65,4 @@ contentRegistry.registerContentType({ createComponent: (block) => , }) -export default ImageElement +export default React.memo(ImageElement) diff --git a/webapp/src/components/content/textElement.tsx b/webapp/src/components/content/textElement.tsx index 73955fe51..beef17a7a 100644 --- a/webapp/src/components/content/textElement.tsx +++ b/webapp/src/components/content/textElement.tsx @@ -16,7 +16,7 @@ type Props = { readonly: boolean } -const TextElement = React.memo((props: Props): JSX.Element => { +const TextElement = (props: Props): JSX.Element => { const {block, readonly} = props const intl = useIntl() @@ -32,7 +32,7 @@ const TextElement = React.memo((props: Props): JSX.Element => { readonly={readonly} /> ) -}) +} contentRegistry.registerContentType({ type: 'text', @@ -51,4 +51,4 @@ contentRegistry.registerContentType({ }, }) -export default TextElement +export default React.memo(TextElement) diff --git a/webapp/src/components/contentBlock.tsx b/webapp/src/components/contentBlock.tsx index 718d2e81e..f2de21e5b 100644 --- a/webapp/src/components/contentBlock.tsx +++ b/webapp/src/components/contentBlock.tsx @@ -34,7 +34,7 @@ type Props = { cords: {x: number, y?: number, z?: number} } -const ContentBlock = React.memo((props: Props): JSX.Element => { +const ContentBlock = (props: Props): JSX.Element => { const {card, block, readonly, cords} = props const intl = useIntl() const [, , gripRef, itemRef] = useSortableWithGrip('content', {block, cords}, true, () => {}) @@ -158,6 +158,6 @@ const ContentBlock = React.memo((props: Props): JSX.Element => { />
) -}) +} -export default ContentBlock +export default React.memo(ContentBlock) diff --git a/webapp/src/components/dialog.tsx b/webapp/src/components/dialog.tsx index 151a2df4e..8d7642ded 100644 --- a/webapp/src/components/dialog.tsx +++ b/webapp/src/components/dialog.tsx @@ -20,7 +20,7 @@ type Props = { onClose: () => void, } -const Dialog = React.memo((props: Props) => { +const Dialog = (props: Props) => { const {toolsMenu} = props const {toolbar, title} = props const intl = useIntl() @@ -73,6 +73,6 @@ const Dialog = React.memo((props: Props) => {
) -}) +} -export default Dialog +export default React.memo(Dialog) diff --git a/webapp/src/components/gallery/galleryCard.tsx b/webapp/src/components/gallery/galleryCard.tsx index d7f11a6b1..b0017b319 100644 --- a/webapp/src/components/gallery/galleryCard.tsx +++ b/webapp/src/components/gallery/galleryCard.tsx @@ -42,7 +42,7 @@ type Props = { onDrop: (srcCard: Card, dstCard: Card) => void } -const GalleryCard = React.memo((props: Props) => { +const GalleryCard = (props: Props) => { const {card, board} = props const intl = useIntl() const [isDragging, isOver, cardRef] = useSortable('card', card, props.isManualSort && !props.readonly, props.onDrop) @@ -185,6 +185,6 @@ const GalleryCard = React.memo((props: Props) => { />}
) -}) +} -export default GalleryCard +export default React.memo(GalleryCard) diff --git a/webapp/src/components/globalHeader/globalHeaderSettingsMenu.tsx b/webapp/src/components/globalHeader/globalHeaderSettingsMenu.tsx index 160215afc..28030370b 100644 --- a/webapp/src/components/globalHeader/globalHeaderSettingsMenu.tsx +++ b/webapp/src/components/globalHeader/globalHeaderSettingsMenu.tsx @@ -17,7 +17,7 @@ import TelemetryClient, {TelemetryCategory, TelemetryActions} from '../../teleme import './globalHeaderSettingsMenu.scss' -const GlobalHeaderSettingsMenu = React.memo(() => { +const GlobalHeaderSettingsMenu = () => { const intl = useIntl() const dispatch = useAppDispatch() @@ -96,6 +96,6 @@ const GlobalHeaderSettingsMenu = React.memo(() => {
) -}) +} -export default GlobalHeaderSettingsMenu +export default React.memo(GlobalHeaderSettingsMenu) diff --git a/webapp/src/components/kanban/kanbanCard.tsx b/webapp/src/components/kanban/kanbanCard.tsx index 494fcbf62..57dfcbc02 100644 --- a/webapp/src/components/kanban/kanbanCard.tsx +++ b/webapp/src/components/kanban/kanbanCard.tsx @@ -40,7 +40,7 @@ type Props = { isManualSort: boolean } -const KanbanCard = React.memo((props: Props) => { +const KanbanCard = (props: Props) => { const {card, board} = props const intl = useIntl() const [isDragging, isOver, cardRef] = useSortable('card', card, !props.readonly, props.onDrop) @@ -174,6 +174,6 @@ const KanbanCard = React.memo((props: Props) => { ) -}) +} -export default KanbanCard +export default React.memo(KanbanCard) diff --git a/webapp/src/components/kanban/kanbanColumn.tsx b/webapp/src/components/kanban/kanbanColumn.tsx index 069811f89..d5924cfbe 100644 --- a/webapp/src/components/kanban/kanbanColumn.tsx +++ b/webapp/src/components/kanban/kanbanColumn.tsx @@ -11,7 +11,7 @@ type Props = { children: React.ReactNode } -const KanbanColumn = React.memo((props: Props) => { +const KanbanColumn = (props: Props) => { const [{isOver}, drop] = useDrop(() => ({ accept: 'card', collect: (monitor) => ({ @@ -36,6 +36,6 @@ const KanbanColumn = React.memo((props: Props) => { {props.children}
) -}) +} -export default KanbanColumn +export default React.memo(KanbanColumn) diff --git a/webapp/src/components/modal.tsx b/webapp/src/components/modal.tsx index c83dbf525..a66da1857 100644 --- a/webapp/src/components/modal.tsx +++ b/webapp/src/components/modal.tsx @@ -12,7 +12,7 @@ type Props = { children: React.ReactNode } -const Modal = React.memo((props: Props): JSX.Element => { +const Modal = (props: Props): JSX.Element => { const node = useRef(null) const {position, onClose, children} = props @@ -47,6 +47,6 @@ const Modal = React.memo((props: Props): JSX.Element => { {children}
) -}) +} -export default Modal +export default React.memo(Modal) diff --git a/webapp/src/components/modalWrapper.tsx b/webapp/src/components/modalWrapper.tsx index b8cc1c209..e344fc8bd 100644 --- a/webapp/src/components/modalWrapper.tsx +++ b/webapp/src/components/modalWrapper.tsx @@ -7,12 +7,12 @@ type Props = { children: React.ReactNode } -const ModalWrapper = React.memo((props: Props) => { +const ModalWrapper = (props: Props) => { return (
{props.children}
) -}) +} -export default ModalWrapper +export default React.memo(ModalWrapper) diff --git a/webapp/src/components/properties/select/select.tsx b/webapp/src/components/properties/select/select.tsx index 8560e7838..74b48a379 100644 --- a/webapp/src/components/properties/select/select.tsx +++ b/webapp/src/components/properties/select/select.tsx @@ -20,7 +20,7 @@ type Props = { isEditable: boolean } -const SelectProperty = React.memo((props: Props) => { +const SelectProperty = (props: Props) => { const {emptyValue, propertyValue, propertyTemplate, isEditable} = props const [open, setOpen] = useState(false) @@ -56,6 +56,6 @@ const SelectProperty = React.memo((props: Props) => { onBlur={() => setOpen(false)} /> ) -}) +} -export default SelectProperty +export default React.memo(SelectProperty) diff --git a/webapp/src/components/rootPortal.tsx b/webapp/src/components/rootPortal.tsx index 5e17db6f5..5c930a8d6 100644 --- a/webapp/src/components/rootPortal.tsx +++ b/webapp/src/components/rootPortal.tsx @@ -8,7 +8,7 @@ type Props = { children: React.ReactNode } -const RootPortal = React.memo((props: Props): JSX.Element => { +const RootPortal = (props: Props): JSX.Element => { const [el] = useState(document.createElement('div')) const rootPortal = document.getElementById('focalboard-root-portal') @@ -24,6 +24,6 @@ const RootPortal = React.memo((props: Props): JSX.Element => { }, []) return ReactDOM.createPortal(props.children, el) // eslint-disable-line -}) +} -export default RootPortal +export default React.memo(RootPortal) diff --git a/webapp/src/components/shareBoard/shareBoardButton.tsx b/webapp/src/components/shareBoard/shareBoardButton.tsx index 4e7ec1475..ef1aaa055 100644 --- a/webapp/src/components/shareBoard/shareBoardButton.tsx +++ b/webapp/src/components/shareBoard/shareBoardButton.tsx @@ -16,7 +16,7 @@ import ShareBoardDialog from './shareBoard' type Props = { boardId: string } -const ShareBoardButton = React.memo((props: Props) => { +const ShareBoardButton = (props: Props) => { const [showShareDialog, setShowShareDialog] = useState(false) return ( @@ -47,6 +47,6 @@ const ShareBoardButton = React.memo((props: Props) => { }
) -}) +} -export default ShareBoardButton +export default React.memo(ShareBoardButton) diff --git a/webapp/src/components/sidebar/registrationLink.tsx b/webapp/src/components/sidebar/registrationLink.tsx index 172d8fbe2..fc0d46b71 100644 --- a/webapp/src/components/sidebar/registrationLink.tsx +++ b/webapp/src/components/sidebar/registrationLink.tsx @@ -19,7 +19,7 @@ type Props = { onClose: () => void } -const RegistrationLink = React.memo((props: Props) => { +const RegistrationLink = (props: Props) => { const {onClose} = props const intl = useIntl() const workspace = useAppSelector(getCurrentWorkspace) @@ -89,6 +89,6 @@ const RegistrationLink = React.memo((props: Props) => {
) -}) +} -export default RegistrationLink +export default React.memo(RegistrationLink) diff --git a/webapp/src/components/sidebar/sidebar.tsx b/webapp/src/components/sidebar/sidebar.tsx index 35a5c8d3f..97aea8d22 100644 --- a/webapp/src/components/sidebar/sidebar.tsx +++ b/webapp/src/components/sidebar/sidebar.tsx @@ -39,7 +39,7 @@ function getWindowDimensions() { } } -const Sidebar = React.memo((props: Props) => { +const Sidebar = (props: Props) => { const [isHidden, setHidden] = useState(false) const [userHidden, setUserHidden] = useState(false) const [windowDimensions, setWindowDimensions] = useState(getWindowDimensions()) @@ -209,6 +209,6 @@ const Sidebar = React.memo((props: Props) => { }
) -}) +} -export default Sidebar +export default React.memo(Sidebar) diff --git a/webapp/src/components/sidebar/sidebarBoardItem.tsx b/webapp/src/components/sidebar/sidebarBoardItem.tsx index d1e5622d1..e751d638e 100644 --- a/webapp/src/components/sidebar/sidebarBoardItem.tsx +++ b/webapp/src/components/sidebar/sidebarBoardItem.tsx @@ -33,7 +33,7 @@ type Props = { hideSidebar: () => void } -const SidebarBoardItem = React.memo((props: Props) => { +const SidebarBoardItem = (props: Props) => { const [collapsed, setCollapsed] = useState(false) const intl = useIntl() const history = useHistory() @@ -207,6 +207,6 @@ const SidebarBoardItem = React.memo((props: Props) => { />}
) -}) +} -export default SidebarBoardItem +export default React.memo(SidebarBoardItem) diff --git a/webapp/src/components/sidebar/sidebarSettingsMenu.tsx b/webapp/src/components/sidebar/sidebarSettingsMenu.tsx index 46b9767f4..02fcf4c17 100644 --- a/webapp/src/components/sidebar/sidebarSettingsMenu.tsx +++ b/webapp/src/components/sidebar/sidebarSettingsMenu.tsx @@ -30,7 +30,7 @@ type Props = { activeTheme: string } -const SidebarSettingsMenu = React.memo((props: Props) => { +const SidebarSettingsMenu = (props: Props) => { const intl = useIntl() const dispatch = useAppDispatch() @@ -164,6 +164,6 @@ const SidebarSettingsMenu = React.memo((props: Props) => {
) -}) +} -export default SidebarSettingsMenu +export default React.memo(SidebarSettingsMenu) diff --git a/webapp/src/components/sidebar/sidebarUserMenu.tsx b/webapp/src/components/sidebar/sidebarUserMenu.tsx index 9dfe31da2..be031600f 100644 --- a/webapp/src/components/sidebar/sidebarUserMenu.tsx +++ b/webapp/src/components/sidebar/sidebarUserMenu.tsx @@ -25,7 +25,7 @@ import './sidebarUserMenu.scss' declare let window: IAppWindow -const SidebarUserMenu = React.memo(() => { +const SidebarUserMenu = () => { const history = useHistory() const [showRegistrationLinkDialog, setShowRegistrationLinkDialog] = useState(false) const user = useAppSelector(getMe) @@ -106,6 +106,6 @@ const SidebarUserMenu = React.memo(() => {
) -}) +} -export default SidebarUserMenu +export default React.memo(SidebarUserMenu) diff --git a/webapp/src/components/table/horizontalGrip.tsx b/webapp/src/components/table/horizontalGrip.tsx index 67e3ea1ee..8c5dd9a9f 100644 --- a/webapp/src/components/table/horizontalGrip.tsx +++ b/webapp/src/components/table/horizontalGrip.tsx @@ -10,7 +10,7 @@ type Props = { onAutoSizeColumn: (columnID: string) => void; } -const HorizontalGrip = React.memo((props: Props): JSX.Element => { +const HorizontalGrip = (props: Props): JSX.Element => { const [, drag] = useDrag(() => ({ type: 'horizontalGrip', item: {id: props.templateId}, @@ -23,6 +23,6 @@ const HorizontalGrip = React.memo((props: Props): JSX.Element => { onDoubleClick={() => props.onAutoSizeColumn(props.templateId)} /> ) -}) +} -export default HorizontalGrip +export default React.memo(HorizontalGrip) diff --git a/webapp/src/components/table/tableGroup.tsx b/webapp/src/components/table/tableGroup.tsx index 6c9b5845b..90453fb74 100644 --- a/webapp/src/components/table/tableGroup.tsx +++ b/webapp/src/components/table/tableGroup.tsx @@ -31,7 +31,7 @@ type Props = { onDropToGroup: (srcCard: Card, groupID: string, dstCardID: string) => void } -const TableGroup = React.memo((props: Props): JSX.Element => { +const TableGroup = (props: Props): JSX.Element => { const {board, activeView, group, onDropToGroup, groupByProperty} = props const groupId = group.option.id @@ -86,6 +86,6 @@ const TableGroup = React.memo((props: Props): JSX.Element => { />}
) -}) +} -export default TableGroup +export default React.memo(TableGroup) diff --git a/webapp/src/components/table/tableGroupHeaderRow.tsx b/webapp/src/components/table/tableGroupHeaderRow.tsx index 715a9ed0d..ced304689 100644 --- a/webapp/src/components/table/tableGroupHeaderRow.tsx +++ b/webapp/src/components/table/tableGroupHeaderRow.tsx @@ -33,7 +33,7 @@ type Props = { onDrop: (srcOption: IPropertyOption, dstOption?: IPropertyOption) => void } -const TableGroupHeaderRow = React.memo((props: Props): JSX.Element => { +const TableGroupHeaderRow = (props: Props): JSX.Element => { const {board, activeView, group, groupByProperty} = props const [groupTitle, setGroupTitle] = useState(group.option.value) @@ -147,6 +147,6 @@ const TableGroupHeaderRow = React.memo((props: Props): JSX.Element => { }
) -}) +} -export default TableGroupHeaderRow +export default React.memo(TableGroupHeaderRow) diff --git a/webapp/src/components/table/tableHeader.tsx b/webapp/src/components/table/tableHeader.tsx index 6eee6fbd0..b7bc32b45 100644 --- a/webapp/src/components/table/tableHeader.tsx +++ b/webapp/src/components/table/tableHeader.tsx @@ -32,7 +32,7 @@ type Props = { onAutoSizeColumn: (columnID: string, headerWidth: number) => void } -const TableHeader = React.memo((props: Props): JSX.Element => { +const TableHeader = (props: Props): JSX.Element => { const [isDragging, isOver, columnRef] = useSortable('column', props.template, !props.readonly, props.onDrop) const columnWidth = (templateId: string): number => { @@ -85,6 +85,6 @@ const TableHeader = React.memo((props: Props): JSX.Element => { }
) -}) +} -export default TableHeader +export default React.memo(TableHeader) diff --git a/webapp/src/components/table/tableRow.tsx b/webapp/src/components/table/tableRow.tsx index 1e4cab5dd..5e0b8510b 100644 --- a/webapp/src/components/table/tableRow.tsx +++ b/webapp/src/components/table/tableRow.tsx @@ -43,7 +43,7 @@ export const columnWidth = (resizingColumn: string, columnWidths: Record { +const TableRow = (props: Props) => { const {board, activeView, onSaveWithEnter, columnRefs, card} = props const contents = useAppSelector(getCardContents(card.id || '')) const comments = useAppSelector(getCardComments(card.id)) @@ -150,6 +150,6 @@ const TableRow = React.memo((props: Props) => { })}
) -}) +} -export default TableRow +export default React.memo(TableRow) diff --git a/webapp/src/components/topBar.tsx b/webapp/src/components/topBar.tsx index 9e6f1b8ee..22d4b1ce2 100644 --- a/webapp/src/components/topBar.tsx +++ b/webapp/src/components/topBar.tsx @@ -10,7 +10,7 @@ import HelpIcon from '../widgets/icons/help' import {Utils} from '../utils' import {Constants} from '../constants' -const TopBar = React.memo((): JSX.Element => { +const TopBar = (): JSX.Element => { if (Utils.isFocalboardPlugin()) { const feedbackUrl = 'https://www.focalboard.com/fwlink/feedback-boards.html?v=' + Constants.versionString return ( @@ -65,6 +65,6 @@ const TopBar = React.memo((): JSX.Element => {
) -}) +} -export default TopBar +export default React.memo(TopBar) diff --git a/webapp/src/components/viewHeader/emptyCardButton.tsx b/webapp/src/components/viewHeader/emptyCardButton.tsx index b58221881..4b1742d77 100644 --- a/webapp/src/components/viewHeader/emptyCardButton.tsx +++ b/webapp/src/components/viewHeader/emptyCardButton.tsx @@ -20,7 +20,7 @@ type Props = { addCard: () => void } -const EmptyCardButton = React.memo((props: Props) => { +const EmptyCardButton = (props: Props) => { const currentView = useAppSelector(getCurrentView) const intl = useIntl() @@ -52,6 +52,6 @@ const EmptyCardButton = React.memo((props: Props) => { } />) -}) +} -export default EmptyCardButton +export default React.memo(EmptyCardButton) diff --git a/webapp/src/components/viewHeader/filterComponent.tsx b/webapp/src/components/viewHeader/filterComponent.tsx index 4254a3176..aebe9e30a 100644 --- a/webapp/src/components/viewHeader/filterComponent.tsx +++ b/webapp/src/components/viewHeader/filterComponent.tsx @@ -23,7 +23,7 @@ type Props = { onClose: () => void } -const FilterComponent = React.memo((props: Props): JSX.Element => { +const FilterComponent = (props: Props): JSX.Element => { const conditionClicked = (optionId: string, filter: FilterClause): void => { const {activeView} = props @@ -91,6 +91,6 @@ const FilterComponent = React.memo((props: Props): JSX.Element => {
) -}) +} -export default FilterComponent +export default React.memo(FilterComponent) diff --git a/webapp/src/components/viewHeader/filterEntry.tsx b/webapp/src/components/viewHeader/filterEntry.tsx index 1c08337cb..b7195cf78 100644 --- a/webapp/src/components/viewHeader/filterEntry.tsx +++ b/webapp/src/components/viewHeader/filterEntry.tsx @@ -25,7 +25,7 @@ type Props = { filter: FilterClause } -const FilterEntry = React.memo((props: Props): JSX.Element => { +const FilterEntry = (props: Props): JSX.Element => { const {board, view, filter} = props const intl = useIntl() @@ -106,6 +106,6 @@ const FilterEntry = React.memo((props: Props): JSX.Element => {
) -}) +} -export default FilterEntry +export default React.memo(FilterEntry) diff --git a/webapp/src/components/viewHeader/newCardButton.tsx b/webapp/src/components/viewHeader/newCardButton.tsx index 8f4ddf802..4df6eeee7 100644 --- a/webapp/src/components/viewHeader/newCardButton.tsx +++ b/webapp/src/components/viewHeader/newCardButton.tsx @@ -22,7 +22,7 @@ type Props = { editCardTemplate: (cardTemplateId: string) => void } -const NewCardButton = React.memo((props: Props): JSX.Element => { +const NewCardButton = (props: Props): JSX.Element => { const cardTemplates: Card[] = useAppSelector(getCurrentBoardTemplates) const currentView = useAppSelector(getCurrentView) const intl = useIntl() @@ -79,6 +79,6 @@ const NewCardButton = React.memo((props: Props): JSX.Element => { ) -}) +} -export default NewCardButton +export default React.memo(NewCardButton) diff --git a/webapp/src/components/viewHeader/newCardButtonTemplateItem.tsx b/webapp/src/components/viewHeader/newCardButtonTemplateItem.tsx index 1bcbd527e..0d842492d 100644 --- a/webapp/src/components/viewHeader/newCardButtonTemplateItem.tsx +++ b/webapp/src/components/viewHeader/newCardButtonTemplateItem.tsx @@ -22,7 +22,7 @@ type Props = { editCardTemplate: (cardTemplateId: string) => void } -const NewCardButtonTemplateItem = React.memo((props: Props) => { +const NewCardButtonTemplateItem = (props: Props) => { const currentView = useAppSelector(getCurrentView) const {cardTemplate} = props const intl = useIntl() @@ -77,6 +77,6 @@ const NewCardButtonTemplateItem = React.memo((props: Props) => { } /> ) -}) +} -export default NewCardButtonTemplateItem +export default React.memo(NewCardButtonTemplateItem) diff --git a/webapp/src/components/viewHeader/viewHeader.tsx b/webapp/src/components/viewHeader/viewHeader.tsx index 6502de3d4..85ae3a1fb 100644 --- a/webapp/src/components/viewHeader/viewHeader.tsx +++ b/webapp/src/components/viewHeader/viewHeader.tsx @@ -41,7 +41,7 @@ type Props = { dateDisplayProperty?: IPropertyTemplate } -const ViewHeader = React.memo((props: Props) => { +const ViewHeader = (props: Props) => { const [showFilter, setShowFilter] = useState(false) const intl = useIntl() @@ -173,6 +173,6 @@ const ViewHeader = React.memo((props: Props) => { }
) -}) +} -export default ViewHeader +export default React.memo(ViewHeader) diff --git a/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx b/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx index 0584f1161..c1d86a057 100644 --- a/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx +++ b/webapp/src/components/viewHeader/viewHeaderActionsMenu.tsx @@ -92,7 +92,7 @@ function onExportCsvTrigger(board: Board, activeView: BoardView, cards: Card[], } } -const ViewHeaderActionsMenu = React.memo((props: Props) => { +const ViewHeaderActionsMenu = (props: Props) => { const {board, activeView, cards} = props const intl = useIntl() @@ -139,6 +139,6 @@ const ViewHeaderActionsMenu = React.memo((props: Props) => { ) -}) +} -export default ViewHeaderActionsMenu +export default React.memo(ViewHeaderActionsMenu) diff --git a/webapp/src/components/viewHeader/viewHeaderDisplayByMenu.tsx b/webapp/src/components/viewHeader/viewHeaderDisplayByMenu.tsx index 81eb42476..0ac922856 100644 --- a/webapp/src/components/viewHeader/viewHeaderDisplayByMenu.tsx +++ b/webapp/src/components/viewHeader/viewHeaderDisplayByMenu.tsx @@ -19,7 +19,7 @@ type Props = { dateDisplayPropertyName?: string } -const ViewHeaderDisplayByMenu = React.memo((props: Props) => { +const ViewHeaderDisplayByMenu = (props: Props) => { const {properties, activeView, dateDisplayPropertyName} = props const intl = useIntl() @@ -74,6 +74,6 @@ const ViewHeaderDisplayByMenu = React.memo((props: Props) => { ) -}) +} -export default ViewHeaderDisplayByMenu +export default React.memo(ViewHeaderDisplayByMenu) diff --git a/webapp/src/components/viewHeader/viewHeaderGroupByMenu.tsx b/webapp/src/components/viewHeader/viewHeaderGroupByMenu.tsx index a26ff746c..be15f712a 100644 --- a/webapp/src/components/viewHeader/viewHeaderGroupByMenu.tsx +++ b/webapp/src/components/viewHeader/viewHeaderGroupByMenu.tsx @@ -18,7 +18,7 @@ type Props = { groupByProperty?: IPropertyTemplate } -const ViewHeaderGroupByMenu = React.memo((props: Props) => { +const ViewHeaderGroupByMenu = (props: Props) => { const {properties, activeView, groupByProperty} = props const intl = useIntl() return ( @@ -74,6 +74,6 @@ const ViewHeaderGroupByMenu = React.memo((props: Props) => { ) -}) +} -export default ViewHeaderGroupByMenu +export default React.memo(ViewHeaderGroupByMenu) diff --git a/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx b/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx index 66262ee70..687676f86 100644 --- a/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx +++ b/webapp/src/components/viewHeader/viewHeaderPropertiesMenu.tsx @@ -15,7 +15,7 @@ type Props = { properties: readonly IPropertyTemplate[] activeView: BoardView } -const ViewHeaderPropertiesMenu = React.memo((props: Props) => { +const ViewHeaderPropertiesMenu = (props: Props) => { const {properties, activeView} = props const intl = useIntl() const {viewType, visiblePropertyIds} = activeView.fields @@ -68,6 +68,6 @@ const ViewHeaderPropertiesMenu = React.memo((props: Props) => { ) -}) +} -export default ViewHeaderPropertiesMenu +export default React.memo(ViewHeaderPropertiesMenu) diff --git a/webapp/src/components/viewHeader/viewHeaderSortMenu.tsx b/webapp/src/components/viewHeader/viewHeaderSortMenu.tsx index 976c44380..f07e2aeef 100644 --- a/webapp/src/components/viewHeader/viewHeaderSortMenu.tsx +++ b/webapp/src/components/viewHeader/viewHeaderSortMenu.tsx @@ -19,7 +19,7 @@ type Props = { activeView: BoardView orderedCards: Card[] } -const ViewHeaderSortMenu = React.memo((props: Props) => { +const ViewHeaderSortMenu = (props: Props) => { const {properties, activeView, orderedCards} = props const hasSort = activeView.fields.sortOptions?.length > 0 const sortDisplayOptions = properties?.map((o) => ({id: o.id, name: o.name})) @@ -101,6 +101,6 @@ const ViewHeaderSortMenu = React.memo((props: Props) => { ) -}) +} -export default ViewHeaderSortMenu +export default React.memo(ViewHeaderSortMenu) diff --git a/webapp/src/components/viewMenu.tsx b/webapp/src/components/viewMenu.tsx index 96024b333..a10eccadd 100644 --- a/webapp/src/components/viewMenu.tsx +++ b/webapp/src/components/viewMenu.tsx @@ -28,7 +28,7 @@ type Props = { readonly: boolean } -const ViewMenu = React.memo((props: Props) => { +const ViewMenu = (props: Props) => { const history = useHistory() const match = useRouteMatch() @@ -298,6 +298,6 @@ const ViewMenu = React.memo((props: Props) => { } ) -}) +} -export default injectIntl(ViewMenu) +export default injectIntl(React.memo(ViewMenu)) diff --git a/webapp/src/components/viewTitle.tsx b/webapp/src/components/viewTitle.tsx index e53d4abea..47abede10 100644 --- a/webapp/src/components/viewTitle.tsx +++ b/webapp/src/components/viewTitle.tsx @@ -21,7 +21,7 @@ type Props = { readonly: boolean } -const ViewTitle = React.memo((props: Props) => { +const ViewTitle = (props: Props) => { const {board} = props const [title, setTitle] = useState(board.title) @@ -102,6 +102,6 @@ const ViewTitle = React.memo((props: Props) => { }
) -}) +} -export default ViewTitle +export default React.memo(ViewTitle) diff --git a/webapp/src/components/workspace.tsx b/webapp/src/components/workspace.tsx index cc66f513b..397b177fa 100644 --- a/webapp/src/components/workspace.tsx +++ b/webapp/src/components/workspace.tsx @@ -109,7 +109,7 @@ function CenterContent(props: Props) { ) } -const Workspace = React.memo((props: Props) => { +const Workspace = (props: Props) => { const board = useAppSelector(getCurrentBoard) const view = useAppSelector(getCurrentView) const [boardTemplateSelectorOpen, setBoardTemplateSelectorOpen] = useState(false) @@ -149,6 +149,6 @@ const Workspace = React.memo((props: Props) => {
) -}) +} -export default Workspace +export default React.memo(Workspace) diff --git a/webapp/src/pages/changePasswordPage.tsx b/webapp/src/pages/changePasswordPage.tsx index c70acf02e..dc969729b 100644 --- a/webapp/src/pages/changePasswordPage.tsx +++ b/webapp/src/pages/changePasswordPage.tsx @@ -10,7 +10,7 @@ import {IUser} from '../user' import {useAppSelector} from '../store/hooks' import {getMe} from '../store/users' -const ChangePasswordPage = React.memo(() => { +const ChangePasswordPage = () => { const [oldPassword, setOldPassword] = useState('') const [newPassword, setNewPassword] = useState('') const [errorMessage, setErrorMessage] = useState('') @@ -94,6 +94,6 @@ const ChangePasswordPage = React.memo(() => { }
) -}) +} -export default ChangePasswordPage +export default React.memo(ChangePasswordPage) diff --git a/webapp/src/pages/dashboard/dashboardPage.tsx b/webapp/src/pages/dashboard/dashboardPage.tsx index 60a068dda..7fb817eb1 100644 --- a/webapp/src/pages/dashboard/dashboardPage.tsx +++ b/webapp/src/pages/dashboard/dashboardPage.tsx @@ -7,13 +7,13 @@ import Sidebar from '../../components/sidebar/sidebar' import DashboardCenterContent from './centerContent' -const DashboardPage = React.memo(() => ( +const DashboardPage = () => (
-)) +) -export default DashboardPage +export default React.memo(DashboardPage) diff --git a/webapp/src/pages/errorPage.tsx b/webapp/src/pages/errorPage.tsx index d90e87e13..91ab64c4a 100644 --- a/webapp/src/pages/errorPage.tsx +++ b/webapp/src/pages/errorPage.tsx @@ -8,7 +8,7 @@ import octoClient from '../octoClient' import Button from '../widgets/buttons/button' import './errorPage.scss' -const ErrorPage = React.memo(() => { +const ErrorPage = () => { const history = useHistory() return ( @@ -35,6 +35,6 @@ const ErrorPage = React.memo(() => {
) -}) +} -export default ErrorPage +export default React.memo(ErrorPage) diff --git a/webapp/src/pages/loginPage.tsx b/webapp/src/pages/loginPage.tsx index 547f27abf..7f5513d8d 100644 --- a/webapp/src/pages/loginPage.tsx +++ b/webapp/src/pages/loginPage.tsx @@ -11,7 +11,7 @@ import Button from '../widgets/buttons/button' import client from '../octoClient' import './loginPage.scss' -const LoginPage = React.memo(() => { +const LoginPage = () => { const [username, setUsername] = useState('') const [password, setPassword] = useState('') const [errorMessage, setErrorMessage] = useState('') @@ -88,6 +88,6 @@ const LoginPage = React.memo(() => { }
) -}) +} -export default LoginPage +export default React.memo(LoginPage) diff --git a/webapp/src/pages/registerPage.tsx b/webapp/src/pages/registerPage.tsx index 48b437033..e765893c4 100644 --- a/webapp/src/pages/registerPage.tsx +++ b/webapp/src/pages/registerPage.tsx @@ -11,7 +11,7 @@ import Button from '../widgets/buttons/button' import client from '../octoClient' import './registerPage.scss' -const RegisterPage = React.memo(() => { +const RegisterPage = () => { const [username, setUsername] = useState('') const [password, setPassword] = useState('') const [email, setEmail] = useState('') @@ -96,6 +96,6 @@ const RegisterPage = React.memo(() => { }
) -}) +} -export default RegisterPage +export default React.memo(RegisterPage) diff --git a/webapp/src/pages/welcome/welcomePage.tsx b/webapp/src/pages/welcome/welcomePage.tsx index 366abf70f..29f34bdd1 100644 --- a/webapp/src/pages/welcome/welcomePage.tsx +++ b/webapp/src/pages/welcome/welcomePage.tsx @@ -15,7 +15,7 @@ import {Utils} from '../../utils' import './welcomePage.scss' -const WelcomePage = React.memo(() => { +const WelcomePage = () => { const history = useHistory() const queryString = new URLSearchParams(useLocation().search) @@ -84,6 +84,6 @@ const WelcomePage = React.memo(() => {
) -}) +} -export default WelcomePage +export default React.memo(WelcomePage) diff --git a/webapp/src/widgets/menuWrapper.tsx b/webapp/src/widgets/menuWrapper.tsx index 4e19c601a..2b2e2f6ee 100644 --- a/webapp/src/widgets/menuWrapper.tsx +++ b/webapp/src/widgets/menuWrapper.tsx @@ -14,7 +14,7 @@ type Props = { label?: string } -const MenuWrapper = React.memo((props: Props) => { +const MenuWrapper = (props: Props) => { const node = useRef(null) const [open, setOpen] = useState(Boolean(props.isOpen)) @@ -94,6 +94,6 @@ const MenuWrapper = React.memo((props: Props) => { {children && !props.disabled && open ? Object.values(children)[1] : null}
) -}) +} -export default MenuWrapper +export default React.memo(MenuWrapper) diff --git a/webapp/src/widgets/propertyMenu.tsx b/webapp/src/widgets/propertyMenu.tsx index a8387d349..126563b3c 100644 --- a/webapp/src/widgets/propertyMenu.tsx +++ b/webapp/src/widgets/propertyMenu.tsx @@ -89,7 +89,7 @@ export const PropertyTypes = (props: TypesProps): JSX.Element => { ) } -const PropertyMenu = React.memo((props: Props) => { +const PropertyMenu = (props: Props) => { const intl = useIntl() const nameTextbox = useRef(null) const [name, setName] = useState(props.propertyName) @@ -144,6 +144,6 @@ const PropertyMenu = React.memo((props: Props) => { /> ) -}) +} -export default PropertyMenu +export default React.memo(PropertyMenu) diff --git a/webapp/src/widgets/valueSelector.tsx b/webapp/src/widgets/valueSelector.tsx index e1493524f..1ada4ab21 100644 --- a/webapp/src/widgets/valueSelector.tsx +++ b/webapp/src/widgets/valueSelector.tsx @@ -44,7 +44,7 @@ type LabelProps = { isMulti?: boolean } -const ValueSelectorLabel = React.memo((props: LabelProps): JSX.Element => { +const ValueSelectorLabel = (props: LabelProps): JSX.Element => { const {option, onDeleteValue, meta, isMulti} = props const intl = useIntl() if (meta.context === 'value') { @@ -99,7 +99,7 @@ const ValueSelectorLabel = React.memo((props: LabelProps): JSX.Element => {
) -}) +} const valueSelectorStyle = { ...getSelectBaseStyle(), @@ -200,4 +200,4 @@ function ValueSelector(props: Props): JSX.Element { ) } -export default ValueSelector +export default React.memo(ValueSelector) From 64c4be7e1b6bd5eec47e48599fba428559504e14 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Mon, 14 Feb 2022 18:52:38 -0800 Subject: [PATCH 20/21] GitHub: workflows: Use macOS 11 and Xcode 13.2.1 (#2338) * GitHub: workflows: Use macOS 11 and Xcode 13.2.1 * Update readme with macOS version --- .github/workflows/dev-release.yml | 4 ++-- .github/workflows/prod-release.yml | 4 ++-- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index e12a7396b..a4d7e3e82 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -68,7 +68,7 @@ jobs: path: ${{ github.workspace }}/linux/dist/focalboard-linux.tar.gz macos: - runs-on: macos-10.15 + runs-on: macos-11 steps: @@ -101,7 +101,7 @@ jobs: - name: Build macOS run: make mac-app env: - DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer BUILD_NUMBER: ${{ github.run_id }} - name: Upload macOS package diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml index 293b7a8e0..1d9facabe 100644 --- a/.github/workflows/prod-release.yml +++ b/.github/workflows/prod-release.yml @@ -63,7 +63,7 @@ jobs: path: ${{ github.workspace }}/linux/dist/focalboard-linux.tar.gz macos: - runs-on: macos-10.15 + runs-on: macos-11 steps: @@ -96,7 +96,7 @@ jobs: - name: Build macOS run: make mac-app env: - DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer BUILD_NUMBER: ${{ github.run_id }} - name: Upload macOS package diff --git a/README.md b/README.md index a7b1fac2c..ca2800b8b 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ You can build standalone apps that package the server to run locally against SQL * Mac: * `make mac-app` * run `mac/dist/Focalboard.app` - * *Requires: macOS Catalina (10.15)+, Xcode 12+.* + * *Requires: macOS 11.3+, Xcode 13.2.1+* * Linux: * Install webgtk dependencies * `sudo apt-get install libgtk-3-dev` From 2a8d391bd6b62c36d86ff36cc38c8fc14ecfa849 Mon Sep 17 00:00:00 2001 From: Chen-I Lim <46905241+chenilim@users.noreply.github.com> Date: Mon, 14 Feb 2022 19:57:44 -0800 Subject: [PATCH 21/21] Fix #2333. Handle export in Mac App (#2334) --- mac/Focalboard.xcodeproj/project.pbxproj | 8 +- mac/Focalboard/DownloadHandler.swift | 40 ++++++++++ mac/Focalboard/ViewController.swift | 93 ++++++------------------ 3 files changed, 70 insertions(+), 71 deletions(-) create mode 100644 mac/Focalboard/DownloadHandler.swift diff --git a/mac/Focalboard.xcodeproj/project.pbxproj b/mac/Focalboard.xcodeproj/project.pbxproj index 4adf28c4e..8ad05f0a9 100644 --- a/mac/Focalboard.xcodeproj/project.pbxproj +++ b/mac/Focalboard.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 8014951C261598D600A51700 /* PortUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8014951B261598D600A51700 /* PortUtils.swift */; }; 804E57FC27441B6B008526F0 /* whatsnew.txt in Resources */ = {isa = PBXBuildFile; fileRef = 804E57FB27441B6B008526F0 /* whatsnew.txt */; }; + 80672A8B27BAFEBA00257B8C /* DownloadHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80672A8A27BAFEBA00257B8C /* DownloadHandler.swift */; }; 80D6DEBB252E13CB00AEED9E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80D6DEBA252E13CB00AEED9E /* AppDelegate.swift */; }; 80D6DEBD252E13CB00AEED9E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80D6DEBC252E13CB00AEED9E /* ViewController.swift */; }; 80D6DEBF252E13CD00AEED9E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 80D6DEBE252E13CD00AEED9E /* Assets.xcassets */; }; @@ -42,6 +43,7 @@ /* Begin PBXFileReference section */ 8014951B261598D600A51700 /* PortUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortUtils.swift; sourceTree = ""; }; 804E57FB27441B6B008526F0 /* whatsnew.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = whatsnew.txt; sourceTree = ""; }; + 80672A8A27BAFEBA00257B8C /* DownloadHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadHandler.swift; sourceTree = ""; }; 80D6DEB7252E13CB00AEED9E /* Focalboard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Focalboard.app; sourceTree = BUILT_PRODUCTS_DIR; }; 80D6DEBA252E13CB00AEED9E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 80D6DEBC252E13CB00AEED9E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -116,6 +118,7 @@ 80F8BF572624EB0C00FF3943 /* Globals.swift */, 8014951B261598D600A51700 /* PortUtils.swift */, 80D6DEBC252E13CB00AEED9E /* ViewController.swift */, + 80672A8A27BAFEBA00257B8C /* DownloadHandler.swift */, 80F174B62788C1A2000A9EEA /* CustomWKWebView.swift */, 80F8BF4F2624E1BB00FF3943 /* WhatsNewViewController.swift */, 804E57FB27441B6B008526F0 /* whatsnew.txt */, @@ -303,6 +306,7 @@ 80F8BF502624E1BB00FF3943 /* WhatsNewViewController.swift in Sources */, 80F174B72788C1A2000A9EEA /* CustomWKWebView.swift in Sources */, 80F8BF582624EB0C00FF3943 /* Globals.swift in Sources */, + 80672A8B27BAFEBA00257B8C /* DownloadHandler.swift in Sources */, 80D6DF18252F9BDE00AEED9E /* AutoSaveWindowController.swift in Sources */, 80D6DEBD252E13CB00AEED9E /* ViewController.swift in Sources */, 80D6DEBB252E13CB00AEED9E /* AppDelegate.swift in Sources */, @@ -403,7 +407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 11.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -458,7 +462,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 11.3; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; diff --git a/mac/Focalboard/DownloadHandler.swift b/mac/Focalboard/DownloadHandler.swift new file mode 100644 index 000000000..7b5afe033 --- /dev/null +++ b/mac/Focalboard/DownloadHandler.swift @@ -0,0 +1,40 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import Foundation +import WebKit + +class DownloadHandler: NSObject, WKDownloadDelegate { + func download(_ download: WKDownload, decideDestinationUsing response: URLResponse, suggestedFilename: String, completionHandler: @escaping (URL?) -> Void) { + DispatchQueue.main.async { + // Let user select location of file + let savePanel = NSSavePanel() + savePanel.canCreateDirectories = true + savePanel.nameFieldStringValue = suggestedFilename + // BUGBUG: Specifying the allowedFileTypes causes Catalina to hang / error out + //savePanel.allowedFileTypes = [".boardsarchive"] + savePanel.begin { (result) in + if result.rawValue == NSApplication.ModalResponse.OK.rawValue, + let fileUrl = savePanel.url { + if (FileManager.default.fileExists(atPath: fileUrl.path)) { + // HACKHACK: WKWebView doesn't appear to overwrite files, so delete exsiting files first + do { + try FileManager.default.removeItem(at: fileUrl) + } catch { + let alert = NSAlert() + alert.messageText = "Unable to replace \(fileUrl.path)" + alert.addButton(withTitle: "OK") + alert.alertStyle = .warning + alert.runModal() + } + } + completionHandler(fileUrl) + } + } + } + } + + func downloadDidFinish(_ download: WKDownload) { + NSLog("downloadDidFinish") + } +} diff --git a/mac/Focalboard/ViewController.swift b/mac/Focalboard/ViewController.swift index a35685c3e..0c6f98c4c 100644 --- a/mac/Focalboard/ViewController.swift +++ b/mac/Focalboard/ViewController.swift @@ -12,6 +12,7 @@ class ViewController: @IBOutlet var webView: CustomWKWebView! private var didLoad = false private var refreshWebViewOnLoad = true + private let downloadHandler = DownloadHandler() override func viewDidLoad() { super.viewDidLoad() @@ -100,60 +101,6 @@ class ViewController: webView.load(request) } - private func downloadJsonUrl(_ url: URL) { - NSLog("downloadJsonUrl") - let prefix = "data:text/json," - let urlString = url.absoluteString - let encodedJson = String(urlString[urlString.index(urlString.startIndex, offsetBy: prefix.lengthOfBytes(using: .utf8))...]) - guard let json = encodedJson.removingPercentEncoding else { - return - } - - // Form file name - let dateFormatter = DateFormatter() - dateFormatter.dateFormat = "yyyy-M-d" - let dateString = dateFormatter.string(from: Date()) - let filename = "archive-\(dateString).focalboard" - - // Save file - let savePanel = NSSavePanel() - savePanel.canCreateDirectories = true - savePanel.nameFieldStringValue = filename - // BUGBUG: Specifying the allowedFileTypes causes Catalina to hang / error out - //savePanel.allowedFileTypes = [".focalboard"] - savePanel.begin { (result) in - if result.rawValue == NSApplication.ModalResponse.OK.rawValue, - let fileUrl = savePanel.url { - try? json.write(to: fileUrl, atomically: true, encoding: .utf8) - } - } - } - - private func downloadCsvUrl(_ url: URL) { - NSLog("downloadCsvUrl") - let prefix = "data:text/csv;charset=utf-8," - let urlString = url.absoluteString - let encodedContents = String(urlString[urlString.index(urlString.startIndex, offsetBy: prefix.lengthOfBytes(using: .utf8))...]) - guard let contents = encodedContents.removingPercentEncoding else { - return - } - - let filename = "data.csv" - - // Save file - let savePanel = NSSavePanel() - savePanel.canCreateDirectories = true - savePanel.nameFieldStringValue = filename - // BUGBUG: Specifying the allowedFileTypes causes Catalina to hang / error out - //savePanel.allowedFileTypes = [".focalboard"] - savePanel.begin { (result) in - if result.rawValue == NSApplication.ModalResponse.OK.rawValue, - let fileUrl = savePanel.url { - try? contents.write(to: fileUrl, atomically: true, encoding: .utf8) - } - } - } - func webView(_ webView: WKWebView, runOpenPanelWith parameters: WKOpenPanelParameters, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping ([URL]?) -> Void) { NSLog("webView runOpenPanel") let openPanel = NSOpenPanel() @@ -169,22 +116,30 @@ class ViewController: } } - func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) { - if let url = navigationAction.request.url { - // Intercept archive downloads, and present native UI - if (url.absoluteString.hasPrefix("data:text/json,")) { - decisionHandler(.cancel) - downloadJsonUrl(url) - return - } - if (url.absoluteString.hasPrefix("data:text/csv;charset=utf-8,")) { - decisionHandler(.cancel) - downloadCsvUrl(url) - return - } - NSLog("decidePolicyFor navigationAction: \(url.absoluteString)") + // Handle downloads + + func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) { + if navigationAction.shouldPerformDownload { + decisionHandler(.download, preferences) + } else { + decisionHandler(.allow, preferences) } - decisionHandler(.allow) + } + + func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) { + if navigationResponse.canShowMIMEType { + decisionHandler(.allow) + } else { + decisionHandler(.download) + } + } + + func webView(_ webView: WKWebView, navigationAction: WKNavigationAction, didBecome download: WKDownload) { + download.delegate = downloadHandler + } + + func webView(_ webView: WKWebView, navigationResponse: WKNavigationResponse, didBecome download: WKDownload) { + download.delegate = downloadHandler } func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {