Skip to content

Job queue perms #413

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
mradamcox wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Job queue perms #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d736336
cleanup derivative queueing buttons and status
mradamcox Sep 6, 2026
a2ca271
update wording and derivative names
mradamcox Sep 6, 2026
62f4b17
remove print statements
mradamcox Sep 6, 2026
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
7 changes: 4 additions & 3 deletions ohmg/frontend/svelte_components/src/components/base/Link.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
export let download = false;
export let title = '';
export let classes = [];
export let style = '';

const classStr = classes.join(' ');
</script>

{#if external || rightArrow || download}
{#if download }
<a {href} class={classStr} target={external ? '_blank' : null} {title} download>
<a {href} class={classStr} style={style} target={external ? '_blank' : null} {title} download>
<slot></slot>
<DownloadSimple />
</a>
{:else}
<a {href} class={classStr} target={external ? '_blank' : null} {title}>
<a {href} class={classStr} style={style} target={external ? '_blank' : null} {title}>
<slot></slot>
{#if external}
<ArrowSquareOut />
Expand All @@ -30,7 +31,7 @@
</a>
{/if}
{:else}
<a {href} class={classStr} {title}>
<a {href} style={style} class={classStr} {title}>
<slot></slot>
</a>
{/if}
152 changes: 70 additions & 82 deletions ohmg/frontend/svelte_components/src/components/map/MosaicDerivatives.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import ModalInfo from '../base/ModalInfo.svelte';
import LoadingEllipsis from '../shared/LoadingEllipsis.svelte';
import DerivativeDD from '../shared/DerivativeDD.svelte';
import MosaicStatus from '../shared/tags/MosaicStatus.svelte';
import ArrowsClockwise from 'phosphor-svelte/lib/ArrowsClockwise';

export let CONTEXT;
export let mapId;
Expand Down Expand Up @@ -49,52 +51,29 @@
i.masksDateDisplay = i.multimask_date ? new Date(i.multimask_date*1000).toLocaleString() : null;
i.xyzStaticArchiveURL = i.xyz_tiles_url ? `${i.xyz_tiles_url}/archive.tar.gz` : null;
i.xyzStaticTilesURL = i.xyz_tiles_url ? `${i.xyz_tiles_url}/{z}/{x}/{y}.png` : null;

i.enableCogQueueBtn = CONTEXT.user.perms.includes("core.queue_mosaic_cog")
i.cogQueueBtnTitle = CONTEXT.user.perms.includes("core.queue_mosaic_cog") ?
"Click to queue COG build" : "You do not have permission for this action"

i.cogStale = false;
i.cogDateDisplay = "---";
i.showCogQueueBtn = false;
if (i.latest_cog_job) {
if (i.latest_cog_job.stage == "completed") {
i.cogDate = new Date(i.latest_cog_job.date_started * 1000).toLocaleString();
i.cogDateDisplay = `last updated: ${i.cogDate}`;
i.cogStale = i.multimask_date ? i.latest_cog_job.date_started < i.multimask_date : false
i.showCogQueueBtn = i.cogStale;
} else {
i.cogDateDisplay = i.latest_cog_job.stage;
if (i.latest_cog_job.stage != "queued" && i.latest_cog_job.stage != "running") {
i.showCogQueueBtn = true;
}
}
} else {
i.showCogQueueBtn = true;
i.cogDateDisplay = "not generated";
if (i.latest_cog_job && i.latest_cog_job.stage == "completed") {
i.cogStale = i.multimask_date ? i.latest_cog_job.date_started < i.multimask_date : false
}

// same thing now but for the XYZ tileset build
i.showXyzQueueBtn = false;
i.enableXyzQueue = false;
if (i.mosaic_cog_url && !i.cogStale) {
i.enableXyzQueue = true
i.xyzQueueBtnTitle = "Click to queue XYZ tileset build";
i.enableXyzQueue = true;
if (!i.latest_cog_job || i.cogStale) {
i.enableXyzQueue = false;
i.xyzQueueBtnTitle = "COG must be up-to-date before tileset can be built";
}

i.xyzStale = false;
i.xyzDateDisplay = "---"
if (i.latest_xyz_job) {
if (i.latest_xyz_job.stage == "completed") {
i.xyzDate = new Date(i.latest_xyz_job.date_started * 1000).toLocaleString();
i.xyzDateDisplay = `last updated: ${i.xyzDate}`;
i.xyzStale = i.multimask_date ? i.latest_xyz_job.date_started < i.multimask_date : false;
i.showXyzQueueBtn = i.xyzStale;
} else {
i.xyzDateDisplay = i.latest_xyz_job.stage;
if (i.latest_xyz_job.stage != "queued" && i.latest_xyz_job.stage != "running") {
i.showXyzQueueBtn = true;
i.enableXyzQueue = true;
}
}
} else {
i.showXyzQueueBtn = true;
i.xyzDateDisplay = "not generated"
if (!CONTEXT.user.perms.includes("core.queue_mosaic_xyz")) {
i.enableXyzQueue = false;
i.xyzQueueBtnTitle = "You do not have permission for this action";
}


return i
});
loading = false;
Expand Down Expand Up @@ -128,20 +107,21 @@
<ModalConfirm id="modal-confirm-cog-queue"
yesAction={() => {submitQueueRequest('queue-cog-creation')}}
>
<p>Submit mosaic COG generation to queue?</p>
<p>Submit mosaic COG generation to queue? If the current COG is up-to-date, there is no need to rebuild it.</p>
</ModalConfirm>
<ModalConfirm id="modal-confirm-xyz-queue"
yesAction={() => {submitQueueRequest('queue-tileset-creation')}}
>
<p>Submit XYZ tileset generation to queue?</p>
<p>Submit XYZ tileset generation to queue? If the current XYZ tileset is up-to-date, there is no need to rebuild it.</p>
</ModalConfirm>

<div>
<p>Once layers have been trimmed in the <strong>MultiMask</strong> they can be combined into a single
mosaic. We provide access to this mosaic in the form of file downloads, web service endpoints, and direct integrations
into other platforms. Read more <Link href="https://docs.oldinsurancemaps.net/guides/generating-mosaics" rightArrow={true}>in the docs</Link></p>
<p>If the MultiMask has been updated <em>after</em> one of these artifacts was generated, dates will be shown in
red and you can queue that mosaic to be rebuilt. <button class="is-text-link" on:click={initLayersets}>refresh table</button></p>
<p>Once layers have been trimmed in the <strong>MultiMask</strong> they are combined into a single
mosaic output, or "derivative". You can access these derivatives here in the form of file downloads, web service endpoints, and direct integrations
into other platforms.</p>
<p>To queue the creation (or recreation) of mosaics for each layerset, use the summary table below. If a derivative has been created, but
the MultiMask has since been edited, it will be marked as <strong>stale</strong> it should be queued for a rebuild.
Read more <Link href="https://docs.oldinsurancemaps.net/guides/generating-mosaics" rightArrow={true}>in the docs</Link></p>
</div>
{#if loading}
<LoadingEllipsis />
Expand All @@ -152,24 +132,31 @@
<span>
{`${ls.name} (${ls.layers_masked_ct}/${ls.layers.length} layers masked)`}
</span>
{#if ls.multimask_date}
<span class="mask-timestamp">
masks last updated: {ls.masksDateDisplay}
</span>
{/if}
<div class="dl-title-right">
{#if ls.multimask_date}
<span class="mask-timestamp">
masks last edit: {ls.masksDateDisplay}
</span>
{/if}
<button style="color:white" on:click={initLayersets}><ArrowsClockwise/></button>
</div>
</h4>
<dl style="margin-bottom: 1em;">
<dt class="derivative-subheader">
Cloud Optimized GeoTIFF
<span class="timestamp{ls.cogStale ? ' stale' : ''}">
{ls.cogDateDisplay}
{#if ls.showCogQueueBtn}
<button class="is-text-link" on:click={() => {
<div class="derivative-subheader-right">
{#if ls.latest_cog_job}
<MosaicStatus job={ls.latest_cog_job} maskDate={ls.multimask_date}/>
{/if}
<button
class="button is-small is-link"
disabled={!ls.enableCogQueueBtn}
title={ls.cogQueueBtnTitle}
on:click={() => {
layersetToQueueForCog=ls.id;
openModal('modal-confirm-cog-queue')
}}>queue rebuild</button>
{/if}
</span>
}}>build COG</button>
</div>
</dt>
<dt>Direct download (.tif)</dt>
<DerivativeDD
Expand All @@ -183,7 +170,7 @@
linkType="copytext"
naMessage="requires COG"
/>
<dt>XYZ tile endpoint (dynamic)</dt>
<dt>Dynamic XYZ endpoint</dt>
<DerivativeDD
linkUrl={ls.dynamicXyzUrl}
linkType="copytext"
Expand All @@ -196,41 +183,37 @@
naMessage="requires COG"
/>
<dt class="derivative-subheader">
Static XYZ Tileset
<span class="timestamp{ls.xyzStale ? ' stale' : ''}">
{ls.xyzDateDisplay}
{#if ls.showXyzQueueBtn}
<button class="is-text-link"
XYZ Tileset
<div class="derivative-subheader-right">
{#if ls.latest_xyz_job}
<MosaicStatus job={ls.latest_xyz_job} maskDate={ls.multimask_date}/>
{/if}
<button
class="button is-small is-link"
disabled={!ls.enableXyzQueue}
title={ls.enableXyzQueue ?
'Queue creation of XYZ tileset' :
'COG must be rebuilt before tileset can be created'}
title={ls.xyzQueueBtnTitle}
on:click={() => {
layersetToQueueForCog=ls.id;
openModal('modal-confirm-xyz-queue')
}}>queue rebuild</button>
{/if}
</span>
}}>build XYZ tileset</button>
</div>
</dt>
<dt>Direct download (gzipped tarfile)</dt>
<DerivativeDD
linkUrl={ls.xyzStaticArchiveURL}
linkType="download"
naMessage="not yet generated"
/>
<dt>Tiles endpoint</dt>
<dt>Static XYZ endpoint</dt>
<DerivativeDD
linkUrl={ls.xyzStaticTilesURL}
linkType="copytext"
naMessage="not yet generated"
/>
<dt class="derivative-subheader">
Extensions...
<span class="timestamp">
always current, unless noted
</span>
Extensions
</dt>
<dt>Open in OpenHistoricalMap editor (uses XYZ tile endpoint)</dt>
<dt>Open in OpenHistoricalMap editor (uses dynamic XYZ endpoint)</dt>
<DerivativeDD
linkUrl={ls.ohmUrl}
linkType="external"
Expand Down Expand Up @@ -261,6 +244,11 @@
align-items: baseline;
flex-wrap: wrap;
}
.dl-title-right {
display: flex;
align-items: center;
gap: .5em
}
span.mask-timestamp {
font-size: .9em;
}
Expand All @@ -271,6 +259,7 @@
padding: .25em .5em;
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
font-weight: 700;
font-size: .85em;
Expand All @@ -279,10 +268,9 @@
dt.derivative-subheader {
background-color: rgb(188, 241, 253);
}
.timestamp {
color: rgb(128, 128, 128);
}
.timestamp.stale {
color: red;
.derivative-subheader-right {
display: flex;
align-items: center;
gap: .5em;
}
</style>
26 changes: 26 additions & 0 deletions ohmg/frontend/svelte_components/src/components/shared/tags/MosaicStatus.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<script>
import Link from "../../base/Link.svelte";
export let job;
export let maskDate;

const stale = maskDate > job.date_started;
const dateDisplay = new Date(job.date_started * 1000).toLocaleString()
const title = `latest build: ${dateDisplay}`

</script>

{#if job.stage == "completed"}
{#if stale}
<div class="tag is-danger" title={title}>
stale
</div>
{:else}
<div class="tag is-success" title={title}>
up-to-date
</div>
{/if}
{:else}
<div class={`tag ${job.stage == "queued" ? 'is-info' : 'is-warning'}`} title={title}>
<Link href="/jobs" style="color:black;" external={true} title="Open running jobs page...">{job.stage}</Link>
</div>
{/if}