sort workspaces by owner (vs member) first, then alphabetical order (#790)

* sort workspaces by owner (vs member) first, then alphabetical order of the name
to be consistent with the order displayed on the site

* be smarter

* Filter workspace list by tier and order by role (#789)

* filter tier and order by role

* no sort

* fix parens

* pattern

---------

Co-authored-by: Sylvestre <[email protected]>

Author: Fil

src/deploy.ts

@@ -104,9 +104,12 @@ export async function deploy(
   let authError: null | "unauthenticated" | "forbidden" = null;
   try {
     if (apiKey) {
+      const memberTiers = new Set(["starter_2024", "pro_2024", "enterprise_2024"]);
       currentUser = await apiClient.getCurrentUser();
       // List of valid workspaces that can be used to create projects.
-      currentUser.workspaces = currentUser.workspaces.filter((w) => w.role === "owner" || w.role === "member");
+      currentUser.workspaces = currentUser.workspaces.filter(
+        (w) => (w.role === "owner" || w.role === "member") && memberTiers.has(w.tier)
+      );
     }
   } catch (error) {
     if (isHttpError(error)) {
@@ -391,7 +394,7 @@ export async function promptDeployTarget(
       message: "Which Observable workspace do you want to use?",
       options: currentUser.workspaces
         .map((w) => ({value: w, label: formatUser(w)}))
-        .sort((a, b) => a.label.localeCompare(b.label)),
+        .sort((a, b) => b.value.role.localeCompare(a.value.role) || a.label.localeCompare(b.label)),
       initialValue: currentUser.workspaces[0] // the oldest workspace, maybe?
     });
     if (clack.isCancel(chosenWorkspace)) {

test/deploy-test.ts

@@ -531,6 +531,8 @@ describe("deploy", () => {
       assert.ok(err instanceof Error);
       assert.match(err.message, /out of inputs for select.*Which Observable workspace do you want to use/);
       assert.ok("options" in err && Array.isArray(err.options) && err.options.length === 2);
+      assert.ok("options" in err && Array.isArray(err.options) && err.options[0].value.role === "owner");
+      assert.ok("options" in err && Array.isArray(err.options) && err.options[1].value.role === "member");
     }
   });
 

test/mocks/observableApi.ts

@@ -342,7 +342,7 @@ const workspaces = [
     name: "Mock User's Workspace",
     tier: "pro_2024",
     type: "team",
-    role: "owner"
+    role: "member"
   },
   {
     id: "0000000000000002",