diff --git a/web/src/components/IntegrationExtractValueForm.vue b/web/src/components/IntegrationExtractValueForm.vue
index e1934941..79109e8c 100644
--- a/web/src/components/IntegrationExtractValueForm.vue
+++ b/web/src/components/IntegrationExtractValueForm.vue
@@ -108,19 +108,13 @@ export default {
}
return this.$route.params.integrationId;
},
- extractorId() {
- if (/^-?\d+$/.test(this.$route.params.extractorId)) {
- return parseInt(this.$route.params.extractorId, 10);
- }
- return this.$route.params.extractorId;
- },
},
methods: {
getItemsUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/values`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/values`;
},
getSingleItemUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/values/${this.itemId}`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/values/${this.itemId}`;
},
},
};
diff --git a/web/src/components/IntegrationExtractorBase.js b/web/src/components/IntegrationExtractorBase.js
deleted file mode 100644
index b767075f..00000000
--- a/web/src/components/IntegrationExtractorBase.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
- props: {
- extractorId: Number,
- },
-};
diff --git a/web/src/components/IntegrationExtractorChildValueFormBase.js b/web/src/components/IntegrationExtractorChildValueFormBase.js
index 596ad9be..aac68c57 100644
--- a/web/src/components/IntegrationExtractorChildValueFormBase.js
+++ b/web/src/components/IntegrationExtractorChildValueFormBase.js
@@ -4,7 +4,6 @@ import { getErrorMessage } from '@/lib/error';
export default {
props: {
integrationId: [Number, String],
- extractorId: [Number, String],
},
methods: {
/**
diff --git a/web/src/components/IntegrationExtractorForm.vue b/web/src/components/IntegrationExtractorForm.vue
index 29331731..316353ad 100644
--- a/web/src/components/IntegrationExtractorForm.vue
+++ b/web/src/components/IntegrationExtractorForm.vue
@@ -33,10 +33,10 @@ export default {
},
methods: {
getItemsUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors`;
+ return `/api/project/${this.projectId}/integrations`;
},
getSingleItemUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.itemId}`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}`;
},
},
};
diff --git a/web/src/components/IntegrationMatcherForm.vue b/web/src/components/IntegrationMatcherForm.vue
index 03b8b702..08c231ad 100644
--- a/web/src/components/IntegrationMatcherForm.vue
+++ b/web/src/components/IntegrationMatcherForm.vue
@@ -132,10 +132,10 @@ export default {
},
methods: {
getItemsUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/matchers`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/matchers`;
},
getSingleItemUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/matchers/${this.itemId}`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/matchers/${this.itemId}`;
},
},
};
diff --git a/web/src/router/index.js b/web/src/router/index.js
index d0791ec1..4ec7c145 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -15,8 +15,6 @@ import Auth from '../views/Auth.vue';
import New from '../views/project/New.vue';
import Integrations from '../views/project/Integrations.vue';
-import IntegrationExtractors from '../views/project/IntegrationExtractors.vue';
-
import IntegrationExtractor from '../views/project/IntegrationExtractor.vue';
Vue.use(VueRouter);
@@ -76,10 +74,6 @@ const routes = [
},
{
path: '/project/:projectId/integration/:integrationId',
- component: IntegrationExtractors,
- },
- {
- path: '/project/:projectId/integration/:integrationId/extractor/:extractorId',
component: IntegrationExtractor,
},
{
diff --git a/web/src/views/project/IntegrationExtractValue.vue b/web/src/views/project/IntegrationExtractValue.vue
index 24d7eaa7..3f450951 100644
--- a/web/src/views/project/IntegrationExtractValue.vue
+++ b/web/src/views/project/IntegrationExtractValue.vue
@@ -10,7 +10,7 @@
>
@@ -91,12 +91,11 @@
import ItemListPageBase from '@/components/ItemListPageBase';
import IntegrationExtractorsBase from '@/components/IntegrationExtractorsBase';
-import IntegrationExtractorBase from '@/components/IntegrationExtractorBase';
import IntegrationExtractValueForm from '@/components/IntegrationExtractValueForm.vue';
export default {
- mixins: [ItemListPageBase, IntegrationExtractorsBase, IntegrationExtractorBase],
+ mixins: [ItemListPageBase, IntegrationExtractorsBase],
components: { IntegrationExtractValueForm },
computed: {
@@ -112,12 +111,6 @@ export default {
}
return this.$route.params.integrationId;
},
- extractorId() {
- if (/^-?\d+$/.test(this.$route.params.extractorId)) {
- return parseInt(this.$route.params.extractorId, 10);
- }
- return this.$route.params.extractorId;
- },
},
methods: {
@@ -158,10 +151,10 @@ export default {
}];
},
getItemsUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/values`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/values`;
},
getSingleItemUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/values/${this.itemId}`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/values/${this.itemId}`;
},
getEventName() {
return 'w-integration-extract-value';
diff --git a/web/src/views/project/IntegrationExtractor.vue b/web/src/views/project/IntegrationExtractor.vue
index f58495fe..d297ac8a 100644
--- a/web/src/views/project/IntegrationExtractor.vue
+++ b/web/src/views/project/IntegrationExtractor.vue
@@ -7,14 +7,12 @@
diff --git a/web/src/views/project/IntegrationMatcher.vue b/web/src/views/project/IntegrationMatcher.vue
index a75fce00..675d7fc4 100644
--- a/web/src/views/project/IntegrationMatcher.vue
+++ b/web/src/views/project/IntegrationMatcher.vue
@@ -10,7 +10,7 @@
>
@@ -95,12 +95,11 @@
import ItemListPageBase from '@/components/ItemListPageBase';
import IntegrationExtractorsBase from '@/components/IntegrationExtractorsBase';
-import IntegrationExtractorBase from '@/components/IntegrationExtractorBase';
import IntegrationMatcherForm from '@/components/IntegrationMatcherForm.vue';
export default {
- mixins: [ItemListPageBase, IntegrationExtractorsBase, IntegrationExtractorBase],
+ mixins: [ItemListPageBase, IntegrationExtractorsBase],
components: { IntegrationMatcherForm },
computed: {
projectId() {
@@ -115,12 +114,6 @@ export default {
}
return this.$route.params.integrationId;
},
- extractorId() {
- if (/^-?\d+$/.test(this.$route.params.extractorId)) {
- return parseInt(this.$route.params.extractorId, 10);
- }
- return this.$route.params.extractorId;
- },
},
methods: {
allowActions() {
@@ -164,10 +157,10 @@ export default {
}];
},
getItemsUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/matchers`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/matchers`;
},
getSingleItemUrl() {
- return `/api/project/${this.projectId}/integrations/${this.integrationId}/extractors/${this.extractorId}/matchers/${this.itemId}`;
+ return `/api/project/${this.projectId}/integrations/${this.integrationId}/matchers/${this.itemId}`;
},
getEventName() {
return 'w-integration-matcher';