[feat] Extra Journals fully integrated

blairw · blairw · commit 0a97a47563aa · 2021-11-29T11:16:36.000+11:00
diff --git a/README.md b/README.md
@@ -4,9 +4,6 @@
 
 - This is the `api` folder (somewhat misleading name, I know, sorry)
 - The live production version actually uses `www/api-cache` to leverage the CDN (BunnyCDN)
-- Only `getJournalsBySubdivisions` is actually used at the moment.
-    - The other two are to support an old feature of baskets &rarr; subdivisions, based on themes (e.g., ABDC, SIGs, etc)
-    - TODO: Bring those baskets back one day?
 
 ## Frontend (`www/`, `www-build/`)
 
diff --git a/www-build/json/UserDataExtraJournals.json b/www-build/json/UserDataExtraJournals.json
@@ -6,7 +6,8 @@
 		"issn": "0033-6807",
 		"issne": "1467-9310",
 		"scopus_sourceid": "22486",
-		"scopus_coverage": "1970-ongoing"
+		"scopus_coverage": "1970-ongoing",
+		"is_extra_journal": true
 	},
 	{
 		"journal_id": "SCOPUS_28945",
@@ -15,6 +16,7 @@
 		"issn": "0960-6491",
 		"issne": "1464-3650",
 		"scopus_sourceid": "28945",
-		"scopus_coverage": "1992-ongoing"
+		"scopus_coverage": "1992-ongoing",
+		"is_extra_journal": true
 	}
 ]
diff --git a/www-build/temp/compiled.js b/www-build/temp/compiled.js
@@ -42,7 +42,8 @@ var UserDataExtraJournals = [
         "issn": "0033-6807",
         "issne": "1467-9310",
         "scopus_sourceid": "22486",
-        "scopus_coverage": "1970-ongoing"
+        "scopus_coverage": "1970-ongoing",
+        "is_extra_journal": true
     },
     {
         "journal_id": "SCOPUS_28945",
@@ -51,6 +52,7 @@ var UserDataExtraJournals = [
         "issn": "0960-6491",
         "issne": "1464-3650",
         "scopus_sourceid": "28945",
-        "scopus_coverage": "1992-ongoing"
+        "scopus_coverage": "1992-ongoing",
+        "is_extra_journal": true
     }
 ];
diff --git a/www-build/temp/compiled.ts b/www-build/temp/compiled.ts
@@ -40,7 +40,8 @@ let UserDataExtraJournals =
 		"issn": "0033-6807",
 		"issne": "1467-9310",
 		"scopus_sourceid": "22486",
-		"scopus_coverage": "1970-ongoing"
+		"scopus_coverage": "1970-ongoing",
+		"is_extra_journal": true
 	},
 	{
 		"journal_id": "SCOPUS_28945",
@@ -49,6 +50,7 @@ let UserDataExtraJournals =
 		"issn": "0960-6491",
 		"issne": "1464-3650",
 		"scopus_sourceid": "28945",
-		"scopus_coverage": "1992-ongoing"
+		"scopus_coverage": "1992-ongoing",
+		"is_extra_journal": true
 	}
 ];
diff --git a/www-build/typescript/UserDataExtraJournals.ts b/www-build/typescript/UserDataExtraJournals.ts
@@ -9,7 +9,8 @@ let UserDataExtraJournals =
 		"issn": "0033-6807",
 		"issne": "1467-9310",
 		"scopus_sourceid": "22486",
-		"scopus_coverage": "1970-ongoing"
+		"scopus_coverage": "1970-ongoing",
+		"is_extra_journal": true
 	},
 	{
 		"journal_id": "SCOPUS_28945",
@@ -18,6 +19,7 @@ let UserDataExtraJournals =
 		"issn": "0960-6491",
 		"issne": "1464-3650",
 		"scopus_sourceid": "28945",
-		"scopus_coverage": "1992-ongoing"
+		"scopus_coverage": "1992-ongoing",
+		"is_extra_journal": true
 	}
 ];
diff --git a/www/api-cache/UserDataExtraJournals.json b/www/api-cache/UserDataExtraJournals.json
@@ -0,0 +1,22 @@
+[
+	{
+		"journal_id": "SCOPUS_22486",
+		"journal_name": "R and D Management",
+		"url": "https://onlinelibrary.wiley.com/journal/14679310",
+		"issn": "0033-6807",
+		"issne": "1467-9310",
+		"scopus_sourceid": "22486",
+		"scopus_coverage": "1970-ongoing",
+		"is_extra_journal": true
+	},
+	{
+		"journal_id": "SCOPUS_28945",
+		"journal_name": "Industrial and Corporate Change",
+		"url": "https://academic.oup.com/icc",
+		"issn": "0960-6491",
+		"issne": "1464-3650",
+		"scopus_sourceid": "28945",
+		"scopus_coverage": "1992-ongoing",
+		"is_extra_journal": true
+	}
+]
diff --git a/www/extras/index.controller.search.js b/www/extras/index.controller.search.js
@@ -103,11 +103,11 @@ LitbasketsSearchController = {
 
 	, user_did_click_search_button: function() {
 		var scopus_ids = [];
-		for (var i = 0; i < UIJournalSelectorController.selectedJournalIdsForSearch.length; i++) {
-			var this_journal_id = UIJournalSelectorController.selectedJournalIdsForSearch[i];
-			var this_journal = GLOBAL_MODEL_HELPER.get_master_record_by_journal_id(this_journal_id);
-			scopus_ids.push(this_journal.scopus_sourceid);
-		}
+		UIJournalSelectorController.selectedJournalIdsForSearch.forEach(journalId => {
+			var journalRecord = DataHelper.savedJournalsMasterDataDictionary[journalId];
+			var scopusId = journalRecord.scopus_sourceid;
+			scopus_ids.push(scopusId);
+		});
 	
 		var search_mode = "LONG_SEARCH";
 		if (scopus_ids.length <= 55) {
diff --git a/www/extras/index.controller.sources.js b/www/extras/index.controller.sources.js
@@ -48,7 +48,7 @@ LitbasketsSourcesController = {
 
 	/* set_journal_inclusion_to_default(...): called by cs_select_default only */
 	, set_journal_inclusion_to_default: function(given_journal_id) {
-		var journal_object = GLOBAL_MODEL_HELPER.get_master_record_by_journal_id(given_journal_id);
+		var journal_object = DataHelper.savedJournalsMasterDataDictionary[given_journal_id]
 	
 		var include_journal = false;
 		if (GLOBAL_INITIAL_CONTROLLER.just_use_bo8) {
diff --git a/www/extras/index.controller.sources.topbar.js b/www/extras/index.controller.sources.topbar.js
@@ -81,7 +81,7 @@ LitbasketsSourcesTopbarController = {
 		];
 		for (var i = 0; i < UIJournalSelectorController.selectedJournalIdsForSearch.length; i++) {
 			var journal_id = UIJournalSelectorController.selectedJournalIdsForSearch[i];
-			var journal_record = GLOBAL_MODEL_HELPER.get_master_record_by_journal_id(journal_id);
+			var journal_record = DataHelper.savedJournalsMasterDataDictionary[journal_id];
 			prepared_return.push([
 				nvl(journal_record["scopus_sourceid"], ""),
 				nvl(journal_record["scopus_coverage"], ""),
diff --git a/www/extras/index.model.js b/www/extras/index.model.js
@@ -43,10 +43,6 @@ LitbasketsModelHelper = {
 			});
 		});
 	}
-
-	, get_master_record_by_journal_id(journal_id) {
-		return DataHelper.savedJournalsMasterDataDictionary[journal_id];
-	}
 }
 
 
@@ -75,6 +71,11 @@ function generate_journal_master_data() {
 		}
 	}
 
+	// Add all extra journals
+	UserDataExtraJournals.forEach(journal => {
+		DataHelper.savedJournalsMasterDataArray.push(journal);
+	})
+
 	// Dedupe
 	// https://stackoverflow.com/questions/9923890/removing-duplicate-objects-with-underscore-for-javascript
 	DataHelper.savedJournalsMasterDataArray = _.uniq(DataHelper.savedJournalsMasterDataArray, function(x){
diff --git a/www/extras/typescript-compiled-app.js b/www/extras/typescript-compiled-app.js
diff --git a/www/fragments/46-litbaskets-sources.php b/www/fragments/46-litbaskets-sources.php

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`"issn": "0033-6807",`
`7`	`7`	`"issne": "1467-9310",`
`8`	`8`	`"scopus_sourceid": "22486",`
`9`		`- "scopus_coverage": "1970-ongoing"`
	`9`	`+ "scopus_coverage": "1970-ongoing",`
	`10`	`+ "is_extra_journal": true`
`10`	`11`	`},`
`11`	`12`	`{`
`12`	`13`	`"journal_id": "SCOPUS_28945",`
`@@ -15,6 +16,7 @@`
`15`	`16`	`"issn": "0960-6491",`
`16`	`17`	`"issne": "1464-3650",`
`17`	`18`	`"scopus_sourceid": "28945",`
`18`		`- "scopus_coverage": "1992-ongoing"`
	`19`	`+ "scopus_coverage": "1992-ongoing",`
	`20`	`+ "is_extra_journal": true`
`19`	`21`	`}`
`20`	`22`	`]`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,6 @@ LitbasketsModelHelper = {`
`43`	`43`	`});`
`44`	`44`	`});`
`45`	`45`	`}`
`46`		`-`
`47`		`- , get_master_record_by_journal_id(journal_id) {`
`48`		`- return DataHelper.savedJournalsMasterDataDictionary[journal_id];`
`49`		`- }`
`50`	`46`	`}`
`51`	`47`
`52`	`48`
`@@ -75,6 +71,11 @@ function generate_journal_master_data() {`
`75`	`71`	`}`
`76`	`72`	`}`
`77`	`73`
	`74`	`+ // Add all extra journals`
	`75`	`+ UserDataExtraJournals.forEach(journal => {`
	`76`	`+ DataHelper.savedJournalsMasterDataArray.push(journal);`
	`77`	`+ })`
	`78`	`+`
`78`	`79`	`// Dedupe`
`79`	`80`	`// https://stackoverflow.com/questions/9923890/removing-duplicate-objects-with-underscore-for-javascript`
`80`	`81`	`DataHelper.savedJournalsMasterDataArray = _.uniq(DataHelper.savedJournalsMasterDataArray, function(x){`