Debugging problems page; TODO: hash navigation is wrong
[vchess.git] / public / javascripts / components / problems.js
index 6f03fd9..6edab93 100644 (file)
@@ -14,6 +14,7 @@ Vue.component('my-problems', {
                        // New problem (to upload), or existing problem to edit:
                        modalProb: {
                                id: 0, //defined if it's an edit
+                               uid: 0, //...also
                                fen: "",
                                instructions: "",
                                solution: "",
@@ -24,48 +25,51 @@ Vue.component('my-problems', {
        template: `
                <div class="col-sm-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
                        <div id="problemControls" class="button-group">
-                               <button :aria-label='translate("Previous problem(s)")' class="tooltip" @click="showNext('backward')">
+                               <button :aria-label='translate("Previous problem(s)")' class="tooltip"
+                                       @click="showNext('backward')"
+                               >
                                        <i class="material-icons">skip_previous</i>
                                </button>
-                               <button :aria-label='translate("Add a problem")' class="tooltip" onClick="doClick('modal-newproblem')">
+                               <button v-if="!!userId" :aria-label='translate("Add a problem")'
+                                       class="tooltip" onClick="doClick('modal-newproblem')"
+                               >
                                        {{ translate("New") }}
                                </button>
-                               <button :aria-label='translate("Next problem(s)")' class="tooltip" @click="showNext('forward')">
+                               <button :aria-label='translate("Next problem(s)")' class="tooltip"
+                                       @click="showNext('forward')"
+                               >
                                        <i class="material-icons">skip_next</i>
                                </button>
                        </div>
                        <div id="mainBoard" v-if="!!curProb">
                                <div id="instructions-div" class="section-content">
-                                       <p id="problem-instructions">
-                                               {{ curProb.instructions }}
-                                       </p>
+                                       <p id="problem-instructions">{{ curProb.instructions }}</p>
                                </div>
-                               <my-game :fen="curProb.fen" :mode="analyze" :allowMovelist="true" :settings="settings">
+                               <my-game :fen="curProb.fen" :mode="analyze" :allowMovelist="true"
+                                       :settings="settings"
+                               >
                                </my-game>
                                <div id="solution-div" class="section-content">
                                        <h3 class="clickable" @click="showSolution = !showSolution">
                                                {{ translations["Show solution"] }}
                                        </h3>
-                                       <p id="problem-solution" v-show="showSolution">
-                                               {{ curProb.solution }}
-                                       </p>
+                                       <p id="problem-solution" v-show="showSolution">{{ curProb.solution }}</p>
                                </div>
-                               <button @click="displayList()">
-                                       <span>Back to list display</span>
-                               </button>
+                               <button @click="displayList">Back to list display</button>
                        </div>
                        <div>
                                <input type="text" placeholder="Type problem number" v-model="pbNum"/>
-                               <button @click="showProblem()">
-                                       <span>Show problem</span>
-                               </button>
+                               <button @click="showProblem">Show problem</button>
                        </div>
-                       <button v-if="!!userId" @click="toggleListDisplay()">
-                               <span>My problems (only)</span>
+                       <button v-if="!!userId" @click="toggleListDisplay"
+                               :class="{'only-mine':display=='mine'}"
+                       >
+                               My problems (only)
                        </button>
                        <my-problem-summary v-show="!curProb"
                                v-on:edit-problem="editProblem(p)" v-on:delete-problem="deleteProblem(p.id)"
-                               v-for="p in curProblems" @click="curProb=p"
+                               v-on:show-problem="() => showProblem(p.id)"
+                               v-for="p in curProblems()" @click="curProb=p"
                                v-bind:prob="p" v-bind:userid="userId" v-bind:key="p.id">
                        </my-problem-summary>
                        <input type="checkbox" id="modal-newproblem" class="modal"/>
@@ -73,9 +77,7 @@ Vue.component('my-problems', {
                                <div v-show="!modalProb.preview" class="card newproblem-form">
                                        <label for="modal-newproblem" class="modal-close">
                                        </label>
-                                       <h3 id="modalProblemTxt">
-                                               {{ translate("Add a problem") }}
-                                       </h3>
+                                       <h3 id="modalProblemTxt">{{ translate("Add a problem") }}</h3>
                                        <form @submit.prevent="previewProblem()">
                                                <fieldset>
                                                        <label for="newpbFen">FEN</label>
@@ -83,39 +85,28 @@ Vue.component('my-problems', {
                                                                :placeholder='translate("Full FEN description")'/>
                                                </fieldset>
                                                <fieldset>
-                                                       <p class="emphasis">
-                                                               {{ translate("Safe HTML tags allowed") }}
-                                                       </p>
-                                                       <label for="newpbInstructions">
-                                                               {{ translate("Instructions") }}
-                                                       </label>
+                                                       <p class="emphasis">{{ translate("Safe HTML tags allowed") }}</p>
+                                                       <label for="newpbInstructions">{{ translate("Instructions") }}</label>
                                                        <textarea id="newpbInstructions" v-model="modalProb.instructions"
                                                                :placeholder='translate("Describe the problem goal")'>
                                                        </textarea>
-                                                       <label for="newpbSolution">
-                                                               {{ translate("Solution") }}
-                                                       </label>
+                                                       <label for="newpbSolution">{{ translate("Solution") }}</label>
                                                        <textarea id="newpbSolution" v-model="modalProb.solution"
                                                                :placeholder='translate("How to solve the problem?")'>
                                                        </textarea>
-                                                       <button class="center-btn">
-                                                               {{ translate("Preview") }}
-                                                       </button>
+                                                       <button class="center-btn">{{ translate("Preview") }}</button>
                                                </fieldset>
                                        </form>
                                </div>
                                <div v-show="modalProb.preview" class="card newproblem-preview">
-                                       <label for="modal-newproblem" class="modal-close">
+                                       <label for="modal-newproblem" class="modal-close"
+                                               @click="modalProb.preview=false">
                                        </label>
-                                       <my-problem-summary v-bind:prob="modalProb" v-bind:userid="userId">
+                                       <my-problem-summary :prob="modalProb" :userid="userId" :preview="true">
                                        </my-problem-summary>
                                        <div class="button-group">
-                                               <button @click="modalProb.preview=false">
-                                                       {{ translate("Cancel") }}
-                                               </button>
-                                               <button @click="sendProblem()">
-                                                       {{ translate("Send") }}
-                                               </button>
+                                               <button @click="modalProb.preview=false">{{ translate("Cancel") }}</button>
+                                               <button @click="sendProblem()">{{ translate("Send") }}</button>
                                        </div>
                                </div>
                        </div>
@@ -123,9 +114,7 @@ Vue.component('my-problems', {
                        <div role="dialog" aria-labelledby="nomoreMessage">
                                <div class="card smallpad small-modal text-center">
                                        <label for="modalNomore" class="modal-close"></label>
-                                       <h3 id="nomoreMessage" class="section">
-                                               {{ nomoreMessage }}
-                                       </h3>
+                                       <h3 id="nomoreMessage" class="section">{{ nomoreMessage }}</h3>
                                </div>
                        </div>
                </div>
@@ -160,11 +149,17 @@ Vue.component('my-problems', {
                },
                showProblem: function(num) {
                        const pid = num || this.pbNum;
-                       location.hash = "#" + pid;
-                       const pIdx = this.singletons.findIndex(p => p.id == pid);
-                       if (pIdx >= 0)
-                               curProb = this.singletons[pIdx];
-                       else
+                       location.hash = "#problems?id=" + pid;
+                       for (let parray of [this.singletons,this.problems,this.myProblems])
+                       {
+                               const pIdx = parray.findIndex(p => p.id == pid);
+                               if (pIdx >= 0)
+                               {
+                                       curProb = parray[pIdx];
+                                       break;
+                               }
+                       }
+                       if (!curProb)
                        {
                                // Cannot find problem in current set; get from server, and add to singletons.
                                ajax(
@@ -240,27 +235,30 @@ Vue.component('my-problems', {
                },
                displayList: function() {
                        this.curProb = null;
-                       location.hash = "";
+                       location.hash = "#problems";
                        // Fetch problems if first call (if #num, and then lists)
                        if (!this.listsInitialized)
                                this.firstFetch();
                },
                toggleListDisplay: function() {
-                       this.display = (this.display == "others" ? "mine" : "others");
+                       const displays = ["mine","others"];
+                       const curIndex = displays.findIndex(item => item == this.display);
+                       this.display = displays[1-curIndex];
                },
                fetchProblems: function(type, direction) {
                        let problems = (type == "others" ? this.problems : this.myProblems);
+                       // "last datetime" set at a value OK for an empty initial array
                        let last_dt = (direction=="forward" ? 0 : Number.MAX_SAFE_INTEGER);
-                       if (this.problems.length > 0)
+                       if (problems.length > 0)
                        {
                                // Search for newest date (or oldest)
                                last_dt = problems[0].added;
                                for (let i=1; i<problems.length; i++)
                                {
-                                       if ((direction == "forward" && this.problems[i].added > last_dt) ||
-                                               (direction == "backward" && this.problems[i].added < last_dt))
+                                       if ((direction == "forward" && problems[i].added > last_dt) ||
+                                               (direction == "backward" && problems[i].added < last_dt))
                                        {
-                                               last_dt = this.problems[i].added;
+                                               last_dt = problems[i].added;
                                        }
                                }
                        }
@@ -276,7 +274,7 @@ Vue.component('my-problems', {
                                        if (response.problems.length > 0)
                                        {
                                                Array.prototype.push.apply(problems,
-                                                       response.problems.sort((p1,p2) => { return p1.added - p2.added; }));
+                                                       response.problems.sort((p1,p2) => { return p2.added - p1.added; }));
                                                // If one list is empty but not the other, show the non-empty
                                                const otherArray = (type == "mine" ? this.problems : this.myProblems);
                                                if (problems.length > 0 && otherArray.length == 0)
@@ -286,21 +284,22 @@ Vue.component('my-problems', {
                        );
                },
                previewProblem: function() {
-                       if (!V.IsGoodFen(this.newProblem.fen))
+                       if (!V.IsGoodFen(this.modalProb.fen))
                                return alert(translations["Bad FEN description"]);
-                       if (this.newProblem.instructions.trim().length == 0)
+                       if (this.modalProb.instructions.trim().length == 0)
                                return alert(translations["Empty instructions"]);
-                       if (this.newProblem.solution.trim().length == 0)
+                       if (this.modalProb.solution.trim().length == 0)
                                return alert(translations["Empty solution"]);
-                       this.modalProb.preview = true;
+                       Vue.set(this.modalProb, "preview", true);
                },
                editProblem: function(prob) {
                        this.modalProb = prob;
+                       Vue.set(this.modalProb, "preview", false);
                        document.getElementById("modal-newproblem").checked = true;
                },
                deleteProblem: function(pid) {
                        ajax(
-                               "/problems/" + variant.id + "/" + pid,
+                               "/problems/" + pid,
                                "DELETE",
                                response => {
                                        // Delete problem from the list on client side
@@ -318,11 +317,17 @@ Vue.component('my-problems', {
                                this.modalProb,
                                response => {
                                        document.getElementById("modal-newproblem").checked = false;
+                                       Vue.set(this.modalProb, "preview", false);
                                        if (this.modalProb.id == 0)
                                        {
-                                               this.modalProb.added = Date.now();
-                                               this.modalProb.preview = false;
-                                               this.myProblems.push(JSON.parse(JSON.stringify(this.modalProb)));
+                                               this.myProblems.unshift({
+                                                       added: Date.now(),
+                                                       id: response.id,
+                                                       uid: user.id,
+                                                       fen: this.modalProb.fen,
+                                                       instructions: this.modalProb.instructions,
+                                                       solution: this.modalProb.solution,
+                                               });
                                        }
                                        else
                                                this.modalProb.id = 0;