react-toolkits 2.9.18 → 2.9.19

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.9.19
+
+### Patch Changes
+
+- 921deca: fix: app-id header is not right
+
 ## 2.9.18
 
 ### Patch Changes

package/lib/index.d.ts

@@ -124,6 +124,7 @@ type Locale = {
 interface ContextProps {
     locale: Locale;
     usePermissionApiV2: boolean;
+    gameApiV2: boolean;
     interceptor?: {
         response?: (response: Response, opts: RequestOptions) => Promise<any>;
     };
@@ -223,7 +224,6 @@ interface Game {
 }
 
 interface GameSelectProps {
-    apiV2?: boolean;
     filter?: (game: Game) => boolean;
     onGameChange?: (game: Game) => void;
 }
@@ -233,7 +233,6 @@ type HeaderExtra = {
     children: ReactNode;
 };
 interface LayoutProps extends Pick<GameSelectProps, 'filter' | 'onGameChange'> {
-    gameApiV2?: boolean;
     title?: ReactNode;
     items?: NavMenuItem[];
     hideGameSelect?: boolean;

package/lib/index.js

@@ -137,8 +137,9 @@ var init_Provider = __esm({
     init_en_GB();
     createContextStore = (initProps) => {
       const DEFAULT_PROPS = {
+        locale: en_GB_default,
         usePermissionApiV2: false,
-        locale: en_GB_default
+        gameApiV2: false
       };
       return createStore()((set) => ({
         ...DEFAULT_PROPS,
@@ -617,6 +618,7 @@ var init_stores2 = __esm({
   "src/components/layout/stores.ts"() {
     init_request();
     init_storage();
+    init_contextProvider();
     useLayoutStore = create()(
       persist(
         (set) => ({
@@ -637,7 +639,7 @@ var init_stores2 = __esm({
           isLoading: false,
           game: null,
           games: [],
-          async fetchGames({ apiV2 = false, forceUpdate = false } = {}) {
+          async fetchGames({ apiV2 = contextStore.getState().gameApiV2, forceUpdate = false } = {}) {
             if (!forceUpdate && get2().initialized) {
               return get2().games;
             }
@@ -673,13 +675,15 @@ var init_stores2 = __esm({
 var Text, GameSelect, GameSelect_default;
 var init_GameSelect = __esm({
   "src/components/layout/GameSelect.tsx"() {
+    init_contextProvider();
     init_locale();
     init_stores2();
     ({ Text } = Typography);
     GameSelect = (props) => {
-      const { apiV2, filter, onGameChange } = props;
+      const { filter, onGameChange } = props;
       const { t } = useTranslation();
       const { game, games, isLoading, fetchGames } = useGameStore();
+      const apiV2 = useToolkitsContext((state) => state.gameApiV2);
       useEffect(() => {
         fetchGames({ apiV2 });
       }, []);
@@ -732,18 +736,7 @@ var init_Layout = __esm({
     ({ Spin: Spin3, theme: theme3 } = Antd2);
     ({ Header, Sider, Content } = Antd2.Layout);
     Layout2 = (props) => {
-      const {
-        gameApiV2,
-        title,
-        items,
-        headerExtra,
-        hideGameSelect,
-        children,
-        navWidth,
-        logoutRedirectUrl,
-        filter,
-        onGameChange
-      } = props;
+      const { title, items, headerExtra, hideGameSelect, children, navWidth, logoutRedirectUrl, filter, onGameChange } = props;
       const {
         token: { colorBgContainer, colorBorder }
       } = theme3.useToken();
@@ -796,7 +789,7 @@ var init_Layout = __esm({
                       onClick: onCollapse
                     }
                   ),
-                  usePermissionApiV2 && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { apiV2: gameApiV2, filter, onGameChange }),
+                  usePermissionApiV2 && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { filter, onGameChange }),
                   headerExtra?.left?.map((extra) => /* @__PURE__ */ jsx("span", { children: extra.children }, extra.key))
                 ] }),
                 /* @__PURE__ */ jsxs(Space, { size: "small", split: /* @__PURE__ */ jsx(Divider, { type: "vertical" }), children: [
@@ -874,7 +867,7 @@ async function request(url, opts = {}) {
   if (!headers.has(APP_ID_HEADER_NAME) && contextStore.getState().usePermissionApiV2) {
     const game = useGameStore.getState().game;
     if (game) {
-      headers.set(APP_ID_HEADER_NAME, String(game.game_id ?? game.id));
+      headers.set(APP_ID_HEADER_NAME, String(contextStore.getState().gameApiV2 ? game.game_id : game.id));
     }
   }
   if (responseType === "blob") {
@@ -1110,7 +1103,7 @@ var init_QueryList = __esm({
       });
       const action = useRef(3 /* Init */);
       const { game } = useGameStore();
-      const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
+      const { gameApiV2, usePermissionApiV2 } = useToolkitsContext((state) => state);
       const [isValid, setIsValid] = useState(false);
       const { keyMap, getPayload, refetch } = useQueryListStore();
       const { page, size = defaultSize, formValue } = getPayload(route3);
@@ -1134,7 +1127,7 @@ var init_QueryList = __esm({
           if (isGlobal) {
             newHeaders.set(APP_ID_HEADER_NAME, "global");
           } else if (game) {
-            newHeaders.set(APP_ID_HEADER_NAME, String(game.id));
+            newHeaders.set(APP_ID_HEADER_NAME, String(gameApiV2 ? game.game_id : game.id));
           }
         }
         return newHeaders;