Skip to content

Commit db23c4d

Browse files
authored
Merge branch 'master' into fix-ffp-results
2 parents 15b53e5 + 4d2586b commit db23c4d

5 files changed

Lines changed: 212 additions & 9 deletions

File tree

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"vercel": "^28.2.2"
5555
},
5656
"dependencies": {
57-
"@heroicons/react": "^2.0.10",
57+
"@heroicons/react": "^2.0.16",
5858
"@jcubic/lips": "^1.0.0-beta.14",
5959
"axios": "^0.23.0",
6060
"bayes": "^1.0.0",

src/columns/create-json-object.ts

Lines changed: 179 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
11
import * as glide from "../glide";
22

3-
const run: glide.Column = (k1, v1, k2, v2, k3, v3) => {
3+
const run: glide.Column = (
4+
k1,
5+
v1,
6+
k2,
7+
v2,
8+
k3,
9+
v3,
10+
k4,
11+
v4,
12+
k5,
13+
v5,
14+
k6,
15+
v6,
16+
k7,
17+
v7,
18+
k8,
19+
v8,
20+
k9,
21+
v9,
22+
k10,
23+
v10,
24+
k11,
25+
v11,
26+
k12,
27+
v12
28+
) => {
429
const obj: any = {};
530

631
if (k1?.value !== undefined) {
@@ -15,6 +40,41 @@ const run: glide.Column = (k1, v1, k2, v2, k3, v3) => {
1540
obj[k3.value.toString()] = v3?.value;
1641
}
1742

43+
if (k4?.value !== undefined) {
44+
obj[k4.value.toString()] = v4?.value;
45+
}
46+
47+
if (k5?.value !== undefined) {
48+
obj[k5.value.toString()] = v5?.value;
49+
}
50+
51+
if (k6?.value !== undefined) {
52+
obj[k6.value.toString()] = v6?.value;
53+
}
54+
55+
if (k7?.value !== undefined) {
56+
obj[k7.value.toString()] = v7?.value;
57+
}
58+
59+
if (k8?.value !== undefined) {
60+
obj[k8.value.toString()] = v8?.value;
61+
}
62+
63+
if (k9?.value !== undefined) {
64+
obj[k9.value.toString()] = v9?.value;
65+
}
66+
67+
if (k10?.value !== undefined) {
68+
obj[k10.value.toString()] = v10?.value;
69+
}
70+
71+
if (k11?.value !== undefined) {
72+
obj[k11.value.toString()] = v11?.value;
73+
}
74+
if (k12?.value !== undefined) {
75+
obj[k12.value.toString()] = v12?.value;
76+
}
77+
1878
return JSON.stringify(obj);
1979
};
2080

@@ -49,6 +109,78 @@ export default glide.column({
49109
displayName: "v3",
50110
type: "primitive",
51111
},
112+
k4: {
113+
displayName: "k4",
114+
type: "string",
115+
},
116+
v4: {
117+
displayName: "v4",
118+
type: "primitive",
119+
},
120+
k5: {
121+
displayName: "k5",
122+
type: "string",
123+
},
124+
v5: {
125+
displayName: "v5",
126+
type: "primitive",
127+
},
128+
k6: {
129+
displayName: "k6",
130+
type: "string",
131+
},
132+
v6: {
133+
displayName: "v6",
134+
type: "primitive",
135+
},
136+
k7: {
137+
displayName: "k7",
138+
type: "string",
139+
},
140+
v7: {
141+
displayName: "v7",
142+
type: "primitive",
143+
},
144+
k8: {
145+
displayName: "k8",
146+
type: "string",
147+
},
148+
v8: {
149+
displayName: "v8",
150+
type: "primitive",
151+
},
152+
k9: {
153+
displayName: "k9",
154+
type: "string",
155+
},
156+
v9: {
157+
displayName: "v9",
158+
type: "primitive",
159+
},
160+
k10: {
161+
displayName: "k10",
162+
type: "string",
163+
},
164+
v10: {
165+
displayName: "v10",
166+
type: "primitive",
167+
},
168+
k11: {
169+
displayName: "k11",
170+
type: "string",
171+
},
172+
v11: {
173+
displayName: "v11",
174+
type: "primitive",
175+
},
176+
k12: {
177+
displayName: "k12",
178+
type: "string",
179+
},
180+
v12: {
181+
displayName: "v12",
182+
type: "primitive",
183+
},
52184
},
53185
example: {
54186
k1: `no-code`,
@@ -59,9 +191,53 @@ export default glide.column({
59191
tests: [
60192
{ params: {}, expectedResult: "{}" },
61193
{
62-
params: { k1: "foo", v1: "bar" },
63-
expectedResult: `{"foo":"bar"}`,
194+
params: { k1: "key1", v1: "val1" },
195+
expectedResult: `{"key1":"val1"}`,
196+
},
197+
{
198+
params: { k2: "key2", v2: "val2" },
199+
expectedResult: `{"key2":"val2"}`,
200+
},
201+
{
202+
params: { k3: "key3", v3: "val3" },
203+
expectedResult: `{"key3":"val3"}`,
204+
},
205+
{
206+
params: { k4: "key4", v4: "val4" },
207+
expectedResult: `{"key4":"val4"}`,
208+
},
209+
{
210+
params: { k5: "key5", v5: "val5" },
211+
expectedResult: `{"key5":"val5"}`,
212+
},
213+
{
214+
params: { k6: "key6", v6: "val6" },
215+
expectedResult: `{"key6":"val6"}`,
216+
},
217+
{
218+
params: { k7: "key7", v7: "val7" },
219+
expectedResult: `{"key7":"val7"}`,
64220
},
221+
{
222+
params: { k8: "key8", v8: "val8" },
223+
expectedResult: `{"key8":"val8"}`,
224+
},
225+
{
226+
params: { k9: "key9", v9: "val9" },
227+
expectedResult: `{"key9":"val9"}`,
228+
},
229+
{
230+
params: { k10: "key10", v10: "val10" },
231+
expectedResult: `{"key10":"val10"}`,
232+
},
233+
{
234+
params: { k11: "key11", v11: "val11" },
235+
expectedResult: `{"key11":"val11"}`,
236+
},
237+
{
238+
params: { k12: "key12", v12: "val12" },
239+
expectedResult: `{"key12":"val12"}`,
240+
}
65241
],
66242
icon: `<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
67243
<path d="M34.4381 11.774C34.1931 11.474 33.9761 11.205 33.7931 10.968C33.6822 10.8233 33.5338 10.7117 33.3641 10.6452C33.1943 10.5787 33.0096 10.5599 32.8299 10.5908C32.6502 10.6217 32.4824 10.7011 32.3446 10.8205C32.2068 10.9398 32.1043 11.0946 32.0481 11.268C31.4977 12.9485 30.6607 14.521 29.5741 15.916C29.6381 11.944 28.8511 4.93503 23.0951 1.16003C22.944 1.06079 22.7688 1.00435 22.5882 0.996737C22.4076 0.989122 22.2283 1.03061 22.0693 1.11679C21.9104 1.20296 21.7779 1.3306 21.6857 1.48613C21.5936 1.64166 21.5453 1.81926 21.5461 2.00003C21.5461 5.27603 19.7911 8.76703 16.7401 11.575C13.7881 14.293 6.92906 21.476 7.00006 29.433C7.05006 34.973 9.87106 42.633 17.0271 45.674C17.1341 42.197 18.6511 39.728 20.1351 37.348C21.5451 35.084 22.8781 32.948 23.0001 29.959C23.0077 29.7673 23.0703 29.5819 23.1805 29.4248C23.2906 29.2677 23.4436 29.1456 23.6213 29.073C23.7989 29.0005 23.9936 28.9806 24.1823 29.0157C24.3709 29.0508 24.5454 29.1395 24.6851 29.271C28.7181 33.071 30.8791 38.701 30.9851 45.571C36.1181 43.382 40.3221 38.611 40.9421 30.85C41.7431 20.771 36.8091 14.694 34.4381 11.774Z" fill="currentColor"/>

src/columns/fetch.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ export default glide.column({
4747
},
4848
result: { type: "primitive" },
4949
example: {
50-
url: "https://api.icndb.com/jokes/random/3",
51-
query: `.value[0].joke`,
50+
url: "https://api.chucknorris.io/jokes/random",
51+
query: `.value`,
5252
},
5353
run,
5454
});

src/columns/format-duration.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import * as glide from "../glide";
2+
3+
import { Duration } from "luxon";
4+
5+
export default glide
6+
.columnNamed("Format Duration")
7+
.withDescription(`Format a duration in seconds into text like '1:30'.`)
8+
.withReleased("direct")
9+
.withCategory("Date & Time")
10+
.withAuthor("luxon", "https://moment.github.io/luxon")
11+
.withAbout(
12+
`
13+
Learn about date formatting in [luxon's documentation](https://moment.github.io/luxon/#/formatting?id=table-of-tokens).
14+
`
15+
)
16+
.withStringResult()
17+
.withRequiredNumberParam("seconds")
18+
.withRequiredStringParam("format", "Format (e.g. mm:ss)")
19+
20+
.withTest({ seconds: 100, format: "mm:ss" }, "01:40")
21+
.withTest({ seconds: 1, format: "ss" }, "01")
22+
.withTest({ seconds: 1000000000, format: "yy:MM:dd:hh:mm:ss" }, "31:08:19:01:46:40")
23+
24+
.run(({ seconds, format }) => {
25+
const duration = Duration.fromMillis(seconds * 1000);
26+
return duration.toFormat(format);
27+
});

0 commit comments

Comments
 (0)