@everymatrix/casino-tournaments-controller 1.15.0 → 1.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/casino-tournaments-controller",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "main": "dist/casino-tournaments-controller.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -35,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "15ce8765c213b2c036dd5fbc5007d6ea5a666dc1"
+  "gitHead": "c590519dbcc5d9ba61081face50b61df6f79981d"
 }

package/src/CasinoTournamentsController.svelte

@@ -9,6 +9,7 @@
 
   import '@everymatrix/casino-tournaments-filter-controller';
   import '@everymatrix/casino-tournaments-list-controller';
+  import { isValidSession } from './util';
 
   // endpoint for NorWAy
   export let session:string = '';
@@ -63,6 +64,7 @@
 
   let tournamentsSearchParams:string;
   let tournamentsUpdateEventSource:EventSourcePolyfill;
+  let isLoadTriggered = false
 
   setupI18n({ withLocale: 'en', translations: {}});
 
@@ -162,7 +164,7 @@
       StartTimeAfter: getStartTimeAfter(),
     }
 
-    if(!session && showanonymoustournaments === 'false'){
+    if(!isValidSession(session) && showanonymoustournaments === 'false'){
       filterOptions.tags = 'no-role-set'
     }
 
@@ -302,13 +304,21 @@
   }
 
   const setSession = () => {
-    if (session.length > 0 && session != 'false') {
+    if (isValidSession(session)) {
       isLoggedIn = true;
-      isLoading = true;
       sessionID = session;
     } else {
       isLoggedIn = false;
-      initialLoad();
+      sessionID = ''
+    }
+  }
+
+  // ensure multiple props (from session and others) change just trigger initialLoad only once
+  const shouldLoad = async () => {
+    if(!isLoadTriggered){
+      isLoadTriggered = true
+      await initialLoad()
+      isLoadTriggered = false
     }
   }
 
@@ -354,15 +364,15 @@
 
   $: customStylingContainer && clientstyling && setClientStyling();
   $: customStylingContainer && clientstylingurl && setClientStylingURL();
-  $: session && setSession();
   $: userid && setPlayerID();
-  $: lang && setLocale(lang);
   $: filters && setActiveFilters();
   $: lang && setActiveLanguage();
   $: translationurl && setTranslationUrl();
-  $: initialParameters = endpoint && numberoftournaments && showmorestep && lang && showanonymoustournaments;
-  $: readyToLoad = session ? initialParameters && session : initialParameters;
-  $: readyToLoad && isMounted && initialLoad();
+  $: isMounted && initialLoad();
+
+  $: if(session === '' || session) setSession()
+  $: if(sessionID === '' || sessionID) shouldLoad()
+  $: if(endpoint && numberoftournaments && showmorestep && lang && showanonymoustournaments) shouldLoad()
 </script>
 
 <div bind:this={customStylingContainer}>

package/src/util.ts

@@ -0,0 +1,2 @@
+
+export const isValidSession = (session: string) => session.length > 0 && session != 'false'