Skip to content

Commit

Permalink
Reapply "Merge branch 'master' into feat/growi-ai-next"
Browse files Browse the repository at this point in the history
This reverts commit db3f03f.
  • Loading branch information
miya committed Jan 22, 2025
1 parent db3f03f commit f9d65f9
Show file tree
Hide file tree
Showing 381 changed files with 2,301 additions and 2,007 deletions.
1 change: 1 addition & 0 deletions .devcontainer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
- node_modules:/workspace/growi/node_modules
- buildcache_app:/workspace/growi/apps/app/.next
- ../../growi-docker-compose:/workspace/growi-docker-compose:delegated
- ../../share:/workspace/share:delegated
tty: true

mongo:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -58,7 +58,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -72,4 +72,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/release-rc-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
id: package-json

- name: Docker meta for docker.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: docker.io/weseek/growi
Expand All @@ -36,7 +36,7 @@ jobs:
type=raw,value=${{ steps.package-json.outputs.packageVersion }}.{{sha}}
- name: Docker meta for ghcr.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta-ghcr
with:
images: ghcr.io/weseek/growi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
id: package-json

- name: Docker meta for docker.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: docker.io/weseek/growi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-slackbot-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: weseek/growi-slackbot-proxy,asia.gcr.io/${{ secrets.GCP_PRJ_ID_SLACKBOT_PROXY }}/growi-slackbot-proxy
tags: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
id: package-json

- name: Docker meta for docker.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: docker.io/weseek/growi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-app-create-manifests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- name: Docker meta for extra-images
id: meta-extra-images
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ inputs.registry }}/${{ inputs.image-name }}
sep-tags: ','
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-app-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
container:
# Match the Playwright version
# https://github.com/microsoft/playwright/issues/20010
image: mcr.microsoft.com/playwright:v1.46.0-jammy
image: mcr.microsoft.com/playwright:v1.49.1-jammy

strategy:
fail-fast: false
Expand Down
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
# Changelog

## [Unreleased](https://github.com/weseek/growi/compare/v7.1.6...HEAD)
## [Unreleased](https://github.com/weseek/growi/compare/v7.1.8...HEAD)

*Please do not manually update this file. We've automated the process.*

## [v7.1.8](https://github.com/weseek/growi/compare/v7.1.7...v7.1.8) - 2025-01-21

### 🐛 Bug Fixes

* fix: Escape page path when generating RegExp to find ancestors children (#9550) @yuki-takei

## [v7.1.7](https://github.com/weseek/growi/compare/v7.1.6...v7.1.7) - 2025-01-16

### 🐛 Bug Fixes

* fix: Unable to select group viewing permissions (#9541) @miya
* fix: Fix i18n of oidc settings (#9536) @ryu-sato

### 🧰 Maintenance

* support: Update Swagger documentation for the PUT endpoint to update a page (#9529) @tkfm1991
* ci(deps): bump docker/metadata-action from 4 to 5 (#9181) @dependabot
* ci(deps): bump github/codeql-action from 2 to 3 (#9180) @dependabot
* ci(deps): bump next from 14.2.15 to 14.2.21 (#9538) @dependabot
* ci(deps-dev): bump @marp-team/marp-core from 3.9.0 to 3.9.1 (#9530) @dependabot

## [v7.1.6](https://github.com/weseek/growi/compare/v7.1.5...v7.1.6) - 2024-12-26

### 💎 Features
Expand Down
10 changes: 0 additions & 10 deletions apps/app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ module.exports = {
'weseek/react',
],
plugins: [
'regex',
],
settings: {
// resolve path aliases by eslint-import-resolver-typescript
Expand All @@ -17,15 +16,6 @@ module.exports = {
name: 'axios',
message: 'Please use src/utils/axios instead.',
}],
'regex/invalid': ['error', [
{
regex: '\\?\\<\\!',
message: 'Do not use any negative lookbehind',
}, {
regex: '\\?\\<\\=',
message: 'Do not use any Positive lookbehind',
},
]],
'@typescript-eslint/no-var-requires': 'off',

// set 'warn' temporarily -- 2021.08.02 Yuki Takei
Expand Down
16 changes: 7 additions & 9 deletions apps/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@growi/app",
"version": "7.1.7-RC.0",
"version": "7.1.9-RC.0",
"license": "MIT",
"private": "true",
"scripts": {
Expand Down Expand Up @@ -114,7 +114,6 @@
"ejs": "^3.1.10",
"esa-node": "^0.2.2",
"escape-string-regexp": "^4.0.0",
"eslint-plugin-regex": "^1.8.0",
"expose-gc": "^1.0.0",
"express": "^4.20.0",
"express-bunyan-logger": "^1.3.3",
Expand All @@ -135,7 +134,7 @@
"is-iso-date": "^0.0.1",
"js-tiktoken": "^1.0.15",
"js-yaml": "^4.1.0",
"katex": "^0.16.11",
"katex": "^0.16.21",
"ldapjs": "^3.0.2",
"lucene-query-parser": "^1.2.0",
"markdown-table": "^3.0.3",
Expand All @@ -150,7 +149,7 @@
"migrate-mongo": "^11.0.0",
"mkdirp": "^1.0.3",
"mongodb": "^4.17.2",
"mongoose": "^6.11.3",
"mongoose": "^6.13.6",
"mongoose-gridfs": "^1.2.42",
"mongoose-paginate-v2": "^1.3.9",
"mongoose-unique-validator": "^2.0.3",
Expand Down Expand Up @@ -178,12 +177,12 @@
"prop-types": "^15.8.1",
"qs": "^6.11.1",
"rate-limiter-flexible": "^2.3.7",
"react": "^18.2.0",
"react": "^18.3.0",
"react-bootstrap-typeahead": "^6.3.2",
"react-card-flip": "^1.0.10",
"react-datepicker": "^4.7.0",
"react-disable": "^0.1.1",
"react-dom": "^18.2.0",
"react-dom": "^18.3.0",
"react-error-boundary": "^3.1.4",
"react-i18next": "^15.1.1",
"react-image-crop": "^8.3.0",
Expand Down Expand Up @@ -265,8 +264,8 @@
"@types/ldapjs": "^2.2.5",
"@types/mdast": "^4.0.4",
"@types/node-cron": "^3.0.11",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@types/react": "^18.3.0",
"@types/react-dom": "^18.3.0",
"@types/react-input-autosize": "^2.2.4",
"@types/react-scroll": "^1.8.4",
"@types/react-stickynode": "^4.0.3",
Expand All @@ -283,7 +282,6 @@
"downshift": "^8.2.3",
"eazy-logger": "^3.1.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-regex": "^1.8.0",
"fslightbox-react": "^1.7.6",
"handsontable": "=6.2.2",
"happy-dom": "^15.7.4",
Expand Down
80 changes: 43 additions & 37 deletions apps/app/playwright/20-basic-features/comments.spec.ts
Original file line number Diff line number Diff line change
@@ -1,49 +1,55 @@
import { test, expect } from '@playwright/test';

test('Create comment page', async({ page }) => {
await page.goto('/comment');
await page.getByTestId('editor-button').click();
await page.getByTestId('save-page-btn').click();
await expect(page.locator('.page-meta')).toBeVisible();
});
test.describe('Comment', () => {

test('Successfully add comments', async({ page }) => {
const commentText = 'add comment';
await page.goto('/comment');
// make tests run in serial
test.describe.configure({ mode: 'serial' });

// Add comment
await page.getByTestId('page-comment-button').click();
await page.getByTestId('open-comment-editor-button').click();
await page.locator('.cm-content').fill(commentText);
await page.getByTestId('comment-submit-button').first().click();
test('Create comment page', async({ page }) => {
await page.goto('/comment');
await page.getByTestId('editor-button').click();
await page.getByTestId('save-page-btn').click();
await expect(page.locator('.page-meta')).toBeVisible();
});

await expect(page.locator('.page-comment-body')).toHaveText(commentText);
await expect(page.getByTestId('page-comment-button').locator('.grw-count-badge')).toHaveText('1');
});
test('Successfully add comments', async({ page }) => {
const commentText = 'add comment';
await page.goto('/comment');

test('Successfully reply comments', async({ page }) => {
const commentText = 'reply comment';
await page.goto('/comment');
// Add comment
await page.getByTestId('page-comment-button').click();
await page.getByTestId('open-comment-editor-button').click();
await page.locator('.cm-content').fill(commentText);
await page.getByTestId('comment-submit-button').first().click();

// Reply comment
await page.getByTestId('page-comment-button').click();
await page.getByTestId('comment-reply-button').click();
await page.locator('.cm-content').fill(commentText);
await page.getByTestId('comment-submit-button').first().click();
await expect(page.locator('.page-comment-body')).toHaveText(commentText);
await expect(page.getByTestId('page-comment-button').locator('.grw-count-badge')).toHaveText('1');
});

await expect(page.locator('.page-comment-body').nth(1)).toHaveText(commentText);
await expect(page.getByTestId('page-comment-button').locator('.grw-count-badge')).toHaveText('2');
});
test('Successfully reply comments', async({ page }) => {
const commentText = 'reply comment';
await page.goto('/comment');

// Reply comment
await page.getByTestId('comment-reply-button').click();
await page.locator('.cm-content').fill(commentText);
await page.getByTestId('comment-submit-button').first().click();

// test('Successfully delete comments', async({ page }) => {
// await page.goto('/comment');
await expect(page.locator('.page-comment-body').nth(1)).toHaveText(commentText);
await expect(page.getByTestId('page-comment-button').locator('.grw-count-badge')).toHaveText('2');
});

// await page.getByTestId('page-comment-button').click();
// await page.getByTestId('comment-delete-button').first().click({ force: true });
// await expect(page.getByTestId('page-comment-delete-modal')).toBeVisible();
// await page.getByTestId('delete-comment-button').click();
// test('Successfully delete comments', async({ page }) => {
// await page.goto('/comment');

// await expect(page.getByTestId('page-comment-button').locator('.grw-count-badge')).toHaveText('0');
// });
// await page.getByTestId('page-comment-button').click();
// await page.getByTestId('comment-delete-button').first().click({ force: true });
// await expect(page.getByTestId('page-comment-delete-modal')).toBeVisible();
// await page.getByTestId('delete-comment-button').click();

// TODO: https://redmine.weseek.co.jp/issues/139520
// await expect(page.getByTestId('page-comment-button').locator('.grw-count-badge')).toHaveText('0');
// });

// TODO: https://redmine.weseek.co.jp/issues/139520

});
Loading

0 comments on commit f9d65f9

Please sign in to comment.