Merge pull request krayin#418 from devansh-webkul/kanban-filter-remove-fixed

Kanban filter remove fixed krayin#377

Author: devansh-webkul

packages/Webkul/Admin/src/Http/Controllers/Lead/LeadController.php

@@ -13,21 +13,21 @@
 class LeadController extends Controller
 {
     /**
-     * LeadRepository object
+     * Lead repository instance.
      *
      * @var \Webkul\Lead\Repositories\LeadRepository
      */
     protected $leadRepository;
 
     /**
-     * PipelineRepository object
+     * Pipeline repository instance.
      *
      * @var \Webkul\Lead\Repositories\PipelineRepository
      */
     protected $pipelineRepository;
 
     /**
-     * StageRepository object
+     * Stage repository instance.
      *
      * @var \Webkul\Lead\Repositories\StageRepository
      */
@@ -69,32 +69,34 @@ public function index()
             } else {
                 $createdAt = request('created_at') ?? null;
 
-                if ($createdAt) {
+                if ($createdAt && isset($createdAt["bw"])) {
                     $createdAt = explode(",", $createdAt["bw"]);
-        
+
                     $createdAt[0] .= ' 00:01';
-                    
+
                     $createdAt[1] = $createdAt[1]
                         ? $createdAt[1] . ' 23:59'
                         : Carbon::now()->format('Y-m-d 23:59');
+                } else {
+                    $createdAt = null;
                 }
 
                 if (request('pipeline_id')) {
                     $pipeline = $this->pipelineRepository->find(request('pipeline_id'));
                 } else {
                     $pipeline = $this->pipelineRepository->getDefaultPipeline();
                 }
-        
+
                 $leads = $this->leadRepository->getLeads($pipeline->id, request('search') ?? '', $createdAt)->toArray();
-        
+
                 $totalCount = [];
-        
+
                 foreach ($leads as $key => $lead) {
                     $totalCount[$lead['status']] = ($totalCount[$lead['status']] ?? 0) + (float) $lead['lead_value'];
-        
+
                     $leads[$key]['lead_value'] = core()->formatBasePrice($lead['lead_value']);
                 }
-        
+
                 $totalCount = array_map(function ($count) {
                     return core()->formatBasePrice($count);
                 }, $totalCount);
@@ -147,7 +149,7 @@ public function store(AttributeForm $request)
 
         $lead = $this->leadRepository->create($data);
 
-        $user = $this->leadRepository->getUserByLeadId($lead->id);
+        $this->leadRepository->getUserByLeadId($lead->id);
 
         Event::dispatch('lead.create.after', $lead);
 
@@ -217,7 +219,7 @@ public function update(AttributeForm $request, $id)
     }
 
     /**
-     * Search person results
+     * Search person results.
      *
      * @return \Illuminate\Http\Response
      */
@@ -251,7 +253,7 @@ public function destroy($id)
                 'status'  => true,
                 'message' => trans('admin::app.response.destroy-success', ['name' => trans('admin::app.leads.lead')]),
             ], 200);
-        } catch(\Exception $exception) {
+        } catch (\Exception $exception) {
             return response()->json([
                 'status'  => false,
                 'message' => trans('admin::app.response.destroy-failed', ['name' => trans('admin::app.leads.lead')]),

packages/Webkul/UI/publishable/assets/js/ui.js

@@ -1,5 +1,5 @@
 {
-    "/js/ui.js": "/js/ui.js?id=33c8030694c5581a6849",
+    "/js/ui.js": "/js/ui.js?id=ff18906b89dbcbb22b90",
     "/css/ui.css": "/css/ui.css?id=305ba87cbd5ce07c772d",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884",

packages/Webkul/UI/publishable/assets/mix-manifest.json

@@ -220,17 +220,34 @@ export default {
         },
 
         removeAll: function() {
-            this.$store.state.filters = this.$store.state.filters.filter(
-                filter => filter.column == "view_type" && filter.val == "table"
-            );
-
-            (this.columns || this.tableData.columns).forEach(
-                (column, index) => {
-                    if (column.type && column.type == "date_range") {
-                        $(".flatpickr-input").val();
+            /* for default tables cases */
+            if (this.$store.state.filters.length !== undefined) {
+                this.$store.state.filters = this.$store.state.filters.filter(
+                    filter => filter.column == "view_type" && filter.val == "table"
+                );
+
+                (this.columns || this.tableData.columns).forEach(
+                    (column, index) => {
+                        if (column.type && column.type == "date_range") {
+                            $(".flatpickr-input").val('');
+                        }
                     }
-                }
-            );
+                );
+            } else {
+                /**
+                 * For kanban case.
+                 *
+                 * To Do (@devansh-webkul): This needs to be supported by
+                 * all types present in the kanban columns. Currently added
+                 * for `created_at`.
+                 */
+                $(".flatpickr-input").val('');
+
+                this.updateFilterValues({
+                    key: 'created_at',
+                    values: ['', '']
+                });
+            }
 
             this.$forceUpdate();
         },