@apollo-annotation/jbrowse-plugin-apollo 0.1.16 → 0.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.esm.js +16 -14
- package/dist/index.esm.js.map +1 -1
- package/dist/jbrowse-plugin-apollo.cjs.development.js +16 -14
- package/dist/jbrowse-plugin-apollo.cjs.development.js.map +1 -1
- package/dist/jbrowse-plugin-apollo.cjs.production.min.js +1 -1
- package/dist/jbrowse-plugin-apollo.cjs.production.min.js.map +1 -1
- package/dist/jbrowse-plugin-apollo.umd.development.js +16 -14
- package/dist/jbrowse-plugin-apollo.umd.development.js.map +1 -1
- package/dist/jbrowse-plugin-apollo.umd.production.min.js +1 -1
- package/dist/jbrowse-plugin-apollo.umd.production.min.js.map +1 -1
- package/package.json +4 -4
- package/src/ApolloInternetAccount/components/AuthTypeSelector.tsx +1 -1
- package/src/ApolloInternetAccount/model.ts +7 -5
- package/src/components/AddAssembly.tsx +1 -1
- package/src/components/ImportFeatures.tsx +2 -2
- package/src/components/ManageChecks.tsx +2 -2
- package/src/components/ManageUsers.tsx +1 -1
- package/src/components/ViewChangeLog.tsx +1 -1
|
@@ -98,7 +98,7 @@ var ExpandLessIcon__default = /*#__PURE__*/_interopDefaultLegacy(ExpandLessIcon)
|
|
|
98
98
|
var ExpandMoreIcon__default = /*#__PURE__*/_interopDefaultLegacy(ExpandMoreIcon);
|
|
99
99
|
var ErrorIcon__default = /*#__PURE__*/_interopDefaultLegacy(ErrorIcon);
|
|
100
100
|
|
|
101
|
-
var version = "0.1.
|
|
101
|
+
var version = "0.1.17";
|
|
102
102
|
|
|
103
103
|
const ApolloConfigSchema = configuration.ConfigurationSchema('ApolloInternetAccount', {
|
|
104
104
|
baseURL: {
|
|
@@ -487,7 +487,7 @@ function AddAssembly({ changeManager, handleClose, session, }) {
|
|
|
487
487
|
const { baseURL, getFetcher, internetAccountId } = selectedInternetAccount;
|
|
488
488
|
if (fileType !== FileType.EXTERNAL && file) {
|
|
489
489
|
// First upload file
|
|
490
|
-
const url = new URL('
|
|
490
|
+
const url = new URL('files', baseURL).href;
|
|
491
491
|
const formData = new FormData();
|
|
492
492
|
formData.append('file', file);
|
|
493
493
|
formData.append('fileName', file.name);
|
|
@@ -2244,7 +2244,7 @@ function ImportFeatures({ changeManager, handleClose, session, }) {
|
|
|
2244
2244
|
throw new Error('No Apollo internet account found');
|
|
2245
2245
|
}
|
|
2246
2246
|
const { baseURL } = apolloInternetAccount;
|
|
2247
|
-
const uri = new URL('
|
|
2247
|
+
const uri = new URL('features/count', baseURL);
|
|
2248
2248
|
const searchParams = new URLSearchParams({
|
|
2249
2249
|
assemblyId: selectedAssembly.name,
|
|
2250
2250
|
});
|
|
@@ -2298,7 +2298,7 @@ function ImportFeatures({ changeManager, handleClose, session, }) {
|
|
|
2298
2298
|
const apolloInternetAccount = getInternetAccount(selectedAssembly.name, internetAccountConfigId);
|
|
2299
2299
|
const { baseURL } = apolloInternetAccount;
|
|
2300
2300
|
// First upload file
|
|
2301
|
-
const url = new URL('
|
|
2301
|
+
const url = new URL('files', baseURL).href;
|
|
2302
2302
|
const formData = new FormData();
|
|
2303
2303
|
formData.append('file', file);
|
|
2304
2304
|
formData.append('fileName', file.name);
|
|
@@ -2387,7 +2387,7 @@ function ManageChecks({ handleClose, session }) {
|
|
|
2387
2387
|
React.useEffect(() => {
|
|
2388
2388
|
async function getChecks() {
|
|
2389
2389
|
const { baseURL, getFetcher } = selectedInternetAccount;
|
|
2390
|
-
const uri = new URL('
|
|
2390
|
+
const uri = new URL('checks/types', baseURL).href;
|
|
2391
2391
|
const apolloFetch = getFetcher({ locationType: 'UriLocation', uri });
|
|
2392
2392
|
const response = await apolloFetch(uri, { method: 'GET' });
|
|
2393
2393
|
if (!response.ok) {
|
|
@@ -2440,7 +2440,7 @@ function ManageChecks({ handleClose, session }) {
|
|
|
2440
2440
|
}
|
|
2441
2441
|
const { notify } = session;
|
|
2442
2442
|
const { baseURL, getFetcher } = selectedInternetAccount;
|
|
2443
|
-
const uri = new URL('
|
|
2443
|
+
const uri = new URL('assemblies/checks', baseURL).href;
|
|
2444
2444
|
const apolloFetch = getFetcher({
|
|
2445
2445
|
locationType: 'UriLocation',
|
|
2446
2446
|
uri,
|
|
@@ -2528,7 +2528,7 @@ function ManageUsers({ changeManager, handleClose, session, }) {
|
|
|
2528
2528
|
const [users, setUsers] = React.useState([]);
|
|
2529
2529
|
const getUsers = React.useCallback(async () => {
|
|
2530
2530
|
const { baseURL } = selectedInternetAccount;
|
|
2531
|
-
const uri = new URL('
|
|
2531
|
+
const uri = new URL('users', baseURL).href;
|
|
2532
2532
|
const apolloFetch = selectedInternetAccount.getFetcher({
|
|
2533
2533
|
locationType: 'UriLocation',
|
|
2534
2534
|
uri,
|
|
@@ -3177,7 +3177,7 @@ function ViewChangeLog({ handleClose, session }) {
|
|
|
3177
3177
|
];
|
|
3178
3178
|
React.useEffect(() => {
|
|
3179
3179
|
async function getAssemblies() {
|
|
3180
|
-
const uri = new URL('
|
|
3180
|
+
const uri = new URL('assemblies', baseURL).href;
|
|
3181
3181
|
const apolloFetch = apolloInternetAccount?.getFetcher({
|
|
3182
3182
|
locationType: 'UriLocation',
|
|
3183
3183
|
uri,
|
|
@@ -3384,7 +3384,7 @@ const AuthTypeSelector = ({ baseURL, handleClose, name, }) => {
|
|
|
3384
3384
|
const controller = new AbortController();
|
|
3385
3385
|
const { signal } = controller;
|
|
3386
3386
|
async function getAuthTypes() {
|
|
3387
|
-
const uri = new URL('
|
|
3387
|
+
const uri = new URL('auth/types', baseURL).href;
|
|
3388
3388
|
const response = await fetch(uri, { method: 'GET', signal });
|
|
3389
3389
|
if (!response.ok) {
|
|
3390
3390
|
const newErrorMessage = await createFetchErrorMessage(response, 'Error when retrieving auth types from server');
|
|
@@ -3648,9 +3648,10 @@ const stateModelFactory$2 = (configSchema) => {
|
|
|
3648
3648
|
}
|
|
3649
3649
|
}),
|
|
3650
3650
|
}))
|
|
3651
|
-
.volatile((self) =>
|
|
3652
|
-
|
|
3653
|
-
|
|
3651
|
+
.volatile((self) => {
|
|
3652
|
+
const { origin, pathname: path } = new URL('socket.io/', self.baseURL);
|
|
3653
|
+
return { socket: socket_ioClient.io(origin, { path }) };
|
|
3654
|
+
})
|
|
3654
3655
|
.actions((self) => ({
|
|
3655
3656
|
addSocketListeners() {
|
|
3656
3657
|
const { session } = mobxStateTree.getRoot(self);
|
|
@@ -3664,7 +3665,8 @@ const stateModelFactory$2 = (configSchema) => {
|
|
|
3664
3665
|
socket.on('connect', async () => {
|
|
3665
3666
|
await self.getMissingChanges();
|
|
3666
3667
|
});
|
|
3667
|
-
socket.on('connect_error', () => {
|
|
3668
|
+
socket.on('connect_error', (error) => {
|
|
3669
|
+
console.error(error);
|
|
3668
3670
|
notify('Could not connect to the Apollo server.', 'error');
|
|
3669
3671
|
});
|
|
3670
3672
|
socket.on('COMMON', (message) => {
|
|
@@ -3759,7 +3761,7 @@ const stateModelFactory$2 = (configSchema) => {
|
|
|
3759
3761
|
self.addSocketListeners();
|
|
3760
3762
|
// request user locations
|
|
3761
3763
|
const { baseURL } = self;
|
|
3762
|
-
const uri = new URL('
|
|
3764
|
+
const uri = new URL('users/locations', baseURL).href;
|
|
3763
3765
|
const apolloFetch = self.getFetcher({
|
|
3764
3766
|
locationType: 'UriLocation',
|
|
3765
3767
|
uri,
|