support users styling

gemini-hlsw · Sep 19, 2024 · 9cff99d · 9cff99d
1 parent d0bcbe9
commit 9cff99d
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 66 deletions.
diff --git a/common/src/main/scala/explore/components/ui/ExploreStyles.scala b/common/src/main/scala/explore/components/ui/ExploreStyles.scala
@@ -491,7 +491,9 @@ object ExploreStyles:
   // Program Tab
   val ProgramDetailsTile: Css     = Css("program-details-tile")
   val ProgramDetailsInfoArea: Css = Css("program-details-info-area")
+  val ProgramDetailsLeft: Css     = Css("program-details-left")
   val ProgramTabTable: Css        = Css("program-tab-table")
+  val ProgramDetailsUsers: Css    = Css("program-details-users")
 
   val FocusedInfo: Css = Css("explore-focused-info")
 

diff --git a/common/src/main/webapp/sass/explore.scss b/common/src/main/webapp/sass/explore.scss
@@ -3245,17 +3245,30 @@ a.explore-upgrade-link {
   justify-content: space-between;
 
   .program-details-info-area {
-    display: grid;
-    grid-template-columns: [label] auto [value] 1fr;
-    gap: 0.25em 1em;
-    grid-auto-rows: max-content;
     flex: 1 1 0;
     padding: 1em;
 
+    &.program-details-left {
+      display: grid;
+      grid-template-columns: [label] auto [value] 1fr;
+      gap: 0.25em 1em;
+      grid-auto-rows: max-content;      
+    }
+
     label {
       text-align: right;
       font-weight: bold;
     }
+
+    .program-details-users {
+      margin-bottom: 1em;
+
+      label {
+        display: flex;
+        gap: 1em;
+        align-items: center;
+      }
+    }
   }
 }
 

diff --git a/explore/src/main/scala/explore/programs/ProgramDetailsTile.scala b/explore/src/main/scala/explore/programs/ProgramDetailsTile.scala
@@ -43,7 +43,7 @@ object ProgramDetailsTile:
     val readonly: Boolean                       = !EditSupportAccesses.contains_(props.currentUserAccess)
 
     <.div(ExploreStyles.ProgramDetailsTile)(
-      <.div(ExploreStyles.ProgramDetailsInfoArea)(
+      <.div(ExploreStyles.ProgramDetailsInfoArea, ExploreStyles.ProgramDetailsLeft)(
         FormInfo(details.reference.map(_.label).getOrElse("---"), "Reference"),
         FormInfo(Constants.GppDateFormatter.format(props.semester.start.localDate), "Start"),
         FormInfo(Constants.GppDateFormatter.format(props.semester.end.localDate), "End"),

diff --git a/explore/src/main/scala/explore/programs/SupportUsers.scala b/explore/src/main/scala/explore/programs/SupportUsers.scala
@@ -5,6 +5,7 @@ package explore.programs
 
 import cats.data.NonEmptySet
 import crystal.react.View
+import explore.components.ui.ExploreStyles
 import explore.model.ProgramUserWithRole
 import explore.model.UserInvitation
 import explore.users.InviteUserButton
@@ -32,7 +33,7 @@ object SupportUsers:
     case Secondary extends SupportRole(ProgramUserRole.SupportSecondary)
 
   private val component = ScalaFnComponent[Props]: props =>
-    <.div(
+    <.div(ExploreStyles.ProgramDetailsUsers)(
       <.label(
         props.title,
         InviteUserButton(props.programId, props.supportRole.role, props.invitations)

diff --git a/explore/src/main/scala/explore/proposal/InvestigatorUsers.scala b/explore/src/main/scala/explore/proposal/InvestigatorUsers.scala
diff --git a/explore/src/main/scala/explore/users/ProgramUserInvitations.scala b/explore/src/main/scala/explore/users/ProgramUserInvitations.scala
@@ -48,42 +48,38 @@ object ProgramUserInvitations:
 
   private val ColDef = ColumnDef.WithTableMeta[UserInvitation, TableMeta]
 
-  private val KeyId: ColumnId         = ColumnId("id")
-  private val EmailId: ColumnId       = ColumnId("email")
-  private val EmailStatusId: ColumnId = ColumnId("emailStatus")
-  private val RevokeId: ColumnId      = ColumnId("revoke")
+  private enum Column(val tag: String, val header: String):
+    val id: ColumnId = ColumnId(tag)
 
-  private val columnNames: Map[ColumnId, String] = Map(
-    KeyId         -> "ID",
-    EmailId       -> "email",
-    EmailStatusId -> "",
-    RevokeId      -> ""
-  )
+    case Key         extends Column("id", "Id")
+    case Email       extends Column("email", "Email")
+    case EmailStatus extends Column("emailStatus", "")
+    case Revoke      extends Column("revoke", "")
 
   private def column[V](
-    id:       ColumnId,
+    column:   Column,
     accessor: UserInvitation => V
   ): ColumnDef.Single.WithTableMeta[UserInvitation, V, TableMeta] =
-    ColDef(id, accessor, columnNames(id))
+    ColDef(column.id, accessor, column.header)
 
   private def columns(
     ctx: AppContext[IO]
   ): List[ColumnDef.WithTableMeta[UserInvitation, ?, TableMeta]] =
     import ctx.given
 
     List(
-      column(KeyId, _.id),
-      column(EmailId, _.email),
+      column(Column.Key, _.id),
+      column(Column.Email, _.email),
       ColDef(
-        EmailStatusId,
+        Column.EmailStatus.id,
         _.emailStatus,
         "Email Status",
         cell = _.value
           .map(es => <.span(es.tag.toUpperCase).withTooltip(es.description))
           .getOrElse(<.span())
       ),
       ColDef(
-        RevokeId,
+        Column.Revoke.id,
         identity,
         "Revoke",
         cell = cell =>
@@ -141,7 +137,7 @@ object ProgramUserInvitations:
             readOnly = props.readonly
           ),
           state = PartialTableState(columnVisibility =
-            ColumnVisibility(RevokeId -> Visibility.fromVisible(!props.readonly))
+            ColumnVisibility(Column.Revoke.id -> Visibility.fromVisible(!props.readonly))
           )
         )
       .render: (props, _, _, _, _, table) =>

diff --git a/explore/src/main/scala/explore/users/ProgramUsersTable.scala b/explore/src/main/scala/explore/users/ProgramUsersTable.scala
@@ -72,7 +72,7 @@ object ProgramUsersTable:
   enum Column(
     protected[ProgramUsersTable] val tag:    String,
     protected[ProgramUsersTable] val header: String
-  ) derives Enumerated:
+  ):
     val id: ColumnId = ColumnId(tag)
 
     case Name              extends Column("name", "Name")