@@ -98,7 +98,10 @@ func DeleteKey(keyID string) error {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
_, err := db.Col("keys").DeleteOne(ctx, bson.M{"key_id": keyID})
|
if _, err := db.Col("keys").DeleteOne(ctx, bson.M{"key_id": keyID}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err := db.Col("assignments").DeleteMany(ctx, bson.M{"key_id": keyID})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,12 +215,11 @@ func GetAssignmentsWithKeysForServer(serverID string) ([]AssignmentWithKey, erro
|
|||||||
|
|
||||||
result := make([]AssignmentWithKey, 0, len(assignments))
|
result := make([]AssignmentWithKey, 0, len(assignments))
|
||||||
for _, a := range assignments {
|
for _, a := range assignments {
|
||||||
item := AssignmentWithKey{Assignment: a}
|
|
||||||
var key models.Key
|
var key models.Key
|
||||||
if err := db.Col("keys").FindOne(ctx, bson.M{"key_id": a.KeyID}).Decode(&key); err == nil {
|
if err := db.Col("keys").FindOne(ctx, bson.M{"key_id": a.KeyID}).Decode(&key); err != nil {
|
||||||
item.Key = &key
|
continue
|
||||||
}
|
}
|
||||||
result = append(result, item)
|
result = append(result, AssignmentWithKey{Assignment: a, Key: &key})
|
||||||
}
|
}
|
||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ export default function ServerDetailPage() {
|
|||||||
</Tr>
|
</Tr>
|
||||||
</Thead>
|
</Thead>
|
||||||
<Tbody>
|
<Tbody>
|
||||||
{server.keys.map((assignment) => (
|
{server.keys.filter(a => a.key).map((assignment) => (
|
||||||
<Tr key={assignment.key_id}>
|
<Tr key={assignment.key_id}>
|
||||||
<Td>
|
<Td>
|
||||||
<span className="font-medium">{assignment.key.label}</span>
|
<span className="font-medium">{assignment.key.label}</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user