Skip to content

Commit 58491dc

Browse files
hillary-mutisyahillary-mutisya
authored
Move the extension's view pages into a separate folder (#1306)
1 parent 5000aba commit 58491dc

18 files changed

+93
-58
lines changed

‎ts/packages/agents/browser/scripts/buildExtension.mjs

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ const sharedScripts = {
5555
contentScript: "contentScript/index.ts",
5656
webTypeAgentMain: "webTypeAgentMain.ts",
5757
webTypeAgentContentScript: "webTypeAgentContentScript.ts",
58-
options: "options.ts",
59-
sidepanel: "sidepanel.ts",
60-
actionIndex: "actionIndex.ts",
61-
knowledgePanel: "knowledgePanel.ts",
62-
websiteLibraryPanel: "websiteLibraryPanel.ts",
58+
"views/options": "views/options.ts",
59+
"views/pageActions": "views/pageActions.ts",
60+
"views/actionsLibrary": "views/actionsLibrary.ts",
61+
"views/pageKnowledge": "views/pageKnowledge.ts",
62+
"views/knowledgeLibrary": "views/knowledgeLibrary.ts",
6363
uiEventsDispatcher: "uiEventsDispatcher.ts",
6464
"sites/paleobiodb": "sites/paleobiodb.ts",
6565
};
@@ -140,20 +140,30 @@ for (const [name, relPath] of Object.entries(sharedScripts)) {
140140
// Static file copy
141141
if (verbose) console.log(chalk.cyan("\n📁 Copying Chrome static files..."));
142142
copyFileSync(`${srcDir}/manifest.json`, `${chromeOutDir}/manifest.json`);
143-
copyFileSync(`${srcDir}/sidepanel.html`, `${chromeOutDir}/sidepanel.html`);
144-
copyFileSync(`${srcDir}/actionIndex.html`, `${chromeOutDir}/actionIndex.html`);
143+
mkdirSync(`${chromeOutDir}/views`, { recursive: true });
145144
copyFileSync(
146-
`${srcDir}/knowledgePanel.html`,
147-
`${chromeOutDir}/knowledgePanel.html`,
145+
`${srcDir}/views/pageActions.html`,
146+
`${chromeOutDir}/views/pageActions.html`,
148147
);
149-
copyFileSync(`${srcDir}/options.html`, `${chromeOutDir}/options.html`);
150148
copyFileSync(
151-
`${srcDir}/websiteLibraryPanel.html`,
152-
`${chromeOutDir}/websiteLibraryPanel.html`,
149+
`${srcDir}/views/actionsLibrary.html`,
150+
`${chromeOutDir}/views/actionsLibrary.html`,
153151
);
154152
copyFileSync(
155-
`${srcDir}/websiteLibraryPanel.css`,
156-
`${chromeOutDir}/websiteLibraryPanel.css`,
153+
`${srcDir}/views/pageKnowledge.html`,
154+
`${chromeOutDir}/views/pageKnowledge.html`,
155+
);
156+
copyFileSync(
157+
`${srcDir}/views/options.html`,
158+
`${chromeOutDir}/views/options.html`,
159+
);
160+
copyFileSync(
161+
`${srcDir}/views/knowledgeLibrary.html`,
162+
`${chromeOutDir}/views/knowledgeLibrary.html`,
163+
);
164+
copyFileSync(
165+
`${srcDir}/views/knowledgeLibrary.css`,
166+
`${chromeOutDir}/views/knowledgeLibrary.css`,
157167
);
158168
mkdirSync(`${chromeOutDir}/sites`, { recursive: true });
159169
copyFileSync(

‎ts/packages/agents/browser/src/agent/storage/domainManager.mts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,11 @@ export class DomainManager {
279279
const domain = config.domain;
280280
const commonPatterns: UrlPatternDefinition[] = [];
281281

282+
const allowedHosts = ["github.com", "www.github.com"];
283+
282284
// Add basic patterns based on domain structure
283-
if (domain.includes("github.com")) {
285+
const isGitHubDomain = allowedHosts.includes(domain);
286+
if (isGitHubDomain) {
284287
commonPatterns.push(
285288
{
286289
name: "repository-pages",

‎ts/packages/agents/browser/src/extension/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
"128": "images/icon-128.png"
8282
},
8383
"options_ui": {
84-
"page": "options.html",
84+
"page": "views/options.html",
8585
"open_in_tab": false
8686
},
8787
"side_panel": {
88-
"default_path": "sidepanel.html"
88+
"default_path": "views/pageActions.html"
8989
},
9090
"content_security_policy": {
9191
"extension_pages": "script-src 'self'; object-src 'self'"

‎ts/packages/agents/browser/src/extension/serviceWorker/contextMenu.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function initializeContextMenu(): void {
4242
id: "sidepanel-registerAgent",
4343
title: "Update Page Agent",
4444
contexts: ["all"],
45-
documentUrlPatterns: ["chrome-extension://*/sidepanel.html"],
45+
documentUrlPatterns: ["chrome-extension://*/views/pageActions.html"],
4646
});
4747

4848
chrome.contextMenus.create({
@@ -119,15 +119,15 @@ export async function handleContextMenuClick(
119119

120120
await chrome.sidePanel.setOptions({
121121
tabId: tab.id!,
122-
path: "sidepanel.html",
122+
path: "views/pageActions.html",
123123
enabled: true,
124124
});
125125
break;
126126
}
127127
case "manageActions": {
128-
// Check if actionIndex tab already exists
128+
// Check if actionsLibrary tab already exists
129129
const existingTabs = await chrome.tabs.query({
130-
url: chrome.runtime.getURL("actionIndex.html"),
130+
url: chrome.runtime.getURL("views/actionsLibrary.html"),
131131
});
132132

133133
if (existingTabs.length > 0) {
@@ -139,7 +139,7 @@ export async function handleContextMenuClick(
139139
} else {
140140
// Create new tab
141141
await chrome.tabs.create({
142-
url: chrome.runtime.getURL("actionIndex.html"),
142+
url: chrome.runtime.getURL("views/actionsLibrary.html"),
143143
active: true,
144144
});
145145
}
@@ -158,21 +158,21 @@ export async function handleContextMenuClick(
158158

159159
await chrome.sidePanel.setOptions({
160160
tabId: tab.id!,
161-
path: "knowledgePanel.html",
161+
path: "views/pageKnowledge.html",
162162
enabled: true,
163163
});
164164

165165
break;
166166
}
167167

168168
case "showWebsiteLibrary": {
169-
const websiteLibraryUrl = chrome.runtime.getURL(
170-
"websiteLibraryPanel.html",
169+
const knowledgeLibraryUrl = chrome.runtime.getURL(
170+
"views/knowledgeLibrary.html",
171171
);
172172

173-
// Check if website library tab is already open
173+
// Check if knowledge library tab is already open
174174
const existingTabs = await chrome.tabs.query({
175-
url: websiteLibraryUrl,
175+
url: knowledgeLibraryUrl,
176176
});
177177

178178
if (existingTabs.length > 0) {
@@ -187,7 +187,7 @@ export async function handleContextMenuClick(
187187
} else {
188188
// Create new tab
189189
await chrome.tabs.create({
190-
url: websiteLibraryUrl,
190+
url: knowledgeLibraryUrl,
191191
active: true,
192192
});
193193
}

‎ts/packages/agents/browser/src/extension/serviceWorker/messageHandlers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,14 +526,14 @@ export async function handleMessage(
526526
if (panel === "schema") {
527527
await chrome.sidePanel.setOptions({
528528
tabId: tabId,
529-
path: "sidepanel.html",
529+
path: "views/pageActions.html",
530530
enabled: true,
531531
});
532532
await chrome.sidePanel.open({ tabId });
533533
} else if (panel === "knowledge") {
534534
await chrome.sidePanel.setOptions({
535535
tabId: tabId,
536-
path: "knowledgePanel.html",
536+
path: "views/pageKnowledge.html",
537537
enabled: true,
538538
});
539539
await chrome.sidePanel.open({ tabId });

‎ts/packages/agents/browser/src/extension/actionIndex.html renamed to ‎ts/packages/agents/browser/src/extension/views/actionsLibrary.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<meta charset="UTF-8" />
88
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
99
<title>Action Index - TypeAgent</title>
10-
<link rel="stylesheet" href="vendor/bootstrap/bootstrap.min.css" />
11-
<link rel="stylesheet" href="vendor/prism/prism.css" />
10+
<link rel="stylesheet" href="../vendor/bootstrap/bootstrap.min.css" />
11+
<link rel="stylesheet" href="../vendor/prism/prism.css" />
1212
<link
1313
rel="stylesheet"
1414
href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css"
@@ -809,10 +809,10 @@ <h5 class="modal-title" id="actionDetailsModalTitle">
809809
</div>
810810

811811
<!-- Scripts -->
812-
<script src="actionIndex.js"></script>
813-
<script src="vendor/bootstrap/bootstrap.bundle.min.js"></script>
814-
<script src="vendor/prism/prism.js"></script>
815-
<script src="vendor/prism/prism-typescript.js"></script>
816-
<script src="vendor/prism/prism-json.js"></script>
812+
<script src="actionsLibrary.js"></script>
813+
<script src="../vendor/bootstrap/bootstrap.bundle.min.js"></script>
814+
<script src="../vendor/prism/prism.js"></script>
815+
<script src="../vendor/prism/prism-typescript.js"></script>
816+
<script src="../vendor/prism/prism-json.js"></script>
817817
</body>
818818
</html>

‎ts/packages/agents/browser/src/extension/actionIndex.ts renamed to ‎ts/packages/agents/browser/src/extension/views/actionsLibrary.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

4-
import { getActionsForUrl, getAllActions, getActionDomains } from "./storage";
4+
import { getActionsForUrl, getAllActions, getActionDomains } from "../storage";
55

66
declare global {
77
interface Window {

‎ts/packages/agents/browser/src/extension/websiteLibraryPanel.css renamed to ‎ts/packages/agents/browser/src/extension/views/knowledgeLibrary.css

File renamed without changes.

‎ts/packages/agents/browser/src/extension/websiteLibraryPanel.html renamed to ‎ts/packages/agents/browser/src/extension/views/knowledgeLibrary.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<head>
77
<meta charset="utf-8" />
88
<title>TypeAgent Website Library</title>
9-
<link rel="stylesheet" href="vendor/bootstrap/bootstrap.min.css" />
9+
<link rel="stylesheet" href="../vendor/bootstrap/bootstrap.min.css" />
1010
<link
1111
href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css"
1212
rel="stylesheet"
1313
/>
14-
<link rel="stylesheet" href="websiteLibraryPanel.css" />
14+
<link rel="stylesheet" href="knowledgeLibrary.css" />
1515
</head>
1616
<body>
1717
<!-- Top Navigation Bar -->
@@ -626,7 +626,7 @@ <h5 class="modal-title" id="settingsModalLabel">
626626
</div>
627627
</div>
628628

629-
<script src="vendor/bootstrap/bootstrap.bundle.min.js"></script>
630-
<script src="websiteLibraryPanel.js"></script>
629+
<script src="../vendor/bootstrap/bootstrap.bundle.min.js"></script>
630+
<script src="knowledgeLibrary.js"></script>
631631
</body>
632632
</html>

‎ts/packages/agents/browser/src/extension/websiteLibraryPanel.ts renamed to ‎ts/packages/agents/browser/src/extension/views/knowledgeLibrary.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
FolderImportOptions,
1212
ImportProgress,
1313
ImportResult,
14-
} from "./interfaces/websiteImport.types";
14+
} from "../interfaces/websiteImport.types";
1515

1616
interface FullPageNavigation {
1717
currentPage: "search" | "discover" | "analytics";

0 commit comments

Comments
 (0)