Merge pull request #282 from OpenDTU-App/fix-version-if-flashing-self…

…-compiled

Fix version if flashing self compiled opendtu firmware

src/hooks/useHasNewOpenDtuVersion.ts

@@ -4,6 +4,8 @@ import { compare } from 'compare-versions';
 
 import useDtuState from '@/hooks/useDtuState';
 
+import correctTag from '@/utils/correctTag';
+
 import { useAppSelector } from '@/store';
 
 const useHasNewOpenDtuVersion = (options?: {
@@ -21,20 +23,28 @@ const useHasNewOpenDtuVersion = (options?: {
 
   const currentRelease = useDtuState(state => state?.systemStatus?.git_hash);
 
+  const correctedCurrentRelease = correctTag(currentRelease);
+
   return useMemo(() => {
-    if (!openDtuRelease || !currentRelease) return [false, null] as const;
+    if (!openDtuRelease || !correctedCurrentRelease)
+      return [false, null] as const;
 
     const newAppVersionAvailable = compare(
       openDtuRelease?.tag_name,
-      currentRelease,
+      correctedCurrentRelease,
       '>',
     );
 
     return [
       !showIndicator && usedForIndicatorOnly ? false : newAppVersionAvailable,
       openDtuRelease,
     ] as const;
-  }, [currentRelease, openDtuRelease, showIndicator, usedForIndicatorOnly]);
+  }, [
+    correctedCurrentRelease,
+    openDtuRelease,
+    showIndicator,
+    usedForIndicatorOnly,
+  ]);
 };
 
 export default useHasNewOpenDtuVersion;

src/utils/correctTag.ts

@@ -0,0 +1,12 @@
+const correctTag = <T extends string | (string | undefined)>(tag: T): T => {
+  if (!tag) {
+    return tag;
+  }
+
+  const regex = /^v\d+\.\d+\.\d+/;
+  const match = tag.match(regex);
+
+  return (match ? match[0] : tag) as T;
+};
+
+export default correctTag;

src/views/navigation/screens/InformationGroup/FirmwareListScreen.tsx

@@ -16,6 +16,8 @@ import SettingsSurface from '@/components/styled/SettingsSurface';
 
 import useDtuState from '@/hooks/useDtuState';
 
+import correctTag from '@/utils/correctTag';
+
 import { minimumOpenDtuFirmwareVersion, spacing } from '@/constants';
 import { useFetchControl } from '@/github/FetchHandler';
 import { useAppSelector } from '@/store';
@@ -30,7 +32,11 @@ const FirmwareListScreen: FC<PropsWithNavigation> = ({ navigation }) => {
   const { refreshLatestRelease, refreshReleases } = useFetchControl();
 
   const releases = useAppSelector(state => state.github.releases);
-  const currentRelease = useDtuState(state => state?.systemStatus?.git_hash);
+  const rawCurrentRelease = useDtuState(state => state?.systemStatus?.git_hash);
+  const currentRelease = useMemo(
+    () => correctTag(rawCurrentRelease),
+    [rawCurrentRelease],
+  );
 
   const newReleases = useMemo(() => {
     if (!currentRelease) {

src/views/navigation/screens/InformationGroup/SystemInformationScreen.tsx

@@ -18,6 +18,7 @@ import SettingsSurface, {
 import useDtuState from '@/hooks/useDtuState';
 import useHasNewOpenDtuVersion from '@/hooks/useHasNewOpenDtuVersion';
 
+import correctTag from '@/utils/correctTag';
 import formatBytes from '@/utils/formatBytes';
 import percentage from '@/utils/percentage';
 
@@ -51,9 +52,13 @@ const SystemInformationScreen: FC<PropsWithNavigation> = ({ navigation }) => {
   const openGitHub = useCallback(async () => {
     if (!systemStatus) return undefined;
 
+    const corrected = correctTag(systemStatus.git_hash);
+
+    if (!corrected) return undefined;
+
     const url = systemStatus.git_is_hash
-      ? `https://github.com/tbnobody/OpenDTU/commits/${systemStatus.git_hash}`
-      : `https://github.com/tbnobody/OpenDTU/releases/tag/${systemStatus.git_hash}`;
+      ? `https://github.com/tbnobody/OpenDTU/commits/${corrected}`
+      : `https://github.com/tbnobody/OpenDTU/releases/tag/${corrected}`;
 
     if (await Linking.canOpenURL(url)) {
       await Linking.openURL(url);
@@ -66,7 +71,9 @@ const SystemInformationScreen: FC<PropsWithNavigation> = ({ navigation }) => {
 
     if (systemStatus?.git_is_hash) return systemStatus.git_hash;
 
-    const isLatest = compare(systemStatus.git_hash, latestVersion, '>=');
+    const corrected = correctTag(systemStatus.git_hash);
+
+    const isLatest = compare(corrected, latestVersion, '>=');
 
     return isLatest
       ? `${systemStatus.git_hash} (latest)`
@@ -218,6 +225,7 @@ const SystemInformationScreen: FC<PropsWithNavigation> = ({ navigation }) => {
                   description={versionString}
                   right={props => <List.Icon {...props} icon="git" />}
                   onPress={openGitHub}
+                  disabled={!openGitHub}
                 />
                 <List.Item
                   title={t('opendtu.systemInformationScreen.pioEnvironment')}