new approach in public-adventures

data-for-testing.json

@@ -1522,13 +1522,14 @@
       "level": "1",
       "levels": ["1", "2"],
       "content": "This is the explanation of my adventure!\n\nThis way I can show a command: <code>print</code>\n\nBut sometimes I might want to show a piece of code, like this:\n<pre class=\"no-copy-button\">ask What's your name?\necho so your name is \n</pre>",
+      "language": "en",
       "public": 1,
       "tags": [
         "test"
       ]
     },
     {
-      "id": "c9ccb61ae9334416aba972f5d5089939",
+      "id": "c9ccb61ae9334416aba972f5d5084834",
       "date": 1709899719928,
       "creator": "teacher2",
       "name": "adventure2",
@@ -1552,7 +1553,7 @@
         "2",
         "3"
       ],
-      "public": 0
+      "public": 1
     }
   ],
   "tags": [
@@ -1568,5 +1569,89 @@
       ],
       "popularity": 1
     }
+  ],
+  "public-adventures-filters": [
+    {
+      "field": "lang#level",
+      "value": "en#1"
+    },
+    {
+      "field": "lang#level",
+      "value": "en#2"
+    },
+    {
+      "field": "tag",
+      "value": "test"
+    },
+    {
+      "field": "lang#level",
+      "value": "nl#1"
+    },
+    {
+      "field": "lang#level",
+      "value": "ar#2"
+    },
+    {
+      "field": "lang#level",
+      "value": "ar#3"
+    }
+  ],
+  "public-adventures-indexes": [
+    {
+      "field_value": "lang_en",
+      "date_adventure_id": "1668695742716_3f8aea42eb324f08a16776671498dd1b"
+    },
+    {
+      "field_value": "level_lang_1_en",
+      "date_adventure_id": "1668695742716_3f8aea42eb324f08a16776671498dd1b"
+    },
+    {
+      "field_value": "level_1",
+      "date_adventure_id": "1668695742716_3f8aea42eb324f08a16776671498dd1b"
+    },
+    {
+      "field_value": "level_lang_2_en",
+      "date_adventure_id": "1668695742716_3f8aea42eb324f08a16776671498dd1b"
+    },
+    {
+      "field_value": "level_2",
+      "date_adventure_id": "1668695742716_3f8aea42eb324f08a16776671498dd1b"
+    },
+    {
+      "field_value": "tag_test",
+      "date_adventure_id": "1668695742716_3f8aea42eb324f08a16776671498dd1b"
+    },
+    {
+      "field_value": "lang_nl",
+      "date_adventure_id": "1709899719928_c9ccb61ae9334416aba972f5d5084834"
+    },
+    {
+      "field_value": "level_lang_1_nl",
+      "date_adventure_id": "1709899719928_c9ccb61ae9334416aba972f5d5084834"
+    },
+    {
+      "field_value": "level_1",
+      "date_adventure_id": "1709899719928_c9ccb61ae9334416aba972f5d5084834"
+    },
+    {
+      "field_value": "lang_ar",
+      "date_adventure_id": "1709899719928_01f34a6453ff420a8fb83a3fc0f18d8d"
+    },
+    {
+      "field_value": "level_lang_2_ar",
+      "date_adventure_id": "1709899719928_01f34a6453ff420a8fb83a3fc0f18d8d"
+    },
+    {
+      "field_value": "level_2",
+      "date_adventure_id": "1709899719928_01f34a6453ff420a8fb83a3fc0f18d8d"
+    },
+    {
+      "field_value": "level_lang_3_ar",
+      "date_adventure_id": "1709899719928_01f34a6453ff420a8fb83a3fc0f18d8d"
+    },
+    {
+      "field_value": "level_3",
+      "date_adventure_id": "1709899719928_01f34a6453ff420a8fb83a3fc0f18d8d"
+    }
   ]
 }

messages.pot

@@ -221,9 +221,6 @@ msgstr ""
 msgid "adventure_name_invalid"
 msgstr ""
 
-msgid "adventure_prompt"
-msgstr ""
-
 msgid "adventure_terms"
 msgstr ""
 

migration_scripts/migrate-public-adventures-filters.py

@@ -0,0 +1,26 @@
+# setting path
+from website.database import PUBLIC_ADVENTURE_FILTERS, ADVENTURES
+import sys
+sys.path.append('../hedy')
+
+
+def create_filters_table(record):
+    lang_value = record.get("language", "en")
+    levels = record.get("levels")
+    if not levels:
+        levels = [record.get("level")]
+    for level in levels:
+        value = f"{lang_value}_{level}"
+        PUBLIC_ADVENTURE_FILTERS.put({"field": "lang_level", "value": value})
+    tags = record.get("tags", [])
+    for tag in tags:
+        PUBLIC_ADVENTURE_FILTERS.put({"field": "tag", "value": tag})
+
+
+def main():
+    for record in ADVENTURES.get_all({"public": 1}):
+        create_filters_table(record)
+
+
+if __name__ == "__main__":
+    main()

migration_scripts/migrate-public-adventures-index.py

@@ -0,0 +1,30 @@
+# setting path
+from website.database import PUBLIC_ADVENTURE_INDEXES, ADVENTURES
+import sys
+sys.path.append('../hedy')
+
+
+def create_multi_index_table(record):
+    lang_value = record.get("language", "en")
+    id = record.get("id")
+    date = record.get("date")
+    PUBLIC_ADVENTURE_INDEXES.put({"field_value": f"lang_{lang_value}", "date_adventure_id": f"{date}_{id}"})
+    levels = record.get("levels")
+    if not levels:
+        levels = [record.get("level")]
+    for level in levels:
+        PUBLIC_ADVENTURE_INDEXES.put({"field_value": f"level_lang_{level}_{lang_value}",
+                                      "date_adventure_id": f"{date}_{id}"})
+        PUBLIC_ADVENTURE_INDEXES.put({"field_value": f"level_{level}", "date_adventure_id": f"{date}_{id}"})
+    tags = record.get("tags", [])
+    for tag in tags:
+        PUBLIC_ADVENTURE_INDEXES.put({"field_value": f"tag_{tag}", "date_adventure_id": f"{date}_{id}"})
+
+
+def main():
+    for record in ADVENTURES.get_all({"public": 1}):
+        create_multi_index_table(record)
+
+
+if __name__ == "__main__":
+    main()

static/js/appbundle.js

@@ -124760,13 +124760,18 @@ def note_with_error(value, err):
   var languageSelect;
   var tagsSelect;
   var searchInput;
+  var nextPage;
   function initializeVariables() {
     levelSelect = document.getElementById("level-select");
     languageSelect = document.getElementById("language-select");
     tagsSelect = document.getElementById("tag-select");
     searchInput = document.getElementById("search_adventure");
+    nextPage = document.getElementById("next_page_token");
   }
-  document.addEventListener("DOMContentLoaded", prepareDropdowns);
+  document.addEventListener("DOMContentLoaded", () => {
+    prepareDropdowns();
+    initializeVariables();
+  });
   function prepareDropdowns() {
     const options = document.querySelectorAll(".option");
     const dropdowns = document.querySelectorAll("[data-dropdown-initialize]");
@@ -124844,27 +124849,33 @@ def note_with_error(value, err):
     const level3 = levelSelect.getAttribute("data-value") || "";
     const lanugage = languageSelect.getAttribute("data-value") || "";
     const tags2 = tagsSelect.getAttribute("data-value") || "";
+    const nextPageToken = (nextPage == null ? void 0 : nextPage.getAttribute("data-value")) || "";
     urlParams.set("level", level3);
     urlParams.set("lang", lanugage);
     urlParams.set("tag", tags2);
     if (searchInput) {
       urlParams.set("search", searchInput.value);
     }
+    if (nextPageToken) {
+      urlParams.set("page", nextPageToken);
+    }
     window.history.pushState({}, "", `${window.location.pathname}?${urlParams.toString()}`);
   }
   document.addEventListener("updateTSCode", (e) => {
-    setTimeout(() => {
-      initializeVariables();
-      const js = e.detail;
-      updateURL();
-      prepareDropdowns();
-      initialize({
-        lang: js.lang,
-        level: parseInt(js.level),
-        keyword_language: js.lang,
-        javascriptPageOptions: js
-      });
-    }, 1e3);
+    initializeVariables();
+    const js = e.detail;
+    updateURL();
+    prepareDropdowns();
+    initialize({
+      lang: js.lang,
+      level: parseInt(js.level),
+      keyword_language: js.lang,
+      javascriptPageOptions: js
+    });
+  });
+  document.addEventListener("htmx:configRequest", (ev) => {
+    const event2 = ev;
+    event2.detail.headers["search-value"] = searchInput.value;
   });
 
   // static/js/microbit.ts

static/js/public-adventures.ts

@@ -5,16 +5,21 @@ let levelSelect: HTMLElement;
 let languageSelect: HTMLElement;
 let tagsSelect: HTMLElement;
 let searchInput: HTMLInputElement;
+let nextPage: HTMLElement;
 
 function initializeVariables() {
     // Get and initialize needed variables
     levelSelect = document.getElementById("level-select") as HTMLElement;
     languageSelect = document.getElementById("language-select") as HTMLElement;
     tagsSelect = document.getElementById("tag-select") as HTMLElement;
     searchInput = document.getElementById('search_adventure') as HTMLInputElement;
+    nextPage = document.getElementById('next_page_token') as HTMLInputElement;
 }
 
-document.addEventListener("DOMContentLoaded", prepareDropdowns);
+document.addEventListener("DOMContentLoaded", () => {
+    prepareDropdowns();
+    initializeVariables();
+});
 
 function prepareDropdowns() {
     const options = document.querySelectorAll('.option');
@@ -102,27 +107,34 @@ function updateURL() {
     const level = levelSelect.getAttribute("data-value") || "";
     const lanugage = languageSelect.getAttribute("data-value") || "";
     const tags = tagsSelect.getAttribute("data-value") || "";
+    const nextPageToken = nextPage?.getAttribute("data-value") || "";
 
     urlParams.set('level', level)
     urlParams.set('lang', lanugage)
     urlParams.set('tag', tags)
     if (searchInput) {
         urlParams.set('search', searchInput.value)
     }
+    if (nextPageToken) {
+        urlParams.set('page', nextPageToken)
+    }
     window.history.pushState({}, '', `${window.location.pathname}?${urlParams.toString()}`);
 
 }
 
 
 document.addEventListener("updateTSCode", (e: any) => {
-    setTimeout(() => {
-        initializeVariables();
-        const js = e.detail;
-
-        updateURL();
-        prepareDropdowns();
-        initialize({lang: js.lang, level: parseInt(js.level), keyword_language: js.lang,
-            javascriptPageOptions: js
-            });
-    }, 1000);
+    initializeVariables();
+    const js = e.detail;
+
+    updateURL();
+    prepareDropdowns();
+    initialize({lang: js.lang, level: parseInt(js.level), keyword_language: js.lang,
+        javascriptPageOptions: js
+        });
+})
+
+document.addEventListener("htmx:configRequest", (ev) => {
+    const event = ev as any;
+    event.detail.headers["search-value"] = searchInput.value;
 })