Merge branch '1.4.0' of bitbucket.org:snaptsoft/imexrps into 1.4.0
This commit is contained in:
Patrick Fic
@@ -5,7 +5,7 @@ const { default: ipcTypes } = require("../src/ipc.types.commonjs");
|
||||
const { store } = require("./electron-store");
|
||||
const { autoUpdater } = require("electron-updater");
|
||||
const log = require("electron-log");
|
||||
const contextMenu = require("electron-context-menu");
|
||||
const contextMenu = require("electron-context-menu").default;
|
||||
const Sentry = require("@sentry/electron/main");
|
||||
|
||||
//const Nucleus = require("nucleus-nodejs");
|
||||
|
||||
8717
package-lock.json
generated
8717
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
37
package.json
37
package.json
@@ -3,31 +3,31 @@
|
||||
"productName": "ImEXRPS",
|
||||
"author": "ImEX Systems Inc. <support@thinkimex.com>",
|
||||
"description": "ImEXRPS",
|
||||
"version": "1.4.0-alpha.2",
|
||||
"version": "1.4.0-alpha.3",
|
||||
"main": "electron/main.js",
|
||||
"homepage": "./",
|
||||
"dependencies": {
|
||||
"@ant-design/pro-layout": "^7.19.0",
|
||||
"@apollo/client": "^3.13.1",
|
||||
"@ant-design/pro-layout": "^7.22.3",
|
||||
"@apollo/client": "^3.13.4",
|
||||
"@sentry/electron": "^6.1.0",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"antd": "^5.16.2",
|
||||
"antd": "^5.24.3",
|
||||
"apollo-link-logger": "^2.0.1",
|
||||
"apollo-link-sentry": "^4.1.0",
|
||||
"chokidar": "^4.0.3",
|
||||
"dayjs": "^1.11.13",
|
||||
"dayjs-business-days2": "^1.2.3",
|
||||
"dayjs-business-days2": "^1.3.0",
|
||||
"dbffile": "^1.12.0",
|
||||
"dinero.js": "^1.9.1",
|
||||
"electron-context-menu": "^3.6.1",
|
||||
"electron-is-dev": "^2.0.0",
|
||||
"electron-log": "^5.1.2",
|
||||
"electron-context-menu": "^4.0.5",
|
||||
"electron-is-dev": "^3.0.1",
|
||||
"electron-log": "^5.3.2",
|
||||
"electron-reload": "^2.0.0-alpha.1",
|
||||
"electron-store": "^8.2.0",
|
||||
"electron-updater": "^6.1.8",
|
||||
"electron-updater": "^6.3.9",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-config-react-app": "^7.0.1",
|
||||
"firebase": "^11.3.1",
|
||||
"firebase": "^11.4.0",
|
||||
"graphql": "^16.10.0",
|
||||
"lodash": "^4.17.21",
|
||||
"logrocket": "^9.0.2",
|
||||
@@ -40,14 +40,13 @@
|
||||
"react-infinite-scroller": "^1.2.6",
|
||||
"react-redux": "^9.2.0",
|
||||
"react-router-dom": "^6.22.3",
|
||||
"react-to-print": "^2.15.1",
|
||||
"react-to-print": "^3.0.5",
|
||||
"recharts": "^2.15.1",
|
||||
"redux": "^5.0.1",
|
||||
"redux-logger": "^3.0.6",
|
||||
"redux-persist": "^6.0.0",
|
||||
"redux-saga": "^1.3.0",
|
||||
"reselect": "^5.1.1",
|
||||
"sass": "^1.75.0",
|
||||
"vite-plugin-ejs": "^1.7.0"
|
||||
},
|
||||
"scripts": {
|
||||
@@ -79,16 +78,16 @@
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"concurrently": "^8.2.2",
|
||||
"electron": "^30.0.0",
|
||||
"electron-builder": "^24.13.3",
|
||||
"electron-devtools-installer": "^3.2.0",
|
||||
"concurrently": "^9.1.2",
|
||||
"electron": "^35.0.1",
|
||||
"electron-builder": "^25.1.8",
|
||||
"electron-devtools-installer": "^4.0.0",
|
||||
"eslint-config-react": "^1.1.7",
|
||||
"vite": "^5.0.11",
|
||||
"vite-plugin-babel": "^1.2.0",
|
||||
"vite": "^6.2.1",
|
||||
"vite-plugin-babel": "^1.3.0",
|
||||
"vite-plugin-eslint": "^1.8.1",
|
||||
"vite-plugin-legacy": "^2.1.0",
|
||||
"vite-plugin-node-polyfills": "^0.19.0",
|
||||
"vite-plugin-node-polyfills": "^0.23.0",
|
||||
"vite-plugin-style-import": "^2.0.0"
|
||||
},
|
||||
"build": {
|
||||
|
||||
@@ -33,7 +33,6 @@ export default function JobsDetailDescriptionMolecule({ loading, job }) {
|
||||
|
||||
return (
|
||||
<PageHeader
|
||||
ghost={false}
|
||||
title={job.clm_no}
|
||||
subTitle={job.ins_co_nm}
|
||||
extra={[
|
||||
|
||||
@@ -3,11 +3,9 @@ import { setContext } from "@apollo/client/link/context";
|
||||
import { onError } from "@apollo/client/link/error";
|
||||
import { HttpLink } from "@apollo/client/link/http"; //"apollo-link-http";
|
||||
import { RetryLink } from "@apollo/client/link/retry";
|
||||
import { WebSocketLink } from "@apollo/client/link/ws";
|
||||
import { getMainDefinition } from "@apollo/client/utilities";
|
||||
import apolloLogger from "apollo-link-logger";
|
||||
import { auth } from "../firebase/firebase.utils";
|
||||
import { SentryLink } from "apollo-link-sentry";
|
||||
import { auth } from "../firebase/firebase.utils";
|
||||
|
||||
const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => {
|
||||
if (graphQLErrors)
|
||||
@@ -22,49 +20,49 @@ const httpLink = new HttpLink({
|
||||
uri: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT
|
||||
});
|
||||
|
||||
const wsLink = new WebSocketLink({
|
||||
uri: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT_WS,
|
||||
options: {
|
||||
lazy: true,
|
||||
reconnect: true,
|
||||
connectionParams: async () => {
|
||||
const token = auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
if (token) {
|
||||
return {
|
||||
headers: {
|
||||
authorization: token ? `Bearer ${token}` : ""
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
// const wsLink = new WebSocketLink({
|
||||
// uri: import.meta.env.VITE_APP_GRAPHQL_ENDPOINT_WS,
|
||||
// options: {
|
||||
// lazy: true,
|
||||
// reconnect: true,
|
||||
// connectionParams: async () => {
|
||||
// const token = auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
// if (token) {
|
||||
// return {
|
||||
// headers: {
|
||||
// authorization: token ? `Bearer ${token}` : ""
|
||||
// }
|
||||
// };
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
|
||||
const subscriptionMiddleware = {
|
||||
applyMiddleware: async (options, next) => {
|
||||
options.authToken = auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
next();
|
||||
}
|
||||
};
|
||||
wsLink.subscriptionClient.use([subscriptionMiddleware]);
|
||||
// const subscriptionMiddleware = {
|
||||
// applyMiddleware: async (options, next) => {
|
||||
// options.authToken = auth.currentUser && (await auth.currentUser.getIdToken(true));
|
||||
// next();
|
||||
// }
|
||||
// };
|
||||
// wsLink.subscriptionClient.use([subscriptionMiddleware]);
|
||||
|
||||
const link = new HttpLink.split(
|
||||
// split based on operation type
|
||||
({ query }) => {
|
||||
const definition = getMainDefinition(query);
|
||||
// console.log(
|
||||
// "##Intercepted GQL Transaction : " +
|
||||
// definition.operation +
|
||||
// "|" +
|
||||
// definition.name.value +
|
||||
// "##",
|
||||
// query
|
||||
// );
|
||||
return definition.kind === "OperationDefinition" && definition.operation === "subscription";
|
||||
},
|
||||
wsLink,
|
||||
httpLink
|
||||
);
|
||||
// const link = new HttpLink.split(
|
||||
// // split based on operation type
|
||||
// ({ query }) => {
|
||||
// const definition = getMainDefinition(query);
|
||||
// // console.log(
|
||||
// // "##Intercepted GQL Transaction : " +
|
||||
// // definition.operation +
|
||||
// // "|" +
|
||||
// // definition.name.value +
|
||||
// // "##",
|
||||
// // query
|
||||
// // );
|
||||
// return definition.kind === "OperationDefinition" && definition.operation === "subscription";
|
||||
// },
|
||||
// wsLink,
|
||||
// httpLink
|
||||
// );
|
||||
|
||||
const authLink = setContext((_, { headers }) => {
|
||||
return (
|
||||
@@ -104,7 +102,7 @@ if (import.meta.env.DEV) {
|
||||
middlewares.push(apolloLogger);
|
||||
}
|
||||
|
||||
middlewares.push(sentryLink.concat(retryLink.concat(errorLink.concat(authLink.concat(link)))));
|
||||
middlewares.push(sentryLink.concat(retryLink.concat(errorLink.concat(authLink.concat(httpLink)))));
|
||||
|
||||
const cache = new InMemoryCache({});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user