From 177c8fa4bcf903d9ad40b8d78ac28f293e5ded39 Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Wed, 6 Jan 2021 02:00:35 -0700
Subject: [PATCH 1/7] frontend

---
 src/api/services/project.js             | 11 +++--------
 src/components/ProjectsSummary.vue      | 23 -----------------------
 src/components/SystemStatusSummary.vue  |  2 +-
 src/components/icons/GitLabIcon.vue     |  2 +-
 tests/unit/api/services/project.spec.js | 18 +++++++-----------
 5 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/src/api/services/project.js b/src/api/services/project.js
index 0c61c71..7be9722 100644
--- a/src/api/services/project.js
+++ b/src/api/services/project.js
@@ -1,13 +1,8 @@
-import { HTTP } from "@/api/mock-http-common";
+import axios from 'axios';
 
 export default {
   async getProjectsSummary() {
-    const response = await HTTP.get(`project-summary_123.json`);
-
-    return response.data;
+    let response = await axios.get("/api/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user");
+    return response?.data;
   },
-  async updateProject(project) {
-    // project update endpoint goes here
-    console.log(project);
-  }
 };
diff --git a/src/components/ProjectsSummary.vue b/src/components/ProjectsSummary.vue
index cc9bf47..2c237d1 100644
--- a/src/components/ProjectsSummary.vue
+++ b/src/components/ProjectsSummary.vue
@@ -99,29 +99,6 @@
               </v-menu>
               <!-- normal icons in sm+ --->
               <div class="d-none d-sm-flex mx-1">
-                <v-tooltip top v-if="detailed && project.links.repo">
-                  <template v-slot:activator="{ on, attrs }">
-                    <v-btn
-                      icon
-                      target="_blank"
-                      v-bind="attrs"
-                      v-on="on"
-                      color="secondary"
-                      v-on:click="
-                        () => setProjectFavorite(project, !project.favorite)
-                      "
-                      @click.native.stop
-                      class="no-border no-shadow no-link"
-                    >
-                      <v-icon>
-                        {{
-                          project.favorite ? "mdi-heart" : "mdi-heart-outline"
-                        }}
-                      </v-icon>
-                    </v-btn>
-                  </template>
-                  <span>Favorite</span>
-                </v-tooltip>
                 <v-tooltip top v-if="project.links.repo">
                   <template v-slot:activator="{ on, attrs }">
                     <v-btn
diff --git a/src/components/SystemStatusSummary.vue b/src/components/SystemStatusSummary.vue
index a622615..7c04c70 100644
--- a/src/components/SystemStatusSummary.vue
+++ b/src/components/SystemStatusSummary.vue
@@ -119,7 +119,7 @@ export default {
       window.alert(msg);
     },
     getIconName(systemName) {
-      const iconName = systemName.toLowerCase().replace(" ", "-");
+      const iconName = systemName.toLowerCase()?.replace(" ", "-");
       if (this.$vuetify.icons.values[iconName]) {
         return `$vuetify.icons.${iconName}`;
       }
diff --git a/src/components/icons/GitLabIcon.vue b/src/components/icons/GitLabIcon.vue
index d2c5d53..f185102 100644
--- a/src/components/icons/GitLabIcon.vue
+++ b/src/components/icons/GitLabIcon.vue
@@ -25,7 +25,7 @@ export default {
   },
   computed: {
     cssClass() {
-      return this.iconName.replace("_", "-");
+      return this.iconName?.replace("_", "-");
     },
     iconName() {
       if (this.icon) {
diff --git a/tests/unit/api/services/project.spec.js b/tests/unit/api/services/project.spec.js
index 6a2ec26..e7361af 100644
--- a/tests/unit/api/services/project.spec.js
+++ b/tests/unit/api/services/project.spec.js
@@ -1,16 +1,12 @@
 import ProjectApi from "@/api/services/project";
-import { HTTP } from "@/api/mock-http-common";
-
-const mockResponse = { status: 200, data: "mocked ok" };
-
-describe("project api", () => {
-  // dummy test until the API is ironed out
-  it("should pass coverage :)", async () => {
-    HTTP.get = jest.fn().mockResolvedValue(mockResponse);
+jest.mock("axios");
+import axios from "axios";
 
+describe("projects api", () => {
+  it("should call axios.get", async () => {
+    axios.get = jest.fn().mockResolvedValue({ data: { test: "test" } });
     const response = await ProjectApi.getProjectsSummary();
-    expect(response).toBe(mockResponse.data);
-
-    await ProjectApi.updateProject();
+    expect(axios.get).toHaveBeenCalledTimes(1);
+    expect(response).toEqual({ test: "test" });
   });
 });
-- 
GitLab


From 138fb4bf8ced7998352149dfcfc0151a48544a5d Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Wed, 6 Jan 2021 02:00:50 -0700
Subject: [PATCH 2/7] prettier

---
 src/api/services/project.js            |  6 ++++--
 src/components/ProjectsSummary.vue     | 20 ++++++++++----------
 src/components/SystemStatusSummary.vue |  8 ++++----
 src/components/icons/GitLabIcon.vue    | 10 +++++-----
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/api/services/project.js b/src/api/services/project.js
index 7be9722..71c29c6 100644
--- a/src/api/services/project.js
+++ b/src/api/services/project.js
@@ -1,8 +1,10 @@
-import axios from 'axios';
+import axios from "axios";
 
 export default {
   async getProjectsSummary() {
-    let response = await axios.get("/api/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user");
+    let response = await axios.get(
+      "/api/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user"
+    );
     return response?.data;
   },
 };
diff --git a/src/components/ProjectsSummary.vue b/src/components/ProjectsSummary.vue
index 2c237d1..b4d9fd1 100644
--- a/src/components/ProjectsSummary.vue
+++ b/src/components/ProjectsSummary.vue
@@ -214,16 +214,16 @@ import { SET_PROJECTS, UPDATE_PROJECT } from "@/store/mutation-types";
 
 export default {
   components: {
-    GitLabIcon
+    GitLabIcon,
   },
   props: {
     detailed: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data: () => ({
-    loading: false
+    loading: false,
   }),
   async mounted() {
     try {
@@ -250,20 +250,20 @@ export default {
     },
     ...mapMutations({
       setProjects: SET_PROJECTS,
-      updateProject: UPDATE_PROJECT
-    })
+      updateProject: UPDATE_PROJECT,
+    }),
   },
   computed: {
     filteredProjects() {
       const projects = this.detailed
         ? this.projects
-        : this.projects.filter(o => o.favorite);
+        : this.projects.filter((o) => o.favorite);
       return projects;
     },
     ...mapState({
-      projects: state => state.projects.list
-    })
-  }
+      projects: (state) => state.projects.list,
+    }),
+  },
 };
 </script>
 
diff --git a/src/components/SystemStatusSummary.vue b/src/components/SystemStatusSummary.vue
index 7c04c70..d1c1777 100644
--- a/src/components/SystemStatusSummary.vue
+++ b/src/components/SystemStatusSummary.vue
@@ -94,11 +94,11 @@ import GitLabIcon from "@/components/icons/GitLabIcon";
 export default {
   components: {
     ExternalLink,
-    GitLabIcon
+    GitLabIcon,
   },
   data: () => ({
     loading: false,
-    systemStatus: []
+    systemStatus: [],
   }),
   async mounted() {
     try {
@@ -140,8 +140,8 @@ export default {
       } else {
         return "warning";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">
diff --git a/src/components/icons/GitLabIcon.vue b/src/components/icons/GitLabIcon.vue
index f185102..107ffce 100644
--- a/src/components/icons/GitLabIcon.vue
+++ b/src/components/icons/GitLabIcon.vue
@@ -4,7 +4,7 @@
     :class="[
       cssClass,
       small ? 'small' : '',
-      $vuetify.theme.dark ? 'theme--dark' : ''
+      $vuetify.theme.dark ? 'theme--dark' : '',
     ]"
   >
     <use :xlink:href="`./static/gitlab-icons.svg#${iconName}`" />
@@ -15,13 +15,13 @@ const statusMap = {
   passed: "status_success",
   failed: "status_failed",
   skipped: "status_skipped",
-  warning: "status_warning"
+  warning: "status_warning",
 };
 export default {
   props: {
     icon: String,
     status: String,
-    small: { type: Boolean, default: false }
+    small: { type: Boolean, default: false },
   },
   computed: {
     cssClass() {
@@ -32,8 +32,8 @@ export default {
         return this.icon;
       }
       return statusMap[this.status];
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">
-- 
GitLab


From 4003694da0b60b362adfad9263523b245cda4ecc Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Thu, 7 Jan 2021 10:28:45 -0700
Subject: [PATCH 3/7] version update

---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e82ce7f..666cb13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4053,9 +4053,9 @@
       "dev": true
     },
     "axios": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
-      "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "requires": {
         "follow-redirects": "^1.10.0"
       }
diff --git a/package.json b/package.json
index 4092b47..d41deb3 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "prettify:pretty-quick"
   ],
   "dependencies": {
-    "axios": "^0.21.0",
+    "axios": "^0.21.1",
     "core-js": "^3.6.4",
     "lodash": "^4.17.20",
     "overflow-color": "^2.3.0",
-- 
GitLab


From 1d6f69ed5cef52956e45bc2e6c23d9ec1ea1f152 Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Thu, 7 Jan 2021 10:39:17 -0700
Subject: [PATCH 4/7] update to use HTTP

---
 src/api/services/project.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/services/project.js b/src/api/services/project.js
index 71c29c6..f289814 100644
--- a/src/api/services/project.js
+++ b/src/api/services/project.js
@@ -1,8 +1,8 @@
-import axios from "axios";
+import { HTTP } from "@/api/http-common";
 
 export default {
   async getProjectsSummary() {
-    let response = await axios.get(
+    const response = await HTTP.get(
       "/api/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user"
     );
     return response?.data;
-- 
GitLab


From 0173bdda26d7c0b119a87c01605fd1052efa25a0 Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Thu, 7 Jan 2021 10:51:03 -0700
Subject: [PATCH 5/7] update to use HTTP

---
 src/api/services/project.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/services/project.js b/src/api/services/project.js
index f289814..0d13d8f 100644
--- a/src/api/services/project.js
+++ b/src/api/services/project.js
@@ -3,7 +3,7 @@ import { HTTP } from "@/api/http-common";
 export default {
   async getProjectsSummary() {
     const response = await HTTP.get(
-      "/api/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user"
+      "/gitlab/projects-with-jobs-and-pipelines-for-logged-in-user"
     );
     return response?.data;
   },
-- 
GitLab


From c2b199224eab21619812fb0449c7ed32510bf738 Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Thu, 7 Jan 2021 11:09:13 -0700
Subject: [PATCH 6/7] update to use HTTP

---
 tests/unit/api/services/project.spec.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/unit/api/services/project.spec.js b/tests/unit/api/services/project.spec.js
index e7361af..e0e6d92 100644
--- a/tests/unit/api/services/project.spec.js
+++ b/tests/unit/api/services/project.spec.js
@@ -1,12 +1,14 @@
 import ProjectApi from "@/api/services/project";
-jest.mock("axios");
-import axios from "axios";
+import { HTTP } from "@/api/http-common";
 
 describe("projects api", () => {
-  it("should call axios.get", async () => {
-    axios.get = jest.fn().mockResolvedValue({ data: { test: "test" } });
-    const response = await ProjectApi.getProjectsSummary();
-    expect(axios.get).toHaveBeenCalledTimes(1);
-    expect(response).toEqual({ test: "test" });
+  it("should call HTTP.get", async () => {
+    const mockPersonnelResponse = {
+      status: 200,
+      data: [{ name: "mock" }]
+    };
+    HTTP.get = jest.fn(() => mockPersonnelResponse);
+    await ProjectApi.getProjectsSummary();
+    expect(HTTP.get).toHaveBeenCalledTimes(1);
   });
 });
-- 
GitLab


From 536f540d166c9cae048eff9c5961ad7d71fc7023 Mon Sep 17 00:00:00 2001
From: Keith Becker <keith.becker@recro.com>
Date: Thu, 7 Jan 2021 11:09:46 -0700
Subject: [PATCH 7/7] update to use HTTP

---
 tests/unit/api/services/project.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/api/services/project.spec.js b/tests/unit/api/services/project.spec.js
index e0e6d92..6f46e68 100644
--- a/tests/unit/api/services/project.spec.js
+++ b/tests/unit/api/services/project.spec.js
@@ -5,7 +5,7 @@ describe("projects api", () => {
   it("should call HTTP.get", async () => {
     const mockPersonnelResponse = {
       status: 200,
-      data: [{ name: "mock" }]
+      data: [{ name: "mock" }],
     };
     HTTP.get = jest.fn(() => mockPersonnelResponse);
     await ProjectApi.getProjectsSummary();
-- 
GitLab