Issue-813: Handle span class names with version numbers appended (#862)

Author: phillip-hopper

composer-team-city.json

@@ -72,7 +72,6 @@
     "wpackagist-plugin/plugin-activation-status": "@stable",
     "wpackagist-plugin/really-simple-ssl": "@stable",
     "wpackagist-plugin/redis-cache": "@stable",
-    "wpackagist-plugin/sqlite-database-integration": "@stable",
     "wpackagist-plugin/tinymce-advanced": "@stable",
     "wpackagist-plugin/unconfirmed": "@stable",
     "wpackagist-plugin/wordfence": "@stable",

composer_team_city_links.sh

@@ -50,13 +50,6 @@ do
   ln -sfn "${f}" "${thisDir}/wordpress-develop/src/${fn}"
 done
 
-# copy the SQLite db file
-FILE="${thisDir}/wordpress-develop/src/wp-content/plugins/sqlite-database-integration/db.copy"
-if [[ -f "$FILE" ]]; then
-  cp "${FILE}" "${thisDir}/wordpress-develop/src/wp-content/db.php"
-fi
-
-
 # copy additional default localizations
 mkdir -p "${thisDir}/wordpress-develop/src/wp-content/languages"
 FILES="${thisDir}/localizations/wordpress-base/*.mo"

resources/wp-tests-config.php

@@ -3,10 +3,6 @@
 /* Path to the WordPress codebase you'd like to test. Add a forward slash in the end. */
 define('ABSPATH', dirname(__DIR__) . '/wordpress-develop/src/');
 
-define('DB_DIR', dirname(__DIR__) . '/sqlite_db');
-if (!is_dir(DB_DIR))
-	mkdir(DB_DIR, 0777, true);
-
 /*
  * Path to the theme to test with.
  *
@@ -42,9 +38,9 @@
  */
 
 define('DB_NAME', 'wp_webonary_test');
-define('DB_USER', getenv('BITBUCKET_MYSQL_USER'));
-define('DB_PASSWORD', getenv('BITBUCKET_MYSQL_PASSWORD'));
-define('DB_HOST', getenv('BITBUCKET_MYSQL_SERVER'));
+define('DB_USER', 'webonary');
+define('DB_PASSWORD', getenv('MARIADB_PASSWORD'));
+define('DB_HOST', 'localhost');
 define('DB_CHARSET', 'utf8mb4');
 define('DB_COLLATE', 'utf8mb4_unicode_ci');
 

webonary-cloud-api/lambda/postEntry.ts

@@ -25,7 +25,7 @@
  * @apiParam (Post Body) {String} body.mainheadword.lang ISO language code for the head word
  * @apiParam (Post Body) {String} body.mainheadword.value ISO head word
  * @apiParam (Post Body) {Object} body.audio Audio associated with the entry
- * @apiParam (Post Body) {String} body.audio.fileClass Css class for the audio
+ * @apiParam (Post Body) {String} body.audio.fileClass CSS class for the audio
  * @apiParam (Post Body) {String} body.audio.id Unique id for audio file
  * @apiParam (Post Body) {String} body.audio.src Relative file path to the audio
  * @apiParam (Post Body) {Object[]} body.pictures Images associated with the entry
@@ -99,7 +99,7 @@
  * HTTP/1.1 500 Internal Server Error
  * {
  *    "errorType": "SyntaxError",
- *    "errorMessage": "Unexpected token } in JSON at position 243"
+ *    "errorMessage": "Unexpected token { in JSON at position 243"
  * }
  */
 
@@ -247,7 +247,7 @@ const getLangTexts = (xhtml: string) => {
   const searchTexts: string[] = [];
 
   // eslint-disable-next-line array-callback-return
-  $('span[lang]').each((index, elem) => {
+  $('span[lang]').each((_index, elem) => {
     const lang = $(elem).attr('lang');
     const text = $(elem).text();
     if (!lang || !text) {
@@ -330,6 +330,22 @@ export const transformToEntry = ({
   };
 };
 
+/**
+ * This is to remove the version numbers FLEx is now appending to the class name of some span tags.
+ *
+ * @param postedEntry
+ */
+const fixSpanClassVersions = (postedEntry: any) => {
+
+  if (!postedEntry.displayXhtml)
+    return;
+
+  // remove the version numbers from the span classes before processing
+  const regex = /<span class="([^"\s]+?)-\d+"/g;
+  const subst = `<span class="$1"`;
+  postedEntry.displayXhtml = postedEntry.displayXhtml.replace(regex, subst);
+};
+
 export async function upsertEntries(
   postedEntries: Array<any>,
   isReversal: boolean,
@@ -338,7 +354,11 @@ export async function upsertEntries(
 ) {
   const updatedAt = new Date();
   const transformEntryFunction = isReversal ? transformToReversalEntry : transformToEntry;
+
   const entries = postedEntries.map((postedEntry) => {
+
+    fixSpanClassVersions(postedEntry);
+
     const entry = transformEntryFunction({ postedEntry, dictionaryId });
     entry.updatedAt = updatedAt;
     entry.updatedBy = username;

webonary-cloud-api/tools/flexXhtmlParser.ts

@@ -24,7 +24,11 @@ export class FlexXhtmlParser {
   public parsedEntries: Entry[];
 
   public constructor(toBeParsed: string, options: Partial<Options> = {}) {
-    this.toBeParsed = toBeParsed;
+
+    // remove the version numbers from the span classes before parsing
+    const regex = /<span class="([^"\s]+?)-\d+"/g;
+    const subst = `<span class="$1"`;
+    this.toBeParsed = toBeParsed.replace(regex, subst);
 
     this.options = Object.assign(options);