update corporate conundrum to use the new sqlpage.link function

this fixes a bug when player names contain special characters like '&'

Author: lovasoa

examples/charts, computations and custom components/index.sql

@@ -11,7 +11,7 @@ SELECT 'hero' as component,
         'Tap Tempo' as title,
         'Tap Tempo is a tool to **measure a tempo in bpm** by clicking a button in rythm.' as description_md,
         'drums by Nana Yaw Otoo.jpg' as image,
-        'taptempo.sql?session=' || random() as link,
+        sqlpage.link('taptempo.sql', json_object('session', random())) as link,
         'Start tapping !' as link_text;
 
 SELECT 'text' as component,

examples/charts, computations and custom components/taptempo.sql

@@ -8,7 +8,7 @@ SELECT 'big_button' as component,
             (SELECT bpm || ' bpm' FROM tap_bpm WHERE tapping_session = $session ORDER BY day DESC LIMIT 1),
             'Tap'
           ) AS text,
-         'taptempo.sql?session=' || $session as link;
+         sqlpage.link('taptempo.sql', json_object('session', $session)) as link;
 
 SELECT 'chart' as component, 'BPM over time' as title, 'area' as type, 'indigo' as color, 0 AS ymin, 200 AS ymax, 'BPM' as ytitle;
 SELECT * FROM (

examples/corporate-conundrum/New Game.sql

@@ -1,7 +1,5 @@
 INSERT INTO games(id)
 VALUES(random())
 RETURNING
-    'http_header' as component,
-    'game.sql?id='||id as "Location";
-
-SELECT 'text' as component, 'redirecting to game...' as contents;
+    'redirect' as component,
+    CONCAT('game.sql?id=', id) as link;

examples/corporate-conundrum/game.sql

@@ -5,10 +5,17 @@ INSERT INTO players(name, game_id)
 SELECT $Player as name,
     $id::integer as game_id
 WHERE $Player IS NOT NULL;
+
 SELECT 'list' as component,
     'Players' as title;
 SELECT name as title,
-    'next-question.sql?game_id=' || game_id || '&player=' || name as link
+    sqlpage.link(
+        'next-question.sql', 
+        json_object(
+            'game_id', game_id,
+            'player', name
+        )
+     ) as link
 FROM players
 WHERE game_id = $id::integer;
 ---------------------------

examples/corporate-conundrum/next-question.sql

@@ -1,21 +1,32 @@
-SELECT 'http_header' as component,
-    COALESCE(
-        (
-            SELECT 'question.sql?game_id=' || $game_id || '&question_id=' || game_questions.question_id || '&player=' || $player as "Location"
-            FROM game_questions
-            WHERE game_id = $game_id::integer
-                AND NOT EXISTS (
-                    -- This will filter out questions that have already been answered by the player
-                    SELECT 1
-                    FROM answers
-                    WHERE answers.game_id = game_questions.game_id
-                        AND answers.player_name = $player
-                        AND answers.question_id = game_questions.question_id
-                )
-            ORDER BY game_order
-            LIMIT 1
-        ),
-        'game-over.sql?game_id=' || $game_id
-    ) as 'Location';
-SELECT 'text' as component,
-    'redirecting to next question...' as contents;
+-- We need to redirect the user to the next question in the game if there is one, or to the game over page if there are no more questions.
+with next_question as (
+    SELECT 
+        'question.sql' as page,
+        json_object(
+            'game_id', $game_id,
+            'question_id', game_questions.question_id,
+            'player', $player
+        ) as params
+    FROM game_questions
+    WHERE game_id = $game_id::integer
+        AND NOT EXISTS (
+            -- This will filter out questions that have already been answered by the player
+            SELECT 1
+            FROM answers
+            WHERE answers.game_id = game_questions.game_id
+                AND answers.player_name = $player
+                AND answers.question_id = game_questions.question_id
+        )
+    ORDER BY game_order
+    LIMIT 1
+),
+next_page as (
+        SELECT * FROM next_question
+    UNION ALL
+        SELECT 'game-over.sql' as page, json_object('game_id', $game_id) as params
+        WHERE NOT EXISTS (SELECT 1 FROM next_question)
+)
+SELECT 'redirect' as component,
+    sqlpage.link(page, params) as link
+FROM next_page
+LIMIT 1;

examples/corporate-conundrum/question.sql

@@ -3,7 +3,7 @@ select * FROM sqlpage_shell;
 SELECT 'form' as component,
     question_text as title,
     'Submit your answer' as validate,
-    'wait.sql?game_id='|| $game_id ||'&question_id=' || $question_id ||'&player=' || $player as action
+    sqlpage.link('wait.sql', json_object('game_id', $game_id, 'question_id', $question_id, 'player', $player)) as action
 FROM questions
 where id = $question_id::integer;
 

examples/corporate-conundrum/wait.sql

@@ -1,12 +1,14 @@
 -- Redirect to the next question when all players have answered
+set page_params = json_object('game_id', $game_id, 'player', $player);
 select CASE
         (SELECT count(*) FROM answers WHERE question_id = $question_id AND game_id = $game_id::integer)
         WHEN (SELECT count(*) FROM players WHERE game_id = $game_id::integer)
-        THEN '0; next-question.sql?game_id=' || $game_id || '&player=' || $player
+        THEN '0; ' || sqlpage.link('next-question.sql', $page_params)
         ELSE 3
     END as refresh,
     sqlpage_shell.*
 FROM sqlpage_shell;
+
 -- Insert the answer into the answers table
 INSERT INTO answers(game_id, player_name, question_id, answer_value)
 SELECT $game_id::integer as game_id,