Skip to content

Commit f7a28ec

Browse files
committed
Lint typescript
1 parent 5aa4e2c commit f7a28ec

15 files changed

+128
-168
lines changed

adminui2/src/api/cluster.ts

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ export function getClusterEvents(): Promise<ClusterEvents> {
66
return client.get('/api/cluster/events').then(res => res.data)
77
}
88

9-
109
export function getClusterMembers(): Promise<ClusterMember[]> {
1110
return client.get('/api/cluster/members').then(res => res.data)
1211
}
13-

adminui2/src/api/groups.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { GroupDTO,GenericResponseDTO } from './types'
1+
import type { GroupDTO, GenericResponseDTO } from './types'
22

33
import { client } from '.'
44

@@ -12,4 +12,4 @@ export function editGroup(updatedGroup: GroupDTO): Promise<GenericResponseDTO> {
1212

1313
export function createGroup(group: GroupDTO): Promise<GenericResponseDTO> {
1414
return client.post('/api/policy/groups', group).then(res => res.data)
15-
}
15+
}

adminui2/src/api/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ client.interceptors.request.use(config => {
88
})
99

1010
export function setCSRFHeader(csrfToken: string, csrfHeaderName: string) {
11-
console.log("setting: ", csrfHeaderName, csrfToken)
11+
console.log('setting: ', csrfHeaderName, csrfToken)
1212
client.defaults.headers.common[csrfHeaderName] = csrfToken
1313
}
1414

adminui2/src/api/rules.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ export function editRule(updatedRule: RuleDTO): Promise<GenericResponseDTO> {
1212

1313
export function createRule(rule: RuleDTO): Promise<GenericResponseDTO> {
1414
return client.post('/api/policy/rules', rule).then(res => res.data)
15-
}
15+
}

adminui2/src/api/types.ts

-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ export interface ClusterMember {
102102
peer_urls: string[]
103103
}
104104

105-
106-
107-
108105
export interface GenericResponseDTO {
109106
message: string
110107
success: boolean

adminui2/src/components/RulesInput.vue

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const props = defineProps<{
88
99
const emit = defineEmits(['update:modelValue'])
1010
11-
const rows = props.rows ?? "3"
11+
const rows = props.rows ?? '3'
1212
1313
const rules = computed({
1414
get: () => props.modelValue,
@@ -17,11 +17,7 @@ const rules = computed({
1717
</script>
1818

1919
<template>
20-
<textarea
21-
class="rules-input textarea textarea-bordered w-full font-mono"
22-
:rows="rows"
23-
v-model="rules"
24-
></textarea>
20+
<textarea class="rules-input textarea textarea-bordered w-full font-mono" :rows="rows" v-model="rules"></textarea>
2521
</template>
2622

2723
<style scoped>

adminui2/src/composables/useTextareaInput.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@ import { ref, computed } from 'vue'
33
export function useTextareaInput() {
44
const Input = ref('')
55
const Arr = computed(() => {
6-
7-
console.log(Input)
8-
if(Input === null) {
9-
return []
10-
}
11-
126
return Input.value
137
.trim()
148
.split(/\n+/)
159
.filter(x => !!x)
1610
.map(x => x.trim())
1711
})
1812
return { Input, Arr }
19-
}
13+
}

adminui2/src/composables/useToastError.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function useToastError() {
1212
errorString = e.message
1313
}
1414

15-
console.log(e, typeof(e))
15+
console.log(e, typeof e)
1616

1717
const paddedPrefixString = prefixString.endsWith(' ') ? prefixString : prefixString + ' '
1818

adminui2/src/layouts/default.vue

+3-7
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const adminPageLinks = [
4040
{ name: 'Manage Users', icon: Icons.User, to: '/admin/users' }
4141
]
4242
43-
4443
async function logout() {
4544
await authStore.logout()
4645
router.push('/login')
@@ -51,13 +50,11 @@ async function logout() {
5150
<div class="drawer lg:drawer-open h-max bg-slate-100">
5251
<input id="my-drawer" type="checkbox" class="drawer-toggle" />
5352
<div class="drawer-content">
54-
5553
<router-view />
5654

5755
<label for="my-drawer-2" class="fixed btn text-neutral-content bg-neutral lg:hidden">
58-
<span class="w-6 text-center"><font-awesome-icon :icon=Icons.Open /></span>
56+
<span class="w-6 text-center"><font-awesome-icon :icon="Icons.Open" /></span>
5957
</label>
60-
6158
</div>
6259
<div class="drawer-side">
6360
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
@@ -117,7 +114,6 @@ async function logout() {
117114

118115
<div class="flex flex-grow"></div>
119116

120-
121117
<ul class="menu justify-self-end">
122118
<li class="hover-bordered" :class="route.path.startsWith('/admin') ? 'bordered' : 'hover-bordered'">
123119
<div class="text-content-neutral dropdown dropdown-top">
@@ -141,7 +137,7 @@ async function logout() {
141137
<div class="text-content-neutral dropdown dropdown-top">
142138
<label tabindex="0" class="col-span-2 w-full cursor-pointer">
143139
<span class="w-6 text-center"><font-awesome-icon :icon="Icons.User" /></span>
144-
<span
140+
<span
145141
>Welcome, <strong>{{ loggedInUser?.username }}</strong></span
146142
>
147143
</label>
@@ -225,4 +221,4 @@ async function logout() {
225221
.tooltip-white-bg::after {
226222
--tooltip-color: white;
227223
}
228-
</style>
224+
</style>

adminui2/src/pages/ClusterEvents.vue

+14-6
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@ const {
6767
<EmptyTable v-if="allEvents.length == 0" text="No events yet" />
6868
</div>
6969
<div class="mt-2 w-full text-center mb-3">
70-
<PaginationControls @next="() => nextEventsPage()" @prev="() => prevEventsPage()"
71-
:current-page="activeEventsPage" :total-pages="totalEventsPages" />
70+
<PaginationControls
71+
@next="() => nextEventsPage()"
72+
@prev="() => prevEventsPage()"
73+
:current-page="activeEventsPage"
74+
:total-pages="totalEventsPages"
75+
/>
7276
</div>
7377
</div>
7478
<div class="card w-1/2 bg-base-100 shadow-xl">
@@ -86,8 +90,12 @@ const {
8690
<EmptyTable v-if="errors.length == 0" text="No errors!" />
8791
</div>
8892
<div class="mt-2 w-full text-center mb-3">
89-
<PaginationControls @next="() => nextErrorsPage()" @prev="() => prevErrorsPage()"
90-
:current-page="activeErrorsPage" :total-pages="totalErrorsPages" />
93+
<PaginationControls
94+
@next="() => nextErrorsPage()"
95+
@prev="() => prevErrorsPage()"
96+
:current-page="activeErrorsPage"
97+
:total-pages="totalErrorsPages"
98+
/>
9199
</div>
92100
</div>
93101
</div>
@@ -96,11 +104,11 @@ const {
96104
</template>
97105

98106
<style scoped>
99-
thead>tr>th {
107+
thead > tr > th {
100108
background: none !important;
101109
}
102110
103-
.first-col-bold>tr td:first-of-type {
111+
.first-col-bold > tr td:first-of-type {
104112
font-weight: bold;
105113
}
106114
</style>

adminui2/src/pages/ClusterMembers.vue

+17-19
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
<script setup lang="ts">
22
import { useToast } from 'vue-toastification'
3-
import { useApi } from '@/composables/useApi';
4-
import { getClusterMembers } from '@/api/cluster';
5-
import type { ClusterMember } from '@/api';
63
7-
import { useAuthStore } from '@/stores/auth'
4+
import { getClusterMembers } from '@/api/cluster'
5+
6+
import { useApi } from '@/composables/useApi'
87
98
9+
import { useAuthStore } from '@/stores/auth'
10+
1011
import { Icons } from '@/util/icons'
1112
13+
import type { ClusterMember } from '@/api'
14+
1215
const { data: members } = useApi(() => getClusterMembers())
1316
1417
const authStore = useAuthStore()
1518
const toast = useToast()
1619
1720
function nodeName(member: ClusterMember): string {
1821
let result = member.name
19-
if (member.name === "") {
20-
result = "Connecting..."
22+
if (member.name === '') {
23+
result = 'Connecting...'
2124
}
2225
2326
if (member.current_node) {
24-
result += " (current node)"
27+
result += ' (current node)'
2528
}
2629
27-
2830
return result
2931
}
30-
31-
3232
</script>
3333

34-
3534
<template>
3635
<main class="w-full p-4">
3736
<h1 class="text-4xl font-bold">Cluster Members</h1>
3837
<div class="mt-6 flex flex-wrap gap-6">
3938
<div class="grid w-full grid-cols-4 gap-4">
40-
4139
<div v-for="member in members" class="card-compact bg-base-100 shadow-xl min-w-96 max-w-96">
4240
<div class="card-body">
4341
<h5 class="card-title overflow-hidden text-ellipsis whitespace-nowrap">{{ nodeName(member) }}</h5>
@@ -50,34 +48,34 @@ function nodeName(member: ClusterMember): string {
5048
<div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ member.version }}</div>
5149

5250
<div>Role:</div>
53-
<div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ member.leader ? "Leader" : member.learner ? "Learner" : member.witness ? "Witness" : "Member" }}</div>
51+
<div class="overflow-hidden text-ellipsis whitespace-nowrap">
52+
{{ member.leader ? 'Leader' : member.learner ? 'Learner' : member.witness ? 'Witness' : 'Member' }}
53+
</div>
5454

5555
<div>Status:</div>
56-
<div class="overflow-hidden text-ellipsis whitespace-nowrap" >{{ member.status }}</div>
56+
<div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ member.status }}</div>
5757

5858
<div>Last Ping:</div>
5959
<div class="overflow-hidden text-ellipsis whitespace-nowrap">{{ member.last_ping }}</div>
6060

61-
<div>{{ member.peer_urls?.length > 1 ? "Addresses" : "Address" }}:</div>
61+
<div>{{ member.peer_urls?.length > 1 ? 'Addresses' : 'Address' }}:</div>
6262
<div class="grid grid-rows-subgrid grid-cols-1">
6363
<div class="overflow-hidden text-ellipsis whitespace-nowrap" v-for="address in member.peer_urls">{{ address }}</div>
6464
</div>
6565
</div>
6666
</div>
6767
</div>
68-
69-
7068
</div>
7169
</div>
7270
</main>
7371
</template>
7472

7573
<style scoped>
76-
thead>tr>th {
74+
thead > tr > th {
7775
background: none !important;
7876
}
7977
80-
.first-col-bold>tr td:first-of-type {
78+
.first-col-bold > tr td:first-of-type {
8179
font-weight: bold;
8280
}
8381
</style>

adminui2/src/pages/Dashboard.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const toast = useToast()
3232
<h1 class="text-4xl font-bold">Dashboard</h1>
3333
<div class="mt-6 flex flex-wrap gap-6">
3434
<div class="flex w-full gap-4">
35-
<div class="flex grid w-1/2 grid-cols-2 gap-4 min-w-[405px]" >
35+
<div class="flex grid w-1/2 grid-cols-2 gap-4 min-w-[405px]">
3636
<router-link to="/users" class="card-compact bg-base-100 shadow-xl">
3737
<div class="card-body">
3838
<h5 class="card-title">Manage MFA</h5>

0 commit comments

Comments
 (0)