From 197b89ef7031e3bd7f9a3edc66e0c4bf90170642 Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Thu, 23 Mar 2023 15:22:20 +0100 Subject: [PATCH] Remove hardcoded repository URL --- src/paths/index/components/files/FileList.js | 2 +- src/paths/index/components/pulls/PullRequestItem.js | 8 ++++++-- src/paths/index/components/pulls/PullRequestList.js | 9 ++++++--- src/paths/index/entry.js | 7 ++++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/paths/index/components/files/FileList.js b/src/paths/index/components/files/FileList.js index 0a6b186..edf5d98 100644 --- a/src/paths/index/components/files/FileList.js +++ b/src/paths/index/components/files/FileList.js @@ -195,7 +195,7 @@ export default class FileList extends LitElement { @iconclick="${this._onItemIconClicked.bind(this, item.type, item.path, item.pulls)}" > - ${(this.selectedFolders.includes(item.path)) ? + ${(this.selectedFolders.includes(item.path)) ? this.renderFolder(branchFiles, branchFiles[item.path] || []) : null } diff --git a/src/paths/index/components/pulls/PullRequestItem.js b/src/paths/index/components/pulls/PullRequestItem.js index 50099bd..62454ec 100644 --- a/src/paths/index/components/pulls/PullRequestItem.js +++ b/src/paths/index/components/pulls/PullRequestItem.js @@ -121,13 +121,17 @@ export default class PullRequestItem extends LitElement { @property({ type: String, reflect: true }) url = ''; @property({ type: String, reflect: true }) diff_url = ''; @property({ type: String, reflect: true }) patch_url = ''; + @property({ type: Boolean }) draft = false; @property({ type: String, reflect: true }) milestone = ''; @property({ type: String, reflect: true }) branch = ''; + @property({ type: String }) created_at = ''; @property({ type: String }) updated_at = ''; @property({ type: Object }) author = null; + @property({ type: String }) repository = ''; + render(){ const authorClassList = [ "pr-author-value" ]; if (this.author.pull_count > 40) { @@ -175,7 +179,7 @@ export default class PullRequestItem extends LitElement { author: @@ -227,4 +231,4 @@ export default class PullRequestItem extends LitElement { `; } -} \ No newline at end of file +} diff --git a/src/paths/index/components/pulls/PullRequestList.js b/src/paths/index/components/pulls/PullRequestList.js index 179a867..ebba186 100644 --- a/src/paths/index/components/pulls/PullRequestList.js +++ b/src/paths/index/components/pulls/PullRequestList.js @@ -106,7 +106,8 @@ export default class PullRequestList extends LitElement { @property({ type: Array }) pulls = []; @property({ type: Object }) authors = {}; - + + @property({ type: String }) selectedRepository = ""; @property({ type: String }) selectedBranch = ""; @property({ type: String }) selectedPath = ""; @property({ type: Array }) selectedPulls = []; @@ -132,7 +133,7 @@ export default class PullRequestList extends LitElement { const total_pulls = this.pulls.length; let filtered_pulls = pulls.length - + const has_pinned = (this.filteredPull !== ""); if (has_pinned) { filtered_pulls -= 1; @@ -166,6 +167,7 @@ export default class PullRequestList extends LitElement { .diff_url="${item.diff_url}" .patch_url="${item.patch_url}" + .repository="${this.selectedRepository}" /> `; })} @@ -211,10 +213,11 @@ export default class PullRequestList extends LitElement { .diff_url="${item.diff_url}" .patch_url="${item.patch_url}" + .repository="${this.selectedRepository}" /> `; })} `; } -} \ No newline at end of file +} diff --git a/src/paths/index/entry.js b/src/paths/index/entry.js index f86b9ef..3df7406 100644 --- a/src/paths/index/entry.js +++ b/src/paths/index/entry.js @@ -128,7 +128,7 @@ export default class EntryComponent extends LitElement { if (typeof branchFiles[file.parent] === "undefined") { branchFiles[file.parent] = []; } - + branchFiles[file.parent].push(file); } }); @@ -141,10 +141,10 @@ export default class EntryComponent extends LitElement { if (b.type === "folder" && a.type !== "folder") { return 1; } - + const a_name = a.path.toLowerCase(); const b_name = b.path.toLowerCase(); - + if (a_name > b_name) return 1; if (a_name < b_name) return -1; return 0; @@ -242,6 +242,7 @@ export default class EntryComponent extends LitElement {