@plusscommunities/pluss-circles-web 1.5.5 → 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 +130 -96
- package/dist/index.esm.js +130 -96
- package/dist/index.umd.js +130 -96
- package/package.json +1 -1
- package/src/screens/AddCircle.js +537 -478
- package/src/screens/Circle.js +843 -751
- package/src/screens/Circles.js +469 -376
package/dist/index.cjs.js
CHANGED
|
@@ -418,7 +418,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
418
418
|
|
|
419
419
|
case 3:
|
|
420
420
|
res = _context.sent;
|
|
421
|
-
console.log(
|
|
421
|
+
console.log("getData", res.data);
|
|
422
422
|
|
|
423
423
|
_this.props.circlesLoaded(res.data);
|
|
424
424
|
|
|
@@ -432,7 +432,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
432
432
|
case 9:
|
|
433
433
|
_context.prev = 9;
|
|
434
434
|
_context.t0 = _context["catch"](0);
|
|
435
|
-
console.error(
|
|
435
|
+
console.error("getData", _context.t0);
|
|
436
436
|
|
|
437
437
|
_this.setState({
|
|
438
438
|
loadingAll: false
|
|
@@ -514,9 +514,15 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
514
514
|
});
|
|
515
515
|
});
|
|
516
516
|
|
|
517
|
+
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectSort", function (sortType) {
|
|
518
|
+
_this.setState({
|
|
519
|
+
sortBy: sortType
|
|
520
|
+
});
|
|
521
|
+
});
|
|
522
|
+
|
|
517
523
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
|
|
518
524
|
var stateChange = {};
|
|
519
|
-
stateChange[event.target.getAttribute(
|
|
525
|
+
stateChange[event.target.getAttribute("id")] = event.target.value;
|
|
520
526
|
|
|
521
527
|
_this.setState(stateChange);
|
|
522
528
|
});
|
|
@@ -528,14 +534,14 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
528
534
|
circleActions.delete(circle.Id).then(function (res) {
|
|
529
535
|
_this.getData();
|
|
530
536
|
}).catch(function (res) {
|
|
531
|
-
alert(
|
|
537
|
+
alert("Something went wrong with the request. Please try again.");
|
|
532
538
|
});
|
|
533
539
|
}
|
|
534
540
|
});
|
|
535
541
|
|
|
536
542
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getTypeFilterText", function (type) {
|
|
537
|
-
if (type ===
|
|
538
|
-
return
|
|
543
|
+
if (type === "private") {
|
|
544
|
+
return "Private Message";
|
|
539
545
|
}
|
|
540
546
|
|
|
541
547
|
return ___default['default'].capitalize(values.entityName);
|
|
@@ -545,14 +551,15 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
545
551
|
if (circle.IsPrivate) {
|
|
546
552
|
return "PM: ".concat(circle.Audience.map(function (user) {
|
|
547
553
|
return user.displayName;
|
|
548
|
-
}).join(
|
|
554
|
+
}).join(", "));
|
|
549
555
|
}
|
|
550
556
|
|
|
551
557
|
return circle.Title;
|
|
552
558
|
});
|
|
553
559
|
|
|
554
560
|
_this.state = {
|
|
555
|
-
userSearch:
|
|
561
|
+
userSearch: "",
|
|
562
|
+
sortBy: "newest"
|
|
556
563
|
};
|
|
557
564
|
return _this;
|
|
558
565
|
}
|
|
@@ -571,7 +578,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
571
578
|
|
|
572
579
|
if (this.state.selectedTypeFilter) {
|
|
573
580
|
result = ___default['default'].filter(result, function (circle) {
|
|
574
|
-
return _this2.state.selectedTypeFilter ===
|
|
581
|
+
return _this2.state.selectedTypeFilter === "circle" ? !circle.IsPrivate : circle.IsPrivate;
|
|
575
582
|
});
|
|
576
583
|
}
|
|
577
584
|
|
|
@@ -581,6 +588,15 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
581
588
|
return user.userId === _this2.state.selectedUserFilter.userId;
|
|
582
589
|
});
|
|
583
590
|
});
|
|
591
|
+
} // Apply sorting
|
|
592
|
+
|
|
593
|
+
|
|
594
|
+
result = ___default['default'].sortBy(result, function (circle) {
|
|
595
|
+
return moment__default['default'](circle.Changed).valueOf();
|
|
596
|
+
});
|
|
597
|
+
|
|
598
|
+
if (this.state.sortBy === "newest") {
|
|
599
|
+
result.reverse();
|
|
584
600
|
}
|
|
585
601
|
|
|
586
602
|
return result;
|
|
@@ -598,10 +614,10 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
598
614
|
});
|
|
599
615
|
users = ___default['default'].sortBy(___default['default'].uniqBy(users, function (user) {
|
|
600
616
|
return user.userId;
|
|
601
|
-
}),
|
|
617
|
+
}), "displayName");
|
|
602
618
|
return ___default['default'].filter(users, function (u) {
|
|
603
619
|
if (!___default['default'].isEmpty(_this3.state.userSearch)) {
|
|
604
|
-
return (u.displayName ||
|
|
620
|
+
return (u.displayName || "").toLowerCase().indexOf(_this3.state.userSearch.toLowerCase()) > -1;
|
|
605
621
|
}
|
|
606
622
|
|
|
607
623
|
return true;
|
|
@@ -635,7 +651,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
635
651
|
className: "table-TitleColumn"
|
|
636
652
|
}, /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
|
|
637
653
|
to: "/".concat(values.featureKey, "/").concat(values.entityKey, "/").concat(circle.Id)
|
|
638
|
-
}, this.getTitle(circle))), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'](circle.Changed).local().format(
|
|
654
|
+
}, 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) {
|
|
639
655
|
return /*#__PURE__*/React__default['default'].createElement(Components$4.ProfilePic, {
|
|
640
656
|
size: 30,
|
|
641
657
|
image: user.profilePic,
|
|
@@ -646,8 +662,8 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
646
662
|
className: "table-options"
|
|
647
663
|
}, /*#__PURE__*/React__default['default'].createElement("div", {
|
|
648
664
|
style: {
|
|
649
|
-
display:
|
|
650
|
-
alignItems:
|
|
665
|
+
display: "flex",
|
|
666
|
+
alignItems: "center"
|
|
651
667
|
}
|
|
652
668
|
}, this.validateCircleAdmin(circle) && !circle.IsPrivate && /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
|
|
653
669
|
to: "/".concat(values.featureKey, "/edit/").concat(circle.Id)
|
|
@@ -656,7 +672,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
656
672
|
fontSize: 20,
|
|
657
673
|
padding: 5,
|
|
658
674
|
marginLeft: 12,
|
|
659
|
-
cursor:
|
|
675
|
+
cursor: "pointer"
|
|
660
676
|
},
|
|
661
677
|
name: "pencil"
|
|
662
678
|
})), this.validateCircleAdmin(circle, true) && !circle.IsPrivate && /*#__PURE__*/React__default['default'].createElement("a", {
|
|
@@ -668,7 +684,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
668
684
|
fontSize: 20,
|
|
669
685
|
padding: 5,
|
|
670
686
|
marginLeft: 12,
|
|
671
|
-
cursor:
|
|
687
|
+
cursor: "pointer"
|
|
672
688
|
},
|
|
673
689
|
name: "minus-circle"
|
|
674
690
|
})))));
|
|
@@ -676,6 +692,8 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
676
692
|
}, {
|
|
677
693
|
key: "renderFilters",
|
|
678
694
|
value: function renderFilters() {
|
|
695
|
+
var _this6 = this;
|
|
696
|
+
|
|
679
697
|
var userFilter = /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
680
698
|
className: "marginRight-10",
|
|
681
699
|
onClick: this.openUserFilter,
|
|
@@ -715,12 +733,28 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
715
733
|
}, /*#__PURE__*/React__default['default'].createElement(Components$4.Text, {
|
|
716
734
|
type: "h5",
|
|
717
735
|
className: "marginRight-20"
|
|
718
|
-
}, "Filter by"), userFilter, typeFilter
|
|
736
|
+
}, "Filter by"), userFilter, typeFilter, /*#__PURE__*/React__default['default'].createElement(Components$4.Text, {
|
|
737
|
+
type: "h5",
|
|
738
|
+
className: "marginRight-20 marginLeft-20"
|
|
739
|
+
}, "Sort by:"), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
740
|
+
className: "marginRight-10",
|
|
741
|
+
onClick: function onClick() {
|
|
742
|
+
return _this6.selectSort("newest");
|
|
743
|
+
},
|
|
744
|
+
leftIcon: this.state.sortBy === "newest" ? "check" : null,
|
|
745
|
+
text: "Newest first"
|
|
746
|
+
}), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
747
|
+
onClick: function onClick() {
|
|
748
|
+
return _this6.selectSort("oldest");
|
|
749
|
+
},
|
|
750
|
+
leftIcon: this.state.sortBy === "oldest" ? "check" : null,
|
|
751
|
+
text: "Oldest first"
|
|
752
|
+
}));
|
|
719
753
|
}
|
|
720
754
|
}, {
|
|
721
755
|
key: "renderUserFilterPopup",
|
|
722
756
|
value: function renderUserFilterPopup() {
|
|
723
|
-
var
|
|
757
|
+
var _this7 = this;
|
|
724
758
|
|
|
725
759
|
if (!this.state.userFilterOpen) {
|
|
726
760
|
return null;
|
|
@@ -740,7 +774,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
740
774
|
placeholder: "Enter name",
|
|
741
775
|
value: this.state.userSearch,
|
|
742
776
|
onChange: function onChange(e) {
|
|
743
|
-
return
|
|
777
|
+
return _this7.onHandleChange(e);
|
|
744
778
|
},
|
|
745
779
|
alwaysShowLabel: true
|
|
746
780
|
}), this.getUsers().map(function (user) {
|
|
@@ -748,7 +782,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
748
782
|
key: user.userId,
|
|
749
783
|
user: user,
|
|
750
784
|
onClick: function onClick() {
|
|
751
|
-
|
|
785
|
+
_this7.selectUserFilter(user);
|
|
752
786
|
}
|
|
753
787
|
});
|
|
754
788
|
}));
|
|
@@ -756,7 +790,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
756
790
|
}, {
|
|
757
791
|
key: "renderTypeFilterPopup",
|
|
758
792
|
value: function renderTypeFilterPopup() {
|
|
759
|
-
var
|
|
793
|
+
var _this8 = this;
|
|
760
794
|
|
|
761
795
|
if (!this.state.typeFilterOpen) {
|
|
762
796
|
return null;
|
|
@@ -770,13 +804,13 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
770
804
|
onClose: this.closeTypeFilter
|
|
771
805
|
}, /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
772
806
|
onClick: function onClick() {
|
|
773
|
-
|
|
807
|
+
_this8.selectTypeFilter("circle");
|
|
774
808
|
},
|
|
775
809
|
text: ___default['default'].capitalize(values.entityName),
|
|
776
810
|
className: "marginRight-10"
|
|
777
811
|
}), /*#__PURE__*/React__default['default'].createElement(Components$4.Tag, {
|
|
778
812
|
onClick: function onClick() {
|
|
779
|
-
|
|
813
|
+
_this8.selectTypeFilter("private");
|
|
780
814
|
},
|
|
781
815
|
text: "Private Message"
|
|
782
816
|
}));
|
|
@@ -784,7 +818,7 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
784
818
|
}, {
|
|
785
819
|
key: "render",
|
|
786
820
|
value: function render() {
|
|
787
|
-
var
|
|
821
|
+
var _this9 = this;
|
|
788
822
|
|
|
789
823
|
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, {
|
|
790
824
|
onClick: this.onAddNew,
|
|
@@ -801,14 +835,14 @@ var Circles = /*#__PURE__*/function (_Component) {
|
|
|
801
835
|
condensed: true,
|
|
802
836
|
hover: true,
|
|
803
837
|
style: {
|
|
804
|
-
minWidth:
|
|
838
|
+
minWidth: "100%"
|
|
805
839
|
}
|
|
806
840
|
}, /*#__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", {
|
|
807
841
|
style: {
|
|
808
842
|
width: 50
|
|
809
843
|
}
|
|
810
844
|
}))), /*#__PURE__*/React__default['default'].createElement("tbody", null, this.getCircles().map(function (circle) {
|
|
811
|
-
return
|
|
845
|
+
return _this9.renderRow(circle);
|
|
812
846
|
})))));
|
|
813
847
|
}
|
|
814
848
|
}]);
|
|
@@ -870,7 +904,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
870
904
|
if (res.data != null && !___default['default'].isEmpty(res.data.results.Items)) {
|
|
871
905
|
_this.setState({
|
|
872
906
|
users: ___default['default'].sortBy(res.data.results.Items, function (u) {
|
|
873
|
-
return (u.displayName ||
|
|
907
|
+
return (u.displayName || "").toLowerCase();
|
|
874
908
|
}).map(function (u) {
|
|
875
909
|
return _objectSpread$4(_objectSpread$4({}, u), {}, {
|
|
876
910
|
userId: u.userId || u.Id
|
|
@@ -894,7 +928,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
894
928
|
}
|
|
895
929
|
|
|
896
930
|
if (!___default['default'].isEmpty(_this.state.userSearch)) {
|
|
897
|
-
return (u.displayName ||
|
|
931
|
+
return (u.displayName || "").toLowerCase().indexOf(_this.state.userSearch.toLowerCase()) > -1;
|
|
898
932
|
}
|
|
899
933
|
|
|
900
934
|
return true;
|
|
@@ -948,7 +982,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
948
982
|
|
|
949
983
|
case 3:
|
|
950
984
|
res = _context.sent;
|
|
951
|
-
console.log(
|
|
985
|
+
console.log("getData", res.data);
|
|
952
986
|
circle = ___default['default'].find(res.data, function (c) {
|
|
953
987
|
return c.Id === _this.state.circleId;
|
|
954
988
|
});
|
|
@@ -968,7 +1002,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
968
1002
|
case 11:
|
|
969
1003
|
_context.prev = 11;
|
|
970
1004
|
_context.t0 = _context["catch"](0);
|
|
971
|
-
console.error(
|
|
1005
|
+
console.error("getData", _context.t0);
|
|
972
1006
|
|
|
973
1007
|
_this.setState({
|
|
974
1008
|
loadingAll: false
|
|
@@ -985,7 +1019,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
985
1019
|
|
|
986
1020
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
|
|
987
1021
|
var stateChange = {};
|
|
988
|
-
stateChange[event.target.getAttribute(
|
|
1022
|
+
stateChange[event.target.getAttribute("id")] = event.target.value;
|
|
989
1023
|
|
|
990
1024
|
_this.setState(stateChange);
|
|
991
1025
|
});
|
|
@@ -1008,7 +1042,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1008
1042
|
};
|
|
1009
1043
|
|
|
1010
1044
|
if (___default['default'].isEmpty(_this.state.title) && ___default['default'].includes(newState.selectedUsers, user)) {
|
|
1011
|
-
newState.title = "".concat(user.displayName.split(
|
|
1045
|
+
newState.title = "".concat(user.displayName.split(" ")[0], "'s Circle");
|
|
1012
1046
|
}
|
|
1013
1047
|
|
|
1014
1048
|
_this.setState(newState);
|
|
@@ -1049,17 +1083,17 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1049
1083
|
updating: false
|
|
1050
1084
|
});
|
|
1051
1085
|
|
|
1052
|
-
console.log(
|
|
1086
|
+
console.log("success");
|
|
1053
1087
|
|
|
1054
1088
|
_this.props.circleUpdated(res.data);
|
|
1055
1089
|
}).catch(function (err) {
|
|
1056
|
-
console.log(
|
|
1090
|
+
console.log("error");
|
|
1057
1091
|
|
|
1058
1092
|
_this.setState({
|
|
1059
1093
|
updating: false
|
|
1060
1094
|
});
|
|
1061
1095
|
|
|
1062
|
-
alert(
|
|
1096
|
+
alert("Something went wrong with the request. Please try again.");
|
|
1063
1097
|
});
|
|
1064
1098
|
} else {
|
|
1065
1099
|
circleActions.add(_this.props.auth.site, _this.state.title, _this.state.image, audience, _this.state.isPublic).then(function (res) {
|
|
@@ -1068,17 +1102,17 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1068
1102
|
updating: false
|
|
1069
1103
|
});
|
|
1070
1104
|
|
|
1071
|
-
console.log(
|
|
1105
|
+
console.log("success");
|
|
1072
1106
|
|
|
1073
1107
|
_this.props.circleUpdated(res.data);
|
|
1074
1108
|
}).catch(function (err) {
|
|
1075
|
-
console.log(
|
|
1109
|
+
console.log("error");
|
|
1076
1110
|
|
|
1077
1111
|
_this.setState({
|
|
1078
1112
|
updating: false
|
|
1079
1113
|
});
|
|
1080
1114
|
|
|
1081
|
-
alert(
|
|
1115
|
+
alert("Something went wrong with the request. Please try again.");
|
|
1082
1116
|
});
|
|
1083
1117
|
}
|
|
1084
1118
|
});
|
|
@@ -1099,20 +1133,20 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1099
1133
|
});
|
|
1100
1134
|
});
|
|
1101
1135
|
|
|
1102
|
-
var circleId = Helper$1.safeReadParams(props,
|
|
1136
|
+
var circleId = Helper$1.safeReadParams(props, "circleId");
|
|
1103
1137
|
_this.state = {
|
|
1104
1138
|
circleId: circleId,
|
|
1105
1139
|
circle: ___default['default'].find(props.circles, function (c) {
|
|
1106
1140
|
return c.Id === circleId;
|
|
1107
1141
|
}),
|
|
1108
|
-
title:
|
|
1142
|
+
title: "",
|
|
1109
1143
|
showWarnings: false,
|
|
1110
1144
|
success: false,
|
|
1111
1145
|
users: [],
|
|
1112
1146
|
selectedUsers: [],
|
|
1113
|
-
userSearch:
|
|
1147
|
+
userSearch: "",
|
|
1114
1148
|
isPublic: false,
|
|
1115
|
-
selectedOption:
|
|
1149
|
+
selectedOption: "visibility"
|
|
1116
1150
|
};
|
|
1117
1151
|
return _this;
|
|
1118
1152
|
}
|
|
@@ -1134,7 +1168,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1134
1168
|
this.setState({
|
|
1135
1169
|
image: url
|
|
1136
1170
|
});
|
|
1137
|
-
this.imageInput.
|
|
1171
|
+
this.imageInput.setValue(url);
|
|
1138
1172
|
} else {
|
|
1139
1173
|
setTimeout(function () {
|
|
1140
1174
|
_this2.checkSetImage(url);
|
|
@@ -1167,9 +1201,9 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1167
1201
|
value: function renderSuccess() {
|
|
1168
1202
|
if (!this.state.success) return null;
|
|
1169
1203
|
return /*#__PURE__*/React__default['default'].createElement(Components$3.SuccessPopup, {
|
|
1170
|
-
text: "".concat(___default['default'].capitalize(values.entityName), " has been ").concat(this.state.circleId == null ?
|
|
1204
|
+
text: "".concat(___default['default'].capitalize(values.entityName), " has been ").concat(this.state.circleId == null ? "added" : "edited"),
|
|
1171
1205
|
buttons: [{
|
|
1172
|
-
type:
|
|
1206
|
+
type: "outlined",
|
|
1173
1207
|
onClick: function onClick() {
|
|
1174
1208
|
window.history.back();
|
|
1175
1209
|
},
|
|
@@ -1216,7 +1250,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1216
1250
|
label: "Do you want to make this ".concat(values.entityName, " a public ").concat(values.entityName, "?"),
|
|
1217
1251
|
isActive: this.state.isPublic,
|
|
1218
1252
|
options: [{
|
|
1219
|
-
Label:
|
|
1253
|
+
Label: "Yes",
|
|
1220
1254
|
Value: true,
|
|
1221
1255
|
onChange: function onChange() {
|
|
1222
1256
|
return _this5.setState({
|
|
@@ -1224,7 +1258,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1224
1258
|
});
|
|
1225
1259
|
}
|
|
1226
1260
|
}, {
|
|
1227
|
-
Label:
|
|
1261
|
+
Label: "No",
|
|
1228
1262
|
Value: false,
|
|
1229
1263
|
onChange: function onChange() {
|
|
1230
1264
|
return _this5.setState({
|
|
@@ -1244,7 +1278,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1244
1278
|
value: function renderSelectedOption() {
|
|
1245
1279
|
return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
|
|
1246
1280
|
style: {
|
|
1247
|
-
display: this.state.selectedOption ===
|
|
1281
|
+
display: this.state.selectedOption === "visibility" ? "block" : "none"
|
|
1248
1282
|
}
|
|
1249
1283
|
}, this.renderVisibility()));
|
|
1250
1284
|
}
|
|
@@ -1252,14 +1286,14 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1252
1286
|
key: "renderOptionsSection",
|
|
1253
1287
|
value: function renderOptionsSection() {
|
|
1254
1288
|
var options = [{
|
|
1255
|
-
key:
|
|
1256
|
-
icon:
|
|
1257
|
-
text:
|
|
1289
|
+
key: "visibility",
|
|
1290
|
+
icon: "people3",
|
|
1291
|
+
text: "Visibility"
|
|
1258
1292
|
}];
|
|
1259
1293
|
|
|
1260
1294
|
if (!this.props.circleAllowPublicCircles) {
|
|
1261
1295
|
options = ___default['default'].filter(options, function (o) {
|
|
1262
|
-
return o.key !==
|
|
1296
|
+
return o.key !== "visibility";
|
|
1263
1297
|
});
|
|
1264
1298
|
}
|
|
1265
1299
|
|
|
@@ -1283,7 +1317,7 @@ var AddCircle = /*#__PURE__*/function (_Component) {
|
|
|
1283
1317
|
}, /*#__PURE__*/React__default['default'].createElement(Components$3.Text, {
|
|
1284
1318
|
type: "formTitleLarge",
|
|
1285
1319
|
className: "marginBottom-24"
|
|
1286
|
-
}, this.state.circleId == null ?
|
|
1320
|
+
}, this.state.circleId == null ? "New" : "Edit", " ", ___default['default'].capitalize(values.entityName)), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
1287
1321
|
className: "flex flex-reverse"
|
|
1288
1322
|
}, /*#__PURE__*/React__default['default'].createElement(Components$3.ImageInput, {
|
|
1289
1323
|
ref: function ref(_ref2) {
|
|
@@ -1467,7 +1501,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1467
1501
|
|
|
1468
1502
|
case 3:
|
|
1469
1503
|
res = _context.sent;
|
|
1470
|
-
console.log(
|
|
1504
|
+
console.log("getData", res.data);
|
|
1471
1505
|
circle = ___default['default'].find(res.data, function (c) {
|
|
1472
1506
|
return c.Id === _this.state.circleId;
|
|
1473
1507
|
});
|
|
@@ -1485,7 +1519,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1485
1519
|
case 10:
|
|
1486
1520
|
_context.prev = 10;
|
|
1487
1521
|
_context.t0 = _context["catch"](0);
|
|
1488
|
-
console.error(
|
|
1522
|
+
console.error("getData", _context.t0);
|
|
1489
1523
|
|
|
1490
1524
|
_this.setState({
|
|
1491
1525
|
loadingAll: false
|
|
@@ -1517,8 +1551,8 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1517
1551
|
while (1) {
|
|
1518
1552
|
switch (_context2.prev = _context2.next) {
|
|
1519
1553
|
case 0:
|
|
1520
|
-
startOf = moment__default['default'](date,
|
|
1521
|
-
endOf = moment__default['default'](date,
|
|
1554
|
+
startOf = moment__default['default'](date, "YYYY-MM-DD").startOf("d");
|
|
1555
|
+
endOf = moment__default['default'](date, "YYYY-MM-DD").endOf("d");
|
|
1522
1556
|
_context2.next = 4;
|
|
1523
1557
|
return circleActions.getMessages(_this.state.circleId, 10000, startOf.valueOf(), endOf.valueOf());
|
|
1524
1558
|
|
|
@@ -1572,13 +1606,13 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1572
1606
|
var circle = _this.state.circle;
|
|
1573
1607
|
|
|
1574
1608
|
if (!circle) {
|
|
1575
|
-
return
|
|
1609
|
+
return "";
|
|
1576
1610
|
}
|
|
1577
1611
|
|
|
1578
1612
|
if (circle.IsPrivate) {
|
|
1579
1613
|
return "PM: ".concat(circle.Audience.map(function (user) {
|
|
1580
1614
|
return user.displayName;
|
|
1581
|
-
}).join(
|
|
1615
|
+
}).join(", "));
|
|
1582
1616
|
}
|
|
1583
1617
|
|
|
1584
1618
|
return circle.Title;
|
|
@@ -1586,13 +1620,13 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1586
1620
|
|
|
1587
1621
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
|
|
1588
1622
|
var stateChange = {};
|
|
1589
|
-
stateChange[event.target.getAttribute(
|
|
1623
|
+
stateChange[event.target.getAttribute("id")] = event.target.value;
|
|
1590
1624
|
|
|
1591
1625
|
_this.setState(stateChange);
|
|
1592
1626
|
});
|
|
1593
1627
|
|
|
1594
1628
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onImageUpdated", function (image) {
|
|
1595
|
-
console.log(
|
|
1629
|
+
console.log("updated image");
|
|
1596
1630
|
console.log(image);
|
|
1597
1631
|
|
|
1598
1632
|
_this.setState({
|
|
@@ -1608,7 +1642,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1608
1642
|
});
|
|
1609
1643
|
|
|
1610
1644
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onFileUpdated", function (url) {
|
|
1611
|
-
console.log(
|
|
1645
|
+
console.log("updated url");
|
|
1612
1646
|
console.log(url);
|
|
1613
1647
|
|
|
1614
1648
|
_this.setState({
|
|
@@ -1629,7 +1663,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1629
1663
|
});
|
|
1630
1664
|
|
|
1631
1665
|
if (m) {
|
|
1632
|
-
var input = document.getElementById(
|
|
1666
|
+
var input = document.getElementById("messageInput");
|
|
1633
1667
|
if (input) input.focus();
|
|
1634
1668
|
}
|
|
1635
1669
|
});
|
|
@@ -1637,7 +1671,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1637
1671
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "handleMessageDateChange", function (date) {
|
|
1638
1672
|
_this.setState({
|
|
1639
1673
|
messageDate: date,
|
|
1640
|
-
messageDateText: moment__default['default'](date,
|
|
1674
|
+
messageDateText: moment__default['default'](date, "YYYY-MM-DD").format("DD/MM/YYYY"),
|
|
1641
1675
|
showMessageDate: false,
|
|
1642
1676
|
messages: []
|
|
1643
1677
|
});
|
|
@@ -1675,7 +1709,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1675
1709
|
});
|
|
1676
1710
|
|
|
1677
1711
|
_defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onKeyDown", function (event) {
|
|
1678
|
-
if (event.key ===
|
|
1712
|
+
if (event.key === "Enter" && !event.shiftKey) {
|
|
1679
1713
|
event.preventDefault();
|
|
1680
1714
|
|
|
1681
1715
|
_this.sendMessage();
|
|
@@ -1710,7 +1744,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1710
1744
|
if (m._id === messageToDelete._id) {
|
|
1711
1745
|
return _objectSpread$3(_objectSpread$3({}, m), {}, {
|
|
1712
1746
|
deleted: true,
|
|
1713
|
-
text:
|
|
1747
|
+
text: " "
|
|
1714
1748
|
});
|
|
1715
1749
|
}
|
|
1716
1750
|
|
|
@@ -1740,7 +1774,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1740
1774
|
case 11:
|
|
1741
1775
|
_context4.prev = 11;
|
|
1742
1776
|
_context4.t0 = _context4["catch"](5);
|
|
1743
|
-
console.error(
|
|
1777
|
+
console.error("Failed to delete message:", _context4.t0); // Revert the optimistic update on failure
|
|
1744
1778
|
|
|
1745
1779
|
revertedMessages = _this.state.messages.map(function (m) {
|
|
1746
1780
|
if (m._id === messageToDelete._id) {
|
|
@@ -1755,7 +1789,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1755
1789
|
deletingMessageId: null
|
|
1756
1790
|
});
|
|
1757
1791
|
|
|
1758
|
-
alert(
|
|
1792
|
+
alert("Failed to delete message. Please try again.");
|
|
1759
1793
|
|
|
1760
1794
|
case 17:
|
|
1761
1795
|
case "end":
|
|
@@ -1813,7 +1847,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1813
1847
|
|
|
1814
1848
|
_this.setState({
|
|
1815
1849
|
messages: [].concat(_toConsumableArray__default['default'](_this.state.messages), [clonedMessage]),
|
|
1816
|
-
messageInput:
|
|
1850
|
+
messageInput: "",
|
|
1817
1851
|
imageInput: null,
|
|
1818
1852
|
imageInputShowing: false,
|
|
1819
1853
|
fileInput: null,
|
|
@@ -1825,18 +1859,18 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1825
1859
|
|
|
1826
1860
|
_this.scrollToBottom();
|
|
1827
1861
|
|
|
1828
|
-
_this.imageInput && _this.imageInput.
|
|
1829
|
-
_this.fileInput && _this.fileInput.
|
|
1862
|
+
_this.imageInput && _this.imageInput.setValue(null);
|
|
1863
|
+
_this.fileInput && _this.fileInput.setValue(null);
|
|
1830
1864
|
}, 100);
|
|
1831
1865
|
});
|
|
1832
1866
|
|
|
1833
|
-
var circleId = Helper.safeReadParams(props,
|
|
1867
|
+
var circleId = Helper.safeReadParams(props, "circleId");
|
|
1834
1868
|
_this.state = {
|
|
1835
1869
|
circleId: circleId,
|
|
1836
1870
|
circle: ___default['default'].find(props.circles, function (c) {
|
|
1837
1871
|
return c.Id === circleId;
|
|
1838
1872
|
}),
|
|
1839
|
-
messageInput:
|
|
1873
|
+
messageInput: "",
|
|
1840
1874
|
messages: [],
|
|
1841
1875
|
images: [],
|
|
1842
1876
|
files: [],
|
|
@@ -1885,7 +1919,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1885
1919
|
value: function mergeMessages(receivedMessages, excludePending) {
|
|
1886
1920
|
var _this2 = this;
|
|
1887
1921
|
|
|
1888
|
-
var newMessages = ___default['default'].sortBy(___default['default'].concat(this.state.messages, receivedMessages),
|
|
1922
|
+
var newMessages = ___default['default'].sortBy(___default['default'].concat(this.state.messages, receivedMessages), "createdAt");
|
|
1889
1923
|
|
|
1890
1924
|
this.setState({
|
|
1891
1925
|
messages: ___default['default'].filter(___default['default'].uniqBy(newMessages, function (m) {
|
|
@@ -1979,17 +2013,17 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
1979
2013
|
},
|
|
1980
2014
|
onKeyDown: this.onKeyDown
|
|
1981
2015
|
}), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
|
|
1982
|
-
className: "chat_imageIcon".concat(this.state.imageInputShowing ?
|
|
2016
|
+
className: "chat_imageIcon".concat(this.state.imageInputShowing ? " chat_imageIcon-selected" : ""),
|
|
1983
2017
|
name: "camera",
|
|
1984
2018
|
onClick: this.showImageInput
|
|
1985
2019
|
}), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
|
|
1986
|
-
className: "chat_imageIcon".concat(this.state.fileInputShowing ?
|
|
2020
|
+
className: "chat_imageIcon".concat(this.state.fileInputShowing ? " chat_imageIcon-selected" : ""),
|
|
1987
2021
|
name: "paperclip",
|
|
1988
2022
|
onClick: this.showFileInput
|
|
1989
2023
|
})), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
1990
2024
|
className: "overflow-x",
|
|
1991
2025
|
style: {
|
|
1992
|
-
display: this.state.imageInputShowing ?
|
|
2026
|
+
display: this.state.imageInputShowing ? "block" : "none"
|
|
1993
2027
|
}
|
|
1994
2028
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.ImageInput, {
|
|
1995
2029
|
ref: function ref(_ref5) {
|
|
@@ -2004,7 +2038,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2004
2038
|
})), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2005
2039
|
className: "overflow-x",
|
|
2006
2040
|
style: {
|
|
2007
|
-
display: this.state.fileInputShowing ?
|
|
2041
|
+
display: this.state.fileInputShowing ? "block" : "none"
|
|
2008
2042
|
}
|
|
2009
2043
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.FileInput, {
|
|
2010
2044
|
ref: function ref(_ref6) {
|
|
@@ -2038,11 +2072,11 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2038
2072
|
var isDeleting = this.state.deletingMessageId === m._id;
|
|
2039
2073
|
return /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2040
2074
|
key: m._id,
|
|
2041
|
-
className: "message".concat(isSelf ?
|
|
2075
|
+
className: "message".concat(isSelf ? " message-self" : "").concat(m.uploading ? " message-uploading" : "").concat(isDeleting ? " message-deleting" : "")
|
|
2042
2076
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2043
2077
|
type: "h5-noUpper",
|
|
2044
2078
|
className: "message_time"
|
|
2045
|
-
}, moment__default['default'].utc(m.createdAt).local().format(
|
|
2079
|
+
}, moment__default['default'].utc(m.createdAt).local().format("D MMM YYYY • h:mma")), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2046
2080
|
className: "message_inner"
|
|
2047
2081
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.ProfilePic, {
|
|
2048
2082
|
size: 40,
|
|
@@ -2053,17 +2087,17 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2053
2087
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2054
2088
|
type: "body",
|
|
2055
2089
|
className: "message_name"
|
|
2056
|
-
}, m.user.name, m.replyingTo && !isDeleted ? " replied to ".concat(m.replyingTo.user.name) :
|
|
2090
|
+
}, m.user.name, m.replyingTo && !isDeleted ? " replied to ".concat(m.replyingTo.user.name) : ""), m.replyingTo && !isDeleted && /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2057
2091
|
className: "message_replyBubble"
|
|
2058
2092
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2059
2093
|
type: "body",
|
|
2060
2094
|
className: "message_text"
|
|
2061
|
-
}, Helper.toParagraphed((m.replyingTo.text ||
|
|
2095
|
+
}, Helper.toParagraphed((m.replyingTo.text || "").substr(0, 100)))), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2062
2096
|
className: "message_bubble"
|
|
2063
2097
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2064
2098
|
type: "body",
|
|
2065
2099
|
className: "message_text"
|
|
2066
|
-
}, isDeleted ?
|
|
2100
|
+
}, isDeleted ? "[Message deleted]" : Helper.toParagraphed(m.text)), !isDeleted && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", null, (m.image || []).map(function (url, i) {
|
|
2067
2101
|
return /*#__PURE__*/React__default['default'].createElement("a", {
|
|
2068
2102
|
href: url,
|
|
2069
2103
|
target: "_blank",
|
|
@@ -2082,8 +2116,8 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2082
2116
|
})))), !isDeleted && /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2083
2117
|
className: "message_reply",
|
|
2084
2118
|
style: {
|
|
2085
|
-
display:
|
|
2086
|
-
gap:
|
|
2119
|
+
display: "flex",
|
|
2120
|
+
gap: "16px"
|
|
2087
2121
|
}
|
|
2088
2122
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2089
2123
|
type: "button",
|
|
@@ -2120,7 +2154,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2120
2154
|
value: function renderEmptyDate() {
|
|
2121
2155
|
return this.renderMessage({
|
|
2122
2156
|
system: true,
|
|
2123
|
-
text:
|
|
2157
|
+
text: "No messages on this date"
|
|
2124
2158
|
});
|
|
2125
2159
|
}
|
|
2126
2160
|
}, {
|
|
@@ -2135,7 +2169,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2135
2169
|
className: "chat_section_titleSection"
|
|
2136
2170
|
}, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
|
|
2137
2171
|
className: "chat_section_titleSection_caret",
|
|
2138
|
-
name: "chevron-".concat(this.state.membersExpanded ?
|
|
2172
|
+
name: "chevron-".concat(this.state.membersExpanded ? "up" : "down"),
|
|
2139
2173
|
onClick: this.toggleMembers
|
|
2140
2174
|
}), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2141
2175
|
className: "flex-1"
|
|
@@ -2153,7 +2187,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2153
2187
|
className: "chat_section_titleSection"
|
|
2154
2188
|
}, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
|
|
2155
2189
|
className: "chat_section_titleSection_caret",
|
|
2156
|
-
name: "chevron-".concat(this.state.imagesExpanded ?
|
|
2190
|
+
name: "chevron-".concat(this.state.imagesExpanded ? "up" : "down"),
|
|
2157
2191
|
onClick: this.toggleImages
|
|
2158
2192
|
}), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2159
2193
|
className: "flex-1"
|
|
@@ -2176,7 +2210,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2176
2210
|
className: "chat_section_titleSection"
|
|
2177
2211
|
}, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
|
|
2178
2212
|
className: "chat_section_titleSection_caret",
|
|
2179
|
-
name: "chevron-".concat(this.state.filesExpanded ?
|
|
2213
|
+
name: "chevron-".concat(this.state.filesExpanded ? "up" : "down"),
|
|
2180
2214
|
onClick: this.toggleFiles
|
|
2181
2215
|
}), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2182
2216
|
className: "flex-1"
|
|
@@ -2207,7 +2241,7 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2207
2241
|
className: "chat_replyTo_container"
|
|
2208
2242
|
}, /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2209
2243
|
type: "h5"
|
|
2210
|
-
}, "Replying to ", m && m.user && !___default['default'].isEmpty(m.user.displayName) ? m.user.displayName :
|
|
2244
|
+
}, "Replying to", " ", m && m.user && !___default['default'].isEmpty(m.user.displayName) ? m.user.displayName : ""), m && !___default['default'].isEmpty(m.text) && /*#__PURE__*/React__default['default'].createElement(Components$2.Text, {
|
|
2211
2245
|
type: "body"
|
|
2212
2246
|
}, m.text.substr(0, 50))), /*#__PURE__*/React__default['default'].createElement("div", {
|
|
2213
2247
|
className: "chat_replyTo_remove"
|
|
@@ -2227,14 +2261,14 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2227
2261
|
return /*#__PURE__*/React__default['default'].createElement(Components$2.Popup, {
|
|
2228
2262
|
title: "Delete Message",
|
|
2229
2263
|
buttons: [{
|
|
2230
|
-
text:
|
|
2264
|
+
text: "Delete",
|
|
2231
2265
|
onClick: this.onConfirmDelete,
|
|
2232
|
-
type:
|
|
2266
|
+
type: "primary",
|
|
2233
2267
|
isActive: true
|
|
2234
2268
|
}, {
|
|
2235
|
-
text:
|
|
2269
|
+
text: "Cancel",
|
|
2236
2270
|
onClick: this.onCancelDelete,
|
|
2237
|
-
type:
|
|
2271
|
+
type: "tertiary",
|
|
2238
2272
|
isActive: true
|
|
2239
2273
|
}],
|
|
2240
2274
|
onClose: this.onCancelDelete,
|
|
@@ -2251,8 +2285,8 @@ var Circle = /*#__PURE__*/function (_Component) {
|
|
|
2251
2285
|
return /*#__PURE__*/React__default['default'].createElement(Components$2.OverlayPage, {
|
|
2252
2286
|
fullPage: true,
|
|
2253
2287
|
fullPageStyle: {
|
|
2254
|
-
display:
|
|
2255
|
-
flexDirection:
|
|
2288
|
+
display: "flex",
|
|
2289
|
+
flexDirection: "column"
|
|
2256
2290
|
}
|
|
2257
2291
|
}, this.renderDeleteConfirmPopup(), /*#__PURE__*/React__default['default'].createElement(Components$2.Header, {
|
|
2258
2292
|
rightContent: this.renderHeaderRight()
|