Skip to content

Commit

Permalink
Component Cleanup #318
Browse files Browse the repository at this point in the history
  • Loading branch information
grolu committed Aug 14, 2019
1 parent f5f2cf5 commit b6cacca
Show file tree
Hide file tree
Showing 39 changed files with 77 additions and 77 deletions.
28 changes: 14 additions & 14 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$|^.secrets.baseline_temp$",
"lines": null
},
"generated_at": "2019-08-13T11:48:58Z",
"generated_at": "2019-08-14T06:39:18Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -90,7 +90,7 @@
{
"hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926",
"is_secret": false,
"line_number": 87,
"line_number": 93,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -254,7 +254,7 @@
"type": "Private Key"
}
],
"frontend/src/components/CreateShootDetails.vue": [
"frontend/src/components/CreateShoot/CreateShootDetails.vue": [
{
"hashed_secret": "d5d4cd07616a542891b7ec2d0257b3a24b69856e",
"is_secret": false,
Expand All @@ -268,7 +268,7 @@
"type": "Secret Keyword"
}
],
"frontend/src/components/CreateShootInfrastructureDetails.vue": [
"frontend/src/components/CreateShoot/CreateShootInfrastructureDetails.vue": [
{
"hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
"is_secret": false,
Expand Down Expand Up @@ -326,19 +326,19 @@
{
"hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
"is_secret": false,
"line_number": 57,
"line_number": 54,
"type": "Secret Keyword"
},
{
"hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
"is_secret": false,
"line_number": 104,
"line_number": 101,
"type": "Secret Keyword"
},
{
"hashed_secret": "7717bf7a8e425319c10e1783aa343c29e65b8eb7",
"is_secret": false,
"line_number": 120,
"line_number": 117,
"type": "Secret Keyword"
}
],
Expand All @@ -358,7 +358,7 @@
{
"hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
"is_secret": false,
"line_number": 57,
"line_number": 54,
"type": "Secret Keyword"
}
],
Expand All @@ -372,19 +372,19 @@
{
"hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
"is_secret": false,
"line_number": 55,
"line_number": 52,
"type": "Secret Keyword"
},
{
"hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
"is_secret": false,
"line_number": 129,
"line_number": 120,
"type": "Secret Keyword"
},
{
"hashed_secret": "d7dfaa07cdc7acf0f55a2e455e6fd27030e90492",
"is_secret": false,
"line_number": 147,
"line_number": 138,
"type": "Secret Keyword"
}
],
Expand Down Expand Up @@ -414,19 +414,19 @@
{
"hashed_secret": "00cd9f89ee4dd241dbcb2c94df250b17e63b7a64",
"is_secret": false,
"line_number": 94,
"line_number": 82,
"type": "Secret Keyword"
},
{
"hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
"is_secret": false,
"line_number": 146,
"line_number": 134,
"type": "Secret Keyword"
},
{
"hashed_secret": "2da371dc54d130d81ade37c43b591fd96bc1b78d",
"is_secret": false,
"line_number": 168,
"line_number": 156,
"type": "Secret Keyword"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,4 @@ export default {
>>> .flex {
max-width: 300px;
}
</style>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -432,4 +432,4 @@ export default {
>>> .flex {
max-width: 300px;
}
</style>
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ limitations under the License.

<script>
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import ManageShootAddons from '@/components/ManageShootAddons'
import ManageShootAddons from '@/components/ShootAddons/ManageAddons'
import { updateShootAddons } from '@/utils/api'
import { errorDetailsFromError } from '@/utils/error'
import { shootGetters } from '@/mixins/shootGetters'
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ limitations under the License.
import AccountAvatar from '@/components/AccountAvatar'
import TimeString from '@/components/TimeString'
import WorkerGroup from '@/components/WorkerGroup'
import WorkerConfiguration from '@/components/WorkerConfiguration'
import WorkerGroup from '@/components/ShootWorkers/WorkerGroup'
import WorkerConfiguration from '@/components/ShootWorkers/WorkerConfiguration'
import PurposeConfiguration from '@/components/PurposeConfiguration'
import ShootVersion from '@/components/ShootVersion'
import AddonConfiguration from '@/components/AddonConfiguration'
import ShootVersion from '@/components/ShootVersion/ShootVersion'
import AddonConfiguration from '@/components/ShootAddons/AddonConfiguration'
import join from 'lodash/join'
import filter from 'lodash/filter'
import map from 'lodash/map'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ limitations under the License.
import get from 'lodash/get'
import forEach from 'lodash/forEach'
import { mapState } from 'vuex'
import Journal from '@/components/Journal'
import Journal from '@/components/ShootJournals/Journal'
import { canLinkToSeed } from '@/utils'
import { shootGetters } from '@/mixins/shootGetters'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ limitations under the License.
</v-flex>
<v-flex shrink class="pa-0">
<v-layout row>
<shoot-hibernation :shootItem="shootItem"></shoot-hibernation>
<change-hibernation :shootItem="shootItem"></change-hibernation>
<hibernation-configuration ref="hibernationConfiguration" :shootItem="shootItem"></hibernation-configuration>
</v-layout>
</v-flex>
Expand Down Expand Up @@ -89,17 +89,17 @@ import { mapState } from 'vuex'
import get from 'lodash/get'
import moment from 'moment-timezone'
import { isShootHasNoHibernationScheduleWarning } from '@/utils'
import ShootHibernation from '@/components/ShootHibernation'
import MaintenanceStart from '@/components/MaintenanceStart'
import MaintenanceConfiguration from '@/components/MaintenanceConfiguration'
import HibernationConfiguration from '@/components/HibernationConfiguration'
import ChangeHibernation from '@/components/ShootHibernation/ChangeHibernation'
import MaintenanceStart from '@/components/ShootMaintenance/MaintenanceStart'
import MaintenanceConfiguration from '@/components/ShootMaintenance/MaintenanceConfiguration'
import HibernationConfiguration from '@/components/ShootHibernation/HibernationConfiguration'
import DeleteCluster from '@/components/DeleteCluster'
import ReconcileStart from '@/components/ReconcileStart'
import { shootGetters } from '@/mixins/shootGetters'
export default {
components: {
ShootHibernation,
ChangeHibernation,
MaintenanceStart,
MaintenanceConfiguration,
HibernationConfiguration,
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ limitations under the License.
<template slot="affectedObjectName">{{shootName}}</template>
<template slot="message">
<v-layout row wrap>
<hibernation-schedule
<manage-hibernation-schedule
ref="hibernationSchedule"
@valid="onHibernationScheduleValid"
></hibernation-schedule>
></manage-hibernation-schedule>
</v-layout>
</template>
</confirm-dialog>
Expand All @@ -48,7 +48,7 @@ limitations under the License.

<script>
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import HibernationSchedule from '@/components/HibernationSchedule'
import ManageHibernationSchedule from '@/components/ShootHibernation/ManageHibernationSchedule'
import { updateShootHibernationSchedules, addShootAnnotation } from '@/utils/api'
import { errorDetailsFromError } from '@/utils/error'
import get from 'lodash/get'
Expand All @@ -58,7 +58,7 @@ export default {
name: 'hibernation-configuration',
components: {
ConfirmDialog,
HibernationSchedule
ManageHibernationSchedule
},
props: {
shootItem: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ limitations under the License.
</template>

<script>
import HibernationScheduleEvent from '@/components/HibernationScheduleEvent'
import HibernationScheduleEvent from '@/components/ShootHibernation/HibernationScheduleEvent'
import forEach from 'lodash/forEach'
import flatMap from 'lodash/flatMap'
import get from 'lodash/get'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ limitations under the License.
import get from 'lodash/get'
import { mapState, mapGetters } from 'vuex'
import TimeString from '@/components/TimeString'
import JournalLabels from '@/components/JournalLabels'
import JournalComment from '@/components/JournalComment'
import JournalLabels from '@/components/ShootJournals/JournalLabels'
import JournalComment from '@/components/ShootJournals/JournalComment'
export default {
components: {
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions frontend/src/components/ShootListRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ import ShootStatus from '@/components/ShootStatus'
import StatusTags from '@/components/StatusTags'
import PurposeTag from '@/components/PurposeTag'
import TimeString from '@/components/TimeString'
import ShootVersion from '@/components/ShootVersion'
import ShootVersion from '@/components/ShootVersion/ShootVersion'
import RetryOperation from '@/components/RetryOperation'
import JournalLabels from '@/components/JournalLabels'
import JournalLabels from '@/components/ShootJournals/JournalLabels'
import CopyBtn from '@/components/CopyBtn'
import SelfTerminationWarning from '@/components/SelfTerminationWarning'
import HibernationScheduleWarning from '@/components/HibernationScheduleWarning'
import HibernationScheduleWarning from '@/components/ShootHibernation/HibernationScheduleWarning'
import DeleteCluster from '@/components/DeleteCluster'
import forEach from 'lodash/forEach'
import includes from 'lodash/includes'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ limitations under the License.

<script>
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import MaintenanceComponents from '@/components/MaintenanceComponents'
import MaintenanceTime from '@/components/MaintenanceTime'
import MaintenanceComponents from '@/components/ShootMaintenance/MaintenanceComponents'
import MaintenanceTime from '@/components/ShootMaintenance/MaintenanceTime'
import { updateShootMaintenance } from '@/utils/api'
import { errorDetailsFromError } from '@/utils/error'
import get from 'lodash/get'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ limitations under the License.

<script>
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import MaintenanceComponents from '@/components/MaintenanceComponents'
import MaintenanceComponents from '@/components/ShootMaintenance/MaintenanceComponents'
import { addShootAnnotation } from '@/utils/api'
import { errorDetailsFromError } from '@/utils/error'
import { SnotifyPosition } from 'vue-snotify'
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ limitations under the License.
</template>

<script>
import ShootVersionUpdate from '@/components/ShootVersionUpdate'
import ShootVersionUpdate from '@/components/ShootVersion/ShootVersionUpdate'
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import { updateShootVersion } from '@/utils/api'
import { availableK8sUpdatesForShoot } from '@/utils'
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ limitations under the License.
</template>

<script>
import WorkerInputGeneric from '@/components/WorkerInputGeneric'
import WorkerInputGeneric from '@/components/ShootWorkers/WorkerInputGeneric'
import { mapGetters } from 'vuex'
import { shortRandomString } from '@/utils'
import forEach from 'lodash/forEach'
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ limitations under the License.

<script>
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import ManageWorkers from '@/components/ManageWorkers'
import ManageWorkers from '@/components/ShootWorkers/ManageWorkers'
import { updateShootWorkers } from '@/utils/api'
import { errorDetailsFromError } from '@/utils/error'
import { shootGetters } from '@/mixins/shootGetters'
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ limitations under the License.
<script>
import { mapGetters } from 'vuex'
import isEmpty from 'lodash/isEmpty'
import SizeInput from '@/components/VolumeSizeInput'
import MachineType from '@/components/MachineType'
import VolumeType from '@/components/VolumeType'
import MachineImage from '@/components/MachineImage'
import SizeInput from '@/components/ShootWorkers/VolumeSizeInput'
import MachineType from '@/components/ShootWorkers/MachineType'
import VolumeType from '@/components/ShootWorkers/VolumeType'
import MachineImage from '@/components/ShootWorkers/MachineImage'
import { required, maxLength, minValue } from 'vuelidate/lib/validators'
import { getValidationErrors } from '@/utils'
import { uniqueWorkerName, minVolumeSize, resourceName, noStartEndHyphen, numberOrPercentage } from '@/utils/validators'
Expand Down
22 changes: 11 additions & 11 deletions frontend/src/pages/CreateShoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ limitations under the License.
Hibernation
</v-card-title>
<v-card-text>
<hibernation-schedule
<manage-hibernation-schedule
ref="hibernationSchedule"
:userInterActionBus="userInterActionBus"
@valid="onHibernationScheduleValid"
></hibernation-schedule>
></manage-hibernation-schedule>
</v-card-text>
</v-card>
<alert color="error" :message.sync="errorMessage" :detailedMessage.sync="detailedErrorMessage"></alert>
Expand All @@ -121,14 +121,14 @@ limitations under the License.

<script>
import CreateShootSelectInfrastructure from '@/components/CreateShootSelectInfrastructure'
import CreateShootInfrastructureDetails from '@/components/CreateShootInfrastructureDetails'
import CreateShootDetails from '@/components/CreateShootDetails'
import ManageShootAddons from '@/components/ManageShootAddons'
import MaintenanceComponents from '@/components/MaintenanceComponents'
import MaintenanceTime from '@/components/MaintenanceTime'
import HibernationSchedule from '@/components/HibernationSchedule'
import ManageWorkers from '@/components/ManageWorkers'
import CreateShootSelectInfrastructure from '@/components/CreateShoot/CreateShootSelectInfrastructure'
import CreateShootInfrastructureDetails from '@/components/CreateShoot/CreateShootInfrastructureDetails'
import CreateShootDetails from '@/components/CreateShoot/CreateShootDetails'
import ManageShootAddons from '@/components/ShootAddons/ManageAddons'
import MaintenanceComponents from '@/components/ShootMaintenance/MaintenanceComponents'
import MaintenanceTime from '@/components/ShootMaintenance/MaintenanceTime'
import ManageHibernationSchedule from '@/components/ShootHibernation/ManageHibernationSchedule'
import ManageWorkers from '@/components/ShootWorkers/ManageWorkers'
import Alert from '@/components/Alert'
import ConfirmDialog from '@/dialogs/ConfirmDialog'
import { mapActions, mapGetters, mapState } from 'vuex'
Expand All @@ -152,7 +152,7 @@ export default {
ManageShootAddons,
MaintenanceComponents,
MaintenanceTime,
HibernationSchedule,
ManageHibernationSchedule,
ManageWorkers,
Alert,
ConfirmDialog
Expand Down
Loading

0 comments on commit b6cacca

Please sign in to comment.