Fixed: cms component issue

Author: we-vikram-wri231

Http/Controllers/Backend/ContentTypesController.php

@@ -5,6 +5,7 @@
 use VaahCms\Modules\Cms\Models\Content;
 use VaahCms\Modules\Cms\Models\FieldType;
 use VaahCms\Modules\Cms\Models\ContentType;
+use WebReinvent\VaahCms\Models\TaxonomyType;
 
 
 class ContentTypesController extends Controller
@@ -50,6 +51,12 @@ public function getAssets(Request $request)
             $data['field_types'] = FieldType::select('id', 'name', 'slug', 'meta')
                 ->get();
 
+            $data['content_relations'] = vh_content_relations();
+
+            $data['taxonomy_types'] = TaxonomyType::whereNotNull('is_active')
+                ->whereNull('parent_id')->with(['children'])
+                ->select('id', 'name', 'slug')->get();
+
             $data['non_repeatable_fields'] = Content::getNonRepeatableFields();
 
             $data['actions'] = [];

Http/Controllers/Backend/ContentsController.php

@@ -254,6 +254,40 @@ public function itemAction(Request $request,$id,$action)
         }
     }
     //----------------------------------------------------------
+    public function getRelationsInTree(Request $request)
+    {
+        $input = $request->all();
+
+        $list = [];
+
+        $relation =  vh_content_relations_by_name($input['type']);
+
+        if(!isset($relation['display_column']) || !$relation['display_column']){
+            $relation['display_column'] = 'name';
+        }
+
+        $url = null;
+
+        if($relation && isset($relation['namespace'])){
+
+            $relation['filter_id'] = $input['filter_id'];
+
+            $list = Content::getListByVariables($relation);
+
+            if(isset($relation['add_url']) && $relation['add_url']){
+                $url = $relation['add_url'];
+            }
+        }
+
+
+        $response['success'] = true;
+        $response['data']['list'] = $list;
+        $response['data']['display_column'] = $relation['display_column'];
+        $response['data']['add_url'] = $url;
+
+        return $response;
+    }
+    //----------------------------------------------------------
 
 
 }

Libraries/CmsSeeder.php

@@ -267,13 +267,14 @@ public static function createSampleField($theme_slug, $file_path, $content_type_
 
         $content_type = ContentType::where('slug', $content_type_slug)
             ->with(['groups.fields.type'])
-            ->first()->toArray();
+            ->first();
 
         if(!$content_type)
         {
             return false;
         }
 
+        $content_type = $content_type->toArray();
 
         foreach($list as $item)
         {

Models/ContentBase.php

@@ -891,7 +891,7 @@ public static function storeFormGroups(Content $content, $groups, $type = null)
                         if(!$field['content']){
                             $row_to_delete_ids = array_diff($relatable_ids, []);
                         }else{
-                            $row_to_delete_ids = array_diff($relatable_ids, $field['content']);
+                            $row_to_delete_ids = array_diff($relatable_ids, [$field['content']]);
                         }
 
                         if(count($row_to_delete_ids) > 0)
@@ -1330,7 +1330,7 @@ public static function getListByVariables($var)
             $list->where($var['filter_by'],$var['filter_id']);
         }
 
-        $list = $list->get();
+        $list = $list->select('id','id as key', $var['display_column'].' as label')->get();
 
         return $list;
 

Models/FormGroup.php

@@ -224,7 +224,7 @@ public static function syncWithFormFields(FormGroup $group, $fields_array)
 
                         if($stored_field){
 
-                            if($stored_field->meta && isset($stored_field->meta->type)
+                            if(isset($field['id']) && $stored_field->meta && isset($stored_field->meta->type)
                                 && $field['meta']['type'] != $stored_field->meta->type){
                                 $content_form_fields = ContentFormField::with(['contentFormRelations'])
                                     ->where('vh_cms_form_field_id', $field['id'])->get();

Routes/backend/routes-contents.php

@@ -36,6 +36,10 @@ function () {
     /**
      * Update List
      */
+
+    Route::post('/getRelationsInTree', 'ContentsController@getRelationsInTree')
+        ->name('backend.cms.contents.getRelationsInTree');
+    //---------------------------------------------------------
     Route::match(['put', 'patch'], '/', 'ContentsController@updateList')
         ->name('vh.backend.cms.contents.list.update');
     /**

Vue/pages/contenttypes/ContentStructure.vue

@@ -180,13 +180,13 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                         </td>
                                                     </tr>
 
-                                                    <template v-if="element.meta">
-                                                        <tr v-for="(meta_item, meta_index) in element.meta"
-                                                            v-if="(meta_index !== 'container_opening_tag'
+                                                    <template v-if="element.meta" v-for="(meta_item, meta_index) in element.meta">
+                                                        <tr
+                                                            v-if="meta_index !== 'filter' && ((meta_index !== 'container_opening_tag'
                                                                     && meta_index !== 'container_closing_tag')
                                                                     || (store && store.assets && store.assets.non_repeatable_fields
                                                                      && store.assets.non_repeatable_fields.includes(element.type.slug))
-                                                                    || element.is_repeatable"
+                                                                    || element.is_repeatable)"
                                                         >
                                                             <td v-if="meta_index !== 'filter_id'
                                                                 && meta_index !== 'display_column'
@@ -228,9 +228,24 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                                     <Dropdown v-model="element.meta[meta_index]"
                                                                               :options="store.assets.content_relations"
                                                                               optionLabel="name"
+                                                                              optionValue="name"
                                                                               placeholder="Select"
                                                                               class="w-full md:w-14rem mt-3"
                                                                     />
+
+                                                                    <TreeSelect  v-if="element.meta[meta_index]
+                                                                        && useVaah.findInArrayByKey(
+                                                                        store.assets.content_relations,'name', element.meta[meta_index])
+                                                                        && useVaah.findInArrayByKey(
+                                                                        store.assets.content_relations,'name', element.meta[meta_index])['options']"
+                                                                                 class="w-full"
+                                                                                v-model="element.meta['filter']"
+                                                                                 :metaKeySelection="false"
+                                                                                 @node-select="store.selectType($event,element)"
+                                                                                :options="useVaah.findInArrayByKey(
+                                                                        store.assets.content_relations,'name', element.meta[meta_index])['options']"
+                                                                                placeholder="Select..."
+                                                                    />
                                                                 </template>
 
                                                                 <template v-else>

Vue/stores/store-contenttypes.js

@@ -993,6 +993,10 @@ export const useContentTypeStore = defineStore({
             return item;
         },
         //---------------------------------------------------------------------
+        async selectType(event,item) {
+            item.meta['filter_id'] = event.id;
+        },
+        //---------------------------------------------------------------------
     }
 });