Skip to content

Show "Importing..." while importing #10059

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
vaisest wants to merge 1 commit into
base: dev
Choose a base branch
from
+10 −6
Open

Show "Importing..." while importing #10059

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
16 changes: 10 additions & 6 deletions src/Classes/ImportTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ local function addOAuthControls(self)
--- @type table<string, table[]>
self.characterList = {}

local function fetchButtonEnabled()
local realm = self.controls.accountRealm:GetSelValue()
return not (realm and self.characterList[realm.realmCode])
end
local function charImportStatus()
if not self.isAuthorized() and not self.oauthTimer then
return colorCodes.WARNING .. "Not authenticated"
Expand All @@ -59,7 +63,7 @@ local function addOAuthControls(self)
end
return colorCodes.WARNING .. string.format("You're doing that too fast. Please wait (%d)", timeLeft)
elseif self.isAuthorized() and self.oauthLoading then
return "Fetching..."
return fetchButtonEnabled() and "Fetching..." or "Importing..."
elseif self.isAuthorized() then
return "Authenticated"
end
Expand Down Expand Up @@ -204,10 +208,6 @@ local function addOAuthControls(self)
end
return "Fetch Characters"
end
local function fetchButtonEnabled()
local realm = self.controls.accountRealm:GetSelValue()
return not (realm and self.characterList[realm.realmCode])
end
self.controls.accountRealmFetchButton = new("ButtonControl", { "LEFT", self.controls.accountRealm, "RIGHT" },
{ labelSpacing, 0, 130, 20 }, fetchTextFunc, fetchCharacters)
self.controls.accountRealmFetchButton.enabled = fetchButtonEnabled
Expand Down Expand Up @@ -264,13 +264,16 @@ local function addOAuthControls(self)
self.oauthErrCode = "Could not import character"
end
end
self.oauthLoading = false
end
if self.build.spec:CountAllocNodes() > 0 then
main:OpenConfirmPopup("Character Import", "Importing the passive tree will overwrite your current tree.",
"Import", function()
self.oauthLoading = true
main.api:DownloadCharacter(realm.realmCode, selectedName, importHandler)
end)
else
self.oauthLoading = true
main.api:DownloadCharacter(realm.realmCode, selectedName, importHandler)
end
end)
Expand All @@ -287,6 +290,7 @@ local function addOAuthControls(self)

saveDetails(realm.id, league, selectedName)

self.oauthLoading = true
main.api:DownloadCharacter(realm.realmCode, selectedName, function(data, errMsg)
local clearItems = self.controls.charImportItemsClearItems.state
local clearSkills = self.controls.charImportItemsClearSkills.state
Expand All @@ -301,7 +305,7 @@ local function addOAuthControls(self)
self.oauthErrCode = "Could not import character"
end
end

self.oauthLoading = false
end)
end)
self.controls.charImportItems.enabled = function()
Expand Down
Loading