Merge pull request #12446 from Godmartinz/livewire_slack_inputs

Adds Livewire slack inputs

app/Http/Controllers/Api/SettingsController.php

@@ -143,47 +143,6 @@ class SettingsController extends Controller
 
     }
 
-    public function slacktest(SlackSettingsRequest $request)
-    {
-
-        $validator = Validator::make($request->all(), [
-            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
-            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json(['message' => 'Validation failed', 'errors' => $validator->errors()], 422);
-        }
-
-        // If validation passes, continue to the curl request
-            $slack = new Client([
-                'base_url' => e($request->input('slack_endpoint')),
-                'defaults' => [
-                    'exceptions' => false,
-                ],
-            ]);
-
-            $payload = json_encode(
-                [
-                    'channel'    => e($request->input('slack_channel')),
-                    'text'       => trans('general.slack_test_msg'),
-                    'username'    => e($request->input('slack_botname')),
-                    'icon_emoji' => ':heart:',
-                ]);
-
-            try {
-                $slack->post($request->input('slack_endpoint'), ['body' => $payload]);
-                return response()->json(['message' => 'Success'], 200);
-
-            } catch (\Exception $e) {
-                return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.e($request->input('slack_endpoint')).'). Slack responded with: '.$e->getMessage()], 400);
-            }
-
-        //} 
-        return response()->json(['message' => 'Something went wrong :( '], 400);
-    }
-
-
     /**
      * Test the email configuration
      *

app/Http/Controllers/SettingsController.php

@@ -679,33 +679,6 @@ class SettingsController extends Controller
         return view('settings.slack', compact('setting'));
     }
 
-    /**
-     * Return a form to allow a super admin to update settings.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     *
-     * @since [v1.0]
-     *
-     * @return View
-     */
-    public function postSlack(SlackSettingsRequest $request)
-    {
-        if (is_null($setting = Setting::getSettings())) {
-            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
-        }
-
-        $setting->slack_endpoint = $request->input('slack_endpoint');
-        $setting->slack_channel = $request->input('slack_channel');
-        $setting->slack_botname = $request->input('slack_botname');
-
-        if ($setting->save()) {
-            return redirect()->route('settings.index')
-                ->with('success', trans('admin/settings/message.update.success'));
-        }
-
-        return redirect()->back()->withInput()->withErrors($setting->getErrors());
-    }
-
     /**
      * Return a form to allow a super admin to update settings.
      *

app/Http/Livewire/SlackSettingsForm.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use GuzzleHttp\Client;
+use Livewire\Component;
+use App\Models\Setting;
+
+class SlackSettingsForm extends Component
+{
+    public $slack_endpoint;
+    public $slack_channel;
+    public $slack_botname;
+
+    public Setting $setting;
+
+    protected $rules = [
+        'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
+        'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
+        'slack_botname'                       => 'string|nullable',
+    ];
+
+    public function mount(){
+
+        $this->setting = Setting::getSettings();
+        $this->slack_endpoint = $this->setting->slack_endpoint;
+        $this->slack_channel = $this->setting->slack_channel;
+        $this->slack_botname = $this->setting->slack_botname;
+
+    }
+    public function updated($field){
+
+        $this->validateOnly($field ,$this->rules);
+    }
+
+    public function render()
+    {
+        return view('livewire.slack-settings-form');
+    }
+
+    public function testSlack(){
+
+        $slack = new Client([
+            'base_url' => e($this->slack_endpoint),
+            'defaults' => [
+                'exceptions' => false,
+            ],
+        ]);
+
+        $payload = json_encode(
+            [
+                'channel'    => e($this->slack_channel),
+                'text'       => trans('general.slack_test_msg'),
+                'username'    => e($this->slack_botname),
+                'icon_emoji' => ':heart:',
+            ]);
+
+        try {
+            $slack->post($this->slack_endpoint, ['body' => $payload]);
+            return session()->flash('success' , 'Your Slack Integration works!');
+
+        } catch (\Exception $e) {
+            return session()->flash('error' , 'Please check the channel name and webhook endpoint URL ('.e($this->slack_endpoint).'). Slack responded with: '.$e->getMessage());
+        }
+
+        //}
+        return session()->flash('message' , 'Something went wrong :( ');
+
+
+
+    }
+    public function submit()
+    {
+        $this->validate($this->rules);
+
+        $this->setting->slack_endpoint = $this->slack_endpoint;
+        $this->setting->slack_channel = $this->slack_channel;
+        $this->setting->slack_botname = $this->slack_botname;
+
+        $this->setting->save();
+
+        session()->flash('save',trans('admin/settings/message.update.success'));
+
+
+    }
+}

app/Http/Requests/SlackSettingsRequest.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-class SlackSettingsRequest extends Request
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:"https://hooks.slack.com"|nullable',
-            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
-            'slack_botname'                       => 'string|nullable',
-
-        ];
-    }
-
-
-}

app/Models/Setting.php

@@ -83,6 +83,9 @@ class Setting extends Model
         'email_domain',
         'email_format',
         'username_format',
+        'slack_endpoint',
+        'slack_channel',
+        'slack_botname',
     ];
 
     /**

resources/views/livewire/slack-settings-form.blade.php

@@ -0,0 +1,101 @@
+
+
+    <div class="col-md-12" style="border-top: 0px;">
+        @if (session()->has('save'))
+        <div class="alert alert-success">
+            {{session('save')}}
+        </div>
+        @endif
+            @if(session()->has('success'))
+                <div class="alert alert-success">
+                    {{session('success')}}
+                </div>
+            @endif
+            @if(session()->has('error'))
+                <div class="alert alert-danger">
+                    {{session('error')}}
+                </div>
+            @endif
+            @if(session()->has('message'))
+                <div class="alert alert-danger">
+                    {{session('message')}}
+                </div>
+            @endif
+        <form wire:submit.prevent ="submit">
+        {{csrf_field()}}
+
+        <!--slack endpoint-->
+        <div class="form-group required {{ $errors->has('slack_endpoint') ? 'error' : '' }}">
+            <div class="col-md-2">
+                {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
+            </div>
+            <div class="col-md-10">
+                @if (config('app.lock_passwords')===true)
+                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                    <input type="text" wire:model.lazy="slack_endpoint" id="slack_endpoint" class= 'form-control' placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('slack_endpoint', $slack_endpoint)}} ><br>
+                @else
+                    <input type="text" wire:model.lazy="slack_endpoint" id="slack_endpoint" class= 'form-control' placeholder="https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX" {{old('slack_endpoint', $slack_endpoint)}} ><br>
+                @endif
+                {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+            </div>
+        </div>
+
+        <!-- slack channel -->
+        <div class="form-group required {{ $errors->has('slack_channel') ? 'error' : '' }}">
+            <div class="col-md-2">
+                {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
+            </div>
+            <div class="col-md-10">
+                @if (config('app.lock_passwords')===true)
+                    <input type="text" wire:model.lazy="slack_channel" id="slack_channel" class='form-control' placeholder="#IT-Ops" value="{{old('slack_channel', $slack_channel)}}" ><br>
+                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+
+                @else
+                    <input type="text" wire:model.lazy="slack_channel" id="slack_channel" class= 'form-control' placeholder="#IT-Ops" value="{{old('slack_channel', $slack_channel)}}" ><br>
+                @endif
+                {!! $errors->first('slack_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+            </div>
+        </div>
+
+        <!-- slack botname -->
+        <div class="form-group required {{ $errors->has('slack_botname') ? 'error' : '' }}">
+            <div class="col-md-2">
+                {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
+            </div>
+            <div class="col-md-10">
+                @if (config('app.lock_passwords')===true)
+                    <input type="text" wire:model.lazy="slack_botname" id="slack_botname" class= 'form-control' placeholder="Snipe-Bot" {{old('slack_botname', $slack_botname)}} ><br>
+                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+
+                @else
+                    <input type="text" wire:model.lazy="slack_botname" id="slack_botname" class= 'form-control' placeholder="Snipe-Bot" {{old('slack_botname', $slack_botname)}} ><br>
+                @endif
+                {!! $errors->first('slack_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+            </div><!--col-md-10-->
+        </div>
+
+        <!--Slack Integration Test-->
+            @if($slack_endpoint != null && $slack_channel != null && $slack_botname != null)
+        <div class="form-group">
+                <div class="col-md-2">
+                    {{ Form::label('test_slack', 'Test Slack') }}
+                </div>
+                <div class="col-md-10">
+                    <a href="#" wire:click.prevent="testSlack" id="test_slack" class="btn btn-default btn-sm pull-left"><span>{!! trans('admin/settings/general.slack_test') !!}</span></a>
+                    <div wire:loading><i class="fas fa-spinner spin"></i></div>
+                </div>
+        </div>
+            @endif
+
+        <div class="box-footer" style="margin-top: 45px;">
+
+            <div class="text-right col-md-12">
+                <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
+                <button type="submit" id="save_slack" class="btn btn-primary"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+            </div>
+        </div><!--box-footer-->
+        </form>
+
+    </div> <!-- /box -->
+
+

resources/views/settings/slack.blade.php

@@ -20,15 +20,9 @@
         }
     </style>
 
-
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
-
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
 
-
             <div class="panel box box-default">
                 <div class="box-header with-border">
                     <h2 class="box-title">
@@ -37,227 +31,20 @@
                 </div>
                 <div class="box-body">
 
-
                     <p style="padding: 20px;">
                         {!! trans('admin/settings/general.slack_integration_help',array('slack_link' => 'https://my.slack.com/services/new/incoming-webhook')) !!}
-
-                    @if (($setting->slack_channel=='') && ($setting->slack_endpoint==''))
-                           {{ trans('admin/settings/general.slack_integration_help_button') }}
-                    @endif
                     </p>
 
+                    @livewire('slack-settings-form')
 
-                    <div class="col-md-12" style="border-top: 0px;">
-
-
-                        <!-- slack endpoint -->
-                        <div class="form-group required {{ $errors->has('slack_endpoint') ? 'error' : '' }}">
-                            <div class="col-md-2">
-                                {{ Form::label('slack_endpoint', trans('admin/settings/general.slack_endpoint')) }}
-                            </div>
-                            <div class="col-md-10">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-
-                                @else
-                                    {{ Form::text('slack_endpoint', old('slack_endpoint', $setting->slack_endpoint), array('class' => 'form-control','placeholder' => 'https://hooks.slack.com/services/XXXXXXXXXXXXXXXXXXXXX', 'id' => 'slack_endpoint')) }}
-                                @endif
-                                {!! $errors->first('slack_endpoint', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- slack channel -->
-                        <div class="form-group required {{ $errors->has('slack_channel') ? 'error' : '' }}">
-                            <div class="col-md-2">
-                                {{ Form::label('slack_channel', trans('admin/settings/general.slack_channel')) }}
-                            </div>
-                            <div class="col-md-10">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_channel', old('slack_channel', $setting->slack_channel), array('class' => 'form-control','disabled'=>'disabled','placeholder' => '#IT-Ops')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-
-                                @else
-                                    {{ Form::text('slack_channel', old('slack_channel', $setting->slack_channel), array('class' => 'form-control','placeholder' => '#IT-Ops')) }}
-                                @endif
-                                {!! $errors->first('slack_channel', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- slack botname -->
-                        <div class="form-group required {{ $errors->has('slack_botname') ? 'error' : '' }}">
-                            <div class="col-md-2">
-                                {{ Form::label('slack_botname', trans('admin/settings/general.slack_botname')) }}
-                            </div>
-                            <div class="col-md-10">
-                                @if (config('app.lock_passwords')===true)
-                                    {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','disabled'=>'disabled','placeholder' => 'Snipe-Bot')) }}
-                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
-
-                                @else
-                                    {{ Form::text('slack_botname', old('slack_botname', $setting->slack_botname), array('class' => 'form-control','placeholder' => 'Snipe-Bot')) }}
-                                @endif
-                                {!! $errors->first('slack_botname', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <div class="form-group" id="slacktestcontainer" style="display: none">
-                            <div class="col-md-2">
-                                {{ Form::label('test_slack', 'Test Slack') }}
-                            </div>
-                            <div class="col-md-10" id="slacktestrow">
-                                <a class="btn btn-default btn-sm pull-left" id="slacktest" style="margin-right: 10px;">{!! trans('admin/settings/general.slack_test') !!}</a>
-                            </div>
-                            <div class="col-md-10 col-md-offset-2">
-                                <span id="slacktesticon"></span>
-                                <span id="slacktestresult"></span>
-                                <span id="slackteststatus"></span>
-                            </div>
-
-
-                        </div>
-                    </div> <!--/-->
-                </div> <!--/.box-body-->
-                <div class="box-footer">
-                    <div class="text-left col-md-6">
-                        <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
-                    </div>
-                    <div class="text-right col-md-6">
-                        <button type="submit" id="save_slack" class="btn btn-primary" disabled><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
-                    </div>
-
-                </div>
-            </div> <!-- /box -->
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
 
 @stop
 
-@push('js')
-    <script nonce="{{ csrf_token() }}">
-        var fieldcheck = function (event) {
-            if($('#slack_endpoint').val() != "" && $('#slack_channel').val() != "" && $('#slack_botname').val() != "") {
-                //enable test button *only* if all three fields are filled in
-                $('#slacktestcontainer').fadeIn(500);
-            } else {
-                //otherwise it's hidden
-                $('#slacktestcontainer').fadeOut(500);
-            }
-
-            if(event) { //on 'initial load' we don't *have* an 'event', but in the regular keyup callback, we *do*. So this only fires on 'real' callback events, not on first load
-                if($('#slack_endpoint').val() == "" && $('#slack_channel').val() == "" && $('#slack_botname').val() == "") {
-                    // if all three fields are blank, the user may want to disable Slack integration; enable the Save button
-                    $('#save_slack').removeAttr('disabled');
-                }
-            }
-        };
-
-        fieldcheck(); //run our field-checker once on page-load to set the initial state correctly.
-
-        $('input:text').keyup(fieldcheck); // if *any* text field changes, we recalculate button states
-
-        $("#slacktest").click(function() {
-
-            $("#slacktestrow").removeClass('text-success');
-            $("#slacktestrow").removeClass('text-danger');
-            $("#slackteststatus").removeClass('text-danger');
-            $("#slackteststatus").html('');
-            $("#slacktesticon").html('<i class="fas fa-spinner spin"></i> {{ trans('admin/settings/message.slack.sending') }}');
-            $.ajax({
-                
-                // If I comment this back in, I always get a success (200) message
-                // Without it, I get 
-                    //  beforeSend: function (xhr) { 
-                    //  xhr.setRequestHeader("Content-Type","application/json");
-                    // xhr.setRequestHeader("Accept","text/json");
-                    // },
 
 
-                url: '{{ route('api.settings.slacktest') }}',
-                type: 'POST',
-                headers: {
-                    "X-Requested-With": 'XMLHttpRequest',
-                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content'),
-                //    'Accept': 'application/json',
-                //    'Content-Type': 'application/json',
-                },
-                data: {
-                    'slack_endpoint': $('#slack_endpoint').val(),
-                    'slack_channel': $('#slack_channel').val(),
-                    'slack_botname': $('#slack_botname').val(),
-
-                },
-
-                dataType: 'json',
-
-                accepts: {
-                    text: "application/json"
-                },
-
-                success: function (data) {
-                    $('#save_slack').removeAttr('disabled');
-                    $("#slacktesticon").html('');
-                    $("#slacktestrow").addClass('text-success');
-                    $("#slackteststatus").addClass('text-success');
-                    //TODO: This is a bit hacky...Might need some cleanup
-                    $("#slackteststatus").html('<i class="fas fa-check text-success"></i> {{ trans('admin/settings/message.slack.success_pt1') }} ' + $('#slack_channel').val() + '{{ trans('admin/settings/message.slack.success_pt2') }}');
-                },
-
-                error: function (data) {
 
 
-                    if (data.responseJSON) {
-                        var errors = data.responseJSON.errors;
-                        var error_msg = data.responseJSON.message;
-                    } else {
-                        var errors;
-                        var error_msg = trans('admin/settings/message.slack.error');
-                    }
 
-                    var error_text = '';
-
-                    $('#save_slack').attr("disabled", true);
-                    $("#slacktesticon").html('');
-                    $("#slackteststatus").addClass('text-danger');
-                    $("#slacktesticon").html('<i class="fas fa-exclamation-triangle text-danger"></i><span class="text-danger">' + error_msg+ '</span>');
-
-                    
-                    if (data.status == 500) {
-                        $('#slackteststatus').html('{{  trans('admin/settings/message.slack.500') }}');
-                    } else if ((data.status == 400) || (data.status == 422)) {
-                        console.log('Type of errors is '+ typeof errors);
-                        console.log('Data status was 400 or 422');
-
-                        if (typeof errors != 'string') {
-                        
-                            console.log(errors.length);
-
-                            for (i in errors) {
-                                if (errors[i]) {
-                                    error_text += '<li>Error: ' + errors[i];
-                                }
-
-                            }
-
-                        } else {
-
-                            error_text = errors;
-                        }
-
-                        $('#slackteststatus').html(error_text);
-
-                    } else {
-                        $('#slackteststatus').html(data.responseText.message);
-                    }
-                }
-
-
-            });
-            return false;
-        });
-
-    </script>
-
-@endpush