Merge pull request #2280 from visuddhinanda/development

Development

api-v8/app/Http/Api/AiAssistantApi.php

@@ -17,7 +17,7 @@ class AiAssistantApi
     public static function userInfo($user)
     {
         if (!$user) {
-            Log::error('$user=null;');
+            Log::warning('$user=null;');
             return [
                 'id' => 0,
                 'nickName' => 'unknown',

api-v8/app/Http/Api/UserApi.php

@@ -69,7 +69,7 @@ class UserApi
     public static function userInfo($user)
     {
         if (!$user) {
-            Log::error('$user=null;');
+            Log::warning('$user=null;');
             return [
                 'id' => 0,
                 'nickName' => 'unknown',

api-v8/app/Http/Controllers/UserMilestoneController.php

@@ -3,6 +3,14 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Http\Api\StudioApi;
+
+use App\Models\UserInfo;
+use App\Models\Wbw;
+use App\Models\Sentence;
+use App\Models\DhammaTerm;
+use App\Models\Course;
+
 
 class UserMilestoneController extends Controller
 {
@@ -39,35 +47,38 @@ class UserMilestoneController extends Controller
         $user_uid = StudioApi::getIdByName($studioName);
 
         $milestone = [];
-        $milestone[] = ['date'=>UserInfo::where('userid',$user_uid)->value('created_at'),'event'=>'sign-in'] ;
-        if(Wbw::where('creator_uid',$user_uid)->exists()){
-            $milestone[] = ['date'=>Wbw::where('creator_uid',$user_uid)
-                                       ->orderBy('created_at')
-                                       ->value('created_at'),
-                                       'event'=>'first-wbw'
-                           ] ;
+        $milestone[] = ['date' => UserInfo::where('userid', $user_uid)->value('created_at'), 'event' => 'sign-in'];
+        if (Wbw::where('creator_uid', $user_uid)->exists()) {
+            $milestone[] = [
+                'date' => Wbw::where('creator_uid', $user_uid)
+                    ->orderBy('created_at')
+                    ->value('created_at'),
+                'event' => 'first-wbw'
+            ];
         }
-        if(Sentence::where('editor_uid',$user_uid)->exists()){
-            $milestone[] = ['date'=>Sentence::where('editor_uid',$user_uid)
-                                            ->orderBy('created_at')
-                                            ->value('created_at'),
-                                            'event'=>'first-translation'
-                            ] ;
+        if (Sentence::where('editor_uid', $user_uid)->exists()) {
+            $milestone[] = [
+                'date' => Sentence::where('editor_uid', $user_uid)
+                    ->orderBy('created_at')
+                    ->value('created_at'),
+                'event' => 'first-translation'
+            ];
         }
-        if(DhammaTerm::where('owner',$user_uid)->exists()){
-            $milestone[] = ['date'=>DhammaTerm::where('owner',$user_uid)
-                                              ->orderBy('created_at')
-                                              ->value('created_at'),
-                                              'event'=>'first-term'
-                        ] ;
-
+        if (DhammaTerm::where('owner', $user_uid)->exists()) {
+            $milestone[] = [
+                'date' => DhammaTerm::where('owner', $user_uid)
+                    ->orderBy('created_at')
+                    ->value('created_at'),
+                'event' => 'first-term'
+            ];
         }
-        if(Course::where('studio_id',$user_uid)->exists()){
-            $milestone[] = ['date'=>Course::where('studio_id',$user_uid)
-                                           ->orderBy('created_at')
-                                           ->value('created_at'),
-                                           'event'=>'first-course'
-                                           ] ;
+        if (Course::where('studio_id', $user_uid)->exists()) {
+            $milestone[] = [
+                'date' => Course::where('studio_id', $user_uid)
+                    ->orderBy('created_at')
+                    ->value('created_at'),
+                'event' => 'first-course'
+            ];
         }
 
 

dashboard-v4/dashboard/src/components/template/SentEdit/SentCell.tsx

@@ -490,7 +490,10 @@ const SentCellWidget = ({
         open={copyOpen}
         onClose={() => setCopyOpen(false)}
       />
-      <Collapse bordered={false} style={{ backgroundColor: "unset" }}>
+      <Collapse
+        bordered={false}
+        style={{ display: "none", backgroundColor: "unset" }}
+      >
         <Collapse.Panel
           header={"attachment"}
           key="parent2"