Skip to content

Commit 9827ebf

Browse files
AchoArnoldAchoArnold
committed
Fix ESLINT warnings
1 parent 78e1013 commit 9827ebf

6 files changed

Lines changed: 30 additions & 22 deletions

File tree

‎api/pkg/validators/bulk_message_handler_validator.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212

1313
"github.com/xuri/excelize/v2"
1414

15+
"github.com/NdoleStudio/httpsms/pkg/cache"
1516
"github.com/NdoleStudio/httpsms/pkg/entities"
1617
"github.com/NdoleStudio/httpsms/pkg/repositories"
1718
"github.com/NdoleStudio/httpsms/pkg/requests"
1819
"github.com/NdoleStudio/httpsms/pkg/services"
1920
"github.com/NdoleStudio/httpsms/pkg/telemetry"
20-
"github.com/NdoleStudio/httpsms/pkg/cache"
2121
"github.com/dustin/go-humanize"
2222
"github.com/jszwec/csvutil"
2323
"github.com/nyaruka/phonenumbers"
@@ -123,6 +123,7 @@ func (v *BulkMessageHandlerValidator) parseXlsx(ctxLogger telemetry.Logger, user
123123
result.Add("document", fmt.Sprintf("Cannot parse the uploaded excel file with name [%s].", header.Filename))
124124
return nil, result
125125
}
126+
defer excel.Close()
126127

127128
rows, err := excel.GetRows(excel.GetSheetName(0))
128129
if err != nil {
@@ -212,14 +213,14 @@ func (v *BulkMessageHandlerValidator) parseCSV(ctxLogger telemetry.Logger, user
212213
var messages []*requests.BulkMessage
213214
if err := csvutil.Unmarshal(content, &messages); err != nil {
214215
ctxLogger.Error(stacktrace.Propagate(err, fmt.Sprintf("cannot unmarshall contents [%s] into type [%T] for file [%s] and user [%s]", content, messages, header.Filename, user.ID)))
215-
result.Add("document", fmt.Sprintf("Cannot read the conents of the uploaded file [%s].", header.Filename))
216+
result.Add("document", fmt.Sprintf("Cannot read the contents of the uploaded file [%s].", header.Filename))
216217
return nil, result
217218
}
218219

219220
return messages, url.Values{}
220221
}
221222

222-
func (v *BulkMessageHandlerValidator) validateMessages(ctx context.Context, messages []*requests.BulkMessage) url.Values {
223+
func (v *BulkMessageHandlerValidator) validateMessages(_ context.Context, messages []*requests.BulkMessage) url.Values {
223224
result := url.Values{}
224225
for index, message := range messages {
225226

@@ -251,7 +252,6 @@ func (v *BulkMessageHandlerValidator) validateMessages(ctx context.Context, mess
251252
}
252253
}
253254
}
254-
}
255255

256256
if _, err := phonenumbers.Parse(message.FromPhoneNumber, phonenumbers.UNKNOWN_REGION); err != nil {
257257
result.Add("document", fmt.Sprintf("Row [%d]: The FromPhoneNumber [%s] is not a valid E.164 phone number", index+2, message.FromPhoneNumber))

‎web/models/api.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable */
2-
/* tslint:disable */
31
// @ts-nocheck
42
/*
53
* ---------------------------------------------------------------

‎web/pages/messages/index.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ export default {
106106
107107
let contentType = 'application/octet-stream'
108108
const lowerUrl = cleanUrl.toLowerCase()
109-
if (lowerUrl.endsWith('.jpg') || lowerUrl.endsWith('.jpeg')) contentType = 'image/jpeg'
109+
if (lowerUrl.endsWith('.jpg') || lowerUrl.endsWith('.jpeg'))
110+
contentType = 'image/jpeg'
110111
else if (lowerUrl.endsWith('.png')) contentType = 'image/png'
111112
else if (lowerUrl.endsWith('.gif')) contentType = 'image/gif'
112113
else if (lowerUrl.endsWith('.mp4')) contentType = 'video/mp4'
@@ -120,7 +121,7 @@ export default {
120121
to: this.formPhoneNumber,
121122
from: this.$store.getters.getOwner,
122123
content: this.formContent,
123-
attachments: attachments,
124+
attachments,
124125
sim: this.simSelected.code,
125126
})
126127
.then(() => {

‎web/pages/phone-api-keys/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<v-col cols="12" md="9" offset-md="1" xl="8" offset-xl="2">
2525
<div class="d-flex mt-3 mb-4">
2626
<v-progress-circular
27+
v-if="loading"
2728
:size="24"
2829
:width="2"
29-
v-if="loading"
3030
color="primary"
3131
class="mt-2 mr-2"
3232
indeterminate

‎web/pages/settings/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ import {
828828
mdiSquareEditOutline,
829829
mdiQrcode,
830830
} from '@mdi/js'
831-
import QRCode from 'qrcode'
831+
import { toCanvas } from 'qrcode'
832832
import { ErrorMessages } from '~/plugins/errors'
833833
import LoadingButton from '~/components/LoadingButton.vue'
834834
@@ -955,7 +955,7 @@ export default Vue.extend({
955955
generateQrCode(text) {
956956
const canvas = this.$refs.qrCodeCanvas
957957
if (canvas) {
958-
QRCode.toCanvas(canvas, text, { errorCorrectionLevel: 'H' }, (err) => {
958+
toCanvas(canvas, text, { errorCorrectionLevel: 'H' }, (err) => {
959959
if (err) {
960960
this.$store.dispatch('addNotification', {
961961
message: 'Failed to generate API key QR code',

‎web/pages/threads/_id/index.vue‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,8 @@
173173
>
174174
</v-card-text>
175175
</v-card>
176-
<v-card
177-
v-if="message.attachments?.length"
178-
shaped
179-
>
180-
<v-card-title>Message Attachments</v-card-title>
176+
<v-card v-if="message.attachments?.length" shaped>
177+
<v-card-title>Message Attachments</v-card-title>
181178
<v-card-text>
182179
<v-row>
183180
<v-col
@@ -195,19 +192,31 @@
195192
class="bg-grey-lighten-2 rounded"
196193
cover
197194
>
198-
<template v-slot:placeholder>
199-
<v-row class="fill-height ma-0" align="center" justify="center">
195+
<template #placeholder>
196+
<v-row
197+
class="fill-height ma-0"
198+
align="center"
199+
justify="center"
200+
>
200201
<v-progress-circular
201202
indeterminate
202203
color="grey-lighten-1"
203204
></v-progress-circular>
204205
</v-row>
205206
</template>
206207
</v-img>
207-
208-
<div v-else class="text-center pa-4 bg-grey-lighten-4 rounded">
209-
<v-icon icon="mdi-file-document-outline" size="large"></v-icon>
210-
<div class="text-caption mt-2">Unsupported file type</div>
208+
209+
<div
210+
v-else
211+
class="text-center pa-4 bg-grey-lighten-4 rounded"
212+
>
213+
<v-icon
214+
icon="mdi-file-document-outline"
215+
size="large"
216+
></v-icon>
217+
<div class="text-caption mt-2">
218+
Unsupported file type
219+
</div>
211220
</div>
212221
</v-col>
213222
</v-row>

0 commit comments

Comments
 (0)