Merge pull request #106 from HanashiDev/next

2.1.0
HanashiDev · Oct 15, 2023 · 9fc71e1 · 9fc71e1
2 parents 2ae204f + 3a929ff
commit 9fc71e1
Show file tree

Hide file tree

Showing 60 changed files with 1,929 additions and 1,543 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 **/*.js
+vendor/**
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,37 +2,33 @@ module.exports = {
     root: true,
     parser: "@typescript-eslint/parser",
     parserOptions: {
-        tsconfigRootDir: __dirname,
-        project: ["./tsconfig.json"]
+      tsconfigRootDir: __dirname,
+      project: ["./tsconfig.json"]
     },
     plugins: ["@typescript-eslint"],
     extends: [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/recommended-requiring-type-checking",
-        "prettier"
+      "eslint:recommended",
+      "plugin:@typescript-eslint/recommended",
+      "plugin:@typescript-eslint/recommended-type-checked",
+      "plugin:@typescript-eslint/strict",
+      "plugin:@typescript-eslint/strict-type-checked",
+      "plugin:@typescript-eslint/stylistic",
+      "plugin:@typescript-eslint/stylistic-type-checked",
+      "prettier"
     ],
     rules: {
-        "@typescript-eslint/ban-types": [
-            "error", {
-                types: {
-                    "object": false
-                },
-                extendDefaults: true
-            }
-        ],
-        "@typescript-eslint/no-explicit-any": 0,
-        "@typescript-eslint/no-non-null-assertion": 0,
-        "@typescript-eslint/no-unsafe-assignment": 0,
-        "@typescript-eslint/no-unsafe-call": 0,
-        "@typescript-eslint/no-unsafe-member-access": 0,
-        "@typescript-eslint/no-unsafe-return": 0,
-        "@typescript-eslint/explicit-module-boundary-types": 0,
-        "@typescript-eslint/restrict-template-expressions": 0,
-        "@typescript-eslint/no-unused-vars": [
-            "error", {
-                "argsIgnorePattern": "^_"
-            }
-        ]
+      "@typescript-eslint/no-non-null-assertion": 0,
+      "@typescript-eslint/consistent-type-definitions": 0,
+      "@typescript-eslint/prefer-nullish-coalescing": 0,
+      "@typescript-eslint/no-unused-vars": [
+        "error", {
+          "argsIgnorePattern": "^_"
+        }
+      ],
+      "@typescript-eslint/strict-boolean-expressions": [
+        "error", {
+          "allowNullableBoolean": true
+        }
+      ],
     }
-};
+};
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+files/js/**/*.js linguist-generated
diff --git a/.github/diff.json b/.github/diff.json
@@ -1,14 +1,14 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "diff",
-      "pattern": [
-        {
-          "regexp": "--- a/(.*)",
-          "file": 1,
-          "message": 1
-        }
-      ]
-    }
-  ]
+    "problemMatcher": [
+      {
+        "owner": "diff",
+        "pattern": [
+          {
+            "regexp": "--- a/(.*)",
+            "file": 1,
+            "message": 1
+          }
+        ]
+      }
+    ]
 }
diff --git a/.github/php-syntax.json b/.github/php-syntax.json
@@ -1,15 +1,15 @@
 {
-  "problemMatcher": [
-    {
-      "owner": "php -l",
-      "pattern": [
-        {
-          "regexp": "^\\s*(PHP\\s+)?([a-zA-Z\\s]+):\\s+(.*)\\s+in\\s+(\\S+)\\s+on\\s+line\\s+(\\d+)$",
-          "file": 4,
-          "line": 5,
-          "message": 3
-        }
-      ]
-    }
-  ]
+    "problemMatcher": [
+      {
+        "owner": "php -l",
+        "pattern": [
+          {
+            "regexp": "^\\s*(PHP\\s+)?([a-zA-Z\\s]+):\\s+(.*)\\s+in\\s+(\\S+)\\s+on\\s+line\\s+(\\d+)$",
+            "file": 4,
+            "line": 5,
+            "message": 3
+          }
+        ]
+      }
+    ]
 }
diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml
@@ -1,4 +1,4 @@
-name: Codestyle check
+name: Code Style
 
 on:
   push:
@@ -9,11 +9,11 @@ jobs:
     name: PHP
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup PHP with tools
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.0'
         extensions: ctype, dom, exif, gd, gmp, hash, intl, json, libxml, mbstring, opcache, pcre, pdo, pdo_mysql, zlib
         tools: cs2pr, phpcs, php-cs-fixer
     - name: phpcs
@@ -24,7 +24,7 @@ jobs:
     name: TS Prettier
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up node.js
       uses: actions/setup-node@v3
       with:

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -12,15 +12,14 @@ jobs:
       fail-fast: false
       matrix:
         php:
-        - '7.4'
-        - '8.0'
         - '8.1'
+        - '8.2'
     steps:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: echo "::add-matcher::.github/php-syntax.json"
     - run: |
         ! find . -type f -name '*.php' -exec php -l '{}' \; 2>&1 |grep -v '^No syntax errors detected'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,9 +12,9 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v2.4.2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3.5.0
+      - uses: actions/setup-node@v3
         with:
           node-version: 16
 
@@ -25,7 +25,7 @@ jobs:
 
       - name: Check file existence
         id: check_files
-        uses: andstor/file-existence-action@v1.1.0
+        uses: andstor/file-existence-action@v2.0.0
         with:
           files: "*.tar.gz"
 
@@ -35,7 +35,7 @@ jobs:
           echo "Packaging FAILED" && exit 1
 
       - name: Release
-        uses: softprops/[email protected].14
+        uses: softprops/[email protected].15
         if: startsWith(github.ref, 'refs/tags/') && steps.check_files.outputs.files_exists == 'true'
         with:
           files: "*.tar.gz"
diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml
@@ -11,9 +11,9 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: "16"
         cache: "npm"
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up node.js
       uses: actions/setup-node@v3
       with:

diff --git a/acpMenu.xml b/acpMenu.xml
@@ -14,7 +14,7 @@
 			<controller>wcf\acp\form\FaqCategoryAddForm</controller>
 			<parent>wcf.acp.menu.link.faq.categories.list</parent>
 			<permissions>admin.faq.canAddCategory</permissions>
-			<icon>fa-plus</icon>
+			<icon>plus</icon>
 		</acpmenuitem>
 		<acpmenuitem name="wcf.acp.menu.link.faq.questions.list">
 			<controller>wcf\acp\page\FaqQuestionListPage</controller>
@@ -26,7 +26,7 @@
 			<controller>wcf\acp\form\FaqQuestionAddForm</controller>
 			<parent>wcf.acp.menu.link.faq.questions.list</parent>
 			<permissions>admin.faq.canAddQuestion</permissions>
-			<icon>fa-plus</icon>
+			<icon>plus</icon>
 		</acpmenuitem>
 	</import>
 </data>
diff --git a/acptemplates/faqQuestionAdd.tpl b/acptemplates/faqQuestionAdd.tpl
@@ -7,7 +7,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='FaqQuestionList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.faq.questions.list{/lang}</span></a></li>
+			<li><a href="{link controller='FaqQuestionList'}{/link}" class="button">{icon name='list' size=16} <span>{lang}wcf.acp.menu.link.faq.questions.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>

diff --git a/acptemplates/faqQuestionAddDialog.tpl b/acptemplates/faqQuestionAddDialog.tpl
@@ -0,0 +1,32 @@
+<div id="articleAddDialog" style="display: none">
+	<div class="section">
+		<dl>
+			<dt>{lang}wcf.acp.article.i18n{/lang}</dt>
+			<dd>
+				<label><input type="radio" name="isMultilingual" value="0" checked> {lang}wcf.acp.faq.i18n.none{/lang}</label>
+				<small>{lang}wcf.acp.article.i18n.none.description{/lang}</small>
+				<label><input type="radio" name="isMultilingual" value="1"> {lang}wcf.acp.faq.i18n.i18n{/lang}</label>
+				<small>{lang}wcf.acp.article.i18n.i18n.description{/lang}</small>
+			</dd>
+		</dl>
+
+		<div class="formSubmit">
+			<button type="button" class="button buttonPrimary">{lang}wcf.global.button.next{/lang}</button>
+		</div>
+	</div>
+</div>
+<script data-relocate="true">
+	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Article/Add'], function(Language, AcpUiArticleAdd) {
+		Language.addObject({
+			'wcf.acp.article.add': '{jslang}wcf.acp.menu.link.faq.questions.add{/jslang}'
+		});
+		
+		AcpUiArticleAdd.init('{link controller='FaqQuestionAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{/link}');
+		
+		{if $showFaqAddDialog}
+			window.setTimeout(function() {
+				AcpUiArticleAdd.openDialog();
+			}, 10);
+		{/if}
+	});
+</script>
diff --git a/acptemplates/faqQuestionList.tpl b/acptemplates/faqQuestionList.tpl
@@ -17,7 +17,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='FaqQuestionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.faq.questions.add{/lang}</span></a></li>
+			<li><a href="{link controller='FaqQuestionAdd'}{/link}" class="button">{icon name='plus' size=16} <span>{lang}wcf.acp.menu.link.faq.questions.add{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -89,9 +89,8 @@
 						<a href="{link controller='FaqQuestionEdit' object=$question}{/link}">{$question->getTitle()}</a>
 
 						<span class="statusDisplay sortableButtonContainer">
-							<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
 							{objectAction action="toggle" isDisabled=$question->isDisabled}
-							<a href="{link controller='FaqQuestionEdit' object=$question}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='FaqQuestionEdit' object=$question}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon name='pencil' size=16}</a>
 							{objectAction action="delete" objectTitle=$question->getTitle()}
 
 							{event name='itemButtons'}
@@ -115,7 +114,7 @@
 
 		<nav class="contentFooterNavigation">
 			<ul>
-				<li><a href="{link controller='FaqQuestionAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.faq.questions.add{/lang}</span></a></li>
+				<li><a href="{link controller='FaqQuestionAdd'}{/link}" class="button">{icon name='plus' size=16} <span>{lang}wcf.acp.menu.link.faq.questions.add{/lang}</span></a></li>
 
 				{event name='contentFooterNavigation'}
 			</ul>
@@ -125,4 +124,6 @@
 	<p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
 
+{include file='faqQuestionAddDialog'}
+
 {include file='footer'}
diff --git a/files/acp/database/install_dev.tkirch.wsc.faq.php b/files/acp/database/install_dev.tkirch.wsc.faq.php
@@ -21,6 +21,9 @@
             TinyintDatabaseTableColumn::create('hasEmbeddedObjects')
                 ->notNull()
                 ->defaultValue(0),
+            TinyintDatabaseTableColumn::create('isMultilingual')
+                ->notNull()
+                ->defaultValue(0),
         ])
         ->foreignKeys([
             DatabaseTableForeignKey::create()

diff --git a/...abase/update_dev.tkirch.wsc.faq_2.0.0.php → ...update_dev.tkirch.wsc.faq_2.0.0_step1.php b/...abase/update_dev.tkirch.wsc.faq_2.0.0.php → ...update_dev.tkirch.wsc.faq_2.0.0_step1.php
@@ -6,7 +6,7 @@
 return [
     PartialDatabaseTable::create('wcf1_faq_questions')
         ->columns([
-            TinyintDatabaseTableColumn::create('hasEmbeddedObjects')
+            TinyintDatabaseTableColumn::create('isMultilingual')
                 ->notNull()
                 ->defaultValue(0),
         ]),

diff --git a/files/acp/update_dev.tkirch.wsc.faq_2.0.0_step2.php b/files/acp/update_dev.tkirch.wsc.faq_2.0.0_step2.php
@@ -0,0 +1,11 @@
+<?php
+
+use wcf\system\WCF;
+
+$sql = "
+    UPDATE      wcf1_faq_questions
+    SET         isMultilingual = 1
+    WHERE       answer LIKE ?
+";
+$statement = WCF::getDB()->prepare($sql);
+$statement->execute(['wcf.faq.question.answer%']);
diff --git a/files/js/3rdParty/redactor2/plugins/FaqQuestion.js b/files/js/3rdParty/redactor2/plugins/FaqQuestion.js