Skip to content

Commit bf7f762

Browse files
kentonvkentonv
committed
Merge branch 'khulsman/naming-inconsistencies' into 'main'
Address naming inconsistencies See merge request cloudflare/developers/gadgets!299
2 parents 54df24e + ab432fc commit bf7f762

72 files changed

Lines changed: 441 additions & 310 deletions

File tree

Some content is hidden

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

‎packages/gatekeeper-cloudflare/src/cloudflare.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ function getBasePath(env: Env) {
7878
const SELF_CLOSING_HTML = `<!DOCTYPE html>
7979
<html lang="en"><body>
8080
<script type="text/javascript">window.close();</script>
81-
<p>Authorization complete. You may close this tab and return to the Gadgets Workshop.
81+
<p>Authorization complete. You may close this tab and return to Cloudflare OS.
8282
</body></html>`;
8383

8484
const INVALID_LINK_HTML = `<!DOCTYPE html>
8585
<html lang="en"><head><meta charset="UTF-8"><title>Authorization Link Expired</title></head>
8686
<body style="font-family: system-ui, sans-serif; text-align: center; padding: 3rem;">
8787
<h1 style="color:#d97706;">Authorization Link Expired</h1>
88-
<p>This authorization link is invalid or has expired. Please return to the Gadgets Workshop and try again.</p>
88+
<p>This authorization link is invalid or has expired. Please return to Cloudflare OS and try again.</p>
8989
<button onclick="window.close()">Close</button></body></html>`;
9090

9191
const NOT_CONFIGURED_HTML = `<!DOCTYPE html>

‎packages/gatekeeper-confluence/src/confluence-observers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export class ConfluenceObserverTracker {
179179
const access = await Promise.all(sets.map(setId => this.#hasSetAccess(verifier, setId)));
180180
if (access.some(hasAccess => !hasAccess)) {
181181
throw new Error(
182-
"This collaborator does not have access to Confluence data the Gadget has read, so they " +
182+
"This collaborator does not have access to Confluence data this workspace has read, so they " +
183183
"cannot be allowed to observe it.");
184184
}
185185
for (const setId of sets) checked.add(setId);

‎packages/gatekeeper-confluence/src/confluence.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ const htmlResponse = (body: string): Response =>
170170

171171
const SELF_CLOSING_HTML = `<!DOCTYPE html>
172172
<html lang="en"><body><script>window.close();</script>
173-
<p>Authorization complete. You may close this tab and return to the Gadgets Workshop.</p></body></html>`;
173+
<p>Authorization complete. You may close this tab and return to Cloudflare OS.</p></body></html>`;
174174

175175
const page = (title: string, color: string, message: string): string => `<!DOCTYPE html>
176176
<html lang="en"><head><meta charset="UTF-8"><title>${title}</title></head>
@@ -180,7 +180,7 @@ const page = (title: string, color: string, message: string): string => `<!DOCTY
180180
<p style="color: #555; line-height: 1.6;">${message}</p></div></body></html>`;
181181

182182
const INVALID_LINK_HTML = page("Authorization Link Expired", "#d97706",
183-
"This authorization link is invalid or has expired. Please return to the Gadgets Workshop and try again.");
183+
"This authorization link is invalid or has expired. Please return to Cloudflare OS and try again.");
184184
const NOT_CONFIGURED_HTML = page("Confluence Gatekeeper Not Configured", "#d97706",
185185
"Please configure an Atlassian OAuth client ID and secret for this gatekeeper.");
186186

@@ -245,7 +245,7 @@ export class GatekeeperVendor extends WorkerEntrypoint<Env> implements Gatekeepe
245245
color: "#deebff",
246246
tagline: "Read and write your Confluence pages and spaces",
247247
description:
248-
"Connect your Atlassian Confluence site to let Gadgets search, read, and edit the pages, " +
248+
"Connect your Atlassian Confluence site to let Cloudflare OS search, read, and edit the pages, " +
249249
"blog posts, and spaces you share. Build agents that draft documentation, organize " +
250250
"knowledge bases, or keep pages up to date.",
251251
};

‎packages/gatekeeper-context/app/ContextLibraryPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ const CONTENT_SOURCE_OPTIONS = [
687687
value: "web" as const,
688688
Icon: PencilSimple,
689689
title: "Editable documents",
690-
description: "Create, edit, and delete files through the Gadgets UI.",
690+
description: "Create, edit, and delete files through the Cloudflare OS UI.",
691691
},
692692
{
693693
value: "git" as const,

‎packages/gatekeeper-context/src/context-observers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export class ContextObserverTracker {
6262
));
6363
if (access.some(hasAccess => !hasAccess)) {
6464
throw new Error(
65-
"This collaborator does not have access to a Context collection whose data the Gadget " +
65+
"This collaborator does not have access to a Context collection whose data this workspace " +
6666
"has read, so they cannot be allowed to observe it.",
6767
);
6868
}

‎packages/gatekeeper-email/src/configurator/email-configurator-ui.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default {
2020

2121
render({ values, setValues }) {
2222
return <Section>
23-
<Field label="Email name" description="Choose the local part of the mailbox address this gadget can receive.">
23+
<Field label="Email name" description="Choose the local part of the mailbox address this connection can receive.">
2424
<TextInput
2525
name="emailName"
2626
value={values.emailName}

‎packages/gatekeeper-email/src/email.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const SELF_CLOSING_HTML = `<!DOCTYPE html>
134134
<html lang="en">
135135
<body>
136136
<script type="text/javascript">window.close();</script>
137-
<p>Authorization complete. You may close this tab and return to the Gadgets Workshop.
137+
<p>Authorization complete. You may close this tab and return to Cloudflare OS.
138138
</body>
139139
</html>`;
140140

@@ -148,7 +148,7 @@ const INVALID_LINK_HTML = `<!DOCTYPE html>
148148
<body style="font-family: system-ui, -apple-system, sans-serif; display: flex; justify-content: center; align-items: center; min-height: 100vh; margin: 0; background: #f5f5f5;">
149149
<div style="max-width: 520px; padding: 2rem; background: white; border-radius: 8px; box-shadow: 0 2px 8px rgba(0,0,0,0.1); text-align: center;">
150150
<h1 style="color: #d97706; font-size: 1.5rem; margin: 0 0 1rem 0;">Authorization Link Expired</h1>
151-
<p style="color: #555; line-height: 1.6; margin: 0 0 1.5rem 0;">This authorization link is invalid or has expired. Please return to the Gadgets Workshop and try again.</p>
151+
<p style="color: #555; line-height: 1.6; margin: 0 0 1.5rem 0;">This authorization link is invalid or has expired. Please return to Cloudflare OS and try again.</p>
152152
<button onclick="window.close()" style="padding: 0.5rem 1.5rem; background: #d97706; color: white; border: none; border-radius: 4px; font-size: 1rem; cursor: pointer;">Close</button>
153153
</div>
154154
</body>
@@ -263,9 +263,9 @@ export class GatekeeperVendor extends WorkerEntrypoint<Env> implements Gatekeepe
263263
url: getBaseUrl(this.env),
264264
logo: { url: EMAIL_LOGO_URL },
265265
color: "#fff5df",
266-
tagline: "Trigger Gadgets from incoming email",
266+
tagline: "Trigger gadgets from incoming email",
267267
description:
268-
"Give Gadgets an email address they can receive messages from. Useful for triage " +
268+
"Give Cloudflare OS an email address it can receive messages from. Useful for triage " +
269269
"agents, ticket-from-email workflows, or anything driven by mail.",
270270
};
271271
}

‎packages/gatekeeper-github/src/github.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ const SELF_CLOSING_HTML = `<!DOCTYPE html>
303303
<html lang="en">
304304
<body>
305305
<script type="text/javascript">window.close();</script>
306-
<p>Authorization complete. You may close this tab and return to the Gadgets Workshop.</p>
306+
<p>Authorization complete. You may close this tab and return to Cloudflare OS.</p>
307307
</body>
308308
</html>`;
309309

@@ -317,7 +317,7 @@ const INVALID_LINK_HTML = `<!DOCTYPE html>
317317
<body style="font-family: system-ui, -apple-system, sans-serif; display: flex; justify-content: center; align-items: center; min-height: 100vh; margin: 0; background: #f5f5f5;">
318318
<div style="max-width: 520px; padding: 2rem; background: white; border-radius: 8px; box-shadow: 0 2px 8px rgba(0,0,0,0.1); text-align: center;">
319319
<h1 style="color: #d97706; font-size: 1.5rem; margin: 0 0 1rem 0;">Authorization Link Expired</h1>
320-
<p style="color: #555; line-height: 1.6; margin: 0 0 1.5rem 0;">This authorization link is invalid or has expired. Please return to the Gadgets Workshop and try again.</p>
320+
<p style="color: #555; line-height: 1.6; margin: 0 0 1.5rem 0;">This authorization link is invalid or has expired. Please return to Cloudflare OS and try again.</p>
321321
<button onclick="window.close()" style="padding: 0.5rem 1.5rem; background: #d97706; color: white; border: none; border-radius: 4px; font-size: 1rem; cursor: pointer;">Close</button>
322322
</div>
323323
</body>
@@ -972,7 +972,7 @@ export default {
972972
if (relPath === "/oauth") {
973973
const error = url.searchParams.get("error");
974974
if (error) {
975-
return new Response("GitHub authorization failed. Please restart the connection flow from Gadgets.", {
975+
return new Response("GitHub authorization failed. Please restart the connection flow from Cloudflare OS.", {
976976
status: 400,
977977
headers: { "Content-Type": "text/plain; charset=utf-8" },
978978
});
@@ -1017,7 +1017,7 @@ export class GatekeeperVendor extends WorkerEntrypoint<Env> implements Gatekeepe
10171017
color: "#f0f0f0",
10181018
tagline: "Triage issues, review PRs, and manage repos",
10191019
description:
1020-
"Connect your GitHub account so Gadgets can read and update issues, pull requests, " +
1020+
"Connect your GitHub account so Cloudflare OS can read and update issues, pull requests, " +
10211021
"and reviews on the repositories you choose.",
10221022
providesAuth: true,
10231023
};
@@ -3773,7 +3773,7 @@ export class GitHubGatekeeperImpl extends DurableObject<Env, GitHubGatekeeperImp
37733773
if (!(await verifier.hasRepoAccess(owner, repo))) {
37743774
throw new Error(
37753775
`This collaborator does not have read access to the GitHub repository ${owner}/${repo}, ` +
3776-
`so they cannot be allowed to observe data the Gadget read from it.`);
3776+
`so they cannot be allowed to observe data this workspace read from it.`);
37773777
}
37783778
}
37793779

‎packages/gatekeeper-google/src/configurator/bigquery-configurator-ui.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default {
2727

2828
render({ values, setValues, clearFields, ui }) {
2929
return <Section>
30-
<Field label="Project" description="Start with the Google Cloud project this gadget can query.">
30+
<Field label="Project" description="Start with the Google Cloud project this connection can query.">
3131
<Autocomplete
3232
name="projectId"
3333
value={values.projectId}

‎packages/gatekeeper-google/src/configurator/calendar-configurator-ui.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default {
1717
render({ values, setValues, ui }) {
1818
const availabilityMode = values.availabilityMode === "allVisible" ? "allVisible" : "thisCalendar";
1919
return <Section>
20-
<Field label="Calendar" description="Choose the calendar this gadget can read and manage.">
20+
<Field label="Calendar" description="Choose the calendar this connection can read and manage.">
2121
<Autocomplete
2222
name="calendarId"
2323
value={values.calendarId}

0 commit comments

Comments
 (0)