From cafdf0f784923fe3a40d6b8c3621452f1cebae71 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Thu, 16 Mar 2023 19:27:03 +0530
Subject: [PATCH 01/24] Updated: trying to fix content-types blade.php issue

---
 Resources/views/backend/pages/app.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/views/backend/pages/app.blade.php b/Resources/views/backend/pages/app.blade.php
index fd9435f..6246a06 100644
--- a/Resources/views/backend/pages/app.blade.php
+++ b/Resources/views/backend/pages/app.blade.php
@@ -15,14 +15,14 @@
     @if(env('MODULE_CMS_ENV') == 'develop')
         <script type="module" src="http://localhost:8367/Vue/main.js"></script>
     @else
-        <script type="module" src="{{vh_module_assets_url("Cms", "build/index.js")}}"></script>
+        <script type="module" src="{{vh_module_assets_url("Cms", "build/main.js")}}"></script>
     @endif
 
 @endsection
 
 @section('content')
 
-    <div id="appCms" class="bulma">
+    <div id="cmsApp" class="bulma">
 
         <section class="section has-padding-25">
             <router-view></router-view>

From d15abbf9e22430536f144d158772d022de498428 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 10:37:17 +0530
Subject: [PATCH 02/24] Updated: Cms Module issue resolved

---
 Resources/views/backend/pages/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/views/backend/pages/app.blade.php b/Resources/views/backend/pages/app.blade.php
index 6246a06..e76c24a 100644
--- a/Resources/views/backend/pages/app.blade.php
+++ b/Resources/views/backend/pages/app.blade.php
@@ -22,7 +22,7 @@
 
 @section('content')
 
-    <div id="cmsApp" class="bulma">
+    <div id="appCms" class="bulma">
 
         <section class="section has-padding-25">
             <router-view></router-view>

From 119d4199725700dd6867dc76832c60b755aff68b Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 11:29:36 +0530
Subject: [PATCH 03/24] Updated: UI issue fixed in content structure

---
 Vue/pages/contenttypes/Contentstructure.vue   |  4 ++--
 Vue/pages/contenttypes/components/Actions.vue |  2 ++
 Vue/pages/contenttypes/components/Table.vue   | 11 +++++++----
 Vue/stores/store-contenttypes.js              |  9 +++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index e863f37..df90508 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -220,8 +220,8 @@ const toggleItemMenu = (event) => {
             </template>
         </Card>
     </div>
-    <div class="col-2" >
-        <Card>
+    <div class="col-3" >
+        <Card style="height:570px; overflow-y: auto">
             <template #header>
                 <h2 class="font-semibold text-lg">Content Fields</h2>
             </template>
diff --git a/Vue/pages/contenttypes/components/Actions.vue b/Vue/pages/contenttypes/components/Actions.vue
index 648a99b..32912a1 100644
--- a/Vue/pages/contenttypes/components/Actions.vue
+++ b/Vue/pages/contenttypes/components/Actions.vue
@@ -90,6 +90,7 @@ const toggleBulkMenuState = (event) => {
                                     icon="pi pi-search"/>
                             <Button
                                 type="button"
+                                v-if="store.isContentStructure()"
                                 class="p-button-sm"
                                 data-testid="contenttypes-actions-show-filters"
                                 @click="store.show_filters = true">
@@ -99,6 +100,7 @@ const toggleBulkMenuState = (event) => {
 
                             <Button
                                 type="button"
+                                v-if="store.isContentStructure()"
                                 icon="pi pi-filter-slash"
                                 data-testid="contenttypes-actions-reset-filters"
                                 class="p-button-sm"
diff --git a/Vue/pages/contenttypes/components/Table.vue b/Vue/pages/contenttypes/components/Table.vue
index 37ad042..72ffc50 100644
--- a/Vue/pages/contenttypes/components/Table.vue
+++ b/Vue/pages/contenttypes/components/Table.vue
@@ -18,11 +18,11 @@ const useVaah = vaah();
                    stripedRows
                    responsiveLayout="scroll">
              <Column selectionMode="multiple"
-                    v-if="store.isViewLarge()"
+                    v-if="store.isContentStructure()"
                     headerStyle="width: 3em">
             </Column>
 
-            <Column field="id" header="ID" :style="{width: '90px'}" :sortable="true">
+            <Column field="id" v-if="store.isContentStructure()" header="ID" :style="{width: '90px'}" :sortable="true">
             </Column>
 
             <Column field="name" header="Name"
@@ -38,6 +38,7 @@ const useVaah = vaah();
             </Column>
 
              <Column field="plural" header="Plural"
+                     v-if="store.isContentStructure()"
                      :sortable="true">
 
                  <template #body="prop">
@@ -50,6 +51,7 @@ const useVaah = vaah();
              </Column>
 
              <Column field="singular" header="Singular"
+                     v-if="store.isContentStructure()"
                      :sortable="true">
 
                  <template #body="prop">
@@ -63,7 +65,7 @@ const useVaah = vaah();
 
 
              <Column field="updated_at" header="Updated"
-                     v-if="store.isViewLarge()"
+                     v-if="store.isContentStructure()"
                      style="width:90px;"
                      :sortable="true">
                  <template #body="prop">
@@ -71,7 +73,7 @@ const useVaah = vaah();
                  </template>
              </Column>
 
-            <Column field="is_published" v-if="store.isViewLarge()"
+            <Column field="is_published" v-if="store.isContentStructure()"
                     :sortable="true"
                     style="width:150px;"
                     header="Is Published">
@@ -106,6 +108,7 @@ const useVaah = vaah();
                                 icon="pi pi-eye" />
 
                         <Button class="p-button-tiny p-button-text"
+                                v-if="store.isContentStructure()"
                                 data-testid="contenttypes-table-to-edit"
                                 v-tooltip.top="'Update'"
                                 @click="store.toEdit(prop.data)"
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index bdaa1d5..6fde804 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -111,8 +111,8 @@ export const useContentTypeStore = defineStore({
                     this.list_view_width = 12;
                     break;
                 case 'contenttypes.contentstructure':
-                    this.view = 'large';
-                    this.list_view_width = 4;
+                    this.view = 'content structure';
+                    this.list_view_width = 3;
                     break;
                 default:
                     this.view = 'small';
@@ -706,6 +706,11 @@ export const useContentTypeStore = defineStore({
             return this.view === 'large';
         },
         //---------------------------------------------------------------------
+        isContentStructure()
+        {
+            return this.view !== 'content structure';
+        },
+        //---------------------------------------------------------------------
         getIdWidth()
         {
             let width = 50;

From 238691ced31f6a9346967897e2b9f9c770601f4b Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 13:03:07 +0530
Subject: [PATCH 04/24] Updated: research on content structure data save issue

---
 Models/ContentTypeBase.php                  | 2 +-
 Vue/pages/contenttypes/Contentstructure.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Models/ContentTypeBase.php b/Models/ContentTypeBase.php
index 3e4d801..a276fe3 100644
--- a/Models/ContentTypeBase.php
+++ b/Models/ContentTypeBase.php
@@ -331,7 +331,7 @@ public static function getItemWithRelations($id)
                 }])
             ->withTrashed()
             ->first();
-
+        dd($item);
         $response['status'] = 'success';
         $response['data'] = $item;
 
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index df90508..9e1137a 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -89,6 +89,7 @@ const toggleItemMenu = (event) => {
                             <template #item="{element,index}">
                                 <div>
                                     <div class="p-inputgroup mb-3">
+                                        {{element}}
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"

From 2f5a7750df81a22149c4b22878312571abde28b5 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 15:32:10 +0530
Subject: [PATCH 05/24] Updated: Drag & drop issue resolved

---
 Models/ContentTypeBase.php                  |   1 -
 Vue/pages/contenttypes/Contentstructure.vue | 145 +++++++++-----------
 Vue/stores/store-contenttypes.js            |  24 ++++
 3 files changed, 86 insertions(+), 84 deletions(-)

diff --git a/Models/ContentTypeBase.php b/Models/ContentTypeBase.php
index a276fe3..1342862 100644
--- a/Models/ContentTypeBase.php
+++ b/Models/ContentTypeBase.php
@@ -331,7 +331,6 @@ public static function getItemWithRelations($id)
                 }])
             ->withTrashed()
             ->first();
-        dd($item);
         $response['status'] = 'success';
         $response['data'] = $item;
 
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 9e1137a..a15a674 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,6 +28,7 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
+
 });
 
 //--------toggle item menu
@@ -89,7 +90,6 @@ const toggleItemMenu = (event) => {
                             <template #item="{element,index}">
                                 <div>
                                     <div class="p-inputgroup mb-3">
-                                        {{element}}
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"
@@ -109,99 +109,78 @@ const toggleItemMenu = (event) => {
                                         <div class="p-datatable p-component p-datatable-responsive-stack
                                             p-datatable-striped p-datatable-sm"
                                              data-scrollselectors=".p-datatable-wrapper" pv_id_6="">
-                                            <!----><!----><!----><!----><!---->
                                             <div class="p-datatable-wrapper">
                                                 <table role="table" class="p-datatable-table">
-                                                    <thead class="p-datatable-thead" role="rowgroup">
-                                                    <tr role="row">
-                                                        <th class="" role="cell"><!---->
-                                                            <div class="p-column-header-content"><!----><!---->
-                                                                <!----><!----><!----><!----></div>
-                                                        </th>
-                                                        <th class="" role="cell"><!---->
-                                                            <div class="p-column-header-content"><!----><!---->
-                                                                <!----><!----><!----><!----></div>
-                                                        </th>
-                                                    </tr><!----></thead><!---->
-                                                    <tbody class="p-datatable-tbody" role="rowgroup"><!---->
-                                                    <tr class="" role="row" draggable="false">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is repeatable
+
+                                                    <tr v-if="!store.assets.non_repeatable_fields.includes(element.type.slug)">
+                                                        <td >
+                                                            Is repeatable
+                                                        </td>
+                                                        <td>
+                                                            <InputSwitch v-model="element.is_repeatable"
+                                                                         v-bind:false-value="0"
+                                                                         v-bind:true-value="1"
+                                                                         data-testid="contenttype-group_field_repeatable"/>
+
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Is searchable
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>
-                                                            <div class="p-inputswitch p-component">
-                                                                <div class="p-hidden-accessible"><input
-                                                                    type="checkbox" role="switch" class=""
-                                                                    aria-checked="false"></div>
-                                                                <span class="p-inputswitch-slider"></span></div>
-                                                            <!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if-->
+                                                        <td>
+                                                            <InputSwitch v-bind:false-value="0"
+                                                                         v-bind:true-value="1"
+                                                                         data-testid="contenttype-group_field_searchable"
+                                                                         v-model="element.is_searchable"/>
+
                                                         </td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is Searchable
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Excerpt
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if-->
-                                                            <div class="p-inputswitch p-component">
-                                                                <div class="p-hidden-accessible"><input
-                                                                    type="checkbox" role="switch" class=""
-                                                                    aria-checked="false"></div>
-                                                                <span class="p-inputswitch-slider"></span></div>
-                                                            <!--v-if--><!--v-if--><!--v-if--><!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Excerpt
+                                                        <td>
+                                                            <Textarea data-testid="contenttype-group_field_excerpt"
+                                                                      v-model="element.excerpt"
+                                                                      class="w-full"/>
+
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if-->
-                                                            <!--v-if--><textarea
-                                                                class="p-inputtextarea p-inputtext p-component w-full"></textarea>
-                                                            <!--v-if--><!--v-if--><!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Opening Tag
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Opening tag
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><input
-                                                                class="p-inputtext p-component w-full"><!--v-if-->
-                                                            <!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Closing Tag
+                                                        <td>
+                                                            <InputText data-testid="contenttype-group_field_opening_tag"
+                                                                       v-model="element.container_opening_tag"
+                                                                       class="w-full"/>
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><!--v-if--><input
-                                                                class="p-inputtext p-component w-full"><!--v-if-->
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td >
+                                                            Closing tag
                                                         </td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is Hidden
+                                                        <td>
+                                                            <InputText data-testid="contenttype-group_field_closing_tag"
+                                                                       v-model="element.container_closing_tag"
+                                                                       class="w-full"/>
+                                                        </td>
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td >
+                                                            Is hidden
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><!--v-if--><!--v-if-->
-                                                            <div>
-                                                                <div class="p-checkbox p-component" id="hidden">
-                                                                    <div class="p-hidden-accessible"><input
-                                                                        type="checkbox" class=""></div>
-                                                                    <div class="p-checkbox-box"><span
-                                                                        class="p-checkbox-icon"></span></div>
-                                                                </div>
-                                                                <label for="hidden"
-                                                                       class="font-semibold text-xs ml-1">Is
-                                                                    Hidden</label></div>
+                                                        <td>
+                                                            <Checkbox id="hidden"
+                                                                      data-testid="contenttype-group_field_hidden"
+                                                                      v-model="element.display_column"/>
                                                         </td>
-                                                    </tr><!----><!----></tbody><!----></table>
-                                            </div><!----><!---->
-                                            <div class="p-column-resizer-helper" style="display: none;"></div>
+                                                    </tr>
+                                                </table>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index 6fde804..edc74a8 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -197,6 +197,30 @@ export const useContentTypeStore = defineStore({
                     },{deep: true}
                 );
             }
+            if(this.item.fields){
+                watch(() => this.item.fields.name, (newVal,oldVal) =>
+                    {
+                        if(newVal && newVal !== "")
+                        {
+                            this.item.fields.slug = vaah().strToSlug(newVal);
+                        }
+                    },{deep: true}
+                )
+            }
+        },
+        //---------------------------------------------------------------------
+        watchFields(){
+            console.log('sdf');
+            if(this.item.fields){
+                watch(() => this.item.fields.name, (newVal,oldVal) =>
+                    {
+                        if(newVal && newVal !== "")
+                        {
+                            this.item.fields.slug = vaah().strToSlug(newVal);
+                        }
+                    },{deep: true}
+                )
+            }
         },
         //---------------------------------------------------------------------
         async getAssets() {

From d626ed149c771379f6dd94effb3bda50e9212a2d Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 16:15:13 +0530
Subject: [PATCH 06/24] Updated: content save issue fixed

---
 Models/FieldType.php                        | 111 ++++++++++++++++++++
 Models/FormGroup.php                        |   1 -
 Vue/pages/contenttypes/Contentstructure.vue |   5 +
 Vue/stores/store-contenttypes.js            |  30 ++----
 4 files changed, 122 insertions(+), 25 deletions(-)
 create mode 100644 Models/FieldType.php

diff --git a/Models/FieldType.php b/Models/FieldType.php
new file mode 100644
index 0000000..cc6a5b5
--- /dev/null
+++ b/Models/FieldType.php
@@ -0,0 +1,111 @@
+<?php namespace VaahCms\Modules\Cms\Models;
+
+use DateTimeInterface;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use WebReinvent\VaahCms\Models\User;
+use WebReinvent\VaahCms\Traits\CrudWithUuidObservantTrait;
+
+class FieldType extends Model {
+
+    use SoftDeletes;
+    use CrudWithUuidObservantTrait;
+
+    //-------------------------------------------------
+    protected $table = 'vh_cms_field_types';
+    //-------------------------------------------------
+    protected $dates = [
+        'created_at',
+        'updated_at',
+        'deleted_at'
+    ];
+    //-------------------------------------------------
+    protected $dateFormat = 'Y-m-d H:i:s';
+    //-------------------------------------------------
+    protected $fillable = [
+        'name',
+        'slug',
+        'excerpt',
+        'meta',
+        'created_by',
+        'updated_by',
+        'deleted_by'
+    ];
+
+    //-------------------------------------------------
+    protected $appends  = [
+    ];
+
+    //-------------------------------------------------
+
+
+
+    //-------------------------------------------------
+    protected function serializeDate(DateTimeInterface $date)
+    {
+        $date_time_format = config('settings.global.datetime_format');
+
+        return $date->format($date_time_format);
+
+    }
+    //-------------------------------------------------
+    //-------------------------------------------------
+    public function setMetaAttribute($value)
+    {
+        if($value)
+        {
+            $this->attributes['meta'] = json_encode($value);
+        } else{
+            $this->attributes['meta'] = null;
+        }
+    }
+    //-------------------------------------------------
+    public function getMetaAttribute($value)
+    {
+        if($value)
+        {
+            return json_decode($value);
+        }
+        return null;
+    }
+    //-------------------------------------------------
+    public function getTableColumns() {
+        return $this->getConnection()->getSchemaBuilder()
+            ->getColumnListing($this->getTable());
+    }
+    //-------------------------------------------------
+    public function scopeExclude($query, $columns)
+    {
+        return $query->select( array_diff( $this->getTableColumns(),$columns) );
+    }
+    //-------------------------------------------------
+    public function scopeIsPublished($query)
+    {
+        return $query->where( 'is_published', 1 );
+    }
+    //-------------------------------------------------
+    public function createdByUser()
+    {
+        return $this->belongsTo(User::class,
+            'created_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+
+    //-------------------------------------------------
+    public function updatedByUser()
+    {
+        return $this->belongsTo(User::class,
+            'updated_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+    //-------------------------------------------------
+    public function deletedByUser()
+    {
+        return $this->belongsTo(User::class,
+            'deleted_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+    //-------------------------------------------------
+    //-------------------------------------------------
+
+}
diff --git a/Models/FormGroup.php b/Models/FormGroup.php
index 2aeb177..91053e7 100644
--- a/Models/FormGroup.php
+++ b/Models/FormGroup.php
@@ -205,7 +205,6 @@ public static function syncWithFormFields(FormGroup $group, $fields_array)
                     ->first();
 
 
-
                 if(isset($field['type']) && isset($field['type']['slug']) )
                 {
                     $type = FieldType::where('slug', $field['type']['slug'])->first();
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index a15a674..85b1165 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,6 +28,7 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
+    await store.watchFields();
 
 });
 
@@ -71,6 +72,7 @@ const toggleItemMenu = (event) => {
                                              data-testid="contetntypes-is_repeatable"/>
                                 <p class="ml-1 mr-3 text-xs font-semibold">Is Repeatable</p>
                                 <Button icon="pi pi-hashtag"
+                                        :label="item.id"
                                         @click="store.getCopy(item.slug)"
                                         data-testid="contetntypes-copy_slug"
                                         class="p-button-sm"/>
@@ -93,9 +95,12 @@ const toggleItemMenu = (event) => {
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"
+                                                   @input="store.groupsFieldsSlug(element)"
                                                    data-testid="contenttype-group_field_name"
                                                    placeholder="Field Name"/>
                                         <Button icon="pi pi-hashtag p-button-sm"
+                                                :label="element.id"
+                                                :disabled="!element.id"
                                                 @click="store.getCopy(element.slug)"
                                                 data-testid="contenttype-group_field_slug"/>
                                         <Button icon="pi pi-cog p-button-sm"
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index edc74a8..c90e7c2 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -197,30 +197,7 @@ export const useContentTypeStore = defineStore({
                     },{deep: true}
                 );
             }
-            if(this.item.fields){
-                watch(() => this.item.fields.name, (newVal,oldVal) =>
-                    {
-                        if(newVal && newVal !== "")
-                        {
-                            this.item.fields.slug = vaah().strToSlug(newVal);
-                        }
-                    },{deep: true}
-                )
-            }
-        },
-        //---------------------------------------------------------------------
-        watchFields(){
-            console.log('sdf');
-            if(this.item.fields){
-                watch(() => this.item.fields.name, (newVal,oldVal) =>
-                    {
-                        if(newVal && newVal !== "")
-                        {
-                            this.item.fields.slug = vaah().strToSlug(newVal);
-                        }
-                    },{deep: true}
-                )
-            }
+
         },
         //---------------------------------------------------------------------
         async getAssets() {
@@ -1070,6 +1047,11 @@ export const useContentTypeStore = defineStore({
             return item;
         },
         //---------------------------------------------------------------------
+        groupsFieldsSlug(item){
+            console.log(item.name);
+            item.slug = vaah().strToSlug(item.name);
+        },
+        //---------------------------------------------------------------------
     }
 });
 

From e4da46ffc3f6dd07af20a544190dd4cc2f14fe4a Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 16:15:32 +0530
Subject: [PATCH 07/24] Updated: research on content structure data save issue

Updated: Drag & drop issue resolved


Updated: content save issue fixed
---
 Models/ContentTypeBase.php                  |   1 -
 Models/FieldType.php                        | 111 +++++++++++++++
 Models/FormGroup.php                        |   1 -
 Vue/pages/contenttypes/Contentstructure.vue | 149 +++++++++-----------
 Vue/stores/store-contenttypes.js            |   6 +
 5 files changed, 184 insertions(+), 84 deletions(-)
 create mode 100644 Models/FieldType.php

diff --git a/Models/ContentTypeBase.php b/Models/ContentTypeBase.php
index 3e4d801..1342862 100644
--- a/Models/ContentTypeBase.php
+++ b/Models/ContentTypeBase.php
@@ -331,7 +331,6 @@ public static function getItemWithRelations($id)
                 }])
             ->withTrashed()
             ->first();
-
         $response['status'] = 'success';
         $response['data'] = $item;
 
diff --git a/Models/FieldType.php b/Models/FieldType.php
new file mode 100644
index 0000000..cc6a5b5
--- /dev/null
+++ b/Models/FieldType.php
@@ -0,0 +1,111 @@
+<?php namespace VaahCms\Modules\Cms\Models;
+
+use DateTimeInterface;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use WebReinvent\VaahCms\Models\User;
+use WebReinvent\VaahCms\Traits\CrudWithUuidObservantTrait;
+
+class FieldType extends Model {
+
+    use SoftDeletes;
+    use CrudWithUuidObservantTrait;
+
+    //-------------------------------------------------
+    protected $table = 'vh_cms_field_types';
+    //-------------------------------------------------
+    protected $dates = [
+        'created_at',
+        'updated_at',
+        'deleted_at'
+    ];
+    //-------------------------------------------------
+    protected $dateFormat = 'Y-m-d H:i:s';
+    //-------------------------------------------------
+    protected $fillable = [
+        'name',
+        'slug',
+        'excerpt',
+        'meta',
+        'created_by',
+        'updated_by',
+        'deleted_by'
+    ];
+
+    //-------------------------------------------------
+    protected $appends  = [
+    ];
+
+    //-------------------------------------------------
+
+
+
+    //-------------------------------------------------
+    protected function serializeDate(DateTimeInterface $date)
+    {
+        $date_time_format = config('settings.global.datetime_format');
+
+        return $date->format($date_time_format);
+
+    }
+    //-------------------------------------------------
+    //-------------------------------------------------
+    public function setMetaAttribute($value)
+    {
+        if($value)
+        {
+            $this->attributes['meta'] = json_encode($value);
+        } else{
+            $this->attributes['meta'] = null;
+        }
+    }
+    //-------------------------------------------------
+    public function getMetaAttribute($value)
+    {
+        if($value)
+        {
+            return json_decode($value);
+        }
+        return null;
+    }
+    //-------------------------------------------------
+    public function getTableColumns() {
+        return $this->getConnection()->getSchemaBuilder()
+            ->getColumnListing($this->getTable());
+    }
+    //-------------------------------------------------
+    public function scopeExclude($query, $columns)
+    {
+        return $query->select( array_diff( $this->getTableColumns(),$columns) );
+    }
+    //-------------------------------------------------
+    public function scopeIsPublished($query)
+    {
+        return $query->where( 'is_published', 1 );
+    }
+    //-------------------------------------------------
+    public function createdByUser()
+    {
+        return $this->belongsTo(User::class,
+            'created_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+
+    //-------------------------------------------------
+    public function updatedByUser()
+    {
+        return $this->belongsTo(User::class,
+            'updated_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+    //-------------------------------------------------
+    public function deletedByUser()
+    {
+        return $this->belongsTo(User::class,
+            'deleted_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+    //-------------------------------------------------
+    //-------------------------------------------------
+
+}
diff --git a/Models/FormGroup.php b/Models/FormGroup.php
index 2aeb177..91053e7 100644
--- a/Models/FormGroup.php
+++ b/Models/FormGroup.php
@@ -205,7 +205,6 @@ public static function syncWithFormFields(FormGroup $group, $fields_array)
                     ->first();
 
 
-
                 if(isset($field['type']) && isset($field['type']['slug']) )
                 {
                     $type = FieldType::where('slug', $field['type']['slug'])->first();
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index df90508..85b1165 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,6 +28,8 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
+    await store.watchFields();
+
 });
 
 //--------toggle item menu
@@ -70,6 +72,7 @@ const toggleItemMenu = (event) => {
                                              data-testid="contetntypes-is_repeatable"/>
                                 <p class="ml-1 mr-3 text-xs font-semibold">Is Repeatable</p>
                                 <Button icon="pi pi-hashtag"
+                                        :label="item.id"
                                         @click="store.getCopy(item.slug)"
                                         data-testid="contetntypes-copy_slug"
                                         class="p-button-sm"/>
@@ -92,9 +95,12 @@ const toggleItemMenu = (event) => {
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"
+                                                   @input="store.groupsFieldsSlug(element)"
                                                    data-testid="contenttype-group_field_name"
                                                    placeholder="Field Name"/>
                                         <Button icon="pi pi-hashtag p-button-sm"
+                                                :label="element.id"
+                                                :disabled="!element.id"
                                                 @click="store.getCopy(element.slug)"
                                                 data-testid="contenttype-group_field_slug"/>
                                         <Button icon="pi pi-cog p-button-sm"
@@ -108,99 +114,78 @@ const toggleItemMenu = (event) => {
                                         <div class="p-datatable p-component p-datatable-responsive-stack
                                             p-datatable-striped p-datatable-sm"
                                              data-scrollselectors=".p-datatable-wrapper" pv_id_6="">
-                                            <!----><!----><!----><!----><!---->
                                             <div class="p-datatable-wrapper">
                                                 <table role="table" class="p-datatable-table">
-                                                    <thead class="p-datatable-thead" role="rowgroup">
-                                                    <tr role="row">
-                                                        <th class="" role="cell"><!---->
-                                                            <div class="p-column-header-content"><!----><!---->
-                                                                <!----><!----><!----><!----></div>
-                                                        </th>
-                                                        <th class="" role="cell"><!---->
-                                                            <div class="p-column-header-content"><!----><!---->
-                                                                <!----><!----><!----><!----></div>
-                                                        </th>
-                                                    </tr><!----></thead><!---->
-                                                    <tbody class="p-datatable-tbody" role="rowgroup"><!---->
-                                                    <tr class="" role="row" draggable="false">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is repeatable
+
+                                                    <tr v-if="!store.assets.non_repeatable_fields.includes(element.type.slug)">
+                                                        <td >
+                                                            Is repeatable
+                                                        </td>
+                                                        <td>
+                                                            <InputSwitch v-model="element.is_repeatable"
+                                                                         v-bind:false-value="0"
+                                                                         v-bind:true-value="1"
+                                                                         data-testid="contenttype-group_field_repeatable"/>
+
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Is searchable
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>
-                                                            <div class="p-inputswitch p-component">
-                                                                <div class="p-hidden-accessible"><input
-                                                                    type="checkbox" role="switch" class=""
-                                                                    aria-checked="false"></div>
-                                                                <span class="p-inputswitch-slider"></span></div>
-                                                            <!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if-->
+                                                        <td>
+                                                            <InputSwitch v-bind:false-value="0"
+                                                                         v-bind:true-value="1"
+                                                                         data-testid="contenttype-group_field_searchable"
+                                                                         v-model="element.is_searchable"/>
+
                                                         </td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is Searchable
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Excerpt
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if-->
-                                                            <div class="p-inputswitch p-component">
-                                                                <div class="p-hidden-accessible"><input
-                                                                    type="checkbox" role="switch" class=""
-                                                                    aria-checked="false"></div>
-                                                                <span class="p-inputswitch-slider"></span></div>
-                                                            <!--v-if--><!--v-if--><!--v-if--><!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Excerpt
+                                                        <td>
+                                                            <Textarea data-testid="contenttype-group_field_excerpt"
+                                                                      v-model="element.excerpt"
+                                                                      class="w-full"/>
+
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if-->
-                                                            <!--v-if--><textarea
-                                                                class="p-inputtextarea p-inputtext p-component w-full"></textarea>
-                                                            <!--v-if--><!--v-if--><!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Opening Tag
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Opening tag
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><input
-                                                                class="p-inputtext p-component w-full"><!--v-if-->
-                                                            <!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Closing Tag
+                                                        <td>
+                                                            <InputText data-testid="contenttype-group_field_opening_tag"
+                                                                       v-model="element.container_opening_tag"
+                                                                       class="w-full"/>
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><!--v-if--><input
-                                                                class="p-inputtext p-component w-full"><!--v-if-->
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td >
+                                                            Closing tag
                                                         </td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is Hidden
+                                                        <td>
+                                                            <InputText data-testid="contenttype-group_field_closing_tag"
+                                                                       v-model="element.container_closing_tag"
+                                                                       class="w-full"/>
+                                                        </td>
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td >
+                                                            Is hidden
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><!--v-if--><!--v-if-->
-                                                            <div>
-                                                                <div class="p-checkbox p-component" id="hidden">
-                                                                    <div class="p-hidden-accessible"><input
-                                                                        type="checkbox" class=""></div>
-                                                                    <div class="p-checkbox-box"><span
-                                                                        class="p-checkbox-icon"></span></div>
-                                                                </div>
-                                                                <label for="hidden"
-                                                                       class="font-semibold text-xs ml-1">Is
-                                                                    Hidden</label></div>
+                                                        <td>
+                                                            <Checkbox id="hidden"
+                                                                      data-testid="contenttype-group_field_hidden"
+                                                                      v-model="element.display_column"/>
                                                         </td>
-                                                    </tr><!----><!----></tbody><!----></table>
-                                            </div><!----><!---->
-                                            <div class="p-column-resizer-helper" style="display: none;"></div>
+                                                    </tr>
+                                                </table>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index 6fde804..c90e7c2 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -197,6 +197,7 @@ export const useContentTypeStore = defineStore({
                     },{deep: true}
                 );
             }
+
         },
         //---------------------------------------------------------------------
         async getAssets() {
@@ -1046,6 +1047,11 @@ export const useContentTypeStore = defineStore({
             return item;
         },
         //---------------------------------------------------------------------
+        groupsFieldsSlug(item){
+            console.log(item.name);
+            item.slug = vaah().strToSlug(item.name);
+        },
+        //---------------------------------------------------------------------
     }
 });
 

From 990f943675a254670c56bcf85c8b00e7e4d74a90 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 16:36:04 +0530
Subject: [PATCH 08/24] Updated: content remove issue fixed

---
 Vue/pages/contenttypes/Contentstructure.vue | 1 -
 Vue/stores/store-contenttypes.js            | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 85b1165..9761cb1 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,7 +28,6 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
-    await store.watchFields();
 
 });
 
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index c90e7c2..3cd07c1 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -998,7 +998,8 @@ export const useContentTypeStore = defineStore({
         },
         //---------------------------------------------------------------------
         removeField(idx,i) {
-            this.item.groups[i].content_types.splice(idx, 1);
+            this.item.groups[i].fields.splice(idx, 1);
+            vaah().toastErrors(['Removed']);
         },
         //---------------------------------------------------------------------
         getCopy(value)

From 6a1829a5d581ad7909ef09911956274232ae135a Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 19:16:33 +0530
Subject: [PATCH 09/24] Updated: research on group.fields.meta

Updated: research on meta value error
---
 Vue/pages/contenttypes/Contentstructure.vue | 96 ++++++++++++++-------
 Vue/stores/store-contenttypes.js            |  3 +-
 2 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 9761cb1..16cb26d 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -2,7 +2,6 @@
 import {onMounted, ref, watch} from "vue";
 import {useRoute} from 'vue-router';
 import draggable from 'vuedraggable'
-
 import { useContentTypeStore } from '../../stores/store-contenttypes'
 
 import VhViewRow from '../../vaahvue/vue-three/primeflex/VhViewRow.vue';
@@ -151,38 +150,73 @@ const toggleItemMenu = (event) => {
 
                                                         </td>
                                                     </tr>
-                                                    <tr>
-                                                        <td >
-                                                            Opening tag
-                                                        </td>
-                                                        <td>
-                                                            <InputText data-testid="contenttype-group_field_opening_tag"
-                                                                       v-model="element.container_opening_tag"
-                                                                       class="w-full"/>
-                                                        </td>
-                                                    </tr>
+<!--                                                    <tr>-->
+<!--                                                        <td >-->
+<!--                                                            Opening tag-->
+<!--                                                        </td>-->
+<!--                                                        <td>-->
+<!--                                                            <InputText data-testid="contenttype-group_field_opening_tag"-->
+<!--                                                                       v-model="element.container_opening_tag"-->
+<!--                                                                       class="w-full"/>-->
+<!--                                                        </td>-->
+<!--                                                    </tr>-->
+<!--                                                    <tr>-->
+<!--                                                        <td >-->
+<!--                                                            Closing tag-->
+<!--                                                        </td>-->
+<!--                                                        <td>-->
+<!--                                                            <InputText data-testid="contenttype-group_field_closing_tag"-->
+<!--                                                                       v-model="element.container_closing_tag"-->
+<!--                                                                       class="w-full"/>-->
+<!--                                                        </td>-->
+<!--                                                    </tr>-->
+<!--                                                    <tr>-->
+<!--                                                        <td >-->
+<!--                                                            Is hidden-->
+<!--                                                        </td>-->
+<!--                                                        <td>-->
+<!--                                                            <Checkbox id="hidden"-->
+<!--                                                                      data-testid="contenttype-group_field_hidden"-->
+<!--                                                                      v-model="element.display_column"/>-->
+<!--                                                        </td>-->
+<!--                                                    </tr>-->
 
-                                                    <tr>
-                                                        <td >
-                                                            Closing tag
-                                                        </td>
-                                                        <td>
-                                                            <InputText data-testid="contenttype-group_field_closing_tag"
-                                                                       v-model="element.container_closing_tag"
-                                                                       class="w-full"/>
-                                                        </td>
-                                                    </tr>
+                                                    <div v-if="element.meta">
+                                                        <tr v-for="(meta_item, meta_index) in element.meta"
+                                                            v-if="(meta_index !== 'container_opening_tag'
+                                                                    && meta_index !== 'container_closing_tag')
+                                                                    || store.assets.non_repeatable_fields.includes(element.type.slug)
+                                                                    || element.is_repeatable">
+                                                            <td v-if="meta_index !== 'filter_id'
+                                                                && meta_index !== 'display_column'
+                                                                && meta_index !== 'options'"
+                                                                v-html="vaah().toLabel(meta_index)"></td>
+                                                            <td v-if="meta_index !== 'filter_id'
+                                                                && meta_index !== 'display_column'
+                                                                && meta_index !== 'options'">
+                                                                <div v-if="meta_index.includes('is_')">
+                                                                    <Checkbox :id="meta_index"
+                                                                              :data-testid="'contenttype-group_field_meta_'+meta_index"
+                                                                              v-model="element.meta[meta_index]"/>
+                                                                    <label :for="meta_index" class="ml-2"> {{meta_index}} </label>
+                                                                </div>
 
-                                                    <tr>
-                                                        <td >
-                                                            Is hidden
-                                                        </td>
-                                                        <td>
-                                                            <Checkbox id="hidden"
-                                                                      data-testid="contenttype-group_field_hidden"
-                                                                      v-model="element.display_column"/>
-                                                        </td>
-                                                    </tr>
+                                                                <div v-else-if="meta_index === 'option'">
+                                                                    <tag
+                                                                        :value="element.meta[meta_index]"
+                                                                        rounded>
+                                                                    </tag>
+                                                                </div>
+
+                                                                <div v-else>
+                                                                    <InputText :data-testid="'contenttype-group_'+ meta[meta_index]"
+                                                                               v-model="element.meta[meta_index]"
+                                                                               class="w-full"/>
+                                                                </div>
+                                                            </td>
+
+                                                        </tr>
+                                                    </div>
                                                 </table>
                                             </div>
                                         </div>
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index 3cd07c1..79bc316 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -985,8 +985,9 @@ export const useContentTypeStore = defineStore({
             }
         },
         //---------------------------------------------------------------------
-        toContentStructure(item) {
+        async toContentStructure(item) {
             this.item = vaah().clone(item);
+            await this.getContentStrucutre(this.item.id);
             this.$router.push({name: 'contenttypes.contentstructure', params: {id: item.id}});
 
         },

From 3762758ba1949bd7421533ae4a3d5c0eecb2ffb2 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Thu, 16 Mar 2023 19:27:03 +0530
Subject: [PATCH 10/24] Updated: trying to fix content-types blade.php issue

---
 Resources/views/backend/pages/app.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/views/backend/pages/app.blade.php b/Resources/views/backend/pages/app.blade.php
index fd9435f..6246a06 100644
--- a/Resources/views/backend/pages/app.blade.php
+++ b/Resources/views/backend/pages/app.blade.php
@@ -15,14 +15,14 @@
     @if(env('MODULE_CMS_ENV') == 'develop')
         <script type="module" src="http://localhost:8367/Vue/main.js"></script>
     @else
-        <script type="module" src="{{vh_module_assets_url("Cms", "build/index.js")}}"></script>
+        <script type="module" src="{{vh_module_assets_url("Cms", "build/main.js")}}"></script>
     @endif
 
 @endsection
 
 @section('content')
 
-    <div id="appCms" class="bulma">
+    <div id="cmsApp" class="bulma">
 
         <section class="section has-padding-25">
             <router-view></router-view>

From 377d9382620a3f538f4d20d36603aaed5300c1d0 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 10:37:17 +0530
Subject: [PATCH 11/24] Updated: Cms Module issue resolved

---
 Resources/views/backend/pages/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/views/backend/pages/app.blade.php b/Resources/views/backend/pages/app.blade.php
index 6246a06..e76c24a 100644
--- a/Resources/views/backend/pages/app.blade.php
+++ b/Resources/views/backend/pages/app.blade.php
@@ -22,7 +22,7 @@
 
 @section('content')
 
-    <div id="cmsApp" class="bulma">
+    <div id="appCms" class="bulma">
 
         <section class="section has-padding-25">
             <router-view></router-view>

From 470843a6a8aa26adae21194a1f204788d7ed6621 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 11:29:36 +0530
Subject: [PATCH 12/24] Updated: UI issue fixed in content structure

---
 Vue/pages/contenttypes/Contentstructure.vue   |  4 ++--
 Vue/pages/contenttypes/components/Actions.vue |  2 ++
 Vue/pages/contenttypes/components/Table.vue   | 11 +++++++----
 Vue/stores/store-contenttypes.js              |  9 +++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index e863f37..df90508 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -220,8 +220,8 @@ const toggleItemMenu = (event) => {
             </template>
         </Card>
     </div>
-    <div class="col-2" >
-        <Card>
+    <div class="col-3" >
+        <Card style="height:570px; overflow-y: auto">
             <template #header>
                 <h2 class="font-semibold text-lg">Content Fields</h2>
             </template>
diff --git a/Vue/pages/contenttypes/components/Actions.vue b/Vue/pages/contenttypes/components/Actions.vue
index 648a99b..32912a1 100644
--- a/Vue/pages/contenttypes/components/Actions.vue
+++ b/Vue/pages/contenttypes/components/Actions.vue
@@ -90,6 +90,7 @@ const toggleBulkMenuState = (event) => {
                                     icon="pi pi-search"/>
                             <Button
                                 type="button"
+                                v-if="store.isContentStructure()"
                                 class="p-button-sm"
                                 data-testid="contenttypes-actions-show-filters"
                                 @click="store.show_filters = true">
@@ -99,6 +100,7 @@ const toggleBulkMenuState = (event) => {
 
                             <Button
                                 type="button"
+                                v-if="store.isContentStructure()"
                                 icon="pi pi-filter-slash"
                                 data-testid="contenttypes-actions-reset-filters"
                                 class="p-button-sm"
diff --git a/Vue/pages/contenttypes/components/Table.vue b/Vue/pages/contenttypes/components/Table.vue
index 37ad042..72ffc50 100644
--- a/Vue/pages/contenttypes/components/Table.vue
+++ b/Vue/pages/contenttypes/components/Table.vue
@@ -18,11 +18,11 @@ const useVaah = vaah();
                    stripedRows
                    responsiveLayout="scroll">
              <Column selectionMode="multiple"
-                    v-if="store.isViewLarge()"
+                    v-if="store.isContentStructure()"
                     headerStyle="width: 3em">
             </Column>
 
-            <Column field="id" header="ID" :style="{width: '90px'}" :sortable="true">
+            <Column field="id" v-if="store.isContentStructure()" header="ID" :style="{width: '90px'}" :sortable="true">
             </Column>
 
             <Column field="name" header="Name"
@@ -38,6 +38,7 @@ const useVaah = vaah();
             </Column>
 
              <Column field="plural" header="Plural"
+                     v-if="store.isContentStructure()"
                      :sortable="true">
 
                  <template #body="prop">
@@ -50,6 +51,7 @@ const useVaah = vaah();
              </Column>
 
              <Column field="singular" header="Singular"
+                     v-if="store.isContentStructure()"
                      :sortable="true">
 
                  <template #body="prop">
@@ -63,7 +65,7 @@ const useVaah = vaah();
 
 
              <Column field="updated_at" header="Updated"
-                     v-if="store.isViewLarge()"
+                     v-if="store.isContentStructure()"
                      style="width:90px;"
                      :sortable="true">
                  <template #body="prop">
@@ -71,7 +73,7 @@ const useVaah = vaah();
                  </template>
              </Column>
 
-            <Column field="is_published" v-if="store.isViewLarge()"
+            <Column field="is_published" v-if="store.isContentStructure()"
                     :sortable="true"
                     style="width:150px;"
                     header="Is Published">
@@ -106,6 +108,7 @@ const useVaah = vaah();
                                 icon="pi pi-eye" />
 
                         <Button class="p-button-tiny p-button-text"
+                                v-if="store.isContentStructure()"
                                 data-testid="contenttypes-table-to-edit"
                                 v-tooltip.top="'Update'"
                                 @click="store.toEdit(prop.data)"
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index bdaa1d5..6fde804 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -111,8 +111,8 @@ export const useContentTypeStore = defineStore({
                     this.list_view_width = 12;
                     break;
                 case 'contenttypes.contentstructure':
-                    this.view = 'large';
-                    this.list_view_width = 4;
+                    this.view = 'content structure';
+                    this.list_view_width = 3;
                     break;
                 default:
                     this.view = 'small';
@@ -706,6 +706,11 @@ export const useContentTypeStore = defineStore({
             return this.view === 'large';
         },
         //---------------------------------------------------------------------
+        isContentStructure()
+        {
+            return this.view !== 'content structure';
+        },
+        //---------------------------------------------------------------------
         getIdWidth()
         {
             let width = 50;

From 2e9113412e7c6937d52dc7a5c1baf0c7328bd981 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 13:03:07 +0530
Subject: [PATCH 13/24] Updated: research on content structure data save issue

---
 Models/ContentTypeBase.php                  | 2 +-
 Vue/pages/contenttypes/Contentstructure.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Models/ContentTypeBase.php b/Models/ContentTypeBase.php
index 3e4d801..a276fe3 100644
--- a/Models/ContentTypeBase.php
+++ b/Models/ContentTypeBase.php
@@ -331,7 +331,7 @@ public static function getItemWithRelations($id)
                 }])
             ->withTrashed()
             ->first();
-
+        dd($item);
         $response['status'] = 'success';
         $response['data'] = $item;
 
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index df90508..9e1137a 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -89,6 +89,7 @@ const toggleItemMenu = (event) => {
                             <template #item="{element,index}">
                                 <div>
                                     <div class="p-inputgroup mb-3">
+                                        {{element}}
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"

From 09eea9b7903385b363497b5c70a73c61ee639a2c Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 15:32:10 +0530
Subject: [PATCH 14/24] Updated: Drag & drop issue resolved

---
 Models/ContentTypeBase.php                  |   1 -
 Vue/pages/contenttypes/Contentstructure.vue | 145 +++++++++-----------
 Vue/stores/store-contenttypes.js            |  24 ++++
 3 files changed, 86 insertions(+), 84 deletions(-)

diff --git a/Models/ContentTypeBase.php b/Models/ContentTypeBase.php
index a276fe3..1342862 100644
--- a/Models/ContentTypeBase.php
+++ b/Models/ContentTypeBase.php
@@ -331,7 +331,6 @@ public static function getItemWithRelations($id)
                 }])
             ->withTrashed()
             ->first();
-        dd($item);
         $response['status'] = 'success';
         $response['data'] = $item;
 
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 9e1137a..a15a674 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,6 +28,7 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
+
 });
 
 //--------toggle item menu
@@ -89,7 +90,6 @@ const toggleItemMenu = (event) => {
                             <template #item="{element,index}">
                                 <div>
                                     <div class="p-inputgroup mb-3">
-                                        {{element}}
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"
@@ -109,99 +109,78 @@ const toggleItemMenu = (event) => {
                                         <div class="p-datatable p-component p-datatable-responsive-stack
                                             p-datatable-striped p-datatable-sm"
                                              data-scrollselectors=".p-datatable-wrapper" pv_id_6="">
-                                            <!----><!----><!----><!----><!---->
                                             <div class="p-datatable-wrapper">
                                                 <table role="table" class="p-datatable-table">
-                                                    <thead class="p-datatable-thead" role="rowgroup">
-                                                    <tr role="row">
-                                                        <th class="" role="cell"><!---->
-                                                            <div class="p-column-header-content"><!----><!---->
-                                                                <!----><!----><!----><!----></div>
-                                                        </th>
-                                                        <th class="" role="cell"><!---->
-                                                            <div class="p-column-header-content"><!----><!---->
-                                                                <!----><!----><!----><!----></div>
-                                                        </th>
-                                                    </tr><!----></thead><!---->
-                                                    <tbody class="p-datatable-tbody" role="rowgroup"><!---->
-                                                    <tr class="" role="row" draggable="false">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is repeatable
+
+                                                    <tr v-if="!store.assets.non_repeatable_fields.includes(element.type.slug)">
+                                                        <td >
+                                                            Is repeatable
+                                                        </td>
+                                                        <td>
+                                                            <InputSwitch v-model="element.is_repeatable"
+                                                                         v-bind:false-value="0"
+                                                                         v-bind:true-value="1"
+                                                                         data-testid="contenttype-group_field_repeatable"/>
+
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Is searchable
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>
-                                                            <div class="p-inputswitch p-component">
-                                                                <div class="p-hidden-accessible"><input
-                                                                    type="checkbox" role="switch" class=""
-                                                                    aria-checked="false"></div>
-                                                                <span class="p-inputswitch-slider"></span></div>
-                                                            <!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if-->
+                                                        <td>
+                                                            <InputSwitch v-bind:false-value="0"
+                                                                         v-bind:true-value="1"
+                                                                         data-testid="contenttype-group_field_searchable"
+                                                                         v-model="element.is_searchable"/>
+
                                                         </td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is Searchable
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Excerpt
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if-->
-                                                            <div class="p-inputswitch p-component">
-                                                                <div class="p-hidden-accessible"><input
-                                                                    type="checkbox" role="switch" class=""
-                                                                    aria-checked="false"></div>
-                                                                <span class="p-inputswitch-slider"></span></div>
-                                                            <!--v-if--><!--v-if--><!--v-if--><!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Excerpt
+                                                        <td>
+                                                            <Textarea data-testid="contenttype-group_field_excerpt"
+                                                                      v-model="element.excerpt"
+                                                                      class="w-full"/>
+
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if-->
-                                                            <!--v-if--><textarea
-                                                                class="p-inputtextarea p-inputtext p-component w-full"></textarea>
-                                                            <!--v-if--><!--v-if--><!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Opening Tag
+                                                    </tr>
+                                                    <tr>
+                                                        <td >
+                                                            Opening tag
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><input
-                                                                class="p-inputtext p-component w-full"><!--v-if-->
-                                                            <!--v-if--></td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Closing Tag
+                                                        <td>
+                                                            <InputText data-testid="contenttype-group_field_opening_tag"
+                                                                       v-model="element.container_opening_tag"
+                                                                       class="w-full"/>
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><!--v-if--><input
-                                                                class="p-inputtext p-component w-full"><!--v-if-->
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td >
+                                                            Closing tag
                                                         </td>
-                                                    </tr><!----><!----><!---->
-                                                    <tr class="" role="row">
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span>Is Hidden
+                                                        <td>
+                                                            <InputText data-testid="contenttype-group_field_closing_tag"
+                                                                       v-model="element.container_closing_tag"
+                                                                       class="w-full"/>
+                                                        </td>
+                                                    </tr>
+
+                                                    <tr>
+                                                        <td >
+                                                            Is hidden
                                                         </td>
-                                                        <td class="" role="cell"><span
-                                                            class="p-column-title"></span><!--v-if--><!--v-if-->
-                                                            <!--v-if--><!--v-if--><!--v-if-->
-                                                            <div>
-                                                                <div class="p-checkbox p-component" id="hidden">
-                                                                    <div class="p-hidden-accessible"><input
-                                                                        type="checkbox" class=""></div>
-                                                                    <div class="p-checkbox-box"><span
-                                                                        class="p-checkbox-icon"></span></div>
-                                                                </div>
-                                                                <label for="hidden"
-                                                                       class="font-semibold text-xs ml-1">Is
-                                                                    Hidden</label></div>
+                                                        <td>
+                                                            <Checkbox id="hidden"
+                                                                      data-testid="contenttype-group_field_hidden"
+                                                                      v-model="element.display_column"/>
                                                         </td>
-                                                    </tr><!----><!----></tbody><!----></table>
-                                            </div><!----><!---->
-                                            <div class="p-column-resizer-helper" style="display: none;"></div>
+                                                    </tr>
+                                                </table>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index 6fde804..edc74a8 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -197,6 +197,30 @@ export const useContentTypeStore = defineStore({
                     },{deep: true}
                 );
             }
+            if(this.item.fields){
+                watch(() => this.item.fields.name, (newVal,oldVal) =>
+                    {
+                        if(newVal && newVal !== "")
+                        {
+                            this.item.fields.slug = vaah().strToSlug(newVal);
+                        }
+                    },{deep: true}
+                )
+            }
+        },
+        //---------------------------------------------------------------------
+        watchFields(){
+            console.log('sdf');
+            if(this.item.fields){
+                watch(() => this.item.fields.name, (newVal,oldVal) =>
+                    {
+                        if(newVal && newVal !== "")
+                        {
+                            this.item.fields.slug = vaah().strToSlug(newVal);
+                        }
+                    },{deep: true}
+                )
+            }
         },
         //---------------------------------------------------------------------
         async getAssets() {

From 69f7415d7116e23a8a33bbdb86c87256bfc7b8c0 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 16:15:13 +0530
Subject: [PATCH 15/24] Updated: content save issue fixed

---
 Models/FieldType.php                        | 111 ++++++++++++++++++++
 Models/FormGroup.php                        |   1 -
 Vue/pages/contenttypes/Contentstructure.vue |   5 +
 Vue/stores/store-contenttypes.js            |  30 ++----
 4 files changed, 122 insertions(+), 25 deletions(-)
 create mode 100644 Models/FieldType.php

diff --git a/Models/FieldType.php b/Models/FieldType.php
new file mode 100644
index 0000000..cc6a5b5
--- /dev/null
+++ b/Models/FieldType.php
@@ -0,0 +1,111 @@
+<?php namespace VaahCms\Modules\Cms\Models;
+
+use DateTimeInterface;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use WebReinvent\VaahCms\Models\User;
+use WebReinvent\VaahCms\Traits\CrudWithUuidObservantTrait;
+
+class FieldType extends Model {
+
+    use SoftDeletes;
+    use CrudWithUuidObservantTrait;
+
+    //-------------------------------------------------
+    protected $table = 'vh_cms_field_types';
+    //-------------------------------------------------
+    protected $dates = [
+        'created_at',
+        'updated_at',
+        'deleted_at'
+    ];
+    //-------------------------------------------------
+    protected $dateFormat = 'Y-m-d H:i:s';
+    //-------------------------------------------------
+    protected $fillable = [
+        'name',
+        'slug',
+        'excerpt',
+        'meta',
+        'created_by',
+        'updated_by',
+        'deleted_by'
+    ];
+
+    //-------------------------------------------------
+    protected $appends  = [
+    ];
+
+    //-------------------------------------------------
+
+
+
+    //-------------------------------------------------
+    protected function serializeDate(DateTimeInterface $date)
+    {
+        $date_time_format = config('settings.global.datetime_format');
+
+        return $date->format($date_time_format);
+
+    }
+    //-------------------------------------------------
+    //-------------------------------------------------
+    public function setMetaAttribute($value)
+    {
+        if($value)
+        {
+            $this->attributes['meta'] = json_encode($value);
+        } else{
+            $this->attributes['meta'] = null;
+        }
+    }
+    //-------------------------------------------------
+    public function getMetaAttribute($value)
+    {
+        if($value)
+        {
+            return json_decode($value);
+        }
+        return null;
+    }
+    //-------------------------------------------------
+    public function getTableColumns() {
+        return $this->getConnection()->getSchemaBuilder()
+            ->getColumnListing($this->getTable());
+    }
+    //-------------------------------------------------
+    public function scopeExclude($query, $columns)
+    {
+        return $query->select( array_diff( $this->getTableColumns(),$columns) );
+    }
+    //-------------------------------------------------
+    public function scopeIsPublished($query)
+    {
+        return $query->where( 'is_published', 1 );
+    }
+    //-------------------------------------------------
+    public function createdByUser()
+    {
+        return $this->belongsTo(User::class,
+            'created_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+
+    //-------------------------------------------------
+    public function updatedByUser()
+    {
+        return $this->belongsTo(User::class,
+            'updated_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+    //-------------------------------------------------
+    public function deletedByUser()
+    {
+        return $this->belongsTo(User::class,
+            'deleted_by', 'id'
+        )->select('id', 'uuid', 'first_name', 'last_name', 'email');
+    }
+    //-------------------------------------------------
+    //-------------------------------------------------
+
+}
diff --git a/Models/FormGroup.php b/Models/FormGroup.php
index 2aeb177..91053e7 100644
--- a/Models/FormGroup.php
+++ b/Models/FormGroup.php
@@ -205,7 +205,6 @@ public static function syncWithFormFields(FormGroup $group, $fields_array)
                     ->first();
 
 
-
                 if(isset($field['type']) && isset($field['type']['slug']) )
                 {
                     $type = FieldType::where('slug', $field['type']['slug'])->first();
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index a15a674..85b1165 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,6 +28,7 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
+    await store.watchFields();
 
 });
 
@@ -71,6 +72,7 @@ const toggleItemMenu = (event) => {
                                              data-testid="contetntypes-is_repeatable"/>
                                 <p class="ml-1 mr-3 text-xs font-semibold">Is Repeatable</p>
                                 <Button icon="pi pi-hashtag"
+                                        :label="item.id"
                                         @click="store.getCopy(item.slug)"
                                         data-testid="contetntypes-copy_slug"
                                         class="p-button-sm"/>
@@ -93,9 +95,12 @@ const toggleItemMenu = (event) => {
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"
+                                                   @input="store.groupsFieldsSlug(element)"
                                                    data-testid="contenttype-group_field_name"
                                                    placeholder="Field Name"/>
                                         <Button icon="pi pi-hashtag p-button-sm"
+                                                :label="element.id"
+                                                :disabled="!element.id"
                                                 @click="store.getCopy(element.slug)"
                                                 data-testid="contenttype-group_field_slug"/>
                                         <Button icon="pi pi-cog p-button-sm"
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index edc74a8..c90e7c2 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -197,30 +197,7 @@ export const useContentTypeStore = defineStore({
                     },{deep: true}
                 );
             }
-            if(this.item.fields){
-                watch(() => this.item.fields.name, (newVal,oldVal) =>
-                    {
-                        if(newVal && newVal !== "")
-                        {
-                            this.item.fields.slug = vaah().strToSlug(newVal);
-                        }
-                    },{deep: true}
-                )
-            }
-        },
-        //---------------------------------------------------------------------
-        watchFields(){
-            console.log('sdf');
-            if(this.item.fields){
-                watch(() => this.item.fields.name, (newVal,oldVal) =>
-                    {
-                        if(newVal && newVal !== "")
-                        {
-                            this.item.fields.slug = vaah().strToSlug(newVal);
-                        }
-                    },{deep: true}
-                )
-            }
+
         },
         //---------------------------------------------------------------------
         async getAssets() {
@@ -1070,6 +1047,11 @@ export const useContentTypeStore = defineStore({
             return item;
         },
         //---------------------------------------------------------------------
+        groupsFieldsSlug(item){
+            console.log(item.name);
+            item.slug = vaah().strToSlug(item.name);
+        },
+        //---------------------------------------------------------------------
     }
 });
 

From 74f7434c391c440c1ccc7563b5bab7653d2076c6 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 16:36:04 +0530
Subject: [PATCH 16/24] Updated: content remove issue fixed

---
 Vue/pages/contenttypes/Contentstructure.vue | 1 -
 Vue/stores/store-contenttypes.js            | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 85b1165..9761cb1 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -28,7 +28,6 @@ onMounted(async () => {
         await store.getContentStrucutre(route.params.id);
     // }
 
-    await store.watchFields();
 
 });
 
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index c90e7c2..3cd07c1 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -998,7 +998,8 @@ export const useContentTypeStore = defineStore({
         },
         //---------------------------------------------------------------------
         removeField(idx,i) {
-            this.item.groups[i].content_types.splice(idx, 1);
+            this.item.groups[i].fields.splice(idx, 1);
+            vaah().toastErrors(['Removed']);
         },
         //---------------------------------------------------------------------
         getCopy(value)

From f4d86a8430828df10548b81615f2afa7a8c7aef2 Mon Sep 17 00:00:00 2001
From: we-abinash-s001 <abinash.s001@webreinvent.com>
Date: Fri, 17 Mar 2023 19:16:33 +0530
Subject: [PATCH 17/24] Updated: research on group.fields.meta

Updated: research on meta value error
---
 Vue/pages/contenttypes/Contentstructure.vue | 96 ++++++++++++++-------
 Vue/stores/store-contenttypes.js            |  3 +-
 2 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 9761cb1..16cb26d 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -2,7 +2,6 @@
 import {onMounted, ref, watch} from "vue";
 import {useRoute} from 'vue-router';
 import draggable from 'vuedraggable'
-
 import { useContentTypeStore } from '../../stores/store-contenttypes'
 
 import VhViewRow from '../../vaahvue/vue-three/primeflex/VhViewRow.vue';
@@ -151,38 +150,73 @@ const toggleItemMenu = (event) => {
 
                                                         </td>
                                                     </tr>
-                                                    <tr>
-                                                        <td >
-                                                            Opening tag
-                                                        </td>
-                                                        <td>
-                                                            <InputText data-testid="contenttype-group_field_opening_tag"
-                                                                       v-model="element.container_opening_tag"
-                                                                       class="w-full"/>
-                                                        </td>
-                                                    </tr>
+<!--                                                    <tr>-->
+<!--                                                        <td >-->
+<!--                                                            Opening tag-->
+<!--                                                        </td>-->
+<!--                                                        <td>-->
+<!--                                                            <InputText data-testid="contenttype-group_field_opening_tag"-->
+<!--                                                                       v-model="element.container_opening_tag"-->
+<!--                                                                       class="w-full"/>-->
+<!--                                                        </td>-->
+<!--                                                    </tr>-->
+<!--                                                    <tr>-->
+<!--                                                        <td >-->
+<!--                                                            Closing tag-->
+<!--                                                        </td>-->
+<!--                                                        <td>-->
+<!--                                                            <InputText data-testid="contenttype-group_field_closing_tag"-->
+<!--                                                                       v-model="element.container_closing_tag"-->
+<!--                                                                       class="w-full"/>-->
+<!--                                                        </td>-->
+<!--                                                    </tr>-->
+<!--                                                    <tr>-->
+<!--                                                        <td >-->
+<!--                                                            Is hidden-->
+<!--                                                        </td>-->
+<!--                                                        <td>-->
+<!--                                                            <Checkbox id="hidden"-->
+<!--                                                                      data-testid="contenttype-group_field_hidden"-->
+<!--                                                                      v-model="element.display_column"/>-->
+<!--                                                        </td>-->
+<!--                                                    </tr>-->
 
-                                                    <tr>
-                                                        <td >
-                                                            Closing tag
-                                                        </td>
-                                                        <td>
-                                                            <InputText data-testid="contenttype-group_field_closing_tag"
-                                                                       v-model="element.container_closing_tag"
-                                                                       class="w-full"/>
-                                                        </td>
-                                                    </tr>
+                                                    <div v-if="element.meta">
+                                                        <tr v-for="(meta_item, meta_index) in element.meta"
+                                                            v-if="(meta_index !== 'container_opening_tag'
+                                                                    && meta_index !== 'container_closing_tag')
+                                                                    || store.assets.non_repeatable_fields.includes(element.type.slug)
+                                                                    || element.is_repeatable">
+                                                            <td v-if="meta_index !== 'filter_id'
+                                                                && meta_index !== 'display_column'
+                                                                && meta_index !== 'options'"
+                                                                v-html="vaah().toLabel(meta_index)"></td>
+                                                            <td v-if="meta_index !== 'filter_id'
+                                                                && meta_index !== 'display_column'
+                                                                && meta_index !== 'options'">
+                                                                <div v-if="meta_index.includes('is_')">
+                                                                    <Checkbox :id="meta_index"
+                                                                              :data-testid="'contenttype-group_field_meta_'+meta_index"
+                                                                              v-model="element.meta[meta_index]"/>
+                                                                    <label :for="meta_index" class="ml-2"> {{meta_index}} </label>
+                                                                </div>
 
-                                                    <tr>
-                                                        <td >
-                                                            Is hidden
-                                                        </td>
-                                                        <td>
-                                                            <Checkbox id="hidden"
-                                                                      data-testid="contenttype-group_field_hidden"
-                                                                      v-model="element.display_column"/>
-                                                        </td>
-                                                    </tr>
+                                                                <div v-else-if="meta_index === 'option'">
+                                                                    <tag
+                                                                        :value="element.meta[meta_index]"
+                                                                        rounded>
+                                                                    </tag>
+                                                                </div>
+
+                                                                <div v-else>
+                                                                    <InputText :data-testid="'contenttype-group_'+ meta[meta_index]"
+                                                                               v-model="element.meta[meta_index]"
+                                                                               class="w-full"/>
+                                                                </div>
+                                                            </td>
+
+                                                        </tr>
+                                                    </div>
                                                 </table>
                                             </div>
                                         </div>
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
index 3cd07c1..79bc316 100644
--- a/Vue/stores/store-contenttypes.js
+++ b/Vue/stores/store-contenttypes.js
@@ -985,8 +985,9 @@ export const useContentTypeStore = defineStore({
             }
         },
         //---------------------------------------------------------------------
-        toContentStructure(item) {
+        async toContentStructure(item) {
             this.item = vaah().clone(item);
+            await this.getContentStrucutre(this.item.id);
             this.$router.push({name: 'contenttypes.contentstructure', params: {id: item.id}});
 
         },

From fda84a0a67c7cb3b70c336cf4db719cda85048b9 Mon Sep 17 00:00:00 2001
From: Vikram <vikram.wri231@webreinvent.com>
Date: Sat, 18 Mar 2023 12:58:55 +0530
Subject: [PATCH 18/24] Fixed: structure error

---
 Vue/pages/contenttypes/Contentstructure.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 16cb26d..5642154 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -1,6 +1,7 @@
 <script setup>
 import {onMounted, ref, watch} from "vue";
 import {useRoute} from 'vue-router';
+import {vaah} from '../../vaahvue/pinia/vaah'
 import draggable from 'vuedraggable'
 import { useContentTypeStore } from '../../stores/store-contenttypes'
 
@@ -156,7 +157,7 @@ const toggleItemMenu = (event) => {
 <!--                                                        </td>-->
 <!--                                                        <td>-->
 <!--                                                            <InputText data-testid="contenttype-group_field_opening_tag"-->
-<!--                                                                       v-model="element.container_opening_tag"-->
+    <!--                                                                       v-model="element.container_opening_tag"-->
 <!--                                                                       class="w-full"/>-->
 <!--                                                        </td>-->
 <!--                                                    </tr>-->
@@ -187,7 +188,7 @@ const toggleItemMenu = (event) => {
                                                                     && meta_index !== 'container_closing_tag')
                                                                     || store.assets.non_repeatable_fields.includes(element.type.slug)
                                                                     || element.is_repeatable">
-                                                            <td v-if="meta_index !== 'filter_id'
+<!--                                                            <td v-if="meta_index !== 'filter_id'
                                                                 && meta_index !== 'display_column'
                                                                 && meta_index !== 'options'"
                                                                 v-html="vaah().toLabel(meta_index)"></td>
@@ -213,7 +214,7 @@ const toggleItemMenu = (event) => {
                                                                                v-model="element.meta[meta_index]"
                                                                                class="w-full"/>
                                                                 </div>
-                                                            </td>
+                                                            </td>-->
 
                                                         </tr>
                                                     </div>

From bdbb47ec4ab793629ecd393076bc44138fca8c8a Mon Sep 17 00:00:00 2001
From: Vikram <vikram.wri231@webreinvent.com>
Date: Sat, 18 Mar 2023 16:24:34 +0530
Subject: [PATCH 19/24] Added: menu api

---
 Http/Controllers/Api/MenusController.php | 28 +++++++++++++
 Routes/api.php                           |  2 +
 Routes/api/api-routes-menus.php          | 53 +-----------------------
 3 files changed, 32 insertions(+), 51 deletions(-)
 create mode 100644 Http/Controllers/Api/MenusController.php

diff --git a/Http/Controllers/Api/MenusController.php b/Http/Controllers/Api/MenusController.php
new file mode 100644
index 0000000..67b7003
--- /dev/null
+++ b/Http/Controllers/Api/MenusController.php
@@ -0,0 +1,28 @@
+<?php  namespace VaahCms\Modules\Cms\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Routing\Controller;
+use VaahCms\Modules\Cms\Entities\Content;
+use VaahCms\Modules\Cms\Entities\ContentFormField;
+use VaahCms\Modules\Cms\Entities\ContentTypeBase;
+use WebReinvent\VaahCms\Models\ThemeLocation;
+
+class MenusController extends Controller
+{
+
+    public function __construct()
+    {
+    }
+
+    //----------------------------------------------------------
+    //----------------------------------------------------------
+
+    public static function getList(Request $request, $menu_slug)
+    {
+
+        return ThemeLocation::getLocationData($menu_slug);
+
+    }
+
+}
diff --git a/Routes/api.php b/Routes/api.php
index 2be9861..6a074ea 100644
--- a/Routes/api.php
+++ b/Routes/api.php
@@ -29,3 +29,5 @@ function () {
         Route::any( '/contents/{singular_slug}/{content_slug}', 'ContentsController@getContentItem' );
         //------------------------------------------------
     });
+
+include('api/api-routes-menus.php');
diff --git a/Routes/api/api-routes-menus.php b/Routes/api/api-routes-menus.php
index e7ff350..daa0d20 100644
--- a/Routes/api/api-routes-menus.php
+++ b/Routes/api/api-routes-menus.php
@@ -6,64 +6,15 @@
 Route::group(
     [
         'prefix' => 'cms/menus',
-        'namespace' => 'Backend',
+        'namespace' => 'Api',
     ],
 function () {
-
-    /**
-     * Get Assets
-     */
-    Route::get('/assets', 'MenusController@getAssets')
-        ->name('vh.backend.cms.api.menus.assets');
     /**
      * Get List
      */
-    Route::get('/', 'MenusController@getList')
+    Route::get('/{menu_slug}', 'MenusController@getList')
         ->name('vh.backend.cms.api.menus.list');
-    /**
-     * Update List
-     */
-    Route::match(['put', 'patch'], '/', 'MenusController@updateList')
-        ->name('vh.backend.cms.api.menus.list.update');
-    /**
-     * Delete List
-     */
-    Route::delete('/', 'MenusController@deleteList')
-        ->name('vh.backend.cms.api.menus.list.delete');
-
-
-    /**
-     * Create Item
-     */
-    Route::post('/', 'MenusController@createItem')
-        ->name('vh.backend.cms.api.menus.create');
-    /**
-     * Get Item
-     */
-    Route::get('/{id}', 'MenusController@getItem')
-        ->name('vh.backend.cms.api.menus.read');
-    /**
-     * Update Item
-     */
-    Route::match(['put', 'patch'], '/{id}', 'MenusController@updateItem')
-        ->name('vh.backend.cms.api.menus.update');
-    /**
-     * Delete Item
-     */
-    Route::delete('/{id}', 'MenusController@deleteItem')
-        ->name('vh.backend.cms.api.menus.delete');
 
-    /**
-     * List Actions
-     */
-    Route::any('/action/{action}', 'MenusController@listAction')
-        ->name('vh.backend.cms.api.menus.list.action');
-
-    /**
-     * Item actions
-     */
-    Route::any('/{id}/action/{action}', 'MenusController@itemAction')
-        ->name('vh.backend.cms.api.menus.item.action');
 
 
 

From 2617f618a589e01be06709857199d733543798cb Mon Sep 17 00:00:00 2001
From: Tanmoy Dey <tanmoy.d001@webreinvent.com>
Date: Sat, 18 Mar 2023 19:23:55 +0530
Subject: [PATCH 20/24] Updated: content type structure

---
 Vue/pages/contenttypes/Contentstructure.vue | 133 ++++++++++----------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 5642154..88c5160 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -38,7 +38,12 @@ const toggleItemMenu = (event) => {
 };
 //--------/toggle item menu
 
+const onSelectType = (field,data,group_index,field_index) => {
+    field.meta['filter_id'] = null;
+}
+
 </script>
+
 <template>
     <div class="col-6" >
         <Card>
@@ -68,19 +73,25 @@ const toggleItemMenu = (event) => {
                                 <InputSwitch v-model="item.is_repeatable"
                                              v-bind:false-value="0"
                                              v-bind:true-value="1"
-                                             data-testid="contetntypes-is_repeatable"/>
+                                             data-testid="contetntypes-is_repeatable"
+                                />
+
                                 <p class="ml-1 mr-3 text-xs font-semibold">Is Repeatable</p>
                                 <Button icon="pi pi-hashtag"
                                         :label="item.id"
                                         @click="store.getCopy(item.slug)"
                                         data-testid="contetntypes-copy_slug"
-                                        class="p-button-sm"/>
+                                        class="p-button-sm"
+                                />
+
                                 <Button icon="pi pi-trash"
                                         class="p-button-sm"
                                         data-testid="contetntypes-remove_group"
-                                        @click="store.removeGroup(item,idx)"/>
+                                        @click="store.removeGroup(item,idx)"
+                                />
                             </div>
                         </div>
+
                         <draggable
                             v-model="item.fields"
                             class="dragArea list-group"
@@ -117,107 +128,97 @@ const toggleItemMenu = (event) => {
                                                 <table role="table" class="p-datatable-table">
 
                                                     <tr v-if="!store.assets.non_repeatable_fields.includes(element.type.slug)">
-                                                        <td >
+                                                        <td>
                                                             Is repeatable
                                                         </td>
+
                                                         <td>
                                                             <InputSwitch v-model="element.is_repeatable"
                                                                          v-bind:false-value="0"
                                                                          v-bind:true-value="1"
-                                                                         data-testid="contenttype-group_field_repeatable"/>
-
+                                                                         data-testid="contenttype-group_field_repeatable"
+                                                            />
                                                         </td>
                                                     </tr>
+
                                                     <tr>
-                                                        <td >
+                                                        <td>
                                                             Is searchable
                                                         </td>
+
                                                         <td>
                                                             <InputSwitch v-bind:false-value="0"
                                                                          v-bind:true-value="1"
                                                                          data-testid="contenttype-group_field_searchable"
-                                                                         v-model="element.is_searchable"/>
-
+                                                                         v-model="element.is_searchable"
+                                                            />
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td >
+                                                        <td>
                                                             Excerpt
                                                         </td>
+
                                                         <td>
                                                             <Textarea data-testid="contenttype-group_field_excerpt"
                                                                       v-model="element.excerpt"
-                                                                      class="w-full"/>
-
+                                                                      class="w-full"
+                                                            />
                                                         </td>
                                                     </tr>
-<!--                                                    <tr>-->
-<!--                                                        <td >-->
-<!--                                                            Opening tag-->
-<!--                                                        </td>-->
-<!--                                                        <td>-->
-<!--                                                            <InputText data-testid="contenttype-group_field_opening_tag"-->
-    <!--                                                                       v-model="element.container_opening_tag"-->
-<!--                                                                       class="w-full"/>-->
-<!--                                                        </td>-->
-<!--                                                    </tr>-->
-<!--                                                    <tr>-->
-<!--                                                        <td >-->
-<!--                                                            Closing tag-->
-<!--                                                        </td>-->
-<!--                                                        <td>-->
-<!--                                                            <InputText data-testid="contenttype-group_field_closing_tag"-->
-<!--                                                                       v-model="element.container_closing_tag"-->
-<!--                                                                       class="w-full"/>-->
-<!--                                                        </td>-->
-<!--                                                    </tr>-->
-<!--                                                    <tr>-->
-<!--                                                        <td >-->
-<!--                                                            Is hidden-->
-<!--                                                        </td>-->
-<!--                                                        <td>-->
-<!--                                                            <Checkbox id="hidden"-->
-<!--                                                                      data-testid="contenttype-group_field_hidden"-->
-<!--                                                                      v-model="element.display_column"/>-->
-<!--                                                        </td>-->
-<!--                                                    </tr>-->
 
-                                                    <div v-if="element.meta">
+                                                    <template v-if="element.meta">
                                                         <tr v-for="(meta_item, meta_index) in element.meta"
                                                             v-if="(meta_index !== 'container_opening_tag'
                                                                     && meta_index !== 'container_closing_tag')
                                                                     || store.assets.non_repeatable_fields.includes(element.type.slug)
-                                                                    || element.is_repeatable">
-<!--                                                            <td v-if="meta_index !== 'filter_id'
+                                                                    || field.is_repeatable"
+                                                        >
+                                                            <td v-if="meta_index !== 'filter_id'
                                                                 && meta_index !== 'display_column'
                                                                 && meta_index !== 'options'"
-                                                                v-html="vaah().toLabel(meta_index)"></td>
+                                                            >
+                                                                <span v-html="vaah().toLabel(meta_index)"></span>
+                                                            </td>
+
                                                             <td v-if="meta_index !== 'filter_id'
-                                                                && meta_index !== 'display_column'
-                                                                && meta_index !== 'options'">
-                                                                <div v-if="meta_index.includes('is_')">
+                                                                    && meta_index !== 'display_column'
+                                                                    && meta_index !== 'options'"
+                                                            >
+                                                                <template v-if="meta_index.includes('is_')">
                                                                     <Checkbox :id="meta_index"
-                                                                              :data-testid="'contenttype-group_field_meta_'+meta_index"
-                                                                              v-model="element.meta[meta_index]"/>
-                                                                    <label :for="meta_index" class="ml-2"> {{meta_index}} </label>
-                                                                </div>
+                                                                              :data-testid="'contenttype-group_field_meta_' + meta_index"
+                                                                              v-model="element.meta[meta_index]"
+                                                                              class="mt-2"
+                                                                    />
+
+                                                                    <label :for="meta_index" class="ml-2"> {{ meta_index }} </label>
+                                                                </template>
 
-                                                                <div v-else-if="meta_index === 'option'">
-                                                                    <tag
-                                                                        :value="element.meta[meta_index]"
-                                                                        rounded>
-                                                                    </tag>
-                                                                </div>
+                                                                <template v-else-if="meta_index === 'option'">
+                                                                    <Chips  v-model="element.meta[meta_index]"
+                                                                            placeholder="Add a tag"
+                                                                            aria-close-label="Delete this tag"
+                                                                    />
+                                                                </template>
 
-                                                                <div v-else>
-                                                                    <InputText :data-testid="'contenttype-group_'+ meta[meta_index]"
-                                                                               v-model="element.meta[meta_index]"
-                                                                               class="w-full"/>
-                                                                </div>
-                                                            </td>-->
+                                                                <template v-else-if="meta_index === 'type'">
+                                                                    <Dropdown v-model="selectedCity"
+                                                                              :options="cities"
+                                                                              optionLabel="name"
+                                                                              placeholder="Select a City"
+                                                                              class="w-full md:w-14rem" />
+                                                                </template>
 
+                                                                <template v-else>
+                                                                    <InputText v-model="element.meta[meta_index]"
+                                                                               type="text"
+                                                                               class="mt-2 w-full"
+                                                                    />
+                                                                </template>
+                                                            </td>
                                                         </tr>
-                                                    </div>
+                                                    </template>
                                                 </table>
                                             </div>
                                         </div>

From 5bb0cf190cdc4b6a80e0e678ae250de12ae45564 Mon Sep 17 00:00:00 2001
From: Tanmoy Dey <tanmoy.d001@webreinvent.com>
Date: Mon, 20 Mar 2023 13:27:27 +0530
Subject: [PATCH 21/24] Updated: content sturcture

---
 Http/Controllers/Backend/ExtendController.php |  4 ++--
 Vue/pages/contenttypes/Contentstructure.vue   | 20 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Http/Controllers/Backend/ExtendController.php b/Http/Controllers/Backend/ExtendController.php
index 8fb4408..db18f67 100644
--- a/Http/Controllers/Backend/ExtendController.php
+++ b/Http/Controllers/Backend/ExtendController.php
@@ -4,7 +4,7 @@
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
 use VaahCms\Modules\Cms\Entities\ContentTypeBase;
-use WebReinvent\VaahCms\Entities\TaxonomyType;
+use WebReinvent\VaahCms\Models\TaxonomyType;
 
 class ExtendController extends Controller
 {
@@ -37,7 +37,7 @@ public static function getCmsContentRelations()
         $list = [
             [
                 "name" => "Taxonomy",
-                "namespace" => "WebReinvent\\VaahCms\\Entities\\Taxonomy",
+                "namespace" => "WebReinvent\\VaahCms\\Models\\Taxonomy",
                 "options" => TaxonomyType::getListInTreeFormat(),
                 "filter_by" => 'vh_taxonomy_type_id',
                 "add_url" => route('vh.backend')."#/vaah/manage/taxonomies/create",
diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 88c5160..47e3b62 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -8,6 +8,7 @@ import { useContentTypeStore } from '../../stores/store-contenttypes'
 import VhViewRow from '../../vaahvue/vue-three/primeflex/VhViewRow.vue';
 const store = useContentTypeStore();
 const route = useRoute();
+const useVaah = vaah();
 
 onMounted(async () => {
 
@@ -171,14 +172,14 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                         <tr v-for="(meta_item, meta_index) in element.meta"
                                                             v-if="(meta_index !== 'container_opening_tag'
                                                                     && meta_index !== 'container_closing_tag')
-                                                                    || store.assets.non_repeatable_fields.includes(element.type.slug)
-                                                                    || field.is_repeatable"
+                                                                    || (store && store.assets && store.assets.non_repeatable_fields && store.assets.non_repeatable_fields.includes(element.type.slug))
+                                                                    || element.is_repeatable"
                                                         >
-                                                            <td v-if="meta_index !== 'filter_id'
+                                                            <td v-if="meta_index && meta_index !== 'filter_id'
                                                                 && meta_index !== 'display_column'
                                                                 && meta_index !== 'options'"
                                                             >
-                                                                <span v-html="vaah().toLabel(meta_index)"></span>
+                                                                <span v-html="useVaah.toLabel(meta_index)"> </span>
                                                             </td>
 
                                                             <td v-if="meta_index !== 'filter_id'
@@ -202,12 +203,13 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                                     />
                                                                 </template>
 
-                                                                <template v-else-if="meta_index === 'type'">
-                                                                    <Dropdown v-model="selectedCity"
-                                                                              :options="cities"
+                                                                <template v-else-if="meta_index === 'type' && store && store.assets && store.assets.content_relations">
+                                                                    <Dropdown v-model="element.meta[meta_index]"
+                                                                              :options="store.assets.content_relations"
                                                                               optionLabel="name"
-                                                                              placeholder="Select a City"
-                                                                              class="w-full md:w-14rem" />
+                                                                              placeholder="Select"
+                                                                              class="w-full md:w-14rem"
+                                                                    />
                                                                 </template>
 
                                                                 <template v-else>

From 6e9b4a9b0db114a0e3c57ae05a7a489e70fee73f Mon Sep 17 00:00:00 2001
From: Tanmoy Dey <tanmoy.d001@webreinvent.com>
Date: Mon, 20 Mar 2023 13:36:25 +0530
Subject: [PATCH 22/24] removed: unnecessary condition

---
 Vue/pages/contenttypes/Contentstructure.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 47e3b62..4a1ce6b 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -175,7 +175,7 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                                     || (store && store.assets && store.assets.non_repeatable_fields && store.assets.non_repeatable_fields.includes(element.type.slug))
                                                                     || element.is_repeatable"
                                                         >
-                                                            <td v-if="meta_index && meta_index !== 'filter_id'
+                                                            <td v-if="meta_index !== 'filter_id'
                                                                 && meta_index !== 'display_column'
                                                                 && meta_index !== 'options'"
                                                             >

From 28820eb5bfb722a500d45b1ba1b15095eb79988f Mon Sep 17 00:00:00 2001
From: Tanmoy Dey <tanmoy.d001@webreinvent.com>
Date: Tue, 21 Mar 2023 19:16:20 +0530
Subject: [PATCH 23/24] Updated: improve UI and conditional rendering of input
 fields

---
 Vue/pages/contenttypes/Contentstructure.vue | 25 +++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Vue/pages/contenttypes/Contentstructure.vue b/Vue/pages/contenttypes/Contentstructure.vue
index 4a1ce6b..f4d40d5 100644
--- a/Vue/pages/contenttypes/Contentstructure.vue
+++ b/Vue/pages/contenttypes/Contentstructure.vue
@@ -102,7 +102,7 @@ const onSelectType = (field,data,group_index,field_index) => {
                             item-key="id">
                             <template #item="{element,index}">
                                 <div>
-                                    <div class="p-inputgroup mb-3">
+                                    <div class="p-inputgroup my-3">
                                         <InputText class="w-2" :model-value="element.type.name" disabled/>
                                         <InputText class="w-6"
                                                    v-model="element.name"
@@ -126,7 +126,7 @@ const onSelectType = (field,data,group_index,field_index) => {
                                             p-datatable-striped p-datatable-sm"
                                              data-scrollselectors=".p-datatable-wrapper" pv_id_6="">
                                             <div class="p-datatable-wrapper">
-                                                <table role="table" class="p-datatable-table">
+                                                <table role="table" class="p-datatable-table p-component p-datatable-striped">
 
                                                     <tr v-if="!store.assets.non_repeatable_fields.includes(element.type.slug)">
                                                         <td>
@@ -152,6 +152,7 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                                          v-bind:true-value="1"
                                                                          data-testid="contenttype-group_field_searchable"
                                                                          v-model="element.is_searchable"
+                                                                         class="mt-2"
                                                             />
                                                         </td>
                                                     </tr>
@@ -179,7 +180,7 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                                 && meta_index !== 'display_column'
                                                                 && meta_index !== 'options'"
                                                             >
-                                                                <span v-html="useVaah.toLabel(meta_index)"> </span>
+                                                                <span class="mt-3" v-html="useVaah.toLabel(meta_index)"></span>
                                                             </td>
 
                                                             <td v-if="meta_index !== 'filter_id'
@@ -190,32 +191,38 @@ const onSelectType = (field,data,group_index,field_index) => {
                                                                     <Checkbox :id="meta_index"
                                                                               :data-testid="'contenttype-group_field_meta_' + meta_index"
                                                                               v-model="element.meta[meta_index]"
-                                                                              class="mt-2"
+                                                                              :inputId="meta_index"
+                                                                              class="mt-3"
+                                                                              :binary="true"
                                                                     />
 
-                                                                    <label :for="meta_index" class="ml-2"> {{ meta_index }} </label>
+                                                                    <label :for="meta_index" class="mt-4 ml-2">
+                                                                        {{ useVaah.toLabel(meta_index) }}
+                                                                    </label>
                                                                 </template>
 
                                                                 <template v-else-if="meta_index === 'option'">
                                                                     <Chips  v-model="element.meta[meta_index]"
                                                                             placeholder="Add a tag"
-                                                                            aria-close-label="Delete this tag"
+                                                                            aria-close-label="Delete this option"
+                                                                            class="w-full mt-3"
+                                                                            inputClass="p-inputtext-sm"
                                                                     />
                                                                 </template>
 
-                                                                <template v-else-if="meta_index === 'type' && store && store.assets && store.assets.content_relations">
+                                                                <template v-else-if="meta_index === 'type' && (store && store.assets && store.assets.content_relations)">
                                                                     <Dropdown v-model="element.meta[meta_index]"
                                                                               :options="store.assets.content_relations"
                                                                               optionLabel="name"
                                                                               placeholder="Select"
-                                                                              class="w-full md:w-14rem"
+                                                                              class="w-full md:w-14rem mt-3"
                                                                     />
                                                                 </template>
 
                                                                 <template v-else>
                                                                     <InputText v-model="element.meta[meta_index]"
                                                                                type="text"
-                                                                               class="mt-2 w-full"
+                                                                               class="mt-3 w-full p-inputtext-sm"
                                                                     />
                                                                 </template>
                                                             </td>

From b2264aba5c95720c11dd700f02cb32b770bb9483 Mon Sep 17 00:00:00 2001
From: Tanmoy Dey <tanmoy.d001@webreinvent.com>
Date: Wed, 22 Mar 2023 11:32:31 +0530
Subject: [PATCH 24/24] Updated: trashed badge on table

---
 Vue/pages/contenttypes/components/Table.vue | 113 +++++++++-----------
 1 file changed, 53 insertions(+), 60 deletions(-)

diff --git a/Vue/pages/contenttypes/components/Table.vue b/Vue/pages/contenttypes/components/Table.vue
index 72ffc50..34405f8 100644
--- a/Vue/pages/contenttypes/components/Table.vue
+++ b/Vue/pages/contenttypes/components/Table.vue
@@ -12,114 +12,115 @@ const useVaah = vaah();
     <div v-if="store.list">
         <!--table-->
          <DataTable :value="store.list.data"
-                       dataKey="id"
-                   class="p-datatable-sm"
-                   v-model:selection="store.action.items"
-                   stripedRows
-                   responsiveLayout="scroll">
+                    dataKey="id"
+                    class="p-datatable-sm"
+                    v-model:selection="store.action.items"
+                    stripedRows
+                    responsiveLayout="scroll"
+         >
              <Column selectionMode="multiple"
-                    v-if="store.isContentStructure()"
-                    headerStyle="width: 3em">
-            </Column>
+                     v-if="store.isContentStructure()"
+                     headerStyle="width: 3em"
+             />
 
-            <Column field="id" v-if="store.isContentStructure()" header="ID" :style="{width: '90px'}" :sortable="true">
-            </Column>
+            <Column field="id" v-if="store.isContentStructure()" header="ID" :style="{width: '90px'}" :sortable="true"
+            />
 
             <Column field="name" header="Name"
-                    :sortable="true">
-
+                    :sortable="true"
+            >
                 <template #body="prop">
                     <Badge v-if="prop.data.deleted_at"
                            value="Trashed"
-                           severity="danger"></Badge>
-                    {{prop.data.name}}
+                           severity="danger"
+                    />
+                    {{ prop.data.name }}
                 </template>
-
             </Column>
 
-             <Column field="plural" header="Plural"
+             <Column field="plural"
+                     header="Plural"
                      v-if="store.isContentStructure()"
-                     :sortable="true">
-
+                     :sortable="true"
+             >
                  <template #body="prop">
-                     <Badge v-if="prop.data.deleted_at"
-                            value="Trashed"
-                            severity="danger"></Badge>
-                     {{prop.data.plural}}
+                     {{ prop.data.plural }}
                  </template>
-
              </Column>
 
-             <Column field="singular" header="Singular"
+             <Column field="singular"
+                     header="Singular"
                      v-if="store.isContentStructure()"
-                     :sortable="true">
-
+                     :sortable="true"
+             >
                  <template #body="prop">
-                     <Badge v-if="prop.data.deleted_at"
-                            value="Trashed"
-                            severity="danger"></Badge>
-                     {{prop.data.singular}}
+                     {{ prop.data.singular }}
                  </template>
-
              </Column>
 
 
-             <Column field="updated_at" header="Updated"
+             <Column field="updated_at"
+                     header="Updated"
                      v-if="store.isContentStructure()"
                      style="width:90px;"
-                     :sortable="true">
+                     :sortable="true"
+             >
                  <template #body="prop">
-                     {{useVaah.ago(prop.data.updated_at)}}
+                     {{ useVaah.ago(prop.data.updated_at) }}
                  </template>
              </Column>
 
-            <Column field="is_published" v-if="store.isContentStructure()"
+            <Column field="is_published"
+                    v-if="store.isContentStructure()"
                     :sortable="true"
                     style="width:150px;"
-                    header="Is Published">
-
+                    header="Is Published"
+            >
                 <template #body="prop">
                     <InputSwitch v-model.bool="prop.data.is_published"
                                  data-testid="contenttypes-table-is-active"
                                  v-bind:false-value="0"  v-bind:true-value="1"
                                  class="p-inputswitch-sm"
-                                 @input="store.toggleIsActive(prop.data)">
-                    </InputSwitch>
+                                 @input="store.toggleIsActive(prop.data)"
+                    />
                 </template>
-
             </Column>
 
             <Column field="actions" style="width:150px;"
                     :style="{width: store.getActionWidth() }"
-                    :header="store.getActionLabel()">
-
+                    :header="store.getActionLabel()"
+            >
                 <template #body="prop">
-                    <div class="p-inputgroup ">
-
+                    <div class="p-inputgroup">
                         <Button class="p-button-tiny p-button-text"
                                 data-testid="contenttypes-table-to-view"
                                 v-tooltip.top="'Content Structure'"
                                 @click="store.toContentStructure(prop.data)"
-                                icon="pi pi-align-left" />
+                                icon="pi pi-align-left"
+                        />
+
                         <Button class="p-button-tiny p-button-text"
                                 data-testid="contenttypes-table-to-view"
                                 v-tooltip.top="'View'"
                                 @click="store.toView(prop.data)"
-                                icon="pi pi-eye" />
+                                icon="pi pi-eye"
+                        />
 
                         <Button class="p-button-tiny p-button-text"
                                 v-if="store.isContentStructure()"
                                 data-testid="contenttypes-table-to-edit"
                                 v-tooltip.top="'Update'"
                                 @click="store.toEdit(prop.data)"
-                                icon="pi pi-pencil" />
+                                icon="pi pi-pencil"
+                        />
 
                         <Button class="p-button-tiny p-button-danger p-button-text"
                                 data-testid="contenttypes-table-action-trash"
                                 v-if="store.isViewLarge() && !prop.data.deleted_at"
                                 @click="store.itemAction('trash', prop.data)"
                                 v-tooltip.top="'Trash'"
-                                icon="pi pi-trash" />
+                                icon="pi pi-trash"
+                        />
 
 
                         <Button class="p-button-tiny p-button-success p-button-text"
@@ -127,17 +128,11 @@ const useVaah = vaah();
                                 v-if="store.isViewLarge() && prop.data.deleted_at"
                                 @click="store.itemAction('restore', prop.data)"
                                 v-tooltip.top="'Restore'"
-                                icon="pi pi-replay" />
-
-
+                                icon="pi pi-replay"
+                        />
                     </div>
-
                 </template>
-
-
             </Column>
-
-
         </DataTable>
         <!--/table-->
 
@@ -147,10 +142,8 @@ const useVaah = vaah();
         <Paginator v-model:rows="store.query.rows"
                    :totalRecords="store.list.total"
                    @page="store.paginate($event)"
-                   :rowsPerPageOptions="store.rows_per_page">
-        </Paginator>
+                   :rowsPerPageOptions="store.rows_per_page"
+        />
         <!--/paginator-->
-
     </div>
-
 </template>