Support external identifier property

Jayprakash-SE · Jayprakash-SE · commit b7601926311e · 2021-07-03T23:22:23.000+05:30
Bug: T285656
Change-Id: Ia15deba7a601b475cba046b9c2024e5a850758bc
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "react-bootstrap": "^1.5.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.3",
-    "react-scripts": "4.0.3",
+    "react-scripts": "^4.0.3",
     "react-typeahead": "^2.0.0-alpha.8",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
diff --git a/src/components/DataTable/Widget/EditorWidget.js b/src/components/DataTable/Widget/EditorWidget.js
@@ -56,7 +56,10 @@ function EditorWidget({ itemId, pItem }) {
                     setOptions(data.search)
                 })
             }
-        } else if (pItem.type === 'string' && e.key === 'Enter') {
+        } else if (
+                e.key === 'Enter' &&
+                (pItem.type === 'string' || pItem.type === 'external-id')
+            ) {
             createClaimById(newValue, pItem.type);
         }
     }
diff --git a/src/components/DataTable/Widget/FormEditorWidget.js b/src/components/DataTable/Widget/FormEditorWidget.js
@@ -56,7 +56,10 @@ function FormEditorWidget({ itemId, pItem }) {
                     setOptions(data.search)
                 })
             }
-        } else if (pItem.type === 'string' && e.key === 'Enter') {
+        } else if (
+            e.key === 'Enter' &&
+            (pItem.type === 'string' || pItem.type === 'external-id')
+        ) {
             createClaimById(newValue, pItem.type);
         }
     }
diff --git a/src/components/DataTable/Widget/FormPropertyWidget.js b/src/components/DataTable/Widget/FormPropertyWidget.js
@@ -18,7 +18,7 @@ function FormPropertyWidget({ pItem, itemId }) {
     let itemDataValue;
     if (itemType === "wikibase-lexeme" || itemType === "wikibase-item") {
         itemDataValue = itemMainsnak.datavalue.value.id
-    } else if (itemType === "string") {
+    } else if (itemType === "string" || itemType === "external-id") {
         itemDataValue = itemMainsnak.datavalue.value
     }
 
@@ -68,7 +68,10 @@ function FormPropertyWidget({ pItem, itemId }) {
         }
 
         // Property having string nature can be edit by Enter
-        if (e.key === "Enter" && pItem.type === "string") {
+        if (
+            e.key === "Enter" &&
+            ( pItem.type === "string" || pItem.type === "external-id" )
+        ) {
             onEditClaim(newValue)
         }
     }
@@ -100,7 +103,12 @@ function FormPropertyWidget({ pItem, itemId }) {
     }
 
     const getCellContent = () => {
-        if (pItem.type === "string" || pItem.type === "wikibase-item" || pItem.type === "wikibase-lexeme") {
+        if (
+            pItem.type === "string" ||
+            pItem.type === "external-id" ||
+            pItem.type === "wikibase-item" ||
+            pItem.type === "wikibase-lexeme"
+        ) {
             return <>
                 <input disabled value={itemText} className="propertyCellInput" />
                 <div style={{ marginLeft: -30, display: 'inline', zIndex: 999 }}>
diff --git a/src/components/DataTable/Widget/PropertyWidget.js b/src/components/DataTable/Widget/PropertyWidget.js
@@ -17,7 +17,7 @@ function PropertyWidget({ pItem, itemId }) {
     let itemDataValue;
     if (itemType === "wikibase-lexeme" || itemType === "wikibase-item") {
         itemDataValue = itemMainsnak.datavalue.value.id
-    } else if (itemType === "string") {
+    } else if (itemType === "string" || itemType === "external-id") {
         itemDataValue = itemMainsnak.datavalue.value
     }
 
@@ -67,7 +67,10 @@ function PropertyWidget({ pItem, itemId }) {
         }
 
         // Property having string nature can be edit by Enter
-        if (e.key === "Enter" && pItem.type === "string") {
+        if (
+            e.key === "Enter" &&
+            ( pItem.type === "string" || pItem.type === "external-id" )
+        ) {
             onEditClaim(newValue)
         }
     }
@@ -99,7 +102,12 @@ function PropertyWidget({ pItem, itemId }) {
     }
 
     const getCellContent = () => {
-        if (pItem.type === "string" || pItem.type === "wikibase-item" || pItem.type === "wikibase-lexeme") {
+        if (
+            pItem.type === "string" ||
+            pItem.type === "external-id" ||
+            pItem.type === "wikibase-item" ||
+            pItem.type === "wikibase-lexeme"
+        ) {
             return <>
                 <input disabled value={itemText} className="propertyCellInput" />
                 <div style={{ marginLeft: -30, display: 'inline', zIndex: 999 }}>
diff --git a/src/components/DataTable/Widget/SenseEditorWidget.js b/src/components/DataTable/Widget/SenseEditorWidget.js
@@ -56,7 +56,10 @@ function SenseEditorWidget({ itemId, pItem }) {
                     setOptions(data.search)
                 })
             }
-        } else if (pItem.type === 'string' && e.key === 'Enter') {
+        } else if (
+            e.key === 'Enter' &&
+            (pItem.type === 'string' || pItem.type === 'external-id')
+        ) {
             createClaimById(newValue, pItem.type);
         }
     }
diff --git a/src/components/DataTable/Widget/SensePropertyWidget.js b/src/components/DataTable/Widget/SensePropertyWidget.js
@@ -18,7 +18,7 @@ function SensePropertyWidget({ pItem, itemId }) {
     let itemDataValue;
     if (itemType === "wikibase-lexeme" || itemType === "wikibase-item") {
         itemDataValue = itemMainsnak.datavalue.value.id
-    } else if (itemType === "string") {
+    } else if (itemType === "string" || itemType === "external-id") {
         itemDataValue = itemMainsnak.datavalue.value
     }
 
@@ -68,7 +68,10 @@ function SensePropertyWidget({ pItem, itemId }) {
         }
 
         // Property having string nature can be edit by Enter
-        if (e.key === "Enter" && pItem.type === "string") {
+        if (
+            e.key === "Enter" &&
+            ( pItem.type === "string" || pItem.type === "external-id" )
+        ) {
             onEditClaim(newValue)
         }
     }
@@ -100,7 +103,12 @@ function SensePropertyWidget({ pItem, itemId }) {
     }
 
     const getCellContent = () => {
-        if (pItem.type === "string" || pItem.type === "wikibase-item" || pItem.type === "wikibase-lexeme") {
+        if (
+            pItem.type === "string" ||
+            pItem.type === "external-id" ||
+            pItem.type === "wikibase-item" ||
+            pItem.type === "wikibase-lexeme"
+        ) {
             return <>
                 <input disabled value={itemText} className="propertyCellInput" />
                 <div style={{ marginLeft: -30, display: 'inline', zIndex: 999 }}>
diff --git a/src/util.js b/src/util.js
@@ -22,7 +22,7 @@ export function getTypeByString(item) {
  * @return  {boolean}
  */
 export function allowProperties(item) {
-    return ['wikibase-item', 'wikibase-lexeme', 'string'].includes(item)
+    return ['wikibase-item', 'wikibase-lexeme', 'string', 'external-id'].includes(item)
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,10 @@ function EditorWidget({ itemId, pItem }) {`
`56`	`56`	`setOptions(data.search)`
`57`	`57`	`})`
`58`	`58`	`}`
`59`		`- } else if (pItem.type === 'string' && e.key === 'Enter') {`
	`59`	`+ } else if (`
	`60`	`+ e.key === 'Enter' &&`
	`61`	`+ (pItem.type === 'string' \|\| pItem.type === 'external-id')`
	`62`	`+ ) {`
`60`	`63`	`createClaimById(newValue, pItem.type);`
`61`	`64`	`}`
`62`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,10 @@ function FormEditorWidget({ itemId, pItem }) {`
`56`	`56`	`setOptions(data.search)`
`57`	`57`	`})`
`58`	`58`	`}`
`59`		`- } else if (pItem.type === 'string' && e.key === 'Enter') {`
	`59`	`+ } else if (`
	`60`	`+ e.key === 'Enter' &&`
	`61`	`+ (pItem.type === 'string' \|\| pItem.type === 'external-id')`
	`62`	`+ ) {`
`60`	`63`	`createClaimById(newValue, pItem.type);`
`61`	`64`	`}`
`62`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,10 @@ function SenseEditorWidget({ itemId, pItem }) {`
`56`	`56`	`setOptions(data.search)`
`57`	`57`	`})`
`58`	`58`	`}`
`59`		`- } else if (pItem.type === 'string' && e.key === 'Enter') {`
	`59`	`+ } else if (`
	`60`	`+ e.key === 'Enter' &&`
	`61`	`+ (pItem.type === 'string' \|\| pItem.type === 'external-id')`
	`62`	`+ ) {`
`60`	`63`	`createClaimById(newValue, pItem.type);`
`61`	`64`	`}`
`62`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export function getTypeByString(item) {`
`22`	`22`	`* @return {boolean}`
`23`	`23`	`*/`
`24`	`24`	`export function allowProperties(item) {`
`25`		`- return ['wikibase-item', 'wikibase-lexeme', 'string'].includes(item)`
	`25`	`+ return ['wikibase-item', 'wikibase-lexeme', 'string', 'external-id'].includes(item)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`