diff --git a/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue index 31029e1e6..66d072f4f 100644 --- a/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue +++ b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue @@ -76,10 +76,10 @@ const installing = ref(false) const onInstall = ref(() => {}) defineExpose({ - show: (instanceVal, projectVal, projectVersions, callback) => { + show: (instanceVal, projectVal, projectVersions, selected, callback) => { instance.value = instanceVal versions.value = projectVersions - selectedVersion.value = projectVersions[0] + selectedVersion.value = selected ?? projectVersions[0] project.value = projectVal diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js index 4746b9070..034e30a29 100644 --- a/apps/app-frontend/src/store/install.js +++ b/apps/app-frontend/src/store/install.js @@ -29,8 +29,8 @@ export const useInstall = defineStore('installStore', { setIncompatibilityWarningModal(ref) { this.incompatibilityWarningModal = ref }, - showIncompatibilityWarningModal(instance, project, versions, onInstall) { - this.incompatibilityWarningModal.show(instance, project, versions, onInstall) + showIncompatibilityWarningModal(instance, project, versions, selected, onInstall) { + this.incompatibilityWarningModal.show(instance, project, versions, selected, onInstall) }, setModInstallModal(ref) { this.modInstallModal = ref @@ -133,7 +133,13 @@ export const install = async ( callback(version.id) } else { const install = useInstall() - install.showIncompatibilityWarningModal(instance, project, projectVersions, callback) + install.showIncompatibilityWarningModal( + instance, + project, + projectVersions, + version, + callback, + ) } } else { const versions = (await get_version_many(project.versions).catch(handleError)).sort( diff --git a/apps/frontend/nuxt.config.ts b/apps/frontend/nuxt.config.ts index 354bff294..9ca6846ef 100644 --- a/apps/frontend/nuxt.config.ts +++ b/apps/frontend/nuxt.config.ts @@ -143,8 +143,13 @@ export default defineNuxtConfig({ state.lastGenerated && new Date(state.lastGenerated).getTime() + TTL > new Date().getTime() && // ...but only if the API URL is the same - state.apiUrl === API_URL + state.apiUrl === API_URL && + // ...and if no errors were caught during the last generation + (state.errors ?? []).length === 0 ) { + console.log( + "Tags already recently generated. Delete apps/frontend/generated/state.json to force regeneration.", + ); return; }