Skip to content

Improve federation support #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/Collection.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<VueCollection :data="data">
<VueCollection :data="data" :federation="federation">
<template #spatial-extents="p">
<span v-if="p.worldwide" class="worldwide"><i class="fas fa-globe"></i> Worldwide</span>
<MapExtentViewer v-else class="map" :footprint="p.extents"></MapExtentViewer>
Expand All @@ -25,6 +25,7 @@ export default {
},
computed: {
...Utils.mapState(['connection']),
...Utils.mapState(['federation']),
...Utils.mapGetters(['supports']),
bbox() {
try {
Expand Down
7 changes: 4 additions & 3 deletions src/components/DiscoveryToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</label>
</div>
<div class="search-results">
<Collections class="category" :collections="collections" :searchTerm="searchTerm" :offerDetails="false" :collapsed="collapsed" :hideDeprecated="!showDeprecated" :hideExperimental="!showExperimental">
<Collections class="category" :collections="collections" :searchTerm="searchTerm" :offerDetails="false" :collapsed="collapsed" :hideDeprecated="!showDeprecated" :hideExperimental="!showExperimental" :federation="federation" :missing="federationMissing.collections">
<template #summary="{ item }">
<div class="discovery-entity" :draggable="supportsLoadCollection" @dragstart="onDrag($event, 'collection', item)">
<div class="discovery-info" @click="showCollectionInfo(item.id)">
Expand All @@ -27,7 +27,7 @@
</template>
</Collections>

<Processes class="category" :processes="allProcesses" :searchTerm="searchTerm" :offerDetails="false" :collapsed="collapsed" :hideDeprecated="!showDeprecated" :hideExperimental="!showExperimental">
<Processes class="category" :processes="allProcesses" :searchTerm="searchTerm" :offerDetails="false" :collapsed="collapsed" :hideDeprecated="!showDeprecated" :hideExperimental="!showExperimental" :federation="federation" :missing="federationMissing.processes">
<template #summary="{ item }">
<div class="discovery-entity" draggable="true" @dragstart="onDrag($event, 'process', item)">
<div class="discovery-info" @click="showProcess(item)">
Expand All @@ -51,7 +51,7 @@
</template>
</UdfRuntimes>

<FileFormats class="category" :formats="fileFormats" :showInput="false" heading="Export File Formats" :searchTerm="searchTerm" :offerDetails="false" :collapsed="collapsed" :hideDeprecated="!showDeprecated" :hideExperimental="!showExperimental">
<FileFormats class="category" :formats="fileFormats" :showInput="false" heading="Export File Formats" :searchTerm="searchTerm" :offerDetails="false" :collapsed="collapsed" :hideDeprecated="!showDeprecated" :hideExperimental="!showExperimental" :federation="federation" :missing="federationMissing.fileFormats">
<template #summary="{ item }">
<div class="discovery-entity" :draggable="supportsSaveResult" @dragstart="onDrag($event, 'fileformat', item)">
<div class="discovery-info" @click="showFileFormatInfo(item)">
Expand Down Expand Up @@ -109,6 +109,7 @@ export default {
computed: {
...Utils.mapState(['collections', 'udfRuntimes']),
...Utils.mapState('editor', ['discoverySearchTerm']),
...Utils.mapState(['federation', 'federationMissing']),
...Utils.mapGetters(['supports', 'fileFormats', 'processes']),
supportsLoadCollection() {
return this.processes.has('load_collection');
Expand Down
28 changes: 28 additions & 0 deletions src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ const getDefaultState = () => {
collections: [],
processNamespaces: Config.processNamespaces || [],
pageLimit: Config.pageLimit,
federation: null,
federationMissing: {
collections: [],
processes: [],
fileFormats: [],
},
};
};

Expand Down Expand Up @@ -174,6 +180,12 @@ export default new Vuex.Store({
let errors = [];
let capabilities = cx.state.connection.capabilities();

// Note down federation things from capabilities
let federation = capabilities.listFederation();
if (Object.keys(federation).length > 0) { // empty object = no federation -> don't commit (leaving default value)
cx.commit('federation', federation);
}

// Request collections
if (capabilities.hasFeature('listCollections')) {
promises.push(cx.state.connection.listCollections()
Expand All @@ -188,6 +200,7 @@ export default new Vuex.Store({
// Request processes
if (capabilities.hasFeature('listProcesses')) {
promises.push(cx.state.connection.listProcesses()
.then(data => cx.state.federationMissing.processes = data['federation:missing'])
.catch(error => errors.push(error)));
}
else {
Expand Down Expand Up @@ -344,6 +357,7 @@ export default new Vuex.Store({
},
fileFormats(state, fileFormats) {
state.fileFormats = fileFormats;
state.federationMissing.fileFormats = fileFormats['federation:missing'];
},
serviceTypes(state, serviceTypes) {
// Make keys uppercase for simplicity
Expand Down Expand Up @@ -390,6 +404,7 @@ export default new Vuex.Store({
.map(c => StacMigrate.collection(c, false))
.filter(c => (typeof c.id === 'string'))
.sort(Utils.sortById);
state.federationMissing.collections = data['federation:missing'];
},
setConnectionError(state, error) {
state.connectionError = error;
Expand Down Expand Up @@ -418,6 +433,19 @@ export default new Vuex.Store({
else {
Vue.delete(state.beforeLogoutListener, key);
}
},
federation(state, federation) {
if (Array.isArray(federation)) {
// convert array of objects, which each have an `id` property, into an object with those IDs as the keys
// e.g. [ {id:'f',name:'foo'} ] -> { 'f': {id:'f',name:'foo'} }
state.federation = federation.reduce((arr, val) => ({ ...arr, [val.id]: val }), {})
} else {
// otherwise expect that it is already in that format
state.federation = federation;
}
},
federationMissing(state, federationMissing) {
state.federationMissing = federationMissing;
}
}
});