@wavemaker-ai/react-runtime 1.0.0-rc.647502 → 1.0.0-rc.647565

package/store/index.js

@@ -1,40 +1,34 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
+import { combineReducers, configureStore } from "@reduxjs/toolkit";
+import { setupListeners } from "@reduxjs/toolkit/query";
+import authReducer from "./slices/authSlice";
+import appConfigReducer from "./slices/appConfigSlice";
+import { useDispatch, useSelector } from "react-redux";
+import i18nReducer from "./slices/i18nSlice";
+import navigationReducer from "./slices/navigationSlice";
+import { pendingTabNavigationIntentMiddleware } from "./middleware/pendingTabNavigationIntentMiddleware";
+const rootReducer = combineReducers({
+  auth: authReducer,
+  info: appConfigReducer,
+  i18n: i18nReducer,
+  navigation: navigationReducer
 });
-exports.useAppSelector = exports.useAppDispatch = exports.store = void 0;
-var _toolkit = require("@reduxjs/toolkit");
-var _query = require("@reduxjs/toolkit/query");
-var _authSlice = _interopRequireDefault(require("@wavemaker-ai/react-runtime/store/slices/authSlice"));
-var _appConfigSlice = _interopRequireDefault(require("@wavemaker-ai/react-runtime/store/slices/appConfigSlice"));
-var _reactRedux = require("react-redux");
-var _i18nSlice = _interopRequireDefault(require("@wavemaker-ai/react-runtime/store/slices/i18nSlice"));
-var _navigationSlice = _interopRequireDefault(require("@wavemaker-ai/react-runtime/store/slices/navigationSlice"));
-var _pendingTabNavigationIntentMiddleware = require("@wavemaker-ai/react-runtime/store/middleware/pendingTabNavigationIntentMiddleware");
-var rootReducer = (0, _toolkit.combineReducers)({
-  auth: _authSlice["default"],
-  info: _appConfigSlice["default"],
-  i18n: _i18nSlice["default"],
-  navigation: _navigationSlice["default"]
-});
-var store = exports.store = (0, _toolkit.configureStore)({
+const store = configureStore({
   reducer: rootReducer,
-  middleware: function middleware(getDefaultMiddleware) {
-    return getDefaultMiddleware({
-      serializableCheck: {
-        ignoredActions: ["auth/loadSecurityInfo/fulfilled"],
-        ignoredActionPaths: ["meta.arg", "payload.config", "payload.request"],
-        ignoredPaths: ["auth.securityConfig"]
-      }
-    }).concat(_pendingTabNavigationIntentMiddleware.pendingTabNavigationIntentMiddleware);
-  }
+  middleware: (getDefaultMiddleware) => getDefaultMiddleware({
+    serializableCheck: {
+      ignoredActions: ["auth/loadSecurityInfo/fulfilled"],
+      ignoredActionPaths: ["meta.arg", "payload.config", "payload.request"],
+      ignoredPaths: ["auth.securityConfig"]
+    }
+  }).concat(pendingTabNavigationIntentMiddleware)
 });
-
-// Only setup listeners on the client side (not during SSR)
 if (typeof window !== "undefined") {
-  (0, _query.setupListeners)(store.dispatch);
+  setupListeners(store.dispatch);
 }
-var useAppDispatch = exports.useAppDispatch = _reactRedux.useDispatch;
-var useAppSelector = exports.useAppSelector = _reactRedux.useSelector;
+const useAppDispatch = useDispatch;
+const useAppSelector = useSelector;
+export {
+  store,
+  useAppDispatch,
+  useAppSelector
+};

package/store/middleware/navigationMiddleware.js

@@ -1,48 +1,28 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.setRouter = exports.navigationMiddleware = exports.getRouterInstance = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _authSlice = require("@wavemaker-ai/react-runtime/store/slices/authSlice");
-var _constants = require("../../core/constants");
-var router = null;
-var setRouter = exports.setRouter = function setRouter(routerInstance) {
+import {
+  loadSecurityInfo,
+  setPageLoading
+} from "../slices/authSlice";
+import { getActiveRoutingBasePath } from "../../core/constants";
+let router = null;
+const setRouter = (routerInstance) => {
   router = routerInstance;
 };
-var navigationMiddleware = exports.navigationMiddleware = function navigationMiddleware(store) {
-  return function (next) {
-    return /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(action) {
-        var result, _state$auth$securityC, state, loginPage;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              result = next(action);
-              if (_authSlice.loadSecurityInfo.rejected.match(action)) {
-                state = store.getState();
-                loginPage = ((_state$auth$securityC = state.auth.securityConfig) === null || _state$auth$securityC === void 0 || (_state$auth$securityC = _state$auth$securityC.loginConfig) === null || _state$auth$securityC === void 0 ? void 0 : _state$auth$securityC.pageName) || "Login";
-                if (router) {
-                  store.dispatch((0, _authSlice.setPageLoading)(false));
-                  router.push("/".concat((0, _constants.getActiveRoutingBasePath)(), "/").concat(loginPage));
-                }
-              }
-              return _context.abrupt("return", result);
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-  };
+const navigationMiddleware = (store) => (next) => async (action) => {
+  var _a, _b;
+  const result = next(action);
+  if (loadSecurityInfo.rejected.match(action)) {
+    const state = store.getState();
+    const loginPage = ((_b = (_a = state.auth.securityConfig) == null ? void 0 : _a.loginConfig) == null ? void 0 : _b.pageName) || "Login";
+    if (router) {
+      store.dispatch(setPageLoading(false));
+      router.push(`/${getActiveRoutingBasePath()}/${loginPage}`);
+    }
+  }
+  return result;
+};
+const getRouterInstance = () => router;
+export {
+  getRouterInstance,
+  navigationMiddleware,
+  setRouter
 };
-var getRouterInstance = exports.getRouterInstance = function getRouterInstance() {
-  return router;
-};

package/store/middleware/pendingTabNavigationIntentMiddleware.js

@@ -1,25 +1,20 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.pendingTabNavigationIntentMiddleware = void 0;
-var _navigationSlice = require("@wavemaker-ai/react-runtime/store/slices/navigationSlice");
-var _pendingTabNavigationIntent = require("@wavemaker-ai/react-runtime/utils/pending-tab-navigation-intent");
-/**
- * Keeps pending-tab navigation intent in module scope for components that render
- * outside a react-redux Provider while navigation still uses the app store.
- */
-var pendingTabNavigationIntentMiddleware = exports.pendingTabNavigationIntentMiddleware = function pendingTabNavigationIntentMiddleware() {
-  return function (next) {
-    return function (action) {
-      var result = next(action);
-      if (_navigationSlice.setPendingTabSelection.match(action)) {
-        (0, _pendingTabNavigationIntent.applyPendingTabNavigationIntent)(action.payload);
-      } else if (_navigationSlice.clearPendingTabSelection.match(action)) {
-        (0, _pendingTabNavigationIntent.clearPendingTabNavigationIntent)();
-      }
-      return result;
-    };
-  };
-};
+import {
+  clearPendingTabSelection,
+  setPendingTabSelection
+} from "../slices/navigationSlice";
+import {
+  applyPendingTabNavigationIntent,
+  clearPendingTabNavigationIntent
+} from "../../utils/pending-tab-navigation-intent";
+const pendingTabNavigationIntentMiddleware = () => (next) => (action) => {
+  const result = next(action);
+  if (setPendingTabSelection.match(action)) {
+    applyPendingTabNavigationIntent(action.payload);
+  } else if (clearPendingTabSelection.match(action)) {
+    clearPendingTabNavigationIntent();
+  }
+  return result;
+};
+export {
+  pendingTabNavigationIntentMiddleware
+};

package/store/slices/appConfigSlice.js

@@ -1,105 +1,76 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.updateConfig = exports.getServiceDefinitions = exports.getPrefabDefinitions = exports["default"] = exports.addPrefab = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toolkit = require("@reduxjs/toolkit");
-var _axios = _interopRequireDefault(require("axios"));
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var initialState = {
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
+import axios from "axios";
+import { resolveBasePath } from "../util/resolve-path";
+const initialState = {
   appVariables: {},
   appConfig: {},
   prefabs: {}
 };
-var getServiceDefinitions = exports.getServiceDefinitions = (0, _toolkit.createAsyncThunk)("appConfig/getServiceDefinitions", /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(baseUrl, _ref) {
-    var dispatch, rejectWithValue, response, data, serviceDefinitions;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          dispatch = _ref.dispatch, rejectWithValue = _ref.rejectWithValue;
-          _context.prev = 1;
-          _context.next = 4;
-          return _axios["default"].get("".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : "", "/services/servicedefs").concat(baseUrl ? "" : ".json"));
-        case 4:
-          response = _context.sent;
-          data = (response === null || response === void 0 ? void 0 : response.data) || {};
-          serviceDefinitions = (data === null || data === void 0 ? void 0 : data.serviceDefs) || {};
-          dispatch(updateConfig(data));
-          return _context.abrupt("return", serviceDefinitions);
-        case 11:
-          _context.prev = 11;
-          _context.t0 = _context["catch"](1);
-          return _context.abrupt("return", rejectWithValue("Failed to fetch service definitions"));
-        case 14:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[1, 11]]);
-  }));
-  return function (_x, _x2) {
-    return _ref2.apply(this, arguments);
-  };
-}());
-var getPrefabDefinitions = exports.getPrefabDefinitions = (0, _toolkit.createAsyncThunk)("appConfig/getPrefabDefinitions", /*#__PURE__*/function () {
-  var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref3, _ref4) {
-    var prefabName, baseUrl, pages, dispatch, rejectWithValue, _response$data, useRootServicedefs, url, response, data;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          prefabName = _ref3.prefabName, baseUrl = _ref3.baseUrl, pages = _ref3.pages;
-          dispatch = _ref4.dispatch, rejectWithValue = _ref4.rejectWithValue;
-          _context2.prev = 2;
-          // `""` and `__self__`: studio prefab preview — root `servicedefs` (metadata uses CONTEXT_APP).
-          useRootServicedefs = !prefabName || prefabName === "__self__";
-          url = useRootServicedefs ? "".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : "", "/services/servicedefs").concat(baseUrl ? "" : ".json") : "".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : "", "/services/prefabs/").concat(prefabName, "/servicedefs").concat(baseUrl ? "" : ".json");
-          _context2.next = 7;
-          return _axios["default"].get(url);
-        case 7:
-          response = _context2.sent;
-          data = {
-            serviceDefs: (response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.serviceDefs) || {},
-            baseUrl: url,
-            pages: pages
-          };
-          dispatch(addPrefab({
-            prefabName: prefabName,
-            data: data
-          }));
-          return _context2.abrupt("return", data);
-        case 13:
-          _context2.prev = 13;
-          _context2.t0 = _context2["catch"](2);
-          return _context2.abrupt("return", rejectWithValue("Failed to fetch prefab definitions"));
-        case 16:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2, null, [[2, 13]]);
-  }));
-  return function (_x3, _x4) {
-    return _ref5.apply(this, arguments);
-  };
-}());
-var appConfigSlice = (0, _toolkit.createSlice)({
+const getServiceDefinitions = createAsyncThunk(
+  "appConfig/getServiceDefinitions",
+  async (baseUrl, { dispatch, rejectWithValue }) => {
+    try {
+      const url = `${resolveBasePath(baseUrl)}/services/servicedefs${baseUrl ? "" : ".json"}`;
+      const response = await axios.get(url);
+      const data = (response == null ? void 0 : response.data) || {};
+      const serviceDefinitions = (data == null ? void 0 : data.serviceDefs) || {};
+      dispatch(updateConfig(data));
+      return serviceDefinitions;
+    } catch (error) {
+      return rejectWithValue("Failed to fetch service definitions");
+    }
+  }
+);
+const getPrefabDefinitions = createAsyncThunk(
+  "appConfig/getPrefabDefinitions",
+  async ({ prefabName, baseUrl, pages }, { dispatch, rejectWithValue }) => {
+    var _a;
+    try {
+      const useRootServicedefs = !prefabName || prefabName === "__self__";
+      const url = useRootServicedefs ? `${resolveBasePath(baseUrl)}/services/servicedefs${baseUrl ? "" : ".json"}` : `${resolveBasePath(baseUrl)}/services/prefabs/${prefabName}/servicedefs${baseUrl ? "" : ".json"}`;
+      const response = await axios.get(url);
+      const data = { serviceDefs: ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.serviceDefs) || {}, baseUrl: url, pages };
+      dispatch(addPrefab({ prefabName, data }));
+      return data;
+    } catch (error) {
+      return rejectWithValue("Failed to fetch prefab definitions");
+    }
+  }
+);
+const appConfigSlice = createSlice({
   name: "appConfig",
-  initialState: initialState,
+  initialState,
   reducers: {
-    updateConfig: function updateConfig(state, action) {
-      return _objectSpread(_objectSpread({}, state), action.payload);
+    updateConfig: (state, action) => {
+      return __spreadValues(__spreadValues({}, state), action.payload);
     },
-    addPrefab: function addPrefab(state, action) {
+    addPrefab: (state, action) => {
       state.prefabs[action.payload.prefabName] = action.payload.data;
     }
   }
 });
-var _appConfigSlice$actio = appConfigSlice.actions,
-  updateConfig = exports.updateConfig = _appConfigSlice$actio.updateConfig,
-  addPrefab = exports.addPrefab = _appConfigSlice$actio.addPrefab;
-var _default = exports["default"] = appConfigSlice.reducer;
+const { updateConfig, addPrefab } = appConfigSlice.actions;
+var appConfigSlice_default = appConfigSlice.reducer;
+export {
+  addPrefab,
+  appConfigSlice_default as default,
+  getPrefabDefinitions,
+  getServiceDefinitions,
+  updateConfig
+};