Skip to content

Commit 09199bc

Browse files
committed
fix-lint: lint: prettify and fix lint issues
1 parent 7e95b2e commit 09199bc

File tree

14 files changed

+86
-85
lines changed

14 files changed

+86
-85
lines changed

app/src/components/app/item-list.vue

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<section class="position-relative d-flex">
104104
<div
105105
class="ms-3"
106-
ref="twocolumns"
106+
ref="twoColumns"
107107
>
108108
<table class="mb-0 position-relative table table-hover table-bordered">
109109
<thead>
@@ -141,7 +141,7 @@
141141
</tr>
142142
</thead>
143143

144-
<tbody ref="metatbody">
144+
<tbody ref="metaTableBody">
145145
<tr
146146
:class="{ 'table-primary': find(item) > -1 }"
147147
v-for="item in items"
@@ -236,7 +236,7 @@
236236
@click="(e) => handleItemSelect(e, item)"
237237
>
238238
<td
239-
v-for="(key, index) in headers.slice(1)"
239+
v-for="key in headers.slice(1)"
240240
:key="key"
241241
>
242242
<div>{{ item[key] }}</div>
@@ -250,7 +250,7 @@
250250
<div
251251
class="scrollbar-container overflow-x-scroll sticky-bottom me-3"
252252
@scroll="handleScroll"
253-
ref="scrollcontainer"
253+
ref="scrollContainer"
254254
>
255255
<hr
256256
ref="scrollbar"
@@ -351,7 +351,7 @@
351351
});
352352
353353
const router = useRouter();
354-
const store: any = inject("store");
354+
const store = inject("store") as any;
355355
const emit = defineEmits(["reset", "unselect"]);
356356
357357
const sort = reactive({
@@ -403,7 +403,7 @@
403403
});
404404
};
405405
406-
const setSort = (key: any) => {
406+
const setSort = (key: string) => {
407407
const index = SORTS.findIndex((order) => order === sort.order);
408408
409409
if (sort.key === key) {
@@ -416,16 +416,15 @@
416416
/* SORT */
417417
418418
/* SCROLL */
419-
const row = ref(null);
420419
const table = ref(null);
421420
const tbody = ref(null);
422421
const scrollbar = ref(null);
423-
const twocolumns = ref(null);
422+
const twoColumns = ref(null);
424423
const tableContainer = ref(null);
425-
const scrollcontainer = ref(null);
424+
const scrollContainer = ref(null);
426425
const tableHeaderContainer = ref(null);
427426
428-
const metatbody = ref(null);
427+
const metaTableBody = ref(null);
429428
430429
watchEffect(() => {
431430
if (props.isSelected) {
@@ -441,7 +440,7 @@
441440
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
442441
//@ts-ignore
443442
scrollbar.value.style.width = `${+table.value.scrollWidth}px`;
444-
scrollcontainer.value.style.marginLeft = `${+twocolumns.value.scrollWidth + 14}px`;
443+
scrollContainer.value.style.marginLeft = `${+twoColumns.value.scrollWidth + 14}px`;
445444
});
446445
},
447446
);
@@ -461,22 +460,22 @@
461460
() => items.value,
462461
async () => {
463462
await nextTick(() => {
464-
const metarows = metatbody.value?.getElementsByTagName("tr")?.[0];
465-
const metacells = metarows?.getElementsByTagName("td");
463+
const metaRows = metaTableBody.value?.getElementsByTagName("tr")?.[0];
464+
const metaCells = metaRows?.getElementsByTagName("td");
466465
467466
const rows = tbody.value?.getElementsByTagName("tr")?.[0];
468467
const cells = rows?.getElementsByTagName("td");
469468
470-
if (cells && metacells) {
471-
widths.value = [...metacells, ...cells].map((td) => td.getBoundingClientRect()?.width);
469+
if (cells && metaCells) {
470+
widths.value = [...metaCells, ...cells].map((td) => td.getBoundingClientRect()?.width);
472471
}
473472
});
474473
},
475474
);
476475
/* RESIZE */
477476
478477
const handleScrollbarPosition = throttle((event) => {
479-
scrollcontainer.value?.scroll({ left: event.target.scrollLeft });
478+
scrollContainer.value?.scroll({ left: event.target.scrollLeft });
480479
tableHeaderContainer.value?.scroll({ left: event.target.scrollLeft });
481480
}, 0.5);
482481
@@ -530,7 +529,7 @@
530529
};
531530
};
532531
533-
const find = (item: any) => {
532+
const find = (item: Record<string, any>) => {
534533
const index = selectedItems.value.findIndex((_item) => {
535534
const pkMatch = pk.value ? _item[pk.value.AttributeName] === item[pk.value.AttributeName] : true;
536535
@@ -542,7 +541,7 @@
542541
return index;
543542
};
544543
545-
const select = (item: any) => {
544+
const select = (item: Record<string, any>) => {
546545
emit("unselect");
547546
548547
const index = find(item);
@@ -619,8 +618,6 @@
619618
const offcanvas = (item) => {
620619
const bsOffcanvas = new bootstrap.Offcanvas(offcanvasRef.value);
621620
622-
const href = handleItem(item);
623-
624621
codeMirrorRef.value.dispatch({
625622
changes: {
626623
from: 0,

app/src/views/items/CreateItem.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
<script lang="ts">
8989
import * as bootstrap from "bootstrap";
9090
91-
import * as CodeMirror from "codemirror";
92-
9391
import { useRoute, useRouter } from "vue-router";
9492
import { inject, onMounted, reactive, ref, watch } from "vue";
9593

app/src/views/items/HomeTable.vue

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@
290290
import { scanItems, queryItems, countItems } from "@/services/item";
291291
import { generateDynamodbParameters } from "@/utils/table";
292292
293-
import type table from "@/store/table";
294-
295293
import ItemList from "@/components/app/item-list.vue";
296294
import TableList from "@/components/app/table-list.vue";
297295
import TableFilter from "@/components/app/table-filter.vue";
@@ -301,7 +299,7 @@
301299
302300
const route = useRoute();
303301
const router = useRouter();
304-
const store: any = inject("store");
302+
const store = inject("store") as any;
305303
306304
const toastRef = ref(null);
307305
const toast = reactive({
@@ -345,9 +343,10 @@
345343
346344
store.dynamodb.setters.init({ ...dynamodb, ...data });
347345
store.ui.setters.setTable(table, [...rows, ...data.Items], data.Count, data.ScannedCount);
348-
} catch (error: any) {
346+
} catch (error: unknown) {
347+
const err = error as any;
349348
toast.className = "text-bg-danger";
350-
toast.message = error.response.data.message ?? error.message;
349+
toast.message = err.response?.data?.message ?? err.message;
351350
const toastEl = new bootstrap.Toast(toastRef.value, { delay: 5000 });
352351
setTimeout(() => toastEl.show(), 0);
353352
}
@@ -425,7 +424,7 @@
425424
if (!tableName) return;
426425
427426
// @TABLE
428-
const [old_tableName, old_limit, old_page, old_parameters, old_indexName, old_requestId] = oldValues ?? [];
427+
const [old_tableName, , , old_parameters, old_indexName, old_requestId] = oldValues ?? [];
429428
430429
{
431430
if (tableName !== old_tableName) {
@@ -451,8 +450,6 @@
451450
if (old_parameters !== _parameters || old_indexName !== _indexName || old_requestId !== requestId) {
452451
const parameters = JSON.parse(decodeURIComponent(_parameters?.toString() ?? "{}"));
453452
454-
const dynamodb = { ...store.dynamodb.state };
455-
456453
const dynamodbParameters = generateDynamodbParameters({
457454
parameters,
458455
table: store.table.state.Table,

app/src/views/table/TableTTL.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@
107107
import { TTL } from "@/constants/dynamodb";
108108
import { useRoute, useRouter } from "vue-router";
109109
import { getTableTTL, updateTableTTL } from "@/services/table";
110-
import { computed, inject, onBeforeMount, reactive, ref } from "vue";
110+
import { inject, onBeforeMount, reactive, ref } from "vue";
111111
112112
const route = useRoute();
113113
const router = useRouter();
114-
const store: any = inject("store");
114+
const store = inject("store") as any;
115115
116116
const ttl = reactive({
117117
TimeToLiveSpecification: {
@@ -139,8 +139,6 @@
139139
}
140140
};
141141
142-
const reset = () => {};
143-
144142
const toastRef = ref();
145143
const toast = reactive({ className: "", message: "" });
146144

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
"yarn app:prettify"
2020
],
2121
"server/**/*.{js,jsx,ts,tsx}": [
22-
"yarn server:prettify",
23-
"yarn server:lint"
22+
"yarn server:prettify"
2423
]
2524
},
2625
"devDependencies": {

server/src/constants/event.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const EVENTS = {
1+
const EVENTS = {
22
BEGIN: "BEGIN",
33
SUCCESS: "SUCCESS",
44
FAILURE: "FAILURE",
@@ -7,3 +7,5 @@ export const EVENTS = {
77
ACK: "ACK",
88
PROGRESS: "PROGRESS",
99
};
10+
11+
export default EVENTS;

server/src/controllers/database.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import EventEmitter from "events";
22
import AWS from "../config/aws";
33
import DatabaseServiceProvider from "../services/database.service";
4-
import { EVENTS } from "../constants/event";
4+
import EVENTS from "../constants/event";
55

66
const eventEmitter = new EventEmitter();
77

server/src/controllers/item.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { OPERATIONS } from "../constants/dynamodb";
2-
import { isPartialMatchWith } from "../utils/object";
2+
import isPartialMatchWith from "../utils/object";
33
import ItemServiceProvider from "../services/item.service";
44

55
const ItemService = new ItemServiceProvider();

server/src/errors/handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default function (error, _req, res, _next) {
1+
export default function errorHandler(error, _req, res, _next) {
22
console.error(error);
33

44
if (error.isJoi) {

server/src/services/database.service.js

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AWS } from "../config/aws";
2-
import { EVENTS } from "../constants/event";
2+
import EVENTS from "../constants/event";
33

44
import ItemServiceProvider from "./item.service";
55
import TableServiceProvider from "./table.service";
@@ -29,14 +29,14 @@ export default class DatabaseServiceProvider {
2929
/**
3030
* @param {object} credentials
3131
*/
32-
async update(credentials) {
33-
const { default: AWS } = await import("../config/aws");
34-
AWS.initialize(credentials);
32+
static async update(credentials) {
33+
const { default: AWSConfig } = await import("../config/aws");
34+
AWSConfig.initialize(credentials);
3535
}
3636

37-
async reset() {
38-
const { default: AWS } = await import("../config/aws");
39-
AWS.initialize();
37+
static async reset() {
38+
const { default: AWSConfig } = await import("../config/aws");
39+
AWSConfig.initialize();
4040
}
4141

4242
/**
@@ -55,44 +55,46 @@ export default class DatabaseServiceProvider {
5555
*
5656
* @returns {Array<string>}
5757
*/
58-
restore(tables = [], uid, eventEmitter) {
58+
restore(uid, eventEmitter, tables = []) {
5959
const queue = [...tables];
6060
const jobs = queue.splice(0, POOL_SIZE);
6161
let counter = jobs.length;
6262

63-
eventEmitter.on(EVENTS.END, () => {
64-
if (queue.length) {
65-
const job = queue.shift();
66-
run(job);
67-
return;
68-
}
69-
70-
if (--counter === 0) {
71-
eventEmitter.emit(EVENTS.CLOSE, uid);
72-
}
73-
});
74-
7563
const run = async ({ source, target }) => {
7664
const tableName = source;
77-
7865
try {
79-
eventEmitter.emit(EVENTS.BEGIN, uid, { tableName });
66+
eventEmitter.emit(EVENTS.BEGIN, uid, tableName);
8067

81-
const restore = TableServiceProvider.restore(source, target, this);
68+
const restore = TableServiceProvider.restore(tableName, target, this);
8269

70+
// eslint-disable-next-line no-restricted-syntax
8371
for await (const [ItemCount, TotalItemCount] of restore) {
8472
eventEmitter.emit(EVENTS.PROGRESS, uid, { tableName, data: [ItemCount, TotalItemCount] });
8573
}
8674

87-
eventEmitter.emit(EVENTS.SUCCESS, uid, { tableName });
75+
eventEmitter.emit(EVENTS.SUCCESS, uid, tableName);
8876
} catch (error) {
89-
eventEmitter.emit(EVENTS.FAILURE, uid, { tableName, error });
77+
// eslint-disable-next-line no-console
9078
console.error(error);
91-
} finally {
92-
eventEmitter.emit(EVENTS.END, uid, { tableName });
79+
eventEmitter.emit(EVENTS.FAILURE, uid, tableName);
9380
}
81+
82+
eventEmitter.emit(EVENTS.END, uid, tableName);
9483
};
9584

85+
eventEmitter.on(EVENTS.END, () => {
86+
if (queue.length) {
87+
const job = queue.shift();
88+
run(job);
89+
return;
90+
}
91+
92+
counter -= 1;
93+
if (counter === 0) {
94+
eventEmitter.emit(EVENTS.CLOSE, uid);
95+
}
96+
});
97+
9698
jobs.map(run);
9799

98100
return tables;
@@ -109,8 +111,8 @@ export default class DatabaseServiceProvider {
109111
this.SOURCE.TableService.describe(sourceTableName),
110112
]);
111113

112-
const ItemCount = TargetTable.ItemCount;
113-
const TotalItemCount = SourceTable.ItemCount;
114+
const { ItemCount } = TargetTable;
115+
const { ItemCount: TotalItemCount } = SourceTable;
114116

115117
return [ItemCount, TotalItemCount];
116118
}

0 commit comments

Comments
 (0)