Dev

.github/workflows/cypress-tests.yml

@@ -35,6 +35,8 @@ jobs:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           CYPRESS_RESEARCHER_USER_NAME: ${{ secrets.CYPRESS_RESEARCHER_USER_NAME }}
           CYPRESS_RESEARCHER_USER_PASSWORD: ${{ secrets.CYPRESS_RESEARCHER_USER_PASSWORD }}
+          CYPRESS_RESEARCHER_NAME: ${{ vars.CYPRESS_RESEARCHER_NAME }}
           CYPRESS_LIBRARIAN_USER_NAME: ${{ secrets.CYPRESS_LIBRARIAN_USER_NAME }}
           CYPRESS_LIBRARIAN_USER_PASSWORD: ${{ secrets.CYPRESS_LIBRARIAN_USER_PASSWORD }}
+          CYPRESS_LIBRARIAN_NAME: ${{ vars.CYPRESS_LIBRARIAN_NAME }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.vscode/settings.json

@@ -7,6 +7,7 @@
     "Arxiv",
     "biblio",
     "Biblio",
+    "bibtex",
     "briefcase",
     "CYPRESSTEST",
     "eisbn",
@@ -17,6 +18,8 @@
     "liblogin",
     "Moreels",
     "pubmed",
+    "socs",
     "tagify"
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

assets/ugent/scss/components/_c-spinner-card-backdrop.scss

@@ -0,0 +1,26 @@
+/* ==========================================================================
+  Additions to bootstrap/spinner – backdrop
+  To disable backgrounds for cards
+  ========================================================================== */
+
+$spinner-backdrop-bg:                 $gray-25;
+$spinner-backdrop-opacity:            .8;
+
+.spinner-card-backdrop {
+  position: absolute;
+  z-index: 1050;
+  background-color: $spinner-backdrop-bg;
+  opacity: $spinner-backdrop-opacity;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  display: none;
+}
+
+.spinner-card-backdrop.htmx-request {
+  display: flex;
+}

assets/ugent/scss/main.scss

@@ -129,8 +129,9 @@ $theme-colors: map-merge($theme-colors, $custom-theme-colors);
 @import "components/c-radio-card";
 @import "components/c-requested-change";
 @import "components/c-sidebar";
-@import "components/c-stepper";
 @import "components/c-side-panel";
+@import "components/c-spinner-card-backdrop";
+@import "components/c-stepper";
 @import "components/c-sub-sidebar";
 @import "components/c-tagify";
 @import "components/c-thumbnail";

backends/authority/person.go

@@ -13,7 +13,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 
 	"github.com/ugent-library/biblio-backoffice/models"
-	"github.com/ugent-library/biblio-backoffice/util"
 )
 
 func (c *Client) GetPerson(id string) (*models.Person, error) {
@@ -96,27 +95,42 @@ func (c *Client) SuggestPeople(q string) ([]*models.Person, error) {
 }
 
 func (c *Client) recordToPerson(record bson.M) (*models.Person, error) {
-	var person *models.Person = &models.Person{}
+	person := &models.Person{}
 
-	if v, e := record["_id"]; e {
-		// _id might be stored as number, float or even "null"
-		person.ID = util.ParseString(v)
+	if v, ok := record["_id"]; ok {
+		person.ID = v.(string)
 	}
-	if v, e := record["active"]; e {
-		person.Active = util.ParseBoolean(v)
+	if v, ok := record["email"]; ok {
+		person.Email = strings.ToLower(v.(string))
 	}
-	if v, e := record["orcid_id"]; e {
-		// orcid might be stored as "null"
-		person.ORCID = util.ParseString(v)
+	if v, ok := record["ugent_username"]; ok {
+		person.Username = v.(string)
 	}
-	if v, e := record["ugent_id"]; e {
+	if v, ok := record["active"]; ok {
+		person.Active = v.(int32) == 1
+	}
+	if v, ok := record["orcid_token"]; ok {
+		person.ORCIDToken = v.(string)
+	}
+	if v, ok := record["orcid_id"]; ok {
+		person.ORCID = v.(string)
+	}
+	if v, ok := record["ugent_id"]; ok {
 		for _, i := range v.(bson.A) {
-			person.UGentID = append(person.UGentID, util.ParseString(i))
+			person.UGentID = append(person.UGentID, i.(string))
+		}
+	}
+	if v, ok := record["roles"]; ok {
+		for _, r := range v.(bson.A) {
+			if r.(string) == "biblio-admin" {
+				person.Role = "admin"
+				break
+			}
 		}
 	}
-	if v, e := record["ugent_department_id"]; e {
+	if v, ok := record["ugent_department_id"]; ok {
 		for _, i := range v.(bson.A) {
-			person.Affiliations = append(person.Affiliations, &models.Affiliation{OrganizationID: util.ParseString(i)})
+			person.Affiliations = append(person.Affiliations, &models.Affiliation{OrganizationID: i.(string)})
 		}
 	}
 	if v, e := record["object_class"]; e {
@@ -131,19 +145,19 @@ func (c *Client) recordToPerson(record bson.M) (*models.Person, error) {
 			person.Affiliations = append(person.Affiliations, &models.Affiliation{OrganizationID: "UZGent"})
 		}
 	}
-	if v, e := record["preferred_first_name"]; e {
-		person.FirstName = util.ParseString(v)
-	} else if v, e := record["first_name"]; e {
-		person.FirstName = util.ParseString(v)
+	if v, ok := record["preferred_first_name"]; ok {
+		person.FirstName = v.(string)
+	} else if v, ok := record["first_name"]; ok {
+		person.FirstName = v.(string)
 	}
-	if v, e := record["preferred_last_name"]; e {
-		person.LastName = util.ParseString(v)
-	} else if v, e := record["last_name"]; e {
-		person.LastName = util.ParseString(v)
+	if v, ok := record["preferred_last_name"]; ok {
+		person.LastName = v.(string)
+	} else if v, ok := record["last_name"]; ok {
+		person.LastName = v.(string)
 	}
 
 	// TODO: cleanup when authority database is synchronized with full_name
-	if v, e := record["full_name"]; e {
+	if v, ok := record["full_name"]; ok {
 		person.FullName = v.(string)
 	}
 	if person.FullName == "" {
@@ -156,12 +170,12 @@ func (c *Client) recordToPerson(record bson.M) (*models.Person, error) {
 		}
 	}
 
-	if v, e := record["date_created"]; e {
-		t, _ := time.Parse(time.RFC3339, util.ParseString(v))
+	if v, ok := record["date_created"]; ok {
+		t, _ := time.Parse(time.RFC3339, v.(string))
 		person.DateCreated = &t
 	}
-	if v, e := record["date_updated"]; e {
-		t, _ := time.Parse(time.RFC3339, util.ParseString(v))
+	if v, ok := record["date_updated"]; ok {
+		t, _ := time.Parse(time.RFC3339, v.(string))
 		person.DateUpdated = &t
 	}
 

backends/authority/user.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/pkg/errors"
 	"go.mongodb.org/mongo-driver/bson"
@@ -13,7 +12,7 @@ import (
 	"github.com/ugent-library/biblio-backoffice/models"
 )
 
-func (c *Client) GetUser(id string) (*models.User, error) {
+func (c *Client) GetUser(id string) (*models.Person, error) {
 	var record bson.M
 	err := c.mongo.Database("authority").Collection("person").FindOne(
 		context.Background(),
@@ -24,10 +23,10 @@ func (c *Client) GetUser(id string) (*models.User, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "unexpected error during document retrieval")
 	}
-	return c.recordToUser(record)
+	return c.recordToPerson(record)
 }
 
-func (c *Client) GetUserByUsername(username string) (*models.User, error) {
+func (c *Client) GetUserByUsername(username string) (*models.Person, error) {
 	var record bson.M
 	err := c.mongo.Database("authority").Collection("person").FindOne(
 		context.Background(),
@@ -38,7 +37,7 @@ func (c *Client) GetUserByUsername(username string) (*models.User, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "unexpected error during document retrieval")
 	}
-	return c.recordToUser(record)
+	return c.recordToPerson(record)
 }
 
 func (c *Client) SuggestUsers(q string) ([]*models.Person, error) {
@@ -96,79 +95,3 @@ func (c *Client) SuggestUsers(q string) ([]*models.Person, error) {
 
 	return persons, nil
 }
-
-func (c *Client) recordToUser(record bson.M) (*models.User, error) {
-	user := &models.User{}
-
-	if v, ok := record["_id"]; ok {
-		user.ID = v.(string)
-	}
-	if v, ok := record["email"]; ok {
-		user.Email = strings.ToLower(v.(string))
-	}
-	if v, ok := record["ugent_username"]; ok {
-		user.Username = v.(string)
-	}
-	if v, ok := record["active"]; ok {
-		user.Active = v.(int32) == 1
-	}
-	if v, ok := record["orcid_token"]; ok {
-		user.ORCIDToken = v.(string)
-	}
-	if v, ok := record["orcid_id"]; ok {
-		user.ORCID = v.(string)
-	}
-	if v, ok := record["ugent_id"]; ok {
-		for _, i := range v.(bson.A) {
-			user.UGentID = append(user.UGentID, i.(string))
-		}
-	}
-	if v, ok := record["roles"]; ok {
-		for _, r := range v.(bson.A) {
-			if r.(string) == "biblio-admin" {
-				user.Role = "admin"
-				break
-			}
-		}
-	}
-	if v, ok := record["ugent_department_id"]; ok {
-		for _, i := range v.(bson.A) {
-			user.Affiliations = append(user.Affiliations, &models.Affiliation{OrganizationID: i.(string)})
-		}
-	}
-	if v, ok := record["preferred_first_name"]; ok {
-		user.FirstName = v.(string)
-	} else if v, ok := record["first_name"]; ok {
-		user.FirstName = v.(string)
-	}
-	if v, ok := record["preferred_last_name"]; ok {
-		user.LastName = v.(string)
-	} else if v, ok := record["last_name"]; ok {
-		user.LastName = v.(string)
-	}
-
-	// TODO: cleanup when authority database is synchronized with full_name
-	if v, ok := record["full_name"]; ok {
-		user.FullName = v.(string)
-	}
-	if user.FullName == "" {
-		if user.FirstName != "" && user.LastName != "" {
-			user.FullName = user.FirstName + " " + user.LastName
-		} else if user.LastName != "" {
-			user.FullName = user.LastName
-		} else if user.FirstName != "" {
-			user.FullName = user.FirstName
-		}
-	}
-
-	if v, ok := record["date_created"]; ok {
-		t, _ := time.Parse(time.RFC3339, v.(string))
-		user.DateCreated = &t
-	}
-	if v, ok := record["date_updated"]; ok {
-		t, _ := time.Parse(time.RFC3339, v.(string))
-		user.DateUpdated = &t
-	}
-
-	return user, nil
-}

backends/ecoom/ecoom.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/ugent-library/biblio-backoffice/helpers"
 	"github.com/ugent-library/biblio-backoffice/models"
 	"github.com/ugent-library/biblio-backoffice/util"
 	"go.mongodb.org/mongo-driver/bson"
@@ -73,7 +74,7 @@ func NewPublicationFixer(c *mongo.Client) func(context.Context, *models.Publicat
 				newFields.Add(fmt.Sprintf("ecoom-%s-%s", fund, "css"), util.ParseString(v))
 			}
 			if v, ok := fundRecords[0]["internationale_samenwerking"]; ok {
-				newFields.Add(fmt.Sprintf("ecoom-%s-%s", fund, "international-collaboration"), util.ParseString(v))
+				newFields.Add(fmt.Sprintf("ecoom-%s-%s", fund, "international-collaboration"), helpers.FormatBool(util.ParseBoolean(v), "true", "false"))
 			}
 			if v, ok := fundRecords[0]["hoger_onderwijs"]; ok && util.ParseBoolean(v) {
 				newFields.Add(fmt.Sprintf("ecoom-%s-%s", fund, "sector"), "higher-education")

backends/excel/publication/publication_list_exporter.go

@@ -76,7 +76,7 @@ var headers = []string{
 	"jcr_eigenfactor",
 	"jcr_immediacy_index",
 	"jcr_impact_factor",
-	"jcr_impact_factor_5year",
+	"jcr_impact_factor_5yr",
 	"jcr_total_cites",
 	"jcr_category_quartile",
 	"jcr_prev_impact_factor",
@@ -232,7 +232,7 @@ func (x *xlsx) publicationToRow(pub *models.Publication) []string {
 	m["jcr_eigenfactor"] = ""
 	m["jcr_immediacy_index"] = ""
 	m["jcr_impact_factor"] = ""
-	m["jcr_impact_factor_5year"] = ""
+	m["jcr_impact_factor_5yr"] = ""
 	m["jcr_total_cites"] = ""
 	m["jcr_category_quartile"] = ""
 	m["jcr_prev_impact_factor"] = ""