Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.
Merged

2.4.66 #4216

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"serialize-javascript": "^1.5.0",
"session-rethinkdb": "^2.0.0",
"shortid": "^2.2.14",
"slate": "^0.43.6",
"slate": "^0.43.7",
"slate-markdown": "0.1.0",
"slugg": "^1.1.0",
"string-replace-to-array": "^1.0.3",
Expand Down
6 changes: 3 additions & 3 deletions api/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7972,9 +7972,9 @@ slate-markdown@0.1.0:
react "^0.14.0 || ^15.0.0"
styled-components "^2.0.0"

slate@^0.43.6:
version "0.43.6"
resolved "https://registry.yarnpkg.com/slate/-/slate-0.43.6.tgz#f42934dc041bd52ea23bf7190b51cb8f84867fe6"
slate@^0.43.7:
version "0.43.7"
resolved "https://registry.yarnpkg.com/slate/-/slate-0.43.7.tgz#8e33860dd0ea698c106fe781b2fb926e56e271df"
dependencies:
debug "^3.1.0"
direction "^0.1.5"
Expand Down
4 changes: 2 additions & 2 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"electron-window-state": "^5.0.2"
},
"devDependencies": {
"electron": "^3.0.7",
"electron": "^3.0.8",
"electron-builder": "^20.31.2",
"nodemon": "^1.18.5",
"nodemon": "^1.18.6",
"rimraf": "^2.6.2"
},
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions desktop/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,9 @@ electron-window-state@^5.0.2:
jsonfile "^4.0.0"
mkdirp "^0.5.1"

electron@^3.0.7:
version "3.0.7"
resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.7.tgz#e70c735467b4903c66e0c21278263c8ca571f9eb"
electron@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.8.tgz#7905806ebaead4c693531e11cda6568c32efa7bb"
dependencies:
"@types/node" "^8.0.24"
electron-download "^4.1.0"
Expand Down Expand Up @@ -1704,9 +1704,9 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"

nodemon@^1.18.5:
version "1.18.5"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.5.tgz#3d3924df23d06806952e8b6d3de052f2a3351807"
nodemon@^1.18.6:
version "1.18.6"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.6.tgz#89b1136634d6c0afc7de24cc932a760e999e2c76"
dependencies:
chokidar "^2.0.4"
debug "^3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "16.3.1",
"react-apollo": "2.x",
"react-native": "https://github.com/expo/react-native/archive/sdk-28.0.0.tar.gz",
"react-native-gesture-handler": "^1.0.8",
"react-native-gesture-handler": "^1.0.9",
"react-native-keyboard-spacer": "^0.4.1",
"react-native-picker-select": "^3.1.3",
"react-native-tab-view": "^0.0.78",
Expand Down
6 changes: 3 additions & 3 deletions mobile/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6372,9 +6372,9 @@ react-native-gesture-handler@1.0.4:
invariant "^2.2.2"
prop-types "^15.5.10"

react-native-gesture-handler@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.0.8.tgz#c2799741bf6443bb542892b0a36201a6d9ded209"
react-native-gesture-handler@^1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.0.9.tgz#ddec4d19d51cb6fb54df6eca792ebd76aaef083f"
dependencies:
hoist-non-react-statics "^2.3.1"
invariant "^2.2.2"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Spectrum",
"version": "2.4.65",
"version": "2.4.66",
"license": "BSD-3-Clause",
"devDependencies": {
"@babel/preset-flow": "^7.0.0",
Expand Down
2 changes: 2 additions & 0 deletions shared/graphql/queries/community/getCommunityMembers.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const getcommunityMembersQuery = gql`
const getcommunityMembersOptions = {
props: ({
data: { fetchMore, error, loading, community, networkStatus },
ownProps: { filter },
}) => ({
data: {
error,
Expand All @@ -72,6 +73,7 @@ const getcommunityMembersOptions = {
after:
community.members.edges[community.members.edges.length - 1]
.cursor,
filter: filter || null,
},
updateQuery: (prev, { fetchMoreResult }) => {
if (!fetchMoreResult.community) {
Expand Down
17 changes: 10 additions & 7 deletions src/views/communityMembers/components/communityMembers.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ type State = {
isMember?: boolean,
isModerator?: boolean,
isBlocked?: boolean,
isOwner?: boolean,
},
searchIsFocused: boolean,
// what the user types in
Expand All @@ -71,8 +72,8 @@ class CommunityMembers extends React.Component<Props, State> {
return this.viewPending();
}

if (filter === 'moderators') {
return this.viewModerators();
if (filter === 'team') {
return this.viewTeam();
}

if (filter === 'blocked') {
Expand All @@ -94,9 +95,9 @@ class CommunityMembers extends React.Component<Props, State> {
});
};

viewModerators = () => {
viewTeam = () => {
return this.setState({
filter: { isModerator: true },
filter: { isModerator: true, isOwner: true },
searchIsFocused: false,
});
};
Expand Down Expand Up @@ -185,8 +186,10 @@ class CommunityMembers extends React.Component<Props, State> {
Members
</Filter>
<Filter
onClick={this.viewModerators}
active={filter && filter.isModerator ? true : false}
onClick={this.viewTeam}
active={
filter && filter.isModerator && filter.isOwner ? true : false
}
>
Team
</Filter>
Expand Down Expand Up @@ -350,7 +353,7 @@ class CommunityMembers extends React.Component<Props, State> {
);
}

if (filter && filter.isModerator) {
if (filter && filter.isModerator && filter.isOwner) {
return (
<ViewError
emoji={' '}
Expand Down