Skip to content

Development to main #358

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Mar 25, 2025
Merged

Development to main #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ead9b8
Updated jobLogs to be fetched on change of job
remko48 Mar 25, 2025
06e0f4d
Added visual indicator to check if job is enabled or disabled
remko48 Mar 25, 2025
e45ffd8
Better css placement
remko48 Mar 25, 2025
bfee3fc
Merge pull request #356 from ConductionNL/feature/VSC-212/job-enabled…
remko48 Mar 25, 2025
5a984ef
cleanup
remko48 Mar 25, 2025
c161df1
Merge pull request #357 from ConductionNL/feature/VSC-212/job-enabled…
remko48 Mar 25, 2025
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
4 changes: 4 additions & 0 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,7 @@
font-weight: bold !important;
unicode-bidi: isolate !important;
}

.jobStatusDisabled > svg > path {
fill: var(--color-error) !important;
}
88 changes: 45 additions & 43 deletions src/views/Job/JobDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ import { jobStore, navigationStore, logStore } from '../../store/store.js'
<p>{{ jobStore.jobItem?.version || '-' }}</p>
</div>
<div class="gridContent">
<b>Enabled:</b>
<p>{{ jobStore.jobItem?.isEnabled || '-' }}</p>
<b>{{ jobStore.jobItem?.isEnabled ? 'Enabled' : 'Disabled' }}</b>
<NcUserStatusIcon :class="!jobStore.jobItem?.isEnabled && 'jobStatusDisabled'" :status="'online'" />
</div>
<div class="gridContent">
<b>Job Class:</b>
Expand Down Expand Up @@ -197,7 +197,7 @@ import { jobStore, navigationStore, logStore } from '../../store/store.js'
</template>

<script>
import { NcActions, NcActionButton, NcListItem } from '@nextcloud/vue'
import { NcActions, NcActionButton, NcListItem, NcUserStatusIcon } from '@nextcloud/vue'
import { BTabs, BTab } from 'bootstrap-vue'
import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
import Pencil from 'vue-material-design-icons/Pencil.vue'
Expand Down Expand Up @@ -228,7 +228,7 @@ export default {
NcListItem,
},
mounted() {
jobStore.refreshJobLogs()
jobStore.refreshJobLogs(jobStore.jobItem.id)
},
methods: {
deleteJobArgument(key) {
Expand Down Expand Up @@ -260,7 +260,7 @@ export default {
navigationStore.setModal('viewJobLog')
},
refreshJobLogs() {
jobStore.refreshJobLogs()
jobStore.refreshJobLogs(jobStore.jobItem.id)
},
getLevelColor(level) {
switch (level) {
Expand Down Expand Up @@ -291,54 +291,56 @@ export default {
}
</script>

<style>
.successLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-success);
color: var(--OC-color-status-success);
}
<style scoped>
.successLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-success);
color: var(--OC-color-status-success);
}

.errorLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-error);
color: var(--OC-color-status-error);
}
.errorLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-error);
color: var(--OC-color-status-error);
}

.noticeLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-notice);
color: var(--OC-color-status-notice);
}
.noticeLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-notice);
color: var(--OC-color-status-notice);
}

.warningLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-warning);
color: var(--OC-color-status-warning);
}
.warningLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-warning);
color: var(--OC-color-status-warning);
}

.infoLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-info);
color: var(--OC-color-status-info);
}
.infoLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-info);
color: var(--OC-color-status-info);
}

.criticalLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-critical);
color: var(--OC-color-status-critical);
}
.criticalLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-critical);
color: var(--OC-color-status-critical);
}

.alertLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-alert);
color: var(--OC-color-status-alert);
}
.alertLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-alert);
color: var(--OC-color-status-alert);
}

.emergencyLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-emergency);
color: var(--OC-color-status-emergency);
}
.emergencyLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-emergency);
color: var(--OC-color-status-emergency);
}

.debugLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-debug);
color: var(--OC-color-status-debug);
}
.gridContent p {
.debugLevel * .counter-bubble__counter {
background-color: var(--OC-color-status-background-debug);
color: var(--OC-color-status-debug);
}

.gridContent p {
white-space: normal;
overflow-wrap: break-word;
word-wrap: break-word;
}

</style>
4 changes: 2 additions & 2 deletions src/views/Job/JobsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import { jobStore, navigationStore, searchStore } from '../../store/store.js'
:name="job.name"
:active="jobStore.jobItem?.id === job?.id"
:force-display-actions="true"
@click="jobStore.setJobItem(job)">
@click="jobStore.setJobItem(job); jobStore.refreshJobLogs(job.id)">
<template #icon>
<Update :class="jobStore.jobItem?.id === job.id && 'selectedJobIcon'"
disable-menu
Expand Down Expand Up @@ -80,7 +80,7 @@ import { jobStore, navigationStore, searchStore } from '../../store/store.js'
</template>
Run
</NcActionButton>
<NcActionButton @click="jobStore.setJobItem(job); jobStore.refreshJobLogs()">
<NcActionButton @click="jobStore.setJobItem(job); jobStore.refreshJobLogs(job.id)">
<template #icon>
<Sync :size="20" />
</template>
Expand Down
Loading