Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix/mistake reorganize (#2366)

Browse Source 
* revert patch for string parsing fix due to out of date yq version

* reorganize conditionals

* use ng-container

* alertButton needs to be outside of template or container
This commit is contained in:
Lucy
2023-07-19 12:54:18 -04:00
committed by GitHub
parent ccdb477dbb
commit 564186a1f9
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -162,7 +162,7 @@ frontend/config.json: $(GIT_HASH_FILE) frontend/config-sample.json
npm --prefix frontend run-script build-config npm --prefix frontend run-script build-config
frontend/patchdb-ui-seed.json: frontend/package.json frontend/patchdb-ui-seed.json: frontend/package.json
jq '."ack-welcome" = "$(shell yq '.version' frontend/package.json)"' frontend/patchdb-ui-seed.json > ui-seed.tmp jq '."ack-welcome" = $(shell yq '.version' frontend/package.json)' frontend/patchdb-ui-seed.json > ui-seed.tmp
mv ui-seed.tmp frontend/patchdb-ui-seed.json mv ui-seed.tmp frontend/patchdb-ui-seed.json
patch-db/client/node_modules: patch-db/client/package.json patch-db/client/node_modules: patch-db/client/package.json

22
frontend/projects/ui/src/app/components/toast-container/refresh-alert/refresh-alert.component.html
View File

@@ -1,5 +1,5 @@
<div *ngIf="!onPwa; else pwa">
<alert *ngIf="show$ | async" header="Refresh Needed" (dismiss)="onDismiss()"> <alert *ngIf="show$ | async" header="Refresh Needed" (dismiss)="onDismiss()">
<ng-container *ngIf="!onPwa; else pwa">
Your user interface is cached and out of date. Hard refresh the page to get Your user interface is cached and out of date. Hard refresh the page to get
the latest UI. the latest UI.
<ul> <ul>
@@ -16,17 +16,13 @@
: Browser specific, typically a refresh button in the browser menu. : Browser specific, typically a refresh button in the browser menu.
</li> </li>
</ul> </ul>
<a alertButton class="enter-click" role="cancel">Ok</a> </ng-container>
</alert>
</div>
<ng-template #pwa> <ng-template #pwa>
<alert *ngIf="show$ | async" header="Refresh Needed" (dismiss)="onDismiss()"> Your user interface is cached and out of date. Attempt to reload the PWA
Your user interface is cached and out of date. using the button below. If you continue to see this message, uninstall and
<br /> reinstall the PWA.
<br />
Attempt to reload the PWA using the button below. If you continue to see
this message, uninstall and reinstall the PWA.
<a alertButton (click)="pwaReload()" role="cancel">Reload</a>
</alert>
</ng-template> </ng-template>
<!-- alertButton needs to be a direct child of alert element for ionic styling -->
<a *ngIf="!onPwa" alertButton class="enter-click" role="cancel">Ok</a>
<a *ngIf="onPwa" alertButton (click)="pwaReload()" role="cancel">Reload</a>
</alert>