From c887407960b276d548965983ab26294c9131a851 Mon Sep 17 00:00:00 2001
From: Tomina <tomina@vycital.eu>
Date: Tue, 1 Mar 2022 19:17:57 +0100
Subject: [PATCH] fix(data): primarily use public API idProp (#1330)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(data): primarily use public API idProp

The “private” _idProp has been removed and instead there idProp in the
official supported API. I kept the older version there as a fallback
just in case something actually depends on it.

* ci: add apt update

The databases may be stale and that's possibly why it's failing at the
moment.
---
 .circleci/config.yml | 46 +++++++++++++++++++++++++++++++++++++-------
 lib/util.js          |  2 +-
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 066e13ad61..b3ff02bce3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,14 +55,46 @@ jobs:
       - run:
           name: Install dependencies for headless Chromium
           command: |
+            sudo apt-get update
             sudo apt-get install -yq \
-            ca-certificates fonts-liberation gconf-service libappindicator1 \
-            libasound2 libatk-bridge2.0-0 libatk1.0-0 libc6 libcairo2 libcups2 \
-            libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 \
-            libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 \
-            libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 \
-            libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 \
-            libxi6 libxrandr2 libxrender1 libxss1 libxtst6 lsb-release wget \
+            ca-certificates \
+            fonts-liberation \
+            gconf-service \
+            libappindicator1 \
+            libasound2 \
+            libatk-bridge2.0-0 \
+            libatk1.0-0 \
+            libc6 \
+            libcairo2 \
+            libcups2 \
+            libdbus-1-3 \
+            libexpat1 \
+            libfontconfig1 \
+            libgcc1 \
+            libgconf-2-4 \
+            libgdk-pixbuf2.0-0 \
+            libglib2.0-0 \
+            libgtk-3-0 \
+            libnspr4 \
+            libnss3 \
+            libpango-1.0-0 \
+            libpangocairo-1.0-0 \
+            libstdc++6 \
+            libx11-6 \
+            libx11-xcb1 \
+            libxcb1 \
+            libxcomposite1 \
+            libxcursor1 \
+            libxdamage1 \
+            libxext6 \
+            libxfixes3 \
+            libxi6 \
+            libxrandr2 \
+            libxrender1 \
+            libxss1 \
+            libxtst6 \
+            lsb-release \
+            wget \
             xdg-utils
 
       - run: npm run generate-examples-index
diff --git a/lib/util.js b/lib/util.js
index 06a87cdbaa..6b57809a91 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -18,7 +18,7 @@ export function isDataViewLike(obj) {
     if(!obj) {
         return false;
     }
-    let idProp = obj._idProp;
+    let idProp = obj.idProp ?? obj._idProp;
     if(!idProp) {
         return false;
     }