Skip to content
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

Jump to bottom

Refactoring: removed references to routeManager global variable from RouteManager … #653

Merged
merged 1 commit into from
Jun 30, 2023
Merged

Refactoring: removed references to routeManager global variable from RouteManager … #653

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
60 changes: 31 additions & 29 deletions src/utils/RouteManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {NavigationFailure, RouteLocationNormalizedLoaded, RouteLocationRaw, Rout
import {Transaction} from "@/schemas/HederaSchemas";
import {NetworkRegistry, networkRegistry} from "@/schemas/NetworkRegistry";
import {computed, ref, watch, WatchStopHandle} from "vue";
import router, {routeManager} from "@/router";
import router from "@/router";
import {AppStorage} from "@/AppStorage";
import {nameServiceSetNetwork} from '@/utils/NameService';
import axios from "axios";
Expand All @@ -44,11 +44,13 @@ export class RouteManager {
axios.defaults.baseURL = this.currentNetworkEntry.value.url
this.updateSelectedNetworkSilently()
this.switchThemes()
RouteManager.resetSingletons()
}, { immediate: true})
watch(this.currentNetwork, () => {
RouteManager.resetSingletons()
})
}

public readonly currentRoute = computed(() => this.router?.currentRoute.value?.name)
public readonly currentRoute = computed(() => this.router.currentRoute.value?.name)

public readonly currentNetwork = computed(() => {
return this.currentNetworkEntry.value.name
Expand All @@ -57,7 +59,7 @@ export class RouteManager {
public readonly currentNetworkEntry = computed(() => {

let networkName: string|null
const networkParam = this.router?.currentRoute.value?.params?.network
const networkParam = this.router.currentRoute.value?.params?.network
if (Array.isArray(networkParam)) {
networkName = networkParam.length >= 1 ? networkParam[0] : null
} else {
Expand All @@ -68,7 +70,7 @@ export class RouteManager {
return networkEntry != null ? networkEntry : networkRegistry.getDefaultEntry()
})

public selectedNetwork = ref(routeManager?.currentNetwork.value)
public selectedNetwork = ref(networkRegistry.getDefaultEntry().name)

public selectedNetworkWatchHandle: WatchStopHandle|undefined

Expand All @@ -85,7 +87,7 @@ export class RouteManager {
})
}

public readonly previousRoute = computed(() => (this.router?.currentRoute.value?.query.from as string))
public readonly previousRoute = computed(() => (this.router.currentRoute.value?.query.from as string))

public readonly isDashboardRoute = computed(() => this.testDashboardRoute())
public readonly isTransactionRoute = computed(() => this.testTransactionRoute())
Expand Down Expand Up @@ -181,7 +183,7 @@ export class RouteManager {
public makeRouteToTransaction(transactionLoc: string|undefined): RouteLocationRaw {
return {
name: 'TransactionDetails',
params: { transactionLoc: transactionLoc, network: routeManager.currentNetwork.value }
params: { transactionLoc: transactionLoc, network: this.currentNetwork.value }
}
}

Expand All @@ -194,7 +196,7 @@ export class RouteManager {
}

public makeRouteToTransactionsById(transactionId: string): RouteLocationRaw {
return {name: 'TransactionsById', params: { transactionId: transactionId, network: routeManager.currentNetwork.value }}
return {name: 'TransactionsById', params: { transactionId: transactionId, network: this.currentNetwork.value }}
}

//
Expand All @@ -204,7 +206,7 @@ export class RouteManager {
public makeRouteToAccount(accountId: string, showApproveDialog = false): RouteLocationRaw {
return {
name: 'AccountDetails',
params: {accountId: accountId, network: routeManager.currentNetwork.value},
params: {accountId: accountId, network: this.currentNetwork.value},
query: {app: showApproveDialog ? 'true' : 'false'}
}
}
Expand All @@ -227,7 +229,7 @@ export class RouteManager {

public makeRouteToAccountsWithKey(pubKey: string): RouteLocationRaw {
return {
name: 'AccountsWithKey', params: {pubKey: pubKey, network: routeManager.currentNetwork.value}
name: 'AccountsWithKey', params: {pubKey: pubKey, network: this.currentNetwork.value}
}
}

Expand All @@ -241,7 +243,7 @@ export class RouteManager {

public makeRouteToAdminKey(accountId: string): RouteLocationRaw {
return {
name: 'AdminKeyDetails', params: {accountId: accountId, network: routeManager.currentNetwork.value}
name: 'AdminKeyDetails', params: {accountId: accountId, network: this.currentNetwork.value}
}
}

Expand All @@ -250,7 +252,7 @@ export class RouteManager {
//

public makeRouteToToken(tokenId: string): RouteLocationRaw {
return { name: 'TokenDetails', params: { tokenId: tokenId, network: routeManager.currentNetwork.value }}
return { name: 'TokenDetails', params: { tokenId: tokenId, network: this.currentNetwork.value }}
}

public routeToToken(tokenId: string, newTab = false): Promise<NavigationFailure | void | undefined> {
Expand All @@ -270,7 +272,7 @@ export class RouteManager {
//

public makeRouteToContract(contractId: string): RouteLocationRaw {
return {name: 'ContractDetails', params: { contractId: contractId, network: routeManager.currentNetwork.value }}
return {name: 'ContractDetails', params: { contractId: contractId, network: this.currentNetwork.value }}
}

public routeToContract(contractId: string, newTab = false): Promise<NavigationFailure | void | undefined> {
Expand All @@ -290,7 +292,7 @@ export class RouteManager {
//

public makeRouteToTopic(topicId: string): RouteLocationRaw {
return {name: 'TopicDetails', params: {topicId: topicId, network: routeManager.currentNetwork.value}}
return {name: 'TopicDetails', params: {topicId: topicId, network: this.currentNetwork.value}}
}

public routeToTopic(topicId: string, newTab = false): Promise<NavigationFailure | void | undefined> {
Expand All @@ -310,7 +312,7 @@ export class RouteManager {
//

public makeRouteToBlock(blockHon: string|number): RouteLocationRaw {
return {name: 'BlockDetails', params: {blockHon: blockHon, network: routeManager.currentNetwork.value}}
return {name: 'BlockDetails', params: {blockHon: blockHon, network: this.currentNetwork.value}}
}

public routeToBlock(blockHon: string|number, newTab = false): Promise<NavigationFailure | void | undefined> {
Expand All @@ -330,7 +332,7 @@ export class RouteManager {
//

public makeRouteToNode(nodeId: number): RouteLocationRaw {
return {name: 'NodeDetails', params: {nodeId: nodeId, network: routeManager.currentNetwork.value}}
return {name: 'NodeDetails', params: {nodeId: nodeId, network: this.currentNetwork.value}}
}

public routeToNode(nodeId: number, newTab = false): Promise<NavigationFailure | void | undefined> {
Expand All @@ -352,7 +354,7 @@ export class RouteManager {
public makeRouteToNoSearchResult(searchedId: string, errorCount: number): RouteLocationRaw {
return {
name: 'NoSearchResult',
params: { searchedId: searchedId, network: routeManager.currentNetwork.value },
params: { searchedId: searchedId, network: this.currentNetwork.value },
query: { errorCount: errorCount }
}
}
Expand All @@ -366,57 +368,57 @@ export class RouteManager {
//

public makeRouteToMainDashboard(): RouteLocationRaw {
return {name: 'MainDashboard', params: { network: routeManager.currentNetwork.value } }
return {name: 'MainDashboard', params: { network: this.currentNetwork.value } }
}

public routeToMainDashboard(): Promise<NavigationFailure | void | undefined> {
return this.router.push(this.makeRouteToMainDashboard())
}

public makeRouteToTransactions(): RouteLocationRaw {
return {name: 'Transactions', params: { network: routeManager.currentNetwork.value } }
return {name: 'Transactions', params: { network: this.currentNetwork.value } }
}

public makeRouteToTokens(): RouteLocationRaw {
return {name: 'Tokens', params: { network: routeManager.currentNetwork.value } }
return {name: 'Tokens', params: { network: this.currentNetwork.value } }
}

public makeRouteToTopics(): RouteLocationRaw {
return {name: 'Topics', params: { network: routeManager.currentNetwork.value } }
return {name: 'Topics', params: { network: this.currentNetwork.value } }
}

public makeRouteToContracts(): RouteLocationRaw {
return {name: 'Contracts', params: { network: routeManager.currentNetwork.value } }
return {name: 'Contracts', params: { network: this.currentNetwork.value } }
}

public makeRouteToAccounts(): RouteLocationRaw {
return {name: 'Accounts', params: { network: routeManager.currentNetwork.value } }
return {name: 'Accounts', params: { network: this.currentNetwork.value } }
}

public makeRouteToNodes(): RouteLocationRaw {
return {name: 'Nodes', params: { network: routeManager.currentNetwork.value } }
return {name: 'Nodes', params: { network: this.currentNetwork.value } }
}

public makeRouteToStaking(): RouteLocationRaw {
return {name: 'Staking', params: { network: routeManager.currentNetwork.value } }
return {name: 'Staking', params: { network: this.currentNetwork.value } }
}

public makeRouteToBlocks(): RouteLocationRaw {
return {name: 'Blocks', params: { network: routeManager.currentNetwork.value } }
return {name: 'Blocks', params: { network: this.currentNetwork.value } }
}

public makeRouteToMobileSearch(): RouteLocationRaw {
return {name: 'MobileSearch', params: { network: routeManager.currentNetwork.value } }
return {name: 'MobileSearch', params: { network: this.currentNetwork.value } }
}

public makeRouteToPageNotFound(): RouteLocationRaw {
return {name: 'PageNotFound', params: { network: routeManager.currentNetwork.value } }
return {name: 'PageNotFound', params: { network: this.currentNetwork.value } }
}

public makeRouteToMobileMenu(name: unknown): RouteLocationRaw {
return {
name: 'MobileMenu',
params: {network: routeManager.currentNetwork.value},
params: {network: this.currentNetwork.value},
query: {from: name as string}
}
}
Expand Down