Merge pull request #519 from Countly/staging

Staging 24.4.1

Author: turtledreams

.eslintignore

@@ -1,4 +1,5 @@
-lib
+lib/countly.js
+lib/countly.min.js
 plugin/boomerang/boomerang.min.js
 examples/
 node_modules

.gitignore

@@ -1,4 +1,2 @@
 /node_modules/
-.vscode/*
-package-lock.json
-
+.vscode/*

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 24.4.1
+- Added types for the SDK
+- Added a new method `set_id(newDeviceId)` for managing device ID changes according to the device ID Type
+
+- Mitigated an issue that could have prevented automatic Device Traces to not show up in server
+
 ## 24.4.0
 ! Minor breaking change ! For implementations using `salt` the browser compatability is tied to SubtleCrypto's `digest` method support
 

cypress/integration/bridge_utils.js

@@ -16,7 +16,7 @@ function initMain(name, version) {
 }
 
 const SDK_NAME = "javascript_native_web";
-const SDK_VERSION = "24.4.0";
+const SDK_VERSION = "24.4.1";
 
 // tests
 describe("Bridged SDK Utilities Tests", () => {

cypress/integration/device_id_change.js

@@ -145,6 +145,14 @@ describe("Device ID change tests ", ()=>{
             });
         });
     });
+    it("Check init time temp mode with set_id", () => {
+        hp.haltAndClearStorage(() => {
+            initMain(true); // init in offline mode
+            testDeviceIdInReqs(() => {
+                Countly.set_id("new ID");
+            });
+        });
+    });
 
     // ========================================
     // default init configuration tests
@@ -209,4 +217,60 @@ describe("Device ID change tests ", ()=>{
             });
         });
     });
-});
+});
+
+describe("Set ID change tests ", () => {
+    it("set_id should be non merge as there was dev provided id", () => {
+        hp.haltAndClearStorage(() => {
+            Countly.init({
+                app_key: "YOUR_APP_KEY",
+                url: "https://your.domain.count.ly",
+                test_mode: true,
+                debug: true,
+                device_id: "old ID"
+            });
+            Countly.add_event(eventObj("1")); // record an event.
+            cy.wait(500); // wait for the request to be sent
+            cy.fetch_local_request_queue().then((eq) => {
+                expect(eq[0].device_id).to.equal("old ID");
+                Countly.set_id("new ID");
+                Countly.add_event(eventObj("2")); // record another event
+                cy.wait(500); // wait for the request to be sent
+                cy.fetch_local_request_queue().then((eq2) => {
+                    expect(eq2.length).to.equal(3); // no merge request
+                    expect(eq2[0].device_id).to.equal("old ID");
+                    expect(eq2[0].events).to.contains("\"key\":\"1\"");
+                    expect(eq2[1].device_id).to.equal("new ID");
+                    expect(eq2[1].begin_session).to.equal(1);
+                    expect(eq2[2].device_id).to.equal("new ID");
+                    expect(eq2[2].events).to.contains("\"key\":\"2\"");
+                });
+            });
+        });
+    });
+    it("set_id should be merge as there was sdk generated id", () => {
+        hp.haltAndClearStorage(() => {
+            initMain(false); // init normally
+            Countly.add_event(eventObj("1")); // record an event.
+            cy.wait(500); // wait for the request to be sent
+            let generatedID;
+            cy.fetch_local_request_queue().then((eq) => {
+                cy.log(eq);
+                generatedID = eq[0].device_id; // get the new id from first item in the queue
+                Countly.set_id("new ID");
+                Countly.add_event(eventObj("2")); // record another event
+                cy.wait(500); // wait for the request to be sent
+                cy.fetch_local_request_queue().then((eq2) => {
+                    cy.log(eq2);
+                    expect(eq2.length).to.equal(3); // merge request
+                    expect(eq2[0].device_id).to.equal(generatedID);
+                    expect(eq2[0].events).to.contains("\"key\":\"1\"");
+                    expect(eq2[1].device_id).to.equal("new ID");
+                    expect(eq2[1].old_device_id).to.equal(generatedID);
+                    expect(eq2[2].device_id).to.equal("new ID");
+                    expect(eq2[2].events).to.contains("\"key\":\"2\"");
+                });
+            });
+        });
+    });
+});

examples/Angular/countly.d.ts

@@ -1,8 +1,6 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
+import { bootstrapApplication } from '@angular/platform-browser';
+import { appConfig } from './app/app.config';
+import { AppComponent } from './app/app.component';
 
 import Countly from 'countly-sdk-web';
 
@@ -17,15 +15,64 @@ if (COUNTLY_APP_KEY === "YOUR_APP_KEY" || COUNTLY_SERVER_KEY === "https://your.s
 // initializing countly with params
 Countly.init({
   app_key: COUNTLY_APP_KEY,
-  url: COUNTLY_SERVER_KEY, //your server goes here
+  url: COUNTLY_SERVER_KEY,
   debug: true
 });
+
+// Automatic tracking
 Countly.track_sessions();
+Countly.track_clicks();
+Countly.track_links();
+Countly.track_forms();
+Countly.track_errors();
+Countly.track_scrolls();
+Countly.track_pageview();
 
-if (environment.production) {
-  enableProdMode();
+// Showing a feedback widget
+Countly.get_available_feedback_widgets(function (widgets, err) {
+  console.log('Available feedback widgets:', widgets);
+  if (widgets && widgets.length) {
+    console.log('Presenting feedback widget:', widgets[0]);
+    Countly.present_feedback_widget(widgets[0]); // Show the first widget
+  }
+});
 
-}
+// Reporting a feedback widget's result manually
+Countly.get_available_feedback_widgets(function (widgets, err) {
+  console.log('Available feedback widgets:', widgets);
+  if (widgets && widgets.length) {
+    console.log('Reporting feedback widget:', widgets[0]);
+    Countly.getFeedbackWidgetData(widgets[0], function (data, err) {
+      console.log('Feedback widget data:', data);
+      Countly.reportFeedbackWidgetManually(widgets[0], data, null); // Report the first widget's data as null
+    });
+  }
+});
+
+// add a custom event
+Countly.add_event({
+  key: "test",
+  count: 1,
+  dur: 50,
+  sum: 0.99,
+  segmentation: {
+    "Country": "Germany",
+    "Age": "28"
+  }
+});
+
+// send some user properties
+Countly.user_details({
+  name: "John Doe",
+  username: "johndoe",
+  organization: "Countly",
+  phone: "1234567890",
+  picture: "https://path.to/picture",
+});
+
+// set custom user property
+Countly.userData.set("key", "value");
+Countly.userData.save();
 
-platformBrowserDynamic().bootstrapModule(AppModule)
-  .catch(err => console.error(err));
+bootstrapApplication(AppComponent, appConfig)
+  .catch((err) => console.error(err));