Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/dev/configs/api.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.13.1",
"version": "4.14.0",
"extraOrigins": [],
"sandbox": true,
"ssoSubIds": [],
Expand Down
81 changes: 17 additions & 64 deletions api/generated-schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -1501,98 +1501,51 @@ type InfoBaseboard implements Node {
memSlots: Float
}

type InfoVersions implements Node {
id: PrefixedID!
type CoreVersions {
"""Unraid version"""
unraid: String

"""Unraid API version"""
api: String

"""Kernel version"""
kernel: String
}

type PackageVersions {
"""OpenSSL version"""
openssl: String

"""System OpenSSL version"""
systemOpenssl: String

"""Node.js version"""
node: String

"""V8 engine version"""
v8: String

"""npm version"""
npm: String

"""Yarn version"""
yarn: String

"""pm2 version"""
pm2: String

"""Gulp version"""
gulp: String

"""Grunt version"""
grunt: String

"""Git version"""
git: String

"""tsc version"""
tsc: String

"""MySQL version"""
mysql: String

"""Redis version"""
redis: String

"""MongoDB version"""
mongodb: String

"""Apache version"""
apache: String

"""nginx version"""
nginx: String

"""PHP version"""
php: String

"""Postfix version"""
postfix: String

"""PostgreSQL version"""
postgresql: String

"""Perl version"""
perl: String

"""Python version"""
python: String

"""Python3 version"""
python3: String

"""pip version"""
pip: String

"""pip3 version"""
pip3: String

"""Java version"""
java: String

"""gcc version"""
gcc: String

"""VirtualBox version"""
virtualbox: String

"""Docker version"""
docker: String
}

"""Unraid version"""
unraid: String
type InfoVersions implements Node {
id: PrefixedID!

"""Core system versions"""
core: CoreVersions!

"""Software package versions"""
packages: PackageVersions!
}

type Info implements Node {
Expand Down
10 changes: 7 additions & 3 deletions api/src/unraid-api/cli/__test__/api-report.service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,13 @@ describe('ApiReportService', () => {
uuid: 'test-uuid',
},
versions: {
unraid: '6.12.0',
kernel: '5.19.17',
openssl: '3.0.8',
core: {
unraid: '6.12.0',
kernel: '5.19.17',
},
packages: {
openssl: '3.0.8',
},
},
},
config: {
Expand Down
2 changes: 1 addition & 1 deletion api/src/unraid-api/cli/api-report.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class ApiReportService {
? {
id: systemData.info.system.uuid,
name: systemData.server?.name || 'Unknown',
version: systemData.info.versions.unraid || 'Unknown',
version: systemData.info.versions.core.unraid || 'Unknown',
machineId: 'REDACTED',
manufacturer: systemData.info.system.manufacturer,
model: systemData.info.system.model,
Expand Down
6 changes: 3 additions & 3 deletions api/src/unraid-api/cli/generated/gql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Documents = {
"\n mutation UpdateSandboxSettings($input: JSON!) {\n updateSettings(input: $input) {\n restartRequired\n values\n }\n }\n": typeof types.UpdateSandboxSettingsDocument,
"\n query GetPlugins {\n plugins {\n name\n version\n hasApiModule\n hasCliModule\n }\n }\n": typeof types.GetPluginsDocument,
"\n query GetSSOUsers {\n settings {\n api {\n ssoSubIds\n }\n }\n }\n": typeof types.GetSsoUsersDocument,
"\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n unraid\n kernel\n openssl\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n": typeof types.SystemReportDocument,
"\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n core {\n unraid\n kernel\n }\n packages {\n openssl\n }\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n": typeof types.SystemReportDocument,
"\n query ConnectStatus {\n connect {\n id\n dynamicRemoteAccess {\n enabledType\n runningType\n error\n }\n }\n }\n": typeof types.ConnectStatusDocument,
"\n query Services {\n services {\n id\n name\n online\n uptime {\n timestamp\n }\n version\n }\n }\n": typeof types.ServicesDocument,
"\n query ValidateOidcSession($token: String!) {\n validateOidcSession(token: $token) {\n valid\n username\n }\n }\n": typeof types.ValidateOidcSessionDocument,
Expand All @@ -32,7 +32,7 @@ const documents: Documents = {
"\n mutation UpdateSandboxSettings($input: JSON!) {\n updateSettings(input: $input) {\n restartRequired\n values\n }\n }\n": types.UpdateSandboxSettingsDocument,
"\n query GetPlugins {\n plugins {\n name\n version\n hasApiModule\n hasCliModule\n }\n }\n": types.GetPluginsDocument,
"\n query GetSSOUsers {\n settings {\n api {\n ssoSubIds\n }\n }\n }\n": types.GetSsoUsersDocument,
"\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n unraid\n kernel\n openssl\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n": types.SystemReportDocument,
"\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n core {\n unraid\n kernel\n }\n packages {\n openssl\n }\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n": types.SystemReportDocument,
"\n query ConnectStatus {\n connect {\n id\n dynamicRemoteAccess {\n enabledType\n runningType\n error\n }\n }\n }\n": types.ConnectStatusDocument,
"\n query Services {\n services {\n id\n name\n online\n uptime {\n timestamp\n }\n version\n }\n }\n": types.ServicesDocument,
"\n query ValidateOidcSession($token: String!) {\n validateOidcSession(token: $token) {\n valid\n username\n }\n }\n": types.ValidateOidcSessionDocument,
Expand Down Expand Up @@ -79,7 +79,7 @@ export function gql(source: "\n query GetSSOUsers {\n settings {\n
/**
* The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
export function gql(source: "\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n unraid\n kernel\n openssl\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n"): (typeof documents)["\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n unraid\n kernel\n openssl\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n"];
export function gql(source: "\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n core {\n unraid\n kernel\n }\n packages {\n openssl\n }\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n"): (typeof documents)["\n query SystemReport {\n info {\n id\n machineId\n system {\n manufacturer\n model\n version\n sku\n serial\n uuid\n }\n versions {\n core {\n unraid\n kernel\n }\n packages {\n openssl\n }\n }\n }\n config {\n id\n valid\n error\n }\n server {\n id\n name\n }\n }\n"];
/**
* The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
*/
Expand Down
Loading
Loading