1.2.0: improvements, bug fixing and ci

* ci: publish.yml triggers on push/pr in master

* fix: sha and deploy btn adopt the new GitHub UI

* feature: support 2 deployable URLs
homepage & commit details view

* fix: display btn only appears in homepage and deployable URL.
it also hides when not matching owner & repo from settings popup.

* bump version to 1.2.0

* ci: publish only in master push

Author: alejandrocoding

.github/workflows/publish.yml

@@ -1,5 +1,7 @@
 name: CI - Publish in Chrome Store
-on: repository_dispatch
+on:
+  push:
+    branches: [ master ]
 
 jobs:
   build:
@@ -30,5 +32,3 @@ jobs:
           client-id: ${{ secrets.CLIENT_ID }}
           client-secret: ${{ secrets.SECRET }}
           refresh-token: ${{ secrets.REFRESH_TOKEN }}
-          # optionally specify the visibility of the addon
-          # publishTarget: default

package.json

@@ -1,7 +1,7 @@
 {
   "name": "easy-deploy",
   "description": "Easy Deploy is a chrome extension that allows you to manually trigger a GitHub Action ",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": {
     "email": "[email protected]",
     "name": "Alejandro Lora"

src/app/shared/helpers/dom.helper.ts

@@ -1,4 +1,5 @@
 import { Settings } from '../interfaces/settings.interface';
+import { Environment } from '../interfaces/environment.interface';
 
 import { URLHelper } from './url.helper';
 import { GitHubHelper } from './github.helper';
@@ -25,7 +26,7 @@ export class DomHelper {
 
             this.subscribeToStorageChanges();
 
-            if (this.settings && this.isMatchingOwnerAndRepo()) {
+            if (this.settings && this.isMatchingOwnerAndRepo() && URLHelper.isDeployableURL()) {
                 this.showDisplayBtn();
                 this.refreshEnvironmentButtonList();
             }
@@ -36,9 +37,9 @@ export class DomHelper {
         return document.querySelector('#branch-select-menu') as HTMLElement;
     }
 
-    private getSHARef() {
+    private getSHARef(environment: Environment) {
         if (URLHelper.isDeployableURL() && this.getContainer()) {
-            const anchor: HTMLAnchorElement = document.querySelector('.commit-tease-sha');
+            const anchor: HTMLAnchorElement = document.querySelector(`.Box-header a[href^="/${environment.repoOwner}/${environment.repoName}/commit/"]`);
             return anchor.href.split('/commit/')[1];
         }
     }
@@ -84,7 +85,7 @@ export class DomHelper {
 
     private createDropDownBtn() {
         const dropDownBtn = document.createElement('summary');
-        dropDownBtn.classList.add('select-menu-button', 'btn', 'btn-sm', 'btn-primary', 'ml-2');
+        dropDownBtn.classList.add('select-menu-button', 'btn', 'btn-primary', 'ml-2');
         dropDownBtn.innerHTML = '<span> Deploy </span>';
         return dropDownBtn;
     }
@@ -124,7 +125,7 @@ export class DomHelper {
 
     private removeAllEnvironmentButtons() {
         if (this.environmentsButtonList) {
-            this.showDisplayBtn();
+            this.hideDisplayBtn();
             while (this.environmentsButtonList.firstChild) {
                 this.environmentsButtonList.removeChild(this.environmentsButtonList.lastChild);
             }
@@ -133,7 +134,7 @@ export class DomHelper {
 
     private refreshEnvironmentButtonList() {
         this.removeAllEnvironmentButtons();
-        if (!this.settings.environments.length || !this.isMatchingOwnerAndRepo()) {
+        if (!this.settings.environments.length || !this.isMatchingOwnerAndRepo() || !URLHelper.isDeployableURL()) {
             return;
         }
         for (const environment of this.settings.environments) {
@@ -174,7 +175,7 @@ export class DomHelper {
         this.closeDropDown();
 
         const environment = this.settings.environments.find((env) => env.id === button.id);
-        const sha = this.getSHARef();
+        const sha = this.getSHARef(environment);
 
         const gitHubHelper = new GitHubHelper(this.settings.token, environment.repoOwner, environment.repoName);
         await gitHubHelper.actionDispatch(sha, environment.event);

src/app/shared/helpers/url.helper.ts

@@ -8,8 +8,12 @@ export class URLHelper {
     }
 
     static isDeployableURL() {
-        return location.pathname
-            .split(`/${this.getOwner()}/${this.getRepositoryName()}/tree/`)
-            .filter((e) => e).length === 1;
+        const urlTreeSplit = location.pathname.split(`/tree/`);
+        const isTreeCommitURL =
+            urlTreeSplit[0] === `/${this.getOwner()}/${this.getRepositoryName()}` &&
+            urlTreeSplit[1]?.indexOf('/') === -1;
+        const isHomePageURL = location.pathname.replace(/\/+$/, '') === `/${this.getOwner()}/${this.getRepositoryName()}`;
+
+        return isTreeCommitURL || isHomePageURL;
     }
 }

src/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Easy Deploy",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Allows you to manually trigger a GitHub Action",
   "manifest_version": 2,
   "icons": {