@@ -609,6 +614,7 @@ function PointLibrary({ metadata, filterText, onFilterTextChange, onAddPoint })
const search = filterText.trim().toLowerCase();
return getOrderedPointEntries(metadata)
+ .filter((point) => normalizeDisplayText(point.alias).trim().length > 0)
.filter((point) => {
if (!search) {
return true;
@@ -711,7 +717,7 @@ export default function App() {
const [isCreatingSource, setIsCreatingSource] = useState(false);
const [sourceDraft, setSourceDraft] = useState(defaultSourceDraft);
const [sourceModalOpen, setSourceModalOpen] = useState(false);
- const emptyManualDatapointDraft = (protocol = defaultSourceDraft.protocol) => ({ alias: "", address: "", pointIndex: "", unit: "°C", dataType: getDefaultPointDataType(protocol), kind: "analog", scale: "1", writeMode: "", condition: "" });
+ const emptyManualDatapointDraft = (protocol = defaultSourceDraft.protocol, kind = "analog") => ({ alias: "", address: "", pointIndex: "", unit: getDefaultUnitForKind(kind), dataType: getDefaultPointDataType(protocol), kind, scale: "1", writeMode: "", condition: "" });
const [collectorPointFilter, setCollectorPointFilter] = useState("");
const [manualDatapointDraft, setManualDatapointDraft] = useState(emptyManualDatapointDraft());
const [scanResults, setScanResults] = useState({ opcua: null, bacnet: null });
@@ -719,13 +725,14 @@ export default function App() {
const trendIsps = useMemo(() => isps.filter((isp) => Number(isp.rowCount) > 0), [isps]);
const selectedMetadata = selectedIsp ? metadataCache[selectedIsp] : null;
- const canViewDashboard = hasPermission(user, "view_dashboard");
- const canViewTrends = hasPermission(user, "view_trends");
- const canEditAliases = hasPermission(user, "edit_aliases");
- const canManageSources = hasPermission(user, "manage_sources");
- const canManageUsers = hasPermission(user, "manage_users");
- const canManageRoles = hasPermission(user, "manage_roles");
- const canViewDebug = hasPermission(user, "view_debug");
+ const isAuthenticated = Boolean(token);
+ const canViewDashboard = !isAuthenticated || hasPermission(user, "view_dashboard");
+ const canViewTrends = !isAuthenticated || hasPermission(user, "view_trends");
+ const canEditAliases = isAuthenticated && hasPermission(user, "edit_aliases");
+ const canManageSources = isAuthenticated && hasPermission(user, "manage_sources");
+ const canManageUsers = isAuthenticated && hasPermission(user, "manage_users");
+ const canManageRoles = isAuthenticated && hasPermission(user, "manage_roles");
+ const canViewDebug = isAuthenticated && hasPermission(user, "view_debug");
const canAccessAdmin = canEditAliases || canManageSources || canManageUsers || canManageRoles || canViewDebug;
const firstAdminSection = canEditAliases ? "aliases" : canManageSources ? "sources" : canManageUsers ? "users" : canManageRoles ? "roles" : canViewDebug ? "debug" : "aliases";
const sidebarCollapsed = !sidebarPinned && !sidebarHover;
@@ -777,10 +784,7 @@ export default function App() {
};
const refreshIspCatalog = async () => {
- if (!token) {
- return [];
- }
- const result = await api.getIsps(token);
+ const result = await api.getIsps(token || undefined);
const nextIsps = result.isps || [];
setIsps(nextIsps);
return nextIsps;
@@ -843,18 +847,31 @@ export default function App() {
}, [activeView, adminSection]);
useEffect(() => {
- if (!token) {
- setSessionReady(true);
- setPreferencesReady(false);
- return;
- }
-
let ignore = false;
async function bootstrap() {
setSessionReady(false);
resetFlash();
try {
+ if (!token) {
+ const [ispResult, dashboardResult] = await Promise.all([
+ api.getIsps(),
+ api.getDashboard(),
+ ]);
+
+ if (ignore) {
+ return;
+ }
+
+ setUser(null);
+ setIsps(ispResult.isps || []);
+ setSelections([]);
+ setDashboard(dashboardResult);
+ setActiveView((current) => current === "admin" ? "dashboard" : current);
+ setPreferencesReady(false);
+ return;
+ }
+
const [me, pref, ispResult, selectionResult, dashboardResult] = await Promise.all([
api.me(token),
api.getPreferences(token),
@@ -879,10 +896,12 @@ export default function App() {
} catch (error) {
if (!ignore) {
setBootError(error.message);
- setLoginError(error.message);
- setToken("");
- setUser(null);
- localStorage.removeItem("seltd-token");
+ if (token) {
+ setLoginError(error.message);
+ setToken("");
+ setUser(null);
+ localStorage.removeItem("seltd-token");
+ }
}
} finally {
if (!ignore) {
@@ -952,11 +971,11 @@ export default function App() {
}, [csvDelimiter, preferencesReady, sidebarPinned, themeMode, token]);
useEffect(() => {
- if (!token || !selectedIsp || metadataCache[selectedIsp]) {
+ if (!selectedIsp || metadataCache[selectedIsp]) {
return;
}
- api.getAliases(token, selectedIsp)
+ api.getAliases(token || undefined, selectedIsp)
.then((result) => setMetadataCache((current) => ({ ...current, [selectedIsp]: result })))
.catch((error) => setBootError(error.message));
}, [metadataCache, selectedIsp, token]);
@@ -975,7 +994,7 @@ export default function App() {
}, [adminIsp, token]);
useEffect(() => {
- if (!token || workingPoints.length === 0) {
+ if (workingPoints.length === 0) {
return;
}
@@ -984,7 +1003,7 @@ export default function App() {
return;
}
- Promise.all(missingIsps.map((isp) => api.getAliases(token, isp)))
+ Promise.all(missingIsps.map((isp) => api.getAliases(token || undefined, isp)))
.then((results) => {
setMetadataCache((current) => {
const next = { ...current };
@@ -998,12 +1017,12 @@ export default function App() {
}, [metadataCache, token, workingPoints]);
useEffect(() => {
- if (!token || dashboard.widgets.length === 0) {
+ if (dashboard.widgets.length === 0) {
setDashboardData({});
return;
}
- api.loadDashboardData(token, { widgets: dashboard.widgets })
+ api.loadDashboardData(token || undefined, { widgets: dashboard.widgets })
.then((result) => setDashboardData(Object.fromEntries(result.widgets.map((widget) => [widget.id, widget]))))
.catch((error) => setBootError(error.message));
}, [dashboard, token]);
@@ -1045,11 +1064,6 @@ export default function App() {
}, [canEditAliases, canManageSources, token]);
useEffect(() => {
- if (!token) {
- return undefined;
- }
-
- let ignore = false;
const refreshIsps = () => {
refreshIspCatalog().catch(() => undefined);
};
@@ -1064,7 +1078,6 @@ export default function App() {
window.addEventListener("focus", refreshIsps);
document.addEventListener("visibilitychange", handleVisibilityChange);
return () => {
- ignore = true;
window.clearInterval(timer);
window.removeEventListener("focus", refreshIsps);
document.removeEventListener("visibilitychange", handleVisibilityChange);
@@ -1106,6 +1119,7 @@ export default function App() {
setManualDatapointDraft((current) => ({
...current,
dataType: getDefaultPointDataType(currentSource.protocol || "modbus-tcp"),
+ unit: current.unit || getDefaultUnitForKind(current.kind || "analog"),
}));
}, [currentSource]);
@@ -1204,7 +1218,8 @@ export default function App() {
};
const addPoint = (pointIndex, isp = selectedIsp) => {
- if (!isp || workingPoints.some((point) => point.isp === isp && point.pointIndex === pointIndex)) {
+ const pointMeta = metadataCache[isp]?.points?.[String(pointIndex)];
+ if (!isp || !normalizeDisplayText(pointMeta?.alias).trim() || workingPoints.some((point) => point.isp === isp && point.pointIndex === pointIndex)) {
return;
}
@@ -1900,7 +1915,7 @@ export default function App() {
}
if (passwordDraft.nextPassword !== passwordDraft.repeatPassword) {
- setBootError("Die neuen Passw?rter stimmen nicht ?berein.");
+ setBootError("Die neuen Passwörter stimmen nicht überein.");
return;
}
@@ -1910,16 +1925,12 @@ export default function App() {
nextPassword: passwordDraft.nextPassword,
});
setPasswordDraft({ currentPassword: "", nextPassword: "", repeatPassword: "" });
- setSuccessMessage("Passwort ge?ndert.");
+ setSuccessMessage("Passwort geändert.");
} catch (error) {
setBootError(error.message);
}
};
- if (!token) {
- return
;
- }
-
if (!sessionReady) {
return
;
}
@@ -1942,7 +1953,7 @@ export default function App() {
) : null}