refactor: acpt update action slug

Author: RishadAlam

frontend-dev/src/components/AllIntegrations/ACPT/ACPTIntegLayout.jsx

@@ -39,12 +39,9 @@ export default function ACPTIntegLayout({
           draftConf.label_field_map = []
 
           if (val === 'create_cpt' || val === 'update_cpt') {
-            draftConf.acptFields =
-              val === 'update_cpt'
-                ? [{ label: __('Slug', 'bit-integrations'), key: 'slug', required: true }, ...cptFields]
-                : cptFields
-
+            draftConf.acptFields = cptFields
             draftConf.acptLabels = cptLabels
+
             draftConf.label_field_map = generateMappedField(cptLabels)
           } else if (val === 'delete_cpt' || val === 'delete_taxonomy') {
             draftConf.acptFields = [

frontend-dev/src/components/AllIntegrations/ACPT/staticData.js

@@ -20,7 +20,7 @@ export const modules = [
 ]
 
 export const cptFields = [
-  { label: __('Post Name', 'bit-integrations'), key: 'post_name', required: true },
+  { label: __('Post Name or Slug', 'bit-integrations'), key: 'post_name', required: true },
   { label: __('Singular Label', 'bit-integrations'), key: 'singular_label', required: true },
   { label: __('Plural Label', 'bit-integrations'), key: 'plural_label', required: true },
   { label: __('REST API base slug', 'bit-integrations'), key: 'rest_base', required: false },

includes/Actions/ACPT/ACPTHelper.php

@@ -26,23 +26,14 @@ public static function generateReqDataFromFieldMap($data, $fieldMap)
         return $dataFinal;
     }
 
-    public static function cptValidateRequired($finalData, $isUpdate = false)
+    public static function cptValidateRequired($finalData)
     {
         $required = [
             'post_name'      => __('Post Name', 'bit-integrations'),
             'singular_label' => __('Singular Label', 'bit-integrations'),
             'plural_label'   => __('Plural Label', 'bit-integrations'),
         ];
 
-        if ($isUpdate) {
-            $required = array_merge(
-                [
-                    'slug' => __('Slug', 'bit-integrations')
-                ],
-                $required
-            );
-        }
-
         foreach ($required as $key => $label) {
             if (empty($finalData[$key])) {
                 return [
@@ -54,7 +45,7 @@ public static function cptValidateRequired($finalData, $isUpdate = false)
         }
     }
 
-    public static function taxonomyValidateRequired($finalData, $isUpdate = false)
+    public static function taxonomyValidateRequired($finalData)
     {
         $requiredFields = [
             'slug'           => __('Slug', 'bit-integrations'),
@@ -68,11 +59,10 @@ public static function taxonomyValidateRequired($finalData, $isUpdate = false)
     public static function optionPageValidateRequired($finalData)
     {
         $requiredFields = [
-            'pageTitle'  => __('Page Title', 'bit-integrations'),
-            'menuTitle'  => __('Menu Title', 'bit-integrations'),
-            'capability' => __('Capability', 'bit-integrations'),
-            'menuSlug'   => __('Menu Slug', 'bit-integrations'),
-            'position'   => __('Menu Position', 'bit-integrations'),
+            'pageTitle' => __('Page Title', 'bit-integrations'),
+            'menuTitle' => __('Menu Title', 'bit-integrations'),
+            'menuSlug'  => __('Menu Slug', 'bit-integrations'),
+            'position'  => __('Menu Position', 'bit-integrations'),
         ];
 
         return self::validateFields($requiredFields, $finalData);
@@ -145,11 +135,7 @@ public static function validateResponse($response)
 
     public static function convertToSlug($string)
     {
-        $string = strtolower(trim($string));
-        $string = preg_replace('/[^a-z0-9-]/', '-', $string);
-        $string = preg_replace('/-+/', '-', $string);
-
-        return trim($string, '-');
+        return str_replace(' ', '-', strtolower($string));
     }
 
     private static function validateFields($requiredFields, $finalData)

includes/Actions/ACPT/RecordApiHelper.php

@@ -64,13 +64,11 @@ public function createCPT($finalData, $fieldValues)
 
     public function updateCPT($finalData, $fieldValues)
     {
-        if ($error = ACPTHelper::cptValidateRequired($finalData, true)) {
+        if ($error = ACPTHelper::cptValidateRequired($finalData)) {
             return $error;
         }
 
-        $slug = ACPTHelper::convertToSlug($finalData['slug']);
-
-        unset($finalData['slug']);
+        $slug = ACPTHelper::convertToSlug($finalData['post_name']);
 
         $finalData['icon'] = $this->integrationDetails->icon;
 
@@ -106,6 +104,7 @@ public function createOrUpdateTaxonomy($finalData, $fieldValues, $isUpdate = fal
         }
 
         $slug = ACPTHelper::convertToSlug($finalData['slug']);
+        $finalData['slug'] = $slug;
 
         $finalData = ACPTHelper::prepareTaxonomyData($finalData, $fieldValues, $this->integrationDetails);
 
@@ -129,9 +128,9 @@ public function deleteTaxonomy($finalData)
             ];
         }
 
-        $finalData['slug'] = ACPTHelper::convertToSlug($finalData['slug']);
+        $slug = ACPTHelper::convertToSlug($finalData['slug']);
 
-        $apiEndpoint = $this->apiUrl . '/taxonomy/' . $finalData['slug'];
+        $apiEndpoint = $this->apiUrl . '/taxonomy/' . $slug;
 
         $response = apply_filters('btcbi_acpt_delete_taxonomy', false, $apiEndpoint, $this->apikey);
 
@@ -303,7 +302,7 @@ public function execute($fieldValues, $fieldMap, $module)
                 break;
             case 'update_taxonomy':
                 $type = 'Taxonomy';
-                $typeName = 'Create Taxonomy';
+                $typeName = 'Update Taxonomy';
 
                 $apiResponse = $this->createOrUpdateTaxonomy($finalData, $fieldValues, true);