Merge PR_26177_ALFA_058-flat-project-tags

Author: ToolboxAid

assets/toolbox/game-configuration/js/index.js

@@ -1,3 +1,4 @@
+import { getSessionCurrent } from "../../../../src/api/session-api-client.js";
 import {
   createServerRepositoryClient,
   readServerToolConstants,
@@ -65,6 +66,23 @@ function setText(element, value) {
   }
 }
 
+function currentSession() {
+  try {
+    return getSessionCurrent();
+  } catch {
+    return { authenticated: false };
+  }
+}
+
+function redirectGuestWriteAction() {
+  if (currentSession()?.authenticated === true) {
+    return false;
+  }
+  setText(elements.statusLog, "Sign in before saving Game Configuration.");
+  window.location.href = new URL("/account/sign-in.html", window.location.href).href;
+  return true;
+}
+
 function createListItem(text) {
   const item = document.createElement("li");
   item.textContent = text;
@@ -190,6 +208,9 @@ elements.form?.addEventListener("change", renderFormValidation);
 
 elements.form?.addEventListener("submit", (event) => {
   event.preventDefault();
+  if (redirectGuestWriteAction()) {
+    return;
+  }
   const snapshot = repository.getSnapshot();
   const projectId = snapshot.handoff.activeProject?.id || "";
 

assets/toolbox/game-design/js/index.js

@@ -1,3 +1,4 @@
+import { getSessionCurrent } from "../../../../src/api/session-api-client.js";
 import {
   createServerRepositoryClient,
   readServerToolConstants,
@@ -62,6 +63,23 @@ function setText(element, value) {
   }
 }
 
+function currentSession() {
+  try {
+    return getSessionCurrent();
+  } catch {
+    return { authenticated: false };
+  }
+}
+
+function redirectGuestWriteAction() {
+  if (currentSession()?.authenticated === true) {
+    return false;
+  }
+  setText(elements.statusLog, "Sign in before saving Game Design.");
+  window.location.href = new URL("/account/sign-in.html", window.location.href).href;
+  return true;
+}
+
 function populateSelect(select, values, placeholder) {
   if (!select) {
     return;
@@ -291,6 +309,9 @@ elements.form?.addEventListener("input", renderFormValidation);
 
 elements.form?.addEventListener("submit", (event) => {
   event.preventDefault();
+  if (redirectGuestWriteAction()) {
+    return;
+  }
   const result = repository.saveDesign(readForm());
   setText(elements.statusLog, result.message);
   render();

assets/toolbox/tags/js/index.js

@@ -1,3 +1,4 @@
+import { getSessionCurrent } from "../../../../src/api/session-api-client.js";
 import {
   createServerRepositoryClient,
   readServerToolConstants,
@@ -16,14 +17,17 @@ const repository = createTagsToolApiRepository();
 
 const elements = {
   add: document.querySelector("[data-tags-add]"),
+  activeProject: document.querySelector("[data-tags-active-project]"),
+  assignedCount: document.querySelector("[data-tags-assigned-count]"),
+  assignedLabels: document.querySelector("[data-tags-assigned-labels]"),
   count: document.querySelector("[data-tags-count]"),
   log: document.querySelector("[data-tags-log]"),
   outputStatus: document.querySelector("[data-tags-output-status]"),
+  refresh: document.querySelector("[data-tags-refresh]"),
   selected: document.querySelector("[data-tags-selected]"),
   status: document.querySelector("[data-tags-status]"),
   table: document.querySelector("[data-tags-table]"),
   tableCounts: document.querySelector("[data-tags-table-counts]"),
-  usageCount: document.querySelector("[data-tags-usage-count]"),
 };
 
 let editingTagId = "";
@@ -63,20 +67,42 @@ function createInput(value, label, datasetName) {
 function editingValues(row) {
   return {
     description: row.querySelector("[data-tags-description-input]")?.value || "",
-    name: row.querySelector("[data-tags-name-input]")?.value || "",
+    label: row.querySelector("[data-tags-name-input]")?.value || "",
   };
 }
 
+function currentSession() {
+  try {
+    return getSessionCurrent();
+  } catch {
+    return { authenticated: false };
+  }
+}
+
+function redirectGuestWriteAction() {
+  if (currentSession()?.authenticated === true) {
+    return false;
+  }
+  setText(elements.log, "Sign in before saving project tags.");
+  window.location.href = new URL("/account/sign-in.html", window.location.href).href;
+  return true;
+}
+
+function tagLabel(tag) {
+  return tag?.label || tag?.name || "";
+}
+
 function createEditRow(tag = null) {
   const row = document.createElement("tr");
   row.dataset.tagsEditingRow = tag?.id || "__new__";
 
   const nameCell = document.createElement("td");
-  nameCell.append(createInput(tag?.name || "", "Tag Name", "tagsNameInput"));
+  nameCell.append(createInput(tagLabel(tag), "Tag Label", "tagsNameInput"));
 
   const descriptionCell = document.createElement("td");
   descriptionCell.append(createInput(tag?.description || "", "Description", "tagsDescriptionInput"));
 
+  const assignedCell = createCell(tag?.assigned ? "Yes" : "No");
   const usageCell = createCell(tag ? String(tag.usageCount || 0) : "0");
 
   const actionsCell = document.createElement("td");
@@ -88,15 +114,15 @@ function createEditRow(tag = null) {
   );
   actionsCell.append(actions);
 
-  row.append(nameCell, descriptionCell, usageCell, actionsCell);
+  row.append(nameCell, descriptionCell, assignedCell, usageCell, actionsCell);
   return row;
 }
 
 function createUsageCountButton(tag) {
   const cell = document.createElement("td");
   const button = createButton(String(tag.usageCount || 0), "tagsToggleUsage", tag.id);
   button.setAttribute("aria-expanded", String(expandedTagId === tag.id));
-  button.setAttribute("aria-label", `Show usage for ${tag.name}`);
+  button.setAttribute("aria-label", `Show usage for ${tagLabel(tag)}`);
   cell.append(button);
   return cell;
 }
@@ -113,14 +139,18 @@ function createTagRow(tag) {
   const actions = document.createElement("div");
   actions.className = "action-group action-group--tight";
   actions.append(
+    tag.assigned
+      ? createButton("Remove", "tagsRemove", tag.id)
+      : createButton("Assign", "tagsAssign", tag.id),
     createButton("Edit", "tagsEdit", tag.id),
     createButton("Trash", "tagsDelete", tag.id)
   );
   actionsCell.append(actions);
 
   row.append(
-    createCell(tag.name),
+    createCell(tagLabel(tag)),
     createCell(tag.description || "No description"),
+    createCell(tag.assigned ? "Yes" : "No"),
     createUsageCountButton(tag),
     actionsCell
   );
@@ -132,14 +162,14 @@ function createUsageRow(tag) {
   row.dataset.tagsUsageRow = tag.id;
 
   const cell = document.createElement("td");
-  cell.colSpan = 4;
+  cell.colSpan = 5;
 
   const wrapper = document.createElement("div");
   wrapper.className = "table-wrapper";
 
   const table = document.createElement("table");
   table.className = "data-table";
-  table.setAttribute("aria-label", `${tag.name} usage`);
+  table.setAttribute("aria-label", `${tagLabel(tag)} usage`);
 
   const head = document.createElement("thead");
   const headRow = document.createElement("tr");
@@ -151,7 +181,9 @@ function createUsageRow(tag) {
     const emptyRow = document.createElement("tr");
     const emptyCell = document.createElement("td");
     emptyCell.colSpan = 2;
-    emptyCell.textContent = "No usage yet.";
+    emptyCell.textContent = tag.assigned
+      ? "Assigned to the active project."
+      : "No usage yet.";
     emptyRow.append(emptyCell);
     body.append(emptyRow);
   } else {
@@ -182,7 +214,7 @@ function renderTable(snapshot) {
   if (!snapshot.tags.length && editingTagId !== "__new__") {
     const row = document.createElement("tr");
     const cell = document.createElement("td");
-    cell.colSpan = 4;
+    cell.colSpan = 5;
     cell.textContent = "No tags added yet.";
     row.append(cell);
     elements.table.append(row);
@@ -212,11 +244,13 @@ function renderTableCounts(snapshot) {
 
 function render() {
   const snapshot = repository.getSnapshot();
-  const usageCount = snapshot.tags.reduce((total, tag) => total + tag.usageCount, 0);
+  const assignedLabels = snapshot.assignedTags.map(tagLabel).join(", ") || "None";
   setText(elements.status, snapshot.status);
   setText(elements.outputStatus, snapshot.status);
+  setText(elements.activeProject, snapshot.activeProject?.name || "No active project");
+  setText(elements.assignedCount, String(snapshot.assignedTags.length));
+  setText(elements.assignedLabels, assignedLabels);
   setText(elements.count, String(snapshot.tags.length));
-  setText(elements.usageCount, String(usageCount));
   setText(elements.selected, selectedTagName);
   if (elements.add) {
     elements.add.disabled = editingTagId === "__new__";
@@ -229,15 +263,22 @@ elements.add?.addEventListener("click", () => {
   editingTagId = "__new__";
   expandedTagId = "";
   selectedTagName = "New tag";
-  setText(elements.log, "Adding a workspace tag.");
+  setText(elements.log, "Adding a project tag.");
+  render();
+});
+
+elements.refresh?.addEventListener("click", () => {
+  setText(elements.log, "Project tags refreshed from the API.");
   render();
 });
 
 elements.table?.addEventListener("click", (event) => {
+  const assign = event.target.closest("[data-tags-assign]");
   const edit = event.target.closest("[data-tags-edit]");
   const save = event.target.closest("[data-tags-save]");
   const cancel = event.target.closest("[data-tags-cancel]");
   const deleteButton = event.target.closest("[data-tags-delete]");
+  const remove = event.target.closest("[data-tags-remove]");
   const toggleUsage = event.target.closest("[data-tags-toggle-usage]");
 
   if (toggleUsage) {
@@ -248,6 +289,28 @@ elements.table?.addEventListener("click", (event) => {
     return;
   }
 
+  if (assign) {
+    if (redirectGuestWriteAction()) {
+      return;
+    }
+    const result = repository.assignTagToProject(assign.dataset.tagsAssign);
+    selectedTagName = tagLabel(result.tag) || selectedTagName;
+    setText(elements.log, result.message);
+    render();
+    return;
+  }
+
+  if (remove) {
+    if (redirectGuestWriteAction()) {
+      return;
+    }
+    const result = repository.removeTagFromProject(remove.dataset.tagsRemove);
+    selectedTagName = tagLabel(result.tag) || selectedTagName;
+    setText(elements.log, result.message);
+    render();
+    return;
+  }
+
   if (edit) {
     editingTagId = edit.dataset.tagsEdit;
     expandedTagId = "";
@@ -266,21 +329,27 @@ elements.table?.addEventListener("click", (event) => {
   }
 
   if (save) {
+    if (redirectGuestWriteAction()) {
+      return;
+    }
     const row = save.closest("[data-tags-editing-row]");
     const values = editingValues(row);
     const result = save.dataset.tagsSave === "__new__"
       ? repository.addTag(values)
       : repository.updateTag(save.dataset.tagsSave, values);
     if (result.added || result.updated) {
       editingTagId = "";
-      selectedTagName = result.tag?.name || "None";
+      selectedTagName = tagLabel(result.tag) || "None";
     }
     setText(elements.log, result.message);
     render();
     return;
   }
 
   if (deleteButton) {
+    if (redirectGuestWriteAction()) {
+      return;
+    }
     const result = repository.deleteTag(deleteButton.dataset.tagsDelete);
     if (result.deleted) {
       editingTagId = "";

docs_build/database/ddl/game-configuration.sql

@@ -20,6 +20,18 @@ CREATE TABLE IF NOT EXISTS game_configuration_records (
 CREATE INDEX IF NOT EXISTS idx_game_configuration_records_gamekey ON game_configuration_records ("gameKey");
 CREATE INDEX IF NOT EXISTS idx_game_configuration_records_createdby ON game_configuration_records ("createdBy");
 CREATE INDEX IF NOT EXISTS idx_game_configuration_records_updatedby ON game_configuration_records ("updatedBy");
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "gameName" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "gamePurpose" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "gameType" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "genre" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "playStyle" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "gameBasics" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "gameRules" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "playerSetup" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "worldSetup" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "objectSetup" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "audioSetup" text;
+ALTER TABLE game_configuration_records ADD COLUMN IF NOT EXISTS "testReadiness" text;
 
 CREATE TABLE IF NOT EXISTS game_configuration_validation_items (
     key text PRIMARY KEY,
@@ -36,3 +48,4 @@ CREATE TABLE IF NOT EXISTS game_configuration_validation_items (
 CREATE INDEX IF NOT EXISTS idx_game_configuration_validation_items_gamekey ON game_configuration_validation_items ("gameKey");
 CREATE INDEX IF NOT EXISTS idx_game_configuration_validation_items_createdby ON game_configuration_validation_items ("createdBy");
 CREATE INDEX IF NOT EXISTS idx_game_configuration_validation_items_updatedby ON game_configuration_validation_items ("updatedBy");
+ALTER TABLE game_configuration_validation_items ADD COLUMN IF NOT EXISTS "section" text;

docs_build/database/ddl/game-design.sql

@@ -20,6 +20,15 @@ CREATE INDEX IF NOT EXISTS idx_game_design_documents_gamekey ON game_design_docu
 CREATE INDEX IF NOT EXISTS idx_game_design_documents_createdby ON game_design_documents ("createdBy");
 CREATE INDEX IF NOT EXISTS idx_game_design_documents_updatedby ON game_design_documents ("updatedBy");
 
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "gamePurpose" text;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "gameType" text;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "genre" text;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "playStyle" text;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "playerMode" text;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "designSummary" text;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "capabilityDemoAuthoring" boolean NOT NULL DEFAULT false;
+ALTER TABLE game_design_documents ADD COLUMN IF NOT EXISTS "capabilityDemoNotes" text;
+
 CREATE TABLE IF NOT EXISTS game_design_validation_items (
     key text PRIMARY KEY,
     "gameKey" text REFERENCES game_workspace_games(key),
@@ -35,3 +44,21 @@ CREATE TABLE IF NOT EXISTS game_design_validation_items (
 CREATE INDEX IF NOT EXISTS idx_game_design_validation_items_gamekey ON game_design_validation_items ("gameKey");
 CREATE INDEX IF NOT EXISTS idx_game_design_validation_items_createdby ON game_design_validation_items ("createdBy");
 CREATE INDEX IF NOT EXISTS idx_game_design_validation_items_updatedby ON game_design_validation_items ("updatedBy");
+ALTER TABLE game_design_validation_items ADD COLUMN IF NOT EXISTS "field" text;
+
+CREATE TABLE IF NOT EXISTS game_design_capability_demos (
+    key text PRIMARY KEY,
+    "gameKey" text REFERENCES game_workspace_games(key),
+    "gameName" text,
+    "gamePurpose" text,
+    "authoringMode" text,
+    "status" text,
+    "createdAt" timestamptz NOT NULL DEFAULT now(),
+    "updatedAt" timestamptz NOT NULL DEFAULT now(),
+    "createdBy" text NOT NULL REFERENCES users(key),
+    "updatedBy" text NOT NULL REFERENCES users(key)
+);
+
+CREATE INDEX IF NOT EXISTS idx_game_design_capability_demos_gamekey ON game_design_capability_demos ("gameKey");
+CREATE INDEX IF NOT EXISTS idx_game_design_capability_demos_createdby ON game_design_capability_demos ("createdBy");
+CREATE INDEX IF NOT EXISTS idx_game_design_capability_demos_updatedby ON game_design_capability_demos ("updatedBy");