From f0d1664623a83f740c780ad9a61567122f090db1 Mon Sep 17 00:00:00 2001
From: VAN BOSSUYT Nicolas <nivb@odoo.com>
Date: Thu, 29 Feb 2024 16:48:36 +0100
Subject: [PATCH] Fix graph command

---
 cutekit/bootstrap.sh |  9 +--------
 cutekit/model.py     | 12 ++++++------
 cutekit/plugins.py   |  5 +++--
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/cutekit/bootstrap.sh b/cutekit/bootstrap.sh
index 7589abf..b9aade6 100644
--- a/cutekit/bootstrap.sh
+++ b/cutekit/bootstrap.sh
@@ -47,15 +47,8 @@ if [ ! -f .cutekit/tools/ready ]; then
     fi
     source .cutekit/venv/bin/activate
 
-    echo "Downloading CuteKit..."
-    if [ ! -d .cutekit/tools/cutekit ]; then
-        git clone --depth 1 https://github.com/cute-engineering/cutekit .cutekit/tools/cutekit --branch "$CUTEKIT_VERSION"
-    else
-        echo "CuteKit already downloaded."
-    fi
-
     echo "Installing Tools..."
-    $CUTEKIT_PYTHON -m pip install -e .cutekit/tools/cutekit
+    $CUTEKIT_PYTHON -m pip install "git+https://github.com/cute-engineering/cutekit@$CUTEKIT_VERSION"
 
     echo "Installing plugins requirements..."
     if [ -f "meta/plugins/requirements.txt" ]; then
diff --git a/cutekit/model.py b/cutekit/model.py
index a927b71..470e8e4 100644
--- a/cutekit/model.py
+++ b/cutekit/model.py
@@ -624,11 +624,11 @@ class Registry(DataClassJsonMixin):
                             )
                         else:
                             victim.resolved[target.id].injected.append(c.id)
-                            victim.resolved[target.id].required = (
-                                utils.uniqPreserveOrder(
-                                    c.resolved[target.id].required
-                                    + victim.resolved[target.id].required
-                                )
+                            victim.resolved[
+                                target.id
+                            ].required = utils.uniqPreserveOrder(
+                                c.resolved[target.id].required
+                                + victim.resolved[target.id].required
                             )
 
             # Resolve tooling
@@ -700,7 +700,7 @@ def view(
     if scope is not None:
         scopeInstance = registry.lookup(scope, Component)
 
-    for component in registry.iterEnabled(target):
+    for component in registry.iter(Component):
         if not component.type == Kind.LIB and not showExe:
             continue
 
diff --git a/cutekit/plugins.py b/cutekit/plugins.py
index b3d2bc1..747a6a3 100644
--- a/cutekit/plugins.py
+++ b/cutekit/plugins.py
@@ -56,5 +56,6 @@ class PluginsArgs:
 
 
 def setup(args: PluginsArgs):
-    if not args.safemod:
-        loadAll()
+    if args.safemod:
+        return
+    loadAll()