From b4b537a65ef6f8863532ff5a37d450bac996a216 Mon Sep 17 00:00:00 2001
From: Sriram Viswanathan <sriram.vish@gmail.com>
Date: Mon, 28 Nov 2022 21:28:22 -0500
Subject: [PATCH 1/3] Update book as primary sort and select sort as secondary

---
 rest/app/pp/serializers.py                    | 13 +++-
 .../CharacterGroupingDetail.vue               | 45 +++++++----
 .../Interfaces/CharacterGroupingInterface.vue | 75 ++++++++++++++-----
 3 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/rest/app/pp/serializers.py b/rest/app/pp/serializers.py
index c73d2fa..d4b3b1f 100644
--- a/rest/app/pp/serializers.py
+++ b/rest/app/pp/serializers.py
@@ -40,7 +40,17 @@ class Meta:
         fields = ["url", "id", "label", "sequence", "image"]
 
 
+class BookNameSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.Book
+        fields = [
+            "id",
+            "label",
+        ]
+
+
 class CharacterFlatSerializer(serializers.ModelSerializer):
+    book = BookNameSerializer(many=False)
     character_class = serializers.PrimaryKeyRelatedField(
         queryset=models.CharacterClass.objects.all()
     )
@@ -67,7 +77,8 @@ class Meta:
             "exposure",
             "offset",
             "image",
-            "created_by_run_id"
+            "created_by_run_id",
+            "book",
         ]
 
 
diff --git a/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue b/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue
index 3b71936..4ffa66d 100644
--- a/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue
+++ b/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue
@@ -157,6 +157,7 @@ export default {
       cg_id: null,
       order: 'character_class',
       selectedCharacters: {},
+      ordered_characters: [],
       selectedCharCount: 0,
       showCreate: false,
       image_size: 'actual',
@@ -166,20 +167,6 @@ export default {
     edit_mode() {
       return !!this.$route.query.edit
     },
-    ordered_characters() {
-      // order default by run - associated with a book
-      const orderBy = ['created_by_run_id']
-      const direction = ['asc']
-      if (this.order.variable !== 'bookseq,pageseq,lineseq,sequence') {
-        orderBy.push(this.lodash_order.variable)
-        direction.push(this.lodash_order.direction)
-      }
-      return _.orderBy(
-        this.character_group.characters,
-        [this.lodash_order.variable],
-        [this.lodash_order.direction]
-      )
-    },
     lodash_order() {
       var direction = 'asc'
       if (this.order.includes('-')) {
@@ -205,6 +192,23 @@ export default {
     },
   },
   methods: {
+    order_characters() {
+      if (this.lodash_order.variable === 'bookseq,pageseq,lineseq,sequence') {
+        return this.character_group.characters
+      } else {
+        const defaultOrderByBook = [
+          (character) =>
+            character.book.label.substring(
+              character.book.label.indexOf(' ') + 1
+            ),
+        ]
+        return _.orderBy(
+          this.character_group.characters,
+          [...defaultOrderByBook, this.lodash_order.variable],
+          ['asc', this.lodash_order.direction]
+        )
+      }
+    },
     display_date: function (date) {
       return moment(new Date(date)).format('MM-DD-YY, h:mm a')
     },
@@ -310,8 +314,17 @@ export default {
       )
     },
   },
-  created: function () {
-    // this.get_book(this.id);
+  watch: {
+    // everytime order changes, re-order the characters
+    order: function () {
+      this.ordered_characters = this.order_characters()
+    },
+    character_group: function (val) {
+      // first time initialization on load
+      if (val) {
+        this.ordered_characters = this.order_characters()
+      }
+    },
   },
 }
 </script>
diff --git a/vue/src/components/Interfaces/CharacterGroupingInterface.vue b/vue/src/components/Interfaces/CharacterGroupingInterface.vue
index 9eab383..35b2d4a 100644
--- a/vue/src/components/Interfaces/CharacterGroupingInterface.vue
+++ b/vue/src/components/Interfaces/CharacterGroupingInterface.vue
@@ -31,21 +31,31 @@
       </div>
       <div class="col-5">
         <div class="card sticky-top">
-          <div class="card-header">
-            <div class="d-inline-flex align-items-center">
-              <b-button
-                @click="toggle_create"
-                size="sm"
-                class="mr-2"
-                :variant="new_cg_card.button_variant[new_cg_card.show]"
-                >{{ new_cg_card.button_text[new_cg_card.show] }}
-              </b-button>
-              <CharacterGroupingSelect v-model="cg_id" :key="cg_menu_key" />
-            </div>
-            <NewCharacterGrouping
-              v-show="new_cg_card.show"
-              @new_group="create_group"
-            />
+          <div class="card-header inline-flex">
+            <dl class="row">
+              <dt class="col-sm-6">
+                <div class="d-inline-flex align-items-center">
+                  <b-button
+                    @click="toggle_create"
+                    size="sm"
+                    class="mr-2"
+                    :variant="new_cg_card.button_variant[new_cg_card.show]"
+                    >{{ new_cg_card.button_text[new_cg_card.show] }}
+                  </b-button>
+                  <CharacterGroupingSelect v-model="cg_id" :key="cg_menu_key" />
+                </div>
+                <NewCharacterGrouping
+                  v-show="new_cg_card.show"
+                  @new_group="create_group"
+                />
+              </dt>
+              <dt class="col-sm-6">
+                <CharacterOrderingSelect
+                  v-model="cgCharactersOrdering"
+                  @input="cgCharactersOrdering = $event"
+                />
+              </dt>
+            </dl>
           </div>
           <div class="card-body" v-if="selected_cg">
             <dl class="row">
@@ -156,6 +166,7 @@
 <script>
 import CharacterGroupingSelect from '../Menus/CharacterGroupingSelect'
 import NewCharacterGrouping from '../CharacterGroups/NewCharacterGrouping'
+import CharacterOrderingSelect from '../Menus/CharacterOrderingSelect'
 import CharacterImage from '../Characters/CharacterImage'
 import CharacterList from '../Characters/CharacterList'
 import { HTTP } from '../../main'
@@ -166,6 +177,7 @@ export default {
   name: 'CharacterGroupingInterface',
   components: {
     CharacterGroupingSelect,
+    CharacterOrderingSelect,
     NewCharacterGrouping,
     CharacterImage,
     CharacterList,
@@ -196,6 +208,8 @@ export default {
       show_damaged_characters: false,
       page_start: null,
       page_end: null,
+      cgCharactersOrdering: 'character_class',
+      cg_characters: [],
     }
   },
   computed: {
@@ -210,14 +224,35 @@ export default {
     },
     selected_cg_ordered_chars: function () {
       if (!!this.selected_cg) {
-        return _.orderBy(
-          this.selected_cg.characters,
-          [(character) => character.character_class.toLowerCase()],
-          ['asc']
-        )
+        if (this.lodash_order.variable === 'bookseq,pageseq,lineseq,sequence') {
+          return this.selected_cg.characters
+        } else {
+          const defaultOrderByBook = [
+            (character) =>
+              character.book.label.substring(
+                character.book.label.indexOf(' ') + 1
+              ),
+          ]
+          return _.orderBy(
+            this.selected_cg.characters,
+            [...defaultOrderByBook, this.lodash_order.variable],
+            ['asc', this.lodash_order.direction]
+          )
+        }
       }
       return []
     },
+    lodash_order() {
+      var direction = 'asc'
+      if (this.cgCharactersOrdering.includes('-')) {
+        direction = 'desc'
+      }
+      const clean_string = this.cgCharactersOrdering.replace('-', '')
+      return {
+        variable: clean_string,
+        direction: direction,
+      }
+    },
     view_params() {
       return {
         book: this.book,

From 3e86a0a1011039f111845bdee3fe5afddcd11592 Mon Sep 17 00:00:00 2001
From: Sriram Viswanathan <sriram.vish@gmail.com>
Date: Wed, 30 Nov 2022 17:46:01 -0500
Subject: [PATCH 2/3] Revert "Update book as primary sort and select sort as
 secondary"

This reverts commit b4b537a65ef6f8863532ff5a37d450bac996a216.
---
 rest/app/pp/serializers.py                    | 13 +---
 .../CharacterGroupingDetail.vue               | 45 ++++-------
 .../Interfaces/CharacterGroupingInterface.vue | 75 +++++--------------
 3 files changed, 37 insertions(+), 96 deletions(-)

diff --git a/rest/app/pp/serializers.py b/rest/app/pp/serializers.py
index d4b3b1f..c73d2fa 100644
--- a/rest/app/pp/serializers.py
+++ b/rest/app/pp/serializers.py
@@ -40,17 +40,7 @@ class Meta:
         fields = ["url", "id", "label", "sequence", "image"]
 
 
-class BookNameSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = models.Book
-        fields = [
-            "id",
-            "label",
-        ]
-
-
 class CharacterFlatSerializer(serializers.ModelSerializer):
-    book = BookNameSerializer(many=False)
     character_class = serializers.PrimaryKeyRelatedField(
         queryset=models.CharacterClass.objects.all()
     )
@@ -77,8 +67,7 @@ class Meta:
             "exposure",
             "offset",
             "image",
-            "created_by_run_id",
-            "book",
+            "created_by_run_id"
         ]
 
 
diff --git a/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue b/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue
index 4ffa66d..3b71936 100644
--- a/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue
+++ b/vue/src/components/CharacterGroups/CharacterGroupingDetail.vue
@@ -157,7 +157,6 @@ export default {
       cg_id: null,
       order: 'character_class',
       selectedCharacters: {},
-      ordered_characters: [],
       selectedCharCount: 0,
       showCreate: false,
       image_size: 'actual',
@@ -167,6 +166,20 @@ export default {
     edit_mode() {
       return !!this.$route.query.edit
     },
+    ordered_characters() {
+      // order default by run - associated with a book
+      const orderBy = ['created_by_run_id']
+      const direction = ['asc']
+      if (this.order.variable !== 'bookseq,pageseq,lineseq,sequence') {
+        orderBy.push(this.lodash_order.variable)
+        direction.push(this.lodash_order.direction)
+      }
+      return _.orderBy(
+        this.character_group.characters,
+        [this.lodash_order.variable],
+        [this.lodash_order.direction]
+      )
+    },
     lodash_order() {
       var direction = 'asc'
       if (this.order.includes('-')) {
@@ -192,23 +205,6 @@ export default {
     },
   },
   methods: {
-    order_characters() {
-      if (this.lodash_order.variable === 'bookseq,pageseq,lineseq,sequence') {
-        return this.character_group.characters
-      } else {
-        const defaultOrderByBook = [
-          (character) =>
-            character.book.label.substring(
-              character.book.label.indexOf(' ') + 1
-            ),
-        ]
-        return _.orderBy(
-          this.character_group.characters,
-          [...defaultOrderByBook, this.lodash_order.variable],
-          ['asc', this.lodash_order.direction]
-        )
-      }
-    },
     display_date: function (date) {
       return moment(new Date(date)).format('MM-DD-YY, h:mm a')
     },
@@ -314,17 +310,8 @@ export default {
       )
     },
   },
-  watch: {
-    // everytime order changes, re-order the characters
-    order: function () {
-      this.ordered_characters = this.order_characters()
-    },
-    character_group: function (val) {
-      // first time initialization on load
-      if (val) {
-        this.ordered_characters = this.order_characters()
-      }
-    },
+  created: function () {
+    // this.get_book(this.id);
   },
 }
 </script>
diff --git a/vue/src/components/Interfaces/CharacterGroupingInterface.vue b/vue/src/components/Interfaces/CharacterGroupingInterface.vue
index 35b2d4a..9eab383 100644
--- a/vue/src/components/Interfaces/CharacterGroupingInterface.vue
+++ b/vue/src/components/Interfaces/CharacterGroupingInterface.vue
@@ -31,31 +31,21 @@
       </div>
       <div class="col-5">
         <div class="card sticky-top">
-          <div class="card-header inline-flex">
-            <dl class="row">
-              <dt class="col-sm-6">
-                <div class="d-inline-flex align-items-center">
-                  <b-button
-                    @click="toggle_create"
-                    size="sm"
-                    class="mr-2"
-                    :variant="new_cg_card.button_variant[new_cg_card.show]"
-                    >{{ new_cg_card.button_text[new_cg_card.show] }}
-                  </b-button>
-                  <CharacterGroupingSelect v-model="cg_id" :key="cg_menu_key" />
-                </div>
-                <NewCharacterGrouping
-                  v-show="new_cg_card.show"
-                  @new_group="create_group"
-                />
-              </dt>
-              <dt class="col-sm-6">
-                <CharacterOrderingSelect
-                  v-model="cgCharactersOrdering"
-                  @input="cgCharactersOrdering = $event"
-                />
-              </dt>
-            </dl>
+          <div class="card-header">
+            <div class="d-inline-flex align-items-center">
+              <b-button
+                @click="toggle_create"
+                size="sm"
+                class="mr-2"
+                :variant="new_cg_card.button_variant[new_cg_card.show]"
+                >{{ new_cg_card.button_text[new_cg_card.show] }}
+              </b-button>
+              <CharacterGroupingSelect v-model="cg_id" :key="cg_menu_key" />
+            </div>
+            <NewCharacterGrouping
+              v-show="new_cg_card.show"
+              @new_group="create_group"
+            />
           </div>
           <div class="card-body" v-if="selected_cg">
             <dl class="row">
@@ -166,7 +156,6 @@
 <script>
 import CharacterGroupingSelect from '../Menus/CharacterGroupingSelect'
 import NewCharacterGrouping from '../CharacterGroups/NewCharacterGrouping'
-import CharacterOrderingSelect from '../Menus/CharacterOrderingSelect'
 import CharacterImage from '../Characters/CharacterImage'
 import CharacterList from '../Characters/CharacterList'
 import { HTTP } from '../../main'
@@ -177,7 +166,6 @@ export default {
   name: 'CharacterGroupingInterface',
   components: {
     CharacterGroupingSelect,
-    CharacterOrderingSelect,
     NewCharacterGrouping,
     CharacterImage,
     CharacterList,
@@ -208,8 +196,6 @@ export default {
       show_damaged_characters: false,
       page_start: null,
       page_end: null,
-      cgCharactersOrdering: 'character_class',
-      cg_characters: [],
     }
   },
   computed: {
@@ -224,35 +210,14 @@ export default {
     },
     selected_cg_ordered_chars: function () {
       if (!!this.selected_cg) {
-        if (this.lodash_order.variable === 'bookseq,pageseq,lineseq,sequence') {
-          return this.selected_cg.characters
-        } else {
-          const defaultOrderByBook = [
-            (character) =>
-              character.book.label.substring(
-                character.book.label.indexOf(' ') + 1
-              ),
-          ]
-          return _.orderBy(
-            this.selected_cg.characters,
-            [...defaultOrderByBook, this.lodash_order.variable],
-            ['asc', this.lodash_order.direction]
-          )
-        }
+        return _.orderBy(
+          this.selected_cg.characters,
+          [(character) => character.character_class.toLowerCase()],
+          ['asc']
+        )
       }
       return []
     },
-    lodash_order() {
-      var direction = 'asc'
-      if (this.cgCharactersOrdering.includes('-')) {
-        direction = 'desc'
-      }
-      const clean_string = this.cgCharactersOrdering.replace('-', '')
-      return {
-        variable: clean_string,
-        direction: direction,
-      }
-    },
     view_params() {
       return {
         book: this.book,

From f611ae958efcacfbebb769f9f1bcbae2e3cc3872 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Dec 2022 23:29:49 +0000
Subject: [PATCH 3/3] Bump decode-uri-component from 0.2.0 to 0.2.2 in /vue

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 vue/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vue/package-lock.json b/vue/package-lock.json
index 78e2df1..d1a4f09 100644
--- a/vue/package-lock.json
+++ b/vue/package-lock.json
@@ -5388,9 +5388,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -20200,9 +20200,9 @@
       "dev": true
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
     "deep-equal": {