Merge pull request #21 from Steinbeck-Lab/functionality-button-for-pr…

…ocessing-entries Functionality button for processing entries
Steinbeck-Lab · May 15, 2024 · 220a730 · 220a730
2 parents 9b3cac4 + 3765492
commit 220a730
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 1 deletion.
diff --git a/app/Console/Commands/ImportEntries.php b/app/Console/Commands/ImportEntries.php
@@ -8,6 +8,7 @@
 use Illuminate\Bus\Batch;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Cache;
 
 class ImportEntries extends Command
 {
@@ -55,6 +56,7 @@ public function handle()
                 $collection->jobs_status = 'INCURATION';
                 $collection->job_info = '';
                 $collection->save();
+                Cache::forget('stats.collections'.$collection->id.'molecules.count');
             })->name('Import Entries '.$collection->id)
                 ->allowFailures(false)
                 ->onConnection('redis')

diff --git a/app/Filament/Dashboard/Resources/CollectionResource.php b/app/Filament/Dashboard/Resources/CollectionResource.php
@@ -5,6 +5,7 @@
 use App\Filament\Dashboard\Resources\CollectionResource\Pages;
 use App\Filament\Dashboard\Resources\CollectionResource\RelationManagers\CitationsRelationManager;
 use App\Filament\Dashboard\Resources\CollectionResource\RelationManagers\EntriesRelationManager;
+use App\Filament\Dashboard\Resources\CollectionResource\RelationManagers\MoleculesRelationManager;
 use App\Filament\Dashboard\Resources\CollectionResource\Widgets\CollectionStats;
 use App\Livewire\ShowJobStatus;
 use App\Models\Collection;
@@ -91,11 +92,17 @@ public static function table(Table $table): Table
 
     public static function getRelations(): array
     {
-        return [
+        // $record = static::getOwner();
+        // dd(static::getOwner());
+        // dd(static::$model::molecules()->get());
+        $arr = [
             EntriesRelationManager::class,
             CitationsRelationManager::class,
             AuditsRelationManager::class,
+            MoleculesRelationManager::class,
         ];
+
+        return $arr;
     }
 
     public static function getPages(): array

diff --git a/...lament/Dashboard/Resources/CollectionResource/RelationManagers/EntriesRelationManager.php b/...lament/Dashboard/Resources/CollectionResource/RelationManagers/EntriesRelationManager.php
@@ -11,10 +11,12 @@
 use Filament\Infolists\Infolist;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
+use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\ImportAction;
 use Filament\Tables\Columns\ImageColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
+use Illuminate\Support\Facades\Artisan;
 
 class EntriesRelationManager extends RelationManager
 {
@@ -157,6 +159,13 @@ public function table(Table $table): Table
                     ->options([
                         'collection_id' => $this->ownerRecord->id,
                     ]),
+                Action::make('process')
+                    ->hidden(function () {
+                        return $this->ownerRecord->entries()->where('status', 'SUBMITTED')->count() < 1;
+                    })
+                    ->action(function () {
+                        Artisan::call('entries:process');
+                    }),
                 // Tables\Actions\CreateAction::make(),
             ])
             ->actions([

diff --git a/...ment/Dashboard/Resources/CollectionResource/RelationManagers/MoleculesRelationManager.php b/...ment/Dashboard/Resources/CollectionResource/RelationManagers/MoleculesRelationManager.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Filament\Dashboard\Resources\CollectionResource\RelationManagers;
+
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class MoleculesRelationManager extends RelationManager
+{
+    protected static string $relationship = 'molecules';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('canonical_smiles')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('canonical_smiles')
+            ->columns([
+                Tables\Columns\TextColumn::make('canonical_smiles'),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make(),
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}