From 00b59e1a0e298779b9537e368aaaf148744d3387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Mon, 27 Dec 2021 15:42:39 +0100
Subject: [PATCH] remove vector_by_user from front
---
src/services/misc-api.js | 4 +--
src/views/Catalog.vue | 55 ++++++++++++++++++++++------------------
2 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/services/misc-api.js b/src/services/misc-api.js
index 5bce25aa..78ed7cc2 100644
--- a/src/services/misc-api.js
+++ b/src/services/misc-api.js
@@ -6,9 +6,9 @@ const baseUrl = store.state.configuration.VUE_APP_DJANGO_API_BASE;
const miscAPI = {
- async getIdgoCatalog(vector_by_user) {
+ async getIdgoCatalog() {
const response = await axios.get(
- `${baseUrl}idgo-catalog/?vector_by_user=${vector_by_user}`
+ `${baseUrl}idgo-catalog/`
);
if (
response.status === 200 &&
diff --git a/src/views/Catalog.vue b/src/views/Catalog.vue
index d841382e..d0e074e6 100644
--- a/src/views/Catalog.vue
+++ b/src/views/Catalog.vue
@@ -11,22 +11,24 @@
<div>Dataset</div>
<div>Ressource</div>
</div>
- <div
- v-for="(resource, index) in paginatedRessources"
- :key="`${resource.resource_name}-${index}`"
- @click="selectResource(resource)"
- :class="[
- 'row',
- {
- selected:
- selectedResource &&
- resource.resource === selectedResource.resource,
- },
- ]"
- >
- <div>{{ resource.organization_name }}</div>
- <div>{{ resource.dataset_name }}</div>
- <div>{{ resource.resource_name }}</div>
+ <div>
+ <div
+ v-for="(resource, index) in paginatedRessources"
+ :key="`${resource.resource_name}-${index}`"
+ @click="selectResource(resource)"
+ :class="[
+ 'row',
+ {
+ selected:
+ selectedResource &&
+ resource.layer === selectedResource.layer,
+ },
+ ]"
+ >
+ <div>{{ resource.organization_name }}</div>
+ <div>{{ resource.dataset_name }}</div>
+ <div>{{ resource.resource_name }}</div>
+ </div>
</div>
</div>
@@ -167,7 +169,10 @@ export default {
},
redirect(geojson) {
- const name = this.$route.params.feature_type_slug === "create" ? "ajouter-type-signalement" : "details-type-signalement"
+ const name =
+ this.$route.params.feature_type_slug === "create"
+ ? "ajouter-type-signalement"
+ : "details-type-signalement";
this.$router.push({
name: name,
params: {
@@ -187,7 +192,9 @@ export default {
mounted() {
this.$store.dispatch("GET_PROJECT_INFO", this.$route.params.slug);
- miscAPI.getIdgoCatalog('mmeliani').then((data)=> this.ressources = data.layers);
+ miscAPI
+ .getIdgoCatalog()
+ .then((data) => (this.ressources = data.layers));
},
};
</script>
@@ -206,26 +213,26 @@ h1 {
border: 1px solid #c0c0c0;
margin: 2rem 0;
}
-.table > .row {
+.table .row {
display: flex;
transition: background-color ease-out 0.2s;
}
-.table > .row:not(:first-of-type).selected {
+.table .row:not(:first-of-type).selected {
background-color: #8bddd9;
}
-.table > .row:not(:first-of-type):hover {
+.table .row:not(:first-of-type):hover {
background-color: #009c95;
color: #ffffff;
cursor: pointer;
}
-.table > .row:not(:last-child) {
+.table .row:not(:last-child) {
border-bottom: 1px solid #cacaca;
}
-.table > .row > div {
+.table .row > div {
width: 100%;
padding: 0.5rem;
}
-.table > .header {
+.table .header {
background-color: #e0e0e0;
}
--
GitLab