Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Server rules #10660

Merged
merged 32 commits into from
Apr 19, 2023
Merged

feat: Server rules #10660

merged 32 commits into from
Apr 19, 2023

Conversation

syuilo
Copy link
Member

@syuilo syuilo commented Apr 17, 2023

Based on #10633

Resolve #10595

@github-actions github-actions bot added packages/backend Server side specific issue/PR packages/frontend Client side specific issue/PR labels Apr 17, 2023
@github-actions github-actions bot requested a review from tamaina April 17, 2023 07:19
@syuilo syuilo mentioned this pull request Apr 17, 2023
4 tasks
@EbiseLutica EbiseLutica changed the title Server rules feat: Server rules Apr 17, 2023
@EbiseLutica EbiseLutica self-requested a review April 17, 2023 07:20
@codecov
Copy link

codecov bot commented Apr 17, 2023

Codecov Report

Merging #10660 (8ca436b) into develop (0f7defc) will increase coverage by 0.57%.
The diff coverage is 78.94%.

@@             Coverage Diff             @@
##           develop   #10660      +/-   ##
===========================================
+ Coverage    75.50%   76.07%   +0.57%     
===========================================
  Files          735      898     +163     
  Lines        68576    88689   +20113     
  Branches      5946     6259     +313     
===========================================
+ Hits         51780    67474   +15694     
- Misses       16796    21215    +4419     
Impacted Files Coverage Δ
packages/backend/src/server/api/endpoints/meta.ts 75.21% <0.00%> (-0.44%) ⬇️
packages/frontend/src/components/MkModal.vue 100.00% <ø> (ø)
...kend/src/server/api/endpoints/admin/update-meta.ts 64.91% <60.00%> (-0.07%) ⬇️
packages/backend/src/models/entities/Meta.ts 100.00% <100.00%> (ø)
packages/frontend/src/components/MkSwitch.vue 100.00% <100.00%> (ø)
packages/frontend/src/router.ts 96.38% <100.00%> (ø)

... and 161 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@syuilo syuilo marked this pull request as draft April 17, 2023 07:37
EbiseLutica
EbiseLutica previously approved these changes Apr 17, 2023
@acid-chicken acid-chicken mentioned this pull request Apr 17, 2023
20 tasks
@syuilo syuilo marked this pull request as ready for review April 17, 2023 08:16
EbiseLutica

This comment was marked as outdated.

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

e2eテスト自体は動くようになったけどサインアップ前にルール確認のステップが入るようになった影響で結局テストは落ちるわね

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

あれやっぱりe2eが走らない
確率的なのか

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

  • 長いルールで折り返されないのを修正
  • 番号をstickyに

a

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

e2eテストが走らない問題をどうにかしないとどうにもならん

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

やっと走ったけどまだ落ちてる
image

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

MkSwitchコンポーネント自体をclickしてもスイッチがオンにはならない可能性があるな

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

こういう場合どうしたらいいんだ

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

MkFolderも同様の問題がありそう

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

これでどうだ

@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

おー通った

@syuilo syuilo merged commit e1f9ab7 into develop Apr 19, 2023
@syuilo syuilo deleted the server-rules branch April 19, 2023 12:24
@syuilo
Copy link
Member Author

syuilo commented Apr 19, 2023

🙏🙏🙏

sasagar pushed a commit to sasagar/misskey that referenced this pull request May 9, 2023
* enhance(frontend): サーバールールのデザイン調整

* enhance(frontend): i18n

* enhance(frontend): 利用規約URLの設定を「モデレーション」ページへ移動

* enhance(frontend): サーバールールのデザイン調整

* Update CHANGELOG.md

* 不要な差分を削除

* fix(frontend): lint

* ui tweak

* test: add stories

* tweak

* test: bind args

* test: add interaction tests

* fix bug

* Update packages/frontend/src/pages/admin/server-rules.vue

Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>

* Update misskey-js.api.md

* chore: windowを明示

* 🎨

* refactor

* 🎨

* 🎨

* fix e2e test

* 🎨

* 🎨

* fix icon

* fix e2e

---------

Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
na2na-p pushed a commit to na2na-p/misskey that referenced this pull request May 10, 2023
* enhance(frontend): サーバールールのデザイン調整

* enhance(frontend): i18n

* enhance(frontend): 利用規約URLの設定を「モデレーション」ページへ移動

* enhance(frontend): サーバールールのデザイン調整

* Update CHANGELOG.md

* 不要な差分を削除

* fix(frontend): lint

* ui tweak

* test: add stories

* tweak

* test: bind args

* test: add interaction tests

* fix bug

* Update packages/frontend/src/pages/admin/server-rules.vue

Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>

* Update misskey-js.api.md

* chore: windowを明示

* 🎨

* refactor

* 🎨

* 🎨

* fix e2e test

* 🎨

* 🎨

* fix icon

* fix e2e

---------

Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
@tamaina
Copy link
Contributor

tamaina commented Jul 26, 2023

なんでMkModalのスクロールをなくしたのかなと思ったけど結局MkModalの内側でスクロールすべきという話になったのかしら

@tamaina
Copy link
Contributor

tamaina commented Jul 26, 2023

復活させたらそれはそれで動かないものが出てくる?

@tamaina
Copy link
Contributor

tamaina commented Jul 26, 2023

memo

c847381

@syuilo
Copy link
Member Author

syuilo commented Jul 26, 2023

MkModalの内側でスクロールすべき

だった気がするけどよく覚えてない

復活させたらそれはそれで動かないものが出てくる?

復活させても特に問題なかったから復活させる

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages/backend Server side specific issue/PR packages/frontend:test packages/frontend Client side specific issue/PR packages/misskey-js
Projects
None yet
Development

Successfully merging this pull request may close these issues.

新規登録前にサーバールールの要約を表示できる機能
4 participants