chore: release version v1.17.0

fixes #60

.github/workflows/release_actions.yml

@@ -18,4 +18,4 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           port: ${{ secrets.PORT }}
           script: |
-            /app/release/linux/deploy.sh ${{ github.event.release.tag_name }}
+            /home/wanderer/app/deploy.sh ${{ github.event.release.tag_name }}

.tool-versions

@@ -1,3 +1,3 @@
-erlang 25.3
-elixir 1.16-otp-25
+erlang 26.2.5.5
+elixir 1.17.3-otp-26
 nodejs 18.0.0

CHANGELOG.md

@@ -2,6 +2,57 @@
 
 <!-- changelog -->
 
+## [v1.17.0](https://github.com/wanderer-industries/wanderer/compare/v1.16.1...v1.17.0) (2024-11-15)
+
+
+
+
+### Features:
+
+* Signatures: Add user setting to show Description in a separate column
+
+## [v1.16.1](https://github.com/wanderer-industries/wanderer/compare/v1.16.0...v1.16.1) (2024-11-15)
+
+
+
+
+### Bug Fixes:
+
+* Signatures: Fix signature stored filters
+
+## [v1.16.0](https://github.com/wanderer-industries/wanderer/compare/v1.15.5...v1.16.0) (2024-11-15)
+
+
+
+
+### Features:
+
+* Signatures: Add additional filters support to signature list, show description icon
+
+## [v1.15.5](https://github.com/wanderer-industries/wanderer/compare/v1.15.4...v1.15.5) (2024-11-14)
+
+
+
+
+## [v1.15.4](https://github.com/wanderer-industries/wanderer/compare/v1.15.3...v1.15.4) (2024-11-14)
+
+
+
+
+### Bug Fixes:
+
+* Core: Untracked characters still tracked on map (#63)
+
+## [v1.15.3](https://github.com/wanderer-industries/wanderer/compare/v1.15.2...v1.15.3) (2024-11-13)
+
+
+
+
+## [v1.15.2](https://github.com/wanderer-industries/wanderer/compare/v1.15.1...v1.15.2) (2024-11-07)
+
+
+
+
 ## [v1.15.1](https://github.com/wanderer-industries/wanderer/compare/v1.15.0...v1.15.1) (2024-11-07)
 
 

README.md

@@ -20,11 +20,11 @@ Interested to learn more? [Check more on our website](https://wanderer.ltd/news)
 
 Wanderer is open source project and we have a free as in beer and self-hosted solution called [Wanderer Community Edition (CE)](https://wanderer.ltd/news/community-edition). Here are the differences between Wanderer and Wanderer CE:
 
-|  | Wanderer Cloud  | Wanderer Community Edition |
-| ------------- | ------------- | ------------- |
-| **Infrastructure management** | Easy and convenient. It takes 2 minutes to register your character and create a map. We manage everything so you don’t have to worry about anything and can focus on gameplay. | You do it all yourself. You need to get a server and you need to manage your infrastructure. You are responsible for installation, maintenance, upgrades, server capacity, uptime, backup, security, stability, consistency, loading time and so on.|
-| **Release schedule** | Continuously developed and improved with new features and updates multiple times per week. | Latest features and improvements won't be immediately available.|
-| **Server location** | All visitor data is exclusively processed on EU-owned cloud infrastructure. We keep your site data on a secure, encrypted and green energy powered server in Germany. This ensures that your site data is protected by the strict European Union data privacy laws and ensures compliance with GDPR. Your website data never leaves the EU. | You have full control and can host your instance on any server in any country that you wish. Host it on a server in your basement or host it with any cloud provider wherever you want, even those that are not GDPR compliant.|
+|                               | Wanderer Cloud                                                                                                                                                                                                                                                                                                                              | Wanderer Community Edition                                                                                                                                                                                                                           |
+| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Infrastructure management** | Easy and convenient. It takes 2 minutes to register your character and create a map. We manage everything so you don’t have to worry about anything and can focus on gameplay.                                                                                                                                                              | You do it all yourself. You need to get a server and you need to manage your infrastructure. You are responsible for installation, maintenance, upgrades, server capacity, uptime, backup, security, stability, consistency, loading time and so on. |
+| **Release schedule**          | Continuously developed and improved with new features and updates multiple times per week.                                                                                                                                                                                                                                                  | Latest features and improvements won't be immediately available.                                                                                                                                                                                     |
+| **Server location**           | All visitor data is exclusively processed on EU-owned cloud infrastructure. We keep your site data on a secure, encrypted and green energy powered server in Germany. This ensures that your site data is protected by the strict European Union data privacy laws and ensures compliance with GDPR. Your website data never leaves the EU. | You have full control and can host your instance on any server in any country that you wish. Host it on a server in your basement or host it with any cloud provider wherever you want, even those that are not GDPR compliant.                      |
 
 Interested in self-hosting Wanderer CE on your server? Take a look at our [Wanderer CE installation instructions](https://github.com/wanderer-industries/community-edition/).
 
@@ -55,11 +55,10 @@ Now you can visit [`localhost:8000`](http://localhost:8000) from your browser.
 
 - Run devcontainer
 - Install additional dependencies inside Dev container
-
-`root@0d0a785313b6:/app# apt update`
-`root@0d0a785313b6:/app# curl -sL https://deb.nodesource.com/setup_18.x  | bash -`
-`root@0d0a785313b6:/app# apt-get install nodejs inotify-tools -y`
-`root@0d0a785313b6:/app# mix setup`
+- `root@0d0a785313b6:/app# apt update`
+- `root@0d0a785313b6:/app# curl -sL https://deb.nodesource.com/setup_18.x  | bash -`
+- `root@0d0a785313b6:/app# apt-get install nodejs inotify-tools -y`
+- `root@0d0a785313b6:/app# mix setup`
 
 - See how to run server in #Run section
 

assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx

@@ -10,13 +10,17 @@ import {
   Setting,
   COSMIC_SIGNATURE,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
+import { SignatureGroup } from '@/hooks/Mapper/types';
 
 interface SystemLinkSignatureDialogProps {
   data: CommandLinkSignatureToSystem;
   setVisible: (visible: boolean) => void;
 }
 
-const signatureSettings: Setting[] = [{ key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true }];
+const signatureSettings: Setting[] = [
+  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true },
+  { key: SignatureGroup.Wormhole, name: 'Wormhole', value: true },
+];
 
 export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignatureDialogProps) => {
   const { outCommand } = useMapRootState();
@@ -59,6 +63,7 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
     >
       <SystemSignaturesContent
         systemId={`${data.solar_system_source}`}
+        hideLinkedSignatures
         settings={signatureSettings}
         onSelect={handleSelect}
         selectable={true}

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.module.scss

@@ -0,0 +1,79 @@
+.verticalTabsContainer {
+  display: flex;
+  width: 100%;
+  min-height: 300px;
+
+  :global {
+    .p-tabview {
+      width: 100%;
+      display: flex;
+      align-items: flex-start;
+    }
+
+    .p-tabview-panels {
+      padding: 6px 1rem !important;
+      flex-grow: 1;
+    }
+
+    .p-tabview-nav-container {
+      border-right: none;
+      height: 100%;
+    }
+
+    .p-tabview-nav {
+      flex-direction: column;
+      width: 150px;
+      min-height: 100%;
+      border: none;
+
+      li {
+        width: 100%;
+        border-right: 4px solid var(--surface-hover);
+        background-color: var(--surface-card);
+
+        transition:
+          background-color 200ms,
+          border-right-color 200ms;
+
+        &:hover {
+          background-color: var(--surface-hover);
+          border-right: 4px solid var(--surface-100);
+        }
+
+        .p-tabview-nav-link {
+          transition: color 200ms;
+
+          justify-content: flex-end;
+          padding: 10px;
+          //background-color: var(--surface-card);
+          background-color: initial;
+          border: none;
+          color: var(--gray-400);
+
+          border-radius: initial;
+          font-weight: 400;
+          margin: 0;
+        }
+
+        &.p-tabview-selected {
+          background-color: var(--surface-50);
+          border-right: 4px solid var(--primary-color);
+
+          .p-tabview-nav-link {
+            font-weight: 600;
+            color: var(--primary-color);
+          }
+
+          &:hover {
+            //background-color: var(--surface-hover);
+            border-right: 4px solid var(--primary-color);
+          }
+        }
+      }
+    }
+
+    .p-tabview-panel {
+      flex-grow: 1;
+    }
+  }
+}

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.tsx

@@ -2,8 +2,10 @@ import { Dialog } from 'primereact/dialog';
 import { useCallback, useState } from 'react';
 import { Button } from 'primereact/button';
 import { Checkbox } from 'primereact/checkbox';
+import { TabPanel, TabView } from 'primereact/tabview';
+import styles from './SystemSignatureSettingsDialog.module.scss';
 
-export type Setting = { key: string; name: string; value: boolean };
+export type Setting = { key: string; name: string; value: boolean; isFilter?: boolean };
 
 export const COSMIC_SIGNATURE = 'Cosmic Signature';
 export const COSMIC_ANOMALY = 'Cosmic Anomaly';
@@ -24,8 +26,12 @@ export const SystemSignatureSettingsDialog = ({
   onSave,
   onCancel,
 }: SystemSignatureSettingsDialogProps) => {
+  const [activeIndex, setActiveIndex] = useState(0);
   const [settings, setSettings] = useState<Setting[]>(defaultSettings);
 
+  const filterSettings = settings.filter(setting => setting.isFilter);
+  const userSettings = settings.filter(setting => !setting.isFilter);
+
   const handleSettingsChange = (key: string) => {
     setSettings(prevState => prevState.map(item => (item.key === key ? { ...item, value: !item.value } : item)));
   };
@@ -35,23 +41,53 @@ export const SystemSignatureSettingsDialog = ({
   }, [onSave, settings]);
 
   return (
-    <Dialog header="Filter signatures" visible draggable={false} style={{ width: '300px' }} onHide={onCancel}>
+    <Dialog header="System Signatures Settings" visible={true} onHide={onCancel} className="w-full max-w-lg">
       <div className="flex flex-col gap-3">
         <div className="flex flex-col gap-2">
-          {settings.map(setting => {
-            return (
-              <div key={setting.key} className="flex items-center">
-                <Checkbox
-                  inputId={setting.key}
-                  checked={setting.value}
-                  onChange={() => handleSettingsChange(setting.key)}
-                />
-                <label htmlFor={setting.key} className="ml-2">
-                  {setting.name}
-                </label>
-              </div>
-            );
-          })}
+          <div className={styles.verticalTabsContainer}>
+            <TabView
+              activeIndex={activeIndex}
+              onTabChange={e => setActiveIndex(e.index)}
+              className={styles.verticalTabView}
+            >
+              <TabPanel header="Filters" headerClassName={styles.verticalTabHeader}>
+                <div className="w-full h-full flex flex-col gap-1">
+                  {filterSettings.map(setting => {
+                    return (
+                      <div key={setting.key} className="flex items-center">
+                        <Checkbox
+                          inputId={setting.key}
+                          checked={setting.value}
+                          onChange={() => handleSettingsChange(setting.key)}
+                        />
+                        <label htmlFor={setting.key} className="ml-2">
+                          {setting.name}
+                        </label>
+                      </div>
+                    );
+                  })}
+                </div>
+              </TabPanel>
+              <TabPanel header="User Interface" headerClassName={styles.verticalTabHeader}>
+                <div className="w-full h-full flex flex-col gap-1">
+                  {userSettings.map(setting => {
+                    return (
+                      <div key={setting.key} className="flex items-center">
+                        <Checkbox
+                          inputId={setting.key}
+                          checked={setting.value}
+                          onChange={() => handleSettingsChange(setting.key)}
+                        />
+                        <label htmlFor={setting.key} className="ml-2">
+                          {setting.name}
+                        </label>
+                      </div>
+                    );
+                  })}
+                </div>
+              </TabPanel>
+            </TabView>
+          </div>
         </div>
 
         <div className="flex gap-2 justify-end">

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx

@@ -12,6 +12,7 @@ import {
   SHIP,
   DRONE,
 } from './SystemSignatureSettingsDialog';
+import { SignatureGroup } from '@/hooks/Mapper/types';
 
 import React, { useCallback, useEffect, useState } from 'react';
 
@@ -19,17 +20,25 @@ import { PrimeIcons } from 'primereact/api';
 
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 
-const settings: Setting[] = [
-  { key: COSMIC_ANOMALY, name: 'Show Anomalies', value: true },
-  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true },
-  { key: DEPLOYABLE, name: 'Show Deployables', value: true },
-  { key: STRUCTURE, name: 'Show Structures', value: true },
-  { key: STARBASE, name: 'Show Starbase', value: true },
-  { key: SHIP, name: 'Show Ships', value: true },
-  { key: DRONE, name: 'Show Drones And Charges', value: true },
-];
+const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings_v3';
+export const SHOW_DESCRIPTION_COLUMN_SETTING = 'show_description_column_setting';
 
-const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings';
+const settings: Setting[] = [
+  { key: SHOW_DESCRIPTION_COLUMN_SETTING, name: 'Show Description Column', value: false, isFilter: false },
+  { key: COSMIC_ANOMALY, name: 'Show Anomalies', value: true, isFilter: true },
+  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true, isFilter: true },
+  { key: DEPLOYABLE, name: 'Show Deployables', value: true, isFilter: true },
+  { key: STRUCTURE, name: 'Show Structures', value: true, isFilter: true },
+  { key: STARBASE, name: 'Show Starbase', value: true, isFilter: true },
+  { key: SHIP, name: 'Show Ships', value: true, isFilter: true },
+  { key: DRONE, name: 'Show Drones And Charges', value: true, isFilter: true },
+  { key: SignatureGroup.Wormhole, name: 'Show Wormholes', value: true, isFilter: true },
+  { key: SignatureGroup.RelicSite, name: 'Show Relic Sites', value: true, isFilter: true },
+  { key: SignatureGroup.DataSite, name: 'Show Data Sites', value: true, isFilter: true },
+  { key: SignatureGroup.OreSite, name: 'Show Ore Sites', value: true, isFilter: true },
+  { key: SignatureGroup.GasSite, name: 'Show Gas Sites', value: true, isFilter: true },
+  { key: SignatureGroup.CombatSite, name: 'Show Combat Sites', value: true, isFilter: true },
+];
 
 const defaultSettings = () => {
   return [...settings];
@@ -91,8 +100,7 @@ export const SystemSignatures = () => {
                     </InfoDrawer>
                     <InfoDrawer title={<b className="text-slate-50">How to delete?</b>}>
                       For delete any signature first of all you need select before
-                      <br /> and then use <b className="text-sky-500">Del</b> or{' '}
-                      <b className="text-sky-500">Backspace</b>
+                      <br /> and then use <b className="text-sky-500">Backspace</b>
                     </InfoDrawer>
                   </div>
                 ) as React.ReactNode,

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx

@@ -3,6 +3,7 @@ import { useClipboard } from '@/hooks/Mapper/hooks/useClipboard';
 import { parseSignatures } from '@/hooks/Mapper/helpers';
 import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WdTooltip, WdTooltipHandlers } from '@/hooks/Mapper/components/ui-kit';
+import { GROUPS_LIST } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
 
 import { DataTable, DataTableRowClickEvent, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
 import { Column } from 'primereact/column';
@@ -21,6 +22,7 @@ import {
   getRowColorByTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers';
 import {
+  renderDescription,
   renderIcon,
   renderInfoColumn,
   renderTimeLeft,
@@ -30,7 +32,8 @@ import { PrimeIcons } from 'primereact/api';
 import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
 import { useMapEventListener } from '@/hooks/Mapper/events';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
-
+import { COSMIC_SIGNATURE } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
+import { SHOW_DESCRIPTION_COLUMN_SETTING } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures';
 type SystemSignaturesSortSettings = {
   sortField: string;
   sortOrder: SortOrder;
@@ -44,10 +47,17 @@ const SORT_DEFAULT_VALUES: SystemSignaturesSortSettings = {
 interface SystemSignaturesContentProps {
   systemId: string;
   settings: Setting[];
+  hideLinkedSignatures?: boolean;
   selectable?: boolean;
   onSelect?: (signature: SystemSignature) => void;
 }
-export const SystemSignaturesContent = ({ systemId, settings, selectable, onSelect }: SystemSignaturesContentProps) => {
+export const SystemSignaturesContent = ({
+  systemId,
+  settings,
+  hideLinkedSignatures,
+  selectable,
+  onSelect,
+}: SystemSignaturesContentProps) => {
   const { outCommand } = useMapRootState();
 
   const [signatures, setSignatures, signaturesRef] = useRefState<SystemSignature[]>([]);
@@ -80,13 +90,36 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
     }
   }, []);
 
+  const groupSettings = useMemo(() => settings.filter(s => (GROUPS_LIST as string[]).includes(s.key)), [settings]);
+  const showDescriptionColumn = useMemo(
+    () => settings.find(s => s.key === SHOW_DESCRIPTION_COLUMN_SETTING)?.value,
+    [settings],
+  );
+
   const filteredSignatures = useMemo(() => {
     return signatures
-      .filter(x => settings.find(y => y.key === x.kind)?.value)
+      .filter(x => {
+        if (hideLinkedSignatures && !!x.linked_system) {
+          return false;
+        }
+
+        const isCosmicSignature = x.kind === COSMIC_SIGNATURE;
+
+        if (isCosmicSignature) {
+          const showCosmicSignatures = settings.find(y => y.key === COSMIC_SIGNATURE)?.value;
+          if (showCosmicSignatures) {
+            return !x.group || groupSettings.find(y => y.key === x.group)?.value;
+          } else {
+            return !!x.group && groupSettings.find(y => y.key === x.group)?.value;
+          }
+        }
+
+        return settings.find(y => y.key === x.kind)?.value;
+      })
       .sort((a, b) => {
         return new Date(b.updated_at || 0).getTime() - new Date(a.updated_at || 0).getTime();
       });
-  }, [signatures, settings]);
+  }, [signatures, settings, groupSettings, hideLinkedSignatures]);
 
   const handleGetSignatures = useCallback(async () => {
     const { signatures } = await outCommand({
@@ -98,26 +131,6 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
     setSignatures(signatures);
   }, [outCommand, systemId]);
 
-  // const updateSignatures = useCallback(
-  //   async (newSignatures: SystemSignature[], updateOnly: boolean) => {
-  //     const { added, updated, removed } = getActualSigs(signaturesRef.current, newSignatures, updateOnly);
-
-  //     const { signatures: updatedSignatures } = await outCommand({
-  //       type: OutCommand.updateSignatures,
-  //       data: {
-  //         system_id: systemId,
-  //         added,
-  //         updated,
-  //         removed,
-  //       },
-  //     });
-
-  //     setSignatures(() => updatedSignatures);
-  //     setSelectedSignatures([]);
-  //   },
-  //   [outCommand, systemId],
-  // );
-
   const handleUpdateSignatures = useCallback(
     async (newSignatures: SystemSignature[], updateOnly: boolean) => {
       const { added, updated, removed } = getActualSigs(signaturesRef.current, newSignatures, updateOnly);
@@ -181,7 +194,7 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
 
   useHotkey(true, ['a'], handleSelectAll);
 
-  useHotkey(false, ['Backspace', 'Delete'], handleDeleteSelected);
+  useHotkey(false, ['Backspace'], handleDeleteSelected);
 
   useEffect(() => {
     if (selectable) {
@@ -345,6 +358,16 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
                 style={{ maxWidth: nameColumnWidth }}
                 hidden={compact || medium}
               ></Column>
+              {showDescriptionColumn && (
+                <Column
+                  field="description"
+                  header="Description"
+                  bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
+                  body={renderDescription}
+                  hidden={compact}
+                  sortable
+                ></Column>
+              )}
               <Column
                 field="updated_at"
                 header="Updated"
@@ -354,13 +377,15 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
                 sortable
               ></Column>
 
-              <Column
-                bodyClassName="p-0 pl-1 pr-2"
-                field="group"
-                body={renderToolbar}
-                // headerClassName={headerClasses}
-                style={{ maxWidth: 26, minWidth: 26, width: 26 }}
-              ></Column>
+              {!selectable && (
+                <Column
+                  bodyClassName="p-0 pl-1 pr-2"
+                  field="group"
+                  body={renderToolbar}
+                  // headerClassName={headerClasses}
+                  style={{ maxWidth: 26, minWidth: 26, width: 26 }}
+                ></Column>
+              )}
             </DataTable>
           </>
         )}
@@ -370,12 +395,14 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
           content={hoveredSig ? <SignatureView {...hoveredSig} /> : null}
         />
 
-        <SignatureSettings
-          systemId={systemId}
-          show={showSignatureSettings}
-          onHide={() => setShowSignatureSettings(false)}
-          signatureData={selectedSignature}
-        />
+        {showSignatureSettings && (
+          <SignatureSettings
+            systemId={systemId}
+            show
+            onHide={() => setShowSignatureSettings(false)}
+            signatureData={selectedSignature}
+          />
+        )}
 
         {askUser && (
           <div className="absolute left-[1px] top-[29px] h-[calc(100%-30px)] w-[calc(100%-3px)] bg-stone-900/10 backdrop-blur-sm">

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/index.ts

@@ -1,4 +1,5 @@
 export * from './renderIcon';
+export * from './renderDescription';
 export * from './renderName';
 export * from './renderTimeLeft';
 export * from './renderLinkedSystem';

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderDescription.tsx

@@ -0,0 +1,5 @@
+import { SystemSignature } from '@/hooks/Mapper/types';
+
+export const renderDescription = (row: SystemSignature) => {
+  return <span title={row?.description}>{row?.description}</span>;
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInfoColumn.tsx

@@ -1,5 +1,9 @@
+import { PrimeIcons } from 'primereact/api';
 import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
 import { SystemViewStandalone, WHClassView } from '@/hooks/Mapper/components/ui-kit';
+
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
+
 import clsx from 'clsx';
 import { renderName } from './renderName.tsx';
 import classes from './renderInfoColumn.module.scss';
@@ -32,13 +36,23 @@ export const renderInfoColumn = (row: SystemSignature) => {
             </span>
           </>
         )}
+        {row.description && (
+          <WdTooltipWrapper content={row.description}>
+            <span className={clsx(PrimeIcons.EXCLAMATION_CIRCLE, 'text-[12px]')}></span>
+          </WdTooltipWrapper>
+        )}
       </div>
     );
   }
 
-  if (row.description != null && row.description.length > 0) {
-    return <span title={row.description}>{row.description}</span>;
-  }
-
-  return renderName(row);
+  return (
+    <div className="flex gap-1 items-center">
+      {renderName(row)}{' '}
+      {row.description && (
+        <WdTooltipWrapper content={row.description}>
+          <span className={clsx(PrimeIcons.EXCLAMATION_CIRCLE, 'text-[12px]')}></span>
+        </WdTooltipWrapper>
+      )}
+    </div>
+  );
 };

config/runtime.exs

@@ -172,43 +172,65 @@ config :wanderer_app, WandererApp.Scheduler,
   timeout: :infinity
 
 if config_env() == :prod do
-  database_url =
-    System.get_env("DATABASE_URL") ||
-      raise """
-      environment variable DATABASE_URL is missing.
-      For example: ecto://USER:PASS@HOST/DATABASE
-      """
+  database_unix_socket =
+    System.get_env("DATABASE_UNIX_SOCKET")
 
-  maybe_ipv6 =
-    config_dir
-    |> get_var_from_path_or_env("ECTO_IPV6", "false")
-    |> String.to_existing_atom()
+  database =
+    database_unix_socket
     |> case do
-      true -> [:inet6]
-      _ -> []
-    end
+      nil ->
+        System.get_env("DATABASE_URL") ||
+          raise """
+          environment variable DATABASE_URL is missing.
+          For example: ecto://USER:PASS@HOST/DATABASE
+          """
 
-  db_ssl_enabled =
-    config_dir
-    |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
-    |> String.to_existing_atom()
-
-  db_ssl_verify_none =
-    config_dir
-    |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
-    |> String.to_existing_atom()
-
-  client_opts =
-    if db_ssl_verify_none do
-      [verify: :verify_none]
+      _ ->
+        System.get_env("DATABASE_NAME") ||
+          raise """
+          environment variable DATABASE_NAME is missing.
+          For example: "wanderer"
+          """
     end
 
   config :wanderer_app, WandererApp.Repo,
-    url: database_url,
-    ssl: db_ssl_enabled,
-    ssl_opts: client_opts,
-    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
-    socket_options: maybe_ipv6
+    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")
+
+  if not is_nil(database_unix_socket) do
+    config :wanderer_app, WandererApp.Repo,
+      socket_dir: database_unix_socket,
+      database: database
+  else
+    db_ssl_enabled =
+      config_dir
+      |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
+      |> String.to_existing_atom()
+
+    db_ssl_verify_none =
+      config_dir
+      |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
+      |> String.to_existing_atom()
+
+    client_opts =
+      if db_ssl_verify_none do
+        [verify: :verify_none]
+      end
+
+    maybe_ipv6 =
+      config_dir
+      |> get_var_from_path_or_env("ECTO_IPV6", "false")
+      |> String.to_existing_atom()
+      |> case do
+        true -> [:inet6]
+        _ -> []
+      end
+
+    config :wanderer_app, WandererApp.Repo,
+      url: database,
+      ssl: db_ssl_enabled,
+      ssl_opts: client_opts,
+      socket_options: maybe_ipv6
+  end
 
   # The secret key base is used to sign/encrypt cookies and other secrets.
   # A default value is used in config/dev.exs and config/test.exs but you

fly.toml

@@ -3,7 +3,7 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = 'wanderer'
+app = 'wanderer-test'
 primary_region = 'ams'
 kill_signal = 'SIGTERM'
 swap_size_mb = 512
@@ -14,18 +14,14 @@ swap_size_mb = 512
   release_command = '/app/bin/migrate.sh'
 
 [env]
-  PHX_HOST = 'wanderer.fly.dev'
+  PHX_HOST = 'wanderer-test.fly.dev'
   PHX_SERVER = 'true'
   PORT = '8080'
 
-[metrics]
-port = 4021
-path = "/metrics"
-
 [http_service]
   internal_port = 8080
   force_https = true
-  auto_stop_machines = false
+  auto_stop_machines = 'off'
   auto_start_machines = false
   min_machines_running = 0
   processes = ['app']
@@ -36,6 +32,9 @@ path = "/metrics"
     soft_limit = 1000
 
 [[vm]]
-  memory = '256mb'
-  cpu_kind = 'shared'
-  cpus = 1
+  size = 'shared-cpu-1x'
+
+[[metrics]]
+  port = 4021
+  path = '/metrics'
+  https = false

lib/wanderer_app/api/map_character_settings.ex

@@ -17,12 +17,12 @@ defmodule WandererApp.Api.MapCharacterSettings do
       action: :read_by_map
     )
 
-    define(:tracked_by_map,
-      action: :tracked_by_map
+    define(:tracked_by_map_filtered,
+      action: :tracked_by_map_filtered
     )
 
     define(:tracked_by_map_all,
-      action: :read_tracked_by_map
+      action: :tracked_by_map_all
     )
 
     define(:track, action: :track)
@@ -38,7 +38,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
 
     defaults [:create, :read, :update, :destroy]
 
-    read :tracked_by_map do
+    read :tracked_by_map_filtered do
       argument(:map_id, :string, allow_nil?: false)
       argument(:character_ids, {:array, :uuid}, allow_nil?: false)
 
@@ -52,7 +52,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
       filter(expr(map_id == ^arg(:map_id)))
     end
 
-    read :read_tracked_by_map do
+    read :tracked_by_map_all do
       argument(:map_id, :string, allow_nil?: false)
       filter(expr(map_id == ^arg(:map_id) and tracked == true))
     end

lib/wanderer_app/api/map_system_signature.ex

@@ -16,6 +16,7 @@ defmodule WandererApp.Api.MapSystemSignature do
     define(:update, action: :update)
     define(:update_linked_system, action: :update_linked_system)
     define(:update_type, action: :update_type)
+    define(:update_group, action: :update_group)
 
     define(:by_id,
       get_by: [:id],
@@ -86,6 +87,10 @@ defmodule WandererApp.Api.MapSystemSignature do
       accept [:type]
     end
 
+    update :update_group do
+      accept [:group]
+    end
+
     read :by_system_id do
       argument(:system_id, :string, allow_nil?: false)
 

lib/wanderer_app/map/map_server_impl.ex

@@ -617,17 +617,21 @@ defmodule WandererApp.Map.Server.Impl do
     Process.send_after(self(), :update_tracked_characters, @update_tracked_characters_timeout)
 
     Task.start_link(fn ->
-      map_characters =
+      {:ok, map_tracked_character_ids} =
         map_id
-        |> WandererApp.Map.get_map!()
-        |> Map.get(:characters, [])
+        |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_all()
+        |> case do
+          {:ok, settings} -> {:ok, settings |> Enum.map(&Map.get(&1, :character_id))}
+          _ -> {:ok, []}
+        end
 
       {:ok, tracked_characters} = WandererApp.Cache.lookup("tracked_characters", [])
 
-      map_tracked_characters =
-        map_characters |> Enum.filter(fn character -> character in tracked_characters end)
+      map_active_tracked_characters =
+        map_tracked_character_ids
+        |> Enum.filter(fn character -> character in tracked_characters end)
 
-      WandererApp.Cache.insert("maps:#{map_id}:tracked_characters", map_tracked_characters)
+      WandererApp.Cache.insert("maps:#{map_id}:tracked_characters", map_active_tracked_characters)
 
       :ok
     end)
@@ -827,13 +831,13 @@ defmodule WandererApp.Map.Server.Impl do
   def handle_event(:cleanup_characters, %{map_id: map_id, map: %{owner_id: owner_id}} = state) do
     Process.send_after(self(), :cleanup_characters, @characters_cleanup_timeout)
 
-    {:ok, character_ids} =
+    {:ok, invalidate_character_ids} =
       WandererApp.Cache.lookup(
         "map_#{map_id}:invalidate_character_ids",
         []
       )
 
-    character_ids
+    invalidate_character_ids
     |> Task.async_stream(
       fn character_id ->
         character_id
@@ -966,7 +970,7 @@ defmodule WandererApp.Map.Server.Impl do
   end
 
   def handle_event(msg, state) do
-    @logger.warning("Unhandled event: #{inspect(msg)}")
+    Logger.warning("Unhandled event: #{inspect(msg)}")
 
     state
   end
@@ -980,17 +984,20 @@ defmodule WandererApp.Map.Server.Impl do
   end
 
   defp remove_and_untrack_characters(%{map_id: map_id} = state, character_ids) do
+    Logger.warning(fn ->
+      "Map #{map_id} - remove and untrack characters #{inspect(character_ids)}"
+    end)
+
     map_id
     |> _untrack_characters(character_ids)
 
-    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-           map_id: map_id,
-           character_ids: character_ids
-         }) do
+    map_id
+    |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(character_ids)
+    |> case do
       {:ok, settings} ->
         settings
-        |> Enum.map(fn s ->
-          s |> WandererApp.Api.MapCharacterSettings.untrack()
+        |> Enum.each(fn s ->
+          s |> WandererApp.MapCharacterSettingsRepo.untrack()
           state |> remove_character(s.character_id)
         end)
 

lib/wanderer_app/repositories/map_character_settings_repo.ex

@@ -3,4 +3,23 @@ defmodule WandererApp.MapCharacterSettingsRepo do
 
   def create(settings),
     do: WandererApp.Api.MapCharacterSettings.create(settings)
+
+  def get_tracked_by_map_filtered(map_id, character_ids),
+    do:
+      WandererApp.Api.MapCharacterSettings.tracked_by_map_filtered(%{
+        map_id: map_id,
+        character_ids: character_ids
+      })
+
+  def get_all_by_map(map_id),
+    do: WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id})
+
+  def get_tracked_by_map_all(map_id),
+    do: WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{map_id: map_id})
+
+  def track(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track()
+  def untrack(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack()
+
+  def track!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track!()
+  def untrack!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack!()
 end

lib/wanderer_app_web/live/characters/characters_tracking_live.ex

@@ -41,7 +41,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do
     selected_map = socket.assigns.maps |> Enum.find(&(&1.slug == map_slug))
 
     {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: selected_map.id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(selected_map.id) do
         {:ok, settings} ->
           {:ok, settings}
 
@@ -83,7 +83,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do
 
     case character_settings |> Enum.find(&(&1.character_id == character_id)) do
       nil ->
-        WandererApp.Api.MapCharacterSettings.create(%{
+        WandererApp.MapCharacterSettingsRepo.create(%{
           character_id: character_id,
           map_id: selected_map.id,
           tracked: true
@@ -95,18 +95,18 @@ defmodule WandererAppWeb.CharactersTrackingLive do
         case character_setting.tracked do
           true ->
             character_setting
-            |> WandererApp.Api.MapCharacterSettings.untrack!()
+            |> WandererApp.MapCharacterSettingsRepo.untrack!()
 
           _ ->
             character_setting
-            |> WandererApp.Api.MapCharacterSettings.track!()
+            |> WandererApp.MapCharacterSettingsRepo.track!()
         end
     end
 
     %{result: characters} = socket.assigns.characters
 
     {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: selected_map.id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(selected_map.id) do
         {:ok, settings} -> {:ok, settings}
         _ -> {:ok, []}
       end

lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex

@@ -75,7 +75,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
         } = socket
       ) do
     {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
         {:ok, settings} -> {:ok, settings}
         _ -> {:ok, []}
       end
@@ -132,7 +132,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
       case character_settings |> Enum.find(&(&1.character_id == character_id)) do
         nil ->
           {:ok, map_character_settings} =
-            WandererApp.Api.MapCharacterSettings.create(%{
+            WandererApp.MapCharacterSettingsRepo.create(%{
               character_id: character_id,
               map_id: map_id,
               tracked: true
@@ -150,7 +150,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
             true ->
               {:ok, map_character_settings} =
                 character_setting
-                |> WandererApp.Api.MapCharacterSettings.untrack()
+                |> WandererApp.MapCharacterSettingsRepo.untrack()
 
               character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)
 
@@ -166,7 +166,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
             _ ->
               {:ok, map_character_settings} =
                 character_setting
-                |> WandererApp.Api.MapCharacterSettings.track()
+                |> WandererApp.MapCharacterSettingsRepo.track()
 
               character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)
 
@@ -184,7 +184,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
     user_character_eve_ids = map_characters |> Enum.map(& &1.eve_id)
 
     {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
         {:ok, settings} -> {:ok, settings}
         _ -> {:ok, []}
       end
@@ -225,10 +225,10 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
   def has_tracked_characters?(_user_characters), do: true
 
   def get_tracked_map_characters(map_id, current_user) do
-    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-           map_id: map_id,
-           character_ids: current_user.characters |> Enum.map(& &1.id)
-         }) do
+    case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
+           map_id,
+           current_user.characters |> Enum.map(& &1.id)
+         ) do
       {:ok, settings} ->
         {:ok,
          settings

lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex

@@ -41,10 +41,10 @@ defmodule WandererAppWeb.MapCoreEventHandler do
 
       %{track_character: track_character} ->
         {:ok, map_characters} =
-          case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-                 map_id: map_id,
-                 character_ids: current_user.characters |> Enum.map(& &1.id)
-               }) do
+          case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
+                 map_id,
+                 current_user.characters |> Enum.map(& &1.id)
+               ) do
             {:ok, settings} ->
               {:ok,
                settings
@@ -258,7 +258,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
       )
 
     {:ok, character_settings} =
-      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
         {:ok, settings} -> {:ok, settings}
         _ -> {:ok, []}
       end
@@ -511,10 +511,10 @@ defmodule WandererAppWeb.MapCoreEventHandler do
   end
 
   defp get_tracked_map_characters(map_id, current_user) do
-    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
-           map_id: map_id,
-           character_ids: current_user.characters |> Enum.map(& &1.id)
-         }) do
+    case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
+           map_id,
+           current_user.characters |> Enum.map(& &1.id)
+         ) do
       {:ok, settings} ->
         {:ok,
          settings

lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex

@@ -225,6 +225,7 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
             |> Enum.filter(fn s -> s.eve_id == signature_eve_id end)
             |> Enum.each(fn s ->
               s
+              |> WandererApp.Api.MapSystemSignature.update_group!(%{group: "Wormhole"})
               |> WandererApp.Api.MapSystemSignature.update_linked_system(%{
                 linked_system_id: solar_system_target
               })

lib/wanderer_app_web/live/maps/maps_live.ex

@@ -848,9 +848,9 @@ defmodule WandererAppWeb.MapsLive do
           |> Enum.map(fn acl -> acl |> Ash.load!(:members) end)
 
         {:ok, characters_count} =
-          case WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{
-                 map_id: map.id
-               }) do
+          map.id
+          |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_all()
+          |> case do
             {:ok, settings} ->
               {:ok,
                settings

mix.exs

@@ -2,7 +2,7 @@ defmodule WandererApp.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/wanderer-industries/wanderer"
-  @version "1.15.1"
+  @version "1.17.0"
 
   def project do
     [