From e09456baa6b19e6d94bcc770e4560ea50617a4af Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 12:38:10 +0000 Subject: [PATCH 01/13] Minor version change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 831e1e31c4..3d5c6c4159 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serge", - "version": "0.3.0", + "version": "0.3.1", "main": "index.js", "repository": "git@github.com:serge-web/serge.git", "author": "foxleigh81 ", From f87a08d677f9472f01f8ca1378cd1528d45c34bb Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 17:06:11 +0000 Subject: [PATCH 02/13] New wargame TOTC request --- packages/server/db/message_types | Bin 102400 -> 102400 bytes packages/server/db/pouch__all_dbs__ | Bin 102400 -> 102400 bytes packages/server/db/wargame-kx691lik.sqlite | Bin 0 -> 69632 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/server/db/wargame-kx691lik.sqlite diff --git a/packages/server/db/message_types b/packages/server/db/message_types index 3a5e7fd33b9923787aaf58e80ee8f6b32d5ab1b3..c56041df8bb75e0854d0f1f08ddd8154a8adaff7 100644 GIT binary patch delta 932 zcmb7CK~EDw6yB#&OB(@gH6lfu7t4huVM|M5H6(P2dZ-~Wy%_>acW6huyLEPoHlzWr zUbMkD7Z3Cw=)rLH65q7*x?y*8th;++9$@%9p27@F}pqkHc^CC)B2 zndn@Bal>nH>bX7^wy?^my;||=O-JGRwvG+vH3;LB{JJNuEz9=4e9k7@gUi-3vk8;+ z;$j9aM}2NF9+XXt_1^bO^5Sp-lG7n?n4g{1k+&KI3+SysCKZm7zijzW#9;!iZadU1 z5x2@~Sjg#k;>1Sw|R0kvA*t@f$YWyWux_98Z z_?CcFDNJIx%AnurM$U`f+mN{1VANxjx73KlZ8}(Zg!gH+CL25;HkAn-OWreF`HLjE zws@I=Ns-DxY{VxPtJG$EsjtU^*|+<|i-u%d%&KEf9z_L<3KkVK6*LtzbMja+R8t=4 zhXJ2V_kQp{)(*WDXS{EMdC|>4a%Gd$XeIa;n`~Ikx-^raPb5rw5rq4BI zbg*(O%Fk8O;ZgtsB{xTZ7&9m}Ewv~$FF94g+22vYuQWF)wFoBXn_66)n4UVlL61?6 z1*Cs^Lk6SD^w}|teA5r=F$(J-nF%yCH?hJeH7~s+18BdI0obNmgoS8&r};7R>f_OY z&0VNQ$eLof7{4PR-kBb#&!`IWgYfh}o{SvRPw6povBP}Y63^(vixhN9T-!O+7{9S{ oFfcGKW@wxm3J&+}z;IV*zDYs8tku8jifq@}pGV6ntO#E+wTG@CvZ+mOb#LmXT$iWyEw)x9@fdpo04vFdP z0gPsh5*sJpVs~>1V`C8Ha15-j#p5hp)6}HI#1vx-6Eh2oq-0}@WCK$J!$gC`6vIR_ zV{>D}?Qs!|%fy)tSoTk6FJO#kV%fiOVmOPFBa34oKJOAVH*7m&DI+sC4-0P^1Aj2z z8a`p(G@!@Acx4*34A~r;WErs;KYfD{qZB(dXs2H^VpNkS;DPCleT?cXX0>5q+lBiW H-!cLKIN^wy delta 185 zcmZozz}B#UZGtpo#6%fq)(8eY`x_fm7UVPQb5EMgUJ$=oP(X)!^Q7t`7G{0E7n9i= zKq5_in_u+FD58n%6IWyl<>G(K5ImXn!Ad6HZ9tW5yqmYZHD_XHU|?Wp3<=r%<-I@x zvlK_%boKy7Gsd`$6BRhN$3-wM6KB?EWt`4lz!<-A;%t`b`%4%FC-1A~+pbW`_=Jm# YnNOI3KbUU~pD@r!R=(}ReT;7z0rj3a`v3p{ diff --git a/packages/server/db/wargame-kx691lik.sqlite b/packages/server/db/wargame-kx691lik.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..810d32deb4a8bd57d60c0343b2909ff5d27b0083 GIT binary patch literal 69632 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 literal 0 HcmV?d00001 From 7572ce50cd8c62ebeb0bd03a3df94175ed38051f Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 18:41:31 +0000 Subject: [PATCH 03/13] collab 2 version working --- packages/server/db/wargame-kskl1i3t.sqlite | Bin 217088 -> 335872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/server/db/wargame-kskl1i3t.sqlite b/packages/server/db/wargame-kskl1i3t.sqlite index 66891883ed5260a0d48fbb0b153a973b8fac22fd..b7465cf48583331f6377e71995c7d211cb65c012 100644 GIT binary patch delta 30995 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 From 58a5ebb306a6cccc7e5534eeabddcdae49d0b5b4 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 18:41:38 +0000 Subject: [PATCH 04/13] new response object --- packages/server/db/message_types | Bin 102400 -> 102400 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/server/db/message_types b/packages/server/db/message_types index c56041df8bb75e0854d0f1f08ddd8154a8adaff7..835a558e94ba1c98ebb8782a40f486a255516f2d 100644 GIT binary patch delta 1214 zcmd^8OKTHR6uu|#iAko9l)fyP+%(X}5tEc?onS<2u?w+Mvyo729yd5N&ctL2hEnOK zsEA+?a<)N)x-=BYLPXrTD7Y5|-MEl~x)G%y-ci~_{Rg@@=U&eHe0*oU=~!<%?v8qE zgpgq_LtLOfaSUp$r3cUaHgSg=$bh&jei3)X&-N40Y}IeVR`dB;pU6FaFIU4puKIjN3 zJrq2cqTu!{up+B4EzhX3idQL&;0Fr*gNdk2D=b^kwNi~L`(IoNfqx{OtuFI$T42?D zMJ*euuJIVtil-tlfH?|>j>=Tkih7z|Gq~?`CsNXjl5v?y1`n4EUCJ?OMJuq1kzHmQ z#XA%x@d<@Fk7|_oP(RB`_;v^e+r1$uTku90W`&JD!AWk-cP$zgW^}Efn!{jp90HgO z!ND#YpFA*GU}eUeX?c}Z%?%bhF;`#WqMBMs=MGKmMM%{;%lfSVGLiVKtMeVz9Sv@<<2mRGBx(LpHI(7dyS+R zPWxfp5|7<`_aY#sfA_T$6R_Bu5Tge!(@1-@>4@BMQ7p0BO6*@Kto1#{}LC@n%|emtb*xGO;;hb8b+dNh^#g TK+Ws(FY@ delta 714 zcmZXR-%Aux6vyYd)66>RPT(5ahFpi%)Ld{~XVk?tq9;jO2|)ZmGh(h&7oE z!?aOrrB+w!8U%Cw?wb$Mka$1=(;^;P!YI>!oGbsBDf$L~Ta7H$<#^o~s;}D?@oi$Lo{zgl zxG*)6l!>WZp42OllO-kPM5^x;P4y*|({%J7I|;vibS~h?3LWHS5qdi(ZC^ErHD}If zF0p5cqs|j2U-0ytY8VCLxSFR~$KA{(Yuo6r6{%V=P%GqGp-BJtaXgizT7|5i*W58{ z)^<(2^Bnr4SFHlEtB~kNwE8%>c?()_|2ov;&VAspI1TOiHVa}ov&eUx6q5YvpGs*W s-P9hvs=Yx%}+Dd Date: Tue, 14 Dec 2021 18:41:49 +0000 Subject: [PATCH 05/13] Prioritise reference over _id --- .../components/src/local/coa-status-board/helpers/gen-data.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/local/coa-status-board/helpers/gen-data.tsx b/packages/components/src/local/coa-status-board/helpers/gen-data.tsx index 1268f8d119..f6f92528e5 100644 --- a/packages/components/src/local/coa-status-board/helpers/gen-data.tsx +++ b/packages/components/src/local/coa-status-board/helpers/gen-data.tsx @@ -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, From eea16a552398a6ff954002e588ae7924213da4d9 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 18:42:04 +0000 Subject: [PATCH 06/13] Handle transition from storing message title to message id --- packages/components/src/local/molecules/json-editor/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/local/molecules/json-editor/index.tsx b/packages/components/src/local/molecules/json-editor/index.tsx index f1f93d1c93..b2e47ff506 100644 --- a/packages/components/src/local/molecules/json-editor/index.tsx +++ b/packages/components/src/local/molecules/json-editor/index.tsx @@ -19,7 +19,7 @@ export const JsonEditor: React.FC = ({ messageTemplates, messageId, messa const jsonEditorRef = useRef(null) const [editor, setEditor] = useState(null) - const schema = messageTemplates[template] + const schema = messageTemplates[template] || Object.values(messageTemplates).find((item: any) => item.title === template) if (!schema) { const styles = { From 8cf3cafebdd46c2a2ce5f6a714d5616676aa6683 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 19:17:12 +0000 Subject: [PATCH 07/13] V2 collab editing working --- packages/server/db/message_types | Bin 102400 -> 102400 bytes packages/server/db/wargame-kx691lik.sqlite | Bin 69632 -> 77824 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/server/db/message_types b/packages/server/db/message_types index 835a558e94ba1c98ebb8782a40f486a255516f2d..6b6b2f0a821eda0eaf3765637bfb80c8937776c3 100644 GIT binary patch delta 328 zcmZozz}B#UZGtpo%|sbz#+t^2tqF_^<@q@h8JL;a7`Xp2v9X?E2%b36e!IT{<2FVP zj&^4bc7{H~>Ha2+?rgy&i6y1Q(-oB&HK+emWt8C$NG(cE%_~uG&d)8#NiCWF&Vo^g z+0ejXy0j&u`t%xgM&aoRs*EBMI!Z8=Zl$R?3Pq{8iJ5tsdFj*NTQF*)Xi(?WQ3@{2 z%}p$-oPJT5QDS<63?ujSJatAsM$_prri^mab5t2QrhimnjDeW{Pl{1gKu4)0vm_@~ z$w~?8#E0sPBGaqY7_+7?Fk^hQ5sD~sW#it pEHyPHJI_#eGGmUy_A{!CQ<>Nq7?|fW^u|wCIBm9lo(5x5Ism*kWU&AM delta 75 zcmZozz}B#UZGtpo&QotqF_^<@p&H7?@elFmV6lNCZ;B6DQhl_g7%t#<=~L fDdT$P=|Yl>65G$HGEQaMyx`zm=I#Hq8JSW5j8qu< diff --git a/packages/server/db/wargame-kx691lik.sqlite b/packages/server/db/wargame-kx691lik.sqlite index 810d32deb4a8bd57d60c0343b2909ff5d27b0083..20c8706631f8edade06b636f810cc0d619b477ec 100644 GIT binary patch literal 77824 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 ja3x^uf`h*!_@d6 zq3IK37~f7mEz3BC-PFq1!pgvWdYT+#*d_-Sh0QDif8-Y_2td##1r~wDED8c((M<}h L0$W)bfAa$X$3h=d From 614aab79471329d99b25df7cf32450e3e82b0768 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 19:30:34 +0000 Subject: [PATCH 08/13] More collab experiments --- packages/server/db/wargame-kx691lik.sqlite | Bin 77824 -> 94208 bytes packages/themes/_json-editor.scss | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/db/wargame-kx691lik.sqlite b/packages/server/db/wargame-kx691lik.sqlite index 20c8706631f8edade06b636f810cc0d619b477ec..7ca0ca63c3d421e5e68627650f2c85497731c75f 100644 GIT binary patch literal 94208 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 B5H$b* delta 641 zcmah`O=uHg6x^3hvNS*Y@@vFe57gpYlNb@&80}iuCJQDh7Hn*5 zi}t3;CtYviL2nh(MS^&;2)&wvn2TCyh#-g}#Y;u~f)`JEd-G=IF^^f=u`TUb@AcaH zIF9pIBO}mPzwo%|V#%kr+%7!5!#J(cv@6PlhNl2Hu6+8+@{PGcjj^%?iyVzqk zW;KhjjJ*BmEuax~f%fN}=2QJF_ykOI*v4&qfEuRp8Qx~@IMRumK03Adgz+s7f8clg zil3P7J+>IXg|v0|u$$*?Jb=Z*^F2Kd6Fk4dwTSg!4)V9d-OUawoV(!o=qL#p`!3&x zm3p-R!s?VDaBCBWd>oS0*giy4uO2oQ2&}nH>+5|C368E8n;h=r9)89Se!vzsS+W;M zn_mWef|%j(B`%{&G{g+1#kY(b6Y0jjpMB*p%RldXsh+5rdoh z^P8f=|B7j_ViFLlNH@rwu3gini9%-Q h3 > span:first-child { +div[data-schemaid="root"] > h3 > span:first-child { color: #fff !important; -} \ No newline at end of file +} From a2011724d2408bf9b580e61a59c084055524c324 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 19:34:55 +0000 Subject: [PATCH 09/13] reinstate linter fix --- packages/themes/_json-editor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/themes/_json-editor.scss b/packages/themes/_json-editor.scss index e61b384894..d4f77d01c7 100644 --- a/packages/themes/_json-editor.scss +++ b/packages/themes/_json-editor.scss @@ -14,6 +14,6 @@ max-width: 100%; } -div[data-schemaid="root"] > h3 > span:first-child { +div[data-schemaid=root] > h3 > span:first-child { color: #fff !important; } From ed8620e7b3b9ad2771698b02a878dc83a9b3008c Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 14 Dec 2021 19:43:35 +0000 Subject: [PATCH 10/13] try a workaround --- packages/themes/_json-editor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/themes/_json-editor.scss b/packages/themes/_json-editor.scss index d4f77d01c7..5ee52ee9eb 100644 --- a/packages/themes/_json-editor.scss +++ b/packages/themes/_json-editor.scss @@ -14,6 +14,6 @@ max-width: 100%; } -div[data-schemaid=root] > h3 > span:first-child { +div[data-schemaid='root'] > h3 > span:first-child { color: #fff !important; } From c340789287d542378dee1113501d2ebf6f205029 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Wed, 15 Dec 2021 08:22:08 +0000 Subject: [PATCH 11/13] update snapshot --- .../__snapshots__/index.spec.tsx.snap | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap b/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap index 9f963108ff..6b3da032b3 100644 --- a/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap +++ b/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap @@ -330,7 +330,7 @@ Array [ >
  - id_3a + Blue-3
  - id_4 + RED-1
Date: Wed, 15 Dec 2021 09:40:06 +0000 Subject: [PATCH 12/13] Force rebuid --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d5c6c4159..8ae8f432a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serge", - "version": "0.3.1", + "version": "0.3.2", "main": "index.js", "repository": "git@github.com:serge-web/serge.git", "author": "foxleigh81 ", From 178d97f6c4af71a5bd422ac38c465d1be4328f51 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Wed, 15 Dec 2021 09:45:53 +0000 Subject: [PATCH 13/13] Investigate missing message --- packages/helpers/src/most-recent-only.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/helpers/src/most-recent-only.ts b/packages/helpers/src/most-recent-only.ts index 3ca56703e3..732e78b3b5 100644 --- a/packages/helpers/src/most-recent-only.ts +++ b/packages/helpers/src/most-recent-only.ts @@ -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