Skip to content

Test branch for TOTC changes #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IanMayo wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Test branch for TOTC changes #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e09456b
Minor version change
IanMayo Dec 14, 2021
f87a08d
New wargame TOTC request
IanMayo Dec 14, 2021
7572ce5
collab 2 version working
IanMayo Dec 14, 2021
58a5ebb
new response object
IanMayo Dec 14, 2021
1663b50
Prioritise reference over _id
IanMayo Dec 14, 2021
eea16a5
Handle transition from storing message title to message id
IanMayo Dec 14, 2021
8cf3caf
V2 collab editing working
IanMayo Dec 14, 2021
614aab7
More collab experiments
IanMayo Dec 14, 2021
a201172
reinstate linter fix
IanMayo Dec 14, 2021
ed8620e
try a workaround
IanMayo Dec 14, 2021
4b27a09
Merge branch 'develop' into totc_trial
IanMayo Dec 15, 2021
c340789
update snapshot
IanMayo Dec 15, 2021
5f9dbe1
Force rebuid
IanMayo Dec 15, 2021
178d97f
Investigate missing message
IanMayo Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "serge",
"version": "0.3.0",
"version": "0.3.2",
"main": "index.js",
"repository": "git@github.com:serge-web/serge.git",
"author": "foxleigh81 <alex@alexfoxleigh.com>",
Expand Down
36 changes: 18 additions & 18 deletions packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Array [
>
<div
className="sc-iwsKbI joYMLE rdt_TableRow"
id="row-id_3a"
id="row-Blue-3"
onClick={[Function]}
onDoubleClick={[Function]}
role="row"
Expand All @@ -345,7 +345,7 @@ Array [
aria-disabled={false}
aria-label="Expand Row"
className="sc-gzVnrw eURjsc"
data-testid="expander-button-id_3a"
data-testid="expander-button-Blue-3"
disabled={false}
onClick={[Function]}
role="button"
Expand All @@ -372,7 +372,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={1}
data-tag="allowRowEvents"
id="cell-1-id_3a"
id="cell-1-Blue-3"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -388,14 +388,14 @@ Array [
className="svg-inline--fa fa-envelope"
/>

id_3a
Blue-3
</div>
</div>
<div
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={2}
data-tag="allowRowEvents"
id="cell-2-id_3a"
id="cell-2-Blue-3"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand Down Expand Up @@ -424,7 +424,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={3}
data-tag="allowRowEvents"
id="cell-3-id_3a"
id="cell-3-Blue-3"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -443,7 +443,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje EsLZI rdt_TableCell"
data-column-id={4}
data-tag="allowRowEvents"
id="cell-4-id_3a"
id="cell-4-Blue-3"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand Down Expand Up @@ -472,7 +472,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={5}
data-tag="allowRowEvents"
id="cell-5-id_3a"
id="cell-5-Blue-3"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -489,7 +489,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={6}
data-tag="allowRowEvents"
id="cell-6-id_3a"
id="cell-6-Blue-3"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -507,7 +507,7 @@ Array [
</div>
<div
className="sc-iwsKbI joYMLE rdt_TableRow"
id="row-id_4"
id="row-RED-1"
onClick={[Function]}
onDoubleClick={[Function]}
role="row"
Expand All @@ -522,7 +522,7 @@ Array [
aria-disabled={false}
aria-label="Expand Row"
className="sc-gzVnrw eURjsc"
data-testid="expander-button-id_4"
data-testid="expander-button-RED-1"
disabled={false}
onClick={[Function]}
role="button"
Expand All @@ -549,7 +549,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={1}
data-tag="allowRowEvents"
id="cell-1-id_4"
id="cell-1-RED-1"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -565,14 +565,14 @@ Array [
className="svg-inline--fa fa-envelope"
/>

id_4
RED-1
</div>
</div>
<div
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={2}
data-tag="allowRowEvents"
id="cell-2-id_4"
id="cell-2-RED-1"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand Down Expand Up @@ -601,7 +601,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={3}
data-tag="allowRowEvents"
id="cell-3-id_4"
id="cell-3-RED-1"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -620,7 +620,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje EsLZI rdt_TableCell"
data-column-id={4}
data-tag="allowRowEvents"
id="cell-4-id_4"
id="cell-4-RED-1"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand Down Expand Up @@ -649,7 +649,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={5}
data-tag="allowRowEvents"
id="cell-5-id_4"
id="cell-5-RED-1"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand All @@ -666,7 +666,7 @@ Array [
className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
data-column-id={6}
data-tag="allowRowEvents"
id="cell-6-id_4"
id="cell-6-RED-1"
onDragEnd={[Function]}
onDragEnter={[Function]}
onDragLeave={[Function]}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/local/coa-status-board/helpers/gen-data.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export const genData = (
}

const row: Row = {
id: message._id || message.message.Reference,
id: message.message.Reference || message._id,
from: message.details.from.roleName,
title: message.message.Title,
status: status,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/local/molecules/json-editor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const JsonEditor: React.FC<Props> = ({ messageTemplates, messageId, messa
const jsonEditorRef = useRef<HTMLDivElement>(null)
const [editor, setEditor] = useState<Editor | null>(null)

const schema = messageTemplates[template]
const schema = messageTemplates[template] || Object.values(messageTemplates).find((item: any) => item.title === template)

if (!schema) {
const styles = {
Expand Down
4 changes: 4 additions & 0 deletions packages/helpers/src/most-recent-only.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ const getIDs = (message: MessageChannel): string => {
if (message.messageType === INFO_MESSAGE_CLIPPED || message.infoType === true) {
res = '' + message.gameTurn
} else {
if(!message) {
console.log('message missing:', message)
return new Date().toString()
}
const msg = message.message
if (msg.Reference !== undefined) {
res = msg.Reference
Expand Down
Binary file modified packages/server/db/message_types
View file
Open in desktop
Binary file not shown.
Binary file modified packages/server/db/pouch__all_dbs__
View file
Open in desktop
Binary file not shown.
Binary file modified packages/server/db/wargame-kskl1i3t.sqlite
View file
Open in desktop
Binary file not shown.
Binary file added packages/server/db/wargame-kx691lik.sqlite
View file
Open in desktop
Binary file not shown.