Skip to content

Migrate build update page to DaisyUI #3390

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

Open
williamjallen wants to merge 1 commit into
base: master
Choose a base branch
from
+105 −119
Open

Migrate build update page to DaisyUI #3390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/Http/Controllers/BuildController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function update(int $build_id): View
{
$this->setBuildById($build_id);

return $this->vue('build-update', 'Files Updated', [], false);
return $this->vue('build-update', 'Files Updated');
}

public function tests(int $build_id): View
Expand Down
222 changes: 104 additions & 118 deletions resources/js/vue/components/BuildUpdate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,68 +2,60 @@
<section v-if="errored">
<p>{{ cdash.error }}</p>
</section>
<section v-else>
<div v-if="loading">
<img :src="$baseURL + '/img/loading.gif'">
</div>
<div v-else>
<h4 v-if="cdash.build.site">
Files changed on <a
class="cdash-link"
:href="$baseURL + '/sites/' + cdash.build.siteid"
>{{ cdash.build.site }}</a>
({{ cdash.build.buildname }}) as of {{ cdash.build.buildtime }}
</h4>

<div v-if="cdash.update.revision">
<b>Revision: </b>
<tt>
<a
v-if="cdash.update.revisionurl.length > 0"
:href="cdash.update.revisionurl"
>{{ cdash.update.revision }}</a>
</tt>
<tt v-if="cdash.update.revisionurl.length === 0">
{{ cdash.update.revision }}
</tt>
</div>
<div v-if="cdash.update.priorrevision">
<b>Prior Revision: </b>
<tt>
<a
v-if="cdash.update.revisiondiff.length > 0"
:href="cdash.update.revisiondiff"
>{{ cdash.update.priorrevision }}</a>
</tt>
<tt
v-if="cdash.update.revisiondiff.length === 0"
:href="cdash.update.revisiondiff"
>
{{ cdash.update.priorrevision }}
</tt>
</div>
<section
v-else
class="tw-flex tw-flex-col tw-w-full tw-gap-4"
>
<loading-indicator :is-loading="loading">
<build-summary-card :build-id="cdash.build.buildid" />

<div>
<div v-if="cdash.update.revision">
<b>Revision: </b>
<tt v-if="cdash.update.revisionurl.length > 0">
<a
class="tw-link tw-link-hover tw-link-info"
:href="cdash.update.revisionurl"
>{{ cdash.update.revision }}</a>
</tt>
<tt v-else>
{{ cdash.update.revision }}
</tt>
</div>
<div v-if="cdash.update.priorrevision">
<b>Prior Revision: </b>
<tt v-if="cdash.update.revisiondiff.length > 0">
<a
class="tw-link tw-link-hover tw-link-info"
:href="cdash.update.revisiondiff"
>{{ cdash.update.priorrevision }}</a>
</tt>
<tt v-else>
{{ cdash.update.priorrevision }}
</tt>
</div>

<a
class="cdash-link"
@click="toggleGraph()"
>
<span v-text="showGraph ? 'Hide Activity Graph' : 'Show Activity Graph'" />
</a>
<div v-if="graphLoading">
<img
id="spinner"
:src="$baseURL + '/img/loading.gif'"
<a
class="tw-link tw-link-hover tw-link-info"
@click="toggleGraph()"
>
<span v-text="showGraph ? 'Hide Activity Graph' : 'Show Activity Graph'" />
</a>
<div v-if="graphLoading">
<img
id="spinner"
:src="$baseURL + '/img/loading.gif'"
>
</div>
<div v-show="graphLoaded && showGraph">
<div id="graphoptions" />
<div id="graph" />
<div
id="graph_holder"
class="center-text"
/>
</div>
</div>
<div v-show="graphLoaded && showGraph">
<div id="graphoptions" />
<div id="graph" />
<div
id="graph_holder"
class="center-text"
/>
</div>
<br>

<h3
v-if="cdash.update.status"
Expand All @@ -73,86 +65,76 @@
</h3>

<div v-for="group in cdash.updategroups">
<div class="container-fluid">
<div class="row">
<div class="tw-w-full">
<div @click="group.hidden = !group.hidden; $forceUpdate()">
<font-awesome-icon :icon="group.hidden ? FA.faChevronRight : FA.faChevronDown" />
<b>{{ group.description }}</b>
</div>
<div class="tw-flex tw-flex-col tw-gap-4 tw-ml-8">
<div
class="col-md-12"
@click="group.hidden = !group.hidden; $forceUpdate()"
v-for="directory in group.directories"
v-show="!group.hidden"
>
<span
class="glyphicon"
:class="group.hidden ? 'glyphicon-chevron-right' : 'glyphicon-chevron-down'"
/>
<b>{{ group.description }}</b>
</div>
</div>
<div
v-for="directory in group.directories"
v-show="!group.hidden"
class="animate-show"
>
<div class="row">
<div
class="col-md-12 col-md-offset-1"
@click="directory.hidden = !directory.hidden; $forceUpdate()"
>
<span
class="glyphicon"
:class="directory.hidden ? 'glyphicon-chevron-right' : 'glyphicon-chevron-down'"
/>
<font-awesome-icon :icon="directory.hidden ? FA.faChevronRight : FA.faChevronDown" />
<tt>{{ directory.name }}</tt>
</div>
</div>
<div
v-for="file in directory.files"
v-show="!directory.hidden"
class="animate-show"
>
<div class="row">
<div class="col-md-12 col-md-offset-2">
<a
v-if="file.diffurl"
:href="file.diffurl"
>
<tt>{{ file.filename }}</tt> Revision: <tt>{{ file.revision }}</tt>
</a>
<span v-else>
<tt>{{ file.filename }}</tt> Revision: <tt>{{ file.revision }}</tt>
</span>
<span v-if="file.author">
by
<div class="tw-flex tw-flex-col tw-gap-4 tw-ml-8">
<div
v-for="file in directory.files"
v-show="!directory.hidden"
>
<div>
<tt>{{ file.filename }}</tt> Revision:
<a
v-if="file.email"
:href="'mailto:' + file.email"
v-if="file.diffurl"
class="tw-link tw-link-hover tw-link-info"
:href="file.diffurl"
>
{{ file.author }}
<tt>{{ file.revision }}</tt>
</a>
<span v-else>
{{ file.author }}
<tt v-else>
{{ file.revision }}
</tt>
<span v-if="file.author">
by
<a
v-if="file.email"
class="tw-link tw-link-hover tw-link-info"
:href="'mailto:' + file.email"
>
{{ file.author }}
</a>
<span v-else>
{{ file.author }}
</span>
</span>
</span>
</div>
<code-box :text="file.log" />
</div>
</div>
<div class="row spacer-bottom">
<pre
class="col-md-10 col-md-offset-2"
style="white-space: pre-wrap;"
>{{ file.log }}</pre>
</div>
</div>
</div>
</div>
</div>
</div>
</loading-indicator>
</section>
</template>

<script>
import $ from 'jquery';
import ApiLoader from './shared/ApiLoader';
import BuildSummaryCard from './shared/BuildSummaryCard.vue';
import LoadingIndicator from './shared/LoadingIndicator.vue';
import CodeBox from './shared/CodeBox.vue';
import {faChevronDown, faChevronRight} from '@fortawesome/free-solid-svg-icons';
import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';

export default {
name: 'BuildUpdate',
components: {FontAwesomeIcon, CodeBox, LoadingIndicator, BuildSummaryCard},

data() {
return {
Expand All @@ -178,6 +160,15 @@ export default {
};
},

computed: {
FA() {
return {
faChevronDown,
faChevronRight,
};
},
},

async mounted() {
// Ensure jQuery is globally available before loading plugins
window.jQuery = $;
Expand Down Expand Up @@ -244,11 +235,6 @@ export default {
}
});
},

toggleGroup: function(group_index) {
this.cdash.updategroups[group_index].hidden = !this.cdash.updategroups[group_index].hidden;
console.log(this.cdash.updategroups[group_index].hidden);
},
},
};
</script>
Expand Down