Merge branch 'development' into fix-gameserver-deletes-taking-extreme…

…ly-long
gettakaro · Dec 15, 2024 · e1d0c99 · e1d0c99
2 parents 27d7c53 + b4af5fe
commit e1d0c99
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/lib-apiclient/src/generated/api.ts b/packages/lib-apiclient/src/generated/api.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 43371ac8482d3c746d4d6c4b9c2fa93c0ad4cb6d
+ * The version of the OpenAPI document: development - 6ab7a6f6b7cb278165265c7cafdf2b3c3ca9d90a
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/base.ts b/packages/lib-apiclient/src/generated/base.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 43371ac8482d3c746d4d6c4b9c2fa93c0ad4cb6d
+ * The version of the OpenAPI document: development - 6ab7a6f6b7cb278165265c7cafdf2b3c3ca9d90a
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/common.ts b/packages/lib-apiclient/src/generated/common.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 43371ac8482d3c746d4d6c4b9c2fa93c0ad4cb6d
+ * The version of the OpenAPI document: development - 6ab7a6f6b7cb278165265c7cafdf2b3c3ca9d90a
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/configuration.ts b/packages/lib-apiclient/src/generated/configuration.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 43371ac8482d3c746d4d6c4b9c2fa93c0ad4cb6d
+ * The version of the OpenAPI document: development - 6ab7a6f6b7cb278165265c7cafdf2b3c3ca9d90a
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/lib-apiclient/src/generated/index.ts b/packages/lib-apiclient/src/generated/index.ts
@@ -4,7 +4,7 @@
  * Takaro app-api
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: development - 43371ac8482d3c746d4d6c4b9c2fa93c0ad4cb6d
+ * The version of the OpenAPI document: development - 6ab7a6f6b7cb278165265c7cafdf2b3c3ca9d90a
  * Contact: [email protected]
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

diff --git a/packages/web-main/index.html b/packages/web-main/index.html
@@ -43,6 +43,17 @@
   </style>
 
   <script id="global-config" src="/env.js"></script>
+  <script>
+  (function (w, d, f) {
+    var a = d.getElementsByTagName('head')[0];
+    var s = d.createElement('script');
+    s.async = 1;
+    s.src = f;
+    s.setAttribute('id', 'produktlyScript');
+    s.dataset.clientToken = "35fa6a12f75360fb014339bd6e71975367bef5f92f8d1e2fd2e67db7e2daccd5535068f8d95b1befcbb6659a347c8377ea91edd288732ba1338d1ea0d9fa427e8205a59e9c8caa14ec8d8822833d99272d8c986e53de8d4dd139b04425c7e03142ec3ed2";
+    a.appendChild(s);
+  })(window, document, "https://public.produktly.com/js/main.js");
+</script>
 </head>
 
 <body>
@@ -56,4 +67,4 @@
   <script type="module" src="/src/index.tsx"></script>
 </body>
 
-</html>
+</html>
diff --git a/packages/web-main/src/routes/_auth/_global/-roles/RolesTableView.tsx b/packages/web-main/src/routes/_auth/_global/-roles/RolesTableView.tsx
@@ -148,7 +148,7 @@ const PlayerCount: FC<{ roleId: string }> = ({ roleId }) => {
     return 'unknown';
   }
 
-  return data.data.length;
+  return data.meta.total;
 };
 
 const UserCount: FC<{ roleId: string }> = ({ roleId }) => {
@@ -164,5 +164,5 @@ const UserCount: FC<{ roleId: string }> = ({ roleId }) => {
     return 'unknown';
   }
 
-  return data.data.length;
+  return data.meta.total;
 };