Code cleanup, renaming functions, use .all() on config promises

CONTRIBUTING.md

@@ -171,6 +171,7 @@ Here are the guidelines for how to name functions.
 |`replace<x>`| Use for methods that make API `PUT` requests |
 |`disassociate<x>`| Use for methods that pass `{ disassociate: true }` as a data param to an endpoint |
 |`associate<x>`| Use for methods that pass a resource id as a data param to an endpoint |
+|`can<x>`| Use for props dealing with RBAC to denote whether a user has access to something |
 
 ### Default State Initialization
 When declaring empty initial states, prefer the following instead of leaving them undefined:

__tests__/pages/Organizations/components/OrganizationAccessList.test.jsx

@@ -51,9 +51,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => {}}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     );
   });
 
@@ -62,9 +61,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
 
     setImmediate(() => {
@@ -79,9 +77,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
     expect(onSort).not.toHaveBeenCalled();
 
@@ -98,9 +95,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
 
     setImmediate(() => {
@@ -120,9 +116,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
     expect(handleWarning).not.toHaveBeenCalled();
     expect(confirmDelete).not.toHaveBeenCalled();
@@ -145,9 +140,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
 
     setImmediate(() => {
@@ -182,9 +176,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={organization}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
 
     setImmediate(() => {
@@ -200,9 +193,8 @@ describe('<OrganizationAccessList />', () => {
       <OrganizationAccessList
         getAccessList={() => ({ data: { count: 1, results: mockData } })}
         removeRole={() => {}}
-        api={api}
         organization={readOnlyOrg}
-      />
+      />, { context: { network: { api } } }
     ).find('OrganizationAccessList');
 
     setImmediate(() => {

src/api.js

@@ -76,7 +76,7 @@ class APIClient {
     return this.http.post(API_ORGANIZATIONS, data);
   }
 
-  callOrganizations () {
+  optionsOrganizations () {
     return this.http.options(API_ORGANIZATIONS);
   }
 

src/contexts/Config.jsx

@@ -78,28 +78,19 @@ class Provider extends Component {
     const { api, handleHttpError } = this.props;
 
     try {
-      const {
-        data: {
-          ansible_version,
-          custom_virtualenvs,
-          version
-        }
-      } = await api.getConfig();
-      const {
-        data: {
-          custom_logo,
-          custom_login_info
-        }
-      } = await api.getRoot();
-      const { data: { results: [me] } } = await api.getMe();
+      const [configRes, rootRes, meRes] = await Promise.all([
+        api.getConfig(),
+        api.getRoot(),
+        api.getMe()
+      ]);
       this.setState({
         value: {
-          ansible_version,
-          custom_virtualenvs,
-          version,
-          custom_logo,
-          custom_login_info,
-          me
+          ansible_version: configRes.data.ansible_version,
+          custom_virtualenvs: configRes.data.custom_virtualenvs,
+          version: configRes.data.version,
+          custom_logo: rootRes.data.custom_logo,
+          custom_login_info: rootRes.data.custom_login_info,
+          me: meRes.data.results
         }
       });
     } catch (err) {

src/pages/Login.jsx

@@ -53,7 +53,7 @@ class AWXLogin extends Component {
     try {
       const { data } = await api.login(username, password);
       updateConfig(data);
-      fetchMe();
+      await fetchMe();
       this.setState({ isAuthenticated: true, isLoading: false });
     } catch (error) {
       handleHttpError(error) || this.setState({ isInputValid: false, isLoading: false });

src/pages/Organizations/screens/Organization/Organization.jsx

@@ -240,9 +240,6 @@ class Organization extends Component {
                 path="/organizations/:id/notifications"
                 render={() => (
                   <OrganizationNotifications
-                    match={match}
-                    location={location}
-                    history={history}
                     canToggleNotifications={canToggleNotifications}
                   />
                 )}

src/pages/Organizations/screens/OrganizationsList.jsx

@@ -73,7 +73,7 @@ class OrganizationsList extends Component {
     this.onSelectAll = this.onSelectAll.bind(this);
     this.onSelect = this.onSelect.bind(this);
     this.updateUrl = this.updateUrl.bind(this);
-    this.callOrganizations = this.callOrganizations.bind(this);
+    this.fetchOptionsOrganizations = this.fetchOptionsOrganizations.bind(this);
     this.fetchOrganizations = this.fetchOrganizations.bind(this);
     this.handleOrgDelete = this.handleOrgDelete.bind(this);
     this.handleOpenOrgDeleteModal = this.handleOpenOrgDeleteModal.bind(this);
@@ -82,7 +82,7 @@ class OrganizationsList extends Component {
 
   componentDidMount () {
     const queryParams = this.getQueryParams();
-    this.callOrganizations();
+    this.fetchOptionsOrganizations();
     this.fetchOrganizations(queryParams);
   }
 
@@ -240,11 +240,11 @@ class OrganizationsList extends Component {
     }
   }
 
-  async callOrganizations () {
+  async fetchOptionsOrganizations () {
     const { api } = this.props;
 
     try {
-      const { data } = await api.callOrganizations();
+      const { data } = await api.optionsOrganizations();
       const { actions } = data;
 
       const stateToUpdate = {
@@ -345,11 +345,14 @@ class OrganizationsList extends Component {
                           <Trans>
                             You dont have permission to delete the following Organizations:
                           </Trans>
-                          {selected.map(row => (
-                            <div key={row.id}>
-                              {row.name}
-                            </div>
-                          ))}
+                          {selected
+                            .filter(row => !row.summary_fields.user_capabilities.delete)
+                            .map(row => (
+                              <div key={row.id}>
+                                {row.name}
+                              </div>
+                            ))
+                          }
                         </div>
                       ) : undefined
                     }