diff --git a/satellite/console/consoleweb/config.go b/satellite/console/consoleweb/config.go index a0d53adf9..0266eb866 100644 --- a/satellite/console/consoleweb/config.go +++ b/satellite/console/consoleweb/config.go @@ -33,6 +33,7 @@ type FrontendConfig struct { PathwayOverviewEnabled bool `json:"pathwayOverviewEnabled"` Captcha console.CaptchaConfig `json:"captcha"` AllProjectsDashboard bool `json:"allProjectsDashboard"` + LimitsAreaEnabled bool `json:"limitsAreaEnabled"` DefaultPaidStorageLimit memory.Size `json:"defaultPaidStorageLimit"` DefaultPaidBandwidthLimit memory.Size `json:"defaultPaidBandwidthLimit"` InactivityTimerEnabled bool `json:"inactivityTimerEnabled"` diff --git a/satellite/console/consoleweb/server.go b/satellite/console/consoleweb/server.go index 6c25df4c8..ee6565dba 100644 --- a/satellite/console/consoleweb/server.go +++ b/satellite/console/consoleweb/server.go @@ -93,6 +93,7 @@ type Config struct { PublicLinksharingURL string `help:"url link for linksharing requests for external sharing" default:"https://link.storjshare.io" devDefault:"http://localhost:8001"` PathwayOverviewEnabled bool `help:"indicates if the overview onboarding step should render with pathways" default:"true"` AllProjectsDashboard bool `help:"indicates if all projects dashboard should be used" default:"false"` + LimitsAreaEnabled bool `help:"indicates whether limit card section of the UI is enabled" default:"false"` GeneratedAPIEnabled bool `help:"indicates if generated console api should be used" default:"false"` OptionalSignupSuccessURL string `help:"optional url to external registration success page" default:""` HomepageURL string `help:"url link to storj.io homepage" default:"https://www.storj.io"` @@ -531,6 +532,7 @@ func (server *Server) frontendConfigHandler(w http.ResponseWriter, r *http.Reque DefaultPaidBandwidthLimit: server.config.UsageLimits.Bandwidth.Paid, Captcha: server.config.Captcha, AllProjectsDashboard: server.config.AllProjectsDashboard, + LimitsAreaEnabled: server.config.LimitsAreaEnabled, InactivityTimerEnabled: server.config.Session.InactivityTimerEnabled, InactivityTimerDuration: server.config.Session.InactivityTimerDuration, InactivityTimerViewerEnabled: server.config.Session.InactivityTimerViewerEnabled, diff --git a/scripts/testdata/satellite-config.yaml.lock b/scripts/testdata/satellite-config.yaml.lock index 6c8eac65c..ee6fcb649 100755 --- a/scripts/testdata/satellite-config.yaml.lock +++ b/scripts/testdata/satellite-config.yaml.lock @@ -274,6 +274,9 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0 # url link to let us know page # console.let-us-know-url: https://storjlabs.atlassian.net/servicedesk/customer/portals +# indicates whether limit card section of the UI is enabled +# console.limits-area-enabled: false + # url link for linksharing requests within the application # console.linksharing-url: https://link.storjsatelliteshare.io diff --git a/web/satellite/src/api/v0.gen.ts b/web/satellite/src/api/v0.gen.ts index fa70a5869..92cf1f6c3 100644 --- a/web/satellite/src/api/v0.gen.ts +++ b/web/satellite/src/api/v0.gen.ts @@ -7,6 +7,7 @@ import { MemorySize, Time, UUID } from '@/types/common'; export class APIKeyInfo { id: UUID; projectId: UUID; + projectPublicId: UUID; userAgent: string; name: string; createdAt: Time; diff --git a/web/satellite/src/components/project/dashboard/ProjectDashboard.vue b/web/satellite/src/components/project/dashboard/ProjectDashboard.vue index a5a6572c6..eea4f7ee5 100644 --- a/web/satellite/src/components/project/dashboard/ProjectDashboard.vue +++ b/web/satellite/src/components/project/dashboard/ProjectDashboard.vue @@ -102,7 +102,7 @@ - +
{ return projectsStore.state.currentLimits; }); +/** + * Returns the whether the limits area is enabled. + */ +const limitsAreaEnabled = computed((): boolean => { + return configStore.state.config.limitsAreaEnabled; +}); + /** * Returns status string based on account status. */ diff --git a/web/satellite/src/types/config.gen.ts b/web/satellite/src/types/config.gen.ts index 5891d615c..49e15c736 100644 --- a/web/satellite/src/types/config.gen.ts +++ b/web/satellite/src/types/config.gen.ts @@ -26,9 +26,11 @@ export class FrontendConfig { couponCodeSignupUIEnabled: boolean; fileBrowserFlowDisabled: boolean; linksharingURL: string; + publicLinksharingURL: string; pathwayOverviewEnabled: boolean; captcha: CaptchaConfig; allProjectsDashboard: boolean; + limitsAreaEnabled: boolean; defaultPaidStorageLimit: MemorySize; defaultPaidBandwidthLimit: MemorySize; inactivityTimerEnabled: boolean;