chore(merge-tool): Cleanup before merging PR

metabrainz · May 25, 2020 · a010506 · a010506
1 parent 83bda6b
commit a010506
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 22 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "env": {"SSR":true, "DEBUG": true},
+            "env": {"SSR":true},
             "program": "${workspaceFolder}/lib/server/app.js",
             "args": ["--config", "./config/config.local.json"],
             "sourceMaps": true,

diff --git a/src/client/components/forms/deletion.js b/src/client/components/forms/deletion.js
@@ -133,8 +133,7 @@ class EntityDeletionForm extends React.Component {
 									revision note below to explain why and confirm the deletion.
 									</p>
 									<p className="text-muted">
-									We are currently working on the merging tool. If this {entity.type} is a duplicate,
-									please edit it to add &quot;duplicate&quot; as a disambiguation to mark it to be merged.
+									If this {entity.type} is a duplicate, click <a href={`/merge/add/${entity.bbid}`}>this link</a> to select it to be merged instead.
 									</p>
 
 									<CustomInput

diff --git a/src/client/entity-editor/alias-editor/alias-editor-merge.js b/src/client/entity-editor/alias-editor/alias-editor-merge.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Ben Ockmore
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/client/entity-editor/alias-editor/alias-row-merge.js b/src/client/entity-editor/alias-editor/alias-row-merge.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Ben Ockmore
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/client/entity-editor/author-section/author-section-merge.js b/src/client/entity-editor/author-section/author-section-merge.js
@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
 /*
- * Copyright (C) 2016  Ben Ockmore
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/client/entity-editor/edition-group-section/edition-group-section-merge.js b/src/client/entity-editor/edition-group-section/edition-group-section-merge.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Ben Ockmore
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/client/entity-editor/entity-merge.js b/src/client/entity-editor/entity-merge.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Ben Ockmore
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/src/client/entity-editor/name-section/name-section-merge.js b/src/client/entity-editor/name-section/name-section-merge.js
@@ -1,7 +1,5 @@
-/* eslint-disable no-inline-comments */
-/* eslint-disable no-console */
 /*
- * Copyright (C) 2016  Ben Ockmore
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,8 +59,6 @@ import {entityTypeProperty} from '../../helpers/react-validators';
  * @returns {ReactElement} React element containing the rendered NameSectionMerge.
  */
 
-// const valueFromId = (opts, id, path = 'value') => opts.find(opt => _.get(opt, path) === id);
-
 function NameSectionMerge({
 	disambiguationDefaultValue,
 	mergingEntities,

diff --git a/src/server/helpers/entityRouteUtils.js b/src/server/helpers/entityRouteUtils.js
@@ -44,7 +44,7 @@ type PassportRequest = $Request & {user: any, session: any};
 
 /**
  * Callback to get the initial state
- * @callback initialState
+ * @callback initialStateCallback
  * @param {object} entity - entity
  */
 
@@ -104,7 +104,7 @@ export function generateEntityProps(
 
 /**
  * Callback to get the initial state
- * @callback initialState
+ * @callback initialStateCallback
  * @param {object} entity - entity
  */
 

diff --git a/src/server/routes/entity/author.js b/src/server/routes/entity/author.js
@@ -54,7 +54,7 @@ function _setAuthorTitle(res) {
 	res.locals.title = utils.createEntityPageTitle(
 		res.locals.entity,
 		'Author',
-		utils.template`${'name'}`
+		utils.template`Author “${'name'}”`
 	);
 }
 

diff --git a/src/server/routes/entity/edition-group.js b/src/server/routes/entity/edition-group.js
@@ -61,7 +61,7 @@ function _setEditionGroupTitle(res) {
 	res.locals.title = utils.createEntityPageTitle(
 		res.locals.entity,
 		'EditionGroup',
-		utils.template`${'name'}`
+		utils.template`Edition Group “${'name'}”`
 	);
 }
 

diff --git a/src/server/routes/entity/edition.js b/src/server/routes/entity/edition.js
@@ -63,7 +63,7 @@ function _setEditionTitle(res) {
 	res.locals.title = utils.createEntityPageTitle(
 		res.locals.entity,
 		'Edition',
-		utils.template`${'name'}`
+		utils.template`Edition “${'name'}”`
 	);
 }
 

diff --git a/src/server/routes/entity/publisher.js b/src/server/routes/entity/publisher.js
@@ -52,7 +52,7 @@ function _setPublisherTitle(res) {
 	res.locals.title = utils.createEntityPageTitle(
 		res.locals.entity,
 		'Publisher',
-		utils.template`${'name'}`
+		utils.template`Publisher “${'name'}”`
 	);
 }
 

diff --git a/src/server/routes/entity/work.js b/src/server/routes/entity/work.js
@@ -56,7 +56,7 @@ function _setWorkTitle(res) {
 	res.locals.title = utils.createEntityPageTitle(
 		res.locals.entity,
 		'Work',
-		utils.template`${'name'}`
+		utils.template`Work “${'name'}”`
 	);
 }
 

diff --git a/src/server/routes/merge.js b/src/server/routes/merge.js
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2015-2016  Ben Ockmore
- *               2016       Sean Burke
+ * Copyright (C) 2019  Nicolas Pelletier
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by