chore: Pass org if already selected (#125)

* pass org if already selected * _
invertase · Dec 27, 2024 · 56a5c79 · 56a5c79
1 parent f392a68
commit 56a5c79
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 33 deletions.
diff --git a/packages/globe_cli/lib/src/package_info.dart b/packages/globe_cli/lib/src/package_info.dart
@@ -2,5 +2,6 @@
 
 const name = 'globe_cli';
 const version = '0.0.14-dev.0+1';
-const description = 'The global deployment platform for Dart & Flutter applications.';
+const description =
+    'The global deployment platform for Dart & Flutter applications.';
 const executable = 'globe';
diff --git a/packages/globe_cli/lib/src/utils/prompts.dart b/packages/globe_cli/lib/src/utils/prompts.dart
@@ -19,12 +19,11 @@ import 'scope.dart';
 Future<ScopeMetadata> linkProject({
   required Logger logger,
   required GlobeApi api,
+  Organization? org,
 }) async {
   try {
-    final organization = await selectOrganization(
-      logger: logger,
-      api: api,
-    );
+    final organization =
+        org ?? await selectOrganization(logger: logger, api: api);
 
     final project = await selectProject(
       organization,
@@ -111,6 +110,7 @@ Future<Project> selectProject(
   String message = '❓ Please select a project you want to link:',
 }) async {
   logger.detail('Fetching organization projects');
+
   final projects = await api.getProjects(org: organization.id);
   logger.detail('Found ${projects.length} projects');
 

diff --git a/packages/globe_cli/lib/src/utils/scope.dart b/packages/globe_cli/lib/src/utils/scope.dart
@@ -89,37 +89,40 @@ class GlobeScope {
   }) async {
     if (hasScope()) return current!;
 
-    final selectOrg = await selectOrganization(logger: logger, api: api);
-    const linkNewProjectSymbol = '__LINK_NEW_PROJECT';
-
-    final scopes = workspace.where((p) => p.orgId == selectOrg.id);
-    var selectedProject = linkNewProjectSymbol;
-
-    if (scopes.length > 1) {
-      selectedProject = logger.chooseOne(
-        '🔺 Select project:',
-        choices: [
-          ...scopes.map((o) => o.projectId),
-          if (canLinkNew) linkNewProjectSymbol,
-        ],
-        display: (choice) {
-          if (choice == linkNewProjectSymbol) {
-            return lightYellow.wrap('link new project +')!;
-          }
-          return scopes.firstWhere((o) => o.projectId == choice).projectSlug;
-        },
-      );
-    } else if (scopes.length == 1) {
-      return setScope(scopes.first);
-    }
+    final selectedOrg = await selectOrganization(logger: logger, api: api);
+
+    if (workspace.isNotEmpty) {
+      const linkNewProjectSymbol = '__LINK_NEW_PROJECT';
+
+      final scopes = workspace.where((p) => p.orgId == selectedOrg.id);
+      var selectedProject = linkNewProjectSymbol;
+
+      if (scopes.length > 1) {
+        selectedProject = logger.chooseOne(
+          '🔺 Select project:',
+          choices: [
+            ...scopes.map((o) => o.projectId),
+            if (canLinkNew) linkNewProjectSymbol,
+          ],
+          display: (choice) {
+            if (choice == linkNewProjectSymbol) {
+              return lightYellow.wrap('link new project +')!;
+            }
+            return scopes.firstWhere((o) => o.projectId == choice).projectSlug;
+          },
+        );
+      } else if (scopes.length == 1) {
+        return setScope(scopes.first);
+      }
 
-    if (selectedProject != linkNewProjectSymbol) {
-      return setScope(
-        scopes.firstWhere((scope) => scope.projectId == selectedProject),
-      );
+      if (selectedProject != linkNewProjectSymbol) {
+        return setScope(
+          scopes.firstWhere((scope) => scope.projectId == selectedProject),
+        );
+      }
     }
 
-    return linkProject(logger: logger, api: api);
+    return linkProject(logger: logger, api: api, org: selectedOrg);
   }
 
   Future<Organization> _findOrg() async {