fix: merge conflict

elibosley · elibosley · commit ee4ad64fd18c · 2025-03-17T11:43:42.000-04:00
diff --git a/api/src/graphql/generated/api/types.ts b/api/src/graphql/generated/api/types.ts
@@ -97,7 +97,10 @@ export type ApiSettingsInput = {
   extraOrigins?: InputMaybe<Array<Scalars['String']['input']>>;
   /** The type of port forwarding to use for Remote Access. */
   forwardType?: InputMaybe<WAN_FORWARD_TYPE>;
-  /** The port to use for Remote Access. */
+  /**
+   * The port to use for Remote Access. Not required for UPNP forwardType. Required for STATIC forwardType.
+   * Ignored if accessType is DISABLED or forwardType is UPNP.
+   */
   port?: InputMaybe<Scalars['Port']['input']>;
   /**
    * If true, the GraphQL sandbox will be enabled and available at /graphql.
@@ -330,10 +333,18 @@ export type ConnectSettings = Node & {
 /** Intersection type of ApiSettings and RemoteAccess */
 export type ConnectSettingsValues = {
   __typename?: 'ConnectSettingsValues';
+  /** The type of WAN access used for Remote Access. */
   accessType: WAN_ACCESS_TYPE;
+  /** A list of origins allowed to interact with the API. */
   extraOrigins: Array<Scalars['String']['output']>;
+  /** The type of port forwarding used for Remote Access. */
   forwardType?: Maybe<WAN_FORWARD_TYPE>;
+  /** The port used for Remote Access. */
   port?: Maybe<Scalars['Port']['output']>;
+  /**
+   * If true, the GraphQL sandbox is enabled and available at /graphql.
+   * If false, the GraphQL sandbox is disabled and only the production API will be available.
+   */
   sandbox: Scalars['Boolean']['output'];
 };
 
@@ -654,6 +665,8 @@ export type LogFileContent = {
   content: Scalars['String']['output'];
   /** Path to the log file */
   path: Scalars['String']['output'];
+  /** Starting line number of the content (1-indexed) */
+  startLine?: Maybe<Scalars['Int']['output']>;
   /** Total number of lines in the file */
   totalLines: Scalars['Int']['output'];
 };
@@ -768,6 +781,10 @@ export type Mutation = {
   unmountArrayDisk?: Maybe<Disk>;
   /** Marks a notification as unread. */
   unreadNotification: Notification;
+  /**
+   * Update the API settings.
+   * Some setting combinations may be required or disallowed. Please refer to each setting for more information.
+   */
   updateApiSettings: ConnectSettingsValues;
 };
 
@@ -1141,6 +1158,7 @@ export type Query = {
    * Get the content of a specific log file
    * @param path Path to the log file
    * @param lines Number of lines to read from the end of the file (default: 100)
+   * @param startLine Optional starting line number (1-indexed)
    */
   logFile: LogFileContent;
   /** List all available log files */
@@ -1198,6 +1216,7 @@ export type QuerydockerNetworksArgs = {
 export type QuerylogFileArgs = {
   lines?: InputMaybe<Scalars['Int']['input']>;
   path: Scalars['String']['input'];
+  startLine?: InputMaybe<Scalars['Int']['input']>;
 };
 
 
@@ -2544,6 +2563,7 @@ export type LogFileResolvers<ContextType = Context, ParentType extends Resolvers
 export type LogFileContentResolvers<ContextType = Context, ParentType extends ResolversParentTypes['LogFileContent'] = ResolversParentTypes['LogFileContent']> = ResolversObject<{
   content?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   path?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  startLine?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
   totalLines?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
diff --git a/api/src/unraid-api/graph/resolvers/resolvers.module.ts b/api/src/unraid-api/graph/resolvers/resolvers.module.ts
@@ -44,12 +44,9 @@ import { VmsResolver } from '@app/unraid-api/graph/resolvers/vms/vms.resolver.js
         VmsResolver,
         NotificationsService,
         MeResolver,
-<<<<<<< HEAD
         LogsResolver,
         LogsService,
-=======
         ConnectSettingsService,
->>>>>>> main
     ],
     exports: [AuthModule, ApiKeyResolver],
 })
