Skip to content

Commit c88a779

Browse files
derrickmehaffyderrickmehaffy
committed
run prettier on all files
1 parent 74d9a8d commit c88a779

21 files changed

+316
-338
lines changed

‎.editorconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
11+
[{package.json,*.yml}]
12+
indent_style = space
13+
indent_size = 2
14+
15+
[*.md]
16+
trim_trailing_whitespace = false

‎v3-sql-v4-sql/config/database.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const knex = require("knex");
1+
const knex = require('knex');
22

33
let additionalConfigV3 = {};
44
let additionalConfigV4 = {};
55

6-
if (process.env.DATABASE_CLIENT === "sqlite") {
6+
if (process.env.DATABASE_CLIENT === 'sqlite') {
77
additionalConfigV3 = {
88
useNullAsDefault: true,
99
connection: {
@@ -19,7 +19,7 @@ if (process.env.DATABASE_CLIENT === "sqlite") {
1919
};
2020
}
2121

22-
if (process.env.DATABASE_CLIENT === "pg") {
22+
if (process.env.DATABASE_CLIENT === 'pg') {
2323
additionalConfigV3 = {
2424
connection: {
2525
host: process.env.DATABASE_V3_HOST,
@@ -42,7 +42,7 @@ if (process.env.DATABASE_CLIENT === "pg") {
4242
};
4343
}
4444

45-
if (process.env.DATABASE_CLIENT === "mysql") {
45+
if (process.env.DATABASE_CLIENT === 'mysql') {
4646
additionalConfigV3 = {
4747
connection: {
4848
host: process.env.DATABASE_V3_HOST,
@@ -75,9 +75,9 @@ const dbV4 = knex({
7575
...additionalConfigV4,
7676
});
7777

78-
const isPGSQL = dbV3.client.config.client === "pg";
79-
const isSQLITE = dbV3.client.config.client === "sqlite";
80-
const isMYSQL = dbV3.client.config.client === "mysql";
78+
const isPGSQL = dbV3.client.config.client === 'pg';
79+
const isSQLITE = dbV3.client.config.client === 'sqlite';
80+
const isMYSQL = dbV3.client.config.client === 'mysql';
8181

8282
module.exports = {
8383
dbV3,

‎v3-sql-v4-sql/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require("dotenv").config();
1+
require('dotenv').config();
22

3-
const { migrate } = require("./migrate");
3+
const { migrate } = require('./migrate');
44

55
async function f() {
66
await migrate();

‎v3-sql-v4-sql/migrate/helpers/adminHelpers.js

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
const {
2-
dbV3,
3-
dbV4,
4-
isPGSQL,
5-
isSQLITE,
6-
isMYSQL,
7-
} = require("../../config/database");
8-
const { BATCH_SIZE, SUPER_ADMIN } = require("./constants");
9-
const { resetTableSequence } = require("./migrate");
10-
const { migrateItems } = require("./migrateFields");
11-
const { migrateUids } = require("./migrateValues");
12-
const pluralize = require("pluralize");
13-
const { camelCase } = require("lodash");
14-
const { resolveDestTableName, resolveSourceTableName } = require("./tableNameHelpers");
1+
const { dbV3, dbV4, isPGSQL, isSQLITE, isMYSQL } = require('../../config/database');
2+
const { BATCH_SIZE, SUPER_ADMIN } = require('./constants');
3+
const { resetTableSequence } = require('./migrate');
4+
const { migrateItems } = require('./migrateFields');
5+
const { migrateUids } = require('./migrateValues');
6+
const pluralize = require('pluralize');
7+
const { camelCase } = require('lodash');
8+
const { resolveDestTableName, resolveSourceTableName } = require('./tableNameHelpers');
159

1610
const extraV4Permissions = [
17-
{ action: "admin::api-tokens.create", properties: {}, conditions: [] },
18-
{ action: "admin::api-tokens.delete", properties: {}, conditions: [] },
19-
{ action: "admin::api-tokens.read", properties: {}, conditions: [] },
20-
{ action: "admin::api-tokens.update", properties: {}, conditions: [] },
11+
{ action: 'admin::api-tokens.create', properties: {}, conditions: [] },
12+
{ action: 'admin::api-tokens.delete', properties: {}, conditions: [] },
13+
{ action: 'admin::api-tokens.read', properties: {}, conditions: [] },
14+
{ action: 'admin::api-tokens.update', properties: {}, conditions: [] },
2115
];
2216

2317
function migrateSubject(subject) {
2418
if (subject) {
2519
return subject
26-
.split(".")
20+
.split('.')
2721
.map((s) => migrateUids(pluralize(s, 1)))
28-
.join(".");
22+
.join('.');
2923
}
3024
return subject;
3125
}
@@ -38,14 +32,13 @@ function migrateProperties(properties) {
3832
return properties;
3933
}
4034

41-
4235
async function migrateAdminPermissions() {
43-
const source = "strapi_permission";
44-
const destination = "admin_permissions";
45-
const destinationLinks = "admin_permissions_role_links";
36+
const source = 'strapi_permission';
37+
const destination = 'admin_permissions';
38+
const destinationLinks = 'admin_permissions_role_links';
4639
const count =
4740
(await dbV3(resolveSourceTableName(source)).count().first()).count ||
48-
(await dbV3(resolveSourceTableName(source)).count().first())["count(*)"];
41+
(await dbV3(resolveSourceTableName(source)).count().first())['count(*)'];
4942
console.log(`Migrating ${count} items from ${source} to ${destination}`);
5043
await dbV4(resolveDestTableName(destinationLinks)).del();
5144
await dbV4(resolveDestTableName(destination)).del();
@@ -73,7 +66,7 @@ async function migrateAdminPermissions() {
7366
let ids = [];
7467

7568
if (isPGSQL) {
76-
ids = await dbV4(resolveDestTableName(destination)).insert(extraV4Permissions).returning("id");
69+
ids = await dbV4(resolveDestTableName(destination)).insert(extraV4Permissions).returning('id');
7770
}
7871

7972
if (isSQLITE) {

‎v3-sql-v4-sql/migrate/helpers/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { isPGSQL } = require("../../config/database");
1+
const { isPGSQL } = require('../../config/database');
22

33
const BATCH_SIZE = process.env.BATCH_SIZE || 50;
44
const SUPER_ADMIN = 1;

‎v3-sql-v4-sql/migrate/helpers/coreStoreHelpers.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
11
const apiTokenEntry = {
2-
key: "plugin_content_manager_configuration_content_types::admin::api-token",
3-
type: "object",
2+
key: 'plugin_content_manager_configuration_content_types::admin::api-token',
3+
type: 'object',
44
environment: null,
55
tag: null,
66
value: {
7-
uid: "admin::api-token",
7+
uid: 'admin::api-token',
88
settings: {
99
bulkable: true,
1010
filterable: true,
1111
searchable: true,
1212
pageSize: 10,
13-
mainField: "name",
14-
defaultSortBy: "name",
15-
defaultSortOrder: "ASC",
13+
mainField: 'name',
14+
defaultSortBy: 'name',
15+
defaultSortOrder: 'ASC',
1616
},
1717
metadatas: {
18-
id: { edit: {}, list: { label: "id", searchable: true, sortable: true } },
18+
id: { edit: {}, list: { label: 'id', searchable: true, sortable: true } },
1919
name: {
2020
edit: {
21-
label: "name",
22-
description: "",
23-
placeholder: "",
21+
label: 'name',
22+
description: '',
23+
placeholder: '',
2424
visible: true,
2525
editable: true,
2626
},
27-
list: { label: "name", searchable: true, sortable: true },
27+
list: { label: 'name', searchable: true, sortable: true },
2828
},
2929
description: {
3030
edit: {
31-
label: "description",
32-
description: "",
33-
placeholder: "",
31+
label: 'description',
32+
description: '',
33+
placeholder: '',
3434
visible: true,
3535
editable: true,
3636
},
37-
list: { label: "description", searchable: true, sortable: true },
37+
list: { label: 'description', searchable: true, sortable: true },
3838
},
3939
type: {
4040
edit: {
41-
label: "type",
42-
description: "",
43-
placeholder: "",
41+
label: 'type',
42+
description: '',
43+
placeholder: '',
4444
visible: true,
4545
editable: true,
4646
},
47-
list: { label: "type", searchable: true, sortable: true },
47+
list: { label: 'type', searchable: true, sortable: true },
4848
},
4949
accessKey: {
5050
edit: {
51-
label: "accessKey",
52-
description: "",
53-
placeholder: "",
51+
label: 'accessKey',
52+
description: '',
53+
placeholder: '',
5454
visible: true,
5555
editable: true,
5656
},
57-
list: { label: "accessKey", searchable: true, sortable: true },
57+
list: { label: 'accessKey', searchable: true, sortable: true },
5858
},
5959
createdAt: {
6060
edit: {
61-
label: "createdAt",
62-
description: "",
63-
placeholder: "",
61+
label: 'createdAt',
62+
description: '',
63+
placeholder: '',
6464
visible: false,
6565
editable: true,
6666
},
67-
list: { label: "createdAt", searchable: true, sortable: true },
67+
list: { label: 'createdAt', searchable: true, sortable: true },
6868
},
6969
updatedAt: {
7070
edit: {
71-
label: "updatedAt",
72-
description: "",
73-
placeholder: "",
71+
label: 'updatedAt',
72+
description: '',
73+
placeholder: '',
7474
visible: false,
7575
editable: true,
7676
},
77-
list: { label: "updatedAt", searchable: true, sortable: true },
77+
list: { label: 'updatedAt', searchable: true, sortable: true },
7878
},
7979
},
8080
layouts: {
81-
list: ["id", "name", "description", "type"],
81+
list: ['id', 'name', 'description', 'type'],
8282
editRelations: [],
8383
edit: [
8484
[
85-
{ name: "name", size: 6 },
86-
{ name: "description", size: 6 },
85+
{ name: 'name', size: 6 },
86+
{ name: 'description', size: 6 },
8787
],
8888
[
89-
{ name: "type", size: 6 },
90-
{ name: "accessKey", size: 6 },
89+
{ name: 'type', size: 6 },
90+
{ name: 'accessKey', size: 6 },
9191
],
9292
],
9393
},

‎v3-sql-v4-sql/migrate/helpers/migrateFields.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const { snakeCase } = require("lodash/fp");
1+
const { snakeCase } = require('lodash/fp');
22

33
function migrateField(fieldName) {
44
switch (fieldName) {
5-
case "created_by":
6-
return "created_by_id";
7-
case "updated_by":
8-
return "updated_by_id";
5+
case 'created_by':
6+
return 'created_by_id';
7+
case 'updated_by':
8+
return 'updated_by_id';
99
default:
1010
return snakeCase(fieldName);
1111
}
@@ -21,9 +21,7 @@ function migrateItem(item) {
2121
}
2222

2323
function migrateItems(items, itemMapper = undefined) {
24-
return items
25-
.map(itemMapper ?? migrateItem)
26-
.filter((item) => item !== undefined);
24+
return items.map(itemMapper ?? migrateItem).filter((item) => item !== undefined);
2725
}
2826

2927
module.exports = {

‎v3-sql-v4-sql/migrate/helpers/migrateValues.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
const { cloneDeepWith, camelCase, isObject, isString } = require("lodash");
1+
const { cloneDeepWith, camelCase, isObject, isString } = require('lodash');
22

33
function migrateUids(uid) {
44
if (!uid) {
55
return uid;
66
}
77
var result = uid;
8-
result = result.replace("strapi::", "admin::");
9-
result = result.replace("application::", "api::");
10-
result = result.replace(
11-
"plugins::users-permission",
12-
"plugin::users-permissions"
13-
);
14-
result = result.replace("plugins::", "plugin::");
8+
result = result.replace('strapi::', 'admin::');
9+
result = result.replace('application::', 'api::');
10+
result = result.replace('plugins::users-permission', 'plugin::users-permissions');
11+
result = result.replace('plugins::', 'plugin::');
1512
return result;
1613
}
1714

1815
function migrateItemValues(item) {
1916
return cloneDeepWith(item, (value, key) => {
20-
if (key === "label" && !isObject(value)) {
17+
if (key === 'label' && !isObject(value)) {
2118
return camelCase(value);
2219
}
23-
if (key === "uid" && !isObject(value)) {
20+
if (key === 'uid' && !isObject(value)) {
2421
return migrateUids(value);
2522
}
2623
});

‎v3-sql-v4-sql/migrate/helpers/relationHelpers.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ async function migrateRelations(tables, relations) {
135135

136136
if (isPGSQL) {
137137
v4Tables = (
138-
await dbV4('information_schema.tables').select('table_name').where('table_schema', process.env.DATABASE_V4_SCHEMA)
138+
await dbV4('information_schema.tables')
139+
.select('table_name')
140+
.where('table_schema', process.env.DATABASE_V4_SCHEMA)
139141
).map((row) => row.table_name);
140142
}
141143

‎v3-sql-v4-sql/migrate/helpers/tableNameHelpers.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
const { isPGSQL } = require("../../config/database");
1+
const { isPGSQL } = require('../../config/database');
22

33
const resolveSourceTableName = (name) => {
44
if (isPGSQL) {
5-
return process.env.DATABASE_V3_SCHEMA + "." + name;
5+
return process.env.DATABASE_V3_SCHEMA + '.' + name;
66
}
77

88
return name;
99
};
1010

1111
const resolveDestTableName = (name) => {
1212
if (isPGSQL) {
13-
return process.env.DATABASE_V4_SCHEMA + "." + name;
13+
return process.env.DATABASE_V4_SCHEMA + '.' + name;
1414
}
1515

1616
return name;

0 commit comments

Comments
 (0)