Fix front and backend views with new service variable setups

app/Models/Server.php

@@ -111,7 +111,7 @@ class Server extends Model
      * @param  string $uuid The Short-UUID of the server to return an object about.
      * @return \Illuminate\Database\Eloquent\Collection
      */
-    public static function byUuid($uuid)
+    public static function byUuid($uuid, array $with = [], array $withCount = [])
     {
         if (! Auth::check()) {
             throw new \Exception('You must call Server:byUuid as an authenticated user.');

app/Models/ServerVariable.php

@@ -52,6 +52,36 @@ class ServerVariable extends Model
          'variable_id' => 'integer',
      ];
 
+     /**
+      * Determine if variable is viewable by users.
+      *
+      * @return bool
+      */
+     public function getUserCanViewAttribute()
+     {
+         return (bool) $this->variable->user_viewable;
+     }
+
+     /**
+      * Determine if variable is editable by users.
+      *
+      * @return bool
+      */
+     public function getUserCanEditAttribute()
+     {
+         return (bool) $this->variable->user_editable;
+     }
+
+     /**
+      * Determine if variable is required.
+      *
+      * @return bool
+      */
+     public function getRequiredAttribute()
+     {
+         return $this->variable->required;
+     }
+
      /**
       * Returns information about a given variables parent.
       *

app/Models/ServiceOption.php

@@ -51,17 +51,6 @@ class ServiceOption extends Model
          'service_id' => 'integer',
      ];
 
-     /**
-      * Returns the display executable for the option and will use the parent
-      * service one if the option does not have one defined.
-      *
-      * @return string
-      */
-     public function getDisplayExecutableAttribute($value)
-     {
-         return (is_null($this->executable)) ? $this->service->executable : $this->executable;
-     }
-
      /**
       * Returns the display startup string for the option and will use the parent
       * service one if the option does not have one defined.

app/Models/ServiceVariable.php

@@ -47,13 +47,29 @@ class ServiceVariable extends Model
       *
       * @var array
       */
-     protected $casts = [
-         'option_id' => 'integer',
-         'user_viewable' => 'integer',
-         'user_editable' => 'integer',
-         'required' => 'integer',
-     ];
+    protected $casts = [
+        'option_id' => 'integer',
+        'user_viewable' => 'integer',
+        'user_editable' => 'integer',
+        'required' => 'integer',
+    ];
 
+    /**
+     * Returns the display executable for the option and will use the parent
+     * service one if the option does not have one defined.
+     *
+     * @return string
+     */
+    public function getRequiredAttribute($value)
+    {
+        return ($this->rules === 'required' || str_contains($this->rules, ['required|', '|required']));
+    }
+
+    /**
+     * Return server variables associated with this variable.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
     public function serverVariable()
     {
         return $this->hasMany(ServerVariable::class, 'variable_id');