Skip to content
Snippets Groups Projects
Verified Commit b1dcaf9c authored by Andrej Ramašeuski's avatar Andrej Ramašeuski
Browse files

Refactoring, podpora hostu mimo skupiny

parent 91d52bcf
Branches
No related tags found
No related merge requests found
Pipeline #10550 passed
Stage: build
Show whitespace changes
Inline Side-by-side
Showing
with 287 additions and 131 deletions
lib/SeMeet/Controller/Auth.pm
+ 1
− 1
View file @ b1dcaf9c
...@@ -6,7 +6,7 @@ sub callback ($c) { ...@@ -6,7 +6,7 @@ sub callback ($c) {
my $token = $c->oidc->get_access_token( $c->param("code") ); my $token = $c->oidc->get_access_token( $c->param("code") );
my $claims = $c->oauth_claims( $token->access_token ); my $claims = $c->oauth_claims( $token->access_token );
my $octopus_user = $c->iapi->get('octopus/user?username=' . $claims->{preferred_username}); my $octopus_user = $c->iapi->get('octopus/users/' . $claims->{sub});
my %user = ( my %user = (
uuid => $claims->{sub}, uuid => $claims->{sub},
......
lib/SeMeet/Controller/Meets.pm
+ 46
− 33
View file @ b1dcaf9c
...@@ -47,12 +47,22 @@ sub get($c) { ...@@ -47,12 +47,22 @@ sub get($c) {
my $args = $c->req->json; my $args = $c->req->json;
my $meet = $c->_get($c->stash->{id}, 0) // return; my $meet = $c->_get($c->stash->{id}, 0) // return;
my $is_mod = $meet->moderators({ octid => $c->stash->{user}->id})->count;
my $users = { 0 => [], 1 => [] };
USER:
foreach my $user ( $meet->users ) {
push @{ $users->{ $user->is_moderator} }, {
id => $user->id,
name => $user->user_name,
}
}
$c->render(openapi => $c->spec_filter({ $c->render(openapi => $c->spec_filter({
$meet->get_columns, $meet->get_columns,
groups => $meet->cached_groups, groups => $meet->cached_groups, #TODO: direct
moderators => $meet->cached_moderators, moderators => $users->{1},
participants => $users->{0},
}, 'Meet')); }, 'Meet'));
} }
...@@ -64,13 +74,13 @@ sub list($c) { ...@@ -64,13 +74,13 @@ sub list($c) {
deleted => undef, deleted => undef,
-or => [ -or => [
owner_id => $c->stash->{user}->id, owner_id => $c->stash->{user}->id,
"groups.group_id" => { '-in' => $c->stash->{groups} }, "meet_groups.group_id" => { '-in' => $c->stash->{groups} },
"moderators.octid" => $c->stash->{user}->octid, "meet_users.user_id" => $c->stash->{user}->id,
] ]
}, },
{ {
order_by => 'name', order_by => 'name',
join => ['groups', 'moderators'], join => ['meet_groups', 'meet_users'],
distinct => 1, distinct => 1,
} }
); );
...@@ -83,8 +93,7 @@ sub list($c) { ...@@ -83,8 +93,7 @@ sub list($c) {
$meet->get_columns, $meet->get_columns,
groups => $meet->cached_groups, groups => $meet->cached_groups,
moderators => $meet->cached_moderators, moderators => $meet->cached_moderators,
# is_owned => ( $meet->owner_id == $c->stash->{user}->id), participants => [],
# is_moderated => 0,
}, 'Meet') }, 'Meet')
} }
...@@ -113,48 +122,50 @@ sub add_groups($c) { ...@@ -113,48 +122,50 @@ sub add_groups($c) {
$c->render( status => 204, text => '' ); $c->render( status => 204, text => '' );
} }
sub add_moderators($c) { sub delete_group($c) {
$c->openapi->valid_input or return; $c->openapi->valid_input or return;
my $args = $c->req->json;
my $meet = $c->_get($c->stash->{id}, 2) // return; my $meet = $c->_get($c->stash->{id}, 1) // return;
IDS:
foreach my $user ( @{ $args->{users} } ) {
$meet->find_or_create_related('moderators', $meet->delete_related('meet_groups',
{ { group_id => $c->stash->{group_id} }
octid => $user->{id},
name => $user->{name},
}
); );
} $meet->update_groups_cache();
$meet->update_moderators_cache();
$c->render( status => 204, text => '' ); $c->render( status => 204, text => '' );
} }
sub delete_group($c) { sub add_users($c) {
$c->openapi->valid_input or return; $c->openapi->valid_input or return;
my $args = $c->req->json;
my $meet = $c->_get($c->stash->{id}, 1) // return; my $meet = $c->_get($c->stash->{id}, 2) // return;
my $is_moderator = $args->{kind} eq 'moderator' ? 't':'f';
$meet->delete_related('meet_groups', UUID:
{ group_id => $c->stash->{group_id} } foreach my $uuid ( @{ $args->{users} } ) {
my $user = $c->user_by_uuid($uuid) // next UUID;
$meet->find_or_create_related('meet_users',
{
user_id => $user->id,
is_moderator => $is_moderator,
}
); );
$meet->update_groups_cache(); }
$meet->update_moderators_cache() if $is_moderator;
$c->render( status => 204, text => '' ); $c->render( status => 204, text => '' );
} }
sub delete_moderator($c) { sub delete_user($c) {
$c->openapi->valid_input or return; $c->openapi->valid_input or return;
my $meet = $c->_get($c->stash->{id}, 2) // return; my $meet = $c->_get($c->stash->{id}, 2) // return;
$meet->delete_related('moderators', $meet->delete_related('meet_users',
{ octid => $c->stash->{user_id} } { id => $c->stash->{relation_id} }
); );
$meet->update_moderators_cache(); $meet->update_moderators_cache();
$c->render( status => 204, text => '' ); $c->render( status => 204, text => '' );
...@@ -205,6 +216,8 @@ sub meet($c) { #NENI API! ...@@ -205,6 +216,8 @@ sub meet($c) { #NENI API!
return $c->error(404, 'NOT_FOUND') if ! $meet; return $c->error(404, 'NOT_FOUND') if ! $meet;
my $roles = $meet->user_roles($user, $c->current_user->{groups}); my $roles = $meet->user_roles($user, $c->current_user->{groups});
$c->trace($roles);
return $c->error(404, 'NOT_FOUND') if ! $roles->{any}; return $c->error(404, 'NOT_FOUND') if ! $roles->{any};
......
lib/SeMeet/Controller/Users.pm
+ 1
− 0
View file @ b1dcaf9c
...@@ -55,6 +55,7 @@ sub list($c) { ...@@ -55,6 +55,7 @@ sub list($c) {
push @users, $c->spec_filter({ push @users, $c->spec_filter({
id => $user->{id}, id => $user->{id},
uuid => $user->{uuid},
name => $user->{displayname}, name => $user->{displayname},
username => $user->{username}, username => $user->{username},
region => join ' - ', grep { defined } ($ks, $ms), region => join ' - ', grep { defined } ($ks, $ms),
......
lib/SeMeet/Helpers/Core.pm
+ 6
− 5
View file @ b1dcaf9c
...@@ -104,22 +104,23 @@ sub register { ...@@ -104,22 +104,23 @@ sub register {
return $data; return $data;
}); });
$self->helper( user_by_octid => sub ($c, $octid) { $self->helper( user_by_uuid => sub ($c, $uuid) {
my $user = $c->schema->resultset('User')->find({ my $user = $c->schema->resultset('User')->find({
octid => $octid uuid => $uuid
}); });
if ( ! $user ) { if ( ! $user ) {
my $octopus_user = $c->iapi->get("octopus/users/$octid"); my $octopus_user = $c->iapi->get("octopus/users/$uuid");
if ( $octopus_user ) { if ( $octopus_user ) {
$user = $c->schema->resultset('User')->find_or_create( $user = $c->schema->resultset('User')->find_or_create(
{ {
octid => $octid, uuid => $uuid,
octid => $octopus_user->{id},
username => $octopus_user->{username}, username => $octopus_user->{username},
displayname => $octopus_user->{displayname}, displayname => $octopus_user->{displayname},
}, },
{ key => 'username' } { key => 'uuid' }
); );
} }
} }
......
lib/SeMeet/I18N/cs.pm
+ 5
− 1
View file @ b1dcaf9c
...@@ -19,18 +19,22 @@ our %Lexicon = ( ...@@ -19,18 +19,22 @@ our %Lexicon = (
ERROR_MEET_NAME_REQURED => "Název nové místnosti je povinný", ERROR_MEET_NAME_REQURED => "Název nové místnosti je povinný",
ERROR_MEET_NAME_DUPLICITY => 'Duplicitní název mistnosti', ERROR_MEET_NAME_DUPLICITY => 'Duplicitní název mistnosti',
LABEL_GROUPS_ADD => 'Přidání skupin', LABEL_GROUPS_ADD => 'Přidání skupin',
LABEL_USERS_ADD => 'Přidání moderatorů',
ENTER => 'Vstoupit', ENTER => 'Vstoupit',
COPY_LINK => 'Zkopírovat odkaz', COPY_LINK => 'Zkopírovat odkaz',
'About meet' => 'O mistnosti', 'About meet' => 'O mistnosti',
'Add groups' => 'Přidat skupiny', 'Add groups' => 'Přidat skupiny',
'Add moderators' => 'Přidat moderatory', 'Add moderators' => 'Přidat moderatory',
'Add people' => 'Přidat osoby',
'Create meet' => 'Vytvořit místnost', 'Create meet' => 'Vytvořit místnost',
'Delete meet' => 'Smazat místnost', 'Delete meet' => 'Smazat místnost',
'Save changes' => 'Uložit změny', 'Save changes' => 'Uložit změny',
'Configuration' => 'Konfigurace', 'Configuration' => 'Konfigurace',
'Authorized groups' => 'Opravněné skupiny', 'Authorized groups' => 'Opravněné skupiny',
'Authorized persons' => 'Opravněné osoby',
'Adding groups' => 'Přidávání skupin',
'Adding people' => 'Přidávání osob',
'Adding moderators' => 'Přidávání moderatorů',
'Moderators' => 'Moderatoři', 'Moderators' => 'Moderatoři',
'Invites' => 'Pozvánky', 'Invites' => 'Pozvánky',
); );
......
lib/SeMeet/Schema/Result/Meet.pm
+ 25
− 6
View file @ b1dcaf9c
...@@ -51,7 +51,7 @@ __PACKAGE__->has_many( ...@@ -51,7 +51,7 @@ __PACKAGE__->has_many(
); );
__PACKAGE__->has_many( __PACKAGE__->has_many(
moderators => 'SeMeet::Schema::Result::Moderator', meet_users => 'SeMeet::Schema::Result::MeetUser',
{ 'foreign.meet_id' => 'self.id', }, { 'foreign.meet_id' => 'self.id', },
); );
...@@ -60,6 +60,11 @@ __PACKAGE__->has_many( ...@@ -60,6 +60,11 @@ __PACKAGE__->has_many(
{ 'foreign.meet_id' => 'self.id', }, { 'foreign.meet_id' => 'self.id', },
); );
__PACKAGE__->has_many(
users => 'SeMeet::Schema::Result::MeetUser_view',
{ 'foreign.meet_id' => 'self.id', },
);
__PACKAGE__->inflate_column('properties', { __PACKAGE__->inflate_column('properties', {
inflate => sub { from_json(shift); }, inflate => sub { from_json(shift); },
deflate => sub { to_json(shift); }, deflate => sub { to_json(shift); },
...@@ -68,8 +73,22 @@ __PACKAGE__->inflate_column('properties', { ...@@ -68,8 +73,22 @@ __PACKAGE__->inflate_column('properties', {
sub user_roles($self, $user, $groups) { sub user_roles($self, $user, $groups) {
my $roles = { my $roles = {
participant => $self->meet_groups({ group_id => { -in => $groups } })->count(),
moderator => $self->moderators({ octid => $user->octid })->count(), participant => (
$self->meet_groups({
group_id => { -in => $groups }
})->count()
||
$self->meet_users({
user_id => $user->id,
})->count()
),
moderator => $self->meet_users({
user_id => $user->id,
is_moderator => 't',
})->count(),
owner => ($self->owner_id == $user->id), owner => ($self->owner_id == $user->id),
}; };
...@@ -93,10 +112,10 @@ sub update_groups_cache($self) { ...@@ -93,10 +112,10 @@ sub update_groups_cache($self) {
sub update_moderators_cache($self) { sub update_moderators_cache($self) {
my @moderators = (); my @moderators = ();
foreach my $moderator ($self->moderators) { foreach my $moderator ($self->users({ is_moderator => 't'})) {
push @moderators, { push @moderators, {
id => $moderator->octid, id => $moderator->id,
name => $moderator->name, name => $moderator->user_name,
}; };
} }
my $properties = $self->properties // {}; my $properties = $self->properties // {};
......
lib/SeMeet/Schema/Result/MeetUser.pm 0 → 100644
+ 32
− 0
View file @ b1dcaf9c
package SeMeet::Schema::Result::MeetUser;
use strict;
use warnings;
use base 'DBIx::Class::Core';
our $VERSION = 1;
__PACKAGE__->table('meets_users');
__PACKAGE__->add_columns(
id => {
data_type => 'integer',
is_auto_increment => 1,
is_nullable => 0,
sequence => 'uid_seq'
},
qw(
meet_id
user_id
is_moderator
),
);
__PACKAGE__->set_primary_key('id');
__PACKAGE__->add_unique_constraint(
secondary => [qw(meet_id user_id is_moderator)]
);
1;
lib/SeMeet/Schema/Result/Moderator.pm → lib/SeMeet/Schema/Result/MeetUser_view.pm
+ 20
− 0
View file @ b1dcaf9c
package SeMeet::Schema::Result::Moderator; package SeMeet::Schema::Result::MeetUser_view;
use strict; use strict;
use warnings; use warnings;
use base 'DBIx::Class::Core'; use base 'SeMeet::Schema::Result::MeetUser';
our $VERSION = 1; our $VERSION = 1;
__PACKAGE__->table('moderators'); __PACKAGE__->table('meets_users_view');
__PACKAGE__->add_columns( __PACKAGE__->add_columns(
qw( qw(
meet_id user_name
octid
name
), ),
); );
__PACKAGE__->set_primary_key('meet_id', 'octid');
1; 1;
openapi.yaml
+ 22
− 16
View file @ b1dcaf9c
...@@ -48,6 +48,10 @@ components: ...@@ -48,6 +48,10 @@ components:
type: array type: array
items: items:
$ref: '#/components/schemas/UserInList' $ref: '#/components/schemas/UserInList'
participants:
type: array
items:
$ref: '#/components/schemas/UserInList'
GroupInList: GroupInList:
type: object type: object
properties: properties:
...@@ -63,6 +67,9 @@ components: ...@@ -63,6 +67,9 @@ components:
id: id:
type: integer type: integer
readOnly: true readOnly: true
uuid:
type: string
readOnly: true
name: name:
type: string type: string
readOnly: true readOnly: true
...@@ -272,7 +279,7 @@ paths: ...@@ -272,7 +279,7 @@ paths:
items: items:
$ref: '#/components/schemas/UserInList' $ref: '#/components/schemas/UserInList'
/meets/{id}/group: /meets/{id}/groups:
post: post:
x-mojo-to: meets#add_groups x-mojo-to: meets#add_groups
security: security:
...@@ -307,7 +314,7 @@ paths: ...@@ -307,7 +314,7 @@ paths:
201: 201:
description: Groups authorized description: Groups authorized
/meets/{id}/group/{group_id}: /meets/{id}/groups/{group_id}:
delete: delete:
x-mojo-to: meets#delete_group x-mojo-to: meets#delete_group
security: security:
...@@ -335,15 +342,15 @@ paths: ...@@ -335,15 +342,15 @@ paths:
204: 204:
description: Groups unauthorized description: Groups unauthorized
/meets/{id}/moderator: /meets/{id}/users:
post: post:
x-mojo-to: meets#add_moderators x-mojo-to: meets#add_users
security: security:
- Bearer: [] - Bearer: []
tags: tags:
- meets - meets
summary: "Pridat moderatory" summary: "Pridat osoby/moderatory"
operationId: addModeratorsToMeet operationId: addUsersToMeet
parameters: parameters:
- name: id - name: id
in: path in: path
...@@ -362,23 +369,22 @@ paths: ...@@ -362,23 +369,22 @@ paths:
users: users:
type: array type: array
items: items:
type: object type: string
# $ref: '#/components/schemas/UserInList'
required: required:
- users - users
responses: responses:
201: 201:
description: Moderators added description: Users added
/meets/{id}/moderator/{user_id}: /meets/{id}/users/{relation_id}:
delete: delete:
x-mojo-to: meets#delete_moderator x-mojo-to: meets#delete_user
security: security:
- Bearer: [] - Bearer: []
tags: tags:
- meets - meets
summary: "Smazat moderatora" summary: "Smazat osobu"
operationId: deleteModeratorFromMeet operationId: deleteUserFromMeet
parameters: parameters:
- name: id - name: id
in: path in: path
...@@ -387,13 +393,13 @@ paths: ...@@ -387,13 +393,13 @@ paths:
description: "Identifikator mistnosti" description: "Identifikator mistnosti"
schema: schema:
type: integer type: integer
- name: user_id - name: relation_id
in: path in: path
required: true required: true
example: 100345 example: 100345
description: "Identifikator moderatora" description: "Identifikator relace"
schema: schema:
type: integer type: integer
responses: responses:
204: 204:
description: Moderator deleted description: User deleted
sql/migrations.sql
+ 19
− 0
View file @ b1dcaf9c
...@@ -62,3 +62,22 @@ create table "moderators" ( ...@@ -62,3 +62,22 @@ create table "moderators" (
foreign key ("meet_id") references "meets" ("id") on update cascade on delete cascade foreign key ("meet_id") references "meets" ("id") on update cascade on delete cascade
); );
-- 5 up
create table "meets_users" (
"id" integer not null default nextval('uid_seq'),
"meet_id" integer not null,
"user_id" integer not null,
"is_moderator" bool not null default 'f',
primary key("id"),
unique("meet_id", "user_id", "is_moderator"),
foreign key ("meet_id") references "meets" ("id") on update cascade on delete cascade,
foreign key ("user_id") references "users" ("id") on update cascade on delete cascade
);
create view "meets_users_view" as
select "meets_users".*,
"users"."displayname" as "user_name"
from "meets_users"
join "users" on ("users"."id" = "meets_users"."user_id")
;
templates/includes/meet.html.ep
+ 1
− 1
View file @ b1dcaf9c
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
}, },
}; };
const jitsi = new JitsiMeetExternalAPI(MEET_DOMAIN, MEET_OPTIONS); // const jitsi = new JitsiMeetExternalAPI(MEET_DOMAIN, MEET_OPTIONS);
</script> </script>
templates/includes/meet_groups.html.ep
+ 7
− 7
View file @ b1dcaf9c
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
</div> </div>
% if ( $roles->{owner} || $roles->{moderator} ) { % if ( $roles->{owner} || $roles->{moderator} ) {
<div class="" v-effect="searchGroups()"> <div v-effect="searchGroups()">
<label class="form-field__label" for="name"><%=l 'LABEL_GROUPS_ADD' %></label> <label class="form-field__label" for="name"><%=l 'Adding groups' %></label>
<input type="text" class="w-full text-input" value="" v-model="search_groups" id="search_group" placeholder="<%=l 'INPUT_MEET_ADD_GROUPS_PLACEHOLDER' %>"/> <input type="text" class="w-full text-input" value="" v-model="filter['group']" id="search_group" placeholder="<%=l 'INPUT_MEET_ADD_GROUPS_PLACEHOLDER' %>"/>
<div class="overflow-y-auto h-64 mb-4 border p-2 text-sm" v-if="groups.length > 0"> <div class="overflow-y-auto h-64 mb-4 border p-2 text-sm" v-if="search['group'].length > 0">
<div v-for="group in groups" class="checkbox form-field__control mb-1" > <div v-for="group in search['group']" class="checkbox form-field__control mb-1" >
<input name="groups" type="checkbox" v-bind:title="group.id" v-bind:value="group.id" v-model="selected_groups" > <input name="groups" type="checkbox" v-bind:title="group.id" v-bind:value="group.id" v-model="selected['group']" >
<label>{{group.name}}</label> <label>{{group.name}}</label>
</div> </div>
</div> </div>
<div class="form-field" v-if="selected_groups.length > 0"> <div class="form-field" v-if="selected['group'].length > 0">
<button class="btn btn--green-400 btn--hoveractive text-lg" @click="addGroups()"> <button class="btn btn--green-400 btn--hoveractive text-lg" @click="addGroups()">
<div class="btn__body"><%=l 'Add groups' %></div> <div class="btn__body"><%=l 'Add groups' %></div>
</button> </button>
......
templates/includes/meet_moderators.html.ep
+ 9
− 9
View file @ b1dcaf9c
...@@ -3,24 +3,24 @@ ...@@ -3,24 +3,24 @@
{{ moderator.name }} {{ moderator.name }}
% if ( $roles->{owner} ) { % if ( $roles->{owner} ) {
<span class="icon"> <span class="icon">
<i class="ico--cross ml-3 cursor-pointer" @click="removeModerator(moderator.id)"></i> <i class="ico--cross ml-3 cursor-pointer" @click="removeUser(moderator.id)"></i>
</span> </span>
% } % }
</span> </span>
</div> </div>
% if ( $roles->{owner} ) { % if ( $roles->{owner} ) {
<div v-effect="searchUsers()"> <div v-effect="searchUsers('moderator')">
<label class="form-field__label" for="name"><%=l 'LABEL_USERS_ADD' %></label> <label class="form-field__label" for="name"><%=l 'Adding moderators' %></label>
<input type="text" class="w-full text-input" value="" v-model="search_users" id="search_user" placeholder="<%=l 'INPUT_MEET_ADD_USERS_PLACEHOLDER' %>"/> <input type="text" class="w-full text-input" value="" v-model="filter['moderator']" id="search_moderator" placeholder="<%=l 'INPUT_MEET_ADD_USERS_PLACEHOLDER' %>"/>
<div class="overflow-y-auto h-64 mb-4 border p-2 text-sm" v-if="users.length > 0"> <div class="overflow-y-auto h-64 mb-4 border p-2 text-sm" v-if="search['moderator'].length > 0">
<div v-for="user in users" class="checkbox form-field__control mb-1" > <div v-for="user in search['moderator']" class="checkbox form-field__control mb-1" >
<input name="users" type="checkbox" v-bind:title="user.id" v-bind:value="user.id" v-model="selected_users" > <input name="moderators" type="checkbox" :value="user.uuid" v-model="selected['moderator']" >
<label style="max-width: 100%">{{user.name}} ({{ user.username }})<span v-if="user.region.length > 0" class="text-grey-300 text-xs"> | {{ user.region }}</span></label> <label style="max-width: 100%">{{user.name}} ({{ user.username }})<span v-if="user.region.length > 0" class="text-grey-300 text-xs"> | {{ user.region }}</span></label>
</div> </div>
</div> </div>
<div class="form-field" v-if="selected_users.length > 0"> <div class="form-field" v-if="selected['moderator'].length > 0">
<button class="btn btn--red-600 btn--hoveractive text-lg" @click="addModerators()"> <button class="btn btn--red-600 btn--hoveractive text-lg" @click="addUsers('moderator')">
<div class="btn__body"><%=l 'Add moderators' %></div> <div class="btn__body"><%=l 'Add moderators' %></div>
</button> </button>
</div> </div>
......
templates/includes/meet_participants.html.ep 0 → 100644
+ 29
− 0
View file @ b1dcaf9c
<div class="mb-4">
<span v-for="user in meet.participants" class="chip chip--blue-300 mr-1 mb-1 rounded">
{{ user.name }}
% if ( $roles->{owner} || $roles->{moderator} ) {
<span class="icon">
<i class="ico--cross ml-3 cursor-pointer" @click="removeUser(user.id)"></i>
</span>
% }
</span>
</div>
% if ( $roles->{owner} || $roles->{moderator} ) {
<div v-effect="searchUsers('participant')">
<label class="form-field__label" for="name"><%=l 'Adding people' %></label>
<input type="text" class="w-full text-input" value="" v-model="filter['participant']" id="search_participant" placeholder="<%=l 'INPUT_MEET_ADD_USERS_PLACEHOLDER' %>"/>
<div class="overflow-y-auto h-64 mb-4 border p-2 text-sm" v-if="search['participant'].length > 0">
<div v-for="user in search['participant']" class="checkbox form-field__control mb-1" >
<input name="participants" type="checkbox" :value="user.uuid" v-model="selected['participant']" >
<label style="max-width: 100%">{{user.name}} ({{ user.username }})<span v-if="user.region.length > 0" class="text-grey-300 text-xs"> | {{ user.region }}</span></label>
</div>
</div>
<div class="form-field" v-if="selected['participant'].length > 0">
<button class="btn btn--blue-300 btn--hoveractive text-lg" @click="addUsers('participant')">
<div class="btn__body"><%=l 'Add people' %></div>
</button>
</div>
</div>
% }
templates/meet.html.ep
+ 64
− 52
View file @ b1dcaf9c
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
%= include 'includes/meet' %= include 'includes/meet'
<div class="grid grid-cols-3 border border-b-0 divide-x text-center"> <div class="grid grid-cols-4 border border-b-0 divide-x text-center">
<div @click="active_tab='groups'" class="p-4 bg-grey-125" :class="tabClass('groups')"><%=l 'Authorized groups' %></div> <div @click="active_tab='groups'" class="p-4 bg-grey-125" :class="tabClass('groups')"><%=l 'Authorized groups' %></div>
<div @click="active_tab='participants'" class="p-4 bg-grey-125" :class="tabClass('participants')"><%=l 'Authorized persons' %></div>
<div @click="active_tab='moderators'" class="p-4 bg-grey-125" :class="tabClass('moderators')"><%=l 'Moderators' %></div> <div @click="active_tab='moderators'" class="p-4 bg-grey-125" :class="tabClass('moderators')"><%=l 'Moderators' %></div>
%#<div @click="active_tab='invites'" class="p-4 bg-grey-125" :class="tabClass('invites')"><%=l 'Invites' %></div> %#<div @click="active_tab='invites'" class="p-4 bg-grey-125" :class="tabClass('invites')"><%=l 'Invites' %></div>
<div @click="active_tab='form'" class="p-4 bg-grey-125" :class="tabClass('form')"><%=l $roles->{owner} ? 'Configuration':'About meet' %></div> <div @click="active_tab='form'" class="p-4 bg-grey-125" :class="tabClass('form')"><%=l $roles->{owner} ? 'Configuration':'About meet' %></div>
...@@ -13,6 +14,9 @@ ...@@ -13,6 +14,9 @@
<div class="border p-4" v-effect="getMeet()" v-cloak> <div class="border p-4" v-effect="getMeet()" v-cloak>
<div v-if="active_tab == 'groups'"> <div v-if="active_tab == 'groups'">
%= include 'includes/meet_groups' %= include 'includes/meet_groups'
</div>
<div v-if="active_tab == 'participants'">
%= include 'includes/meet_participants'
</div> </div>
<div v-if="active_tab == 'moderators'"> <div v-if="active_tab == 'moderators'">
%= include 'includes/meet_moderators' %= include 'includes/meet_moderators'
...@@ -33,10 +37,9 @@ ...@@ -33,10 +37,9 @@
const GROUPS_URL = '/api/groups'; const GROUPS_URL = '/api/groups';
const USERS_URL = '/api/users'; const USERS_URL = '/api/users';
//const USERS_URL = '<%= config->{iapi} %>octopus/users';
const MEET_URL = '/api/meets/<%= stash->{id} %>'; const MEET_URL = '/api/meets/<%= stash->{id} %>';
const ADD_GROUPS_URL = '/api/meets/<%= stash->{id} %>/group'; const ADD_GROUPS_URL = '/api/meets/<%= stash->{id} %>/groups';
const ADD_USERS_URL = '/api/meets/<%= stash->{id} %>/moderator'; const ADD_USERS_URL = '/api/meets/<%= stash->{id} %>/users';
const API_HEADERS = { const API_HEADERS = {
"Content-Type": "application/json", "Content-Type": "application/json",
"Accept": "application/json", "Accept": "application/json",
...@@ -45,20 +48,28 @@ ...@@ -45,20 +48,28 @@
createApp({ createApp({
title: '',
meet: {}, meet: {},
users: {},
active_tab: 'groups', active_tab: 'groups',
delete_confirm_visible: false, delete_confirm_visible: false,
search_groups: '', filter: {
search_users: '', group: '',
participant: '',
moderator: '',
},
search: {
group: '',
participant: '',
moderator: '',
},
groups: [], selected: {
users: [], group: [],
selected_groups: [], participant: [],
selected_users: [], moderator: [],
},
tabClass(id) { tabClass(id) {
if (id == this.active_tab) { if (id == this.active_tab) {
...@@ -80,6 +91,31 @@ ...@@ -80,6 +91,31 @@
}) })
}, },
searchUsers(kind) {
if ( this.filter[kind].length < 2 ) {
this.search[kind] = [];
return true;
}
fetch(USERS_URL + '?search=' + this.filter[kind] )
.then((res) => res.json())
.then(res => {
this.search[kind] = res;
})
},
searchGroups() {
if ( this.filter['group'].length < 2 ) {
this.search['group'] = [];
return true;
}
fetch(GROUPS_URL + '?search=' + this.filter['group'] )
.then((res) => res.json())
.then(res => {
this.search['group'] = res;
})
},
% if ( $roles->{owner} ) { % if ( $roles->{owner} ) {
updateMeet() { updateMeet() {
...@@ -94,19 +130,6 @@ ...@@ -94,19 +130,6 @@
.then() .then()
}, },
searchUsers() {
if ( this.search_users.length < 2 ) {
this.users = [];
return true;
}
fetch(USERS_URL + '?search=' + this.search_users )
.then((res) => res.json())
.then(res => {
this.users = res;
})
},
deleteMeet() { deleteMeet() {
fetch(MEET_URL, { fetch(MEET_URL, {
method: "DELETE", method: "DELETE",
...@@ -120,29 +143,32 @@ ...@@ -120,29 +143,32 @@
}); });
}, },
addModerators() { % }
if ( this.selected_users.length == 0) { % if ( $roles->{owner} || $roles->{moderator} ) {
addUsers(kind) {
if ( this.selected[kind].length == 0) {
return true; return true;
} }
const selected = this.users.filter(item => this.selected_users.includes(item.id)) const selected = this.search[kind].filter(item => this.selected[kind].includes(item.id))
fetch(ADD_USERS_URL, { fetch(ADD_USERS_URL, {
method: "POST", method: "POST",
headers: API_HEADERS, headers: API_HEADERS,
body: JSON.stringify({ users: selected }), body: JSON.stringify({ users: this.selected[kind], kind: kind }),
}) })
.then((response) => { .then((response) => {
if (response.ok) { if (response.ok) {
this.selected_users =[] this.selected[kind] =[]
this.search_users = '' this.filter[kind] = ''
this.getMeet() this.getMeet()
} }
}) })
}, },
removeModerator(id) { removeUser(id, kind) {
fetch(MEET_URL + '/moderator/' + id, { fetch(MEET_URL + '/users/' + id, {
method: "DELETE", method: "DELETE",
headers: API_HEADERS, headers: API_HEADERS,
}) })
...@@ -153,43 +179,29 @@ ...@@ -153,43 +179,29 @@
}) })
}, },
% }
% if ( $roles->{owner} || $roles->{moderator} ) {
searchGroups() {
if ( this.search_groups.length < 2 ) {
this.groups = [];
return true;
}
fetch(GROUPS_URL + '?search=' + this.search_groups )
.then((res) => res.json())
.then(res => {
this.groups = res;
})
},
addGroups() { addGroups() {
if ( this.selected_groups.length == 0) { if ( this.selected['group'].length == 0) {
return true; return true;
} }
fetch(ADD_GROUPS_URL, { fetch(ADD_GROUPS_URL, {
method: "POST", method: "POST",
headers: API_HEADERS, headers: API_HEADERS,
body: JSON.stringify({ groups: this.selected_groups }), body: JSON.stringify({ groups: this.selected['group'] }),
}) })
.then((response) => { .then((response) => {
if (response.ok) { if (response.ok) {
this.selected_groups =[] this.selected['group'] =[]
this.search_groups = '' this.filter['group'] = ''
this.getMeet() this.getMeet()
} }
}) })
}, },
removeGroup(id) { removeGroup(id) {
fetch(MEET_URL + '/group/' + id, { fetch(MEET_URL + '/groups/' + id, {
method: "DELETE", method: "DELETE",
headers: API_HEADERS, headers: API_HEADERS,
}) })
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

Pirátský GitLab - Home of the CopyLeft