Skip to content

Commit 85aade6

Browse files
pvdzpvdz
authored
Improve default org feedback / CTA (#662)
1 parent 20bec40 commit 85aade6

File tree

64 files changed

+346
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+346
-260
lines changed

‎src/commands/analytics/cmd-analytics.test.mts‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('socket analytics', async () => {
5050
"
5151
_____ _ _ /---------------
5252
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
53-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
53+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
5454
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
5555
`)
5656
expect(code, 'explicit help should exit with code 0').toBe(0)
@@ -72,8 +72,9 @@ describe('socket analytics', async () => {
7272
"
7373
_____ _ _ /---------------
7474
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
75-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
75+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
7676
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>
77+
7778
\\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
7879
7980
- The time filter must either be 7, 30 or 90 (\\x1b[32mok\\x1b[39m)
@@ -105,8 +106,9 @@ describe('socket analytics', async () => {
105106
"
106107
_____ _ _ /---------------
107108
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
108-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
109+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
109110
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>
111+
110112
\\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
111113
112114
- Legacy flags are no longer supported. See v1 migration guide. (\\x1b[31mreceived legacy flags\\x1b[39m)
@@ -129,7 +131,7 @@ describe('socket analytics', async () => {
129131
"
130132
_____ _ _ /---------------
131133
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
132-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
134+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
133135
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
134136
`)
135137

@@ -147,7 +149,7 @@ describe('socket analytics', async () => {
147149
"
148150
_____ _ _ /---------------
149151
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
150-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
152+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
151153
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
152154
`)
153155

@@ -165,8 +167,9 @@ describe('socket analytics', async () => {
165167
"
166168
_____ _ _ /---------------
167169
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
168-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
170+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
169171
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>
172+
170173
\\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
171174
172175
- When scope=repo, repo name should be the second argument (\\x1b[31mmissing\\x1b[39m)
@@ -196,7 +199,7 @@ describe('socket analytics', async () => {
196199
"
197200
_____ _ _ /---------------
198201
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
199-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
202+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
200203
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
201204
`)
202205

@@ -214,7 +217,7 @@ describe('socket analytics', async () => {
214217
"
215218
_____ _ _ /---------------
216219
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
217-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
220+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
218221
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
219222
`)
220223

@@ -232,7 +235,7 @@ describe('socket analytics', async () => {
232235
"
233236
_____ _ _ /---------------
234237
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
235-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
238+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
236239
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
237240
`)
238241

@@ -250,7 +253,7 @@ describe('socket analytics', async () => {
250253
"
251254
_____ _ _ /---------------
252255
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
253-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
256+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
254257
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
255258
`)
256259

@@ -276,8 +279,9 @@ describe('socket analytics', async () => {
276279
"
277280
_____ _ _ /---------------
278281
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
279-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
282+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
280283
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>
284+
281285
\\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
282286
283287
- Legacy flags are no longer supported. See v1 migration guide. (\\x1b[31mreceived legacy flags\\x1b[39m)
@@ -307,7 +311,7 @@ describe('socket analytics', async () => {
307311
"
308312
_____ _ _ /---------------
309313
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
310-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
314+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
311315
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
312316
`)
313317

@@ -333,7 +337,7 @@ describe('socket analytics', async () => {
333337
"
334338
_____ _ _ /---------------
335339
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
336-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
340+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
337341
|_____|___|___|_,_|___|_|.dev | Command: \`socket analytics\`, cwd: <redacted>"
338342
`)
339343

‎src/commands/audit-log/cmd-audit-log.test.mts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('socket audit-log', async () => {
5555
"
5656
_____ _ _ /---------------
5757
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
58-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
58+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
5959
|_____|___|___|_,_|___|_|.dev | Command: \`socket audit-log\`, cwd: <redacted>"
6060
`)
6161

@@ -76,11 +76,12 @@ describe('socket audit-log', async () => {
7676
"
7777
_____ _ _ /---------------
7878
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
79-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
79+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
8080
|_____|___|___|_,_|___|_|.dev | Command: \`socket audit-log\`, cwd: <redacted>
81-
\\x1b[33m\\u203c\\x1b[39m Missing the org slug and no --org flag set. Trying to auto-discover the org now...
82-
\\x1b[34mi\\x1b[39m Note: you can set the default org slug to prevent this issue. You can also override all that with the --org flag.
81+
\\x1b[33m\\u203c\\x1b[39m Unable to determine the target org. Trying to auto-discover it now...
82+
\\x1b[34mi\\x1b[39m Note: you can run \`socket login\` to set a default org. You can also override it with the --org flag.
8383
\\x1b[31m\\xd7\\x1b[39m Skipping auto-discovery of org in dry-run mode
84+
8485
\\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
8586
8687
- Org name by default setting, --org, or auto-discovered (\\x1b[31mmissing\\x1b[39m)
@@ -108,8 +109,9 @@ describe('socket audit-log', async () => {
108109
"
109110
_____ _ _ /---------------
110111
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
111-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>, org: <redacted>
112+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
112113
|_____|___|___|_,_|___|_|.dev | Command: \`socket audit-log\`, cwd: <redacted>
114+
113115
\\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again
114116
115117
- Legacy flags are no longer supported. See v1 migration guide. (\\x1b[31mreceived legacy flags\\x1b[39m)
@@ -135,7 +137,7 @@ describe('socket audit-log', async () => {
135137
"
136138
_____ _ _ /---------------
137139
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
138-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>, org: <redacted>
140+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
139141
|_____|___|___|_,_|___|_|.dev | Command: \`socket audit-log\`, cwd: <redacted>"
140142
`)
141143

@@ -160,7 +162,7 @@ describe('socket audit-log', async () => {
160162
"
161163
_____ _ _ /---------------
162164
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
163-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
165+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, --org: forcedorg
164166
|_____|___|___|_,_|___|_|.dev | Command: \`socket audit-log\`, cwd: <redacted>"
165167
`)
166168

‎src/commands/ci/cmd-ci.test.mts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('socket ci', async () => {
4242
"
4343
_____ _ _ /---------------
4444
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
45-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
45+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
4646
|_____|___|___|_,_|___|_|.dev | Command: \`socket ci\`, cwd: <redacted>"
4747
`)
4848

@@ -61,7 +61,7 @@ describe('socket ci', async () => {
6161
"
6262
_____ _ _ /---------------
6363
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
64-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
64+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
6565
|_____|___|___|_,_|___|_|.dev | Command: \`socket ci\`, cwd: <redacted>"
6666
`)
6767

‎src/commands/cli.test.mts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ describe('socket root command', async () => {
1616
Usage
1717
$ socket <command>
1818
19-
2019
All commands have their own --help page
2120
2221
Main commands
@@ -72,7 +71,7 @@ describe('socket root command', async () => {
7271
"
7372
_____ _ _ /---------------
7473
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
75-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
74+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
7675
|_____|___|___|_,_|___|_|.dev | Command: \`socket\`, cwd: <redacted>"
7776
`)
7877

@@ -92,7 +91,7 @@ describe('socket root command', async () => {
9291
"
9392
_____ _ _ /---------------
9493
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
95-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
94+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
9695
|_____|___|___|_,_|___|_|.dev | Command: \`socket\`, cwd: <redacted>"
9796
`)
9897

‎src/commands/config/cmd-config-auto.test.mts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('socket config auto', async () => {
5454
"
5555
_____ _ _ /---------------
5656
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
57-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
57+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
5858
|_____|___|___|_,_|___|_|.dev | Command: \`socket config auto\`, cwd: <redacted>"
5959
`)
6060

@@ -82,7 +82,7 @@ describe('socket config auto', async () => {
8282
"
8383
_____ _ _ /---------------
8484
| __|___ ___| |_ ___| |_ | Socket.dev CLI ver <redacted>
85-
|__ | * | _| '_| -_| _| | Node: <redacted>, API token set: <redacted>
85+
|__ | * | _| '_| -_| _| | Node: <redacted>, API token: <redacted>, org: <redacted>
8686
|_____|___|___|_,_|___|_|.dev | Command: \`socket config auto\`, cwd: <redacted>"
8787
`)
8888

0 commit comments

Comments
 (0)