feat(KAN-69): open saved native workspace directly in dashboard
CI/CD / preconditions (pull_request) Successful in 2s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m17s
CI/CD / test_and_check_app (pull_request) Successful in 6m24s
CI/CD / Publish immutable image (pull_request) Skipped
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m27s
CI/CD / preconditions (pull_request) Successful in 2s
Native JavaScript checks / Native launcher and release tests (pull_request) Successful in 1m17s
CI/CD / test_and_check_app (pull_request) Successful in 6m24s
CI/CD / Publish immutable image (pull_request) Skipped
macOS checks / Native Rust tests and unsigned build (pull_request) Successful in 1m27s
This commit is contained in:
+54
@@ -5,6 +5,7 @@ import android.os.SystemClock
|
||||
import android.view.InputDevice
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.webkit.CookieManager
|
||||
import android.webkit.WebView
|
||||
import androidx.lifecycle.Lifecycle
|
||||
@@ -59,6 +60,59 @@ class PlatformTest {
|
||||
instrumentation.waitForIdleSync()
|
||||
}
|
||||
|
||||
@Test fun coldStartRestoresWorkspaceWithoutSelectionOrLauncherHistory() {
|
||||
val mode = InstrumentationRegistry.getArguments().getString("startupConfig", "saved")
|
||||
val preferences = instrumentation.targetContext.getSharedPreferences("workspace", Context.MODE_PRIVATE)
|
||||
preferences.edit().clear().apply {
|
||||
if (mode == "saved") putString("server", "https://127.0.0.1:9/app/")
|
||||
if (mode == "invalid") putString("server", "http://invalid.example/")
|
||||
}.commit()
|
||||
val scenario = ActivityScenario.launch(MainActivity::class.java)
|
||||
val launcher = AtomicReference<WebView>()
|
||||
fun findLauncher(view: View): WebView? {
|
||||
if (view is WebView && view.url?.startsWith(NavigationPolicy.LAUNCHER_ORIGIN) == true) return view
|
||||
if (view is ViewGroup) for (index in 0 until view.childCount) {
|
||||
findLauncher(view.getChildAt(index))?.let { return it }
|
||||
}
|
||||
return null
|
||||
}
|
||||
waitFor {
|
||||
scenario.onActivity { launcher.set(findLauncher(it.window.decorView)) }
|
||||
launcher.get() != null && evaluate(launcher.get(), "typeof window.updateLauncher === 'function'") == "true"
|
||||
}
|
||||
if (mode == "saved") {
|
||||
waitFor {
|
||||
val state = evaluate(launcher.get(), "document.querySelector('#connection-status').dataset.state")
|
||||
if (state == "\"connecting\"") {
|
||||
assertEquals("true", evaluate(launcher.get(), "document.querySelector('#workspace-settings').hidden"))
|
||||
}
|
||||
state == "\"connectionError\""
|
||||
}
|
||||
assertEquals("https://127.0.0.1:9/app/", preferences.getString("server", null))
|
||||
assertEquals("\"Try again\"", evaluate(launcher.get(), "document.querySelector('.open-workspace').textContent"))
|
||||
scenario.onActivity {
|
||||
assertEquals("https://127.0.0.1:9/app/dashboard", it.workspace?.originalUrl)
|
||||
assertFalse(it.workspace!!.canGoBack())
|
||||
it.openWorkspace("https://127.0.0.1:9/app/")
|
||||
}
|
||||
waitFor { evaluate(launcher.get(), "document.querySelector('#connection-status').dataset.state") == "\"connectionError\"" }
|
||||
} else {
|
||||
waitFor { evaluate(launcher.get(), "document.querySelector('#workspace-settings').hidden") == "false" }
|
||||
scenario.onActivity { assertNull(it.workspace) }
|
||||
}
|
||||
scenario.onActivity { it.openWorkspace("https://kanbangit.de/") }
|
||||
val remote = AtomicReference<WebView>()
|
||||
waitFor {
|
||||
var visible = false
|
||||
scenario.onActivity { remote.set(it.workspace); visible = it.workspace?.visibility == View.VISIBLE }
|
||||
visible && remote.get() != null
|
||||
}
|
||||
assertEquals("\"/login\"", evaluate(remote.get(), "location.pathname"))
|
||||
assertEquals("1", evaluate(remote.get(), "history.length"))
|
||||
assertEquals("https://kanbangit.de/", preferences.getString("server", null))
|
||||
scenario.moveToState(Lifecycle.State.CREATED)
|
||||
}
|
||||
|
||||
@Test fun workspacePreservesFormsAndIsolatesServers() {
|
||||
instrumentation.targetContext.getSharedPreferences("workspace", Context.MODE_PRIVATE).edit().clear().commit()
|
||||
val scenario = ActivityScenario.launch(MainActivity::class.java)
|
||||
|
||||
@@ -164,9 +164,9 @@ class MainActivity : TauriActivity() {
|
||||
if (initialized) return
|
||||
initialized = true
|
||||
val saved = preferences.getString("server", null)
|
||||
server = saved?.let(NavigationPolicy::installation) ?: NavigationPolicy.DEFAULT_SERVER
|
||||
updateLauncher()
|
||||
if (saved != null) openWorkspace(server)
|
||||
val restored = saved?.let(NavigationPolicy::installation)
|
||||
server = restored ?: NavigationPolicy.DEFAULT_SERVER
|
||||
if (restored != null) openWorkspace(restored) else updateLauncher()
|
||||
}
|
||||
"/action/open" -> openWorkspace(url.getQueryParameter("server").orEmpty())
|
||||
"/action/resume" -> if (ready) showWorkspace()
|
||||
@@ -313,8 +313,8 @@ class MainActivity : TauriActivity() {
|
||||
val firstLoad = !ready
|
||||
ready = true
|
||||
CookieManager.getInstance().flush()
|
||||
updateLauncher()
|
||||
if (firstLoad) showWorkspace()
|
||||
updateLauncher()
|
||||
}
|
||||
|
||||
override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
|
||||
@@ -333,7 +333,7 @@ class MainActivity : TauriActivity() {
|
||||
remote.visibility = View.GONE
|
||||
content.addView(remote, 0, FrameLayout.LayoutParams(-1, -1))
|
||||
startTimeout(remote)
|
||||
remote.loadUrl(server)
|
||||
remote.loadUrl(NavigationPolicy.dashboard(server))
|
||||
}
|
||||
|
||||
private fun startTimeout(view: WebView) {
|
||||
|
||||
+2
@@ -21,6 +21,8 @@ object NavigationPolicy {
|
||||
"https://${uri.host.lowercase(Locale.ROOT)}$port$path"
|
||||
}.getOrNull()
|
||||
|
||||
fun dashboard(server: String): String = URI(requireNotNull(installation(server))).resolve("dashboard").toString()
|
||||
|
||||
fun allows(server: String, destination: String): Boolean = runCatching {
|
||||
val base = URI(server)
|
||||
val target = URI(destination)
|
||||
|
||||
+5
@@ -12,6 +12,11 @@ class NavigationPolicyTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test fun startupTargetsDashboardWithinTheInstallation() {
|
||||
assertEquals("https://example.com/dashboard", NavigationPolicy.dashboard("https://example.com/"))
|
||||
assertEquals("https://example.com:8443/kanban/dashboard", NavigationPolicy.dashboard("https://example.com:8443/kanban/"))
|
||||
}
|
||||
|
||||
@Test fun allowsLoginTwoFactorAndHistoryOnlyOnTheSelectedOrigin() {
|
||||
val server = "https://example.com:8443/app/"
|
||||
for (path in listOf("/login", "/two-factor-challenge", "/projects/1?ticket=53#details")) {
|
||||
|
||||
Reference in New Issue
Block a user