feat: now users can suggest changes to the properties of molecules, c…

…itations, collections and organisms

app/Filament/Dashboard/Resources/ReportResource.php

@@ -20,6 +20,8 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Str;
 use Tapp\FilamentAuditing\RelationManagers\AuditsRelationManager;
+use Filament\Forms\Components\KeyValue;
+use Filament\Forms\Components\Toggle;
 
 class ReportResource extends Resource
 {
@@ -35,18 +37,24 @@ public static function form(Form $form): Form
     {
         return $form
             ->schema([
+                Toggle::make('is_change')
+                    ->live()
+                    ->label(function ($state) {
+                        if ($state == true) {
+                            return 'Request changes to data';
+                        } else {
+                            return 'Report false data';
+                        }
+                    }),
                 Select::make('report_type')
-                    ->label('You want to report:')
+                    ->label('Choose')
                     ->hintIcon('heroicon-m-question-mark-circle', tooltip: 'Select what you want to report. Ex: Molecule, Citation, Collection, Organism.')
                     ->live()
-                    ->options([
-                        'molecule' => 'Molecule',
-                        'citation' => 'Citation',
-                        'collection' => 'Collection',
-                        'organism' => 'Organism',
-                    ])
+                    ->options(function () {
+                        return getReportTypes();
+                    })
                     ->hidden(function (string $operation) {
-                        if ($operation == 'create' && (! request()->has('collection_uuid') && ! request()->has('citation_id') && ! request()->has('compound_id') && ! request()->has('organism_id'))) {
+                        if ($operation == 'create' ) {
                             return false;
                         } else {
                             return true;
@@ -57,7 +65,17 @@ public static function form(Form $form): Form
                     ->required(),
                 Textarea::make('evidence')
                     ->hintIcon('heroicon-m-question-mark-circle', tooltip: 'Please provide Evidence/Comment to support your claims in this report. This will help our Curators in reviewing your report.')
-                    ->label('Evidence/Comment'),
+                    ->label('Evidence/Comment')
+                    ->hidden(function (Get $get) {
+                        return $get('is_change');
+                    }),
+                KeyValue::make('suggested_changes')
+                    ->addActionLabel('Add property')
+                    ->keyLabel('Property')
+                    ->valueLabel('Suggested change')
+                    ->hidden(function (Get $get) {
+                        return ! $get('is_change');
+                    }),
                 TextInput::make('url')
                     ->hintIcon('heroicon-m-question-mark-circle', tooltip: 'Provide a link to the webpage that supports your claims.')
                     ->label('URL'),
@@ -66,6 +84,11 @@ public static function form(Form $form): Form
                     ->relationship('collections', 'title')
                     ->multiple()
                     ->preload()
+                    ->required(function (Get $get) {
+                        if ($get('report_type') == 'collection') {
+                            return true;
+                        }
+                    })
                     ->hidden(function (Get $get, string $operation) {
                         if ($operation == 'edit' || $operation == 'view') {
                             if ($get('collections') == []) {
@@ -88,6 +111,11 @@ public static function form(Form $form): Form
                         return Citation::whereNotNull('title')->pluck('title', 'id');
                     })
                     ->multiple()
+                    ->required(function (Get $get) {
+                        if ($get('report_type') == 'citation') {
+                            return true;
+                        }
+                    })
                     ->hidden(function (Get $get, string $operation) {
                         if ($operation == 'edit' || $operation == 'view') {
                             if ($get('citations') == []) {
@@ -108,6 +136,11 @@ public static function form(Form $form): Form
                     ->relationship('organisms', 'name')
                     ->multiple()
                     ->searchable()
+                    ->required(function (Get $get) {
+                        if ($get('report_type') == 'organism') {
+                            return true;
+                        }
+                    })
                     ->hidden(function (Get $get, string $operation) {
                         if ($operation == 'edit' || $operation == 'view') {
                             if ($get('organisms') == []) {
@@ -126,6 +159,11 @@ public static function form(Form $form): Form
                 Textarea::make('mol_id_csv')
                     ->label('Molecules')
                     ->placeholder('Enter the Identifiers separated by commas')
+                    ->required(function (Get $get) {
+                        if ($get('report_type') == 'molecule') {
+                            return true;
+                        }
+                    })
                     ->hidden(function (Get $get, string $operation) {
                         if ($operation == 'edit' || $operation == 'view') {
                             if (is_null($get('mol_id_csv'))) {
@@ -169,9 +207,9 @@ public static function table(Table $table): Table
         return $table
             ->columns([
                 TextColumn::make('title')
-                    ->description(fn (Report $record): string => Str::of($record->evidence)->words(10)),
+                    ->description(fn(Report $record): string => Str::of($record->evidence)->words(10)),
                 TextColumn::make('url')
-                    ->url(fn (Report $record) => $record->url)
+                    ->url(fn(Report $record) => $record->url)
                     ->openUrlInNewTab(),
                 TextColumn::make('status')
                     ->badge()

app/Filament/Dashboard/Resources/ReportResource/Pages/CreateReport.php

@@ -18,20 +18,27 @@ class CreateReport extends CreateRecord
     protected function afterFill(): void
     {
         $request = request();
+        if($request->type == 'change'){
+            $this->data['is_change'] = true; 
+        }
         if ($request->has('collection_uuid')) {
             $collection = Collection::where('uuid', $request->collection_uuid)->get();
             $id = $collection[0]->id;
             array_push($this->data['collections'], $id);
+            $this->data['report_type'] = 'collection';
         } elseif ($request->has('citation_id')) {
             $citation = Citation::where('id', $request->citation_id)->get();
             $id = $citation[0]->id;
             array_push($this->data['citations'], $id);
+            $this->data['report_type'] = 'citation';
         } elseif ($request->has('compound_id')) {
             $this->data['mol_id_csv'] = $request->compound_id;
+            $this->data['report_type'] = 'molecule';
         } elseif ($request->has('organism_id')) {
             $citation = Organism::where('id', $request->organism_id)->get();
             $id = $citation[0]->id;
             array_push($this->data['organisms'], $id);
+            $this->data['report_type'] = 'organism';
         }
     }
 
@@ -54,16 +61,6 @@ protected function beforeCreate(): void
             $this->data['citations'] = [];
             $this->data['mol_id_csv'] = null;
         }
-
-        if (! ($this->data['collections'] || $this->data['citations'] || $this->data['mol_id_csv'] || $this->data['organisms'])) {
-            Notification::make()
-                ->danger()
-                ->title('Select at least one Collection/Citation/Molecule/Organism')
-                ->persistent()
-                ->send();
-
-            $this->halt();
-        }
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

app/Helper.php

@@ -12,6 +12,15 @@ function npScore($old_value)
     return ($old_value - $old_min) / ($old_max - $old_min) * ($new_max - $new_min) + $new_min;
 }
 
+function getReportTypes() {
+    return [
+        'molecule' => 'Molecule',
+        'citation' => 'Citation',
+        'collection' => 'Collection',
+        'organism' => 'Organism',
+    ];
+}
+
 function doiRegxMatch($doi)
 {
     $doiRegex = '/\b(10[.][0-9]{4,}(?:[.][0-9]+)*)\b/';

app/Models/Report.php

@@ -29,7 +29,12 @@ class Report extends Model implements Auditable
         'status',
         'comment',
         'user_id',
+        'suggested_changes',
+        'is_change',
+    ];
 
+    protected $casts = [
+        'suggested_changes' => 'array',
     ];
 
     /**

database/migrations/2024_08_12_150749_add_columns_to_reports_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('reports', function (Blueprint $table) {
+            $table->boolean('is_change')->nullable();
+            $table->json('suggested_changes')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('reports', function (Blueprint $table) {
+            $table->dropColumn(['is_change','suggested_changes']);
+        });
+    }
+};

resources/views/livewire/molecule-details.blade.php

@@ -787,10 +787,10 @@ class="font-medium text-gray-900"></a></p>
                 <dl class="mt-5 flex w-full">
                     <div class="text-center md:text-left">
                         <dd class="mt-1"><a class="text-base font-semibold text-text-dark hover:text-slate-600"
-                                href="/dashboard/reports/create?compound_id={{ $molecule->identifier }}">
+                                href="/dashboard/reports/create?compound_id={{ $molecule->identifier }}&type=report">
                                 Report this compound <span aria-hidden="true">→</span></a></dd>
                         <dd class="mt-1"><a class="text-base font-semibold text-text-dark hover:text-slate-600"
-                                href="/dashboard/reports/create?compound_id={{ $molecule->identifier }}">Request
+                                href="/dashboard/reports/create?compound_id={{ $molecule->identifier }}&type=change">Request
                                 changes to this page <span aria-hidden="true">→</span></a></dd>
                     </div>
                 </dl>