Merge pull request #40 from BuildFire/histogram

Histogram

Author: mas-iota

.eslintrc

@@ -6,6 +6,7 @@
   ],
   "rules": {
     "consistent-return": 0,
+    "no-prototype-builtins": 0,
     "no-return-assign": 0,
     "comma-dangle": 0,
     "no-restricted-globals": 0,

src/DataMocks/category.js

@@ -6,6 +6,30 @@ const authManager = {
   set currentUser(user) {
     authManager._currentUser = user;
   },
+  get sanitizedCurrentUser() {
+    if (!this.currentUser) return null;
+    const sanitizedUser = { ...this.currentUser };
+
+    // the following will be stored in location createdBy
+    if (typeof sanitizedUser._cpUser !== "undefined") {
+      sanitizedUser.isCPUser = true;
+    }
+
+    // List of properties to remove
+    const propertiesToRemove = [
+      "email", "username", "accessToken", "accessTokenExpiresIn",
+      "externalApps", "lastUsedIPAddress", "userToken", "loginProviderType",
+      "failedAttemptCount", "_cpUser",
+    ];
+
+    propertiesToRemove.forEach((prop) => {
+      if (sanitizedUser.hasOwnProperty(prop)) {
+        delete sanitizedUser[prop];
+      }
+    });
+
+    return sanitizedUser;
+  },
   enforceLogin(callback) {
     buildfire.auth.getCurrentUser((err, currentUser) => {
       if (!currentUser) {
@@ -33,6 +57,14 @@ const authManager = {
       authManager.currentUser = null;
       window.location.reload();
     }, true);
+  },
+  getUserProfile(userId) {
+    return new Promise((resolve, reject) => {
+      buildfire.auth.getUserProfile({ userId }, (err, user) => {
+        if (err) return reject(err);
+        resolve(user);
+      });
+    });
   }
 };
 buildfire.auth.onLogout(authManager.enforceLogin, true);

src/DataMocks/index.js

@@ -553,6 +553,7 @@ p.info-note.info-note-transparent {
 }
 
 .bf-tooltip:not(.hidden-tooltip) {
+    cursor: pointer;
     display: inline-block;
     text-align: center;
     position: relative;

src/DataMocks/location.js

@@ -7,7 +7,7 @@ import Analytics from '../../../../utils/analytics';
 export default {
   createCategory(category) {
     category.createdOn = new Date();
-    category.createdBy = authManager.currentUser;
+    category.createdBy = authManager.sanitizedCurrentUser;
     return Categories.create(category.toJSON()).then((result) => {
       Analytics.registerCategoryEvent(result.id, result.title);
       for (const sub of result.subcategories) {
@@ -45,38 +45,40 @@ export default {
     return Categories.search(options);
   },
   getAllCategories(callback) {
-    let searchOptions = {
-        limit: 50,
-        skip: 0,
-        
-    }, categories = [];
-   
+    const options = {
+      limit: 50,
+      skip: 0,
+      filter: {},
+      sort: { title: 1 }
+    };
+    let categories = [];
+
+    options.filter["_buildfire.index.date1"] = { $type: 10 };
+
     const getCategoriesData = (callback) => {
-        Categories.search(searchOptions).then(result => {
-          if (result.length < searchOptions.limit) {
+        Categories.search(options).then((result) => {
+          if (result.length < options.limit) {
               categories = categories.concat(result);
-              categories = categories.filter(x => x.deletedBy == null);
               return callback(categories);
           } else {
-              searchOptions.skip = searchOptions.skip + searchOptions.limit;
+              options.skip = options.skip + options.limit;
               categories = categories.concat(result);
               return getCategoriesData(callback);
           }
         })
     }
 
     getCategoriesData(callback);
-
   },
 
   updateCategory(categoryId, category) {
     category.lastUpdatedOn = new Date();
-    category.lastUpdatedBy = authManager.currentUser;
+    category.lastUpdatedBy = authManager.sanitizedCurrentUser;
     return Categories.update(categoryId, category.toJSON());
   },
   deleteCategory(categoryId, category) {
     category.deletedOn = new Date();
-    category.deletedBy = authManager.currentUser;
+    category.deletedBy = authManager.sanitizedCurrentUser;
     return Categories.delete(categoryId, category.toJSON());
   }
 };

src/UserAccessControl/authManager.js

@@ -556,13 +556,13 @@ window.importCategories = () => {
         let categoriesLoaded = new Set();
         result.forEach((item) =>{
           let itemCategories = item.categories.split(",");
-          if(itemCategories?.length > 0) 
+          if(itemCategories?.length > 0)
             itemCategories.forEach((cat)=> {
-              if(cat?.length > 0) 
+              if(cat?.length > 0)
                 categoriesLoaded.add(cat.trim())
             });
         });
-        categoriesLoaded.forEach((cat) => categories.push(new Category({title:cat,createdOn:new Date(),createdBy:authManager.currentUser}).toJSON()));
+        categoriesLoaded.forEach((cat) => categories.push(new Category({title:cat,createdOn:new Date(),createdBy:authManager.sanitizedCurrentUser}).toJSON()));
       }else{
         categories = result.map((elem) => {
           delete elem.id;
@@ -571,7 +571,7 @@ window.importCategories = () => {
           elem.iconClassName = elem?.iconClassName?.trim();
           elem.subcategories = elem.subcategories?.split(',').filter((elem) => elem).map((subTitle) => ({ id: generateUUID(), title: subTitle?.trim() }));
           elem.createdOn = new Date();
-          elem.createdBy = authManager.currentUser;
+          elem.createdBy = authManager.sanitizedCurrentUser;
           return new Category(elem).toJSON();
         });
       }
@@ -677,7 +677,7 @@ const loadMoreCategories = () => {
         categoriesListUI.append(categories)
         isLoading = false;
       });
-    } 
+    }
   };
 }
 

src/control/assets/bf_base.css

@@ -9,7 +9,7 @@ export default {
   },
   saveSettings(settings) {
     settings.lastUpdatedOn = new Date();
-    settings.lastUpdatedBy = authManager.currentUser;
+    settings.lastUpdatedBy = authManager.sanitizedCurrentUser;
     return Settings.save(settings.toJSON());
   },
 };

src/control/content/js/categories/controller.js

@@ -12,7 +12,7 @@ export default {
   createLocation(location) {
     location.clientId = generateUUID();
     location.createdOn = new Date();
-    location.createdBy = authManager.currentUser;
+    location.createdBy = authManager.sanitizedCurrentUser;
     return Location.add(location.toJSON()).then((result) => {
       Analytics.registerLocationViewedEvent(result.id, result.title);
       DeepLink.registerDeeplink(result);
@@ -40,7 +40,7 @@ export default {
   },
   updateLocation(locationId, location) {
     location.lastUpdatedOn = new Date();
-    location.lastUpdatedBy = authManager.currentUser;
+    location.lastUpdatedBy = authManager.sanitizedCurrentUser;
     const promiseChain = [
       Location.update(locationId, location.toJSON()),
       DeepLink.registerDeeplink(location),
@@ -67,7 +67,7 @@ export default {
   },
   saveSettings(settings) {
     settings.lastUpdatedOn = new Date();
-    settings.lastUpdatedBy = authManager.currentUser;
+    settings.lastUpdatedBy = authManager.sanitizedCurrentUser;
     return Settings.save(settings.toJSON());
   },
 };