Skip to content

Commit

Permalink
Browsertrix API Integration Fixes (#218)
Browse files Browse the repository at this point in the history
- use correct browsertrix api (/api/users/me)
- match both org name and org slug for optional org name
- switch tab order to have browsertrix be first
- remove embed files from git
- bump to 0.12.0
  • Loading branch information
ikreymer authored Jun 4, 2024
1 parent ef2adcc commit 8145370
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4,179 deletions.
2 changes: 1 addition & 1 deletion dist/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*
**/*
!.gitignore
24 changes: 0 additions & 24 deletions dist/embed/index.html

This file was deleted.

4,147 changes: 0 additions & 4,147 deletions dist/embed/ui.js

This file was deleted.

10 changes: 5 additions & 5 deletions src/ui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -681,12 +681,12 @@ class ArchiveWebApp extends ReplayWebApp
<wr-modal @modal-closed="${this.onCancelSettings}" title="Settings">
<div class="tabs mb-3">
<ul>
<li class="${this.settingsTab === "ipfs" ? "is-active" : ""}">
<a @click=${() => this.settingsTab = "ipfs"}>IPFS</a>
</li>
<li class="${this.settingsTab === "browsertrix" ? "is-active" : ""}">
<a @click=${() => this.settingsTab = "browsertrix"}>Browsertrix</a>
</li>
<li class="${this.settingsTab === "ipfs" ? "is-active" : ""}">
<a @click=${() => this.settingsTab = "ipfs"}>IPFS</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -746,10 +746,10 @@ class ArchiveWebApp extends ReplayWebApp
</div>
<div class="field has-addons">
<p class="is-expanded">
Organization Name (Optional)
Organization Name or Slug (Optional)
<input class="input is-small" type="text"
name="btrixOrgName" id="btrixOrgName" value="${this.btrixOpts && this.btrixOpts.orgName}"
placeholder="Organization (optional)">
placeholder="my-org">
</p>
</div>
</fieldset>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ export class BtrixClient
}

async getOrg(name="") {
const json = await this.fetchAPI("/api/users/me-with-orgs");
const json = await this.fetchAPI("/api/users/me");
const { orgs } = json;
if (!orgs || !orgs.length) {
return null;
Expand All @@ -362,7 +362,7 @@ export class BtrixClient
return orgs[0].id;
}
for (const org of orgs) {
if (org.name === name) {
if (org.slug === name || org.name === name) {
return org.id;
}
}
Expand Down

0 comments on commit 8145370

Please sign in to comment.