Merge pull request #72 from webreinvent/2.x-feature/content-fixes

themodernpk · web-flow · commit a182ef8dbab6 · 2024-03-20T12:52:25.000+05:30
2.x feature -&gt; 2.x develop | content fixes
diff --git a/Http/Controllers/Backend/ContentTypesController.php b/Http/Controllers/Backend/ContentTypesController.php
@@ -48,6 +48,12 @@ public function getAssets(Request $request)
                 $data['empty_item'][$column] = null;
             }
 
+            $data['empty_item']['content_statuses'] = [
+                'draft',
+                'published',
+                'protected',
+            ];
+
             $data['field_types'] = FieldType::select('id', 'name', 'slug', 'meta')
                 ->get();
 
diff --git a/Http/Controllers/Backend/ContentsController.php b/Http/Controllers/Backend/ContentsController.php
@@ -237,7 +237,7 @@ public function deleteItem(Request $request,$content_slug,$id)
         }
     }
     //----------------------------------------------------------
-    public function itemAction(Request $request,$id,$action)
+    public function itemAction(Request $request,$content_type_slug,$id,$action)
     {
         try{
             return Content::itemAction($request,$id,$action);
diff --git a/Models/Content.php b/Models/Content.php
@@ -364,15 +364,15 @@ public static function itemAction($request, $id, $type): array
     {
         switch($type)
         {
-            case 'activate':
+            case 'published':
                 self::where('id', $id)
                     ->withTrashed()
-                    ->update(['status' => 1]);
+                    ->update(['status' => 'published']);
                 break;
-            case 'deactivate':
+            case 'draft':
                 self::where('id', $id)
                     ->withTrashed()
-                    ->update(['status' => null]);
+                    ->update(['status' => 'draft']);
                 break;
             case 'trash':
                 self::find($id)->delete();
diff --git a/Models/ContentBase.php b/Models/ContentBase.php
@@ -891,7 +891,7 @@ public static function storeFormGroups(Content $content, $groups, $type = null)
                         if(!$field['content']){
                             $row_to_delete_ids = array_diff($relatable_ids, []);
                         }else{
-                            $row_to_delete_ids = array_diff($relatable_ids, [$field['content']]);
+                            $row_to_delete_ids = array_diff($relatable_ids, $field['content']);
                         }
 
                         if(count($row_to_delete_ids) > 0)
diff --git a/Models/ContentType.php b/Models/ContentType.php
@@ -100,7 +100,7 @@ public function getContentStatusesAttribute($value)
         {
             return json_decode($value);
         }
-        return null;
+        return [];
     }
     //-------------------------------------------------
     public function setMetaAttribute($value)
diff --git a/Models/ContentTypeBase.php b/Models/ContentTypeBase.php
@@ -99,7 +99,7 @@ public function getContentStatusesAttribute($value)
         {
             return json_decode($value);
         }
-        return null;
+        return [];
     }
     //-------------------------------------------------
     public function setMetaAttribute($value)
diff --git a/Resources/assets/build/index.js b/Resources/assets/build/index.js
diff --git a/Resources/assets/build/vanilla-picker-NKbIFE8h.js b/Resources/assets/build/vanilla-picker-NKbIFE8h.js
diff --git a/Vue/package.json b/Vue/package.json
@@ -16,8 +16,10 @@
         "primevue": "3.35.0",
         "qs": "^6.11.0",
         "quill": "^1.3.7",
+        "uuid": "^9.0.1",
         "vue": "^3.2.37",
         "vue-router": "^4.1.2",
+        "vue3-treeselect": "^0.1.10",
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
diff --git a/Vue/pages/contents/components/ContentFields.vue b/Vue/pages/contents/components/ContentFields.vue
@@ -65,7 +65,7 @@ const props = defineProps({
                     <div class="w-full flex flex-column gap-1">
                         <label class="font-medium line-height-1 text-xs">{{ field.name }}</label>
                         <div v-if="!field.content || typeof field.content === 'string'
-                        || typeof field.content === 'number' || typeof field.content === 'object'
+                        || typeof field.content === 'number'
                         || store.assets.non_repeatable_fields.includes(field.type.slug)"
                              class="flex justify-content-between align-items-start gap-3 w-full">
                             <div class="flex-grow-1">
diff --git a/Vue/pages/contents/components/Table.vue b/Vue/pages/contents/components/Table.vue
@@ -77,12 +77,7 @@ const useVaah = vaah();
                     header="Status">
 
                 <template #body="prop">
-                    <InputSwitch v-model.bool="prop.data.status"
-                                 data-testid="contents-table-status"
-                                 v-bind:false-value="0"  v-bind:true-value="1"
-                                 class="p-inputswitch-sm"
-                                 @input="store.toggleIsActive(prop.data)">
-                    </InputSwitch>
+                    {{useVaah.toLabel(prop.data.status)}}
                 </template>
 
             </Column>
diff --git a/Vue/pages/contenttypes/Form.vue b/Vue/pages/contenttypes/Form.vue
@@ -12,13 +12,13 @@ const route = useRoute();
 const useVaah = vaah();
 
 onMounted(async () => {
+    store.enable_status_editing_indexes = [];
     if(route.params && route.params.id)
     {
         await store.getItem(route.params.id);
     }
 
     await store.watchItem();
-    store.getNewStatus();
 
     await store.getFormMenu();
 });
@@ -188,7 +188,7 @@ const toggleFormMenu = (event) => {
                                  v-model="store.item.is_commentable"/>
                 </VhField>
                 <draggable
-                    v-model="store.new_status"
+                    v-model="store.item.content_statuses"
                     class="dragArea list-group"
                     :group="{ name: 'content-types', pull: 'clone', put: false }"
                     @start="drag=true"
@@ -198,20 +198,18 @@ const toggleFormMenu = (event) => {
                         <div class="p-inputgroup mb-2">
                             <Button icon="pi pi-bars" class="p-button-sm p-button-secondary"/>
                             <InputText class="w-full p-inputtext-sm"
-                                       v-if="index == store.edit_status_index && !store.disable_status_editing"
                                        name="contenttypes-statuses_name"
                                        data-testid="contenttypes-statuses_name"
-                                       v-model="store.new_status[index]"/>
-                            <InputText class="w-full p-inputtext-sm"
-                                       v-else
-                                       name="contenttypes-statuses_name"
-                                       data-testid="contenttypes-statuses_name"
-                                       :disabled="true"
-                                       v-model="store.new_status[index]"/>
+                                       :disabled="!store.enable_status_editing_indexes.includes(index)"
+                                       v-model="store.item.content_statuses[index]"/>
                             <Button icon="pi pi-pencil"
                                     data-testid="contenttypes-statuses_name_edit"
                                     @click="store.toggleEditStatus(index)"
                                     class="p-button-sm p-button-secondary"/>
+                            <Button icon="pi pi-times"
+                                    data-testid="contenttypes-statuses_name_edit"
+                                    @click="store.removeStatus(index)"
+                                    class="p-button-sm p-button-secondary"/>
                         </div>
                     </template>
                 </draggable>
@@ -222,7 +220,7 @@ const toggleFormMenu = (event) => {
                                name="contenttypes-new_status"
                                data-testid="contenttypes-new_status"
                                v-model="store.new_status_item"
-                               @blur="store.addStatus"/>
+                               v-on:keyup.enter="store.addStatus"/>
                 </VhField>
 
             </div>
diff --git a/Vue/stores/store-contenttypes.js b/Vue/stores/store-contenttypes.js
@@ -39,6 +39,7 @@ export const useContentTypeStore = defineStore({
         list: null,
         item: null,
         fillable:null,
+        enable_status_editing_indexes:[],
         empty_query:empty_states.query,
         empty_action:empty_states.action,
         query: vaah().clone(empty_states.query),
@@ -64,11 +65,6 @@ export const useContentTypeStore = defineStore({
         list_bulk_menu: [],
         item_menu_list: [],
         item_menu_state: null,
-        new_status: [
-            'draft',
-            'published',
-            'protected',
-        ],
         new_status_item: null,
         edit_status_index: null,
         disable_status_editing: true,
@@ -437,7 +433,6 @@ export const useContentTypeStore = defineStore({
                 case 'create-and-new':
                 case 'create-and-close':
                 case 'create-and-clone':
-                    this.item.content_statuses = JSON.stringify(this.new_status);
                     options.method = 'POST';
                     options.params = item;
                     break;
@@ -449,7 +444,6 @@ export const useContentTypeStore = defineStore({
                 case 'save':
                 case 'save-and-close':
                 case 'save-and-clone':
-                    this.item.content_statuses = JSON.stringify(this.new_status);
                     options.method = 'PUT';
                     options.params = item;
                     ajax_url += '/'+item.id
@@ -905,28 +899,24 @@ export const useContentTypeStore = defineStore({
 
         },
         //---------------------------------------------------------------------
-        getNewStatus(){
-            if(this.item.id){
-                this.new_status = JSON.parse(this.item.content_statuses);
-            }
-        },
-        //---------------------------------------------------------------------
         addStatus(){
-            this.item.content_statuses = null;
-            this.new_status.push(this.new_status_item);
+            this.item.content_statuses.push(this.new_status_item);
             this.new_status_item = null;
         },
         //---------------------------------------------------------------------
+        removeStatus(index){
+            this.item.content_statuses.splice(index, 1);
+        },
+        //---------------------------------------------------------------------
         toggleEditStatus(status_index)
         {
-            this.edit_status_index = status_index;
-            if(this.disable_status_editing)
-            {
-                this.disable_status_editing = false;
-            } else
-            {
-                this.disable_status_editing = true;
+            if(this.enable_status_editing_indexes.includes(status_index)){
+                const index = this.enable_status_editing_indexes.indexOf(status_index);
+                this.enable_status_editing_indexes.splice(index, 1);
+            }else{
+                this.enable_status_editing_indexes.push(status_index);
             }
+
         },
         //---------------------------------------------------------------------
         async toContentStructure(item) {

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ public function deleteItem(Request $request,$content_slug,$id)`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`//----------------------------------------------------------`
`240`		`- public function itemAction(Request $request,$id,$action)`
	`240`	`+ public function itemAction(Request $request,$content_type_slug,$id,$action)`
`241`	`241`	`{`
`242`	`242`	`try{`
`243`	`243`	`return Content::itemAction($request,$id,$action);`
Original file line number	Diff line number	Diff line change
`@@ -891,7 +891,7 @@ public static function storeFormGroups(Content $content, $groups, $type = null)`
`891`	`891`	`if(!$field['content']){`
`892`	`892`	`$row_to_delete_ids = array_diff($relatable_ids, []);`
`893`	`893`	`}else{`
`894`		`- $row_to_delete_ids = array_diff($relatable_ids, [$field['content']]);`
	`894`	`+ $row_to_delete_ids = array_diff($relatable_ids, $field['content']);`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`if(count($row_to_delete_ids) > 0)`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function getContentStatusesAttribute($value)`
`100`	`100`	`{`
`101`	`101`	`return json_decode($value);`
`102`	`102`	`}`
`103`		`- return null;`
	`103`	`+ return [];`
`104`	`104`	`}`
`105`	`105`	`//-------------------------------------------------`
`106`	`106`	`public function setMetaAttribute($value)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function getContentStatusesAttribute($value)`
`99`	`99`	`{`
`100`	`100`	`return json_decode($value);`
`101`	`101`	`}`
`102`		`- return null;`
	`102`	`+ return [];`
`103`	`103`	`}`
`104`	`104`	`//-------------------------------------------------`
`105`	`105`	`public function setMetaAttribute($value)`