katello 4.3.0.rc1 → 4.3.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branch-repositories.controller.js

@@ -1,77 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.ostree-branches.controller:OstreeBranchRepositoriesController
- *
- * @requires $scope
- * @requires $q
- * @requires Nutupane
- * @requires Repository
- * @requires Environment
- * @requires ContentView
- * @requires CurrentOrganization
- *
- * @description
- *   Provides the functionality for the OSTree branch repositories page.
- */
-angular.module('Bastion.ostree-branches').controller('OstreeBranchRepositoriesController',
-    ['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization',
-    function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization) {
-        var repositoriesNutupane, environment, contentView, params;
-        params = {
-            'ostree_branch_id': $scope.$stateParams.branchId,
-            'organization_id': CurrentOrganization,
-            'paged': false
-        };
-
-        repositoriesNutupane = new Nutupane(Repository, params);
-        $scope.controllerName = 'katello_repositories';
-        $scope.table = repositoriesNutupane.table;
-        $scope.table.initialLoad = false;
-        repositoriesNutupane.primaryOnly = true;
-        repositoriesNutupane.setSearchKey('repositoriesSearch');
-
-        environment = Environment.queryUnpaged(function (response) {
-            $scope.environments = response.results;
-            $scope.environmentFilter = _.find($scope.environments, {library: true}).id;
-        });
-
-        contentView = ContentView.queryUnpaged(function (response) {
-            $scope.contentViews = response.results;
-            _.each($scope.contentViews, function(cv) {
-                cv['environment_ids'] = _.map(cv.environments, 'id');
-            });
-            $scope.contentViewFilter = _.find($scope.contentViews, {'default': true});
-        });
-
-        $scope.table.working = true;
-        $q.all([contentView.$promise, environment.$promise]).then(function () {
-            $scope.filterBranches();
-            $scope.table.working = false;
-        });
-
-        $scope.filterBranches = function () {
-            var foundVersion, env;
-            params['environment_id'] = $scope.environmentFilter;
-
-            if ($scope.contentViewFilter) {
-                foundVersion = _.find($scope.contentViewFilter.versions, function(version) {
-                    // Find the version belonging to the environment specified by the enviroment filter
-                    env = _.find(version.environment_ids, function(envId) {
-                        return envId === $scope.environmentFilter;
-                    });
-
-                    return !angular.isUndefined(env);
-                });
-
-                if (!angular.isUndefined(foundVersion)) {
-                    params['content_view_version_id'] = foundVersion.id;
-                } else {
-                    delete params['content_view_version_id'];
-                }
-            }
-
-            repositoriesNutupane.setParams(params);
-            repositoriesNutupane.refresh();
-        };
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branch.controller.js

@@ -1,31 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.ostree-branches.controller:OstreeBranchController
- *
- * @requires $scope
- * @requires OstreeBranch
- * @requires ApiErrorHandler
- *
- * @description
- *   Provides the functionality for the Ostree Branch action pane.
- */
-angular.module('Bastion.ostree-branches').controller('OstreeBranchController', ['$scope', 'OstreeBranch', 'ApiErrorHandler',
-    function ($scope, OstreeBranch, ApiErrorHandler) {
-        $scope.panel = {
-            error: false,
-            loading: true
-        };
-
-        if ($scope.branch) {
-            $scope.panel.loading = false;
-        }
-
-        $scope.branch = OstreeBranch.get({id: $scope.$stateParams.branchId}, function (branch) {
-            $scope.$broadcast('branch.loaded', branch);
-            $scope.panel.loading = false;
-        }, function (response) {
-            $scope.panel.loading = false;
-            ApiErrorHandler.handleGETRequestErrors(response, $scope);
-        });
-    }
-]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-info.html

@@ -1,15 +0,0 @@
-<span page-title ng-model="branch">{{ 'OSTree Branch: ' | translate }} {{ branch.name }}</span>
-
-<div data-extend-template="layouts/two-column-details.html">
-  <div data-block="left-column">
-    <h4 translate>Branch Info</h4>
-
-    <dl class="dl-horizontal dl-horizontal-left">
-      <dt translate>Version</dt>
-      <dd>{{ branch.version }}</dd>
-
-      <dt translate>Commit</dt>
-      <dd>{{ branch.commit }}</dd>
-    </dl>
-  </div>
-</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-repositories.html

@@ -1,72 +0,0 @@
-<span page-title ng-model="branch">{{ 'OSTree Branch: ' | translate }} {{ branch.name }}</span>
-
-<h3 translate>
-  Repositories containing branch {{ branch.name }}
-</h3>
-
-<div data-extend-template="layouts/partials/table.html">
-  <div data-block="search-filter">
-    <select class="form-control"
-            placeholder="{{ 'Select Environment' | translate }}"
-            ng-disabled="!environments"
-            ng-model="environmentFilter"
-            ng-options="e.id as e.name for e in environments"
-            ng-change="filterBranches()">
-    </select>
-
-    <select class="form-control"
-            placeholder="{{ 'Select Content View' | translate }}"
-            ng-disabled="!contentViews || filteredCVs.length === 0"
-            ng-model="contentViewFilter"
-            ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter:{environment_ids: environmentFilter})"
-            ng-change="filterBranches()">
-    </select>
-    <p class="help-block" translate ng-show="filteredCVs.length === 0">
-      There are no Content Views in this Environment.
-    </p>
-  </div>
-
-  <span data-block="no-rows-message" translate>
-    No Repositories contain this Branch.
-  </span>
-
-  <div data-block="table">
-    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
-      <thead>
-        <tr bst-table-head>
-          <th bst-table-column="name"><span translate>Name</span></th>
-          <th bst-table-column="product"><span translate>Product</span></th>
-          <th bst-table-column="lastSync"><span translate>Last Sync</span></th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr bst-table-row
-            ng-repeat="repository in table.rows">
-          <td bst-table-cell>
-            <a ng-href="/products/{{ repository.product.id }}/repositories/{{ repository.library_instance_id || repository.id }}">
-              {{ repository.name }}
-            </a>
-          </td>
-          <td bst-table-cell>
-            <a ui-sref="product.repositories({productId: repository.product.id})">
-              {{ repository.product.name }}
-            </a>
-          </td>
-          <td bst-table-cell>
-              <span ng-show="repository.url">
-              <span ng-show="repository.last_sync == null" translate>
-                Not Synced
-              </span>
-              <span ng-hide="repository.last_sync == null">
-                <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
-                <span translate>{{ repository.last_sync_words }} ago</span>
-              </span>
-            </span>
-            <span ng-hide="repository.url" translate>N/A</span>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch.html

@@ -1,30 +0,0 @@
-<span page-title ng-model="branch">{{ 'OSTree Branch: ' | translate }} {{ branch.name }}</span>
-
-<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
-  <div data-block="header">
-    {{ branch.name }}
-  </div>
-
-  <nav data-block="navigation">
-    <ul class="nav nav-tabs">
-      <li ng-class="{active: isState('ostree-branch.info')}">
-        <a ui-sref="ostree-branch.info">
-          <span translate>
-            Details
-          </span>
-        </a>
-      </li>
-      <li ng-class="{active: isState('ostree-branch.repositories')}">
-        <a ui-sref="ostree-branch.repositories">
-          <span translate>
-            Repositories
-          </span>
-        </a>
-      </li>
-    </ul>
-  </nav>
-
-  <div data-block="content">
-    <section ui-view></section>
-  </div>
-</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branch.factory.js

@@ -1,27 +0,0 @@
-(function () {
-    'use strict';
-
-    /**
-     * @ngdoc factory
-     * @name  Bastion.ostree-branches.factory:OstreeBranch
-     *
-     * @description
-     *   Provides a BastionResource for interacting with Ostree Branches
-     */
-    function OstreeBranch(BastionResource) {
-        return BastionResource('katello/api/v2/ostree_branches/:id',
-            {'id': '@id'},
-            {
-                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
-            }
-
-        );
-    }
-
-    angular
-        .module('Bastion.ostree-branches')
-        .factory('OstreeBranch', OstreeBranch);
-
-    OstreeBranch.$inject = ['BastionResource'];
-
-})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.controller.js

@@ -1,67 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.ostree-branches.controller:OstreeBranchesController
- *
- * @requires $scope
- * @requires $location
- * @requires translate
- * @requires Nutupane
- * @requires OstreeBranch
- * @requires Repository
- * @requires CurrentOrganization
- *
- * @description
- *   Provides the functionality specific to ostree branches for use with the Nutupane UI pattern.
- *   Defines the columns to display and the transform function for how to generate each row
- *   within the table.
- */
-
-angular.module('Bastion.ostree-branches').controller('OstreeBranchesController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'OstreeBranch', 'Repository', 'CurrentOrganization',
-    function ($scope, $location, translate, Nutupane, OstreeBranch, Repository, CurrentOrganization) {
-        var nutupane, params = {
-            'organization_id': CurrentOrganization,
-            'search': $location.search().search || "",
-            'paged': true
-        };
-
-        nutupane = $scope.nutupane = new Nutupane(OstreeBranch, params);
-        $scope.controllerName = 'katello_ostree_branches';
-        $scope.table = nutupane.table;
-        $scope.removeRow = nutupane.removeRow;
-
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('ostree-branches.index');
-        };
-
-        $scope.repository = {name: translate('All Repositories'), id: 'all'};
-
-        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'ostree'}, function (response) {
-            $scope.repositories = [$scope.repository];
-            $scope.repositories = $scope.repositories.concat(response.results);
-
-            if ($location.search().repositoryId) {
-                $scope.repository = _.find($scope.repositories, function (repository) {
-                    return repository.id === parseInt($location.search().repositoryId, 10);
-                });
-            }
-        });
-
-        $scope.$watch('repository', function (repository) {
-            var nutupaneParams = nutupane.getParams();
-
-            if (repository.id === 'all') {
-                nutupaneParams['repository_id'] = null;
-                nutupane.setParams(nutupaneParams);
-            } else {
-                $location.search('repositoryId', repository.id);
-                nutupaneParams['repository_id'] = repository.id;
-                nutupane.setParams(nutupaneParams);
-            }
-
-            if (!nutupane.table.initialLoad) {
-                nutupane.refresh();
-            }
-        });
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.module.js

@@ -1,15 +0,0 @@
-/**
- * @ngdoc module
- * @name  Bastion.ostree-branches
- *
- * @description
- *   Module for Ostree Branch related functionality.
- */
-angular.module('Bastion.ostree-branches', [
-    'ngResource',
-    'ui.router',
-    'Bastion',
-    'Bastion.i18n',
-    'Bastion.common',
-    'Bastion.components'
-]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.routes.js

@@ -1,50 +0,0 @@
-/**
- * @ngdoc object
- * @name Bastion.ostree-branches.config
- *
- * @requires $stateProvider
- *
- * @description
- *   State routes defined for the ostree branches module.
- */
-angular.module('Bastion.ostree-branches').config(['$stateProvider', function ($stateProvider) {
-    $stateProvider.state('ostree-branches', {
-        url: '/ostree_branches',
-        permission: ['view_products', 'view_content_views'],
-        views: {
-            '@': {
-                controller: 'OstreeBranchesController',
-                templateUrl: 'ostree-branches/views/ostree-branches.html'
-            }
-        },
-        ncyBreadcrumb: {
-            label: "{{ 'OSTree Branches' | translate }}"
-        }
-    })
-    .state('ostree-branch', {
-        abstract: true,
-        url: '/ostree_branches/:branchId',
-        permission: ['view_products', 'view_content_views'],
-        controller: 'OstreeBranchController',
-        templateUrl: 'ostree-branches/details/views/ostree-branch.html'
-    })
-    .state('ostree-branch.info', {
-        url: '',
-        permission: ['view_products', 'view_content_views'],
-        templateUrl: 'ostree-branches/details/views/ostree-branch-info.html',
-        ncyBreadcrumb: {
-            label: "{{ branch.name }}",
-            parent: 'ostree-branches'
-        }
-    })
-    .state('ostree-branch.repositories', {
-        url: '/repositories',
-        permission: ['view_products', 'view_content_views'],
-        controller: 'OstreeBranchRepositoriesController',
-        templateUrl: 'ostree-branches/details/views/ostree-branch-repositories.html',
-        ncyBreadcrumb: {
-            label: "{{ 'Repositories' | translate }}",
-            parent: 'ostree-branch.info'
-        }
-    });
-}]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/views/ostree-branches.html

@@ -1,40 +0,0 @@
-<span page-title>{{ 'OSTree Branches' | translate }}</span>
-
-<div data-extend-template="layouts/table-with-header.html">
-
-  <header data-block="header" translate>
-    OSTree Branches
-  </header>
-
-  <div data-block="search-filter">
-    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
-  </div>
-
-  <span data-block="no-rows-message" translate>
-    You currently don't have any OSTree Branches.
-  </span>
-
-  <div data-block="table">
-    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
-      <thead>
-        <tr bst-table-head>
-          <th bst-table-column="name">{{ "Name" | translate }}</th>
-          <th bst-table-column="version">{{ "Version" | translate }}</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr bst-table-row ng-repeat="branch in table.rows">
-          <td bst-table-cell>
-            <a ui-sref="ostree-branch.info({branchId: branch.id})">
-              {{ branch.name }}
-            </a>
-          </td>
-          <td bst-table-cell>
-            {{ branch.version }}
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ostree-branches.html

@@ -1,40 +0,0 @@
-<span page-title ng-model="repository">{{ 'Manage OSTree Branches for Repository:' | translate }} {{ repository.name }}</span>
-
-<div data-block="messages">
-  <div bst-alert="success" ng-hide="generationTaskId === undefined">
-    <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
-    <p translate>
-      OSTree Branch metadata generation has been initiated in the background.  Click
-      <a ng-href="{{ taskUrl() }}">Here</a> to monitor the progress.
-    </p>
-  </div>
-</div>
-
-<div data-extend-template="layouts/partials/table.html">
-  <div data-block="table">
-    <table class="table table-striped table-bordered" >
-
-      <thead>
-        <tr bst-table-head>
-          <th bst-table-column><span translate>Branch Name</span></th>
-          <th bst-table-column><span translate>Version</span></th>
-          <th bst-table-column><span translate>Commit</span></th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr bst-table-row ng-repeat="item in table.rows">
-          <td bst-table-cell>
-            {{ item.name }}
-          </td>
-          <td bst-table-cell>
-            {{ item.version }}
-          </td>
-          <td bst-table-cell>
-            {{ item.commit }}
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/ostree-upstream-sync-policy.service.js

@@ -1,26 +0,0 @@
-/**
- * @ngdoc service
- * @name  Bastion.repository.service:ostreeUpstreamSyncPolicy
- *
- * @requires translate
- *
- * @description
- *   Provides a ostree upstream syncPolicies for repositories
- */
-angular.module('Bastion.repositories').service('OstreeUpstreamSyncPolicy',
-    ['translate', function (translate) {
-
-        this.syncPolicies = {
-            'latest': translate('Latest Only'),
-            'all': translate('All History'),
-            'custom': translate('Custom Depth')
-        };
-
-        this.syncPolicyName = function (policy, depth) {
-            if (policy === "custom") {
-                return translate('Custom Depth (Currently %s)').replace('%s', depth.toString());
-            }
-            return this.syncPolicies[policy];
-        };
-    }]
-);

data/webpack/components/extensions/HostDetails/Tabs/SubscriptionTab.js

@@ -1,12 +0,0 @@
-import React from 'react';
-import EmptyPage from 'foremanReact/components/common/EmptyState/EmptyStatePattern';
-
-const SubscriptionTab = () => (
-  <EmptyPage
-    icon="enterprise"
-    header="WIP Subscription"
-    description="This is a demo for adding content to the new host details page"
-  />
-);
-
-export default SubscriptionTab;

data/webpack/scenes/Content/Details/ContentCounts.js

@@ -1,42 +0,0 @@
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { urlBuilder } from 'foremanReact/common/urlHelpers';
-import ContentConfig from '../ContentConfig';
-
-const appendCount = (type, count, info, productId, repoId) => {
-  const [repoPlural, repoSingular, link] = info;
-  const displayName = count > 1 ? repoPlural : repoSingular;
-  const url = urlBuilder(`products/${productId}/repositories/${repoId}/content`, '', link);
-  const displayInfo = `${count} ${displayName}`;
-  return (
-    <div key={`${type}${count}`}>
-      <a href={url}>{displayInfo}</a>
-    </div>
-  );
-};
-
-const ContentCounts = ({
-  typeSingularLabel, productId, repoId, counts,
-}) => {
-  const config = ContentConfig().find(type =>
-    type.names.singularLabel === typeSingularLabel);
-  const { pluralLowercase, singularLowercase, pluralLabel } = config.names;
-  const info = [pluralLowercase, singularLowercase, pluralLabel];
-
-  const allCounts = [];
-  Object.keys(counts).forEach((type) => {
-    const count = counts[typeSingularLabel];
-    if (count > 0) allCounts.push(appendCount(type, count, info, productId, repoId));
-  });
-
-  return <Fragment>{allCounts}</Fragment>;
-};
-
-ContentCounts.propTypes = {
-  typeSingularLabel: PropTypes.string.isRequired,
-  productId: PropTypes.number.isRequired,
-  repoId: PropTypes.number.isRequired,
-  counts: PropTypes.shape({}).isRequired,
-};
-
-export default ContentCounts;

data/webpack/scenes/Subscriptions/Manifest/__tests__/SimpleContentAccess.test.js

@@ -1,108 +0,0 @@
-import React from 'react';
-import { cleanup } from '@testing-library/react';
-import { renderWithRedux, fireEvent, patientlyWaitFor } from 'react-testing-lib-wrapper';
-import ManifestModal from '../../Manifest';
-import { manifestHistorySuccessState, manifestHistorySuccessResponse } from './manifest.fixtures';
-import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper';
-import api from '../../../../services/api';
-
-afterEach(cleanup);
-
-const noop = jest.fn();
-const organization = {
-  id: 1,
-  redhat_repository_url: 'https://redhat.com',
-  owner_details: {
-    upstreamConsumer: {
-      webUrl: 'https://example.com/',
-    },
-  },
-};
-
-const defaultProps = {
-  disableManifestActions: false,
-  disabledReason: '',
-  canImportManifest: true,
-  canDeleteManifest: true,
-  canEditOrganizations: true,
-  upload: noop,
-  refresh: noop,
-  delete: noop,
-  enableSimpleContentAccess: noop,
-  disableSimpleContentAccess: noop,
-  loadManifestHistory: noop,
-  organization,
-  loadOrganization: noop,
-  saveOrganization: noop,
-  taskInProgress: false,
-  simpleContentAccess: true,
-  manifestHistory: manifestHistorySuccessState,
-  setModalClosed: noop,
-  setModalOpen: noop,
-};
-
-const initialState = {
-  katello: {
-    organization: {
-      simple_content_access: false,
-      ...organization,
-    },
-  },
-  foremanModals: {
-    manageManifestModal: {
-      isOpen: true,
-    },
-  },
-};
-
-const enableSimpleContetAccessPath = api.getApiUrl('/organizations/1/simple_content_access/enable');
-const disableSimpleContetAccessPath = api.getApiUrl('/organizations/1/simple_content_access/disable');
-const manifestHistoryPath = api.getApiUrl('/organizations/1/subscriptions/manifest_history');
-
-test('Enable Simple Content Access after toggle switch value to true', async (done) => {
-  const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
-
-  const updatescope = nockInstance
-    .put(enableSimpleContetAccessPath)
-    .reply(202, true);
-
-  const getscope = nockInstance
-    .get(manifestHistoryPath)
-    .query(true)
-    .reply(200, manifestHistorySuccessResponse);
-
-  const toggleButton = getByTestId('switch');
-
-  await patientlyWaitFor(() => { expect(toggleButton).toBeInTheDocument(); });
-  expect(toggleButton.checked).toEqual(false);
-
-  fireEvent.click(toggleButton);
-
-  assertNockRequest(getscope);
-  assertNockRequest(updatescope, done);
-});
-
-test('Disable Simple Content Access after toggle switch value to false', async (done) => {
-  initialState.katello.organization.simple_content_access = true;
-
-  const updatescope = nockInstance
-    .put(disableSimpleContetAccessPath)
-    .reply(202, true);
-
-  const getscope = nockInstance
-    .get(manifestHistoryPath)
-    .query(true)
-    .reply(200, manifestHistorySuccessResponse);
-
-  const { getByTestId } = renderWithRedux(<ManifestModal {...defaultProps} />, { initialState });
-
-  const toggleButton = getByTestId('switch');
-
-  await patientlyWaitFor(() => { expect(toggleButton).toBeInTheDocument(); });
-  expect(toggleButton.checked).toEqual(true);
-
-  fireEvent.click(toggleButton);
-
-  assertNockRequest(getscope);
-  assertNockRequest(updatescope, done);
-});