mirror of
				https://github.com/nitnelave/lldap.git
				synced 2023-04-12 14:25:13 +00:00 
			
		
		
		
	Display the creation date for groups
This commit is contained in:
		
							parent
							
								
									4ba0db4e9e
								
							
						
					
					
						commit
						25647eadc0
					
				@ -2,6 +2,7 @@ query GetGroupDetails($id: Int!) {
 | 
				
			|||||||
  group(groupId: $id) {
 | 
					  group(groupId: $id) {
 | 
				
			||||||
    id
 | 
					    id
 | 
				
			||||||
    displayName
 | 
					    displayName
 | 
				
			||||||
 | 
					    creationDate
 | 
				
			||||||
    users {
 | 
					    users {
 | 
				
			||||||
      id
 | 
					      id
 | 
				
			||||||
      displayName
 | 
					      displayName
 | 
				
			||||||
 | 
				
			|||||||
@ -2,5 +2,6 @@ query GetGroupList {
 | 
				
			|||||||
  groups {
 | 
					  groups {
 | 
				
			||||||
    id
 | 
					    id
 | 
				
			||||||
    displayName
 | 
					    displayName
 | 
				
			||||||
 | 
					    creationDate
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -68,6 +68,36 @@ impl GroupDetails {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    fn view_details(&self, g: &Group) -> Html {
 | 
				
			||||||
 | 
					      html! {
 | 
				
			||||||
 | 
					        <>
 | 
				
			||||||
 | 
					          <h3>{g.display_name.to_string()}</h3>
 | 
				
			||||||
 | 
					          <div class="py-3">
 | 
				
			||||||
 | 
					            <form class="form">
 | 
				
			||||||
 | 
					              <div class="form-group row mb-3">
 | 
				
			||||||
 | 
					                <label for="displayName"
 | 
				
			||||||
 | 
					                  class="form-label col-4 col-form-label">
 | 
				
			||||||
 | 
					                  {"Group: "}
 | 
				
			||||||
 | 
					                </label>
 | 
				
			||||||
 | 
					                <div class="col-8">
 | 
				
			||||||
 | 
					                  <span id="groupId" class="form-constrol-static">{g.display_name.to_string()}</span>
 | 
				
			||||||
 | 
					                </div>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					              <div class="form-group row mb-3">
 | 
				
			||||||
 | 
					                <label for="creationDate"
 | 
				
			||||||
 | 
					                  class="form-label col-4 col-form-label">
 | 
				
			||||||
 | 
					                  {"Creation date: "}
 | 
				
			||||||
 | 
					                </label>
 | 
				
			||||||
 | 
					                <div class="col-8">
 | 
				
			||||||
 | 
					                  <span id="creationDate" class="form-constrol-static">{g.creation_date.date().naive_local()}</span>
 | 
				
			||||||
 | 
					                </div>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					            </form>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					        </>
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    fn view_user_list(&self, g: &Group) -> Html {
 | 
					    fn view_user_list(&self, g: &Group) -> Html {
 | 
				
			||||||
        let make_user_row = |user: &User| {
 | 
					        let make_user_row = |user: &User| {
 | 
				
			||||||
            let user_id = user.id.clone();
 | 
					            let user_id = user.id.clone();
 | 
				
			||||||
@ -92,7 +122,6 @@ impl GroupDetails {
 | 
				
			|||||||
        };
 | 
					        };
 | 
				
			||||||
        html! {
 | 
					        html! {
 | 
				
			||||||
          <>
 | 
					          <>
 | 
				
			||||||
            <h3>{g.display_name.to_string()}</h3>
 | 
					 | 
				
			||||||
            <h5 class="fw-bold">{"Members"}</h5>
 | 
					            <h5 class="fw-bold">{"Members"}</h5>
 | 
				
			||||||
            <div class="table-responsive">
 | 
					            <div class="table-responsive">
 | 
				
			||||||
              <table class="table table-striped">
 | 
					              <table class="table table-striped">
 | 
				
			||||||
@ -201,6 +230,7 @@ impl Component for GroupDetails {
 | 
				
			|||||||
            (Some(u), error) => {
 | 
					            (Some(u), error) => {
 | 
				
			||||||
                html! {
 | 
					                html! {
 | 
				
			||||||
                    <div>
 | 
					                    <div>
 | 
				
			||||||
 | 
					                      {self.view_details(u)}
 | 
				
			||||||
                      {self.view_user_list(u)}
 | 
					                      {self.view_user_list(u)}
 | 
				
			||||||
                      {self.view_add_user_button(u)}
 | 
					                      {self.view_add_user_button(u)}
 | 
				
			||||||
                      {self.view_messages(error)}
 | 
					                      {self.view_messages(error)}
 | 
				
			||||||
 | 
				
			|||||||
@ -97,7 +97,8 @@ impl GroupTable {
 | 
				
			|||||||
                  <table class="table table-striped">
 | 
					                  <table class="table table-striped">
 | 
				
			||||||
                    <thead>
 | 
					                    <thead>
 | 
				
			||||||
                      <tr>
 | 
					                      <tr>
 | 
				
			||||||
                        <th>{"Groups"}</th>
 | 
					                        <th>{"Group name"}</th>
 | 
				
			||||||
 | 
					                        <th>{"Creation date"}</th>
 | 
				
			||||||
                        <th>{"Delete"}</th>
 | 
					                        <th>{"Delete"}</th>
 | 
				
			||||||
                      </tr>
 | 
					                      </tr>
 | 
				
			||||||
                    </thead>
 | 
					                    </thead>
 | 
				
			||||||
@ -122,6 +123,9 @@ impl GroupTable {
 | 
				
			|||||||
                  {&group.display_name}
 | 
					                  {&group.display_name}
 | 
				
			||||||
                </Link>
 | 
					                </Link>
 | 
				
			||||||
              </td>
 | 
					              </td>
 | 
				
			||||||
 | 
					              <td>
 | 
				
			||||||
 | 
					                {&group.creation_date.date().naive_local()}
 | 
				
			||||||
 | 
					              </td>
 | 
				
			||||||
              <td>
 | 
					              <td>
 | 
				
			||||||
                <DeleteGroup
 | 
					                <DeleteGroup
 | 
				
			||||||
                  group=group.clone()
 | 
					                  group=group.clone()
 | 
				
			||||||
 | 
				
			|||||||
@ -17,6 +17,7 @@ type Mutation {
 | 
				
			|||||||
type Group {
 | 
					type Group {
 | 
				
			||||||
  id: Int!
 | 
					  id: Int!
 | 
				
			||||||
  displayName: String!
 | 
					  displayName: String!
 | 
				
			||||||
 | 
					  creationDate: DateTimeUtc!
 | 
				
			||||||
  "The groups to which this user belongs."
 | 
					  "The groups to which this user belongs."
 | 
				
			||||||
  users: [User!]!
 | 
					  users: [User!]!
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -272,6 +272,9 @@ impl<Handler: BackendHandler + Sync> Group<Handler> {
 | 
				
			|||||||
    fn display_name(&self) -> String {
 | 
					    fn display_name(&self) -> String {
 | 
				
			||||||
        self.display_name.clone()
 | 
					        self.display_name.clone()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    fn creation_date(&self) -> chrono::DateTime<chrono::Utc> {
 | 
				
			||||||
 | 
					        self.creation_date
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    /// The groups to which this user belongs.
 | 
					    /// The groups to which this user belongs.
 | 
				
			||||||
    async fn users(&self, context: &Context<Handler>) -> FieldResult<Vec<User<Handler>>> {
 | 
					    async fn users(&self, context: &Context<Handler>) -> FieldResult<Vec<User<Handler>>> {
 | 
				
			||||||
        let span = debug_span!("[GraphQL query] group::users");
 | 
					        let span = debug_span!("[GraphQL query] group::users");
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user