Fixing limited editing

Author: klakegg

src/main/java/no/java/submit/controller/TalkController.java

@@ -19,6 +19,7 @@
 import no.java.submit.service.ConferenceService;
 import no.java.submit.service.TalksService;
 import no.java.submit.service.TimelineService;
+import no.java.submit.util.SessionHelper;
 import no.java.submit.util.SessionSecretHelper;
 import no.java.submit.util.UserHelper;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -56,6 +57,9 @@ public class TalkController {
     @Inject
     Template sessionForm;
 
+    @Inject
+    Template sessionFormClosed;
+
     @Inject
     Template all;
 
@@ -84,7 +88,7 @@ public TemplateInstance view(@PathParam("sessionId") String sessionId, @Context
         try {
             var session = talksService.getSession(email, sessionId);
 
-            if (!session.containsEmail(email))
+            if (!email.isEmpty() && !session.containsEmail(email) && !appAdmins.contains(email))
                 throw new NotAuthorizedException("Not allowed to view this session");
 
             return talk
@@ -203,13 +207,13 @@ public TemplateInstance editSession(String sessionId, String email, String secre
         try {
             var session = talksService.getSession(email, sessionId);
 
-            if (!email.isEmpty() && !session.containsEmail(email))
-                throw new NotAuthorizedException("Not allowed to view this session");
+            if (!email.isEmpty() && !session.containsEmail(email) && !appAdmins.contains(email))
+                throw new NotAuthorizedException("Not allowed to edit this session");
 
             if (!conferenceService.current().id.equals(session.conferenceId))
                 throw new NotFoundException();
 
-            return sessionForm
+            return (timelineService.isClosed(appAdmins.contains(email)) ? sessionFormClosed : sessionForm)
                     .data("form", SessionForm.parse(session))
                     .data("val", Collections.emptyMap())
                     .data("sessionId", sessionId)
@@ -224,23 +228,58 @@ public TemplateInstance editSession(String sessionId, String email, String secre
     @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @Authenticated
     public Object editSessionPost(@PathParam("sessionId") String sessionId, SessionForm form, @Context SecurityIdentity securityIdentity) {
+        var email = UserHelper.getEmail(securityIdentity);
+
+        return editSessionPost(sessionId, form, email, null);
+    }
+
+    @POST
+    @Path("{sessionId}/{secret}/edit")
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
+    public Object editSessionPost(@PathParam("sessionId") String sessionId, @PathParam("secret") String secret, SessionForm form) {
+        sessionSecrets.validate(sessionId, secret);
+
+        return editSessionPost(sessionId, form, "", secret);
+    }
+
+    public Object editSessionPost(String sessionId, SessionForm form, String email, String secret) {
         // Validate form and present form if there are any errors
         var validation = validator.validate(form);
         if (!validation.isEmpty()) {
-            return sessionForm
+            return (timelineService.isClosed(appAdmins.contains(email)) ? sessionFormClosed : sessionForm)
                     .data("form", form)
                     .data("val", validation.stream().collect(Collectors.groupingBy(c -> c.getPropertyPath().toString())))
-                    .data("sessionId", sessionId);
+                    .data("sessionId", sessionId)
+                    .data("secret", secret);
         }
 
+        // Fetch current session
+        var session = talksService.getSession(email, sessionId);
+
+        if (!email.isEmpty() && !session.containsEmail(email) && !appAdmins.contains(email))
+            throw new NotAuthorizedException("Not allowed to edit this session");
+
         // Prepare form for sending
-        var session = form.asSession();
-        session.postedBy = UserHelper.getEmail(securityIdentity);
-        session.sessionId = sessionId;
+        var newSession = form.asSession();
+
+        if (timelineService.isClosed(appAdmins.contains(email))) {
+            SessionHelper.partialUpdate(session, newSession);
+        } else {
+            // Update session with new data
+            session.data = newSession.data;
+            session.speakers = newSession.speakers;
+        }
 
         // Send form data
         talksService.updateSession(session.postedBy, sessionId, session);
 
+        if (secret != null) {
+            // Redirect to preview page with secret
+            return Response
+                    .seeOther(UriBuilder.fromUri("/talk/{sessionId}/{secret}").build(sessionId, secret))
+                    .build();
+        }
+
         // Redirect to preview page
         return Response
                 .seeOther(UriBuilder.fromUri("/talk/{sessionId}").build(sessionId))

src/main/java/no/java/submit/service/TalksService.java

@@ -81,6 +81,15 @@ public boolean containsEmail(String email) {
 
             return false;
         }
+
+        public Speaker getSpeaker(String name) {
+            for (Speaker speaker : speakers) {
+                if (speaker.name.equals(name)) {
+                    return speaker;
+                }
+            }
+            return null;
+        }
     }
 
     class Speaker {

src/main/java/no/java/submit/service/TimelineService.java

@@ -23,9 +23,6 @@ public class TimelineService {
     @ConfigProperty(name = "timeline.closing")
     Instant closing;
 
-    @ConfigProperty(name = "timeline.finalized")
-    Instant finalized;
-
     @ConfigProperty(name = "timeline.feedback")
     Instant feedback;
 
@@ -59,10 +56,6 @@ public boolean isClosed(boolean hasExtension) {
         return getClosingHard().isBefore(LocalDateTime.now());
     }
 
-    public boolean isFinalized() {
-        return finalized != null && finalized.isBefore(Instant.now());
-    }
-
     public String format(LocalDate date) {
         return formatter.format(date).substring(0, 1).toUpperCase() +
                 formatter.format(date).substring(1) +

src/main/java/no/java/submit/util/SessionHelper.java

@@ -3,6 +3,7 @@
 import no.java.submit.service.TalksService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -27,4 +28,27 @@ static List<String> getTags(TalksService.Session session) {
 
         return result;
     }
+
+    static void partialUpdate(TalksService.Session session, TalksService.Session updates) {
+        for (var key : Arrays.asList("title", "abstract", "outline", "intendedAudience", "equipment", "participation", "workshopPrerequisites", "suggestedKeywords", "infoToProgramCommittee")) {
+            if (updates.data.containsKey(key))
+                session.data.put(key, updates.data.get(key));
+            else
+                session.data.remove(key);
+        }
+
+        for (var speaker : session.speakers) {
+            var updated = updates.getSpeaker(speaker.name);
+
+            if (updated != null) {
+                speaker.id = null;
+                for (var key : Arrays.asList("email", "twitter", "bluesky", "linkedin", "residence", "zipCode", "bio")) {
+                    if (updated.data.containsKey(key))
+                        speaker.data.put(key, updated.data.get(key));
+                    else
+                        speaker.data.remove(key);
+                }
+            }
+        }
+    }
 }

src/main/resources/application.properties

@@ -17,7 +17,6 @@ quarkus.cache.caffeine."sessions".expire-after-write=5m
 conference.current=ffbdc06b-b570-4409-bf2f-7d3b5dd2aed3
 timeline.opening=2025-02-14T00:00:00Z
 timeline.closing=2025-04-28T23:59:59Z
-timeline.finalized=2025-05-31T00:00:00Z
 timeline.feedback=2025-06-30T00:00:00Z
 timeline.refund=2025-08-01T00:00:00Z
 

src/main/resources/templates/partial/forms.html

@@ -1,21 +1,26 @@
 {#fragment inputText}
+{@Boolean disabled=false}
 <div class="field{#if required} required{/if}{#if val.containsKey(path)} error{/if}">
     <label for="form-{path}">{title}</label>
     {#if description != null}
     <p>{description}</p>
     {/if}
-    <input type="{type}" name="{path}" value="{value}" id="form-{path}"{#if placeholder != null} placeholder="{placeholder}"{/if}{#if required} required="required"{/if}/>
+    {#if disabled}
+    <input type="hidden" name="{path}" value="{value}"/>
+    {/if}
+    <input type="{type}" name="{path}" value="{value}" id="form-{path}"{#if placeholder != null} placeholder="{placeholder}"{/if}{#if required} required="required"{/if}{#if disabled} disabled="disabled"{/if}/>
     {#include partial/forms$validation /}
 </div>
 {/fragment}
 
 {#fragment textarea}
+{@Boolean disabled=false}
 <div class="field{#if required} required{/if}{#if val.containsKey(path)} error{/if}">
     <label for="form-{path}">{title}</label>
     {#if description != null}
     <p>{description}</p>
     {/if}
-    <textarea name="{path}" rows="{rows}" id="form-{path}">{value}</textarea>
+    <textarea name="{path}" rows="{rows}" id="form-{path}"{#if disabled} disabled="disabled"{/if}>{value}</textarea>
     {#include partial/forms$validation /}
 </div>
 {/fragment}

src/main/resources/templates/sessionFormClosed.html

@@ -0,0 +1,154 @@
+{#include partial/base}
+{#if sessionId == null}
+<h1>New talk</h1>
+{#else}
+<h1>Edit talk</h1>
+{/if}
+
+{#include partial/forms$validation path="speakers" /}
+
+<form id="talkForm" method="post" class="talk">
+    <h2>About</h2>
+
+    {#include partial/forms$inputText
+        title="Title" path="title" value=form.title type="text" required=true
+        placeholder="A short and snappy title"
+        description="Name your lightning talk, presentation or workshop in a way that draws attention to your submission while also capturing its content. Many participants will use this title to decide if they even read your abstract, so we recommend you to think a few minutes about this name." /}
+
+    <div class="split">
+    <div class="field required{#if val.containsKey("kind")} error{/if}"">
+        <label for="form-kind">Kind</label>
+        <p>In which format are you presenting your talk and how long is it? This is not subject to adjustment by the program committee, so please submit additional proposals if your content may fit multiple alternatives.</p>
+        <input type="hidden" name="kind" value="{form.kind}"/>
+        <select name="kind" id="form-kind" disabled="disabled">
+            {#for k in Kind:values}
+                {#if k.active}
+                <option value="{k}"{#if form.kind == k} selected="selected"{/if}>{k.name}</option>
+                {/if}
+            {/for}
+        </select>
+        {#include partial/forms$validation path="kind" /}
+    </div>
+
+    <div class="field required{#if val.containsKey("language")} error{/if}"">
+        <label for="form-language">Language</label>
+        <p>In which language will you be holding the talk? It is permitted to use English in your slides, even though you may be speaking in Norwegian, but you should fill out this form in the language you will speak in. We generally recommend that you hold the talk in the language you are most comfortable with, as we do not favor one language over the other.</p>
+        <input type="hidden" name="language" value="{form.language}"/>
+        <select name="language" id="form-language" disabled="disabled">
+            {#for v in Language:values}
+                <option value="{v}"{#if form.language == v} selected="selected"{/if}>{v.name}</option>
+            {/for}
+        </select>
+        {#include partial/forms$validation path="language" /}
+    </div>
+    </div>
+
+    {#include partial/forms$textarea
+        title="Description" path="abstractText" value=form.abstractText rows="5" required=true
+        placeholder=null
+        description="Give a concise description of the content and goals of your talk and what audience this presentation or workshop is for. Try not to exceed 300 words, as shorter and more to-the-point descriptions are more likely to be read by participants." /}
+
+    {#include partial/forms$inputText
+        title="Expected audience" path="intendedAudience" value=form.intendedAudience type="text" required=true
+        placeholder=null
+        description="Who should attend this session? How will the participants benefit from attending? What experience (if any) should the audience have to get the most value out of your talk?" /}
+
+    <div id="form-kind-only"{#if !form.kind.isWorkshop()}style="display: none;"{/if}>
+        {#include partial/forms$textarea
+            title="Workshop prerequisites" path="workshopPrerequisites" value=form.workshopPrerequisites rows="5" required=true
+            placeholder=null
+            description="If your workshop requires participants to make any preparations in advance (create an account at a cloud services provider, install a specific IDE etc.), please specify it." /}
+    </div>
+
+    {#include partial/forms$inputText
+        title="Suggested keywords" path="suggestedKeywords" value=form.suggestedKeywords type="text" required=false
+        placeholder=null
+        description="Suggest up to five keywords that describe your talk. Note that we only use these keywords as an orientation and often edit them to better fit into our published program." /}
+
+    <h2>Internal information (not public)</h2>
+
+    {#include partial/forms$textarea
+        title="Outline" path="outline" value=form.outline rows="10" required=true
+        placeholder=null
+        description="The information will be used by the Program Committee to review the details of your talk. The outline should be a rough agenda for the talk, with a short description for each section, and with a rough estimate of the time spent on each. Omitting this section will reduce the chances of your submission being accepted." /}
+
+    {#include partial/forms$textarea
+        title="Equipment" path="equipment" value=form.equipment rows="3" required=false
+        placeholder=null
+        description="Please specify any additional special equipment you may need. Note all will get access to WiFi and a projector." /}
+
+    {#include partial/forms$inputText
+        title="Your participation" path="participation" value=form.participation type="text" required=true
+        placeholder="Indicate if you are attending both days, or only one of them"
+        description="We consider any speaker as a participant of our conference, and we hope that you can stay for both conference days. There is much to see and do during JavaZone, we promise that it will be a good investment of your time! If you cannot participate on both days, please let us know, such that we can consider this when creating the program. To simplify our planning, we can unfortunately not consider time preferences on a given day." /}
+
+    {#include partial/forms$textarea
+        title="Additional information for the program commitee" path="infoToProgramCommittee" value=form.infoToProgramCommittee rows="3" required=false
+        placeholder=null
+        description="Please include any information relevant to the program committee that you do not want to include in your public presentation profile. For example, you can give us your motivation for speaking at JavaZone, include links to videos and slides from previous speaker engagements or any other relevant information for choosing your talk." /}
+
+    <p>All talks at JavaZone are filmed, live-streamed and published for free at Vimeo after the conference. Should you have any reservations about this, let the program committee know in the field above. This might affect your chance of getting selected, but if you have a good reason please let us know.</p>
+
+    <div id="speakers">
+        {#for speaker in form.speakers}
+        {#fragment id=speaker}
+        <div class="speaker">
+            <h2>Speaker {speaker_count}</h2>
+
+            {#include partial/forms$inputText
+                title="Name" path=str:format("speakers[%s].name", speaker_index) value=speaker.name type="text" required=true disabled=true
+                placeholder=null
+                description=null /}
+
+            <div class="split">
+            {#include partial/forms$inputText
+                title="Email (not public)" path=str:format("speakers[%s].email", speaker_index) value=speaker.email type="email" required=true
+                placeholder=null
+                description=null /}
+
+            {#include partial/forms$inputText
+                title="Twitter" path=str:format("speakers[%s].twitter", speaker_index) value=speaker.twitter type="text" required=false
+                placeholder="Twitter handle"
+                description=null /}
+            </div>
+
+            <div class="split">
+            {#include partial/forms$inputText
+                title="Bluesky" path=str:format("speakers[%s].bluesky", speaker_index) value=speaker.bluesky type="text" required=false
+                placeholder="Bluesky handle"
+                description=null /}
+
+            {#include partial/forms$inputText
+                title="LinkedIn" path=str:format("speakers[%s].linkedin", speaker_index) value=speaker.linkedin type="text" required=false
+                placeholder="Link to LinkedIn profile"
+                description=null /}
+            </div>
+
+            <div class="split">
+            {#include partial/forms$inputText
+                title="Country of residence (not public)" path=str:format("speakers[%s].residence", speaker_index) value=speaker.residence type="text" required=false
+                placeholder="Country of residence"
+                description="This is the country you will be travelling from to JavaZone. This information is intended to give us a better overview and will not be used in the selection process." /}
+
+            {#include partial/forms$inputText
+                title="Norwegian Postal Code (not public)" path=str:format("speakers[%s].zipCode", speaker_index) value=speaker.zipCode type="text" required=false
+                placeholder="Norwegian postcode"
+                description="JavaBin is always looking for good speakers to the local JavaBin user groups. By inserting your postal code may it be easier to find your." /}
+            </div>
+
+            {#include partial/forms$textarea
+                title="Bio" path=str:format("speakers[%s].bio", speaker_index) value=speaker.bio rows="3" required=true
+                placeholder="Tell the audience who this speaker is, and why she/he is the perfect person to hold this talk."
+                description="Short description of the speaker (try not to exceed 150 words)" /}
+        </div>
+        {/fragment}
+        {/for}
+    </div>
+
+    <div class="buttons">
+        <a href="{#if sessionId == null}/{#else}/talk/{sessionId}{#if secret != null}/{secret}{/if}{/if}">Cancel</a>
+        <button type="submit">Save</button>
+    </div>
+</form>
+
+{/include}

src/main/resources/web/app/app.css

@@ -249,6 +249,11 @@ form.talk {
             }
         }
 
+        input:disabled, textarea:disabled, select:disabled {
+            color: var(--subtext-color);
+            cursor: not-allowed;
+        }}
+
         &.required label::after {
             content: "*";
             padding: 0 3pt;