psono/psono-admin-client
psono/psono-admin-client
1
0
Fork 0
mirror of https://gitlab.com/psono/psono-admin-client synced 2025-04-19 03:22:17 +03:00
Code

Merge branch 'develop' into 'master'

Browse Source 
Preparing v1.7.19

See merge request psono/psono-admin-client!77
This commit is contained in:
Sascha Pfeiffer 2025-04-10 17:35:48 +00:00
commit e20476ba7e
4 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.nvmrc
View File

@ -1 +1 @@
16.15.1
22.11.0

2
src/components/Card/VersionCard.jsx
View File

@ -21,7 +21,7 @@ function VersionCard(props) {
icon={Update}
iconColor="orange"
title={title}
description={t('LOADING')}
description={used_version || t('LOADING')}
statIcon={Update}
statIconColor="gray"
statText={t('WAITING_FOR_VERSION')}

75
src/views/Dashboard/Index.jsx
View File

@ -27,6 +27,7 @@ import psono_server from '../../services/api-server';
import psono_client from '../../services/api-client';
import HealthCheck from './HealthCheck';
import store from '../../services/store';
import notification from '../../services/notification';
const Chartist = require('chartist');
@ -84,43 +85,49 @@ const Dashboard = ({ classes, state }) => {
const fetchData = async () => {
const serverType = state.server.type;
const serverChangelogUrl =
serverType === 'CE'
? '/gitlab.com/psono/psono-server/changelog.json'
: '/gitlab.com/psono-enterprise/psono-server/changelog.json';
try {
const serverChangelogUrl =
serverType === 'CE'
? '/gitlab.com/psono/psono-server/changelog.json'
: '/gitlab.com/psono-enterprise/psono-server/changelog.json';
const [
serverResponse,
clientResponse,
adminClientResponse,
fileServerResponse,
] = await Promise.all([
api_static.get(serverChangelogUrl),
api_static.get('/gitlab.com/psono/psono-client/changelog.json'),
api_static.get(
'/gitlab.com/psono/psono-admin-client/changelog.json'
),
api_static.get(
'/gitlab.com/psono/psono-fileserver/changelog.json'
),
]);
const [
serverResponse,
clientResponse,
adminClientResponse,
fileServerResponse,
] = await Promise.all([
api_static.get(serverChangelogUrl),
api_static.get(
'/gitlab.com/psono/psono-client/changelog.json'
),
api_static.get(
'/gitlab.com/psono/psono-admin-client/changelog.json'
),
api_static.get(
'/gitlab.com/psono/psono-fileserver/changelog.json'
),
]);
convertTagsToReleases(serverResponse);
convertTagsToReleases(clientResponse);
convertTagsToReleases(adminClientResponse);
convertTagsToReleases(fileServerResponse);
convertTagsToReleases(serverResponse);
convertTagsToReleases(clientResponse);
convertTagsToReleases(adminClientResponse);
convertTagsToReleases(fileServerResponse);
setDashboardData((prevData) => ({
...prevData,
server_tags: serverResponse,
server_latest_version: serverResponse[0].name,
client_tags: clientResponse,
client_latest_version: clientResponse[0].name,
admin_client_tags: adminClientResponse,
admin_client_latest_version: adminClientResponse[0].name,
fileserver_tags: fileServerResponse,
fileserver_latest_version: fileServerResponse[0].name,
}));
setDashboardData((prevData) => ({
...prevData,
server_tags: serverResponse,
server_latest_version: serverResponse[0].name,
client_tags: clientResponse,
client_latest_version: clientResponse[0].name,
admin_client_tags: adminClientResponse,
admin_client_latest_version: adminClientResponse[0].name,
fileserver_tags: fileServerResponse,
fileserver_latest_version: fileServerResponse[0].name,
}));
} catch (e) {
console.log(e);
}
const serverInfoResponse = await psono_server.admin_info(
store.getState().user.token,

2
var/build-ubuntu.sh
View File

@ -3,7 +3,7 @@ apt-get update && \
apt-get install -y ca-certificates curl gnupg apt-transport-https zip && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && \
apt-get -y install nodejs && \
npm --version && \