added dependsOnIn and dependsOnNotIn support

alexwenzel · Jun 20, 2022 · 9c16f38 · 9c16f38
1 parent 6d86e24
commit 9c16f38
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -1,43 +1,43 @@
 {
-  "name": "alexwenzel/nova-dependency-container",
-  "description": "A Laravel Nova 4 form container for grouping fields that depend on other field values.",
-  "keywords": [
-    "laravel",
-    "nova",
-    "nova-4",
-    "field"
-  ],
-  "authors": [
-    {
-      "name": "alexwenzel",
-      "email": "[email protected]"
+    "name": "alexwenzel/nova-dependency-container",
+    "description": "A Laravel Nova 4 form container for grouping fields that depend on other field values.",
+    "keywords": [
+        "laravel",
+        "nova",
+        "nova-4",
+        "field"
+    ],
+    "authors": [
+        {
+            "name": "alexwenzel",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Epartment E-commerce",
+            "email": "[email protected]"
+        }
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^8.0",
+        "laravel/framework": "^9.0",
+        "laravel/nova": "^4.0"
     },
-    {
-      "name": "Epartment E-commerce",
-      "email": "[email protected]"
-    }
-  ],
-  "license": "MIT",
-  "require": {
-    "php": "^8.0",
-    "laravel/framework": "^9.0",
-    "laravel/nova": "^4.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Alexwenzel\\DependencyContainer\\": "src/"
-    }
-  },
-  "extra": {
-    "laravel": {
-      "providers": [
-        "Alexwenzel\\DependencyContainer\\FieldServiceProvider"
-      ]
-    }
-  },
-  "config": {
-    "sort-packages": true
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
+    "autoload": {
+        "psr-4": {
+            "Alexwenzel\\DependencyContainer\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Alexwenzel\\DependencyContainer\\FieldServiceProvider"
+            ]
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/package.json b/package.json
@@ -1,20 +1,20 @@
 {
-  "private": true,
-  "scripts": {
-    "dev": "npm run development",
-    "development": "mix",
-    "watch": "mix watch",
-    "watch-poll": "mix watch -- --watch-options-poll=1000",
-    "hot": "mix watch --hot",
-    "prod": "npm run production",
-    "production": "mix --production",
-    "nova:install": "npm --prefix='../../vendor/laravel/nova' ci"
-  },
-  "devDependencies": {
-    "@vue/compiler-sfc": "^3.2.22",
-    "laravel-mix": "^6.0.41",
-    "lodash": "^4.17.21",
-    "postcss": "^8.3.11",
-    "vue-loader": "^16.8.3"
-  }
+    "private": true,
+    "scripts": {
+        "dev": "npm run development",
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
+        "prod": "npm run production",
+        "production": "mix --production",
+        "nova:install": "npm --prefix='../../vendor/laravel/nova' ci"
+    },
+    "devDependencies": {
+        "@vue/compiler-sfc": "^3.2.22",
+        "laravel-mix": "^6.0.41",
+        "lodash": "^4.17.21",
+        "postcss": "^8.3.11",
+        "vue-loader": "^16.8.3"
+    }
 }
diff --git a/readme.md b/readme.md
@@ -57,13 +57,15 @@ class Page extends Resource
 
 ### Dependencies
 
-The package supports four kinds of dependencies:
+The package supports this kinds of dependencies:
 
 1. `->dependsOn('field', 'value')`
 2. `->dependsOnNot('field', 'value')`
 3. `->dependsOnEmpty('field')`
 4. `->dependsOnNotEmpty('field')`
 5. `->dependsOnNullOrZero('field')`
+6. `->dependsOnIn('field', [array])`
+7. `->dependsOnNotIn('field', [array])`
 
 These dependencies can be combined by chaining the methods on the `DependencyContainer`:
 

diff --git a/resources/js/components/FormField.vue b/resources/js/components/FormField.vue
@@ -136,6 +136,16 @@ export default {
                     return;
                 }
 
+                if (dependency.hasOwnProperty('in') && dependency.in.includes(dependencyValue)) {
+                    this.dependenciesSatisfied = true;
+                    return;
+                }
+
+                if (dependency.hasOwnProperty('notin') && !dependency.notin.includes(dependencyValue)) {
+                    this.dependenciesSatisfied = true;
+                    return;
+                }
+
                 if (dependency.hasOwnProperty('value') && dependencyValue == dependency.value) {
                     this.dependenciesSatisfied = true;
                     return;

diff --git a/src/DependencyContainer.php b/src/DependencyContainer.php
@@ -112,6 +112,38 @@ public function dependsOnNullOrZero($field)
         ]);
     }
 
+    /**
+     * Adds a dependency for in
+     *
+     * @param $field
+     * @param $array
+     * @return $this
+     */
+    public function dependsOnIn($field, $array)
+    {
+        return $this->withMeta([
+            'dependencies' => array_merge($this->meta['dependencies'], [
+                array_merge($this->getFieldLayout($field), ['in' => $array])
+            ])
+        ]);
+    }
+
+    /**
+     * Adds a dependency for not in
+     *
+     * @param $field
+     * @param $array
+     * @return $this
+     */
+    public function dependsOnNotIn($field, $array)
+    {
+        return $this->withMeta([
+            'dependencies' => array_merge($this->meta['dependencies'], [
+                array_merge($this->getFieldLayout($field), ['notin' => $array])
+            ])
+        ]);
+    }
+
     /**
      * Get layout for a specified field. Dot notation will result in {field}.{property}. If no dot was found it will
      * result in {field}.{field}, as it was in previous versions by default.
@@ -173,6 +205,16 @@ public function resolveForDisplay($resource, $attribute = null)
                 continue;
             }
 
+            if (array_key_exists('in', $dependency) && in_array($resource->{$dependency['property']}, $dependency['in'])) {
+                $this->meta['dependencies'][$index]['satisfied'] = true;
+                continue;
+            }
+
+            if (array_key_exists('notin', $dependency) && !in_array($resource->{$dependency['property']}, $dependency['notin'])) {
+                $this->meta['dependencies'][$index]['satisfied'] = true;
+                continue;
+            }
+
             if (array_key_exists('value', $dependency)) {
                 if (is_array($resource)) {
                     if (isset($resource[$dependency['property']]) && $dependency['value'] == $resource[$dependency['property']]) {