refactor: migrated add FAQ page to controller (#3257)

Author: thorsten

phpmyfaq/admin/assets/src/api/faqs.js

@@ -15,8 +15,15 @@
 
 export const fetchAllFaqsByCategory = async (categoryId, language, onlyInactive, onlyNew) => {
   try {
-    const currentUrl = window.location.protocol + '//' + window.location.host + window.location.pathname;
-    const url = new URL(`${currentUrl}api/faqs/${categoryId}/${language}`);
+    let currentUrl = window.location.protocol + '//' + window.location.host;
+    let pathname = window.location.pathname;
+
+    if (pathname.endsWith('/faqs')) {
+      pathname = pathname.slice(0, -5);
+    }
+
+    currentUrl += pathname;
+    const url = new URL(`${currentUrl}/api/faqs/${categoryId}/${language}`);
     if (onlyInactive) {
       url.searchParams.set('only-inactive', onlyInactive);
     }

phpmyfaq/admin/faqs.editor.php

@@ -334,7 +334,7 @@
         'notifyUser' => $notifyUser,
         'notifyEmail' => $notifyEmail,
         'csrfToken' => Token::getInstance($container->get('session'))->getTokenString('edit-faq'),
-        'ad_entry_theme' => Translation::get('ad_entry_theme'),
+        'msgQuestion' => Translation::get('msgQuestion'),
         'msgNoHashAllowed' => Translation::get('msgNoHashAllowed'),
         'msgShowHelp' => Translation::get('msgShowHelp'),
         'ad_entry_content' => Translation::get('ad_entry_content'),
@@ -375,7 +375,7 @@
         'ad_entry_restricted_users' => Translation::get('ad_entry_restricted_users'),
         'userPermissionOptions' => $userHelper->getAllUserOptions($userPermission[0], true),
         'ad_entry_changelog' => Translation::get('ad_entry_changelog'),
-        'ad_entry_date' => Translation::get('ad_entry_date'),
+        'msgDate' => Translation::get('msgDate'),
         'ad_entry_changed' => Translation::get('ad_entry_changed'),
         'ad_admin_notes_hint' => Translation::get('ad_admin_notes_hint'),
         'ad_admin_notes' => Translation::get('ad_admin_notes'),
@@ -397,7 +397,7 @@
         'ad_entry_new_revision' => Translation::get('ad_entry_new_revision'),
         'ad_gen_yes' => Translation::get('ad_gen_yes'),
         'ad_gen_no' => Translation::get('ad_gen_no'),
-        'ad_entry_sticky' => Translation::get('ad_entry_sticky'),
+        'msgStickyFAQ' => Translation::get('msgStickyFAQ'),
         'ad_entry_allowComments' => Translation::get('ad_entry_allowComments'),
         'ad_entry_solution_id' => Translation::get('ad_entry_solution_id'),
         'nextSolutionId' => $faq->getNextSolutionId(),

phpmyfaq/admin/header.php

@@ -68,7 +68,8 @@
 $secLevelEntries['content'] .= $adminHelper->addMenuEntry(
     PermissionType::FAQ_ADD->value,
     'editentry',
-    'ad_entry_add'
+    'ad_entry_add',
+    'faq/add'
 );
 $secLevelEntries['content'] .= $adminHelper->addMenuEntry(
     'edit_faq+delete_faq',

phpmyfaq/admin/import.csv.php

@@ -53,7 +53,7 @@
         'msgImportRecordsColumnStructure' => Translation::get('msgImportRecordsColumnStructure'),
         'csrfToken' => Token::getInstance($container->get('session'))->getTokenString('importfaqs'),
         'is_active' => Translation::get('ad_entry_active'),
-        'is_sticky' => Translation::get('ad_entry_sticky'),
+        'is_sticky' => Translation::get('msgStickyFAQ'),
         'trueFalse' => Translation::get('msgCSVImportTrueOrFalse')
     ];
 

phpmyfaq/assets/templates/admin/content/faq.editor.twig

@@ -68,13 +68,13 @@
                 ID
               </th>
               <th class="align-middle">
-                {{ msgQuestion }}
+                {{ 'msgQuestion' | translate }}
               </th>
               <th class="align-middle">
-                {{ msgDate }}
+                {{ 'msgDate' | translate }}
               </th>
               <th class="align-middle">
-                {{ msgSticky }}
+                {{ 'msgStickyFAQ' | translate }}
               </th>
               <th class="align-middle">
                 {{ 'msgActive' | translate }}

phpmyfaq/assets/templates/admin/content/faq.overview.twig

@@ -108,7 +108,7 @@
           <div class="col mr-2">
             <div class="text-xs font-weight-bold mb-1">
               <a class="text-white" href="?action=comments">
-                {{ 'ad_start_comments' | translate }}
+                {{ 'msgComments' | translate }}
               </a>
             </div>
             <div class="h5 mb-0 mr-3 font-weight-bold text-gray-800">{{ adminDashboardInfoNumComments }}</div>

phpmyfaq/assets/templates/admin/dashboard.twig

@@ -220,7 +220,7 @@
     );
     $templateVars = [
         ... $templateVars,
-        'numberOfComments' => sprintf('%d %s', $numComments[$faqId] ?? 0, Translation::get('ad_start_comments')),
+        'numberOfComments' => sprintf('%d %s', $numComments[$faqId] ?? 0, Translation::get('msgComments')),
         'writeCommentMsg' => $commentMessage
     ];
 }

phpmyfaq/faq.php

@@ -123,6 +123,11 @@
         'controller' => [ConfigurationController::class, 'index'],
         'methods' => 'GET'
     ],
+    'admin.faq.add' => [
+        'path' => '/faq/add',
+        'controller' => [FaqController::class, 'add'],
+        'methods' => 'GET'
+    ],
     'admin.faqs' => [
         'path' => '/faqs',
         'controller' => [FaqController::class, 'index'],

phpmyfaq/src/admin-routes.php

@@ -81,12 +81,14 @@ protected function getHeader(Request $request): array
         $secLevelEntries['content'] .= $adminHelper->addMenuEntry(
             PermissionType::FAQ_ADD->value,
             'editentry',
-            'ad_entry_add'
+            'ad_entry_add',
+            'faq/add'
         );
         $secLevelEntries['content'] .= $adminHelper->addMenuEntry(
             'edit_faq+delete_faq',
             'faqs-overview',
-            'msgHeaderFAQOverview'
+            'msgHeaderFAQOverview',
+            'faqs'
         );
         $secLevelEntries['content'] .= $adminHelper->addMenuEntry(
             PermissionType::FAQ_EDIT->value,