diff --git a/build/clean-symlinks.js b/build/clean-symlinks.js new file mode 100644 index 0000000000..9ae0c0aed1 --- /dev/null +++ b/build/clean-symlinks.js @@ -0,0 +1,40 @@ +// Clean any symlinks from a pre 4.0 Stratos +// These are no longer used for customization and need to be removed + +// Implemented as a single script here so that it works on Windows, Linux and Mac + +const path = require('path'); +const fs = require('fs'); + +// __dirname is the folder where build.js is located +const STRATOS_DIR= path.resolve(__dirname, '..'); + +function processFile(filepath) { + if (fs.existsSync(filepath)) { + const stats = fs.lstatSync(filepath); + if (stats.isSymbolicLink()) { + console.log(`Removing symlink ${filepath}`); + fs.unlinkSync(filepath); + } + } +} + +function processFolder(dir) { + if (!fs.existsSync(dir)) { + return + } + fs.readdirSync(dir).forEach( f => { + let dirPath = path.join(dir, f); + const realPath = fs.realpathSync(dirPath); + const stats = fs.lstatSync(realPath); + if (stats.isDirectory()) { + processFolder(dirPath); + } else { + processFile(dirPath); + } + }); +}; + +processFolder(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'sass')); +processFolder(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'assets')); +processFile(path.join(STRATOS_DIR, 'src', 'frontend', 'packages', 'core', 'favicon.ico')); diff --git a/build/clean-symlinks.sh b/build/clean-symlinks.sh deleted file mode 100755 index 0ff35b104b..0000000000 --- a/build/clean-symlinks.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# Clean any symlinks from a pre 4.0 Stratos -# These are no longer used for customization and need to be removed - -set -euo pipefail - -# Script folder -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" -STRATOS="`cd "${DIR}/..";pwd`" - -function processFile { - filename=$1 - if [ -L "$filename" ]; then - echo Removing symlink $filename - rm $filename - fi -} - -function processFolder { - for filename in $1; do - processFile $filename - done -} - -processFolder "${STRATOS}/src/frontend/packages/core/sass/*.*" -processFolder "${STRATOS}/src/frontend/packages/core/assets/*.*" -processFile "${STRATOS}/src/frontend/packages/core/favicon.ico" diff --git a/build/dev-setup.js b/build/dev-setup.js new file mode 100644 index 0000000000..77a7d6abc1 --- /dev/null +++ b/build/dev-setup.js @@ -0,0 +1,30 @@ +// Copy files required for developer quick start +// Implemented as a single script here so that it works on Windows, Linux and Mac + +const path = require('path'); +const fs = require('fs'); + +// __dirname is the folder where build.js is located +const STRATOS_DIR= path.resolve(__dirname, '..'); + +// Only copy files if they are not already there - just make sure initial versions are in place for developer + +// Proxy config file +const PROXY_CONF = path.join(STRATOS_DIR, 'proxy.conf.js'); +if (!fs.existsSync(PROXY_CONF)) { + let err = fs.copyFileSync(path.join(__dirname, 'proxy.conf.localdev.js'), PROXY_CONF); + if (err) { + console.log(err); + } +} + +// config.properties +const BACKEND_DIR = path.join(STRATOS_DIR, 'src', 'jetstream'); +const BACKEND_CONF = path.join(BACKEND_DIR, 'config.properties'); +const BACKEND_CONF_DEV = path.join(BACKEND_DIR, 'config.dev'); +if (!fs.existsSync(BACKEND_CONF)) { + let err = fs.copyFileSync(BACKEND_CONF_DEV, BACKEND_CONF); + if (err) { + console.log(err); + } +} diff --git a/build/fe-build.js b/build/fe-build.js deleted file mode 100644 index 75946dd93c..0000000000 --- a/build/fe-build.js +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Gulp build file for Angular 2 Front End UI Code - */ -/* eslint-disable angular/log,no-console,no-process-env,angular/json-functions,no-sync */ -(function () { - 'use strict'; - - var gulp = require('gulp'); - // var _ = require('lodash'); - var del = require('delete'); - var spawn = require('child_process').spawn; - var path = require('path'); - var os = require('os'); - var zip = require('gulp-zip'); - var fs = require('fs-extra'); - - var config = require('./gulp.config'); - var paths = config.paths; - - // Clean dist dir - gulp.task('clean', function (next) { - del(paths.dist + '**/*', { - force: true - }, next); - }); - - // Package pre-built UI for the buildpack to detect - gulp.task('package-prebuild', function () { - return gulp.src('dist/**/*') - .pipe(zip('stratos-frontend-prebuild.zip')) - .pipe(gulp.dest('.')) - }); - - gulp.task('dev-setup', function (cb) { - // Copy proxy.conf.js so the front-end is all ready to go against a local backend - if not already exsiting - var proxyConf = path.resolve(__dirname, '../proxy.conf.js'); - var localProxyConf = path.resolve(__dirname, './proxy.conf.localdev.js'); - if (!fs.existsSync(proxyConf)) { - fs.copySync(localProxyConf, proxyConf); - } - cb(); - }); - - // Legacy task name - gulp.task('clean:dist', gulp.series('clean')); - - gulp.task('ng-build', function (cb) { - var rootFolder = path.resolve(__dirname, '..'); - var cmd = 'npm'; - var windowsEnvironment = os.platform().startsWith('win'); - if (windowsEnvironment) { - cmd = 'npm.cmd'; - } - var child = spawn(cmd, ['run', 'build'], { - cwd: rootFolder - }); - child.stdout.on('data', function (data) { - console.log(data.toString()); - }); - child.stderr.on('data', function (data) { - console.log(data.toString()); - }); - child.on('error', function (err) { - console.log(err); - cb(err); - }); - child.on('close', function (code) { - var err = code === 0 ? undefined : 'Build exited with code: ' + code; - cb(err); - }); - }); - - // Production build - gulp.task('build', gulp.series( - 'clean', - 'ng-build' - )); - - // Default task is to build for production - gulp.task('default', gulp.series('build')); - -})(); diff --git a/build/gulp.config.js b/build/gulp.config.js deleted file mode 100644 index 683b24bbb0..0000000000 --- a/build/gulp.config.js +++ /dev/null @@ -1,14 +0,0 @@ -(function () { - 'use strict'; - - // This stores all the configuration information for Gulp - var paths = { - dist: './dist/', - ui: './ui' - }; - - // Now returned as an object so require always returns same object - module.exports = { - paths: paths - }; -})(); diff --git a/build/prebuild-zip.js b/build/prebuild-zip.js new file mode 100644 index 0000000000..6fb3253396 --- /dev/null +++ b/build/prebuild-zip.js @@ -0,0 +1,16 @@ +// Zip the dist folder +// Implemented as a single script here so that it works on Windows, Linux and Mac + +const path = require('path'); +const fs = require('fs'); +const AdmZip = require('adm-zip'); + +// __dirname is the folder where build.js is located +const STRATOS_DIR= path.resolve(__dirname, '..'); +const DIST_DIR= path.join(STRATOS_DIR, 'dist'); +const ZIP_FILE= path.join(STRATOS_DIR, 'stratos-frontend-prebuild.zip'); + +var zip = new AdmZip(); + +zip.addLocalFolder(DIST_DIR); +zip.writeZip(path.join(ZIP_FILE)); \ No newline at end of file diff --git a/build/store-git-metadata.js b/build/store-git-metadata.js new file mode 100644 index 0000000000..36825cd654 --- /dev/null +++ b/build/store-git-metadata.js @@ -0,0 +1,38 @@ +// Generate the git metadata file + +// Implemented as a single script here so that it works on Windows, Linux and Mac + +const path = require('path'); +const fs = require('fs'); +const execSync = require('child_process').execSync; + +// __dirname is the folder where build.js is located +const STRATOS_DIR = path.resolve(__dirname, '..'); +const GIT_FOLDER = path.join(STRATOS_DIR, '.git'); +const GIT_METADATA = path.join(STRATOS_DIR, '.stratos-git-metadata.json'); + +function execGit(cmd) { + try { + var response = execSync(cmd); + return response.toString().trim(); + } catch (e) { + console.log(e) + return ''; + } +} + +// We can only do this if we have a git repository checkout +// We'll store this in a file which we will then use - when in environments like Docker, we will run this +// in the host environment so that we can pick it up when we're running in the Docker world +// Do we have a git folder? +if (!fs.existsSync(GIT_FOLDER)) { + console.log(' + Unable to store git repository metadata - .git folder not found'); + return; +} +var gitMetadata = { + project: execGit('git config --get remote.origin.url'), + branch: execGit('git rev-parse --abbrev-ref HEAD'), + commit: execGit('git rev-parse HEAD') +}; + +fs.writeFileSync(GIT_METADATA, JSON.stringify(gitMetadata, null, 2)); diff --git a/deploy/ci/travis/check-e2e-pr.sh b/deploy/ci/travis/check-e2e-pr.sh index 89ab5b6346..5ba336a72c 100755 --- a/deploy/ci/travis/check-e2e-pr.sh +++ b/deploy/ci/travis/check-e2e-pr.sh @@ -2,8 +2,8 @@ if [ -n "${TRAVIS_PULL_REQUEST}" ]; then if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then - echo "Checking labels on ${TRAVIS_PULL_REQUEST_SLUG} #${TRAVIS_PULL_REQUEST}" - LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_PULL_REQUEST_SLUG}/pulls/${TRAVIS_PULL_REQUEST}" | jq -r '.labels[] | select(.name == "e2e-debug") | .name') + echo "Checking labels on ${TRAVIS_REPO_SLUG} #${TRAVIS_PULL_REQUEST}" + LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/pulls/${TRAVIS_PULL_REQUEST}" | jq -r '.labels[] | select(.name == "e2e-debug") | .name') if [ "${LABEL}" == "e2e-debug" ]; then echo "PR has the 'e2e-debug' label - enabling debug logging for E2E tests" export STRATOS_E2E_DEBUG=true diff --git a/deploy/stratos-ui-release/packages/backend/pre_packaging b/deploy/stratos-ui-release/packages/backend/pre_packaging index ba252553a7..65abaaabb3 100644 --- a/deploy/stratos-ui-release/packages/backend/pre_packaging +++ b/deploy/stratos-ui-release/packages/backend/pre_packaging @@ -11,7 +11,7 @@ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh # Build backend npm install export PATH=$PATH:$PWD/node_modules/.bin -npm run bosh-build-backend +npm run build-backend find ../stratos/deploy -type d ! -path '../stratos/deploy' ! -path '*/db' -maxdepth 1 | xargs rm -rf diff --git a/docs/developers-guide.md b/docs/developers-guide.md index eb36575687..9d9929d16e 100644 --- a/docs/developers-guide.md +++ b/docs/developers-guide.md @@ -212,7 +212,7 @@ db provider this can be done by deleting `src/jetstream/console-database.db` #### Configure by Environment Variables and/or Config File -By default, the configuration in file `src/jetstream/default.config.properties` will be used. These can be changed by environment variables +By default, the configuration in file `src/jetstream/config.properties` will be used. These can be changed by environment variables or an overrides file. ##### Environment variable @@ -238,7 +238,7 @@ If you have a custom uaa, ensure you have set the following environment variable ##### Config File -To easily persist configuration settings copy `src/jetstream/default.config.properties` to `src/jetstream/config.properties`. The backend will load its +To easily persist configuration settings copy `src/jetstream/config.example` to `src/jetstream/config.properties`. The backend will load its configuration from this file in preference to the default config file, if it exists. You can also modify individual configuration settings by setting the corresponding environment variable. diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index d5e126f981..0000000000 --- a/gulpfile.js +++ /dev/null @@ -1,4 +0,0 @@ -(function () { - 'use strict'; - require('./build/fe-build'); -})(); diff --git a/package-lock.json b/package-lock.json index fdfea562d5..ae80a769d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3193,9 +3193,9 @@ } }, "@tootallnate/once": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz", - "integrity": "sha512-KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, "@tweenjs/tween.js": { @@ -3630,9 +3630,9 @@ } }, "adm-zip": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz", - "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==", + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz", + "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==", "dev": true }, "after": { @@ -5464,9 +5464,9 @@ "dev": true }, "codecov": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.0.tgz", - "integrity": "sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.1.tgz", + "integrity": "sha512-JHWxyPTkMLLJn9SmKJnwAnvY09kg2Os2+Ux+GG7LwZ9g8gzDDISpIN5wAsH1UBaafA/yGcd3KofMaorE8qd6Lw==", "dev": true, "requires": { "argv": "0.0.2", @@ -11832,9 +11832,10 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true }, "lodash-es": { "version": "4.17.15", @@ -19302,9 +19303,9 @@ }, "dependencies": { "agent-base": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz", - "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", + "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", "dev": true, "requires": { "debug": "4" diff --git a/package.json b/package.json index 53e0ea9544..32d6ab56b1 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,13 @@ "build-chartsync": "./build/chartsync-build.sh", "full-build-dev": "npm run build-dev; npm run build-backend", "fetch-backend-deps": "./build/bk-fetch-deps.sh", - "bosh-build-backend": "gulp bosh-build-backend", "test-backend": "./build/bk-build.sh test", "update-webdriver": "webdriver-manager update", "build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod", "build-cf": "node --max_old_space_size=1500 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod", "build-dev": "ng build --dev", - "prebuild-ui": "npm run build && gulp package-prebuild", + "prebuild-ui": "npm run build && npm run prebuild-zip", + "prebuild-zip": "node build/prebuild-zip.js", "ng": "ng", "start": "ng serve", "start-high-mem": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng serve", @@ -38,10 +38,11 @@ "headless-e2e": "xvfb-run --server-args='-screen 0 1920x1080x24' protractor ./protractor.conf.js", "climate": "codeclimate analyze $(git diff --name-only master)", "gate-check": "npm run lint && npm run test-headless", - "store-git-metadata": "gulp store-git-metadata", - "postinstall": "gulp dev-setup && npm run build-devkit && npm run clean-symlinks", + "store-git-metadata": "node build/store-git-metadata.js", + "postinstall": "npm run dev-setup && npm run build-devkit && npm run clean-symlinks && npm run store-git-metadata", "build-devkit": "cd src/frontend/packages/devkit && npm run build", - "clean-symlinks": "./build/clean-symlinks.sh" + "clean-symlinks": "node build/clean-symlinks.js", + "dev-setup": "node build/dev-setup.js" }, "author": "", "license": "Apache-2.0", @@ -111,15 +112,14 @@ "@types/node": "^13.11.1", "@types/request": "^2.48.4", "acorn": "^7.1.1", + "adm-zip": "^0.4.16", "browserstack-local": "^1.4.5", - "codecov": "^3.6.5", + "codecov": "^3.7.1", "codelyzer": "^5.1.2", "copy-webpack-plugin": "5.1.1", "delete": "^1.1.0", "fs-extra": "^9.0.0", "globby": "^11.0.0", - "gulp": "^4.0.2", - "gulp-zip": "^5.0.1", "istanbul": "^0.4.5", "istanbul-api": "2.1.6", "istanbul-reports": "3.0.2", @@ -136,7 +136,7 @@ "karma-jasmine-html-reporter": "^1.5.3", "karma-spec-reporter": "0.0.32", "kind-of": "^6.0.3", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "mem": "6.1.0", "mktemp": "^1.0.0", "ng-packagr": "^9.1.1", @@ -145,7 +145,6 @@ "protractor": "^5.4.3", "ps-node": "^0.1.6", "q": "^1.4.1", - "replace-in-file": "^5.0.2", "request": "^2.88.2", "request-promise-native": "^1.0.8", "rxjs-tslint": "^0.1.8", diff --git a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss index b344095253..8818f59d8a 100644 --- a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss +++ b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss @@ -7,10 +7,10 @@ @import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme'; @import '../src/shared/components/schema-form/schema-form.component.theme'; -@import '../src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme'; +@import '../src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme'; @import '../src/features/applications/deploy-application/deploy-application.component.theme'; @import '../src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme'; -@import '../src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme'; +@import '../src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme'; @mixin apply-theme-stratos-cloud-foundry($stratos-theme) { diff --git a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts index e06451854c..84ddf52a57 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts @@ -7,7 +7,7 @@ import { cfEntityFactory } from '../cf-entity-factory'; import { organizationEntityType, quotaDefinitionEntityType, spaceQuotaEntityType } from '../cf-entity-types'; import { CFEntityConfig } from '../cf-types'; import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types'; -import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component'; +import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component'; import { CFStartAction } from './cf-action.types'; export const GET_QUOTA_DEFINITION = '[QuotaDefinition] Get one'; diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts index 0266310650..61bfb111fb 100644 --- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts +++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts @@ -42,7 +42,7 @@ const customRoutes: Routes = [ }, { path: 'cloud-foundry', - loadChildren: () => import('./features/cloud-foundry/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule), + loadChildren: () => import('./features/cf/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule), data: { stratosNavigation: { label: 'Cloud Foundry', diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts index 5bb932f851..2bc284c36c 100644 --- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts +++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts @@ -11,7 +11,7 @@ import { generateStratosEntities } from '../../store/src/stratos-entity-generato import { testSCFEndpointGuid } from '../../store/testing/public-api'; import { BaseCfOrgSpaceRouteMock } from '../test-framework/cloud-foundry-endpoint-service.helper'; import { generateCFEntities } from './cf-entity-generator'; -import { ActiveRouteCfOrgSpace } from './features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from './features/cf/cf-page.types'; import { CfUserService } from './shared/data-services/cf-user.service'; import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service'; import { GitSCMService } from './shared/data-services/scm/scm.service'; diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts index 4641cb90da..4576dd019f 100644 --- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts +++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts @@ -6,7 +6,7 @@ import { UpdateQuotaDefinition, } from '../actions/quota-definitions.actions'; import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator'; -import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component'; +import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component'; export interface QuotaDefinitionActionBuilder extends OrchestratedActionBuilders { get: ( diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts index 68d96b2c80..aec68cfd2e 100644 --- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts +++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts @@ -8,7 +8,7 @@ import { UpdateSpaceQuotaDefinition, } from '../actions/quota-definitions.actions'; import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator'; -import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component'; +import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component'; export interface SpaceQuotaDefinitionActionBuilders extends OrchestratedActionBuilders { get: ( diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts index 956f90192e..b12daa358f 100644 --- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts @@ -47,7 +47,7 @@ import { import { TableCellTCPRouteComponent, } from '../../../shared/components/list/list-types/cf-routes/table-cell-tcproute/table-cell-tcproute.component'; -import { isServiceInstance, isUserProvidedServiceInstance } from '../../cloud-foundry/cf.helpers'; +import { isServiceInstance, isUserProvidedServiceInstance } from '../../cf/cf.helpers'; import { ApplicationService } from '../application.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts index f8b961dfba..f3db600307 100644 --- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts @@ -21,7 +21,7 @@ import { AppServiceBindingListConfigService, } from '../../../../shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service'; import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service'; -import { fetchTotalResults } from '../../../cloud-foundry/cf.helpers'; +import { fetchTotalResults } from '../../../cf/cf.helpers'; import { ApplicationService } from '../../application.service'; @Injectable() diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts index bff084c141..a9be4072a6 100644 --- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.ts @@ -5,8 +5,8 @@ import { CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens'; import { CfAppInstancesConfigService, } from '../../../../../../shared/components/list/list-types/app-instance/cf-app-instances-config.service'; -import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/cf-page.types'; -import { CloudFoundryEndpointService } from '../../../../../cloud-foundry/services/cloud-foundry-endpoint.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../cf/cf-page.types'; +import { CloudFoundryEndpointService } from '../../../../../cf/services/cloud-foundry-endpoint.service'; import { ApplicationMonitorService } from '../../../../application-monitor.service'; @Component({ diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-edit-space-step-base.ts similarity index 89% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-edit-space-step-base.ts index b625a0b8a0..b40983c572 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-edit-space-step-base.ts @@ -4,14 +4,14 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { filter, first, map, tap } from 'rxjs/operators'; -import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state'; -import { organizationEntityType } from '../../../../cloud-foundry/src/cf-entity-types'; -import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types'; import { StepOnNextResult } from '../../../../core/src/shared/components/stepper/step/step.component'; import { getPaginationKey } from '../../../../store/src/actions/pagination.actions'; import { APIResource } from '../../../../store/src/types/api.types'; import { ISpaceQuotaDefinition } from '../../cf-api.types'; +import { CFAppState } from '../../cf-app-state'; import { cfEntityCatalog } from '../../cf-entity-catalog'; +import { organizationEntityType } from '../../cf-entity-types'; +import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types'; import { ActiveRouteCfOrgSpace } from './cf-page.types'; export class AddEditSpaceStepBase { @@ -35,8 +35,8 @@ export class AddEditSpaceStepBase { this.orgGuid, this.cfGuid, getPaginationKey(organizationEntityType, this.orgGuid), { - flatten: true, - } + flatten: true, + } ).entities$.pipe( filter(spaces => !!spaces), map(spaces => spaces.map(space => space.entity.name)), diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/add-organization.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/add-organization.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.ts similarity index 89% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.ts index acc4f55a0c..c13b3bdef2 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-organization/create-organization-step/create-organization-step.component.ts @@ -5,22 +5,20 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { filter, map, tap } from 'rxjs/operators'; -import { CreateOrganization } from '../../../../../../cloud-foundry/src/actions/organization.actions'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; -import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types'; -import { - createEntityRelationPaginationKey, -} from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types'; -import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { APIResource } from '../../../../../../store/src/types/api.types'; +import { CreateOrganization } from '../../../../actions/organization.actions'; import { IOrganization, IOrgQuotaDefinition } from '../../../../cf-api.types'; +import { CFAppState } from '../../../../cf-app-state'; import { cfEntityCatalog } from '../../../../cf-entity-catalog'; +import { organizationEntityType } from '../../../../cf-entity-types'; import { CF_ENDPOINT_TYPE } from '../../../../cf-types'; +import { createEntityRelationPaginationKey } from '../../../../entity-relations/entity-relations.types'; +import { selectCfRequestInfo } from '../../../../store/selectors/api.selectors'; import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/add-quota.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.ts similarity index 83% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.ts index 772a75ba57..d5fbe9dbfd 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-quota/create-quota-step/create-quota-step.component.ts @@ -3,11 +3,11 @@ import { FormGroup } from '@angular/forms'; import { Subscription } from 'rxjs'; import { filter, map, pairwise } from 'rxjs/operators'; -import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog'; -import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; -import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types'; +import { cfEntityCatalog } from '../../../../cf-entity-catalog'; +import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; +import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers'; import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/add-space-quota.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts similarity index 86% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts index af6f0b51e1..6d3214c331 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts @@ -3,13 +3,13 @@ import { ActivatedRoute } from '@angular/router'; import { Observable, Subscription } from 'rxjs'; import { filter, map, pairwise } from 'rxjs/operators'; -import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog'; -import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; -import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types'; import { APIResource } from '../../../../../../store/src/types/api.types'; import { IQuotaDefinition } from '../../../../cf-api.types'; +import { cfEntityCatalog } from '../../../../cf-entity-catalog'; +import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; +import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers'; import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/add-space.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/add-space.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.ts similarity index 97% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.ts index 8d2f3e6d96..5f85a93af3 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/add-space/create-space-step/create-space-step.component.ts @@ -5,9 +5,9 @@ import { Store } from '@ngrx/store'; import { Subscription } from 'rxjs'; import { filter, map, pairwise } from 'rxjs/operators'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types'; +import { CFAppState } from '../../../../cf-app-state'; import { cfEntityCatalog } from '../../../../cf-entity-catalog'; import { AddEditSpaceStepBase } from '../../add-edit-space-step-base'; import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf-cell.helpers.ts similarity index 96% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cf-cell.helpers.ts index 375a28581a..5362fa9b69 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/cf-cell.helpers.ts @@ -11,7 +11,7 @@ import { IMetrics } from '../../../../store/src/types/base-metric.types'; import { MetricQueryType } from '../../../../store/src/types/metric.types'; import { FetchCFCellMetricsPaginatedAction } from '../../actions/cf-metrics.actions'; import { CFEntityConfig } from '../../cf-types'; -import { CellMetrics } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service'; +import { CellMetrics } from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service'; export class CfCellHelper { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-page.types.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf-page.types.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-page.types.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cf-page.types.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts similarity index 96% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts index e6e64456f7..a4ddeb40cf 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/cf.helpers.ts @@ -3,14 +3,6 @@ import { Store } from '@ngrx/store'; import { combineLatest, Observable } from 'rxjs'; import { filter, first, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators'; -import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state'; -import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers'; -import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types'; -import { - getCurrentUserCFEndpointRolesState, -} from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors'; -import { ICfRolesState } from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types'; -import { UserRoleLabels } from '../../../../cloud-foundry/src/store/types/users-roles.types'; import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config'; import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service'; import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service'; @@ -29,9 +21,14 @@ import { EndpointModel } from '../../../../store/src/types/endpoint.types'; import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types'; import { IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types'; import { CFFeatureFlagTypes, IApp, ISpace } from '../../cf-api.types'; +import { CFAppState } from '../../cf-app-state'; import { cfEntityFactory } from '../../cf-entity-factory'; +import { getCFEntityKey } from '../../cf-entity-helpers'; +import { applicationEntityType } from '../../cf-entity-types'; import { CFEntityConfig } from '../../cf-types'; import { ListCfRoute } from '../../shared/components/list/list-types/cf-routes/cf-routes-data-source-base'; +import { getCurrentUserCFEndpointRolesState } from '../../store/selectors/cf-current-user-role.selectors'; +import { ICfRolesState } from '../../store/types/cf-current-user-roles.types'; import { CfUser, CfUserRoleParams, @@ -40,6 +37,7 @@ import { UserRoleInOrg, UserRoleInSpace, } from '../../store/types/cf-user.types'; +import { UserRoleLabels } from '../../store/types/users-roles.types'; import { CfCurrentUserPermissions, CfPermissionTypes } from '../../user-permissions/cf-user-permissions-checkers'; import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts similarity index 96% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts index 3449967904..1f0eb737b6 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts @@ -3,8 +3,6 @@ import { Store } from '@ngrx/store'; import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs'; import { first, map } from 'rxjs/operators'; -import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; -import { CFAppCLIInfoContext } from '../../../../../cloud-foundry/src/shared/components/cli-info/cli-info.component'; import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types'; import { RouterNav } from '../../../../../store/src/actions/router.actions'; import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils'; @@ -12,6 +10,8 @@ import { APIResource, EntityInfo } from '../../../../../store/src/types/api.type import { EndpointModel } from '../../../../../store/src/types/endpoint.types'; import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type'; import { IOrganization, ISpace } from '../../../cf-api.types'; +import { CFAppState } from '../../../cf-app-state'; +import { CFAppCLIInfoContext } from '../../../shared/components/cli-info/cli-info.component'; import { CloudFoundryUserProvidedServicesService, } from '../../../shared/services/cloud-foundry-user-provided-services.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-base/cloud-foundry-base.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts similarity index 68% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts index ca523e3b30..aa22c90c69 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.module.ts @@ -41,80 +41,76 @@ import { CloudFoundryOrganizationService } from './services/cloud-foundry-organi import { SpaceQuotaDefinitionFormComponent } from './space-quota-definition-form/space-quota-definition-form.component'; import { SpaceQuotaDefinitionComponent } from './space-quota-definition/space-quota-definition.component'; import { CfAdminAddUserWarningComponent } from './tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component'; -import { CloudFoundryBuildPacksComponent } from './tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component'; +import { CloudFoundryBuildPacksComponent } from './tabs/cf-build-packs/cloud-foundry-build-packs.component'; import { CloudFoundryCellAppsComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component'; import { CloudFoundryCellBaseComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component'; import { CloudFoundryCellChartsComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component'; import { CloudFoundryCellSummaryComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component'; -import { CloudFoundryCellService } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service'; -import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-foundry-cells.component'; -import { CloudFoundryEventsComponent } from './tabs/cloud-foundry-events/cloud-foundry-events.component'; -import { CloudFoundryFeatureFlagsComponent } from './tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component'; -import { CloudFoundryFirehoseComponent } from './tabs/cloud-foundry-firehose/cloud-foundry-firehose.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component'; +import { CloudFoundryCellService } from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service'; +import { CloudFoundryCellsComponent } from './tabs/cf-cells/cloud-foundry-cells.component'; +import { CloudFoundryEventsComponent } from './tabs/cf-events/cloud-foundry-events.component'; +import { CloudFoundryFeatureFlagsComponent } from './tabs/cf-feature-flags/cloud-foundry-feature-flags.component'; +import { CloudFoundryFirehoseComponent } from './tabs/cf-firehose/cloud-foundry-firehose.component'; import { CloudFoundryOrganizationSpaceQuotasComponent, -} from './tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component'; +} from './tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component'; import { CloudFoundryInviteUserLinkComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component'; +} from './tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component'; import { CloudFoundryOrganizationBaseComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component'; +} from './tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component'; import { CloudFoundryOrganizationEventsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component'; +} from './tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component'; import { CloudFoundryOrganizationSpacesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component'; +} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component'; import { CloudFoundrySpaceBaseComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component'; +} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component'; import { CloudFoundrySpaceAppsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component'; import { CloudFoundrySpaceEventsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component'; import { CloudFoundrySpaceRoutesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component'; import { CloudFoundrySpaceServiceInstancesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component'; import { CloudFoundrySpaceSummaryComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component'; import { CloudFoundrySpaceUserServiceInstancesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component'; import { CloudFoundrySpaceUsersComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component'; import { CloudFoundryOrganizationSummaryComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component'; +} from './tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component'; import { CloudFoundryOrganizationUsersComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component'; -import { - CloudFoundryOrganizationsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organizations.component'; -import { CloudFoundryQuotasComponent } from './tabs/cloud-foundry-quotas/cloud-foundry-quotas.component'; -import { CloudFoundryRoutesComponent } from './tabs/cloud-foundry-routes/cloud-foundry-routes.component'; -import { - CloudFoundrySecurityGroupsComponent, -} from './tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component'; -import { CloudFoundryStacksComponent } from './tabs/cloud-foundry-stacks/cloud-foundry-stacks.component'; -import { CloudFoundrySummaryTabComponent } from './tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component'; -import { CloudFoundryUsersComponent } from './tabs/cloud-foundry-users/cloud-foundry-users.component'; +} from './tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component'; +import { CloudFoundryOrganizationsComponent } from './tabs/cf-organizations/cloud-foundry-organizations.component'; +import { CloudFoundryQuotasComponent } from './tabs/cf-quotas/cloud-foundry-quotas.component'; +import { CloudFoundryRoutesComponent } from './tabs/cf-routes/cloud-foundry-routes.component'; +import { CloudFoundrySecurityGroupsComponent } from './tabs/cf-security-groups/cloud-foundry-security-groups.component'; +import { CloudFoundryStacksComponent } from './tabs/cf-stacks/cloud-foundry-stacks.component'; +import { CloudFoundrySummaryTabComponent } from './tabs/cf-summary-tab/cloud-foundry-summary-tab.component'; +import { CloudFoundryUsersComponent } from './tabs/cf-users/cloud-foundry-users.component'; import { UserInviteConfigurationDialogComponent, } from './user-invites/configuration-dialog/user-invite-configuration-dialog.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts similarity index 76% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts index 258d2b2163..b8b6a008f3 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-section.routing.ts @@ -20,76 +20,72 @@ import { EditSpaceQuotaComponent } from './edit-space-quota/edit-space-quota.com import { EditSpaceComponent } from './edit-space/edit-space.component'; import { QuotaDefinitionComponent } from './quota-definition/quota-definition.component'; import { SpaceQuotaDefinitionComponent } from './space-quota-definition/space-quota-definition.component'; -import { CloudFoundryBuildPacksComponent } from './tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component'; +import { CloudFoundryBuildPacksComponent } from './tabs/cf-build-packs/cloud-foundry-build-packs.component'; import { CloudFoundryCellAppsComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component'; import { CloudFoundryCellBaseComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component'; import { CloudFoundryCellChartsComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component'; import { CloudFoundryCellSummaryComponent, -} from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component'; -import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-foundry-cells.component'; -import { CloudFoundryEventsComponent } from './tabs/cloud-foundry-events/cloud-foundry-events.component'; -import { CloudFoundryFeatureFlagsComponent } from './tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component'; -import { CloudFoundryFirehoseComponent } from './tabs/cloud-foundry-firehose/cloud-foundry-firehose.component'; +} from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component'; +import { CloudFoundryCellsComponent } from './tabs/cf-cells/cloud-foundry-cells.component'; +import { CloudFoundryEventsComponent } from './tabs/cf-events/cloud-foundry-events.component'; +import { CloudFoundryFeatureFlagsComponent } from './tabs/cf-feature-flags/cloud-foundry-feature-flags.component'; +import { CloudFoundryFirehoseComponent } from './tabs/cf-firehose/cloud-foundry-firehose.component'; import { CloudFoundryOrganizationSpaceQuotasComponent, -} from './tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component'; +} from './tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component'; import { CloudFoundryOrganizationBaseComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component'; +} from './tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component'; import { CloudFoundryOrganizationEventsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component'; +} from './tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component'; import { CloudFoundryOrganizationSpacesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component'; +} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component'; import { CloudFoundrySpaceBaseComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component'; +} from './tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component'; import { CloudFoundrySpaceAppsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component'; import { CloudFoundrySpaceEventsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component'; import { CloudFoundrySpaceRoutesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component'; import { CloudFoundrySpaceServiceInstancesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component'; import { CloudFoundrySpaceSummaryComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component'; import { CloudFoundrySpaceUserServiceInstancesComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component'; import { CloudFoundrySpaceUsersComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component'; +} from './tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component'; import { CloudFoundryOrganizationSummaryComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component'; +} from './tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component'; import { CloudFoundryOrganizationUsersComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component'; -import { - CloudFoundryOrganizationsComponent, -} from './tabs/cloud-foundry-organizations/cloud-foundry-organizations.component'; -import { CloudFoundryQuotasComponent } from './tabs/cloud-foundry-quotas/cloud-foundry-quotas.component'; -import { CloudFoundryRoutesComponent } from './tabs/cloud-foundry-routes/cloud-foundry-routes.component'; -import { - CloudFoundrySecurityGroupsComponent, -} from './tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component'; -import { CloudFoundryStacksComponent } from './tabs/cloud-foundry-stacks/cloud-foundry-stacks.component'; -import { CloudFoundrySummaryTabComponent } from './tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component'; -import { CloudFoundryUsersComponent } from './tabs/cloud-foundry-users/cloud-foundry-users.component'; +} from './tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component'; +import { CloudFoundryOrganizationsComponent } from './tabs/cf-organizations/cloud-foundry-organizations.component'; +import { CloudFoundryQuotasComponent } from './tabs/cf-quotas/cloud-foundry-quotas.component'; +import { CloudFoundryRoutesComponent } from './tabs/cf-routes/cloud-foundry-routes.component'; +import { CloudFoundrySecurityGroupsComponent } from './tabs/cf-security-groups/cloud-foundry-security-groups.component'; +import { CloudFoundryStacksComponent } from './tabs/cf-stacks/cloud-foundry-stacks.component'; +import { CloudFoundrySummaryTabComponent } from './tabs/cf-summary-tab/cloud-foundry-summary-tab.component'; +import { CloudFoundryUsersComponent } from './tabs/cf-users/cloud-foundry-users.component'; import { InviteUsersComponent } from './users/invite-users/invite-users.component'; import { UsersRolesComponent } from './users/manage-users/manage-users.component'; import { RemoveUserComponent } from './users/remove-user/remove-user.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.ts similarity index 94% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.ts index 716ad78c4a..e1b4af53cb 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/cloud-foundry/cloud-foundry.component.ts @@ -3,9 +3,9 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { first, map } from 'rxjs/operators'; -import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; import { RouterNav } from '../../../../../store/src/actions/router.actions'; +import { CFAppState } from '../../../cf-app-state'; import { CFEndpointsListConfigService, } from '../../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.ts similarity index 94% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.ts index 5a91738c56..9d206f596b 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization-step/edit-organization-step.component.ts @@ -4,11 +4,6 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { filter, map, pairwise, take, tap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; -import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types'; -import { - createEntityRelationPaginationKey, -} from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types'; import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory'; @@ -17,8 +12,11 @@ import { ActionState } from '../../../../../../store/src/reducers/api-request-re import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { APIResource } from '../../../../../../store/src/types/api.types'; import { IOrganization, IOrgQuotaDefinition } from '../../../../cf-api.types'; +import { CFAppState } from '../../../../cf-app-state'; import { cfEntityCatalog } from '../../../../cf-entity-catalog'; import { cfEntityFactory } from '../../../../cf-entity-factory'; +import { organizationEntityType } from '../../../../cf-entity-types'; +import { createEntityRelationPaginationKey } from '../../../../entity-relations/entity-relations.types'; import { CloudFoundryUserProvidedServicesService, } from '../../../../shared/services/cloud-foundry-user-provided-services.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-organization/edit-organization.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts similarity index 93% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts index 3267ef2916..1216c269d4 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; +import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper'; import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component'; import { EditQuotaStepComponent } from './edit-quota-step.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.ts similarity index 88% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.ts index 822c25a51a..01c463628d 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota-step/edit-quota-step.component.ts @@ -4,15 +4,15 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { filter, first, map, pairwise, tap } from 'rxjs/operators'; -import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog'; -import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; -import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { AppState } from '../../../../../../store/src/app-state'; import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types'; import { APIResource } from '../../../../../../store/src/types/api.types'; import { IOrgQuotaDefinition } from '../../../../cf-api.types'; +import { cfEntityCatalog } from '../../../../cf-entity-catalog'; +import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; +import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers'; import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-quota/edit-quota.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts similarity index 93% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts index 052372456f..3b26f9d45b 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts @@ -1,8 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; -import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; +import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper'; import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component'; import { EditSpaceQuotaStepComponent } from './edit-space-quota-step.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts similarity index 89% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts index 30746139e2..8c0123ad3d 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts @@ -4,15 +4,15 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { filter, map, pairwise, tap } from 'rxjs/operators'; -import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog'; -import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; -import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { AppState } from '../../../../../../store/src/app-state'; import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types'; import { APIResource } from '../../../../../../store/src/types/api.types'; import { ISpaceQuotaDefinition } from '../../../../cf-api.types'; +import { cfEntityCatalog } from '../../../../cf-entity-catalog'; +import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; +import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers'; import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space-quota/edit-space-quota.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.ts similarity index 98% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.ts index ab2f460630..b4930646e2 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space-step/edit-space-step.component.ts @@ -5,9 +5,9 @@ import { Store } from '@ngrx/store'; import { Observable, of, Subscription } from 'rxjs'; import { filter, map, pairwise, switchMap, take, tap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component'; import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types'; +import { CFAppState } from '../../../../cf-app-state'; import { cfEntityCatalog } from '../../../../cf-entity-catalog'; import { AddEditSpaceStepBase } from '../../add-edit-space-step-base'; import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/edit-space/edit-space.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-base/quota-definition-base.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.ts similarity index 88% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.ts index d330a31aec..778a19c696 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition-form/quota-definition-form.component.ts @@ -3,13 +3,13 @@ import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from import { Subscription } from 'rxjs'; import { filter, map, tap } from 'rxjs/operators'; -import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog'; -import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; -import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { safeUnsubscribe } from '../../../../../core/src/core/utils.service'; import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory'; import { IQuotaDefinition } from '../../../cf-api.types'; +import { cfEntityCatalog } from '../../../cf-entity-catalog'; +import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types'; +import { ActiveRouteCfOrgSpace } from '../cf-page.types'; +import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers'; export interface QuotaFormValues { name: string; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/quota-definition/quota-definition.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-endpoint.service.ts similarity index 95% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-endpoint.service.ts index eec79aba70..2a26f72b91 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-endpoint.service.ts @@ -3,20 +3,6 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map, publishReplay, refCount } from 'rxjs/operators'; -import { GetAllApplications } from '../../../../../cloud-foundry/src/actions/application.actions'; -import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; -import { - domainEntityType, - organizationEntityType, - privateDomainsEntityType, - quotaDefinitionEntityType, - spaceEntityType, -} from '../../../../../cloud-foundry/src/cf-entity-types'; -import { - createEntityRelationKey, - createEntityRelationPaginationKey, -} from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types'; -import { CfApplicationState } from '../../../../../cloud-foundry/src/store/types/application.types'; import { EntityService } from '../../../../../store/src/entity-service'; import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; @@ -26,13 +12,27 @@ import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-ca import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types'; import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types'; import { PaginatedAction } from '../../../../../store/src/types/pagination.types'; +import { GetAllApplications } from '../../../actions/application.actions'; import { GetAllRoutes } from '../../../actions/route.actions'; import { GetSpaceRoutes } from '../../../actions/space.actions'; import { IApp, ICfV2Info, IOrganization, ISpace } from '../../../cf-api.types'; +import { CFAppState } from '../../../cf-app-state'; import { cfEntityCatalog } from '../../../cf-entity-catalog'; import { cfEntityFactory } from '../../../cf-entity-factory'; +import { + domainEntityType, + organizationEntityType, + privateDomainsEntityType, + quotaDefinitionEntityType, + spaceEntityType, +} from '../../../cf-entity-types'; +import { + createEntityRelationKey, + createEntityRelationPaginationKey, +} from '../../../entity-relations/entity-relations.types'; import { CfUserService } from '../../../shared/data-services/cf-user.service'; import { QParam, QParamJoiners } from '../../../shared/q-param'; +import { CfApplicationState } from '../../../store/types/application.types'; import { ActiveRouteCfOrgSpace } from '../cf-page.types'; import { fetchTotalResults } from '../cf.helpers'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-org-space-quota.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-org-space-quota.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization-quota.ts similarity index 95% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization-quota.ts index 9c3bcbf845..20ddb603d7 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization-quota.ts @@ -1,10 +1,10 @@ import { Observable } from 'rxjs'; -import { organizationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { APIResource } from '../../../../../store/src/types/api.types'; import { StratosStatus } from '../../../../../store/src/types/shared.types'; import { IApp, IOrganization } from '../../../cf-api.types'; +import { organizationEntityType } from '../../../cf-entity-types'; import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers'; import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service'; import { OrgSpaceQuotaHelper } from './cloud-foundry-org-space-quota'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization.service.ts similarity index 98% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization.service.ts index 07848a222f..52db165c63 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-organization.service.ts @@ -4,14 +4,6 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; -import { - domainEntityType, - organizationEntityType, - privateDomainsEntityType, - quotaDefinitionEntityType, - spaceEntityType, -} from '../../../../../cloud-foundry/src/cf-entity-types'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types'; import { @@ -22,7 +14,15 @@ import { ISpace, ISpaceQuotaDefinition, } from '../../../cf-api.types'; +import { CFAppState } from '../../../cf-app-state'; import { cfEntityCatalog } from '../../../cf-entity-catalog'; +import { + domainEntityType, + organizationEntityType, + privateDomainsEntityType, + quotaDefinitionEntityType, + spaceEntityType, +} from '../../../cf-entity-types'; import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers'; import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types'; import { CfUserService } from '../../../shared/data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space-quota.ts similarity index 95% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space-quota.ts index 692fad26d8..e10bbc9337 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space-quota.ts @@ -1,10 +1,10 @@ import { Observable } from 'rxjs'; -import { spaceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { APIResource } from '../../../../../store/src/types/api.types'; import { StratosStatus } from '../../../../../store/src/types/shared.types'; import { IApp, ISpace } from '../../../cf-api.types'; +import { spaceEntityType } from '../../../cf-entity-types'; import { getStartedAppInstanceCount } from '../../../cf.helpers'; import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service'; import { OrgSpaceQuotaHelper } from './cloud-foundry-org-space-quota'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space.service.ts similarity index 98% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space.service.ts index f3faadd465..656508eb2c 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/services/cloud-foundry-space.service.ts @@ -3,7 +3,11 @@ import { Store } from '@ngrx/store'; import { combineLatest, Observable, of } from 'rxjs'; import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; +import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; +import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types'; +import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types'; +import { CFAppState } from '../../../cf-app-state'; +import { cfEntityCatalog } from '../../../cf-entity-catalog'; import { applicationEntityType, routeEntityType, @@ -11,11 +15,7 @@ import { serviceInstancesEntityType, spaceEntityType, spaceQuotaEntityType, -} from '../../../../../cloud-foundry/src/cf-entity-types'; -import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; -import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types'; -import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types'; -import { cfEntityCatalog } from '../../../cf-entity-catalog'; +} from '../../../cf-entity-types'; import { getStartedAppInstanceCount } from '../../../cf.helpers'; import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types'; import { CfUserService } from '../../../shared/data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.ts similarity index 88% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.ts index 5e648aba80..67b37496eb 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition-form/space-quota-definition-form.component.ts @@ -4,13 +4,13 @@ import { ActivatedRoute } from '@angular/router'; import { Observable, Subscription } from 'rxjs'; import { filter, map, tap } from 'rxjs/operators'; -import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog'; -import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; -import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { safeUnsubscribe } from '../../../../../core/src/core/utils.service'; import { endpointEntityType } from '../../../../../store/src/helpers/stratos-entity-factory'; import { IQuotaDefinition } from '../../../cf-api.types'; +import { cfEntityCatalog } from '../../../cf-entity-catalog'; +import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types'; +import { ActiveRouteCfOrgSpace } from '../cf-page.types'; +import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers'; @Component({ diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/space-quota-definition/space-quota-definition.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts similarity index 87% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts index 7cb9cae72d..6a87f4f761 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.ts @@ -3,8 +3,8 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, map, switchMap } from 'rxjs/operators'; -import { GetAllCfUsersAsAdmin } from '../../../../../../cloud-foundry/src/actions/users.actions'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; +import { GetAllCfUsersAsAdmin } from '../../../../actions/users.actions'; +import { CFAppState } from '../../../../cf-app-state'; import { CfUserService } from '../../../../shared/data-services/cf-user.service'; import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; import { waitForCFPermissions } from '../../cf.helpers'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-build-packs/cloud-foundry-build-packs.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-cells/cloud-foundry-cells.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-events/cloud-foundry-events.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-feature-flags/cloud-foundry-feature-flags.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose-formatter.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose-formatter.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose-formatter.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.types.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.types.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.types.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.types.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-invite-user-link/cloud-foundry-invite-user-link.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.ts similarity index 95% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.ts index 00792c21cc..682da43532 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-base/cloud-foundry-organization-base.component.ts @@ -2,8 +2,6 @@ import { Component } from '@angular/core'; import { Observable } from 'rxjs'; import { filter, first, map } from 'rxjs/operators'; -import { organizationEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types'; -import { IOrgFavMetadata } from '../../../../../../../cloud-foundry/src/cf-metadata-types'; import { getActionsFromExtensions, getTabsFromExtensions, @@ -19,6 +17,8 @@ import { EntitySchema } from '../../../../../../../store/src/helpers/entity-sche import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types'; import { getFavoriteFromEntity } from '../../../../../../../store/src/user-favorite-helpers'; import { cfEntityFactory } from '../../../../../cf-entity-factory'; +import { organizationEntityType } from '../../../../../cf-entity-types'; +import { IOrgFavMetadata } from '../../../../../cf-metadata-types'; import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; import { CfUserService } from '../../../../../shared/data-services/cf-user.service'; import { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-events/cloud-foundry-organization-events.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-organization-spaces.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts similarity index 95% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts index e4b352225d..c1cea96630 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts @@ -3,9 +3,6 @@ import { Store } from '@ngrx/store'; import { combineLatest, Observable, of, Subscription } from 'rxjs'; import { first, map, tap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state'; -import { spaceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types'; -import { ISpaceFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types'; import { getActionsFromExtensions, getTabsFromExtensions, @@ -21,7 +18,10 @@ import { RouterNav } from '../../../../../../../../store/src/actions/router.acti import { FavoritesConfigMapper } from '../../../../../../../../store/src/favorite-config-mapper'; import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types'; import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers'; +import { CFAppState } from '../../../../../../cf-app-state'; import { cfEntityFactory } from '../../../../../../cf-entity-factory'; +import { spaceEntityType } from '../../../../../../cf-entity-types'; +import { ISpaceFavMetadata } from '../../../../../../cf-metadata-types'; import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types'; import { CfUserService } from '../../../../../../shared/data-services/cf-user.service'; import { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts similarity index 93% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts index 3e7cbb2f19..0df268c9e1 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts @@ -12,9 +12,7 @@ import { CloudFoundrySpaceServiceMock } from '../../../../../../../../test-frame import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service'; import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service'; import { CfAdminAddUserWarningComponent } from '../../../../cf-admin-add-user-warning/cf-admin-add-user-warning.component'; -import { - CloudFoundryInviteUserLinkComponent, -} from '../../../cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component'; +import { CloudFoundryInviteUserLinkComponent } from '../../../cf-invite-user-link/cloud-foundry-invite-user-link.component'; import { CloudFoundrySpaceUsersComponent } from './cloud-foundry-space-users.component'; describe('CloudFoundrySpaceUsersComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.ts similarity index 97% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.ts index 163a261a4a..2d9867947f 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-summary/cloud-foundry-organization-summary.component.ts @@ -4,12 +4,12 @@ import { Store } from '@ngrx/store'; import { combineLatest, Observable } from 'rxjs'; import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service'; import { RouterNav } from '../../../../../../../store/src/actions/router.actions'; import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog'; import { selectDeletionInfo } from '../../../../../../../store/src/selectors/api.selectors'; +import { CFAppState } from '../../../../../cf-app-state'; import { organizationEntityType } from '../../../../../cf-entity-types'; import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts similarity index 92% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts index 352fc409a2..8c989eab9b 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.spec.ts @@ -10,9 +10,7 @@ import { } from '../../../../../../test-framework/cloud-foundry-organization.service.mock'; import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service'; import { CfAdminAddUserWarningComponent } from '../../cf-admin-add-user-warning/cf-admin-add-user-warning.component'; -import { - CloudFoundryInviteUserLinkComponent, -} from '../cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component'; +import { CloudFoundryInviteUserLinkComponent } from '../cf-invite-user-link/cloud-foundry-invite-user-link.component'; import { CloudFoundryOrganizationUsersComponent } from './cloud-foundry-organization-users.component'; describe('CloudFoundryOrganizationUsersComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cf-organization-users/cloud-foundry-organization-users.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organizations.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-organizations/cloud-foundry-organizations.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts similarity index 71% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts index 45606154a2..75913ddedf 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.spec.ts @@ -1,14 +1,10 @@ import { DatePipe } from '@angular/common'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { - CfOrgsListConfigService, -} from '../../../../../../cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service'; -import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper'; -import { - generateTestCfEndpointServiceProvider, -} from '../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper'; import { TabNavService } from '../../../../../../core/tab-nav.service'; +import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper'; +import { generateTestCfEndpointServiceProvider } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; +import { CfOrgsListConfigService } from '../../../../shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service'; import { CloudFoundryQuotasComponent } from './cloud-foundry-quotas.component'; describe('CloudFoundryQuotasComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-quotas/cloud-foundry-quotas.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-routes/cloud-foundry-routes.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-security-groups/cloud-foundry-security-groups.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-security-groups/cloud-foundry-security-groups.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-stacks/cloud-foundry-stacks.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-stacks/cloud-foundry-stacks.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.ts similarity index 93% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.ts index 6012c16f79..09c6a63b9f 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-summary-tab/cloud-foundry-summary-tab.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-summary-tab/cloud-foundry-summary-tab.component.ts @@ -3,7 +3,7 @@ import { Store } from '@ngrx/store'; import { combineLatest, Observable } from 'rxjs'; import { filter, map, startWith } from 'rxjs/operators'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; +import { CFAppState } from '../../../../cf-app-state'; import { goToAppWall } from '../../cf.helpers'; import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.ts similarity index 84% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.ts index f184bf4ec8..d8f4896ffa 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-users/cloud-foundry-users.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/tabs/cf-users/cloud-foundry-users.component.ts @@ -2,14 +2,12 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; -import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service'; import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types'; +import { CFAppState } from '../../../../cf-app-state'; +import { CfUserListConfigService } from '../../../../shared/components/list/list-types/cf-users/cf-user-list-config.service'; import { CfUserService } from '../../../../shared/data-services/cf-user.service'; import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; -import { - CfUserListConfigService, -} from './../../../../shared/components/list/list-types/cf-users/cf-user-list-config.service'; @Component({ selector: 'app-cloud-foundry-users', diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html similarity index 63% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html index ed13ca63d5..2e9dc254aa 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html +++ b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.html @@ -1,5 +1,7 @@
- +
@@ -15,13 +17,19 @@

- + + - + + -

+ \ No newline at end of file diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts similarity index 98% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts index ba3d856575..638704cc9b 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts @@ -37,6 +37,7 @@ export class UserInviteConfigurationDialogComponent { public connectDelay = 1000; guid: string; + public showSecret = false; constructor( public fb: FormBuilder, diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/user-invite.service.ts similarity index 98% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/user-invites/user-invite.service.ts index 7331193e11..da7ba84675 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/user-invites/user-invite.service.ts @@ -5,12 +5,12 @@ import { Store } from '@ngrx/store'; import { combineLatest, Observable, of as observableOf } from 'rxjs'; import { catchError, filter, map, switchMap } from 'rxjs/operators'; -import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service'; import { environment } from '../../../../../core/src/environments/environment.prod'; import { ConfirmationDialogConfig } from '../../../../../core/src/shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../../../core/src/shared/components/confirmation-dialog.service'; import { stratosEntityCatalog } from '../../../../../store/src/stratos-entity-catalog'; +import { CFAppState } from '../../../cf-app-state'; import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers'; import { ActiveRouteCfOrgSpace } from '../cf-page.types'; import { waitForCFPermissions } from '../cf.helpers'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users-create/invite-users-create.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/invite-users/invite-users.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.ts similarity index 99% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.ts index faa4668b08..db59e58a77 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/cf-roles.service.ts @@ -13,10 +13,6 @@ import { switchMap, } from 'rxjs/operators'; -import { - createEntityRelationKey, - createEntityRelationPaginationKey, -} from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types'; import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service'; import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory'; import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types'; @@ -25,6 +21,10 @@ import { IOrganization, ISpace } from '../../../../cf-api.types'; import { CFAppState } from '../../../../cf-app-state'; import { cfEntityCatalog } from '../../../../cf-entity-catalog'; import { organizationEntityType, spaceEntityType } from '../../../../cf-entity-types'; +import { + createEntityRelationKey, + createEntityRelationPaginationKey, +} from '../../../../entity-relations/entity-relations.types'; import { CfUserService } from '../../../../shared/data-services/cf-user.service'; import { createDefaultOrgRoles, createDefaultSpaceRoles } from '../../../../store/reducers/cf-users-roles.reducer'; import { diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/manage-users-modify.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-modify/space-roles-list-wrapper/space-roles-list-wrapper.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-select/manage-users-select.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-select/manage-users-select.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.spec.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.html b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.html similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.html rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.html diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.scss b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.scss similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.scss rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.scss diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts similarity index 96% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts index 5879a847df..dc025ef094 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.spec.ts @@ -10,7 +10,7 @@ import { TabNavService } from '../../../../../../core/tab-nav.service'; import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CfUserServiceTestProvider } from '../../../../../test-framework/user-service-helper'; import { ActiveRouteCfOrgSpace } from '../../cf-page.types'; -import { CfRolesService } from '../manage-users//cf-roles.service'; +import { CfRolesService } from '../manage-users/cf-roles.service'; import { UsersRolesConfirmComponent } from '../manage-users/manage-users-confirm/manage-users-confirm.component'; import { RemoveUserComponent } from './remove-user.component'; diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts b/src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts similarity index 100% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.ts rename to src/frontend/packages/cloud-foundry/src/features/cf/users/remove-user/remove-user.component.ts diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts index ba66604b3a..0a2e54631b 100644 --- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts +++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.ts @@ -7,7 +7,7 @@ import { CfServicesListConfigService, } from '../../../shared/components/list/list-types/cf-services/cf-services-list-config.service'; import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service'; -import { getActiveRouteCfOrgSpaceProvider } from '../../cloud-foundry/cf.helpers'; +import { getActiveRouteCfOrgSpaceProvider } from '../../cf/cf.helpers'; @Component({ selector: 'app-service-catalog-page', diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts index d3fce2628e..21db362ed1 100644 --- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts +++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts @@ -22,7 +22,7 @@ import { CFAppState } from '../../cf-app-state'; import { cfEntityCatalog } from '../../cf-entity-catalog'; import { organizationEntityType, servicePlanEntityType, spaceEntityType } from '../../cf-entity-types'; import { QParam, QParamJoiners } from '../../shared/q-param'; -import { fetchTotalResults } from '../cloud-foundry/cf.helpers'; +import { fetchTotalResults } from '../cf/cf.helpers'; import { ServicePlanAccessibility } from './services.service'; export const getSvcAvailability = ( diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts index 8cff3346aa..68f6a9d59e 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.spec.ts @@ -12,7 +12,7 @@ import { generateCfBaseTestModulesNoShared, generateTestCfEndpointService, } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { UserInviteService } from '../../../../features/cloud-foundry/user-invites/user-invite.service'; +import { UserInviteService } from '../../../../features/cf/user-invites/user-invite.service'; import { CardCfInfoComponent } from './card-cf-info.component'; describe('CardCfInfoComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts index 89afc74d73..8be8e3f5cb 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts @@ -7,14 +7,11 @@ import { map, tap } from 'rxjs/operators'; import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service'; import { ICfV2Info } from '../../../../cf-api.types'; -import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service'; import { UserInviteConfigurationDialogComponent, -} from '../../../../features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component'; -import { - UserInviteConfigureService, - UserInviteService, -} from '../../../../features/cloud-foundry/user-invites/user-invite.service'; +} from '../../../../features/cf/user-invites/configuration-dialog/user-invite-configuration-dialog.component'; +import { UserInviteConfigureService, UserInviteService } from '../../../../features/cf/user-invites/user-invite.service'; @Component({ selector: 'app-card-cf-info', diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts index 7b9e5540dd..45b086bc37 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts @@ -16,9 +16,7 @@ import { generateTestCfEndpointServiceProvider, } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CloudFoundryOrganizationServiceMock } from '../../../../../test-framework/cloud-foundry-organization.service.mock'; -import { - CloudFoundryOrganizationService, -} from '../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; +import { CloudFoundryOrganizationService } from '../../../../features/cf/services/cloud-foundry-organization.service'; import { CfOrgSpaceDataService } from '../../../data-services/cf-org-space-service.service'; import { CfUserService } from '../../../data-services/cf-user.service'; import { CardCfOrgUserDetailsComponent } from './card-cf-org-user-details.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts index 151fbfb9c4..6fe1eda951 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.ts @@ -1,12 +1,8 @@ import { Component } from '@angular/core'; -import { - CloudFoundryEndpointService, -} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service'; -import { - CloudFoundryOrganizationService, -} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service'; import { CfUserService } from '../../../../../../cloud-foundry/src/shared/data-services/cf-user.service'; +import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service'; +import { CloudFoundryOrganizationService } from '../../../../features/cf/services/cloud-foundry-organization.service'; @Component({ selector: 'app-card-cf-org-user-details', diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts index e05382f2c2..b93ba4295a 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts @@ -16,7 +16,7 @@ import { generateActiveRouteCfOrgSpaceMock, generateCfBaseTestModulesNoShared, } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service'; import { CfUserService } from '../../../data-services/cf-user.service'; import { CardCfRecentAppsComponent } from './card-cf-recent-apps.component'; import { CompactAppCardComponent } from './compact-app-card/compact-app-card.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts index 6edd6010ab..136fc16ee1 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts @@ -4,13 +4,10 @@ import { Observable } from 'rxjs'; import { filter, first, map, tap } from 'rxjs/operators'; import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; -import { - appDataSort, - CloudFoundryEndpointService, -} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service'; import { APIResource } from '../../../../../../store/src/types/api.types'; import { IApp } from '../../../../cf-api.types'; import { cfEntityCatalog } from '../../../../cf-entity-catalog'; +import { appDataSort, CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service'; const RECENT_ITEMS_COUNT = 10; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts index 8054860739..d6655a60b1 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts @@ -7,7 +7,7 @@ import { ApplicationStateIconPipe, } from '../../../../../../../core/src/shared/components/application-state/application-state-icon/application-state-icon.pipe'; import { generateCfBaseTestModulesNoShared } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { ApplicationStateService } from '../../../../services/application-state.service'; import { CompactAppCardComponent } from './compact-app-card.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts index d982f91991..456ba80949 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts @@ -5,9 +5,9 @@ import { map, startWith } from 'rxjs/operators'; import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service'; -import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; import { BREADCRUMB_URL_PARAM } from '../../../../../../../core/src/shared/components/breadcrumbs/breadcrumbs.types'; import { StratosStatus } from '../../../../../../../store/src/types/shared.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { ApplicationStateData, ApplicationStateService } from '../../../../services/application-state.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts index 11aadb41a3..72fc9fc91e 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts @@ -10,7 +10,7 @@ import { MetadataItemComponent } from '../../../../../../core/src/shared/compone import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service'; import { generateCfBaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CloudFoundrySpaceServiceMock } from '../../../../../test-framework/cloud-foundry-space.service.mock'; -import { CloudFoundrySpaceService } from '../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../features/cf/services/cloud-foundry-space.service'; import { CardCfSpaceDetailsComponent } from './card-cf-space-details.component'; describe('CardCfSpaceDetailsComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts index 555865d96e..ab6ed99ffe 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.ts @@ -4,13 +4,11 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; -import { - CloudFoundrySpaceService, -} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service'; import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service'; import { SnackBarService } from '../../../../../../core/src/shared/services/snackbar.service'; import { RouterNav } from '../../../../../../store/src/actions/router.actions'; import { AppState } from '../../../../../../store/src/app-state'; +import { CloudFoundrySpaceService } from '../../../../features/cf/services/cloud-foundry-space.service'; @Component({ selector: 'app-card-cf-space-details', diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts index 3c6ac6c1c6..86ed14b167 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-user-info/card-cf-user-info.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { - CloudFoundryEndpointService, -} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../features/cf/services/cloud-foundry-endpoint.service'; @Component({ selector: 'app-card-cf-user-info', diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts index a1620f3c8e..e7ade5e7bd 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts @@ -7,8 +7,8 @@ import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-m import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CfUserServiceTestProvider } from '../../../../test-framework/user-service-helper'; -import { ActiveRouteCfOrgSpace } from '../../../features/cloud-foundry/cf-page.types'; -import { CfRolesService } from '../../../features/cloud-foundry/users/manage-users/cf-roles.service'; +import { ActiveRouteCfOrgSpace } from '../../../features/cf/cf-page.types'; +import { CfRolesService } from '../../../features/cf/users/manage-users/cf-roles.service'; import { CfRoleCheckboxComponent } from './cf-role-checkbox.component'; describe('CfRoleCheckboxComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts index f2337914c2..a7d949e8dd 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.ts @@ -7,8 +7,8 @@ import { UsersRolesSetOrgRole, UsersRolesSetSpaceRole } from '../../../../../clo import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; import { CfUserRolesSelected } from '../../../../../cloud-foundry/src/store/types/users-roles.types'; import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service'; -import { canUpdateOrgSpaceRoles } from '../../../features/cloud-foundry/cf.helpers'; -import { CfRolesService } from '../../../features/cloud-foundry/users/manage-users/cf-roles.service'; +import { canUpdateOrgSpaceRoles } from '../../../features/cf/cf.helpers'; +import { CfRolesService } from '../../../features/cf/users/manage-users/cf-roles.service'; import { selectCfUsersIsRemove, selectCfUsersIsSetByUsername, diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts index 90b3c30f3f..97f86c96a9 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts @@ -2,8 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper'; -import { ActiveRouteCfOrgSpace } from '../../../features/cloud-foundry/cf-page.types'; -import { CloudFoundryEndpointService } from '../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { ActiveRouteCfOrgSpace } from '../../../features/cf/cf-page.types'; +import { CloudFoundryEndpointService } from '../../../features/cf/services/cloud-foundry-endpoint.service'; import { CfUserService } from '../../data-services/cf-user.service'; import { CfAllEventsConfigService } from '../list/list-types/cf-events/types/cf-all-events-config.service'; import { CloudFoundryEventsListComponent } from './cloud-foundry-events-list.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts index 2753ce8909..a06230eeb0 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts @@ -28,7 +28,7 @@ import { PaginationMonitorFactory } from '../../../../../../../store/src/monitor import { IMetricMatrixResult, IMetrics } from '../../../../../../../store/src/types/base-metric.types'; import { IMetricApplication, MetricQueryType } from '../../../../../../../store/src/types/metric.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; -import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers'; +import { CfCellHelper } from '../../../../../features/cf/cf-cell.helpers'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { ListAppInstance } from './app-instance-types'; import { CfAppInstancesDataSource } from './cf-app-instances-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts index 50fb563f34..23b66083dc 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts @@ -22,7 +22,7 @@ import { cfEntityCatalog } from '../../../../../../cf-entity-catalog'; import { cfEntityFactory } from '../../../../../../cf-entity-factory'; import { serviceBindingEntityType } from '../../../../../../cf-entity-types'; import { ApplicationService } from '../../../../../../features/applications/application.service'; -import { isUserProvidedServiceInstance } from '../../../../../../features/cloud-foundry/cf.helpers'; +import { isUserProvidedServiceInstance } from '../../../../../../features/cf/cf.helpers'; import { getServiceBrokerName, getServiceName, diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts index 2d39cd38df..5197f7db8b 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts @@ -21,7 +21,7 @@ import { RouterNav } from '../../../../../../../store/src/actions/router.actions import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IServiceBinding } from '../../../../../cf-api-svc.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; -import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers'; +import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cf/cf.helpers'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service'; import { CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts index 0e4e9e1269..137f9073dd 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts @@ -5,6 +5,7 @@ import { tag } from 'rxjs-spy/operators/tag'; import { debounceTime, delay, distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators'; import { GetAllApplications } from '../../../../../../../cloud-foundry/src/actions/application.actions'; +import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; import { applicationEntityType, organizationEntityType, @@ -27,10 +28,9 @@ import { APIResource } from '../../../../../../../store/src/types/api.types'; import { PaginationParam } from '../../../../../../../store/src/types/pagination.types'; import { cfEntityCatalog } from '../../../../../cf-entity-catalog'; import { cfEntityFactory } from '../../../../../cf-entity-factory'; -import { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers'; +import { cfOrgSpaceFilter } from '../../../../../features/cf/cf.helpers'; import { CFListDataSource } from '../../../../cf-list-data-source'; import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service'; -import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; export class CfAppsDataSource extends CFListDataSource { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts index bc239c35ee..b5c46666f8 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.spec.ts @@ -1,7 +1,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfBuildpacksListConfigService } from './cf-buildpacks-list-config.service'; describe('CfBuildpacksListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts index 779c9cbcad..911eb5a927 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts @@ -5,7 +5,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state' import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IBuildpack } from '../../../../../cf-api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfBuildpackCardComponent } from './cf-buildpack-card/cf-buildpack-card.component'; import { CfBuildpacksDataSource } from './cf-buildpacks-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts index 6d4c6d7b02..7cdbeb0e4a 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts @@ -7,7 +7,7 @@ import { ListViewTypes } from '../../../../../../../core/src/shared/components/l import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IApp, ISpace } from '../../../../../cf-api.types'; -import { ActiveRouteCfCell } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfCell } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfCellApp, CfCellAppsDataSource } from './cf-cell-apps-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts index 86bb2ee270..51e4e54f65 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts @@ -17,10 +17,10 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory'; import { FetchCFCellMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions'; import { CFAppState } from '../../../../../cf-app-state'; -import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers'; +import { CfCellHelper } from '../../../../../features/cf/cf-cell.helpers'; import { CloudFoundryCellService, -} from '../../../../../features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service'; +} from '../../../../../features/cf/tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts index 019ab20631..783f2b148f 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts @@ -17,8 +17,8 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory'; import { IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types'; import { IMetricCell } from '../../../../../../../store/src/types/metric.types'; -import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers'; -import { ActiveRouteCfCell } from '../../../../../features/cloud-foundry/cf-page.types'; +import { CfCellHelper } from '../../../../../features/cf/cf-cell.helpers'; +import { ActiveRouteCfCell } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfCellsDataSource } from './cf-cells-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts index c1a013b7a4..5e5667be57 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-all-events-config.service.ts @@ -4,9 +4,7 @@ import { Store } from '@ngrx/store'; import { IListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { CFAppState } from '../../../../../../cf-app-state'; -import { - CloudFoundryEndpointService, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service'; import { CfEventsConfigService } from '../cf-events-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts index 0897130e93..087cc0e4bc 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-org-events-config.service.ts @@ -4,9 +4,7 @@ import { Store } from '@ngrx/store'; import { IListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { CFAppState } from '../../../../../../cf-app-state'; -import { - CloudFoundryOrganizationService, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; +import { CloudFoundryOrganizationService } from '../../../../../../features/cf/services/cloud-foundry-organization.service'; import { CfEventsConfigService } from '../cf-events-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts index e792419597..c665577e32 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/types/cf-space-events-config.service.ts @@ -4,7 +4,7 @@ import { Store } from '@ngrx/store'; import { IListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { CFAppState } from '../../../../../../cf-app-state'; -import { CloudFoundrySpaceService } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../../features/cf/services/cloud-foundry-space.service'; import { CfEventsConfigService } from '../cf-events-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts index be0423ce3a..8349afd1ca 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.spec.ts @@ -1,7 +1,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfFeatureFlagsListConfigService } from './cf-feature-flags-list-config.service'; describe('CfFeatureFlagsListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts index f943e373ad..e332ca154d 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts @@ -6,7 +6,7 @@ import { ITableColumn } from '../../../../../../../core/src/shared/components/li import { IListFilter, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types'; import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { IFeatureFlag } from '../../../../../cf-api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfFeatureFlagsDataSource } from './cf-feature-flags-data-source'; import { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts index 10944e2dd7..361466c74f 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts @@ -11,12 +11,10 @@ import { import { CloudFoundryOrganizationServiceMock, } from '../../../../../../test-framework/cloud-foundry-organization.service.mock'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; -import { - CloudFoundryOrganizationService, -} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; -import { UserInviteService } from '../../../../../features/cloud-foundry/user-invites/user-invite.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service'; +import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service'; +import { UserInviteService } from '../../../../../features/cf/user-invites/user-invite.service'; import { CfOrgUsersListConfigService } from './cf-org-users-list-config.service'; describe('CfOrgUsersListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts index 4d125e2cca..5a49886ad2 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.ts @@ -6,10 +6,8 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state' import { CurrentUserPermissionsService, } from '../../../../../../../core/src/core/permissions/current-user-permissions.service'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { - CloudFoundryOrganizationService, -} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service'; import { CfUser } from '../../../../../store/types/cf-user.types'; import { CfUserService } from '../../../../data-services/cf-user.service'; import { CfUserListConfigService } from '../cf-users/cf-user-list-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts index f7e4ff459b..fee067f62f 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts @@ -25,14 +25,10 @@ import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-fa import { IApp, IOrganization } from '../../../../../../cf-api.types'; import { cfEntityFactory } from '../../../../../../cf-entity-factory'; import { getStartedAppInstanceCount } from '../../../../../../cf.helpers'; -import { getOrgRolesString } from '../../../../../../features/cloud-foundry/cf.helpers'; -import { - CloudFoundryEndpointService, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; -import { OrgQuotaHelper } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization-quota'; -import { - createOrgQuotaDefinition, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; +import { getOrgRolesString } from '../../../../../../features/cf/cf.helpers'; +import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service'; +import { OrgQuotaHelper } from '../../../../../../features/cf/services/cloud-foundry-organization-quota'; +import { createOrgQuotaDefinition } from '../../../../../../features/cf/services/cloud-foundry-organization.service'; import { createUserRoleInOrg } from '../../../../../../store/types/cf-user.types'; import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers'; import { CfUserService } from '../../../../../data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts index f0c23e0d95..86c11ed8c3 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts @@ -9,7 +9,7 @@ import { import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { cfEntityFactory } from '../../../../../cf-entity-factory'; -import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service'; export class CfOrgsDataSourceService extends ListDataSource { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts index 4ab0ef44aa..3986f60290 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts @@ -5,7 +5,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state' import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IOrganization } from '../../../../../cf-api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfOrgCardComponent } from './cf-org-card/cf-org-card.component'; import { CfOrgsDataSourceService } from './cf-orgs-data-source.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts index d4e001d8aa..448a927339 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts @@ -5,7 +5,6 @@ import { Observable, Subscription } from 'rxjs'; import { DeleteQuotaDefinition } from '../../../../../../../cloud-foundry/src/actions/quota-definitions.actions'; import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; -import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; import { BaseCfListConfig, } from '../../../../../../../cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config'; @@ -19,6 +18,7 @@ import { IListAction, ListViewTypes } from '../../../../../../../core/src/shared import { RouterNav } from '../../../../../../../store/src/actions/router.actions'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IQuotaDefinition } from '../../../../../cf-api.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { CfQuotasDataSourceService } from './cf-quotas-data-source.service'; import { TableCellQuotaComponent } from './table-cell-quota/table-cell-quota.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts index f176f59556..ae52336a7e 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts @@ -23,7 +23,7 @@ import { IRoute } from '../../../../../cf-api.types'; import { cfEntityFactory } from '../../../../../cf-entity-factory'; import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; import { getRoute, isTCPRoute } from '../../../../../features/applications/routes/routes.helper'; -import { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers'; +import { cfOrgSpaceFilter } from '../../../../../features/cf/cf.helpers'; import { CFListDataSource } from '../../../../cf-list-data-source'; import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts index 9767322990..f800809ecf 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config.service.ts @@ -14,7 +14,7 @@ import { IListMultiFilterConfig, } from '../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { CfOrgSpaceDataService, diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts index 9ac357c8b7..a63b3659e7 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts @@ -5,7 +5,7 @@ import { generateCfBaseTestModulesNoShared, } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CloudFoundrySpaceServiceMock } from '../../../../../../../test-framework/cloud-foundry-space.service.mock'; -import { CloudFoundrySpaceService } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../../features/cf/services/cloud-foundry-space.service'; import { TableCellRouteAppsAttachedComponent } from './table-cell-route-apps-attached.component'; describe('TableCellRouteAppsAttachedComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts index 434dd70394..78c76495df 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.spec.ts @@ -9,7 +9,7 @@ import { generateCfBaseTestModulesNoShared, generateTestCfEndpointService, } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types'; import { CfSecurityGroupsCardComponent } from './cf-security-groups-card.component'; describe('CfSecurityGroupsCardComponent', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts index a93e2e1137..3b3853c13f 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts @@ -4,9 +4,7 @@ import { AppChip } from '../../../../../../../../core/src/shared/components/chip import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types'; import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { IRule, IRuleType, ISpace } from '../../../../../../cf-api.types'; -import { - CloudFoundryEndpointService, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service'; @Component({ selector: 'app-cf-security-groups-card', diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts index a4f651e5f1..0e54db9f11 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.spec.ts @@ -1,7 +1,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfSecurityGroupsListConfigService } from './cf-security-groups-list-config.service'; describe('CfSecurityGroupsListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts index 6dc824717b..8a95b10189 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-list-config.service.ts @@ -4,7 +4,7 @@ import { Store } from '@ngrx/store'; import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfSecurityGroupsCardComponent } from './cf-security-groups-card/cf-security-groups-card.component'; import { CfSecurityGroupsDataSource } from './cf-security-groups-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts index 10ee7b1abb..9e074d09d6 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts @@ -22,8 +22,8 @@ import { PaginationMonitor } from '../../../../../../../store/src/monitors/pagin import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { waitForCFPermissions } from '../../../../../features/cloud-foundry/cf.helpers'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { waitForCFPermissions } from '../../../../../features/cf/cf.helpers'; import { CfUser, CfUserMissingRoles } from '../../../../../store/types/cf-user.types'; import { CfUserService } from '../../../../data-services/cf-user.service'; import { CfSelectUsersDataSourceService } from './cf-select-users-data-source.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts index b1ecf9ef80..2ed4424106 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts @@ -21,7 +21,7 @@ import { import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IServiceInstance } from '../../../../../cf-api-svc.types'; -import { isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers'; +import { isUserProvidedServiceInstance } from '../../../../../features/cf/cf.helpers'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service'; import { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM, CSI_CANCEL_URL } from '../../../add-service-instance/csi-mode.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts index 78df4dfe9b..32f9fd4c6b 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.spec.ts @@ -1,7 +1,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfServicesListConfigService } from './cf-services-list-config.service'; describe('CfServicesListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts index 90fdcad893..13e12ea854 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts @@ -14,8 +14,8 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { connectedEndpointsOfTypesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { haveMultiConnectedCfs } from '../../../../../features/cloud-foundry/cf.helpers'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { haveMultiConnectedCfs } from '../../../../../features/cf/cf.helpers'; import { CfOrgSpaceItem, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service'; import { CfServiceCardComponent } from './cf-service-card/cf-service-card.component'; import { CfServicesDataSource } from './cf-services-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts index 4a9ee537ec..f66bdff76a 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts @@ -21,7 +21,7 @@ import { import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IUserProvidedServiceInstance } from '../../../../../cf-api-svc.types'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service'; import { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts index b858a197ed..de8d5b25d0 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts @@ -13,7 +13,7 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis import { APIResource } from '../../../../../../../store/src/types/api.types'; import { cfEntityCatalog } from '../../../../../cf-entity-catalog'; import { cfEntityFactory } from '../../../../../cf-entity-factory'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; export class CfSpaceAppsDataSource extends ListDataSource { constructor(store: Store, cfSpaceService: CloudFoundrySpaceService, listConfig?: IListConfig) { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts index 81ce704340..07ea411246 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts @@ -3,7 +3,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { CfSpaceAppsListConfigService } from './cf-space-apps-list-config.service'; describe('CfSpaceAppsListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts index 60065a1ebb..0140384461 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts @@ -18,7 +18,7 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types'; import { IApp } from '../../../../../cf-api.types'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { TableCellAppNameComponent } from '../app/table-cell-app-name/table-cell-app-name.component'; import { TableCellAppStatusComponent } from '../app/table-cell-app-status/table-cell-app-status.component'; import { CfSpaceAppsDataSource } from './cf-space-apps-data-source.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts index fd78c9a3fd..69350aed0c 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts @@ -15,7 +15,7 @@ import { APIResource } from '../../../../../../../store/src/types/api.types'; import { DeleteSpaceQuotaDefinition } from '../../../../../actions/quota-definitions.actions'; import { IQuotaDefinition } from '../../../../../cf-api.types'; import { CFAppState } from '../../../../../cf-app-state'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { QUOTA_FROM_LIST } from '../cf-quotas/cf-quotas-list-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts index 7f8531ebd3..1819bf3f93 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts @@ -3,7 +3,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { CfSpaceRoutesListConfigService } from './cf-space-routes-list-config.service'; describe('CfSpaceRoutesListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts index 0090a576fb..9a54d91cdc 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.ts @@ -10,7 +10,7 @@ import { import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service'; import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { CfCurrentUserPermissions } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { CfRoutesListConfigBase } from '../cf-routes/cf-routes-list-config-base'; import { CfSpaceRoutesDataSource } from './cf-space-routes-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts index 17b9e153bf..ab5cf5744e 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts @@ -6,13 +6,11 @@ import { CloudFoundryOrganizationServiceMock, } from '../../../../../../test-framework/cloud-foundry-organization.service.mock'; import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; -import { - CloudFoundryOrganizationService, -} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; -import { UserInviteService } from '../../../../../features/cloud-foundry/user-invites/user-invite.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { CloudFoundryEndpointService } from '../../../../../features/cf/services/cloud-foundry-endpoint.service'; +import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; +import { UserInviteService } from '../../../../../features/cf/user-invites/user-invite.service'; import { CfUserService } from '../../../../data-services/cf-user.service'; import { CfSpaceUsersListConfigService } from './cf-space-users-list-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts index 0484f50f82..84ce162b93 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.ts @@ -6,11 +6,9 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state' import { CurrentUserPermissionsService, } from '../../../../../../../core/src/core/permissions/current-user-permissions.service'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { - CloudFoundryOrganizationService, -} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { CfUser } from '../../../../../store/types/cf-user.types'; import { CfUserService } from '../../../../data-services/cf-user.service'; import { CfUserListConfigService } from '../cf-users/cf-user-list-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts index f747341abe..61361c6697 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts @@ -9,7 +9,7 @@ import { import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { IServiceInstance } from '../../../../../cf-api-svc.types'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service'; import { CfServiceInstancesListConfigBase } from '../cf-services/cf-service-instances-list-config.base'; import { CfSpacesServiceInstancesDataSource } from './cf-spaces-service-instances-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts index f780e7ce4d..6f137e7428 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts @@ -13,9 +13,7 @@ import { generateTestCfEndpointServiceProvider, generateTestCfUserServiceProvider, } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { - CloudFoundryOrganizationService, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; +import { CloudFoundryOrganizationService } from '../../../../../../features/cf/services/cloud-foundry-organization.service'; import { CfOrgSpaceDataService } from '../../../../../data-services/cf-org-space-service.service'; import { CloudFoundryUserProvidedServicesService, diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts index 322d4bc454..784692eab6 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts @@ -27,15 +27,13 @@ import { IApp, ISpace } from '../../../../../../cf-api.types'; import { cfEntityFactory } from '../../../../../../cf-entity-factory'; import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types'; import { getStartedAppInstanceCount } from '../../../../../../cf.helpers'; -import { getSpaceRolesString } from '../../../../../../features/cloud-foundry/cf.helpers'; -import { - CloudFoundryEndpointService, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; +import { getSpaceRolesString } from '../../../../../../features/cf/cf.helpers'; +import { CloudFoundryEndpointService } from '../../../../../../features/cf/services/cloud-foundry-endpoint.service'; import { CloudFoundryOrganizationService, createSpaceQuotaDefinition, -} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; -import { SpaceQuotaHelper } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space-quota'; +} from '../../../../../../features/cf/services/cloud-foundry-organization.service'; +import { SpaceQuotaHelper } from '../../../../../../features/cf/services/cloud-foundry-space-quota'; import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers'; import { CfUserService } from '../../../../../data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts index 4571a58385..5af34c8602 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts @@ -7,9 +7,7 @@ import { IListConfig, ListViewTypes } from '../../../../../../../core/src/shared import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { ISpace } from '../../../../../cf-api.types'; -import { - CloudFoundryOrganizationService, -} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; +import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service'; import { CfSpaceCardComponent } from './cf-space-card/cf-space-card.component'; import { CfSpacesDataSourceService } from './cf-spaces-data-source.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts index f037cfcc5f..3d9c00c8d7 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.spec.ts @@ -1,7 +1,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { CfStacksListConfigService } from './cf-stacks-list-config.service'; describe('CfStacksListConfigService', () => { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts index 4e89132e0f..1601fd041c 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-list-config.service.ts @@ -4,7 +4,7 @@ import { Store } from '@ngrx/store'; import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types'; import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; import { CfStacksCardComponent } from './cf-stacks-card/cf-stacks-card.component'; import { CfStacksDataSource } from './cf-stacks-data-source'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts index 83128b8b1c..b7e9a14566 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts @@ -19,7 +19,7 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis import { APIResource } from '../../../../../../../store/src/types/api.types'; import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types'; import { ISpace } from '../../../../../cf-api.types'; -import { CfRolesService } from '../../../../../features/cloud-foundry/users/manage-users/cf-roles.service'; +import { CfRolesService } from '../../../../../features/cf/users/manage-users/cf-roles.service'; export class CfUsersSpaceRolesDataSourceService extends ListDataSource> { diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts index 7fe7843b9a..b6130d172c 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts @@ -9,8 +9,8 @@ import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CfUserServiceTestProvider } from '../../../../../../../test-framework/user-service-helper'; import { ISpace } from '../../../../../../cf-api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types'; -import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types'; +import { CfRolesService } from '../../../../../../features/cf/users/manage-users/cf-roles.service'; import { CfRoleCheckboxComponent } from '../../../../cf-role-checkbox/cf-role-checkbox.component'; import { TableCellRoleOrgSpaceComponent } from './table-cell-org-space-role.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts index cd24bca07c..6990244c14 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts @@ -7,8 +7,8 @@ import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory'; import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CfUserServiceTestProvider } from '../../../../../../../test-framework/user-service-helper'; -import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types'; -import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types'; +import { CfRolesService } from '../../../../../../features/cf/users/manage-users/cf-roles.service'; import { CfUserService } from '../../../../../data-services/cf-user.service'; import { TableCellSelectOrgComponent } from './table-cell-select-org.component'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts index 4d11410056..1af855c8b6 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts @@ -8,8 +8,8 @@ import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-sta import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types'; import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { IOrganization } from '../../../../../../cf-api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types'; -import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../../features/cf/cf-page.types'; +import { CfRolesService } from '../../../../../../features/cf/users/manage-users/cf-roles.service'; import { selectCfUsersRolesOrgGuid } from '../../../../../../store/selectors/cf-users-roles.selector'; @Component({ diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts index 76825b3388..05653c251e 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts @@ -16,7 +16,7 @@ import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/ import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { IOrganization } from '../../../../../../cf-api.types'; import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types'; -import { getOrgRoles } from '../../../../../../features/cloud-foundry/cf.helpers'; +import { getOrgRoles } from '../../../../../../features/cf/cf.helpers'; import { CfUser, IUserPermissionInOrg, OrgUserRoleNames } from '../../../../../../store/types/cf-user.types'; import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers'; import { CfUserService } from '../../../../../data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts index 7c325a8325..458162a84b 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts @@ -1,4 +1,4 @@ -import { Input, Directive } from '@angular/core'; +import { Directive, Input } from '@angular/core'; import { Store } from '@ngrx/store'; import { BehaviorSubject, Observable, of as observableOf } from 'rxjs'; import { filter, first, map, switchMap } from 'rxjs/operators'; @@ -11,7 +11,7 @@ import { ConfirmationDialogService } from '../../../../../../../core/src/shared/ import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types'; import { selectSessionData } from '../../../../../../../store/src/reducers/auth.reducer'; import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { IUserRole } from '../../../../../features/cloud-foundry/cf.helpers'; +import { IUserRole } from '../../../../../features/cf/cf.helpers'; import { CfUser } from '../../../../../store/types/cf-user.types'; import { CfUserService } from '../../../../data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts index 6aa867410f..ba82dc8bb6 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts @@ -16,7 +16,7 @@ import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/ import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { IOrganization, ISpace } from '../../../../../../cf-api.types'; import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types'; -import { getSpaceRoles } from '../../../../../../features/cloud-foundry/cf.helpers'; +import { getSpaceRoles } from '../../../../../../features/cf/cf.helpers'; import { CfUser, IUserPermissionInSpace, SpaceUserRoleNames } from '../../../../../../store/types/cf-user.types'; import { CfCurrentUserPermissions } from '../../../../../../user-permissions/cf-user-permissions-checkers'; import { CfUserService } from '../../../../../data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts index 19f56eb01a..9e35b16f7b 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts @@ -14,11 +14,9 @@ import { CloudFoundryOrganizationServiceMock, } from '../../../../../../test-framework/cloud-foundry-organization.service.mock'; import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; -import { - CloudFoundryOrganizationService, -} from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; -import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; +import { CloudFoundryOrganizationService } from '../../../../../features/cf/services/cloud-foundry-organization.service'; +import { CloudFoundrySpaceService } from '../../../../../features/cf/services/cloud-foundry-space.service'; import { CfUserService } from '../../../../data-services/cf-user.service'; import { CfUserListConfigService } from './cf-user-list-config.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts index 23f7f500b9..143a4c32e6 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts @@ -23,7 +23,7 @@ import { selectPaginationState } from '../../../../../../../store/src/selectors/ import { APIResource, EntityInfo } from '../../../../../../../store/src/types/api.types'; import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types'; import { IOrganization, ISpace } from '../../../../../cf-api.types'; -import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../../../features/cf/cf-page.types'; import { canUpdateOrgSpaceRoles, createCfOrgSpaceSteppersUrl, @@ -32,7 +32,7 @@ import { hasRoleWithinSpace, hasSpaceRoleWithinOrg, waitForCFPermissions, -} from '../../../../../features/cloud-foundry/cf.helpers'; +} from '../../../../../features/cf/cf.helpers'; import { CfUser } from '../../../../../store/types/cf-user.types'; import { CfUserPermissionsChecker } from '../../../../../user-permissions/cf-user-permissions-checkers'; import { CfUserService } from './../../../../data-services/cf-user.service'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts index 0f597ef543..2c76635469 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-list-config.service.ts @@ -22,7 +22,7 @@ import { ListViewTypes, } from '../../../../../../../core/src/shared/components/list/list.component.types'; import { ListView } from '../../../../../../../store/src/actions/list.actions'; -import { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers'; +import { cfOrgSpaceFilter } from '../../../../../features/cf/cf.helpers'; import { CfOrgSpaceDataService, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service'; import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service'; import { CfServiceInstancesListConfigBase } from '../cf-services/cf-service-instances-list-config.base'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts index e797eab3c8..01e167c8e2 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts @@ -23,7 +23,7 @@ import { PaginatedAction } from '../../../../store/src/types/pagination.types'; import { IOrganization, ISpace } from '../../cf-api.types'; import { cfEntityCatalog } from '../../cf-entity-catalog'; import { cfEntityFactory } from '../../cf-entity-factory'; -import { ActiveRouteCfOrgSpace } from '../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../features/cf/cf-page.types'; import { fetchTotalResults, filterEntitiesByGuid, @@ -35,7 +35,7 @@ import { isSpaceDeveloper, isSpaceManager, waitForCFPermissions, -} from '../../features/cloud-foundry/cf.helpers'; +} from '../../features/cf/cf.helpers'; import { selectCfPaginationState } from '../../store/selectors/pagination.selectors'; import { CfUser, diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts index 51a8e0ee13..c8ec0fdd99 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts @@ -14,7 +14,7 @@ import { SharedModule } from '../../../../../core/src/shared/shared.module'; import { CoreTestingModule } from '../../../../../core/test-framework/core-test.modules'; import { AppStoreModule } from '../../../../../store/src/store.module'; import { CFAppState } from '../../../cf-app-state'; -import { ActiveRouteCfOrgSpace } from '../../../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../../../features/cf/cf-page.types'; import { CfUserService } from '../../data-services/cf-user.service'; import { AppNameUniqueDirective } from './app-name-unique.directive'; diff --git a/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts index 283767d5f4..8e6406738f 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/directives/cf-user-permission/cf-user-permission.directive.ts @@ -5,7 +5,7 @@ import { switchMap } from 'rxjs/operators'; import { CurrentUserPermissionsService } from '../../../../../core/src/core/permissions/current-user-permissions.service'; import { AppState } from '../../../../../store/src/app-state'; -import { waitForCFPermissions } from '../../../features/cloud-foundry/cf.helpers'; +import { waitForCFPermissions } from '../../../features/cf/cf.helpers'; import { CfCurrentUserPermissions } from '../../../user-permissions/cf-user-permissions-checkers'; @Directive({ diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts index 36c9cb2e38..7fb63eafc2 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts @@ -10,7 +10,7 @@ import { EndpointModel } from '../../../../store/src/types/endpoint.types'; import { IOrganization, ISpace } from '../../cf-api.types'; import { CFAppState } from '../../cf-app-state'; import { organizationEntityType, spaceEntityType } from '../../cf-entity-types'; -import { haveMultiConnectedCfs } from '../../features/cloud-foundry/cf.helpers'; +import { haveMultiConnectedCfs } from '../../features/cf/cf.helpers'; import { selectCfEntity } from '../../store/selectors/api.selectors'; export class CfOrgSpaceLabelService { diff --git a/src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts index a90fbb0a94..3ebc0e70b6 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts @@ -17,7 +17,7 @@ import { CFAppState } from '../../cf-app-state'; import { cfEntityCatalog } from '../../cf-entity-catalog'; import { organizationEntityType, spaceEntityType } from '../../cf-entity-types'; import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types'; -import { fetchTotalResults } from '../../features/cloud-foundry/cf.helpers'; +import { fetchTotalResults } from '../../features/cf/cf.helpers'; import { QParam, QParamJoiners } from '../q-param'; diff --git a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts index 700bf7c0a7..0d49b902db 100644 --- a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts +++ b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { EffectsModule } from '@ngrx/effects'; -import { ActiveRouteCfOrgSpace } from '../features/cloud-foundry/cf-page.types'; +import { ActiveRouteCfOrgSpace } from '../features/cf/cf-page.types'; import { CloudFoundryReducersModule } from './cloud-foundry.reducers.module'; import { AppVariablesEffect } from './effects/app-variables.effects'; import { AppEffects } from './effects/app.effects'; diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts index 7ed0d48c09..c75fb997b0 100644 --- a/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts +++ b/src/frontend/packages/cloud-foundry/src/store/effects/users-roles.effects.ts @@ -4,7 +4,7 @@ import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { ManageUsersSetUsernamesHelper, -} from 'frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component'; +} from 'frontend/packages/cloud-foundry/src/features/cf/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component'; import { combineLatest as observableCombineLatest, combineLatest, Observable, of as observableOf, of } from 'rxjs'; import { catchError, filter, first, map, mergeMap, pairwise, switchMap, tap, withLatestFrom } from 'rxjs/operators'; diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts index 3fc7ed40e9..7a99f5dd9b 100644 --- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts +++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts @@ -14,12 +14,9 @@ import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-mo import { appReducers } from '../../store/src/reducers.module'; import { CFAppState } from '../src/cf-app-state'; import { CloudFoundryTestingModule } from '../src/cloud-foundry-test.module'; -import { ActiveRouteCfOrgSpace } from '../src/features/cloud-foundry/cf-page.types'; -import { CloudFoundryEndpointService } from '../src/features/cloud-foundry/services/cloud-foundry-endpoint.service'; -import { - UserInviteConfigureService, - UserInviteService, -} from '../src/features/cloud-foundry/user-invites/user-invite.service'; +import { ActiveRouteCfOrgSpace } from '../src/features/cf/cf-page.types'; +import { CloudFoundryEndpointService } from '../src/features/cf/services/cloud-foundry-endpoint.service'; +import { UserInviteConfigureService, UserInviteService } from '../src/features/cf/user-invites/user-invite.service'; import { CfOrgSpaceDataService } from '../src/shared/data-services/cf-org-space-service.service'; import { CfUserService } from '../src/shared/data-services/cf-user.service'; import { CloudFoundryService } from '../src/shared/data-services/cloud-foundry.service'; diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts index 385bf3b793..37e33ce7bd 100644 --- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts +++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts @@ -1,6 +1,6 @@ import { Observable, of as observableOf } from 'rxjs'; -import { CloudFoundrySpaceService } from '../src/features/cloud-foundry/services/cloud-foundry-space.service'; +import { CloudFoundrySpaceService } from '../src/features/cf/services/cloud-foundry-space.service'; export class CloudFoundrySpaceServiceMock { diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html index fe95b7a420..234764c826 100644 --- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html +++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html @@ -22,7 +22,11 @@

Advanced Information (Optional)

+ placeholder="Client Secret" [type]="!show ? 'password' : 'text'"> +
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts index 96bca56f21..a1aaf71d57 100644 --- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts +++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts @@ -51,6 +51,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten endpointTypeSupportsSSO = false; endpoint: StratosCatalogEndpointEntity; + show = false; constructor( activatedRoute: ActivatedRoute, diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html index fd059d3a3d..f58d96c145 100644 --- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html +++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.html @@ -15,14 +15,20 @@

{{definition.label}} Information

Advanced Information (Optional)

- Update Client ID and Client Secret - + Update Client ID and Client Secret + + Client ID is required - + +
@@ -36,4 +42,4 @@

Advanced Information (Optional)

- + \ No newline at end of file diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts index cb6120b12e..e447f535f7 100644 --- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts +++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts @@ -42,6 +42,7 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep { existingEndpointNames$: Observable; formChangeSub: Subscription; setClientInfo = false; + show = false; constructor( activatedRoute: ActivatedRoute, diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html index 8eab0cb6ab..21b3273bdf 100644 --- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html +++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html @@ -20,7 +20,12 @@

{{title}} Setup with Cloud Foundry UAA

- + +

Enter the username and password of an admin user (this is used to @@ -31,7 +36,12 @@

{{title}} Setup with Cloud Foundry UAA

- + + diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts index d1e360bfa5..677d623ea1 100644 --- a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts +++ b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts @@ -1,16 +1,16 @@ -import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core'; +import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Store } from '@ngrx/store'; import { BehaviorSubject, Observable } from 'rxjs'; import { delay, filter, map, skipWhile, take } from 'rxjs/operators'; import { VerifySession } from '../../../../../store/src/actions/auth.actions'; +import { SetupConsoleGetScopes, SetupSaveConfig } from '../../../../../store/src/actions/setup.actions'; import { InternalAppState } from '../../../../../store/src/app-state'; import { AuthState } from '../../../../../store/src/reducers/auth.reducer'; import { UAASetupState } from '../../../../../store/src/types/uaa-setup.types'; -import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; -import { SetupConsoleGetScopes, SetupSaveConfig } from '../../../../../store/src/actions/setup.actions'; import { APP_TITLE } from '../../../core/core.types'; +import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; import { getSSOClientRedirectURI } from '../../endpoints/endpoint-helpers'; @Component({ @@ -35,6 +35,9 @@ export class ConsoleUaaWizardComponent implements OnInit { selectedScope = ''; applyingSetup$ = new BehaviorSubject(false); + public show = false; + public showPassword = false; + uaaFormNext: StepOnNextFunction = () => { this.store.dispatch(new SetupConsoleGetScopes({ uaa_endpoint: this.uaaForm.get('apiUrl').value, diff --git a/src/frontend/packages/devkit/build.js b/src/frontend/packages/devkit/build.js new file mode 100644 index 0000000000..7bbcf1dba5 --- /dev/null +++ b/src/frontend/packages/devkit/build.js @@ -0,0 +1,27 @@ +// Copy extra files needed as part of the devkit build +// Implemented as a single script here so that it works on Windows, Linux and Mac + +const path = require('path'); +const fs = require('fs-extra'); + +console.log('Copying devkit files'); + +// __dirname is the folder where build.js is located +const STRATOS_DIR= path.resolve(__dirname, '..', '..', '..', '..'); +const DEVKIT_DIST_DIR= path.join(STRATOS_DIR, 'dist-devkit'); + +let err = fs.copySync(path.join(__dirname, 'package.json'), path.join(DEVKIT_DIST_DIR, 'package.json')); +if (err) { + console.log(err); +} +err =fs.copySync(path.join(__dirname, 'src'), path.join(DEVKIT_DIST_DIR), { + overwrite: true, + dereference: true, + preserveTimestamps: true, + filter: function(file) { + return !file.endsWith('.ts'); + } +}); +if (err) { + console.log(err); +} diff --git a/src/frontend/packages/devkit/build.sh b/src/frontend/packages/devkit/build.sh deleted file mode 100755 index 8aaa9f8b3b..0000000000 --- a/src/frontend/packages/devkit/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Build script for devkit -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -ROOT="$( cd "$( dirname "${DIR}" )" && cd ../../.. && pwd )" -DIST="$ROOT/dist-devkit" - -echo $DIST -echo $DIR -tsc -if [ $? -eq 0 ]; then - echo "Copying supporting files" - cp "$DIR/package.json" "$DIST" - rsync -r --exclude=*.ts "${DIR}/src/" "${DIST}/" -fi - diff --git a/src/frontend/packages/devkit/package.json b/src/frontend/packages/devkit/package.json index e16bd4f8fe..e27689fbd3 100644 --- a/src/frontend/packages/devkit/package.json +++ b/src/frontend/packages/devkit/package.json @@ -2,7 +2,7 @@ "name": "@stratosui/devkit", "version": "0.0.1", "scripts": { - "build": "./build.sh", + "build": "tsc && node build.js", "tsc": "tsc" }, "dependencies": { diff --git a/src/frontend/packages/devkit/src/build/extensions.ts b/src/frontend/packages/devkit/src/build/extensions.ts index cbd7d43090..26f7e8af26 100644 --- a/src/frontend/packages/devkit/src/build/extensions.ts +++ b/src/frontend/packages/devkit/src/build/extensions.ts @@ -1,11 +1,13 @@ import * as fs from 'fs'; import * as path from 'path'; -import { NormalModuleReplacementPlugin } from 'webpack'; +import { NormalModuleReplacementPlugin } from 'webpack'; import { StratosConfig } from '../lib/stratos.config'; const importModuleRegex = /src\/frontend\/packages\/core\/src\/custom-import.module.ts/; +const isWindows = process.platform === 'win32'; + /** * Generates the file _custom-import.module.ts containing the code to import * the extensions modules discovered from the packages being included. @@ -51,8 +53,18 @@ export class ExtensionsHandler { this.writeModule(overrideFile, 'CustomImportModule', moduleImports); this.writeModule(overrideFile, 'CustomRoutingImportModule', routingMmoduleImports); + let regex; + // On windows, use an absolute path with backslashes escaped + if (isWindows) { + let p = path.resolve(path.join(dir, 'custom-import.module.ts')); + p = p.replace(/\\/g, '\\\\'); + regex = new RegExp(p); + } else { + regex = importModuleRegex + } + webpackConfig.plugins.push(new NormalModuleReplacementPlugin( - importModuleRegex, + regex, overrideFile )); } diff --git a/src/frontend/packages/devkit/src/build/sass.ts b/src/frontend/packages/devkit/src/build/sass.ts index 745a378e36..5a1dcf8aa8 100644 --- a/src/frontend/packages/devkit/src/build/sass.ts +++ b/src/frontend/packages/devkit/src/build/sass.ts @@ -1,3 +1,4 @@ +import * as path from 'path'; import { StratosConfig } from '../lib/stratos.config'; /** @@ -52,12 +53,12 @@ export class SassHandler { } else { pkgName = pkgParts.shift(); } - const pkgPath = pkgParts.join('/'); + const pkgPath = pkgParts.join(path.sep); // See if we can resolve the package name const knownPath = config.resolveKnownPackage(pkgName); if (knownPath) { return { - file: knownPath + '/_' + pkgPath + '.scss' + file: path.join(knownPath, pkgPath + '.scss') }; } } diff --git a/src/frontend/packages/devkit/src/lib/packages.ts b/src/frontend/packages/devkit/src/lib/packages.ts index 6e0f3a8c02..eb16284148 100644 --- a/src/frontend/packages/devkit/src/lib/packages.ts +++ b/src/frontend/packages/devkit/src/lib/packages.ts @@ -267,7 +267,7 @@ export class Packages { package: pkg.name, scss: refParts[0], mixin: refParts[1], - importPath: path.join(packagePath, refParts[0]) + importPath: '~' + pkg.name + '/' + refParts[0] }; this.log('Found themed package: ' + pkg.name + ' (' + pkg.stratos.theming + ')'); return themingConfig; diff --git a/src/jetstream/config.dev b/src/jetstream/config.dev new file mode 100644 index 0000000000..a98e5c3ec3 --- /dev/null +++ b/src/jetstream/config.dev @@ -0,0 +1,55 @@ +# =============================================== +# Stratos Default Backend Developer Configuration +# =============================================== + +# Database connectivity environment variables +DATABASE_PROVIDER=sqlite +HTTP_CONNECTION_TIMEOUT_IN_SECS=10 +HTTP_CLIENT_TIMEOUT_IN_SECS=30 +HTTP_CLIENT_TIMEOUT_MUTATING_IN_SECS=120 +HTTP_CLIENT_TIMEOUT_LONGRUNNING_IN_SECS=600 +SKIP_SSL_VALIDATION=true +CONSOLE_PROXY_TLS_ADDRESS=:5443 +CONSOLE_CLIENT=console +CF_CLIENT=cf +UAA_ENDPOINT= +CONSOLE_ADMIN_SCOPE=stratos.admin +CF_ADMIN_ROLE=cloud_controller.admin +ALLOWED_ORIGINS=http://nginx +SESSION_STORE_SECRET=stratos_development +CONSOLE_PROXY_CERT_PATH=../../dev-ssl/server.crt +CONSOLE_PROXY_CERT_KEY_PATH=../../dev-ssl/server.key +ENCRYPTION_KEY=B374A26A71490437AA024E4FADD5B497FDFF1A8EA6FF12F6FB65AF2720B59CCF +SQLITE_KEEP_DB=true +UI_PATH=../../dist + +LOG_TO_JSON=false +LOG_API_REQUESTS=true + +SSO_LOGIN=false +# Whitelist for the SSO redirect url. Paths can contain wildcard `*` +SSO_WHITELIST= + +# Enable feature in tech preview +ENABLE_TECH_PREVIEW=true + +# Override the default max list size. When hit we won't fetch all results for the given list +#UI_LIST_MAX_SIZE=600 +# If the max list size is hit allow the user to load all results anyway. Defaults to false +#UI_LIST_ALLOW_LOAD_MAXED=false + +# User Invites +SMTP_FROM_ADDRESS=Stratos +SMTP_HOST=127.0.0.1 +SMTP_PASSWORD= +SMTP_PORT=1025 +SMTP_USER= +TEMPLATE_DIR=./templates +INVITE_USER_CLIENT_ID= +INVITE_USER_CLIENT_SECRET= + +# Use local admin user rather than UAA users +AUTH_ENDPOINT_TYPE=local +LOCAL_USER=admin +LOCAL_USER_PASSWORD=admin +LOCAL_USER_SCOPE=stratos.admin diff --git a/src/jetstream/default.config.properties b/src/jetstream/config.example similarity index 98% rename from src/jetstream/default.config.properties rename to src/jetstream/config.example index e6466f8004..69d9110c8b 100644 --- a/src/jetstream/default.config.properties +++ b/src/jetstream/config.example @@ -8,7 +8,7 @@ SKIP_SSL_VALIDATION=true CONSOLE_PROXY_TLS_ADDRESS=:5443 CONSOLE_CLIENT=console CF_CLIENT=cf -UAA_ENDPOINT=http://localhost:8080 +UAA_ENDPOINT= CONSOLE_ADMIN_SCOPE=stratos.admin CF_ADMIN_ROLE=cloud_controller.admin ALLOWED_ORIGINS=http://nginx diff --git a/src/jetstream/main.go b/src/jetstream/main.go index f6f90c60c6..955f6f0000 100644 --- a/src/jetstream/main.go +++ b/src/jetstream/main.go @@ -10,7 +10,7 @@ import ( "fmt" "io" "io/ioutil" - "math/rand" + "math/rand" "net" "net/http" "os" @@ -90,9 +90,6 @@ func getEnvironmentLookup() *env.VarSet { // Fallback to a "config.properties" files in our directory envLookup.AppendSource(config.NewConfigFileLookup("./config.properties")) - // Fall back to "default.config.properties" in our directory - envLookup.AppendSource(config.NewConfigFileLookup("./default.config.properties")) - // Fallback to individual files in the "/etc/secrets" directory envLookup.AppendSource(config.NewSecretsDirLookup("/etc/secrets")) diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts index c2656ac9a4..8eb872fd73 100644 --- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts +++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts @@ -9,6 +9,7 @@ import { extendE2ETestTime } from '../helpers/extend-test-helpers'; import { LocaleHelper } from '../locale.helper'; import { CFPage } from '../po/cf-page.po'; import { ConfirmDialogComponent } from '../po/confirm-dialog'; +import { TableData } from '../po/list.po'; import { CREATE_APP_DEPLOY_TEST_TYPE, createApplicationDeployTests } from './application-deploy-helper'; import { ApplicationE2eHelper } from './application-e2e-helpers'; import { ApplicationPageAutoscalerTab } from './po/application-page-autoscaler.po'; @@ -39,6 +40,19 @@ describe('Autoscaler -', () => { const { testAppName, appDetails } = createApplicationDeployTests(CREATE_APP_DEPLOY_TEST_TYPE.GIT_URL); + // Scaling rules for the policy. + // Note - these should not result in scaling events during the test (we only expect one scaling event due to a schedule) + const memoryUtilThreshold = '90'; + const memoryUtilOperator = '>='; + const memoryUtilBreach = '160'; + + const throughputOperator = '>='; + const throughputThreshold = '100' + const throughputAdjustment = '10'; + const throughputAdjustmentType = '% instances'; + + const memoryUsedThreshold = '500'; + describe('Tab Tests -', () => { beforeAll(() => { // Should be deployed, no web-socket open, so we can wait for angular again @@ -123,9 +137,9 @@ describe('Autoscaler -', () => { expect(createPolicy.stepper.canNext()).toBeFalsy(); // Fill in form -- valid inputs createPolicy.stepper.getStepperForm().fill({ metric_type: 'memoryutil' }); - createPolicy.stepper.getStepperForm().fill({ operator: '>=' }); - createPolicy.stepper.getStepperForm().fill({ threshold: '60' }); - createPolicy.stepper.getStepperForm().fill({ breach_duration_secs: '60' }); + createPolicy.stepper.getStepperForm().fill({ operator: memoryUtilOperator }); + createPolicy.stepper.getStepperForm().fill({ threshold: memoryUtilThreshold }); + createPolicy.stepper.getStepperForm().fill({ breach_duration_secs: memoryUtilBreach }); expect(createPolicy.stepper.getMatErrorsCount()).toBe(0); expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null); // Fill in form -- invalid inputs @@ -140,20 +154,22 @@ describe('Autoscaler -', () => { expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null); createPolicy.stepper.clickDoneButton(); + // Click [Add] button createPolicy.stepper.clickAddButton(); expect(createPolicy.stepper.getRuleTilesCount()).toBe(2); expect(createPolicy.stepper.canNext()).toBeFalsy(); // Fill in form -- valid inputs createPolicy.stepper.getStepperForm().fill({ metric_type: 'throughput' }); + createPolicy.stepper.getStepperForm().fill({ operator: throughputOperator, threshold: throughputThreshold }); expect(createPolicy.stepper.getMatErrorsCount()).toBe(0); expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null); // Fill in form -- invalid inputs - createPolicy.stepper.getStepperForm().fill({ adjustment: '10' }); + createPolicy.stepper.getStepperForm().fill({ adjustment: throughputAdjustment }); expect(createPolicy.stepper.getMatErrorsCount()).toBe(1); expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe('true'); // Fill in form -- fix invalid inputs - createPolicy.stepper.getStepperForm().fill({ adjustment_type: '% instances' }); + createPolicy.stepper.getStepperForm().fill({ adjustment_type: throughputAdjustmentType }); expect(createPolicy.stepper.getMatErrorsCount()).toBe(0); expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null); createPolicy.stepper.clickDoneButton(); @@ -281,11 +297,11 @@ describe('Autoscaler -', () => { expect(appAutoscaler.tableTriggers.getTableRowsCount()).toBe(2); expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 0)).toBe('memoryutil'); - expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 1)).toBe('>=60 % for 60 secs.'); + expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 1)).toBe(`${memoryUtilOperator}${memoryUtilThreshold} % for ${memoryUtilBreach} secs.`); expect(appAutoscaler.tableTriggers.getTableRowCellContent(0, 2)).toBe('+2 instances'); expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 0)).toBe('throughput'); - expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 1)).toBe('<=10rps for 120 secs.'); - expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 2)).toBe('-10% instances'); + expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 1)).toBe(`${throughputOperator}${throughputThreshold}rps for 120 secs.`); + expect(appAutoscaler.tableTriggers.getTableRowCellContent(1, 2)).toBe(`+${throughputAdjustment}${throughputAdjustmentType}`); expect(appAutoscaler.tableSchedules.getScheduleTableTitleText()).toBe('Scheduled Limit Rules in UTC'); expect(appAutoscaler.tableSchedules.getRecurringTableRowsCount()).toBe(1); @@ -349,7 +365,14 @@ describe('Autoscaler -', () => { it('Should pass ScalingRules Step', () => { createPolicy.stepper.clickAddButton(); + createPolicy.stepper.getStepperForm().getControlsMap().then(map => { + expect(map['metric_type'].value).toBe('memoryused') + }); + createPolicy.stepper.getStepperForm().fill({ threshold: memoryUsedThreshold }); + expect(createPolicy.stepper.getMatErrorsCount()).toBe(0); + expect(createPolicy.stepper.getDoneButtonDisabledStatus()).toBe(null); createPolicy.stepper.clickDoneButton(); + expect(createPolicy.stepper.canNext()).toBeTruthy(); createPolicy.stepper.next(); }); @@ -396,7 +419,7 @@ describe('Autoscaler -', () => { expect(appAutoscaler.cardMetric.getMetricChartTitleText(2)).toContain('memoryused'); expect(appAutoscaler.tableTriggers.getTableRowsCount()).toBe(3); expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 0)).toBe('memoryused'); - expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 1)).toBe('<=10MB for 120 secs.'); + expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 1)).toBe(`<=${memoryUsedThreshold}MB for 120 secs.`); expect(appAutoscaler.tableTriggers.getTableRowCellContent(2, 2)).toBe('-1 instances'); expect(appAutoscaler.tableSchedules.getRecurringTableRowsCount()).toBe(0); @@ -447,7 +470,7 @@ describe('Autoscaler -', () => { describe('Autoscaler Event Page - ', () => { const loggingPrefix = 'AutoScaler Event Table:'; let eventPageBase: PageAutoscalerEventBase; - describe('From autoscaler event card', () => { + describe('From autoscaler event card - ', () => { beforeAll(() => { const appAutoscaler = new ApplicationPageAutoscalerTab(appDetails.cfGuid, appDetails.appGuid); appAutoscaler.goToAutoscalerTab(); @@ -482,27 +505,38 @@ describe('Autoscaler -', () => { // Timeout after 32 attempts (each 5 seconds, which is just under 3 minutes) let retries = 32; const sub = timer(5000, 5000).pipe( - switchMap(() => promise.all([ + switchMap(() => promise.all([ findRow(), - eventPageBase.list.header.isRefreshing() + eventPageBase.list.header.isRefreshing(), + eventPageBase.list.table.getTableData() ])) - ).subscribe(([foundRow, isRefreshing]) => { + ).subscribe(([foundRow, isRefreshing, tableData]: [boolean, number, TableData[]]) => { // These console.logs help by // .. Showing the actual time we're checking, which can be compared with schedule start/end times // .. Showing when successful runs complete, over time this should show on average events take to show + const time = moment().toString() + console.log(`${time}: Table Data: `, tableData); + if (isRefreshing) { - console.log(`${moment().toString()}: Waiting for event row: Skip actions... list is refreshing`); + console.log(`${time}: Waiting for event row: Skip actions... list is refreshing`); return; } retries--; if (foundRow) { - console.log(`${moment().toString()}: Waiting for event row: Found row!`); + console.log(`${time}: Waiting for event row: Found row!`); sub.unsubscribe(); } else { - console.log(`${moment().toString()}: Waiting for event row: manually refreshing list`); - eventPageBase.list.header.refresh(); if (retries === 0) { + // Fail the test if the retry count made it down to 0 + e2e.debugLog('Timed out waiting for event row'); + fail('Timed out waiting for event row'); sub.unsubscribe(); + } else { + console.log(`${time}: Waiting for event row: manually refreshing list`); + eventPageBase.list.header.refresh(); + if (retries === 0) { + sub.unsubscribe(); + } } } }); @@ -534,7 +568,7 @@ describe('Autoscaler -', () => { browser.wait(ApplicationPageAutoscalerTab.detect() .then(appAutoscaler => { appAutoscaler.tableEvents.clickRefreshButton(); - expect(appAutoscaler.tableEvents.getTableRowsCount()).toBe(1); + expect(appAutoscaler.tableEvents.getTableRowsCount()).toBe(1, 'Expected rows to be one, could be extremely late event reporting'); expect(appAutoscaler.tableEvents.getTableRowCellContent(0, 0)).toBe('Instances scaled up from 1 to 2'); expect(appAutoscaler.tableEvents.getTableRowCellContent(0, 1)) .toBe('schedule starts with instance min 2, instance max 10 and instance min initial 2 limited by min instances 2'); diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts index 4ba0f71622..1e676db7ac 100644 --- a/src/test-e2e/po/form.po.ts +++ b/src/test-e2e/po/form.po.ts @@ -1,10 +1,8 @@ -import { e2e } from './../e2e'; import { browser, by, element, promise } from 'protractor'; import { ElementArrayFinder, ElementFinder, protractor } from 'protractor/built'; import { Key } from 'selenium-webdriver'; import { Component } from './component.po'; -import { P } from '@angular/cdk/keycodes'; const until = protractor.ExpectedConditions; diff --git a/src/test-e2e/po/list.po.ts b/src/test-e2e/po/list.po.ts index 4b1d2a9e43..b6f163ad0a 100644 --- a/src/test-e2e/po/list.po.ts +++ b/src/test-e2e/po/list.po.ts @@ -14,6 +14,10 @@ export interface CardMetadata { click: () => void; } +export interface TableData { + [columnHeader: string]: string +} + // Page Object for the List Table View export class ListTableComponent extends Component { @@ -59,7 +63,7 @@ export class ListTableComponent extends Component { }); } - getTableData(): promise.Promise<{ [columnHeader: string]: string }[]> { + getTableData(): promise.Promise { return this.getTableDataRaw().then(tableData => { const table = []; tableData.rows.forEach((row: string[]) => {