From d3044874ece4fe12c5f34851dade0f0decf6ec01 Mon Sep 17 00:00:00 2001 From: John Murphy Date: Wed, 19 Jun 2024 14:52:47 -0500 Subject: [PATCH 1/3] fixed css issue and a few other things --- app.js | 6 +----- css/style.css | 7 ++++--- lib/createFilters.js | 4 +--- lib/populateUrlMetadata.js | 2 -- manifest.json | 20 ++++++++++++++++++-- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app.js b/app.js index 9bb737d..4486ecf 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,3 @@ -const createFilters = require('./lib/createFilters') -const populateUrlMetadata = require('./lib/populateUrlMetadata') - var token = '' var repoList = [] var intervalIds = [] @@ -42,7 +39,6 @@ function initializeExtension() { } intervalIds.forEach(clearInterval) - saveAppliedFilters({ currentRepo, issueNumber, organization, url }) const kaminoButton = $(Handlebars.templates.button().replace(/(\r\n|\n|\r)/gm, '')) @@ -120,7 +116,7 @@ function saveAppliedFilters(urlMetadata) { filters: [], }, (item) => { - const filters = createFilters(newFilter, item) + const { filters, changed } = createFilters(newFilter, item) // only save if changed, otherwise the max quota per minute will be exceeded throwing errors if (changed) { diff --git a/css/style.css b/css/style.css index 2f7cfcf..76fb24e 100644 --- a/css/style.css +++ b/css/style.css @@ -213,19 +213,20 @@ a { display: none; } -.open { - display: inline; +.sidebar-kamino .open { + display: block; } button.close { -webkit-appearance: none; + appearance: none; padding: 0; cursor: pointer; background: 0 0; border: 0; } -.close { +.modal-header .close { float: right; font-size: 21px; font-weight: 700; diff --git a/lib/createFilters.js b/lib/createFilters.js index d3e1ddd..2476fda 100644 --- a/lib/createFilters.js +++ b/lib/createFilters.js @@ -21,7 +21,5 @@ function createFilters(newFilter, item) { item.filters.push(newFilter) } - return item.filters + return { filters: item.filters, changed } } - -module.exports = createFilters diff --git a/lib/populateUrlMetadata.js b/lib/populateUrlMetadata.js index eed4bae..3ad6935 100644 --- a/lib/populateUrlMetadata.js +++ b/lib/populateUrlMetadata.js @@ -17,5 +17,3 @@ function populateUrlMetadata(href) { return { error: 'Cannot parse this url' } } - -module.exports = populateUrlMetadata diff --git a/manifest.json b/manifest.json index 385036a..eb2de15 100644 --- a/manifest.json +++ b/manifest.json @@ -4,14 +4,28 @@ { "matches": ["*://github.com/*/*/issues"], "exclude_matches": ["*://github.com/*/*/issues/*"], - "js": ["./jquery/jquery-3.6.0.min.js", "./handlebars.runtime.min-v4.7.7.js", "./batch.js", "./template.js"], + "js": [ + "./jquery/jquery-3.6.0.min.js", + "./handlebars.runtime.min-v4.7.7.js", + "./lib/populateUrlMetadata.js", + "./lib/createFilters.js", + "./batch.js", + "./template.js" + ], "css": ["./css/style.css"], "run_at": "document_end" }, { "matches": ["*://github.com/*/*/issues/*"], "exclude_matches": ["*://github.com/*/*/issues"], - "js": ["./jquery/jquery-3.6.0.min.js", "./handlebars.runtime.min-v4.7.7.js", "./app.js", "./template.js"], + "js": [ + "./jquery/jquery-3.6.0.min.js", + "./handlebars.runtime.min-v4.7.7.js", + "./lib/populateUrlMetadata.js", + "./lib/createFilters.js", + "./app.js", + "./template.js" + ], "css": ["./css/style.css"], "run_at": "document_end" } @@ -38,6 +52,8 @@ "./css/options.css", "jquery/jquery-3.6.0.min.js", "handlebars.runtime.min-v4.7.7.js", + "lib/populateUrlMetadata.js", + "lib/createFilters.js", "template.js", "app.js", "options.html", From 955659c0f037bdf1c32163d57de4565912dcccef Mon Sep 17 00:00:00 2001 From: John Murphy Date: Wed, 19 Jun 2024 14:55:09 -0500 Subject: [PATCH 2/3] Version 4.0.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index eb2de15..e4b558f 100644 --- a/manifest.json +++ b/manifest.json @@ -42,7 +42,7 @@ "options_page": "options.html", "permissions": ["tabs", "background", "scripting", "storage", "webNavigation"], "host_permissions": ["*://github.com/*"], - "version": "4.0.0", + "version": "4.0.1", "web_accessible_resources": [ { "resources": [ From 340167b4fd518dd59fafd6a2a37fc7c6d8590fca Mon Sep 17 00:00:00 2001 From: John Murphy Date: Fri, 21 Jun 2024 14:49:32 -0500 Subject: [PATCH 3/3] fix tests --- lib/createFilters.js | 2 ++ lib/populateUrlMetadata.js | 2 ++ tests/createFilters.spec.js | 9 ++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/createFilters.js b/lib/createFilters.js index 2476fda..c3c91fa 100644 --- a/lib/createFilters.js +++ b/lib/createFilters.js @@ -23,3 +23,5 @@ function createFilters(newFilter, item) { return { filters: item.filters, changed } } + +module.exports = createFilters; \ No newline at end of file diff --git a/lib/populateUrlMetadata.js b/lib/populateUrlMetadata.js index 3ad6935..2808b95 100644 --- a/lib/populateUrlMetadata.js +++ b/lib/populateUrlMetadata.js @@ -17,3 +17,5 @@ function populateUrlMetadata(href) { return { error: 'Cannot parse this url' } } + +module.exports = populateUrlMetadata; \ No newline at end of file diff --git a/tests/createFilters.spec.js b/tests/createFilters.spec.js index 7817425..6149a9d 100644 --- a/tests/createFilters.spec.js +++ b/tests/createFilters.spec.js @@ -18,8 +18,9 @@ describe('createFilter', () => { ], } - const filters = createFilters(newFilter, existingFilters) + const {changed, filters} = createFilters(newFilter, existingFilters) expect(filters).toHaveLength(2) + expect(changed).toBeTruthy() expect(filters[1].filter).toEqual('test-filter') }) @@ -40,8 +41,9 @@ describe('createFilter', () => { ], } - const filters = createFilters(newFilter, existingFilters) + const {changed, filters} = createFilters(newFilter, existingFilters) expect(filters).toHaveLength(1) + expect(changed).toBeTruthy() expect(filters[0].filter).toEqual('test-filter') }) @@ -62,8 +64,9 @@ describe('createFilter', () => { ], } - const filters = createFilters(newFilter, existingFilters) + const {changed, filters} = createFilters(newFilter, existingFilters) expect(filters).toHaveLength(1) + expect(changed).toEqual(false) expect(filters[0].filter).toEqual('test-filter') }) })