Better filtering
This commit is contained in:
parent
cf76272456
commit
61825de579
4
server/package-lock.json
generated
4
server/package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti-svr",
|
"name": "ifms-pti-svr",
|
||||||
"version": "2.12.4",
|
"version": "2.12.5",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ifms-pti-svr",
|
"name": "ifms-pti-svr",
|
||||||
"version": "2.12.4",
|
"version": "2.12.5",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@prisma/client": "^3.11.0",
|
"@prisma/client": "^3.11.0",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti-svr",
|
"name": "ifms-pti-svr",
|
||||||
"version": "2.12.4",
|
"version": "2.12.5",
|
||||||
"description": "Servidor do Portal de TI do IFMS",
|
"description": "Servidor do Portal de TI do IFMS",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import prisma from '../../prisma'
|
import prisma from '../../prisma'
|
||||||
|
|
||||||
export async function wifiDevices(_, { take = 100, skip = 0, search }) {
|
export async function wifiDevices(parent, { take = 100, skip = 0, search }) {
|
||||||
const mode = 'insensitive'
|
const mode = 'insensitive'
|
||||||
|
|
||||||
if (search === null)
|
if (search === null)
|
||||||
|
|
|
@ -1,15 +1,44 @@
|
||||||
import prisma from '../../prisma'
|
import prisma from '../../prisma'
|
||||||
|
|
||||||
// TODO: Add filtering
|
// TODO: Add filtering
|
||||||
export async function wifiUsers() {
|
export async function wifiUsers(parent, { take = 100, skip = 0, search }) {
|
||||||
const wifiUsers = await prisma.user.findMany({
|
const mode = 'insensitive'
|
||||||
where: { wifiDevices: { some: { id: { not: undefined } } } },
|
|
||||||
include: { wifiDevices: true }
|
|
||||||
})
|
|
||||||
|
|
||||||
return wifiUsers.sort(
|
if (search === null)
|
||||||
(a, b) =>
|
search = undefined
|
||||||
b.wifiDevices.filter(device => device.status == 'ONLINE').length -
|
|
||||||
a.wifiDevices.filter(device => device.status == 'ONLINE').length
|
return prisma.user.findMany({
|
||||||
)
|
where: {
|
||||||
|
AND: [
|
||||||
|
{ wifiDevices: { some: { id: { not: undefined } } } },
|
||||||
|
{
|
||||||
|
OR: [
|
||||||
|
{ wifiDevices: { some: { hostname: { contains: search, mode } } } },
|
||||||
|
{
|
||||||
|
wifiDevices: {
|
||||||
|
some: {
|
||||||
|
accessPoint: {
|
||||||
|
OR: [
|
||||||
|
{ name: { contains: search, mode } },
|
||||||
|
{ local: { contains: search, mode } },
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ wifiDevices: { some: { mac: { contains: search, mode } } } },
|
||||||
|
{ wifiDevices: { some: { ip: { contains: search, mode } } } },
|
||||||
|
{ displayName: { contains: search, mode } }, ,
|
||||||
|
{ sAMAccountName: { contains: search, mode } },
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
include: { wifiDevices: true },
|
||||||
|
orderBy: [
|
||||||
|
{ wifiDevices: { _count: 'desc' } },
|
||||||
|
{ displayName: 'asc' }],
|
||||||
|
take,
|
||||||
|
skip
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,10 @@ const typeDefs = gql`
|
||||||
): [WifiDevice]! @auth(roles: ["superAdmin"])
|
): [WifiDevice]! @auth(roles: ["superAdmin"])
|
||||||
|
|
||||||
"Users that uses the Wi-Fi"
|
"Users that uses the Wi-Fi"
|
||||||
wifiUsers: [User]! @auth(roles: ["superAdmin"])
|
wifiUsers(
|
||||||
|
search: String = ""
|
||||||
|
take: Int
|
||||||
|
skip: Int): [User]! @auth(roles: ["superAdmin"])
|
||||||
|
|
||||||
"Application Logs"
|
"Application Logs"
|
||||||
logs(
|
logs(
|
||||||
|
|
4
web/package-lock.json
generated
4
web/package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti",
|
"name": "ifms-pti",
|
||||||
"version": "2.12.4",
|
"version": "2.12.5",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ifms-pti",
|
"name": "ifms-pti",
|
||||||
"version": "2.12.4",
|
"version": "2.12.5",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mdi/font": "^6.6.96",
|
"@mdi/font": "^6.6.96",
|
||||||
"apollo-link-ws": "^1.0.20",
|
"apollo-link-ws": "^1.0.20",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ifms-pti",
|
"name": "ifms-pti",
|
||||||
"version": "2.12.4",
|
"version": "2.12.5",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "vue-cli-service serve",
|
"serve": "vue-cli-service serve",
|
||||||
|
|
|
@ -59,18 +59,18 @@ export default {
|
||||||
route: { name: 'wifi-devices' },
|
route: { name: 'wifi-devices' },
|
||||||
role: 'superAdmin'
|
role: 'superAdmin'
|
||||||
},
|
},
|
||||||
{
|
|
||||||
title: 'Access Points',
|
|
||||||
icon: 'mdi-access-point',
|
|
||||||
route: { name: 'access-points' },
|
|
||||||
role: 'superAdmin'
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: 'Usuários Wi-Fi',
|
title: 'Usuários Wi-Fi',
|
||||||
icon: 'mdi-account-voice',
|
icon: 'mdi-account-voice',
|
||||||
route: { name: 'wifi-users' },
|
route: { name: 'wifi-users' },
|
||||||
role: 'superAdmin'
|
role: 'superAdmin'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: 'Access Points',
|
||||||
|
icon: 'mdi-access-point',
|
||||||
|
route: { name: 'access-points' },
|
||||||
|
role: 'superAdmin'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: 'Inspecionar Usuário',
|
title: 'Inspecionar Usuário',
|
||||||
icon: 'mdi-account-search',
|
icon: 'mdi-account-search',
|
||||||
|
|
|
@ -1,16 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<v-container fluid>
|
||||||
<v-toolbar height="115" class="align-content-center bottom-border" flat>
|
<v-toolbar class="mb-2" flat outlined>
|
||||||
<v-text-field
|
<v-text-field
|
||||||
v-model="search"
|
v-model="search"
|
||||||
class="mt-6 search"
|
|
||||||
label="Pesquisar"
|
label="Pesquisar"
|
||||||
hint="MAC/IP/Usuário"
|
prepend-inner-icon="mdi-account-search"
|
||||||
prepend-icon="mdi-magnify"
|
|
||||||
clearable
|
clearable
|
||||||
outlined
|
hide-details
|
||||||
rounded
|
|
||||||
style="max-width: 512px"
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<v-tooltip bottom>
|
<v-tooltip bottom>
|
||||||
|
@ -29,7 +25,6 @@
|
||||||
</template>
|
</template>
|
||||||
</v-tooltip>
|
</v-tooltip>
|
||||||
</v-toolbar>
|
</v-toolbar>
|
||||||
<v-container fluid>
|
|
||||||
<div v-if="wifiDevices && stats" class="text-center my-4">
|
<div v-if="wifiDevices && stats" class="text-center my-4">
|
||||||
<v-chip color="primary" class="mr-1" dark>
|
<v-chip color="primary" class="mr-1" dark>
|
||||||
{{ stats.onlineWifiDevices }}
|
{{ stats.onlineWifiDevices }}
|
||||||
|
@ -192,8 +187,10 @@
|
||||||
</v-expansion-panels>
|
</v-expansion-panels>
|
||||||
</template>
|
</template>
|
||||||
</v-data-iterator>
|
</v-data-iterator>
|
||||||
|
<v-alert type="info" outlined dismissible>
|
||||||
|
São exibidos apenas os 100 primeiros resultados da pesquisa
|
||||||
|
</v-alert>
|
||||||
</v-container>
|
</v-container>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -1,16 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<v-container fluid>
|
||||||
<v-toolbar height="115" class="align-content-center bottom-border" flat>
|
<v-toolbar class="mb-2" flat outlined>
|
||||||
<v-text-field
|
<v-text-field
|
||||||
v-model="search"
|
v-model="search"
|
||||||
class="mt-6 search"
|
|
||||||
label="Pesquisar"
|
label="Pesquisar"
|
||||||
hint="Nome/conta"
|
prepend-inner-icon="mdi-account-search"
|
||||||
prepend-icon="mdi-account-search"
|
|
||||||
clearable
|
clearable
|
||||||
outlined
|
hide-details
|
||||||
rounded
|
|
||||||
style="max-width: 512px"
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<v-tooltip bottom>
|
<v-tooltip bottom>
|
||||||
|
@ -29,7 +25,6 @@
|
||||||
</template>
|
</template>
|
||||||
</v-tooltip>
|
</v-tooltip>
|
||||||
</v-toolbar>
|
</v-toolbar>
|
||||||
<v-container fluid>
|
|
||||||
<div v-if="stats" class="text-center my-4">
|
<div v-if="stats" class="text-center my-4">
|
||||||
<v-chip color="primary" class="mr-2" dark>
|
<v-chip color="primary" class="mr-2" dark>
|
||||||
{{ stats.onlineUsers }}
|
{{ stats.onlineUsers }}
|
||||||
|
@ -42,7 +37,6 @@
|
||||||
<v-data-iterator
|
<v-data-iterator
|
||||||
:items="sortedWifiUsers"
|
:items="sortedWifiUsers"
|
||||||
:loading="$apollo.queries.wifiUsers.loading"
|
:loading="$apollo.queries.wifiUsers.loading"
|
||||||
:search="search"
|
|
||||||
>
|
>
|
||||||
<template #default="{ items }">
|
<template #default="{ items }">
|
||||||
<v-expansion-panels>
|
<v-expansion-panels>
|
||||||
|
@ -199,8 +193,10 @@
|
||||||
</v-expansion-panels>
|
</v-expansion-panels>
|
||||||
</template>
|
</template>
|
||||||
</v-data-iterator>
|
</v-data-iterator>
|
||||||
|
<v-alert type="info" outlined dismissible>
|
||||||
|
São exibidos apenas os 100 primeiros resultados da pesquisa
|
||||||
|
</v-alert>
|
||||||
</v-container>
|
</v-container>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import gql from 'graphql-tag'
|
import gql from 'graphql-tag'
|
||||||
|
@ -225,8 +221,8 @@ export default {
|
||||||
wifiUsers: {
|
wifiUsers: {
|
||||||
fetchPolicy: 'cache-and-network',
|
fetchPolicy: 'cache-and-network',
|
||||||
query: gql`
|
query: gql`
|
||||||
query {
|
query wifiUsers($search: String) {
|
||||||
wifiUsers {
|
wifiUsers(search: $search) {
|
||||||
displayName
|
displayName
|
||||||
sAMAccountName
|
sAMAccountName
|
||||||
thumbnailPhoto
|
thumbnailPhoto
|
||||||
|
@ -244,7 +240,12 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
`
|
`,
|
||||||
|
variables() {
|
||||||
|
return {
|
||||||
|
search: this.search
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
stats: {
|
stats: {
|
||||||
query: gql`
|
query: gql`
|
||||||
|
|
Loading…
Reference in New Issue
Block a user