@apollo-annotation/jbrowse-plugin-apollo 0.1.15 → 0.1.17

package/dist/index.esm.js

@@ -48,7 +48,7 @@ import ExpandLessIcon from '@mui/icons-material/ExpandLess';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import ErrorIcon from '@mui/icons-material/Error';
 
-var version = "0.1.15";
+var version = "0.1.17";
 
 const ApolloConfigSchema = ConfigurationSchema('ApolloInternetAccount', {
     baseURL: {
@@ -437,7 +437,7 @@ function AddAssembly({ changeManager, handleClose, session, }) {
         const { baseURL, getFetcher, internetAccountId } = selectedInternetAccount;
         if (fileType !== FileType.EXTERNAL && file) {
             // First upload file
-            const url = new URL('/files', baseURL).href;
+            const url = new URL('files', baseURL).href;
             const formData = new FormData();
             formData.append('file', file);
             formData.append('fileName', file.name);
@@ -2194,7 +2194,7 @@ function ImportFeatures({ changeManager, handleClose, session, }) {
                 throw new Error('No Apollo internet account found');
             }
             const { baseURL } = apolloInternetAccount;
-            const uri = new URL('/features/count', baseURL);
+            const uri = new URL('features/count', baseURL);
             const searchParams = new URLSearchParams({
                 assemblyId: selectedAssembly.name,
             });
@@ -2248,7 +2248,7 @@ function ImportFeatures({ changeManager, handleClose, session, }) {
         const apolloInternetAccount = getInternetAccount(selectedAssembly.name, internetAccountConfigId);
         const { baseURL } = apolloInternetAccount;
         // First upload file
-        const url = new URL('/files', baseURL).href;
+        const url = new URL('files', baseURL).href;
         const formData = new FormData();
         formData.append('file', file);
         formData.append('fileName', file.name);
@@ -2337,7 +2337,7 @@ function ManageChecks({ handleClose, session }) {
     useEffect(() => {
         async function getChecks() {
             const { baseURL, getFetcher } = selectedInternetAccount;
-            const uri = new URL('/checks/types', baseURL).href;
+            const uri = new URL('checks/types', baseURL).href;
             const apolloFetch = getFetcher({ locationType: 'UriLocation', uri });
             const response = await apolloFetch(uri, { method: 'GET' });
             if (!response.ok) {
@@ -2390,7 +2390,7 @@ function ManageChecks({ handleClose, session }) {
         }
         const { notify } = session;
         const { baseURL, getFetcher } = selectedInternetAccount;
-        const uri = new URL('/assemblies/checks', baseURL).href;
+        const uri = new URL('assemblies/checks', baseURL).href;
         const apolloFetch = getFetcher({
             locationType: 'UriLocation',
             uri,
@@ -2478,7 +2478,7 @@ function ManageUsers({ changeManager, handleClose, session, }) {
     const [users, setUsers] = useState([]);
     const getUsers = useCallback(async () => {
         const { baseURL } = selectedInternetAccount;
-        const uri = new URL('/users', baseURL).href;
+        const uri = new URL('users', baseURL).href;
         const apolloFetch = selectedInternetAccount.getFetcher({
             locationType: 'UriLocation',
             uri,
@@ -3127,7 +3127,7 @@ function ViewChangeLog({ handleClose, session }) {
     ];
     useEffect(() => {
         async function getAssemblies() {
-            const uri = new URL('/assemblies', baseURL).href;
+            const uri = new URL('assemblies', baseURL).href;
             const apolloFetch = apolloInternetAccount?.getFetcher({
                 locationType: 'UriLocation',
                 uri,
@@ -3334,7 +3334,7 @@ const AuthTypeSelector = ({ baseURL, handleClose, name, }) => {
         const controller = new AbortController();
         const { signal } = controller;
         async function getAuthTypes() {
-            const uri = new URL('/auth/types', baseURL).href;
+            const uri = new URL('auth/types', baseURL).href;
             const response = await fetch(uri, { method: 'GET', signal });
             if (!response.ok) {
                 const newErrorMessage = await createFetchErrorMessage(response, 'Error when retrieving auth types from server');
@@ -3598,9 +3598,10 @@ const stateModelFactory$2 = (configSchema) => {
             }
         }),
     }))
-        .volatile((self) => ({
-        socket: io(self.baseURL),
-    }))
+        .volatile((self) => {
+        const { origin, pathname: path } = new URL('socket.io/', self.baseURL);
+        return { socket: io(origin, { path }) };
+    })
         .actions((self) => ({
         addSocketListeners() {
             const { session } = getRoot(self);
@@ -3614,7 +3615,8 @@ const stateModelFactory$2 = (configSchema) => {
             socket.on('connect', async () => {
                 await self.getMissingChanges();
             });
-            socket.on('connect_error', () => {
+            socket.on('connect_error', (error) => {
+                console.error(error);
                 notify('Could not connect to the Apollo server.', 'error');
             });
             socket.on('COMMON', (message) => {
@@ -3709,7 +3711,7 @@ const stateModelFactory$2 = (configSchema) => {
             self.addSocketListeners();
             // request user locations
             const { baseURL } = self;
-            const uri = new URL('/users/locations', baseURL).href;
+            const uri = new URL('users/locations', baseURL).href;
             const apolloFetch = self.getFetcher({
                 locationType: 'UriLocation',
                 uri,