Skip to content

Commit 8145370

Browse files
authored
Browsertrix API Integration Fixes (#218)
- 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
1 parent ef2adcc commit 8145370

File tree

5 files changed

+8
-4179
lines changed

5 files changed

+8
-4179
lines changed

dist/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
*
1+
**/*
22
!.gitignore

dist/embed/index.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

dist/embed/ui.js

Lines changed: 0 additions & 4147 deletions
This file was deleted.

src/ui/app.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -681,12 +681,12 @@ class ArchiveWebApp extends ReplayWebApp
681681
<wr-modal @modal-closed="${this.onCancelSettings}" title="Settings">
682682
<div class="tabs mb-3">
683683
<ul>
684-
<li class="${this.settingsTab === "ipfs" ? "is-active" : ""}">
685-
<a @click=${() => this.settingsTab = "ipfs"}>IPFS</a>
686-
</li>
687684
<li class="${this.settingsTab === "browsertrix" ? "is-active" : ""}">
688685
<a @click=${() => this.settingsTab = "browsertrix"}>Browsertrix</a>
689686
</li>
687+
<li class="${this.settingsTab === "ipfs" ? "is-active" : ""}">
688+
<a @click=${() => this.settingsTab = "ipfs"}>IPFS</a>
689+
</li>
690690
</ul>
691691
</div>
692692
@@ -746,10 +746,10 @@ class ArchiveWebApp extends ReplayWebApp
746746
</div>
747747
<div class="field has-addons">
748748
<p class="is-expanded">
749-
Organization Name (Optional)
749+
Organization Name or Slug (Optional)
750750
<input class="input is-small" type="text"
751751
name="btrixOrgName" id="btrixOrgName" value="${this.btrixOpts && this.btrixOpts.orgName}"
752-
placeholder="Organization (optional)">
752+
placeholder="my-org">
753753
</p>
754754
</div>
755755
</fieldset>

src/ui/upload.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ export class BtrixClient
353353
}
354354

355355
async getOrg(name="") {
356-
const json = await this.fetchAPI("/api/users/me-with-orgs");
356+
const json = await this.fetchAPI("/api/users/me");
357357
const { orgs } = json;
358358
if (!orgs || !orgs.length) {
359359
return null;
@@ -362,7 +362,7 @@ export class BtrixClient
362362
return orgs[0].id;
363363
}
364364
for (const org of orgs) {
365-
if (org.name === name) {
365+
if (org.slug === name || org.name === name) {
366366
return org.id;
367367
}
368368
}

0 commit comments

Comments
 (0)