Skip to content

fix(federation): show Federation section in AdminSettings, hide federated conversations from plugins #11809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 2 commits into from
Mar 15, 2024
Merged

fix(federation): show Federation section in AdminSettings, hide federated conversations from plugins #11809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b837c0
fix(AdminSettings): show Federation section in production
Antreesy Mar 15, 2024
7aa315f
fix(plugins): hide federated rooms for message forwarding and rich ob…
Antreesy Mar 15, 2024
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
5 changes: 5 additions & 0 deletions src/components/RoomSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ import { provide, ref } from 'vue'
import Magnify from 'vue-material-design-icons/Magnify.vue'
import MessageOutline from 'vue-material-design-icons/MessageOutline.vue'

import { getCapabilities } from '@nextcloud/capabilities'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
Expand All @@ -79,6 +81,8 @@ import ConversationsSearchListVirtual from './LeftSidebar/ConversationsList/Conv
import { CONVERSATION } from '../constants.js'
import { searchListedConversations, fetchConversations } from '../services/conversationsService.js'

const supportFederationV1 = getCapabilities()?.spreed?.features?.includes('federation-v1')

export default {
name: 'RoomSelector',

Expand Down Expand Up @@ -193,6 +197,7 @@ export default {
: await fetchConversations({})

this.rooms = response.data.ocs.data.sort(this.sortConversations)
.filter(conversation => !supportFederationV1 || !conversation.remoteServer)
this.loading = false
},

Expand Down
11 changes: 9 additions & 2 deletions src/views/AdminSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<GeneralSettings />
<MatterbridgeIntegration />
<AllowedGroups />
<!-- TODO remove OC.debug when Federation feature is ready -->
<Federation v-if="OC.debug" />
<Federation v-if="supportFederation" />
<BotsSettings />
<Commands />
<WebServerSetupChecks />
Expand All @@ -40,6 +39,8 @@
</template>

<script>
import { getCapabilities } from '@nextcloud/capabilities'

import AllowedGroups from '../components/AdminSettings/AllowedGroups.vue'
import BotsSettings from '../components/AdminSettings/BotsSettings.vue'
import Commands from '../components/AdminSettings/Commands.vue'
Expand All @@ -54,6 +55,8 @@ import StunServers from '../components/AdminSettings/StunServers.vue'
import TurnServers from '../components/AdminSettings/TurnServers.vue'
import WebServerSetupChecks from '../components/AdminSettings/WebServerSetupChecks.vue'

const supportFederation = getCapabilities()?.spreed?.features?.includes('federation-v1')

export default {
name: 'AdminSettings',

Expand All @@ -72,5 +75,9 @@ export default {
TurnServers,
WebServerSetupChecks,
},

setup() {
return { supportFederation }
}
}
</script>
6 changes: 5 additions & 1 deletion src/views/FlowPostToConversation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@

<script>
import axios from '@nextcloud/axios'
import { getCapabilities } from '@nextcloud/capabilities'
import { generateOcsUrl } from '@nextcloud/router'

import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'

import { FLOW, CONVERSATION, PARTICIPANT } from '../constants.js'

const supportFederationV1 = getCapabilities()?.spreed?.features?.includes('federation-v1')

export default {
name: 'FlowPostToConversation',
components: { NcSelect },
Expand Down Expand Up @@ -86,6 +89,7 @@ export default {
this.roomOptions = response.data.ocs.data.filter(function(room) {
return room.readOnly === CONVERSATION.STATE.READ_WRITE
&& (room.permissions & PARTICIPANT.PERMISSIONS.CHAT) !== 0
&& (!supportFederationV1 || !room.remoteServer)
})
})
},
Expand All @@ -95,7 +99,7 @@ export default {
</script>

<style scoped>
.multiselect {
:deep(.v-select) {
width: 100%;
margin: auto;
text-align: center;
Expand Down