Pull request update/250604

bf24a4a OSN-867. Clean up login page and common texts from MLOps-related points
bb25dbd OSN-841. Force FinOps-only mode
2f3a017 OSN-839. Remove MLOps removal announcement to UI

Author: stanfra

ngui/server/api/restapi/client.ts

@@ -11,7 +11,6 @@ import {
   MutationUpdateOrganizationPerspectivesArgs,
   QueryOrganizationPerspectivesArgs,
   QueryOrganizationFeaturesArgs,
-  MutationUpdateOptscaleCapabilityArgs,
   QueryOrganizationConstraintArgs,
   QueryResourceCountBreakdownArgs,
   QueryExpensesDailyBreakdownArgs,
@@ -202,33 +201,6 @@ class RestApiClient extends BaseClient {
     return parsedFeatures;
   }
 
-  async getOptscaleCapability(organizationId: string) {
-    const path = `organizations/${organizationId}/options/optscale_mode`;
-    const capability = await this.get(path);
-
-    const parsedCapability = JSON.parse(capability.value);
-
-    return parsedCapability.value;
-  }
-
-  async updateOptscaleCapability(
-    organizationId: MutationUpdateOptscaleCapabilityArgs["organizationId"],
-    value: MutationUpdateOptscaleCapabilityArgs["value"]
-  ) {
-    const path = `organizations/${organizationId}/options/optscale_mode`;
-    const capability = await this.patch(path, {
-      body: {
-        value: JSON.stringify({
-          value,
-        }),
-      },
-    });
-
-    const parsedCapability = JSON.parse(capability.value);
-
-    return parsedCapability.value;
-  }
-
   async getOrganizationThemeSettings(organizationId: string) {
     const path = `organizations/${organizationId}/options/theme_settings`;
     const settings = await this.get(path);

ngui/server/graphql/resolvers/restapi.generated.ts

@@ -499,7 +499,6 @@ export type Mutation = {
   updateEmployeeEmail?: Maybe<EmployeeEmail>;
   updateEmployeeEmails?: Maybe<Array<Maybe<EmployeeEmail>>>;
   updateInvitation?: Maybe<Scalars['String']['output']>;
-  updateOptscaleCapability?: Maybe<OptscaleCapability>;
   updateOrganization?: Maybe<Organization>;
   updateOrganizationPerspectives?: Maybe<Scalars['JSONObject']['output']>;
   updateOrganizationThemeSettings?: Maybe<Scalars['JSONObject']['output']>;
@@ -551,12 +550,6 @@ export type MutationUpdateInvitationArgs = {
 };
 
 
-export type MutationUpdateOptscaleCapabilityArgs = {
-  organizationId: Scalars['ID']['input'];
-  value?: InputMaybe<OptscaleCapabilityParams>;
-};
-
-
 export type MutationUpdateOrganizationArgs = {
   organizationId: Scalars['ID']['input'];
   params: UpdateOrganizationInput;
@@ -612,17 +605,6 @@ export type NebiusDataSource = DataSourceInterface & {
   type: DataSourceType;
 };
 
-export type OptscaleCapability = {
-  __typename?: 'OptscaleCapability';
-  finops?: Maybe<Scalars['Boolean']['output']>;
-  mlops?: Maybe<Scalars['Boolean']['output']>;
-};
-
-export type OptscaleCapabilityParams = {
-  finops?: InputMaybe<Scalars['Boolean']['input']>;
-  mlops?: InputMaybe<Scalars['Boolean']['input']>;
-};
-
 export type Organization = {
   __typename?: 'Organization';
   currency: Scalars['String']['output'];
@@ -677,7 +659,6 @@ export type Query = {
   employeeEmails?: Maybe<Array<Maybe<EmployeeEmail>>>;
   expensesDailyBreakdown?: Maybe<ExpensesDailyBreakdown>;
   invitations?: Maybe<Array<Maybe<Invitation>>>;
-  optscaleCapability?: Maybe<OptscaleCapability>;
   organizationConstraint?: Maybe<OrganizationConstraint>;
   organizationFeatures?: Maybe<Scalars['JSONObject']['output']>;
   organizationLimitHits?: Maybe<Array<OrganizationLimitHit>>;
@@ -722,11 +703,6 @@ export type QueryExpensesDailyBreakdownArgs = {
 };
 
 
-export type QueryOptscaleCapabilityArgs = {
-  organizationId: Scalars['ID']['input'];
-};
-
-
 export type QueryOrganizationConstraintArgs = {
   constraintId: Scalars['ID']['input'];
 };
@@ -940,8 +916,6 @@ export type ResolversTypes = {
   NebiusConfig: ResolverTypeWrapper<NebiusConfig>;
   NebiusConfigInput: NebiusConfigInput;
   NebiusDataSource: ResolverTypeWrapper<NebiusDataSource>;
-  OptscaleCapability: ResolverTypeWrapper<OptscaleCapability>;
-  OptscaleCapabilityParams: OptscaleCapabilityParams;
   Organization: ResolverTypeWrapper<Organization>;
   OrganizationConstraint: ResolverTypeWrapper<OrganizationConstraint>;
   OrganizationConstraintType: OrganizationConstraintType;
@@ -1009,8 +983,6 @@ export type ResolversParentTypes = {
   NebiusConfig: NebiusConfig;
   NebiusConfigInput: NebiusConfigInput;
   NebiusDataSource: NebiusDataSource;
-  OptscaleCapability: OptscaleCapability;
-  OptscaleCapabilityParams: OptscaleCapabilityParams;
   Organization: Organization;
   OrganizationConstraint: OrganizationConstraint;
   OrganizationLimitHit: OrganizationLimitHit;
@@ -1349,7 +1321,6 @@ export type MutationResolvers<ContextType = any, ParentType extends ResolversPar
   updateEmployeeEmail?: Resolver<Maybe<ResolversTypes['EmployeeEmail']>, ParentType, ContextType, RequireFields<MutationUpdateEmployeeEmailArgs, 'employeeId' | 'params'>>;
   updateEmployeeEmails?: Resolver<Maybe<Array<Maybe<ResolversTypes['EmployeeEmail']>>>, ParentType, ContextType, RequireFields<MutationUpdateEmployeeEmailsArgs, 'employeeId' | 'params'>>;
   updateInvitation?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType, RequireFields<MutationUpdateInvitationArgs, 'action' | 'invitationId'>>;
-  updateOptscaleCapability?: Resolver<Maybe<ResolversTypes['OptscaleCapability']>, ParentType, ContextType, RequireFields<MutationUpdateOptscaleCapabilityArgs, 'organizationId'>>;
   updateOrganization?: Resolver<Maybe<ResolversTypes['Organization']>, ParentType, ContextType, RequireFields<MutationUpdateOrganizationArgs, 'organizationId' | 'params'>>;
   updateOrganizationPerspectives?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType, RequireFields<MutationUpdateOrganizationPerspectivesArgs, 'organizationId' | 'value'>>;
   updateOrganizationThemeSettings?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType, RequireFields<MutationUpdateOrganizationThemeSettingsArgs, 'organizationId' | 'value'>>;
@@ -1382,12 +1353,6 @@ export type NebiusDataSourceResolvers<ContextType = any, ParentType extends Reso
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type OptscaleCapabilityResolvers<ContextType = any, ParentType extends ResolversParentTypes['OptscaleCapability'] = ResolversParentTypes['OptscaleCapability']> = {
-  finops?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
-  mlops?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type OrganizationResolvers<ContextType = any, ParentType extends ResolversParentTypes['Organization'] = ResolversParentTypes['Organization']> = {
   currency?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   disabled?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
@@ -1432,7 +1397,6 @@ export type QueryResolvers<ContextType = any, ParentType extends ResolversParent
   employeeEmails?: Resolver<Maybe<Array<Maybe<ResolversTypes['EmployeeEmail']>>>, ParentType, ContextType, RequireFields<QueryEmployeeEmailsArgs, 'employeeId'>>;
   expensesDailyBreakdown?: Resolver<Maybe<ResolversTypes['ExpensesDailyBreakdown']>, ParentType, ContextType, RequireFields<QueryExpensesDailyBreakdownArgs, 'organizationId'>>;
   invitations?: Resolver<Maybe<Array<Maybe<ResolversTypes['Invitation']>>>, ParentType, ContextType>;
-  optscaleCapability?: Resolver<Maybe<ResolversTypes['OptscaleCapability']>, ParentType, ContextType, RequireFields<QueryOptscaleCapabilityArgs, 'organizationId'>>;
   organizationConstraint?: Resolver<Maybe<ResolversTypes['OrganizationConstraint']>, ParentType, ContextType, RequireFields<QueryOrganizationConstraintArgs, 'constraintId'>>;
   organizationFeatures?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType, RequireFields<QueryOrganizationFeaturesArgs, 'organizationId'>>;
   organizationLimitHits?: Resolver<Maybe<Array<ResolversTypes['OrganizationLimitHit']>>, ParentType, ContextType, RequireFields<QueryOrganizationLimitHitsArgs, 'constraintId' | 'organizationId'>>;
@@ -1488,7 +1452,6 @@ export type Resolvers<ContextType = any> = {
   Mutation?: MutationResolvers<ContextType>;
   NebiusConfig?: NebiusConfigResolvers<ContextType>;
   NebiusDataSource?: NebiusDataSourceResolvers<ContextType>;
-  OptscaleCapability?: OptscaleCapabilityResolvers<ContextType>;
   Organization?: OrganizationResolvers<ContextType>;
   OrganizationConstraint?: OrganizationConstraintResolvers<ContextType>;
   OrganizationLimitHit?: OrganizationLimitHitResolvers<ContextType>;

ngui/server/graphql/resolvers/restapi.ts

@@ -65,9 +65,6 @@ const resolvers: Resolvers = {
     organizationFeatures: async (_, { organizationId }, { dataSources }) => {
       return dataSources.restapi.getOrganizationFeatures(organizationId);
     },
-    optscaleCapability: async (_, { organizationId }, { dataSources }) => {
-      return dataSources.restapi.getOptscaleCapability(organizationId);
-    },
     organizationThemeSettings: async (
       _,
       { organizationId },
@@ -169,16 +166,6 @@ const resolvers: Resolvers = {
     updateInvitation: async (_, { invitationId, action }, { dataSources }) => {
       return dataSources.restapi.updateInvitation(invitationId, action);
     },
-    updateOptscaleCapability: async (
-      _,
-      { organizationId, value },
-      { dataSources }
-    ) => {
-      return dataSources.restapi.updateOptscaleCapability(
-        organizationId,
-        value
-      );
-    },
     updateOrganizationThemeSettings: async (
       _,
       { organizationId, value },

ngui/server/graphql/schemas/restapi.graphql

@@ -550,16 +550,6 @@ type Invitation {
   invite_assignments: [InvitationAssignment!]
 }
 
-type OptscaleCapability {
-  finops: Boolean
-  mlops: Boolean
-}
-
-input OptscaleCapabilityParams {
-  finops: Boolean
-  mlops: Boolean
-}
-
 input UpdateOrganizationInput {
   name: String
   currency: String
@@ -603,7 +593,6 @@ type Query {
   employeeEmails(employeeId: ID!): [EmployeeEmail]
   invitations: [Invitation]
   organizationFeatures(organizationId: ID!): JSONObject
-  optscaleCapability(organizationId: ID!): OptscaleCapability
   organizationThemeSettings(organizationId: ID!): JSONObject
   organizationPerspectives(organizationId: ID!): JSONObject
   organizationConstraint(constraintId: ID!): OrganizationConstraint
@@ -648,10 +637,6 @@ type Mutation {
   ): Organization
   deleteOrganization(organizationId: ID!): String
   updateInvitation(invitationId: String!, action: String!): String
-  updateOptscaleCapability(
-    organizationId: ID!
-    value: OptscaleCapabilityParams
-  ): OptscaleCapability
   updateOrganizationThemeSettings(
     organizationId: ID!
     value: JSONObject!

ngui/ui/public/docs/finops-portal.md

@@ -1,6 +1,6 @@
 ### **Summary**
 
-Get familiar with the concepts of FinOps and MLOps. For more information, visit FinOps in Practice. Explore best practices for FinOps and MLOps by clicking the "How-Tos" tab.
+Get familiar with the concepts of FinOps. For more information, visit FinOps in Practice. Explore best practices for FinOps by clicking the "How-Tos" tab.
 
 ### **View**
 

ngui/ui/public/docs/home.md

@@ -8,14 +8,8 @@ The Home page displays your organization’s current spending and projected expe
 
 ### **Actions**
 
-- Get Detailed Insights: Click on resource expenses, policy violations, tasks, and models to access detailed information and gain deeper insights into each area.
+- Get Detailed Insights: Click on resource expenses and policy violations to access detailed information and gain deeper insights into each area.
 
-- Explore Key Pages: Visit the organization expenses, resources, recommendations, pools, tasks, and models pages to get comprehensive insights and manage different aspects of your cloud operations effectively.
+- Explore Key Pages: Visit the organization expenses, resources, recommendations and pools pages to get comprehensive insights and manage different aspects of your cloud operations effectively.
 
-- Monitoring Usage: Check the resource and pool lists for values ​​that require attention, or visit the Cost Explorer page to view a detailed graph of your costs.
-
-### **Tips**
-
-- Track ML Experiments: Use the task section to track and manage your machine learning experiments. Tasks let you visualize, search for, and compare ML runs and access run metadata for analysis.
-
-- Analyze Models for Insights: Examine the models section to keep track of your machine learning models. Models are used to make predictions or decisions based on data. This can help you make informed decisions about resource allocation and identify opportunities for optimization.
+- Monitoring Usage: Check the resource and pool lists for values ​​that require attention, or visit the Cost Explorer page to view a detailed graph of your costs.

ngui/ui/public/docs/settings.md

@@ -9,8 +9,6 @@ The available tabs allow you to fine-tune settings for seamless collaboration an
 
 -   Invitations: Observe the invitation details, including the organization name and roles.
 
--   Capabilities: Get the list of features available for FinOps and MLOps options.
-
 -   SSH Key: View the list of available SSH keys, and quickly add a new one.
 
 -   Email Notifications: Select the categories to receive email notifications.
@@ -20,8 +18,6 @@ The available tabs allow you to fine-tune settings for seamless collaboration an
 -   Manage Organization: Edit the organization name, change the currency (if no data sources are connected), or delete the organization.
 
 -   Accept Invitations: Accept or decline invitations sent by the managers of other organizations.
-   
--   Control Capabilities: Select FinOps, MLOps, or both to tailor your settings based on financial operations, machine learning processes, or a combination of both.
 
 -   Add SSH Key: View the list of available SSH keys and quickly add a new one.