Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into feature/featur…
Browse files Browse the repository at this point in the history
…e/CONNECTOR-39/source-configurations
  • Loading branch information
remko48 committed Oct 3, 2024
2 parents 8cf92cd + 94f4ee3 commit a19cc60
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
22 changes: 11 additions & 11 deletions src/entities/synchronization/synchronization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ export class Synchronization implements TSynchronization {
constructor(synchronization: TSynchronization) {
this.id = synchronization.id || ''
this.name = synchronization.name || ''
this.description = synchronization.description || null
this.sourceId = synchronization.sourceId || null
this.sourceType = synchronization.sourceType || null
this.sourceHash = synchronization.sourceHash || null
this.sourceTargetMapping = synchronization.sourceTargetMapping || null
this.sourceConfig = synchronization.sourceConfig || null
this.targetId = synchronization.targetId || null
this.targetType = synchronization.targetType || null
this.targetHash = synchronization.targetHash || null
this.targetSourceMapping = synchronization.targetSourceMapping || null
this.targetConfig = synchronization.targetConfig || null
this.description = synchronization.description || ''
this.sourceId = synchronization.sourceId || ''
this.sourceType = synchronization.sourceType || ''
this.sourceHash = synchronization.sourceHash || ''
this.sourceTargetMapping = synchronization.sourceTargetMapping || ''
this.sourceConfig = synchronization.sourceConfig || {}
this.targetId = synchronization.targetId || ''
this.targetType = synchronization.targetType || ''
this.targetHash = synchronization.targetHash || ''
this.targetSourceMapping = synchronization.targetSourceMapping || ''
this.targetConfig = synchronization.targetConfig || {}

}

Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/endpoints.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const useEndpointStore = defineStore(
// Create a copy of the endpoint item and remove empty properties
const endpointToSave = { ...this.endpointItem }
Object.keys(endpointToSave).forEach(key => {
if (endpointToSave[key] === '' || (Array.isArray(endpointToSave[key]) && endpointToSave[key].length === 0)) {
if (endpointToSave[key] === '' || (Array.isArray(endpointToSave[key]) && !endpointToSave[key].length)) {
delete endpointToSave[key]
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/job.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const useJobStore = defineStore(
// Create a copy of the job item and remove empty properties
const jobToSave = { ...jobItem }
Object.keys(jobToSave).forEach(key => {
if (jobToSave[key] === '' || (Array.isArray(jobToSave[key]) && jobToSave[key].length === 0) || key === 'created' || key === 'updated') {
if (jobToSave[key] === '' || (Array.isArray(jobToSave[key]) && !jobToSave[key].length) || key === 'created' || key === 'updated') {
delete jobToSave[key]
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/log.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const useLogStore = defineStore(
// Create a copy of the log item and remove empty properties
const logToSave = { ...this.logItem }
Object.keys(logToSave).forEach(key => {
if (logToSave[key] === '' || (Array.isArray(logToSave[key]) && logToSave[key].length === 0)) {
if (logToSave[key] === '' || (Array.isArray(logToSave[key]) && !logToSave[key].length)) {
delete logToSave[key]
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/mapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const useMappingStore = defineStore(
// Create a copy of the mapping item and remove empty properties
const mappingToSave = { ...this.mappingItem }
Object.keys(mappingToSave).forEach(key => {
if (mappingToSave[key] === '' || (Array.isArray(mappingToSave[key]) && mappingToSave[key].length === 0)) {
if (mappingToSave[key] === '' || (Array.isArray(mappingToSave[key]) && !mappingToSave[key].length)) {
delete mappingToSave[key]
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/source.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const useSourceStore = defineStore(
// Create a copy of the source item and remove empty properties
const sourceToSave = { ...sourceItem }
Object.keys(sourceToSave).forEach(key => {
if (sourceToSave[key] === '' || (Array.isArray(sourceToSave[key]) && sourceToSave[key].length === 0)) {
if (sourceToSave[key] === '' || (Array.isArray(sourceToSave[key]) && !sourceToSave[key].length)) {
delete sourceToSave[key]
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/webhooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const useWebhookStore = defineStore(
// Create a copy of the webhook item and remove empty properties
const webhookToSave = { ...this.webhookItem }
Object.keys(webhookToSave).forEach(key => {
if (webhookToSave[key] === '' || (Array.isArray(webhookToSave[key]) && webhookToSave[key].length === 0)) {
if (webhookToSave[key] === '' || (Array.isArray(webhookToSave[key]) && !webhookToSave[key].length)) {
delete webhookToSave[key]
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/views/Endpoint/EndpointsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { endpointStore, navigationStore, searchStore } from '../../store/store.j
appearance="dark"
name="Endpoints aan het laden" />

<div v-if="endpointStore.endpointList.length === 0" class="emptyListHeader">
<div v-if="!endpointStore.endpointList.length" class="emptyListHeader">
Er zijn nog geen endpoints gedefinieerd.
</div>
</NcAppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Job/JobDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ import { jobStore, navigationStore } from '../../store/store.js'
</template>
</NcListItem>
</div>
<div v-if="jobStore.jobItem?.arguments === null || Object.keys(jobStore.jobItem?.arguments).length === 0" class="tabPanel">
<div v-if="jobStore.jobItem?.arguments === null || !Object.keys(jobStore.jobItem?.arguments).length" class="tabPanel">
No arguments found
</div>
</BTab>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Job/JobsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { jobStore, navigationStore, searchStore } from '../../store/store.js'
appearance="dark"
name="Taken aan het laden" />

<div v-if="jobStore.jobList.length === 0" class="emptyListHeader">
<div v-if="!jobStore.jobList.length" class="emptyListHeader">
No jobs defined.
</div>
</NcAppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Log/LogsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import { logStore, navigationStore, searchStore } from '../../store/store.js'
appearance="dark"
name="Logs aan het laden" />

<div v-if="logStore.logList.length === 0">
<div v-if="!logStore.logList.length">
Er zijn nog geen logs gedefinieerd.
</div>
</NcAppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Mapping/MappingsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { mappingStore, navigationStore, searchStore } from '../../store/store.js
appearance="dark"
name="Mappings aan het laden" />

<div v-if="mappingStore.mappingList.length === 0" class="emptyListHeader">
<div v-if="!mappingStore.mappingList.length" class="emptyListHeader">
Er zijn nog geen mappings gedefinieerd.
</div>
</NcAppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Source/SourcesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { sourceStore, navigationStore, searchStore } from '../../store/store.js'
appearance="dark"
name="Bronnen aan het laden" />

<div v-if="sourceStore.sourceList.length === 0" class="emptyListHeader">
<div v-if="!sourceStore.sourceList.length" class="emptyListHeader">
No sources defined.
</div>
</NcAppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Synchronization/SynchronizationsList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { synchronizationStore, navigationStore, searchStore } from '../../store/
appearance="dark"
name="Synchronisaties aan het laden" />

<div v-if="synchronizationStore.synchronizationList.length === 0" class="emptyListHeader">
<div v-if="!synchronizationStore.synchronizationList.length" class="emptyListHeader">
No synchronizations defined.
</div>
</NcAppContentList>
Expand Down
2 changes: 1 addition & 1 deletion src/views/Webhook/WebhooksList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ import { webhookStore, navigationStore, searchStore } from '../../store/store.js
appearance="dark"
name="Webhooks aan het laden" />

<div v-if="webhookStore.webhookList.length === 0" class="emptyListHeader">
<div v-if="!webhookStore.webhookList.length" class="emptyListHeader">
Er zijn nog geen webhooks gedefinieerd.
</div>
</NcAppContentList>
Expand Down

0 comments on commit a19cc60

Please sign in to comment.