@plusscommunities/pluss-circles-web 1.5.6 → 1.5.7-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs.js +60 -26
- package/dist/index.esm.js +60 -26
- package/dist/index.umd.js +60 -26
- package/package.json +1 -1
- package/src/screens/Circles.js +469 -376
package/dist/index.umd.js
CHANGED
|
@@ -398,7 +398,7 @@
|
|
|
398
398
|
|
|
399
399
|
case 3:
|
|
400
400
|
res = _context.sent;
|
|
401
|
-
console.log(
|
|
401
|
+
console.log("getData", res.data);
|
|
402
402
|
|
|
403
403
|
_this.props.circlesLoaded(res.data);
|
|
404
404
|
|
|
@@ -412,7 +412,7 @@
|
|
|
412
412
|
case 9:
|
|
413
413
|
_context.prev = 9;
|
|
414
414
|
_context.t0 = _context["catch"](0);
|
|
415
|
-
console.error(
|
|
415
|
+
console.error("getData", _context.t0);
|
|
416
416
|
|
|
417
417
|
_this.setState({
|
|
418
418
|
loadingAll: false
|
|
@@ -494,9 +494,15 @@
|
|
|
494
494
|
});
|
|
495
495
|
});
|
|
496
496
|
|
|
497
|
+
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectSort", function (sortType) {
|
|
498
|
+
_this.setState({
|
|
499
|
+
sortBy: sortType
|
|
500
|
+
});
|
|
501
|
+
});
|
|
502
|
+
|
|
497
503
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
|
|
498
504
|
var stateChange = {};
|
|
499
|
-
stateChange[event.target.getAttribute(
|
|
505
|
+
stateChange[event.target.getAttribute("id")] = event.target.value;
|
|
500
506
|
|
|
501
507
|
_this.setState(stateChange);
|
|
502
508
|
});
|
|
@@ -508,14 +514,14 @@
|
|
|
508
514
|
circleActions.delete(circle.Id).then(function (res) {
|
|
509
515
|
_this.getData();
|
|
510
516
|
}).catch(function (res) {
|
|
511
|
-
alert(
|
|
517
|
+
alert("Something went wrong with the request. Please try again.");
|
|
512
518
|
});
|
|
513
519
|
}
|
|
514
520
|
});
|
|
515
521
|
|
|
516
522
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getTypeFilterText", function (type) {
|
|
517
|
-
if (type ===
|
|
518
|
-
return
|
|
523
|
+
if (type === "private") {
|
|
524
|
+
return "Private Message";
|
|
519
525
|
}
|
|
520
526
|
|
|
521
527
|
return ___default['default'].capitalize(values.entityName);
|
|
@@ -525,14 +531,15 @@
|
|
|
525
531
|
if (circle.IsPrivate) {
|
|
526
532
|
return "PM: ".concat(circle.Audience.map(function (user) {
|
|
527
533
|
return user.displayName;
|
|
528
|
-
}).join(
|
|
534
|
+
}).join(", "));
|
|
529
535
|
}
|
|
530
536
|
|
|
531
537
|
return circle.Title;
|
|
532
538
|
});
|
|
533
539
|
|
|
534
540
|
_this.state = {
|
|
535
|
-
userSearch:
|
|
541
|
+
userSearch: "",
|
|
542
|
+
sortBy: "newest"
|
|
536
543
|
};
|
|
537
544
|
return _this;
|
|
538
545
|
}
|
|
@@ -551,7 +558,7 @@
|
|
|
551
558
|
|
|
552
559
|
if (this.state.selectedTypeFilter) {
|
|
553
560
|
result = ___default['default'].filter(result, function (circle) {
|
|
554
|
-
return _this2.state.selectedTypeFilter ===
|
|
561
|
+
return _this2.state.selectedTypeFilter === "circle" ? !circle.IsPrivate : circle.IsPrivate;
|
|
555
562
|
});
|
|
556
563
|
}
|
|
557
564
|
|
|
@@ -561,6 +568,15 @@
|
|
|
561
568
|
return user.userId === _this2.state.selectedUserFilter.userId;
|
|
562
569
|
});
|
|
563
570
|
});
|
|
571
|
+
} // Apply sorting
|
|
572
|
+
|
|
573
|
+
|
|
574
|
+
result = ___default['default'].sortBy(result, function (circle) {
|
|
575
|
+
return moment__default['default'](circle.Changed).valueOf();
|
|
576
|
+
});
|
|
577
|
+
|
|
578
|
+
if (this.state.sortBy === "newest") {
|
|
579
|
+
result.reverse();
|
|
564
580
|
}
|
|
565
581
|
|
|
566
582
|
return result;
|
|
@@ -578,10 +594,10 @@
|
|
|
578
594
|
});
|
|
579
595
|
users = ___default['default'].sortBy(___default['default'].uniqBy(users, function (user) {
|
|
580
596
|
return user.userId;
|
|
581
|
-
}),
|
|
597
|
+
}), "displayName");
|
|
582
598
|
return ___default['default'].filter(users, function (u) {
|
|
583
599
|
if (!___default['default'].isEmpty(_this3.state.userSearch)) {
|
|
584
|
-
return (u.displayName ||
|
|
600
|
+
return (u.displayName || "").toLowerCase().indexOf(_this3.state.userSearch.toLowerCase()) > -1;
|
|
585
601
|
}
|
|
586
602
|
|
|
587
603
|
return true;
|
|
@@ -615,7 +631,7 @@
|
|
|
615
631
|
className: "table-TitleColumn"
|
|
616
632
|
}, /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
|
|
617
633
|
to: "/".concat(values.featureKey, "/").concat(values.entityKey, "/").concat(circle.Id)
|
|
618
|
-
}, this.getTitle(circle))), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'](circle.Changed).local().format(
|
|
634
|
+
}, this.getTitle(circle))), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'](circle.Changed).local().format("D MMM YYYY")), /*#__PURE__*/React__default['default'].createElement("td", null, circle.Audience.map(function (user) {
|
|
619
635
|
return /*#__PURE__*/React__default['default'].createElement(Components$4.ProfilePic, {
|
|
620
636
|
size: 30,
|
|
621
637
|
image: user.profilePic,
|
|
@@ -626,8 +642,8 @@
|
|
|
626
642
|
className: "table-options"
|
|
627
643
|
}, /*#__PURE__*/React__default['default'].createElement("div", {
|
|
628
644
|
style: {
|
|
629
|
-
display:
|
|
630
|
-
alignItems:
|
|
645
|
+
display: "flex",
|
|
646
|
+
alignItems: "center"
|
|
631
647
|
}
|
|
632
648
|
}, this.validateCircleAdmin(circle) && !circle.IsPrivate && /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
|
|
633
649
|
to: "/".concat(values.featureKey, "/edit/").concat(circle.Id)
|
|
@@ -636,7 +652,7 @@
|
|
|
636
652
|
fontSize: 20,
|
|
637
653
|
padding: 5,
|
|
638
654
|
marginLeft: 12,
|
|
639
|
-
cursor:
|
|
655
|
+
cursor: "pointer"
|
|
640
656
|
},
|
|
641
657
|
name: "pencil"
|
|
642
658
|
})), this.validateCircleAdmin(circle, true) && !circle.IsPrivate && /*#__PURE__*/React__default['default'].createElement("a", {
|
|
@@ -648,7 +664,7 @@
|
|
|
648
664
|
fontSize: 20,
|
|
649
665
|
padding: 5,
|
|
650
666
|
marginLeft: 12,
|
|
651
|
-
cursor:
|
|
667
|
+
cursor: "pointer"
|
|
652
668
|
},
|
|
653
669
|
name: "minus-circle"
|
|
654
670
|
})))));
|
|
@@ -656,6 +672,8 @@
|
|
|
656
672
|
}, {
|
|
657
673
|
key: "renderFilters",
|
|
658
674
|
value: function renderFilters() {
|
|
675
|
+
var _this6 = this;
|
|
676
|
+
|
|
659
677
|
var userFilter = /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
660
678
|
className: "marginRight-10",
|
|
661
679
|
onClick: this.openUserFilter,
|
|
@@ -695,12 +713,28 @@
|
|
|
695
713
|
}, /*#__PURE__*/React__default['default'].createElement(Components$4.Text, {
|
|
696
714
|
type: "h5",
|
|
697
715
|
className: "marginRight-20"
|
|
698
|
-
}, "Filter by"), userFilter, typeFilter
|
|
716
|
+
}, "Filter by"), userFilter, typeFilter, /*#__PURE__*/React__default['default'].createElement(Components$4.Text, {
|
|
717
|
+
type: "h5",
|
|
718
|
+
className: "marginRight-20 marginLeft-20"
|
|
719
|
+
}, "Sort by:"), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
720
|
+
className: "marginRight-10",
|
|
721
|
+
onClick: function onClick() {
|
|
722
|
+
return _this6.selectSort("newest");
|
|
723
|
+
},
|
|
724
|
+
leftIcon: this.state.sortBy === "newest" ? "check" : null,
|
|
725
|
+
text: "Newest first"
|
|
726
|
+
}), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
727
|
+
onClick: function onClick() {
|
|
728
|
+
return _this6.selectSort("oldest");
|
|
729
|
+
},
|
|
730
|
+
leftIcon: this.state.sortBy === "oldest" ? "check" : null,
|
|
731
|
+
text: "Oldest first"
|
|
732
|
+
}));
|
|
699
733
|
}
|
|
700
734
|
}, {
|
|
701
735
|
key: "renderUserFilterPopup",
|
|
702
736
|
value: function renderUserFilterPopup() {
|
|
703
|
-
var
|
|
737
|
+
var _this7 = this;
|
|
704
738
|
|
|
705
739
|
if (!this.state.userFilterOpen) {
|
|
706
740
|
return null;
|
|
@@ -720,7 +754,7 @@
|
|
|
720
754
|
placeholder: "Enter name",
|
|
721
755
|
value: this.state.userSearch,
|
|
722
756
|
onChange: function onChange(e) {
|
|
723
|
-
return
|
|
757
|
+
return _this7.onHandleChange(e);
|
|
724
758
|
},
|
|
725
759
|
alwaysShowLabel: true
|
|
726
760
|
}), this.getUsers().map(function (user) {
|
|
@@ -728,7 +762,7 @@
|
|
|
728
762
|
key: user.userId,
|
|
729
763
|
user: user,
|
|
730
764
|
onClick: function onClick() {
|
|
731
|
-
|
|
765
|
+
_this7.selectUserFilter(user);
|
|
732
766
|
}
|
|
733
767
|
});
|
|
734
768
|
}));
|
|
@@ -736,7 +770,7 @@
|
|
|
736
770
|
}, {
|
|
737
771
|
key: "renderTypeFilterPopup",
|
|
738
772
|
value: function renderTypeFilterPopup() {
|
|
739
|
-
var
|
|
773
|
+
var _this8 = this;
|
|
740
774
|
|
|
741
775
|
if (!this.state.typeFilterOpen) {
|
|
742
776
|
return null;
|
|
@@ -750,13 +784,13 @@
|
|
|
750
784
|
onClose: this.closeTypeFilter
|
|
751
785
|
}, /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
752
786
|
onClick: function onClick() {
|
|
753
|
-
|
|
787
|
+
_this8.selectTypeFilter("circle");
|
|
754
788
|
},
|
|
755
789
|
text: ___default['default'].capitalize(values.entityName),
|
|
756
790
|
className: "marginRight-10"
|
|
757
791
|
}), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
758
792
|
onClick: function onClick() {
|
|
759
|
-
|
|
793
|
+
_this8.selectTypeFilter("private");
|
|
760
794
|
},
|
|
761
795
|
text: "Private Message"
|
|
762
796
|
}));
|
|
@@ -764,7 +798,7 @@
|
|
|
764
798
|
}, {
|
|
765
799
|
key: "render",
|
|
766
800
|
value: function render() {
|
|
767
|
-
var
|
|
801
|
+
var _this9 = this;
|
|
768
802
|
|
|
769
803
|
return /*#__PURE__*/React__default['default'].createElement("div", null, this.renderTypeFilterPopup(), this.renderUserFilterPopup(), /*#__PURE__*/React__default['default'].createElement(Components$4.Header, null, this.canAddNew() && /*#__PURE__*/React__default['default'].createElement(Components$4.AddButton, {
|
|
770
804
|
onClick: this.onAddNew,
|
|
@@ -781,14 +815,14 @@
|
|
|
781
815
|
condensed: true,
|
|
782
816
|
hover: true,
|
|
783
817
|
style: {
|
|
784
|
-
minWidth:
|
|
818
|
+
minWidth: "100%"
|
|
785
819
|
}
|
|
786
820
|
}, /*#__PURE__*/React__default['default'].createElement("thead", null, /*#__PURE__*/React__default['default'].createElement("tr", null, /*#__PURE__*/React__default['default'].createElement("th", null, "Title"), /*#__PURE__*/React__default['default'].createElement("th", null, "Last updated"), /*#__PURE__*/React__default['default'].createElement("th", null, "Members"), /*#__PURE__*/React__default['default'].createElement("th", {
|
|
787
821
|
style: {
|
|
788
822
|
width: 50
|
|
789
823
|
}
|
|
790
824
|
}))), /*#__PURE__*/React__default['default'].createElement("tbody", null, this.getCircles().map(function (circle) {
|
|
791
|
-
return
|
|
825
|
+
return _this9.renderRow(circle);
|
|
792
826
|
})))));
|
|
793
827
|
}
|
|
794
828
|
}]);
|