From 127d42d873b41e54b28aa83e5260a1f94c1751b7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Jun 2023 11:43:14 +0200
Subject: [PATCH] updates

---
 app/Http/Controllers/Controller.php                 |  4 ++--
 app/Http/Livewire/Team/Member.php                   |  6 ++++--
 app/Models/User.php                                 | 13 +++++++++----
 database/seeders/TeamSeeder.php                     |  7 ++++---
 resources/views/components/forms/select.blade.php   |  3 ++-
 resources/views/components/navbar.blade.php         |  2 +-
 .../views/components/settings/navbar.blade.php      |  1 -
 .../livewire/notifications/email-settings.blade.php |  2 +-
 .../views/livewire/private-key/create.blade.php     |  2 +-
 resources/views/livewire/switch-team.blade.php      |  2 +-
 resources/views/livewire/team/member.blade.php      |  9 ++++++++-
 resources/views/settings/configuration.blade.php    |  2 +-
 12 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 7fafe144c..ab87e2fec 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -31,7 +31,7 @@ class Controller extends BaseController
     }
     public function settings()
     {
-        if (auth()->user()->isAdmin()) {
+        if (auth()->user()->isInstanceAdmin()) {
             $settings = InstanceSettings::get();
             return view('settings.configuration', [
                 'settings' => $settings
@@ -42,7 +42,7 @@ class Controller extends BaseController
     }
     public function emails()
     {
-        if (auth()->user()->isAdmin()) {
+        if (auth()->user()->isInstanceAdmin()) {
             $settings = InstanceSettings::get();
             return view('settings.emails', [
                 'settings' => $settings
diff --git a/app/Http/Livewire/Team/Member.php b/app/Http/Livewire/Team/Member.php
index 98dcd6812..ad21cc0f4 100644
--- a/app/Http/Livewire/Team/Member.php
+++ b/app/Http/Livewire/Team/Member.php
@@ -8,8 +8,10 @@ use Livewire\Component;
 class Member extends Component
 {
     public User $member;
-    public function render()
+    public function remove()
     {
-        return view('livewire.team.member');
+        $this->member->teams()->detach(session('currentTeam'));
+        session(['currentTeam' => session('currentTeam')->fresh()]);
+        $this->emit('reloadWindow');
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 85fc5564d..209d1e840 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -35,6 +35,11 @@ class User extends Authenticatable
         });
     }
     public function isAdmin()
+    {
+        ray(session('currentTeam'));
+        return session('currentTeam');
+    }
+    public function isInstanceAdmin()
     {
         $found_root_team = auth()->user()->teams->filter(function ($team) {
             if ($team->id == 0) {
@@ -49,10 +54,10 @@ class User extends Authenticatable
         return $this->belongsToMany(Team::class);
     }
 
-    public function currentTeam()
-    {
-        return $this->belongsTo(Team::class);
-    }
+    // public function currentTeam()
+    // {
+    //     return $this->belongsTo(Team::class);
+    // }
 
     public function otherTeams()
     {
diff --git a/database/seeders/TeamSeeder.php b/database/seeders/TeamSeeder.php
index c9e01a762..fa4439540 100644
--- a/database/seeders/TeamSeeder.php
+++ b/database/seeders/TeamSeeder.php
@@ -27,6 +27,10 @@ class TeamSeeder extends Seeder
             'name' => 'Normal Team',
             'personal_team' => true,
         ]);
+        // $root_user->teams()->attach($root_user_personal_team);
+        // $root_user->teams()->attach($root_user_other_team);
+        // $normal_user->teams()->attach($normal_user_personal_team);
+        // $normal_user->teams()->attach($root_user_personal_team);
         DB::table('team_user')->insert([
             'team_id' => $root_user_personal_team->id,
             'user_id' => $root_user->id,
@@ -35,17 +39,14 @@ class TeamSeeder extends Seeder
         DB::table('team_user')->insert([
             'team_id' =>  $root_user_other_team->id,
             'user_id' => $root_user->id,
-            'role' => 'admin',
         ]);
         DB::table('team_user')->insert([
             'team_id' =>  $normal_user_personal_team->id,
             'user_id' => $normal_user->id,
-            'role' => 'admin',
         ]);
         DB::table('team_user')->insert([
             'team_id' =>  $root_user_personal_team->id,
             'user_id' => $normal_user->id,
-            'role' => 'admin',
         ]);
     }
 }
diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index 13b18920d..49ee88f79 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -32,7 +32,8 @@
             @endif
         </span>
     </label>
-    <select {{ $attributes }} wire:model.defer={{ $id }}>
+    <select {{ $attributes }}
+        @if ($id) name={{ $id }} wire:model.defer={{ $id }} @endif>
         {{ $slot }}
     </select>
 
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 5ea535f24..c5a7b6760 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -41,7 +41,7 @@
             </li>
 
 
-            @if (auth()->user()->isAdmin())
+            @if (auth()->user()->isInstanceAdmin())
                 <li title="Command Center">
                     <a class="hover:bg-transparent" @if (!request()->is('command-center')) href="/command-center" @endif>
                         <svg xmlns="http://www.w3.org/2000/svg"
diff --git a/resources/views/components/settings/navbar.blade.php b/resources/views/components/settings/navbar.blade.php
index a45ff3639..65babd276 100644
--- a/resources/views/components/settings/navbar.blade.php
+++ b/resources/views/components/settings/navbar.blade.php
@@ -10,6 +10,5 @@
             <button>Emails</button>
         </a>
         <div class="flex-1"></div>
-        <livewire:switch-team />
     </nav>
 </div>
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index a0e1612b8..e528632ff 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -5,7 +5,7 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
-            @if (auth()->user()->isAdmin())
+            @if (auth()->user()->isInstanceAdmin())
                 <x-forms.button wire:click='copySMTP'>
                     Copy from Instance Settings
                 </x-forms.button>
diff --git a/resources/views/livewire/private-key/create.blade.php b/resources/views/livewire/private-key/create.blade.php
index f06161fa3..2c58b47c5 100644
--- a/resources/views/livewire/private-key/create.blade.php
+++ b/resources/views/livewire/private-key/create.blade.php
@@ -6,7 +6,7 @@
         </div>
         <x-forms.textarea id="value" rows="10" placeholder="-----BEGIN OPENSSH PRIVATE KEY-----"
             label="Private Key" required />
-        <x-forms.button type="submit" wire.click.prevent>
+        <x-forms.button type="submit">
             Save Private Key
         </x-forms.button>
     </form>
diff --git a/resources/views/livewire/switch-team.blade.php b/resources/views/livewire/switch-team.blade.php
index 6ae011962..6648591e9 100644
--- a/resources/views/livewire/switch-team.blade.php
+++ b/resources/views/livewire/switch-team.blade.php
@@ -1,5 +1,5 @@
 <div class="w-64 -mt-9">
-    <x-forms.select id="selectedTeamId" class="pr-0 select-xs ">
+    <x-forms.select wire:model="selectedTeamId" class="pr-0 select-xs ">
         <option value="default" disabled selected>Switch team</option>
         @foreach (auth()->user()->teams as $team)
             <option value="{{ $team->id }}">{{ $team->name }}</option>
diff --git a/resources/views/livewire/team/member.blade.php b/resources/views/livewire/team/member.blade.php
index 5c74e17be..865c11a6a 100644
--- a/resources/views/livewire/team/member.blade.php
+++ b/resources/views/livewire/team/member.blade.php
@@ -3,8 +3,15 @@
     <td>{{ $member->name }}</td>
     <td>{{ $member->email }}</td>
     <td>
+        {{-- @if (auth()->user()->isAdmin())
+            <x-forms.button wire:click="makeAdmin">Make admin</x-forms.button>
+        @else
+            <x-forms.button disabled>Make admin</x-forms.button>
+        @endif --}}
         @if ($member->id !== auth()->user()->id)
-            <x-forms.button class="border-none">Remove</x-forms.button>
+            <x-forms.button wire:click="remove">Remove</x-forms.button>
+        @else
+            <x-forms.button disabled>Remove</x-forms.button>
         @endif
     </td>
 </tr>
diff --git a/resources/views/settings/configuration.blade.php b/resources/views/settings/configuration.blade.php
index 05f98ade0..fe805d461 100644
--- a/resources/views/settings/configuration.blade.php
+++ b/resources/views/settings/configuration.blade.php
@@ -2,7 +2,7 @@
     <x-settings.navbar />
     <livewire:settings.configuration :settings="$settings" />
 
-    @if (auth()->user()->isAdmin())
+    @if (auth()->user()->isInstanceAdmin())
         <livewire:force-upgrade />
     @endif
 </x-layout>