#333: Merged develop and fixed conflicts in Report

NBISweden · May 20, 2022 · 032b02c · 032b02c
2 parents c078ed3 + f977bab
commit 032b02c
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 165 deletions.
diff --git a/.github/workflows/create_packages.yml b/.github/workflows/create_packages.yml
@@ -1,12 +1,15 @@
 name: Create packages
 on:
-  push:
+  pull_request:
     branches:
       - main
+    types:
+      - closed
 
 
 jobs:
   main:
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -23,9 +26,10 @@ jobs:
           COMPOSE_DOCKER_CLI_BUILD: 1
           GH_ACTOR: ${{ github.actor }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_HEAD_REF: ${{ github.head_ref }}
         run: |
              echo "${GH_TOKEN}" | docker login ghcr.io -u "${GH_ACTOR}" --password-stdin
-             branch=${GITHUB_REF##*/}
+             branch="${GH_HEAD_REF}"
 
              for image in urdr urdr-web; do
                docker pull "ghcr.io/nbisweden/$image:latest" || true

diff --git a/backend/api/recentIssuesHandler.go b/backend/api/recentIssuesHandler.go
@@ -3,8 +3,9 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gofiber/fiber/v2"
 	"sort"
+
+	"github.com/gofiber/fiber/v2"
 )
 
 // recentIssuesHandler godoc
@@ -61,6 +62,22 @@ func recentIssuesHandler(c *fiber.Ctx) error {
 		}
 	}
 
+	// Make sure that when there is not any time entry, we send the vacation entry by default
+	if len(entries) == 0 {
+		vacationEntry := Entry{
+			Issue: Issue{
+				Id:      3499,
+				Subject: "NBIS General",
+			},
+			Activity: Activity{
+				Id:   19,
+				Name: "Absence (Vacation/VAB/Other)",
+			},
+		}
+		entries = append(entries, vacationEntry)
+		return c.JSON(entries)
+	}
+
 	// Populate the issue subjects.
 	if ok, err := fetchIssueSubjects(c, entries); !ok {
 		return err

diff --git a/frontend/src/components/Row.tsx b/frontend/src/components/Row.tsx
@@ -6,7 +6,7 @@ import { Cell } from "./Cell";
 import fillStar from "../icons/star-fill.svg";
 import star from "../icons/star.svg";
 import grip from "../icons/grip-vertical.svg";
-import eye from "../icons/eye-slash.svg";
+import x from "../icons/x.svg";
 import { dateFormat } from "../utils";
 import { SNOWPACK_PUBLIC_REDMINE_URL } from "../utils";
 
@@ -39,10 +39,35 @@ export const Row = ({
           {isFav ? (
             <img src={grip} className="grip" alt="grip to change row sorting" />
           ) : (
-            <div></div>
+            <button
+              type="button"
+              className="star-button"
+              onClick={() => onHide(topic)}
+            >
+              <img
+                src={x}
+                className="hide-icon"
+                role="button"
+                alt={"Hide this row"}
+                title={"Hide this row"}
+              />
+            </button>
           )}
+          <button
+            type="button"
+            className="star-button"
+            onClick={() => onToggleFav(topic)}
+          >
+            <img
+              src={isFav ? fillStar : star}
+              className="star-icon"
+              role="button"
+              alt={isFav ? "Remove from favorites" : "Make favorite"}
+              title={isFav ? "Remove from favorites" : "Make favorite"}
+            />
+          </button>
         </div>
-        <div className="col-4 ">
+        <div className="col-5 ">
           <div className="issue-label">
             <p className="issue-label-text">
               <a
@@ -58,36 +83,6 @@ export const Row = ({
             </p>
           </div>
         </div>
-        <div className="col-1 star-container">
-          <button
-            type="button"
-            className="star-button"
-            onClick={() => onToggleFav(topic)}
-          >
-            <img
-              src={isFav ? fillStar : star}
-              className="star"
-              role="button"
-              alt={isFav ? "Remove from favorites" : "Make favorite"}
-            />
-          </button>
-          {!isFav ? (
-            <button
-              type="button"
-              className="star-button"
-              onClick={() => onHide(topic)}
-            >
-              <img
-                src={eye}
-                className="star"
-                role="button"
-                alt={"Hide this row"}
-              />
-            </button>
-          ) : (
-            <></>
-          )}
-        </div>
         {days.map((day, i) => {
           return (
             <Cell

diff --git a/frontend/src/index.css b/frontend/src/index.css
@@ -127,18 +127,17 @@ Other button classes are defined further down together with other classes for th
   justify-content: space-between;
   align-items: center;
   background-color: hsl(76deg 55% 53%);
-  margin-bottom: 0.4rem;
-  position: fixed;
+  margin-bottom: 0.2rem;
+  position: sticky;
   z-index: 100;
   left: 0;
   top: 0;
   width: 100%;
   height: 80px;
 }
 
-.main {
-  position: relative;
-  margin: 50px 0;
+.spreadsheet {
+  min-height: 100vh;
 }
 
 .footer {
@@ -368,13 +367,13 @@ Other button classes are defined further down together with other classes for th
   width: 1.8rem;
 }
 
-.star-container {
-  display: flex;
-  align-items: center;
+.star-icon {
+  width: 1.7rem;
 }
 
-.star {
-  width: 1.7rem;
+.hide-icon {
+  width: 2rem;
+  margin-top: 0.5rem;
 }
 
 .star-button {
@@ -384,7 +383,13 @@ Other button classes are defined further down together with other classes for th
 }
 
 .grip-container {
-  justify-content: end;
+  justify-content: space-evenly;
+  padding: 0;
+}
+
+/* targeting all child elements of grip-container */
+.grip-container > * {
+  margin: 0 0 0 0.75rem;
   padding: 0;
 }