JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web/satellite: remove old object browser

Browse Source 
Change-Id: Ief16a3887444df093c644831d86a9b3e865e5867
This commit is contained in:
Egon Elbre 2022-01-05 12:48:10 +02:00
parent 0c3a7b4575
commit 04d04c0306
8 changed files with 3318 additions and 3053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
satellite/console/consoleweb/server.go
View File

@ -93,7 +93,6 @@ type Config struct {
PathwayOverviewEnabled bool `help:"indicates if the overview onboarding step should render with pathways" default:"true"`
NewProjectDashboard bool `help:"indicates if new project dashboard should be used" default:"false"`
NewNavigation bool `help:"indicates if new navigation structure should be rendered" default:"true"`
NewBrowser bool `help:"indicates if new browser should be used" default:"true"`
NewObjectsFlow bool `help:"indicates if new objects flow should be used" default:"true"`
// RateLimit defines the configuration for the IP and userID rate limiters.
@ -380,7 +379,6 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) {
DefaultPaidStorageLimit memory.Size
DefaultPaidBandwidthLimit memory.Size
NewNavigation bool
NewBrowser bool
NewObjectsFlow bool
}
@ -411,7 +409,6 @@ func (server *Server) appHandler(w http.ResponseWriter, r *http.Request) {
data.RecaptchaSiteKey = server.config.Recaptcha.SiteKey
data.NewProjectDashboard = server.config.NewProjectDashboard
data.NewNavigation = server.config.NewNavigation
data.NewBrowser = server.config.NewBrowser
data.NewObjectsFlow = server.config.NewObjectsFlow
templates, err := server.loadTemplates()

3
scripts/testdata/satellite-config.yaml.lock vendored
View File

@ -181,9 +181,6 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0
# url link for linksharing requests
# console.linksharing-url: https://link.us1.storjshare.io
# indicates if new browser should be used
# console.new-browser: true
# indicates if new navigation structure should be rendered
# console.new-navigation: true

1
testsuite/ui/uitest/run.go
View File

@ -35,7 +35,6 @@ func configureSatellite(log *zap.Logger, index int, config *satellite.Config) {
config.Console.StaticDir = dir
}
config.Console.NewNavigation = true
config.Console.NewBrowser = true
config.Console.NewObjectsFlow = true
config.Console.CouponCodeBillingUIEnabled = true
}

1
web/satellite/index.html
View File

@ -29,7 +29,6 @@
<meta name="default-paid-storage-limit" content="{{ .DefaultPaidStorageLimit }}">
<meta name="default-paid-bandwidth-limit" content="{{ .DefaultPaidBandwidthLimit }}">
<meta name="new-navigation-structure" content="{{ .NewNavigation }}">
<meta name="new-browser" content="{{ .NewBrowser }}">
<meta name="new-objects-flow" content="{{ .NewObjectsFlow }}">
<title>{{ .SatelliteName }}</title>
<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAACDVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////8nbP8obf8pbf8qbv8rb/8sb/8tcP8ucf8vcf8vcv8xc/8zdP81df81dv82dv83d/84eP85eP86ef87ev89e/8+fP8/fP9Aff9Bfv9Cfv9Df/9EgP9FgP9Ggf9Hgv9Jg/9LhP9Mhf9Nhv9Oh/9Ph/9RiP9Rif9Sif9Ui/9Vi/9WjP9Xjf9Yjf9aj/9dkf9ekf9ilP9jlf9llv9nl/9omP9rmv9sm/9tnP9vnf9wnv9yn/91of92ov93o/94o/98pv9/qP+Bqf+Cqv+Eq/+FrP+Hrf+Irv+Jr/+Kr/+Msf+Nsv+Stf+Ttf+Ttv+Utv+Vt/+WuP+XuP+Zuf+Zuv+hv/+kwf+lwv+mwv+nw/+oxP+pxP+pxf+qxf+rxv+yy/+0zP+1zf+3zv+4z/+60P+70f+90v+/0/+/1P/B1f/D1v/E1//F1//F2P/G2P/H2f/I2v/J2v/K2//L3P/P3v/Q3//R4P/S4P/V4v/V4//W4//X5P/Y5P/b5v/b5//c5//d6P/e6f/f6f/g6v/h6//j7P/k7f/l7f/m7v/q8f/r8f/u8//w9f/x9f/x9v/z9//0+P/2+f/3+f/3+v/4+v/5+//6/P/8/f/9/v/+/v////9uCbVDAAAAFXRSTlMABAU4Ozw9PpSWl5ilp6ip4+Tl/P6nIcp/AAAAAWJLR0SuuWuTpwAAAh5JREFUOMtjYGBgYOcXEl6HAYSF+FgZQICJex1OwMkEVIAi3+Xh1ozM5wKaj8xfpBwcITsbWYSNgR+JtzpJYvU6jbAVSEK8DEIITpOZqnxItISWfgVCTJAB7v4ZXpKRC9uMNCqXJci6TID7hQFMrV2zJE7abTKQFesDJGb7SYTOX7sGLAVWUKCgrGZcDeaDFaxb12alqC6XDlMwTyKnRLJ1HbKCddNEc0skJkAVdEssXatRiKqgVmLlatUqqILVpuaOEnLJy4GsIhONuHlAOldVwtJWcwnMDb2i4dPKdHVKV3uqRCdYqU9psVDOmh0vUQN35FTRhevWLU+V0FeZBdTtpSQRvgAoKtuMqmBdpKxvKYjXJ+o+cx0WBRPFO6ABHuesMheLghIdePiutc7AoqBLchZchVMSFgUr9HTS8sEgL1C0E1XBRNGUeeV6OlFONjbqSjY2Nv7mKjnzMyXqYQrW2OsYS8smLkOE5OpsFSkdQ6PlUAU9EgtXq6MFdZ3EkpVKNVAFc8TKW6QbURVMFK1slOyGuSFdUkLOoQtZwSRXaRmpKLgj1y1eMjdIImguTMHCCAnvGcuXQhIMPMl1O8hnrOy31GtfnaNi3oRIcohEu7ZY20DZK0DGTCV7NVKi5UVK40vDJVatU/dfgCTEw8AsgsSdLx+TKjUdOeMAsycnMr/BzrIcmc8ByrycuDMvByM4f7PyCmLL/gK8LEBJALYsGEdXEyupAAAAAElFTkSuQmCC" type="image/x-icon">

6346
web/satellite/package-lock.json
View File

File diff suppressed because it is too large Load Diff

1
web/satellite/package.json
View File

@ -21,7 +21,6 @@
"apollo-link-http": "1.5.17",
"aws-sdk": "2.853.0",
"bip39": "3.0.3",
"browser": "git+https://github.com/storj/browser#4e5770dfa9883176bbab793138911d92305243ed",
"chart.js": "2.9.4",
"graphql": "15.3.0",
"graphql-tag": "2.11.0",

10
web/satellite/src/components/objects/UploadFile.vue
View File

@ -4,7 +4,7 @@
<template>
<div>
<p class="back" @click="goToBuckets">&lt;- Back to Buckets</p>
<div :class="{ 'file-browser': !newBrowser }">
<div class="file-browser">
<FileBrowser />
</div>
<UploadCancelPopup v-if="isCancelUploadPopupVisible" />
@ -12,11 +12,10 @@
</template>
<script lang="ts">
import * as browser from 'browser';
import { Component, Vue } from 'vue-property-decorator';
import UploadCancelPopup from '@/components/objects/UploadCancelPopup.vue';
import InternalFileBrowser from '@/components/browser/FileBrowser.vue';
import FileBrowser from '@/components/browser/FileBrowser.vue';
import { AnalyticsHttpApi } from '@/api/analytics';
import { RouteConfig } from '@/router';
@ -24,8 +23,6 @@ import { ACCESS_GRANTS_ACTIONS } from '@/store/modules/accessGrants';
import { AccessGrant, GatewayCredentials } from '@/types/accessGrants';
import { AnalyticsEvent } from '@/utils/constants/analyticsEventNames';
import { MetaUtils } from '@/utils/meta';
const newBrowser = MetaUtils.getMetaContent('new-browser') === "true";
const FileBrowser = newBrowser ? InternalFileBrowser : browser.FileBrowser;
// @vue/component
@Component({
@ -38,7 +35,6 @@ export default class UploadFile extends Vue {
private linksharingURL = '';
private worker: Worker;
private readonly analytics: AnalyticsHttpApi = new AnalyticsHttpApi();
private readonly newBrowser: boolean = newBrowser;
/**
* Lifecycle hook after initial render.
@ -220,8 +216,6 @@ export default class UploadFile extends Vue {
</script>
<style scoped>
@import '../../../node_modules/browser/dist/browser.css';
.back {
font-family: 'font_medium', sans-serif;
color: #000;

6
web/satellite/src/store/index.ts
View File

@ -1,7 +1,6 @@
// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information.
import { files } from 'browser';
import Vue from 'vue';
import Vuex from 'vuex';
@ -23,10 +22,7 @@ import { makeProjectsModule, PROJECTS_MUTATIONS, ProjectsState } from '@/store/m
import { makeUsersModule } from '@/store/modules/users';
import { User } from '@/types/users';
import { MetaUtils } from '@/utils/meta';
import internalFiles from '@/store/modules/files';
import * as externalBrowser from 'browser';
const files = MetaUtils.getMetaContent('new-browser') === "true" ? internalFiles : externalBrowser.files;
import files from '@/store/modules/files';
Vue.use(Vuex);