Skip to content

Commit 0549c22

Browse files
committed
Fix several ts-expect-error
1 parent c412cd3 commit 0549c22

1 file changed

Lines changed: 18 additions & 33 deletions

File tree

  • src/apps/legacy/controllers/session/login

src/apps/legacy/controllers/session/login/index.js

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function authenticateUserByName(page, apiClient, url, username, password) {
4848

4949
onLoginSuccessful(user.Id, result.AccessToken, apiClient, url);
5050
},
51-
/** @param {{ status: number}} response */
51+
/** @param {{ status: number }} response */
5252
function (response) {
5353
// @ts-expect-error
5454
page.querySelector('#txtManualPassword').value = '';
@@ -73,6 +73,7 @@ function authenticateUserByName(page, apiClient, url, username, password) {
7373
*/
7474
function authenticateQuickConnect(apiClient, targetUrl) {
7575
const url = apiClient.getUrl('/QuickConnect/Initiate');
76+
// TODO: I don't think the `true` in ajax() does anything here since it's never used in src/utils/fetch.js:84
7677
// @ts-expect-error
7778
apiClient.ajax({ type: 'POST', url }, true).then(res => res.json()).then(function (json) {
7879
if (!json.Secret || !json.Code) {
@@ -157,12 +158,9 @@ function onLoginSuccessful(id, accessToken, apiClient, url) {
157158
function showManualForm(context, showCancel, focusPassword) {
158159
// @ts-expect-error
159160
context.querySelector('.chkRememberLogin').checked = appSettings.enableAutoLogin();
160-
// @ts-expect-error
161-
context.querySelector('.manualLoginForm').classList.remove('hide');
162-
// @ts-expect-error
163-
context.querySelector('.visualLoginForm').classList.add('hide');
164-
// @ts-expect-error
165-
context.querySelector('.btnManual').classList.add('hide');
161+
/** @type {Element} */ (context.querySelector('.manualLoginForm')).classList.remove('hide');
162+
/** @type {Element} */ (context.querySelector('.visualLoginForm')).classList.add('hide');
163+
/** @type {Element} */ (context.querySelector('.btnManual')).classList.add('hide');
166164

167165
if (focusPassword) {
168166
// @ts-expect-error
@@ -173,11 +171,9 @@ function showManualForm(context, showCancel, focusPassword) {
173171
}
174172

175173
if (showCancel) {
176-
// @ts-expect-error
177-
context.querySelector('.btnCancel').classList.remove('hide');
174+
/** @type {Element} */ (context.querySelector('.btnCancel')).classList.remove('hide');
178175
} else {
179-
// @ts-expect-error
180-
context.querySelector('.btnCancel').classList.add('hide');
176+
/** @type {Element} */ (context.querySelector('.btnCancel')).classList.add('hide');
181177
}
182178
}
183179

@@ -235,8 +231,7 @@ function loadUserList(context, apiClient, users) {
235231
html += '</button>';
236232
}
237233

238-
// @ts-expect-error
239-
context.querySelector('#divUsers').innerHTML = html;
234+
/** @type {Element} */ (context.querySelector('#divUsers')).innerHTML = html;
240235
}
241236

242237
/**
@@ -269,21 +264,17 @@ export default function (view, params) {
269264
}
270265

271266
function showVisualForm() {
272-
// @ts-expect-error
273-
view.querySelector('.visualLoginForm').classList.remove('hide');
274-
// @ts-expect-error
275-
view.querySelector('.manualLoginForm').classList.add('hide');
276-
// @ts-expect-error
277-
view.querySelector('.btnManual').classList.remove('hide');
267+
/** @type {Element} */ (view.querySelector('.visualLoginForm')).classList.remove('hide');
268+
/** @type {Element} */ (view.querySelector('.manualLoginForm')).classList.add('hide');
269+
/** @type {Element} */ (view.querySelector('.btnManual')).classList.remove('hide');
278270

279271
import('components/autoFocuser').then(({ default: autoFocuser }) => {
280272
autoFocuser.autoFocus(view);
281273
});
282274
}
283275

284276
// On user selected one of the user cards
285-
// @ts-expect-error
286-
view.querySelector('#divUsers').addEventListener('click', function (e) {
277+
/** @type {Element} */ (view.querySelector('#divUsers')).addEventListener('click', function (e) {
287278
const card = dom.parentWithClass(/** @type {HTMLElement} */ (e.target), 'card');
288279
const cardContent = card ? card.querySelector('.cardContent') : null;
289280

@@ -308,8 +299,7 @@ export default function (view, params) {
308299
}
309300
}
310301
});
311-
// @ts-expect-error
312-
view.querySelector('.manualLoginForm').addEventListener('submit', function (e) {
302+
/** @type {Element} */ (view.querySelector('.manualLoginForm')).addEventListener('submit', function (e) {
313303
// @ts-expect-error
314304
appSettings.enableAutoLogin(view.querySelector('.chkRememberLogin').checked);
315305
authenticateUserByName(
@@ -322,25 +312,20 @@ export default function (view, params) {
322312
e.preventDefault();
323313
return false;
324314
});
325-
// @ts-expect-error
326-
view.querySelector('.btnForgotPassword').addEventListener('click', function () {
315+
/** @type {Element} */ (view.querySelector('.btnForgotPassword')).addEventListener('click', function () {
327316
Dashboard.navigate('forgotpassword');
328317
});
329-
// @ts-expect-error
330-
view.querySelector('.btnCancel').addEventListener('click', showVisualForm);
331-
// @ts-expect-error
332-
view.querySelector('.btnQuick').addEventListener('click', function () {
318+
/** @type {Element} */ (view.querySelector('.btnCancel')).addEventListener('click', showVisualForm);
319+
/** @type {Element} */ (view.querySelector('.btnQuick')).addEventListener('click', function () {
333320
authenticateQuickConnect(getApiClient(), getTargetUrl());
334321
return false;
335322
});
336-
// @ts-expect-error
337-
view.querySelector('.btnManual').addEventListener('click', function () {
323+
/** @type {Element} */ (view.querySelector('.btnManual')).addEventListener('click', function () {
338324
// @ts-expect-error
339325
view.querySelector('#txtManualName').value = '';
340326
showManualForm(view, true);
341327
});
342-
// @ts-expect-error
343-
view.querySelector('.btnSelectServer').addEventListener('click', function () {
328+
/** @type {Element} */ (view.querySelector('.btnSelectServer')).addEventListener('click', function () {
344329
Dashboard.selectServer();
345330
});
346331

0 commit comments

Comments
 (0)